Move most of the (duplicated) latex headers into cactus.sty.

Fix typos in template.tex.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@3295 17b73243-c579-4c4c-a9d2-2d5706c11dac

3 files changed, 34 insertions, 32 deletions

diff --git a/doc/ThornGuide/Makefile b/doc/ThornGuide/Makefile
index 05f80cd5..332d2e72 100644
--- a/doc/ThornGuide/Makefile
+++ b/doc/ThornGuide/Makefile
@@ -43,58 +43,54 @@ IMAGE_FILE=$(CCTK_HOME)/doc/UsersGuide/bincactus2.eps
 default : $(MASTER_FILE).ps
 
 $(MASTER_FILE).ps: $(MASTER_FILE).dvi 
-	@echo "  Running dvips on $<"
+	@echo "  Running dvips on $<...."
 	dvips -f $< 2> LOG_DVIPS_MSGS | $(CCTK_HOME)/lib/sbin/FixPageNumbersInPostscript.pl > $@ 
 	if test -e "$@"; then                                  \
 	   echo "     $@ created.";                              \
 	else                                                   \
 	   echo "  Cannot find $@, an error must have occured."; \
-	fi ;                                                   
+	fi
 
 $(MASTER_FILE).dvi: $(MASTER_FILE).tex
-	@echo "  Latexing $<"
-	latex -interaction=nonstopmode $< > LOG_NULL 2>&1; \
-	latex -interaction=nonstopmode $< > LOG_NULL 2>&1; \
-	latex -interaction=nonstopmode $< > LOG_NULL 2>&1; \
-	latex -interaction=nonstopmode $< | grep -v Underfull | grep -v Overfull | grep -v OT1 > LOG_LATEX_MSGS 2>&1;  \
+	@echo "  Latexing $<...."
+	latex $< < /dev/null > LOG_LATEX_FULL_MSGS 2>&1
+	latex $< < /dev/null > LOG_LATEX_FULL_MSGS 2>&1
+	latex $< < /dev/null 2>&1 | tee LOG_LATEX_FULL_MSGS | grep -v Underfull | grep -v Overfull | grep -v OT1 > LOG_LATEX_MSGS
 	if test -e "$@"; then                                  \
 	   echo "     $@ created.";                              \
 	else                                                   \
 	   echo "  Cannot find $@, an error must have occured."; \
-	fi ;                                                   
+	fi
 
 $(MASTER_FILE).pdf: $(MASTER_FILE).tex
-	@echo "  Running pdflatex on $<"
-
-	pdflatex -interaction=nonstopmode $< > LOG_NULL 2>&1; \
-	pdflatex -interaction=nonstopmode $< > LOG_NULL 2>&1; \
-	pdflatex -interaction=nonstopmode $< > LOG_NULL 2>&1; \
-	pdflatex -interaction=nonstopmode $< | grep -v Underfull | grep -v Overfull | grep -v OT1 > LOG_PDFLATEX_MSGS 2>&1
-
+	@echo "  Running pdflatex on $<...."
+	pdflatex $< < /dev/null > LOG_PDFLATEX_MSGS 2>&1
+	pdflatex $< < /dev/null > LOG_PDFLATEX_MSGS 2>&1
+	pdflatex $< < /dev/null 2>&1 | grep -v Underfull | grep -v Overfull | grep -v OT1 > LOG_PDFLATEX_MSGS
 	if test -e "$@"; then                                  \
 	   echo "     $@ created.";                              \
 	else                                                   \
 	   echo "  Cannot find $@, an error must have occured."; \
-	fi ;                                                  
+	fi
 
 $(MASTER_FILE).tex:  $(foreach thorn, $(THORN_DEPENDENCIES), $(thorn)/param.ccl $(thorn)/interface.ccl $(thorn)/schedule.ccl) $(THORNLIST)
 	@echo "  Creating thorn documentation $(MASTER_FILE).tex"
-	@echo "    Processing ..."
-	@echo "       param.ccl ..."
+	@echo "    Processing...."
+	@echo "       param.ccl...."
 	$(PERL) -s $(CCTK_HOME)/lib/sbin/ParamLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section -grouping=bythorn -sort=scope > LOG_PARAMLATEX_MSGS 2>&1
-	@echo "       interface.ccl ..."
+	@echo "       interface.ccl...."
 	$(PERL) -s $(CCTK_HOME)/lib/sbin/InterLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section -grouping=bythorn > LOG_INTERLATEX_MSGS 2>&1
-	@echo "       schedule.ccl ..."
+	@echo "       schedule.ccl...."
 	$(PERL) -s $(CCTK_HOME)/lib/sbin/SchedLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section > LOG_SCHEDLATEX_MSGS 2>&1
