Fix some bugs in the dynamic engraver and PostScript backend

Author: erlendaasland

ChangeLog

@@ -8,8 +8,8 @@
 	Those deserving special mentioning (in no particular order):
 Esther, Marijke, Heike, Inge, Judith, Hannah, Auke, Ilse, Evelyn,
 Maartje, Suzanne, Ilse (gee, again?), Marieke, Irene, Martine, Idwine,
-Hanna, Lonneke, Elisha, Anna, Janneke and last (but certainly not
-least) Janneke!
+Hanna, Lonneke, Elisha, Anna and last (but certainly not least)
+Janneke!
 
 	HWN
 

DEDICATION

@@ -1,7 +1,7 @@
 depth = ..
 
 NAME = documentation
-SUBDIRS=user bibliography pictures topdocs misc
+SUBDIRS=user bibliography pictures topdocs  misc
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'

Documentation/GNUmakefile

@@ -4,7 +4,7 @@ NAME = documentation
 
 STEPMAKE_TEMPLATES=documentation  texinfo
 
-TEXTS = $(call src-wildcard,ANNOUNCE-*[0-9]) $(call src-wildcard,CHANGES-*[0-9]) $(call src-wildcard,ChangeLog*[0-9]) $(call src-wildcard,NEWS-*[0-9])
+TEXTS = $(wildcard ANNOUNCE-*[0-9]) $(wildcard CHANGES-*[0-9]) $(wildcard ChangeLog*[0-9]) $(wildcard NEWS-*[0-9])
 EXTRA_DIST_FILES = $(TEXTS)
 
 include $(depth)/make/stepmake.make

Documentation/misc/GNUmakefile

@@ -1,7 +1,7 @@
 depth = ../..
 
 STEPMAKE_TEMPLATES=documentation
-XPM_FILES=$(call src-wildcard,*.xpm)
+XPM_FILES=$(wildcard *.xpm)
 EXTRA_DIST_FILES= $(XPM_FILES)
 
 lilypond-icon = $(outdir)/lilypond.ico

Documentation/pictures/GNUmakefile

@@ -13,4 +13,3 @@ endif
 
 $(outdir)/NEWS.nexi: NEWS.tely
 
-

Documentation/topdocs/GNUmakefile

@@ -66,165 +66,6 @@ which scares away people.
 
 @end ignore
 
