* Documentation/user/GNUmakefile (DVIPS_PAPERSIZE): set A4 paper

for texinfo and dvips. This fixes problems with PDF output of the
wrong size.

* stepmake/stepmake/tex-rules.make ($(outdir)/%.ps): add
DVIPS_PAPERSIZE variable

* stepmake/stepmake/texinfo-rules.make ($(outdir)/%.dvi): add
TEXINFO_PAPERSIZE variable

diff --git a/ChangeLog b/ChangeLog
index 0b53e6a739c4661c53fb7b98a5efd037af04c9dc..f6507d161471c0d9caf1925d26dce793da0e963c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-07-20  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * Documentation/user/GNUmakefile (DVIPS_PAPERSIZE): set A4 paper
+       for texinfo and dvips. This fixes problems with PDF output of the
+       wrong size.
+
+       * stepmake/stepmake/tex-rules.make ($(outdir)/%.ps): add
+       DVIPS_PAPERSIZE variable
+
+       * stepmake/stepmake/texinfo-rules.make ($(outdir)/%.dvi): add
+       TEXINFO_PAPERSIZE variable 
+
 2003-07-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * mf/feta-macros.mf: whoops: only draw lines for test situations.

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 409ca8ec2375ac850307cae47573730f33ec67ce..06d695ac8efdaafdc30808f455d70ef69a4a452e 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -28,6 +28,9 @@ STEPMAKE_TEMPLATES=tex texinfo omf documentation
 
 OMF_FILES += $(outdir)/lilypond-internals.html.omf
 
+TEXINFO_PAPERSIZE = @afourpaper
+DVIPS_PAPERSIZE = a4
+
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
 

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index ea10699c22425744dbef1ed5da013d886f714f0b..92affee6ab5d977bdd68a13703524217d5b4b5ab 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -105,8 +105,8 @@ look.  Our flat symbol is designed after, among others, this one.  It
 is tuned it to harmonize with the thickness of our staff lines, which
 are also much thicker than Henle's lines.
 
-@multitable @columnfractions  .4 .3 .3
-@item 
+@multitable @columnfractions  .1 .3 .3 .3
+@item  @tab
 @iftex
 @image{henle-flat-bw,4cm}
 @end iftex

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index a3fd84272ab7625155073ca46cf9d7599dc9ca75..8721456b9fd384ad63f5e3e1c080f9a4456c1f20 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -2,6 +2,7 @@
 @setfilename lilypond.info
 @settitle GNU LilyPond
 
+
 @html
 <!--- @@WEB-TITLE@@=User Manual --->
 @end html

diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index ebcb609aa662db653ba17108c07c20a06d132b75..e9647a3355bac38a7c1f3bd31df6240a8e815e5e 100644 (file)
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -30,7 +30,8 @@ rewrite the chord name support.
 @c TODO [wie meer?]  
 
 Han-Wen and Jan, 
-Utrecht/Eindhoven, April/May 2003.
+
+Utrecht/Eindhoven, The Netherlands, April/May 2003.
 
 @node Preface to version 1.6
 @unnumberedsec Preface to version 1.6

diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make
index 6a8c78b764f1738f048b1c4e5a1a53805c9f78e4..482957c5585f07011bc0423855feb639c058cb3b 100644 (file)
--- a/stepmake/stepmake/tex-rules.make
+++ b/stepmake/stepmake/tex-rules.make
@@ -13,8 +13,9 @@ $(outdir)/%.dvi: $(outdir)/%.latex
          (makeindex $(basename $(<F)) || true) && \
          latex \\nonstopmode \\input $(<F) )
 
+
 $(outdir)/%.ps: $(outdir)/%.dvi
-       cd $(outdir) && dvips -ta4 -o $(@F) $(<F)
+       cd $(outdir) && dvips -t $(DVIPS_PAPERSIZE) -o $(@F) $(<F)
 
 $(outdir)-$(PAPERSIZE)/%.ps: $(outdir)-$(PAPERSIZE)/%.dvi
        cd $(outdir)-$(PAPERSIZE) && dvips -t$(PAPERSIZE) -o $(@F) $(<F)

diff --git a/stepmake/stepmake/tex-vars.make b/stepmake/stepmake/tex-vars.make
index 6466cfdce56887b39954e518dd57513e60298f75..e417f4ab7afa3ca115d6cdbe5001af45bb53677b 100644 (file)
--- a/stepmake/stepmake/tex-vars.make
+++ b/stepmake/stepmake/tex-vars.make
@@ -1,2 +1,5 @@
 
 export TEXPICTS:=$(outdir)$(PATHSEP)$(TEXPICTS)
+
+# better not define DVIPS_PAPERSIZE here,
+# since it must be synched with the texinfo setting.

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 426045a04178056adf63e739f7da85728af0d46f..9c96e0990b6374e4d0d0d9c58715b2b762493c3a 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -26,7 +26,7 @@ $(outdir)/%/%.html: $(outdir)/%.texi
        $(deep-footify) $(sort $(wildcard $(outdir)/$(*F)/*.html))
 
 $(outdir)/%.dvi: $(outdir)/%.texi
-       cd $(outdir); texi2dvi --batch $(<F)
+       cd $(outdir); texi2dvi --batch -t $(TEXINFO_PAPERSIZE) $(<F)
 
 $(outdir)/%.txt: $(outdir)/%.texi
        $(MAKEINFO) -I $(pwd) -I $(outdir) --no-split --no-headers --output $@ $<