-	@echo "  Creating $@ ..."
+	@echo "  Creating $@...."
 	$(PERL) -s $(CCTK_HOME)/lib/sbin/ThornGuide.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -outfile=$(MASTER_FILE).tex -tocdepth=$(TOCDEPTH) > LOG_THORNGUIDE_MSGS 2>&1
-	if test -e $(IMAGE_FILE) && test ! -e "bincactus.eps"; then \
-	   cp $(IMAGE_FILE) bincactus.eps;                          \
-	fi ; 
+	if test -e $(IMAGE_FILE) && test ! -e "bincactus2.eps"; then \
+	   cp $(IMAGE_FILE) .;                                       \
+	fi
 
 make.thornlist: $(THORNLIST) 
 	THORN_DEPENDENCIES=`$(PERL) -s $(CCTK_HOME)/lib/sbin/ThornList.pl -arrangements_dir=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST)`
 
 $(THORNLIST):
-	@echo "Creating $@ ..."
+	@echo "Creating $@...."
 	$(PERL) -s $(CCTK_HOME)/lib/sbin/ThornList.pl -arrangements_dir=$(ARRANGEMENTS_DIR) -thorns=$(THORNS) -arrangements=$(ARRANGEMENTS)> $@ 
diff --git a/doc/ThornGuide/cactus.sty b/doc/ThornGuide/cactus.sty
index 479e318f..fb686adb 100644
--- a/doc/ThornGuide/cactus.sty
+++ b/doc/ThornGuide/cactus.sty
@@ -2,6 +2,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NeedsTeXFormat{LaTeX2e}
 
+%%%
+%%% This file is outdated.  It is not intended to be used.
+%%% Please use ../latex/cactus.sty instead.
+%%%
+
 \def\CA@styledate{\CA@getcvsdate $Date$}
 \def\CA@styleversion{\CA@getcvsversion $Revision$}
 
@@ -38,6 +43,7 @@
 % Load in other packages.
 
 \RequirePackage{graphicx}
+\RequirePackage{hyperref}
 \RequirePackage{latexsym}
 \RequirePackage{amssymb}
 \RequirePackage{ifthen}
diff --git a/doc/ThornGuide/template.tex b/doc/ThornGuide/template.tex
index 49d68f69..4ea38dd4 100644
--- a/doc/ThornGuide/template.tex
+++ b/doc/ThornGuide/template.tex
@@ -8,7 +8,7 @@
 %  will be included in ThornGuides built with the Cactus make system.
 %  The scripts employed by the make system automatically include 
 %  pages about variables, parameters and scheduling parsed from the 
-%  relevent thorn CCL files.
+%  relevant thorn CCL files.
 %  
 %  This template contains guidelines which help to assure that your     
 %  documentation will be correctly added to ThornGuides. More 
@@ -19,7 +19,7 @@
 %       % START CACTUS THORNGUIDE",
 %     except for filling in the title, author, date etc. fields.
 %        - Each of these fields should only be on ONE line.
-%        - Author names should be sparated with a \\ or a comma
+%        - Author names should be separated with a \\ or a comma
 %   - You can define your own macros, but they must appear after
 %     the START CACTUS THORNGUIDE line, and must not redefine standard 
 %     latex commands.
@@ -29,12 +29,12 @@
 %       ARRANGEMENT_THORN_LABEL
 %     For example, an image wave.eps in the arrangement CactusWave and 
 %     thorn WaveToyC should be renamed to CactusWave_WaveToyC_wave.eps
-%   - Graphics should only be included using the graphix package. 
-%     More specifically, with the "includegraphics" command. Do
+%   - Graphics should only be included using the graphicx package. 
+%     More specifically, with the "\includegraphics" command.  Do
 %     not specify any graphic file extensions in your .tex file. This 
 %     will allow us (later) to create a PDF version of the ThornGuide
-%     via pdflatex. |
-%   - References should be included with the latex "bibitem" command. 
+%     via pdflatex.
+%   - References should be included with the latex "\bibitem" command. 
 %   - Use \begin{abstract}...\end{abstract} instead of \abstract{...}
 %   - Do not use \appendix, instead include any appendices you need as 
 %     standard sections. 
@@ -74,7 +74,7 @@
 % (Automatically used from Cactus distribution, if you have a 
 %  thorn without the Cactus Flesh download this from the Cactus
 %  homepage at www.cactuscode.org)
-\usepackage{../../../../doc/ThornGuide/cactus}
+\usepackage{../../../../doc/latex/cactus}
 
 \begin{document}