Merge ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master-hanwen

diff --git a/ChangeLog b/ChangeLog
index 778afc92a42364d025a64ea2c9b8c558fe9ccb90..3c42fb12b964cb39c508a58c03e42776d124d5c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-10  Werner Lemberg  <wl@gnu.org>
+
+       * Documentation/user/GNUmakefile ($(outdir)/lilypond/source,
+       $(outdir)/music-glossary/source): Fixes for `make -j'.
+
+       * Documentation/user/introduction.itely: Don't let images overlap
+       and update its scaling values.
+
+       * Documentation/user/lily-flat-bw.png,
+       Documentation/user/henle-flat-gray.png: Add vertical whitespace:
+       texinfo doesn't center images vertically for PDF output.
+
 2006-11-09  Heikki Junes  <hjunes@gmail.com>
 
        * elisp/lilypond-font-lock.el: Should always have been GPL.

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index bab25063094579decd942e385fdadba6560cae5c..03f132c43c7cf881871f73f6a0c08c8540b4cced 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -218,10 +218,12 @@ $(outdir)/source:
 
 $(outdir)/lilypond/source:
        @rm -f $(@)
+       mkdir -p $(outdir)/lilypond
        ln -sf ../../../ $(@)
 
 $(outdir)/music-glossary/source:
        @rm -f $(@)
+       mkdir -p $(outdir)/music-glossary
        ln -sf ../../../ $(@)
 
 local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\

diff --git a/Documentation/user/henle-flat-gray.png b/Documentation/user/henle-flat-gray.png
index e716829deda414ecf7d33f4ad0eecefe912b0158..20326b958a591ca62d8e46820713e5a6bf472cb9 100644 (file)
Binary files a/Documentation/user/henle-flat-gray.png and b/Documentation/user/henle-flat-gray.png differ

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 97d32ec4c66ccbc20567a9e624c9b8b5dbfb5d98..2ac91d0867f8e43a44e823533bba6f21e20e9f92 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -54,11 +54,11 @@ one.  It is rounded, and its weight harmonizes with the thickness of
 our staff lines, which are also much thicker than lines in the
 computer edition.
 
-@multitable @columnfractions .05 .3 .3 .3 .05
+@multitable @columnfractions .125 .25 .25 .25 .125
 @item @tab
 @ifnotinfo
 @iftex
-@image{henle-flat-gray,,8cm}
+@image{henle-flat-gray,,4cm}
 @end iftex
 @ifnottex
 @image{henle-flat-gray,,,png}
@@ -66,7 +66,7 @@ computer edition.
 
 @tab
 @iftex
-@image{baer-flat-gray,,8.4cm}
+@image{baer-flat-gray,,4cm}
 @end iftex
 @ifnottex
 @image{baer-flat-gray,,,png}
@@ -74,7 +74,7 @@ computer edition.
 
 @tab
 @iftex
-@image{lily-flat-bw,,8cm}
+@image{lily-flat-bw,,4cm}
 @end iftex
 @ifnottex
 @image{lily-flat-bw,,,png}
@@ -502,6 +502,7 @@ and the @code{Stem_engraver} adds stems.
 }
 @end lilypond
 
+@noindent
 The @code{Stem_engraver} is notified of any note head coming along.
 Every time one (or more, for a chord) note head is seen, a stem
 object is created and connected to the note head.  By adding

diff --git a/Documentation/user/lily-flat-bw.png b/Documentation/user/lily-flat-bw.png
index b67c626a475bc918cc4b06b0ae8846cca95934af..09ce34e7c5fc7448c2e6f767f7d4ab1620c6cb78 100644 (file)
Binary files a/Documentation/user/lily-flat-bw.png and b/Documentation/user/lily-flat-bw.png differ

diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly
deleted file mode 100644 (file)
index abc30ab..0000000
--- a/input/regression/font-magnification.ly
+++ /dev/null
@@ -1,27 +0,0 @@
-
-\version "2.7.39"
-\header { texidoc = "The magnification can be set for any font. Note
-that this does not change variable symbols such as beams or slurs. 
-" }
-
-
-\relative c'' \context Voice {
-  \override NoteHead  #'font-magnification = #0.9
-  c4
-  \override NoteHead  #'font-magnification = #0.8
-
-
-  c4-"normal"
-  %% why doesn't this  work?
-  c4-\markup \bold \magnify #2.0 "foobar"
-
-  \override NoteHead  #'font-magnification = #1.2
-  \override TextScript  #'font-magnification = #2.0
-  c4-"big"
-  \override NoteHead  #'font-magnification = #1.6
-  c4
-}
-
-
-
-