Merge branch 'master' of dev:/home/robin/git/thesis

Conflicts:
	fmmd_concept/System_safety_2011/submission.tex

invopamp/Makefile

@@ -0,0 +1,27 @@
+DIA_IMAGES = dc1.png  inv.png  fg1b.png  fgampa.png  fgamp.png  opamp.png fg1a.png  fg1.png   fgampb.png    op1.png
+#
+#
+#
+
+%.png : %.dia
+	dia $< -e $@
+	echo source $< target $@
+
+#graphics: $(DIA_IMAGES)
+
+paper:	paper.tex invopamp_paper.tex $(DIA_IMAGES)
+	#latex paper.tex
+	#dvipdf paper     pdflatex cannot use eps ffs
+	pdflatex paper.tex
+	cp paper.pdf invopamp_paper.pdf
+	okular invopamp_paper.pdf
+
+
+# Remove the need for referncing graphics in subdirectories
+#
+invopamp_paper.tex: invopamp.tex paper.tex
+	cat invopamp.tex | sed 's/invopamp\///' > invopamp_paper.tex
+
+bib:	
+	bibtex paper
+

invopamp/paper.tex

@@ -0,0 +1,51 @@
+
+\documentclass[a4paper,10pt]{article}
+
+\usepackage{graphicx}
+\usepackage{fancyhdr}
+\usepackage{tikz}
+\usepackage{amsfonts,amsmath,amsthm}
+\usetikzlibrary{shapes.gates.logic.US,trees,positioning,arrows}
+\input{../style}
+\usepackage{ifthen}
+\usepackage{lastpage}
+\usetikzlibrary{shapes,snakes}
+
+\newboolean{paper}
+\setboolean{paper}{true} % boolvar=true or false
+
+\newboolean{pld}
+\setboolean{pld}{false} % boolvar=true or false : draw analysis using propositional logic diagrams
+
+\newboolean{dag}
+\setboolean{dag}{true} % boolvar=true or false : draw analysis using directed acylic graphs
+\def\layersep{2.5cm}
+
+
+%\newtheorem{definition}{Definition:}
+
+\begin{document}
+\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{Two stage FMMD analysis of an inverting op-amp configuration}
+
+%\outerhead{{\small\bf Developing a rigorous bottom-up modular static failure mode modelling methodology}}
+%\innerfoot{{\small\bf R.P. Clark } }   
+                                              % numbers at outer edges
+\pagenumbering{arabic}                        % Arabic page numbers hereafter
+\author{R.P.Clark}
+\title{Two stage FMMD analysis of a an inverting op-amp configuration}
+\maketitle 
+\input{invopamp_paper}
+
+\bibliographystyle{plain}
+\bibliography{../vmgbibliography,../mybib}
+
+\today
+\end{document}