Improved documentation makefile, removed svn.sty, fixed LaTeX penalties.
--- a/documentation/Makefile Mon Sep 25 15:55:46 2006 +0000
+++ b/documentation/Makefile Mon Sep 25 16:02:07 2006 +0000
@@ -8,100 +8,30 @@
FILE := ethercat_doc
-DVI_DEPEND := images/*.eps
-PDF_DEPEND := images/*.pdf
-
LATEX_OPTIONS := -file-line-error-style
-LATEX_CMD := latex $(LATEX_OPTIONS) \\nonstopmode\\input{$(FILE).tex}
-PDFLATEX_CMD := pdflatex $(LATEX_OPTIONS) $(FILE)
-
#------------------------------------------------------------------------------
-dvi: $(FILE).dvi
-
-pdf: $(FILE).pdf
+first: pdf
all: dvi pdf
-$(FILE).dvi: $(FILE).tex $(DVI_DEPEND)
- @if [ ! -f $(FILE).toc ]; then touch $(FILE).toc; fi
- @if [ ! -f $(FILE).idx ]; then touch $(FILE).idx; fi
- @if [ ! -f $(FILE).glo ]; then touch $(FILE).glo; fi
- @cp $(FILE).toc $(FILE).toc.bak
- @cp $(FILE).idx $(FILE).idx.bak
- @cp $(FILE).glo $(FILE).glo.bak
- $(LATEX_CMD)
- @count=5; \
- while (grep -s 'cross-references' $(FILE).log || \
- ! diff -q $(FILE).toc $(FILE).toc.bak) && \
- [ $$count -gt 0 ]; \
- do \
- cp $(FILE).toc $(FILE).toc.bak; \
- $(LATEX_CMD); \
- count=`expr $$count - 1`; \
- done
- @rerunlatex=0
- @if ! diff -q $(FILE).idx $(FILE).idx.bak; then \
- echo "Rebuilding Index"; \
- makeindex $(FILE); \
- rerunlatex=1; \
- fi
- @if ! diff -q $(FILE).glo $(FILE).glo.bak; then \
- echo "Rebuilding Glossary"; \
- makeindex $(FILE).glo -s nomencl.ist -o $(FILE).gls; \
- rerunlatex=1; \
- fi
- @if [ ! $$rerunlatex ]; then \
- echo "Re-running LaTeX..."; \
- $(LATEX_CMD); \
- fi
- @rm -f $(FILE).toc.bak
- @rm -f $(FILE).idx.bak
- @rm -f $(FILE).glo.bak
+dvi:
+ latex $(LATEX_OPTIONS) \\nonstopmode\\input{$(FILE).tex}
-$(FILE).pdf: $(FILE).tex $(PDF_DEPEND)
- @if [ ! -f $(FILE).toc ]; then touch $(FILE).toc; fi
- @if [ ! -f $(FILE).idx ]; then touch $(FILE).idx; fi
- @if [ ! -f $(FILE).glo ]; then touch $(FILE).glo; fi
- @cp $(FILE).toc $(FILE).toc.bak
- @cp $(FILE).idx $(FILE).idx.bak
- @cp $(FILE).glo $(FILE).glo.bak
- $(PDFLATEX_CMD)
- @count=5; \
- while (grep -s 'cross-references' $(FILE).log || \
- ! diff -q $(FILE).toc $(FILE).toc.bak) && \
- [ $$count -gt 0 ]; \
- do \
- cp $(FILE).toc $(FILE).toc.bak; \
- $(PDFLATEX_CMD); \
- count=`expr $$count - 1`; \
- done
- @rerunlatex=0
- @if ! diff -q $(FILE).idx $(FILE).idx.bak; then \
- echo "Rebuilding Index"; \
- makeindex $(FILE); \
- rerunlatex=1; \
- fi
- @if ! diff -q $(FILE).glo $(FILE).glo.bak; then \
- echo "Rebuilding Glossary"; \
- makeindex $(FILE).glo -s nomencl.ist -o $(FILE).gls; \
- rerunlatex=1; \
- fi
- @if [ ! $$rerunlatex ]; then \
- echo "Re-running LaTeX..."; \
- $(PDFLATEX_CMD); \
- fi
- @rm -f $(FILE).toc.bak
- @rm -f $(FILE).idx.bak
- @rm -f $(FILE).glo.bak
+pdf:
+ pdflatex $(LATEX_OPTIONS) $(FILE)
+
+index:
+ makeindex $(FILE)
+ makeindex $(FILE).glo -s nomencl.ist -o $(FILE).gls
clean:
@rm -f $(FILE).aux $(FILE).dvi $(FILE).idx \
- $(FILE).ilg $(FILE).ind $(FILE).log \
- $(FILE).out $(FILE).pdf $(FILE).ps \
- $(FILE).toc $(FILE).lot $(FILE).lof \
- $(FILE).lol $(FILE).glo $(FILE).gls \
- images/*.bak *~
+ $(FILE).ilg $(FILE).ind $(FILE).log \
+ $(FILE).out $(FILE).pdf $(FILE).ps \
+ $(FILE).toc $(FILE).lot $(FILE).lof \
+ $(FILE).lol $(FILE).glo $(FILE).gls \
+ images/*.bak *~
#------------------------------------------------------------------------------
--- a/documentation/ethercat_doc.tex Mon Sep 25 15:55:46 2006 +0000
+++ b/documentation/ethercat_doc.tex Mon Sep 25 16:02:07 2006 +0000
@@ -17,7 +17,7 @@
\usepackage{svn}
\usepackage{textcomp}
\usepackage{url}
-\usepackage{hyperref}
+\usepackage[pdfpagelabels,plainpages=false]{hyperref}
\setlength{\parskip}{0.8ex plus 0.8ex minus 0.5ex}
\setlength{\parindent}{0mm}
--- a/documentation/svn.sty Mon Sep 25 15:55:46 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-%%
-%% This is file `svn.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% svn.dtx (with options: `package')
-%%
-%% This is a generated file.
-%%
-%% Copyright (C) 2003 by Richard Lewis <rpil+svn@rtf.org.uk>
-%%
-%% This file may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.2 of this
-%% license or (at your option) any later version. The latest version
-%% of this license is in:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% and version 1.2 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
-%%
-\NeedsTeXFormat{LaTeX2e}
-\def\next $Id: #1 #2 #3-#4-#5 #6${%
- \def\svn@date{#3/#4/#5}%
- \def\svn@revision{#2}%
-}
-\next $Id: svn.dtx 32 2003-09-21 19:08:50Z rpil2 $
-\edef\next{%
- \noexpand\ProvidesPackage{svn}[\svn@date\space r\svn@revision\space
- Typeset Subversion keywords.]%
-}
-\next
-\def\SVN $#1${\svn@$#1: $}
-\let\SVNempty\relax
-\def\svn@$#1: #2${%
- \def\svn@tmp{#2}%
- \ifx\svn@tmp\@empty
- \def\svn@suffix{@unexpanded}%
- \else
- \def\svn@suffix{@expanded}%
- \fi
- \@ifundefined{SVN@#1\svn@suffix}%
- {\@nameuse{SVN@generic\svn@suffix}{#1}{#2}}%
- {\@nameuse{SVN@#1\svn@suffix}{#1}{#2}}%
-}
-\def\SVN@generic@expanded#1#2{%
- \expandafter\svn@set\csname SVN#1\endcsname$#2$%
-}
-\def\SVN@generic@unexpanded#1#2{%
- \expandafter\global\expandafter\let\csname SVN#1\endcsname\SVNempty
-}
-\def\svn@set#1$#2 : ${\gdef#1{#2}}
-\def\SVN@Date@unexpanded#1#2{%
- \gdef\SVNDate{\today}%
- \global\let\SVNTime\SVNempty
- \global\let\SVNRawDate\SVNempty
-}
-\let\SVN@LastChangedDate@unexpanded\SVN@Date@unexpanded
-\def\SVN@Date@expanded#1#2{%
- \svn@set\SVNRawDate$#2$%
- \svn@parse@date$#2$%
-}
-\let\SVN@LastChangedDate@expanded\SVN@Date@expanded
-\def\svn@parse@date$#1-#2-#3 #4:#5:#6 #7${%
- \gdef\SVNDate{%
- \begingroup
- \def\svn@tmp{\PackageError{svn}{\SVNDate should not
- be used in an \protect\edef}{See the svn.sty documentation for a
- work around.}}%
- \day#3 \month#2 \year#1
- \today
- \endgroup}%
- \gdef\SVNTime{#4:#5:#6}%
-}
-\def\SVNdate $#1${\SVN $#1$\date{\SVNDate}}
-\endinput
-%%
-%% End of file `svn.sty'.