-@item Calculation of note head durations is now softcoded. 
-
-@lilypond[relative=1,fragment,ragged-right]
-  %% use half heads for whole notes.
-  \override NoteHead #'duration-log = 1                                         
-  c1 c2 c4 c8[ c16 c]
-@end lilypond
-
-
-@c Please insert any new material above this line.  -gp
-
-@item Chords can now be partially tied,
-
-@lilypond[ragged-right,relative,fragment]
-<c~ e g~ b>  <c e g b>
-@end lilypond
-
-This feature was sponsored by Steve Doonan.
-
-@item Lyric extenders now have tunable padding.
-
-This feature was sponsored by David Griffel.
-
-@item
-Instrument changes are better supported: names in the margin can be
-changed half-way during a staff, and cues are printed automatically.
-
-This feature was sponsored by Kieren MacMillan.
-
-@item
-Barlines can be dashed now,
-
-@lilypond[relative,ragged-right,fragment]
-c4 \bar "dashed" c4
-@end lilypond
-
-This feature was sponsored by Kieren MacMillan.
-
-@item
-Grace notes may be forced to use floating spacing, 
-
-@lilypond[relative=2,ragged-right]
-<<
-  \override Score.SpacingSpanner  #'strict-grace-spacing = ##t
-  \new Staff {
-     c'4
-     \afterGrace
-     c'4
-     { c'16[ c'8 c'16] }
-     c'4
-  }
-  \new Staff {
-     c'16[ c'16 c'16 c'16]
-     c'16[ c'16 c'16 c'16]
-     c'4
-  }
->>
-@end lilypond
-
-This feature was sponsored by Trevor Bača.
-
-
-@item
-Durations of grace notes are taken into account for spacing,
-
-@lilypond[relative=2,ragged-right,fragment]
-  c
-  \grace { c8[ c16 d c8]  }
-  c
-@end lilypond
-
-This feature was sponsored by Trevor Bača.
-
-@item
-Tuplet brackets can be made to run to prefatory matter or
-the next note
-
-@lilypond[ragged-right]
-\new RhythmicStaff {
-  \set tupletFullLength = ##t
-  \time 4/4
-  \times 4/5 {
-    c4 c1
-  }
-  \set tupletFullLengthNote = ##t
-  \time 2/4
-  \times 2/3 {
-    c4 c c 
-  }
-  \time 3/4
-  c4 
-}
-@end lilypond
-
-
-This feature was sponsored by Trevor Bača.
-
-@item
-Falls and doits can be added to notes
-
-@lilypond[fragment,ragged-right,relative=2]
-\override Score.SpacingSpanner #'shortest-duration-space = #3.0
-c4-\bendAfter #+5
-c4-\bendAfter #-3
-@end lilypond
-
-This feature was sponsored by Anthony Youngman and Paul Scott.
-
-@item
-@code{lilypond-book} now includes support for PDF@TeX{}.
-
-This feature was sponsored by David Roundy. 
-
-@item
-Nested tuplets can have different formatting for each nesting level,
-
-@lilypond[ragged-right]
-\new Staff {
-  \time 5/4
-  \tweak #'text #tuplet-number::calc-fraction-text
-  \times 5/3 {
-     \tweak #'text  #tuplet-number::calc-denominator-text
-     \times 2/3 {
-        c'8[ c'8 c'8]
-     }
-     \times 2/3 {
-        c'8[ c'8 c'8]
-     }
-     \times 2/3 {
-        c'8[ c'8 c'8]
-     }
-  }
-}
-@end lilypond
-
-This feature was sponsored by Trevor Bača.
-
-
-@item
-New sections with different spacing parameters can be started with
-@code{newSpacingSection}.  This is useful when there are  
-sections with a different notions of long and short notes.
-
-In the following example, the time signature change introduces a new
-section, and hence the 16ths notes are spaced wider.
-
-@lilypond[relative,fragment]
-  \time 2/4
-  c4 c8 c 
-  c8 c c4 c16[ c c8] c4
-
-  \newSpacingSection
-  \time 4/16
-  c16[ c  c8]
-@end lilypond
-
-This feature was sponsored by Trevor Bača, Michael Meixner and Vivian
-Barty-Taylor.
-
 @item
 A new, automated testing technique has been added. It will detect
 changes in the formatting automatically, which will make it easier to
@@ -234,7 +75,7 @@ View @uref{../../test-results.html,test results}.
 
 @item
 Figured bass can also be added to @code{Staff} contexts directly. In
-this case, their vertical position is adjusted automatically.
+this case, their vertical  position is adjusted automatically.
 
 @lilypond[ragged-right,fragment]
 <<
@@ -337,13 +178,10 @@ support for feathered beaming,
   \override Beam #'grow-direction = #LEFT
   c16[
     c c c
-    c c c ]
+    c c c c ]
 }
 @end lilypond 
 
-Known bug: the \featherDuration command only works with very short music
-snippets.
-
 This feature was sponsored by Jamie Bullock.
 
 @item

Documentation/topdocs/NEWS.tely

@@ -2,24 +2,26 @@ depth=../..
 
 LATEX_FILES =$(call src-wildcard,*.latex)
 
+# todo: add latex.
+DVI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.dvi)
 
-EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt convert-ly.txt $(EPS_ILLUSTRATIONS)
+EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES) README.txt $(EPS_ILLUSTRATIONS)
 
 IMAGES=$(call src-wildcard,*.png)
 EPS_ILLUSTRATIONS=context-example.eps
-PDF_ILLUSTRATIONS=context-example.pdf
-
-OUT_PDF_IMAGES=$(IMAGES:%.png=$(outdir)/%.pdf) $(addprefix $(outdir)/,$(PDF_ILLUSTRATIONS))
 
-OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png)
+OUT_EPS_IMAGES=$(IMAGES:%.png=$(outdir)/%.eps) $(addprefix $(outdir)/,$(EPS_ILLUSTRATIONS))
+OUT_PNG_IMAGES=$(OUT_EPS_IMAGES:%.eps=%.png)
 
 OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
  $(ITELY_FILES:%.itely=$(outdir)/%.texi)
 HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%.html)\
  $(outdir)/lilypond-internals.html
 
