* [PATCH 1/2] zshguide: minimal fix for yodl 2.x
@ 2010-11-08 19:28 Andrey Borzenkov
2010-11-08 19:28 ` [PATCH 2/2] zshguide: Makefile fixes Andrey Borzenkov
0 siblings, 1 reply; 2+ messages in thread
From: Andrey Borzenkov @ 2010-11-08 19:28 UTC (permalink / raw)
To: zsh-workers
Yodl 2.x does not define XXparcounter, so workaround
by defining it locally. It does not seem to produce any
visible difference.
It still results in fair number of wornings (yodl 2.x seems
to be far more verbose by default) but it allows it to be built.
The rest of documentation builds as is.
The only difference I could notice is the lack of lower ruler
in HTML title page.
---
zshguide.yo | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/zshguide.yo b/zshguide.yo
index 68e321c..429c830 100755
--- a/zshguide.yo
+++ b/zshguide.yo
@@ -45,6 +45,11 @@ def(myeitd)(0)(\
whenlatex(eit())whenhtml(eit())whenman(eit())whenms(eit())whensgml(eit())\
whentxt(.))\
def(var)(1)(em(ARG1))\
+COMMENT(-- XXparcounter is not defined in yodl 2.x --)\
+IFDEF(XXparcounter)(\
+)(\
+ NEWCOUNTER(XXparcounter)\
+)\
COMMENT(-- without excess newlines in latex style --)\
UNDEFINEMACRO(verb)\
DEFINEMACRO(verb)(1)(\
--
1.7.3.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] zshguide: Makefile fixes
2010-11-08 19:28 [PATCH 1/2] zshguide: minimal fix for yodl 2.x Andrey Borzenkov
@ 2010-11-08 19:28 ` Andrey Borzenkov
0 siblings, 0 replies; 2+ messages in thread
From: Andrey Borzenkov @ 2010-11-08 19:28 UTC (permalink / raw)
To: zsh-workers
- there was very interesting effect of line continuation
on perl - as "\<new line>" was passed verbatim to perl, it was
apparently interpreted as reference to variable with name
<new line> resulting in
\documentclass[a4paper]{book}
SCALAR(0xd1b100)\usepackage[T1]{fontenc}
This is with perl 5.12.2. Patch makes sure continuation is
interpreted and stripped off by shell.
- "make web" was missing zshguide_us.pdf target
- add some more temp files to "clean" target
---
Makefile | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 83dd8a4..2fa0ec2 100755
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,9 @@ SRC_DIST = Makefile zshguide.yo $(CHAPTERS)
DTD = <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
.latex.pdf:
- while pdflatex $< | perl -pe '/should run.*again/ && $$run++; \
- /^LaTeX Warning:.*Rerun/ && $$run++; \
- eof && exit(!$$run);'; do true; done
+ while pdflatex $< | perl -pe '/should run.*again/ && $$run++; '\
+ '/^LaTeX Warning:.*Rerun/ && $$run++; '\
+ 'eof && exit(!$$run);'; do true; done
.yo.txt:
yodl2txt $<
@@ -48,19 +48,19 @@ PERLCOMMON = "\\usepackage[T1]{fontenc}\n", \
yodl2latex $<
cp $@ tmp.latex
perl -ne 'if (/^\\usepackage/) { \
- print "\\documentclass[a4paper]{book}\n", \
- "\\usepackage{a4wide}\n", $(PERLCOMMON)' \
+ print "\\documentclass[a4paper]{book}\n", '\
+ ' "\\usepackage{a4wide}\n", $(PERLCOMMON)' \
$@ > $@.tmp && mv $@.tmp $@
- perl -ne 'if (/^\\usepackage/) { \
- print "\\documentclass{book}\n", \
- $(PERLCOMMON)' \
+ perl -ne 'if (/^\\usepackage/) { '\
+ ' print "\\documentclass{book}\n", '\
+ ' $(PERLCOMMON)' \
tmp.latex > $*_us.latex
rm -f tmp.latex
.latex.dvi:
- if latex $< | perl -pe '/should run.*again/ && $$run++; \
- /^LaTeX Warning:.*Rerun/ && $$run++; \
- eof && exit(!$$run);'; then \
+ if latex $< | perl -pe '/should run.*again/ && $$run++; '\
+ '/^LaTeX Warning:.*Rerun/ && $$run++; '\
+ 'eof && exit(!$$run);'; then \
latex $<; \
fi
.dvi.ps:
@@ -73,7 +73,7 @@ all: zshguide.html zshguide.latex zshguide.txt zshguide.pdf \
zshguide.txt zshguide.html zshguide.latex: zshguide.yo $(CHAPTERS)
-zshguide.pdf zshguide.dvi: zshguide.latex
+zshguide.pdf zshguide_us.pdf zshguide.dvi: zshguide.latex
# zshguide.ps: zshguide.dvi
@@ -92,4 +92,6 @@ web: zshguide.html zshguide.latex zshguide.pdf zshguide_us.pdf
clean:
rm -f zshguide*.html zshguide*.txt zshguide*.tex zshguide*.latex \
- zshguide*.dvi zshguide.pdf zshguide*.ps zshguide.aux zshguide.toc
+ zshguide*.dvi zshguide.pdf zshguide*.ps zshguide.aux zshguide.toc \
+ zshguide*.log zshguide*.pdf *~ zshguide*.aux zshguide*.toc \
+ zshguide*.tmp tmp.latex
--
1.7.3.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-08 19:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-08 19:28 [PATCH 1/2] zshguide: minimal fix for yodl 2.x Andrey Borzenkov
2010-11-08 19:28 ` [PATCH 2/2] zshguide: Makefile fixes Andrey Borzenkov
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).