reverted unwanted commits

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index f446039c5c397acecf61dd1d3533424642264e0f..1bb72ecc824cdc5168a0464218708319090b6ac3 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -493,12 +493,12 @@ then set the
 
 @lilypond[fragment,verbatim]
 {
-%  \override Staff.TimeSignature #'font-name = #"Charter"
-%  \override Staff.TimeSignature #'font-size = #2
+  \override Staff.TimeSignature #'font-name = #"Charter"
+  \override Staff.TimeSignature #'font-size = #2
   \time 3/4
   c'1_\markup {
-%    \override #'(font-name . "Vera Bold")
-%      { This text is in Vera Bold }
+    \override #'(font-name . "Vera Bold")
+      { This text is in Vera Bold }
   }
 }
 @end lilypond

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 1daacd7932ba0cadc4f856099b8bdb08d92bf761..1dd53512b89e31d624b98b4fb1fdf4290da82911 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -24,7 +24,7 @@ ABC2LY = $(script-dir)/abc2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/
-#LILYPOND_BOOK_LILYPOND_FLAGS=-dgs-font-load
+LILYPOND_BOOK_LILYPOND_FLAGS=-dgs-font-load
 LILYPOND_BOOK_FLAGS = --process="$(LILYPOND_BINARY) --backend=eps --formats=ps,png --header=texidoc -I $(top-src-dir)/input/test -dinternal-type-checking -ddump-signatures -danti-alias-factor=2 $(LILYPOND_BOOK_LILYPOND_FLAGS)"
 TEXINPUTS=$(top-src-dir)/tex/::
 export TEXINPUTS

diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make
index b1712c66d37f96555aaf69a146c07ea67dc11ec8..090c6c753c450501073fc9c266a8c16d2d317831 100644 (file)
--- a/make/lysdoc-targets.make
+++ b/make/lysdoc-targets.make
@@ -1,6 +1,5 @@
 
 
-#local-WWW: $(outdir)/$(NAME).html $(outdir)/$(NAME).pdf
-local-WWW: $(outdir)/$(NAME).html
+local-WWW: $(outdir)/$(NAME).html $(outdir)/$(NAME).pdf
 
 #.PRECIOUS: $(outdir)/$(NAME).texi