diff --git a/logic_diagram/logic_diagram.tex b/logic_diagram/logic_diagram.tex index 9d56651..a2ba00e 100644 --- a/logic_diagram/logic_diagram.tex +++ b/logic_diagram/logic_diagram.tex @@ -378,7 +378,7 @@ $$ \mathcal{G}:SMG \rightarrow P. $$ The logic equation (using $oplus$ to represent exclusive-or) representing an SMG $p_{fmg}$ is given thus; -$$\mathcal{G}(fmg) = \bigoplus_{t \in fmg} (\; \mathcal{F_t}_{t} (t) \;) \; .$$ +$$\mathcal{G}(fmg) = \bigoplus_{t \in fmg} (\; \mathcal{F_t} (t) \;) \; .$$ } } @@ -391,7 +391,7 @@ and unused available zones. \section{Context, functional groups, failure modes and symptoms} -\include{../shortfg} +\input{shortfg} \subsection{Symptom Collection} diff --git a/logic_diagram/paper.tex b/logic_diagram/paper.tex index 0643eb6..392089a 100644 --- a/logic_diagram/paper.tex +++ b/logic_diagram/paper.tex @@ -3,21 +3,28 @@ \usepackage{graphicx} \usepackage{fancyhdr} \usepackage{tikz} +\usetikzlibrary{shapes,snakes} \usepackage{amsfonts,amsmath,amsthm} - +\input{../style} \usepackage{ifthen} +\usepackage{lastpage} + \newboolean{paper} \setboolean{paper}{true} % boolvar=true or false -\input{style} - %\newtheorem{definition}{Definition:} \begin{document} -\pagestyle{fancy} +\pagestyle{fancy} +\fancyhf{} +%\renewcommand{\chaptermark}[1]{\markboth{ \emph{#1}}{}} +\fancyhead[LO]{} +\fancyhead[RE]{\leftmark} +%\fancyfoot[LE,RO]{\thepage} +\cfoot{Page \thepage\ of \pageref{LastPage}} +\rfoot{\today} +\lhead{Propositional Logic Diagram FMMD} -\outerhead{{\small\bf Propositional Logic Diagram}} -\innerfoot{{\small\bf R.P. Clark } } % numbers at outer edges \pagenumbering{arabic} % Arabic page numbers hereafter \author{R.P.Clark} diff --git a/logic_diagram/paper.tex~ b/logic_diagram/paper.tex~ index 1393471..392089a 100644 --- a/logic_diagram/paper.tex~ +++ b/logic_diagram/paper.tex~ @@ -3,14 +3,28 @@ \usepackage{graphicx} \usepackage{fancyhdr} \usepackage{tikz} -\usepackage{amsfonts,amsmath} +\usetikzlibrary{shapes,snakes} +\usepackage{amsfonts,amsmath,amsthm} \input{../style} +\usepackage{ifthen} +\usepackage{lastpage} + +\newboolean{paper} +\setboolean{paper}{true} % boolvar=true or false + +%\newtheorem{definition}{Definition:} \begin{document} -\pagestyle{fancy} +\pagestyle{fancy} +\fancyhf{} +%\renewcommand{\chaptermark}[1]{\markboth{ \emph{#1}}{}} +\fancyhead[LO]{} +\fancyhead[RE]{\leftmark} +%\fancyfoot[LE,RO]{\thepage} +\cfoot{Page \thepage\ of \pageref{LastPage}} +\rfoot{\today} +\lhead{Propositional Logic Diagram FMMD} -\outerhead{{\small\bf Propositional Logic Diagram}} -\innerfoot{{\small\bf R.P. Clark } } % numbers at outer edges \pagenumbering{arabic} % Arabic page numbers hereafter \author{R.P.Clark} @@ -19,10 +33,10 @@ \input{logic_diagram_paper} \bibliographystyle{plain} -\bibliography{vmgbibliography,mybib} +\bibliography{../mybib,../vmgbibliography} -\begin{verbatim} -$Id: paper.tex,v 1.3 2008/11/07 19:54:52 robin Exp $ -\end{verbatim} +%\begin{verbatim} +%$Id: paper.tex,v 1.4 2009/11/28 20:05:52 robin Exp $ +%\end{verbatim} \end{document}