-# todo: add latex.
-PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
+PS_FILES = $(DVI_FILES:.dvi=.ps)
+PDF_FILES = $(DVI_FILES:.dvi=.pdf)
+
+PS_GZ_FILES= $(addsuffix .gz, $(PS_FILES))
 
 INFO_DOCS = lilypond lilypond-internals music-glossary
 INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
@@ -36,6 +38,10 @@ export TEXINPUTS
 
 include $(depth)/make/stepmake.make
 
+dvi: $(DVI_FILES)
+
+ps: $(PS_FILES)
+
 info: $(INFO_FILES)
 
 pathsettings:
@@ -189,7 +195,7 @@ $(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internal
 	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$(outdir)/lilypond-internals --docbook $<
 
-$(outdir)/lilypond.pdf: $(OUT_PDF_IMAGES) $(OUT_PNG_IMAGES)
+$(outdir)/lilypond.dvi: $(OUT_EPS_IMAGES) $(OUT_PNG_IMAGES)
 
 $(outdir)/%.png: %.png
 	convert -geometry 50x50% $< $@
@@ -203,13 +209,6 @@ $(outdir)/%.eps: %.png
 $(outdir)/%.eps: %.eps
 	cp $< $@
 
-$(outdir)/%.pdf: %.png
-	convert $< $@
-
-$(outdir)/%.pdf: %.eps
-	gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<
-
-
 DEEP_HTML_FILES =\
  $(outdir)/lilypond/index.html\
  $(outdir)/lilypond-internals/index.html\

Documentation/user/GNUmakefile

@@ -1,7 +1,7 @@
 Info for Documentation
 ----------------------
 
-Current version of the manual: 2.9.13
+Current version of the manual: 2.8.0
 *** Please update this whenever you run convert-ly on the docs.
 
 convert-ly --from=... --to=... --no-version *.itely
@@ -41,10 +41,10 @@ is writtin in formal technical writing style.
 GENERAL GUIDELINES
 
 * Do not forget to create @cindex entries for new sections of text.
-  Enter commands with @funindex, i.e.
-  @funindex \relative
-  do not bother with the @code{} (they are added automatically).  These
-  items are added to both the command index and the unified index.
+Enter commands with @funindex, i.e.
+@funindex \relative
+do not bother with the @code{} (they are added automatically).  These
+items are added to both the command index and the unified index.
 
 * The use of the word `illegal' is inappropriate in most cases.  Say
   `invalid' instead.

Documentation/user/README.txt

@@ -3,26 +3,23 @@
 import os
 import string
 
-Import ('env', 'base_glob', 'src_glob')
+Import ('env', 'base_glob')
 tely = base_glob ('*.tely')
-png = src_glob ('*.png') + map (env.EPS2PNG, base_glob ('*.eps'))
+png = base_glob ('*.png')
 
 # We need lily and mf to build these.
 env.Depends ('lilypond.texi', ['#/lily', '#/mf', '#/python'])
 env.Depends ('music-glossary.texi', ['#/lily', '#/mf', '#/python'])
 
 env.Depends ('lilypond.texi', 'lilypond-internals.texi')
 
-eps = src_glob ('*.eps') + map (env.PNG2EPS, base_glob ('*.png'))
-env.Depends ('lilypond.texi', eps + png)
+eps = map (env.PNG2EPS, png)
+env.Depends ('lilypond.texi', eps)
 
-lilypond_book_flags = '''--format=$LILYPOND_BOOK_FORMAT --process="lilypond -I$srcdir/input/manual/ $__verbose --backend=eps --formats=ps,png --header=texidoc -dcheck-internal-types -ddump-signatures -danti-alias-factor=2 -dgs-load-fonts" '''
 e = env.Copy (
-#	LILYPOND_BOOK_FLAGS = '''--process="lilypond --backend=eps --formats=ps,png --header=texidoc -I#/input/manual -e '(ly:set-option (quote internal-type-checking) \#t)'"''',
-	LILYPOND_BOOK_FLAGS = lilypond_book_flags,
+	LILYPOND_BOOK_FLAGS = '''--process="lilypond --backend=eps --formats=ps,png --header=texidoc -I#/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'"''',
 	__verbose = ' --verbose',
 	GENERATE_DOCUMENTATION = '$srcdir/ly/generate-documentation',
-	## TEXI2DVI_FLAGS = ['-I#Documentation/user'],
 	)
 
 e.Command ('lilypond-internals.texi', ['#/lily', '#/mf', '#/python'],