Merge aba5f16 into 89bf27b

OpenCMISS · Feb 17, 2018 · 93145b4 · 93145b4
2 parents 89bf27b + aba5f16
commit 93145b4
Show file tree

Hide file tree

Showing 32 changed files with 1,384 additions and 12,272 deletions.
diff --git a/cmake/Sources.cmake b/cmake/Sources.cmake
@@ -9,8 +9,6 @@ set(IRON_HEADERS
     external_dae_solver_routines.h
     FieldExport.h
     FieldExportConstants.h
-    macros.h
-    dllexport.h
 )
 set(IRON_Fortran_SRC
     advection_diffusion_equation_routines.f90
@@ -154,4 +152,4 @@ foreach(varname ${FIXPATH_VARS})
 endforeach()
 
 # Set combined sources variable
-set(IRON_SRC ${IRON_C_SRC} ${IRON_Fortran_SRC})
+set(IRON_SRC ${IRON_C_SRC} ${IRON_Fortran_SRC})
diff --git a/doc/latex/Makesvgs b/doc/latex/Makesvgs
@@ -12,18 +12,13 @@ INKSCAPE=inkscape
 
 SHELL=/bin/bash
 
-.SUFFIXES:	.pdf .ps .eps .tex .pdf_tex .ps_tex .eps_tex .svg
+.SUFFIXES:	.pdf .eps .tex .pdf_tex .eps_tex .svg
 
-#all	:	all_pdf_tex
-#all	:	all_ps_tex
 all	:	all_eps_tex
 
 .svg.pdf:
 	( cd ${@D} ; ${INKSCAPE} -D -z --export-pdf=${@F} ${*F}.svg )
 
-.svg.ps:
-	( cd ${@D} ; ${INKSCAPE} -D -z --export-ps=${@F} ${*F}.svg )
-
 .svg.eps:
 	( cd ${@D} ; ${INKSCAPE} -D -z --export-eps=${@F} ${*F}.svg )
 
@@ -33,24 +28,17 @@ all	:	all_eps_tex
 .svg.pdf_tex:	
 	( cd ${@D} ; ${INKSCAPE} -D -z --export-pdf=${*F}.pdf --export-latex ${*F}.svg ; sed -f ${OPENCMISS_ROOT}/cm/doc/latex/Strip_pdftex_svgs ${@F} | sed s%CUR_DIR%${@D}% | sed s%=svgs/./%=svgs/% | sed s%=svgs//%=svgs/% | sed s%{svgs/./%{svgs/% | sed s%{svgs//%{svgs/% > ${*F}.tmp ; mv ${*F}.tmp ${@F} )
 
-.svg.ps_tex:	
-	( cd ${@D} ; ${INKSCAPE} -D -z --export-ps=${*F}.ps --export-latex ${*F}.svg ; sed -f ${OPENCMISS_ROOT}/cm/doc/latex/Strip_pdftex_svgs ${@F} | sed s%CUR_DIR%${@D}% | sed s%=svgs/./%=svgs/% | sed s%=svgs//%=svgs/% | sed s%{svgs/./%{svgs/% | sed s%{svgs//%{svgs/% > ${*F}.tmp ; mv ${*F}.tmp ${@F} )
-
 .svg.eps_tex:	
-	( cd ${@D} ; ${INKSCAPE} -D -z --export-eps=${*F}.eps --export-latex ${*F}.svg ; sed -f ${OPENCMISS_ROOT}/cm/doc/latex/Strip_epstex_svgs ${@F} | sed s%CUR_DIR%${@D}% | sed s%=svgs/./%=svgs/% | sed s%=svgs//%=svgs/% | sed s%{svgs/./%{svgs/% | sed s%{svgs//#%{svgs/% > ${*F}.tmp ; mv ${*F}.tmp ${@F} )
+	( cd ${@D} ; ${INKSCAPE} -D -z --export-eps=${*F}.eps --export-latex ${*F}.svg ; sed -f ${OPENCMISS_ROOT}/cm/doc/latex/Strip_epstex_svgs ${@F} | sed s%CUR_DIR%${@D}% | sed s%=svgs/./%=svgs/% | sed s%=svgs//%=svgs/% | sed s%{svgs/./%{svgs/% | sed s%{svgs//%{svgs/% > ${*F}.tmp ; mv ${*F}.tmp ${@F} )
 
 all_pdf_tex:
 	@${OPENCMISS_ROOT}/cm/doc/latex/call_makefile.sh ${OPENCMISS_ROOT}/cm/doc/latex/Makesvgs pdf_tex `find . -name "*.svg" -print`
 
-all_ps_tex:
-	@${OPENCMISS_ROOT}/cm/doc/latex/call_makefile.sh ${OPENCMISS_ROOT}/cm/doc/latex/Makesvgs ps_tex `find . -name "*.svg" -print`
-
 all_eps_tex:
 	@${OPENCMISS_ROOT}/cm/doc/latex/call_makefile.sh ${OPENCMISS_ROOT}/cm/doc/latex/Makesvgs eps_tex `find . -name "*.svg" -print`
 
 clean:
 	find . -name "*.pdf_tex" -exec rm -f {} \;
-	find . -name "*.ps_tex" -exec rm -f {} \;
 	find . -name "*.eps_tex" -exec rm -f {} \;
 
 clobber:	clean

diff --git a/doc/latex/abbreviations.tex b/doc/latex/abbreviations.tex
@@ -45,11 +45,12 @@
 %
 % Latin abbreviations
 %
-\newcommand{\eg}{\emph{e.g.,}\xspace} % e.g.,
+\newcommand{\Dr}{Dr\xspace} % Dr
+\newcommand{\eg}{\emph{e.g.,}\xspace} % e.g.
 \newcommand{\apriori}{\emph{a priori}\xspace} % a priori
-\newcommand{\etal}{\emph{et al.}\xspace} % et al.
+\newcommand{\etal}{\emph{et al.}\xspace} % et. al.
 \newcommand{\etc}{\emph{etc.}\xspace} % etc.
-\newcommand{\ie}{\emph{i.e.,}\xspace} % i.e.,
+\newcommand{\ie}{\emph{i.e.,}\xspace} % i.e.
 \newcommand{\nb}{\emph{n.b.}\xspace} % n.b.
 \newcommand{\cf}{\emph{cf.}\xspace} % cf. confer
 %

diff --git a/doc/latex/defns.tex b/doc/latex/defns.tex
@@ -1,4 +1,3 @@
-\usepackage{etex} %increase the size of fixed (register) arrays
 \usepackage{epic}  %package for epic 
 \usepackage{eepic} %package for extended epic
 \def\tenrm{}