Author: dylan
Date: 2004-08-07 15:53:02 -0400 (Sat, 07 Aug 2004)
New Revision: 336
Added:
branches/protocol-v4/docs/manual/config.m4
branches/protocol-v4/web/images/1000-things.JPG
branches/protocol-v4/web/images/debian-powered.png
branches/protocol-v4/web/images/dot.png
branches/protocol-v4/web/images/hope.png
branches/protocol-v4/web/images/tt2-powered.png
branches/protocol-v4/web/images/valid-xhtml10.png
branches/protocol-v4/web/images/vim-created.png
Removed:
branches/protocol-v4/docs/manual/config.tex
Modified:
branches/protocol-v4/docs/manual/Makefile
branches/protocol-v4/docs/manual/haver.tex
branches/protocol-v4/docs/manual/macros.tex
Log:
Some documentation changes in the manual.
Latex is being a pain...
Added the images back to haver site. :)
Modified: branches/protocol-v4/docs/manual/Makefile
===================================================================
--- branches/protocol-v4/docs/manual/Makefile 2004-08-07 19:30:38 UTC (rev
335)
+++ branches/protocol-v4/docs/manual/Makefile 2004-08-07 19:53:02 UTC (rev
336)
@@ -1,15 +1,21 @@
export RERUN=Rerun to get cross-references right
-CLEAN=-name '*.aux' \
+clean=-name '*.aux' \
-or -name '*.log' \
-or -name '*.bbl' \
-or -name '*.blg' \
- -or -name '*.toc'
+ -or -name '*.toc' \
+ -or -name 'config.tex'
+base=haver
+tex=$(wildcard chap/*.tex) $(filter-out haver.tex,$(wildcard *.tex)) haver.bib
+have=
+defhave=$(patsubst %,-D %,$(have))
-base=haver
-tex=$(wildcard chap/*.tex) $(wildcard *.tex)
+ifdef DRAFT
+have += DRAFT
+endif
all:
@echo "Probably you want to run make pdf or make dvi or make html"
@@ -23,33 +29,33 @@
clean:
- find . \( $(CLEAN) \) -exec rm -v {} \;
+ find . \( $(clean) \) -exec rm -v {} \;
+
realclean:
-rm $(base).dvi $(base).pdf
-$(base).dvi: $(base).tex $(tex) $(base).bbl
- latex $< | tee dvi.log
- -grep -q "$$RERUN" dvi.log && latex $<
- rm dvi.log
+$(base).dvi: have += DVI
+$(base).dvi: $(base).tex $(tex)
+ m4 $(defhave) config.m4 > config.tex
+ latex $<
+ bibtex $(base)
+ latex $<
+ latex $<
+
-$(base).bbl: $(base).bib
- -if [ ! -e $(base).aux ]; then \
- latex $(base).tex; \
- rm $(base).dvi; \
- fi
+$(base).pdf: have += PDF
+$(base).pdf: $(base).tex $(tex)
+ m4 $(defhave) config.m4 > config.tex
+ pdflatex $<
bibtex $(base)
+ pdflatex $<
+ pdflatex $<
-
-$(base).pdf: $(base).tex $(tex) $(base).bbl
- pdflatex $< | tee pdf.log
- -grep -q "$$RERUN" pdf.log && pdflatex $<
- rm pdf.log
-
-
-$(base)/$(base).html: $(base).tex $(tex) $(base).bbl
+$(base)/$(base).html: have += HTML
+$(base)/$(base).html: $(base).tex $(tex)
latex2html -local_icons -split 3 $<
.PHONY: all clean dvi
Copied: branches/protocol-v4/docs/manual/config.m4 (from rev 334,
branches/protocol-v4/docs/manual/config.tex)
===================================================================
--- branches/protocol-v4/docs/manual/config.tex 2004-08-04 05:50:46 UTC (rev
334)
+++ branches/protocol-v4/docs/manual/config.m4 2004-08-07 19:53:02 UTC (rev
336)
@@ -0,0 +1,8 @@
+define(`have', `dnl
+\newboolean{have$1}
+\setboolean{have$1}{ifdef(`$1', `true', `false')}')dnl
+
+have(`COLOR')
+have(`DRAFT')
+have(`LINKS')
+have(`PDF')
Deleted: branches/protocol-v4/docs/manual/config.tex
===================================================================
--- branches/protocol-v4/docs/manual/config.tex 2004-08-07 19:30:38 UTC (rev
335)
+++ branches/protocol-v4/docs/manual/config.tex 2004-08-07 19:53:02 UTC (rev
336)
@@ -1,11 +0,0 @@
-\newboolean{COLOR}
-\newboolean{DRAFT}
-\newboolean{URL}
-\newboolean{PDF}
-
-\setboolean{COLOR}{true}
-\setboolean{DRAFT}{true}
-\setboolean{URL}{true}
-
-
-ifdef(`PDF', `\setboolean{PDF}{true}', `\setboolean{PDF}{false}')
Modified: branches/protocol-v4/docs/manual/haver.tex
===================================================================
--- branches/protocol-v4/docs/manual/haver.tex 2004-08-07 19:30:38 UTC (rev
335)
+++ branches/protocol-v4/docs/manual/haver.tex 2004-08-07 19:53:02 UTC (rev
336)
@@ -6,8 +6,8 @@
\input{macros}
\ifhas{COLOR}{\usepackage{color}}
-\ifhas{URL}{\usepackage{url}}
-\ifhas{PDF}{\usepackage[pdftex]{hyperref}}
+\usepackage{url}
+%\ifhas{PDF}{\usepackage[pdftex]{hyperref}}
\input{style}
Modified: branches/protocol-v4/docs/manual/macros.tex
===================================================================
--- branches/protocol-v4/docs/manual/macros.tex 2004-08-07 19:30:38 UTC (rev
335)
+++ branches/protocol-v4/docs/manual/macros.tex 2004-08-07 19:53:02 UTC (rev
336)
@@ -1,7 +1,7 @@
\newcommand{\ifhas}[2]{%
-\ifthenelse{\boolean{#1}}{#2}{ }%
+\ifthenelse{\boolean{have#1}}{#2}{ }%
}
\newcommand{\ifhaselse}[3]{%
-\ifthenelse{\boolean{#1}}{#2}{#3}%
+\ifthenelse{\boolean{have#1}}{#2}{#3}%
}
Added: branches/protocol-v4/web/images/1000-things.JPG
===================================================================
(Binary files differ)
Property changes on: branches/protocol-v4/web/images/1000-things.JPG
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/protocol-v4/web/images/debian-powered.png
===================================================================
(Binary files differ)
Property changes on: branches/protocol-v4/web/images/debian-powered.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/protocol-v4/web/images/dot.png
===================================================================
(Binary files differ)
Property changes on: branches/protocol-v4/web/images/dot.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/protocol-v4/web/images/hope.png
===================================================================
(Binary files differ)
Property changes on: branches/protocol-v4/web/images/hope.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/protocol-v4/web/images/tt2-powered.png
===================================================================
(Binary files differ)
Property changes on: branches/protocol-v4/web/images/tt2-powered.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/protocol-v4/web/images/valid-xhtml10.png
===================================================================
(Binary files differ)
Property changes on: branches/protocol-v4/web/images/valid-xhtml10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/protocol-v4/web/images/vim-created.png
===================================================================
(Binary files differ)
Property changes on: branches/protocol-v4/web/images/vim-created.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
