From: Han-Wen Nienhuys Date: Sun, 28 Mar 2004 20:45:56 +0000 (+0000) Subject: (INFOINSTALL): X-Git-Tag: release/2.1.37~29 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=c15ee7f1e5493bd3286bcf3fd1900029d036404a;p=lilypond.git (INFOINSTALL): only do mkdir/install-info if INFO_INSTALL_FILES != "". scripts/lilypond-book.py (Lilypond_snippet.is_outdated): use glob.glob for .png filenames. This catches multipage pngs. * Documentation/user/changing-defaults.itely (Determining the grob property): fix references. --- diff --git a/ChangeLog b/ChangeLog index f7d7cf087d..78849608af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-03-28 Han-Wen Nienhuys + + * stepmake/stepmake/texinfo-vars.make (INFOINSTALL): + only do mkdir/install-info if INFO_INSTALL_FILES != "". + 2004-03-28 Jan Nieuwenhuizen * stepmake/aclocal.m4: Verify that gettext configure check with @@ -5,6 +10,9 @@ 2004-03-28 Han-Wen Nienhuys + * scripts/lilypond-book.py (Lilypond_snippet.is_outdated): use + glob.glob for .png filenames. This catches multipage pngs. + * Documentation/user/changing-defaults.itely (Determining the grob property): fix references. diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index c66dbe69dd..2e83124b7e 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -10,7 +10,7 @@ IMAGES=$(wildcard *.png) OUT_EPS_IMAGES=$(addprefix $(outdir)/,$(IMAGES:.png=.eps)) OUT_PNG_IMAGES=$(addprefix $(outdir)/,$(IMAGES)) - +OUT_ITEXI_FILES=$(addprefix $(outdir)/,$(ITELY_FILES:.itely=.itexi) HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html)) PS_FILES = $(DVI_FILES:.dvi=.ps) diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index 9653f281a9..7e9bcbb787 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -1019,8 +1019,18 @@ collisions, and slurs, and ties and beams can be attached to it. @cindex invisible objects The following example demonstrates how to connect different voices using ties. Normally, ties only connect two notes in the same -voice. By introducing a tie in a different voice, and blanking a stem -in that voice, the tie appears to cross voices: +voice. By introducing a tie in a different voice, + +@lilypond[fragment,relative=2] + << { + b8~ b8\noBeam + } \\ { + b[ g8] + } >> +@end lilypond + +@noindent +and blanking a stem in that voice, the tie appears to cross voices: @lilypond[fragment,relative=2,verbatim] << { @@ -1815,10 +1825,8 @@ exaggerated corrections: \score { \notes { c'4 e''4 e'4 b'4 | b'4 e''4 b'4 e''4| - \override Staff.NoteSpacing #'stem-spacing-correction - = #1.5 - \override Staff.StaffSpacing #'stem-spacing-correction - = #1.5 + \override Staff.NoteSpacing #'stem-spacing-correction = #1.5 + \override Staff.StaffSpacing #'stem-spacing-correction = #1.5 c'4 e''4 e'4 b'4 | b'4 e''4 b'4 e''4| } @@ -1833,7 +1841,7 @@ created before any property commands are interpreted. @example \paper @{ \context @{ \ScoreContext - SpacingSpanner \override #'spacing-increment = #3.0 + \override SpacingSpanner #'spacing-increment = #3.0 @} @} @end example diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index 69b3417632..2f3b4c6b05 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -345,15 +345,15 @@ lengths: You can alter the length of duration by a fraction @var{N/M} appending `@code{*}@var{N/M}' (or `@code{*}@var{N}' if @var{M=1}). This will not affect the appearance of the notes or rests produced. + In the following example, the first three notes take up exactly two -beats: +beats, but no triplet bracket is printed. @lilypond[fragment,relative=2,verbatim] \time 2/4 a4*2/3 gis4*2/3 a4*2/3 a4 @end lilypond - @refcommands Dots are normally moved up to avoid staff lines, except in polyphonic @@ -369,6 +369,8 @@ direction manually: @seealso +This manual: @ref{Tuplets} + Program reference: @internalsref{Dots}, and @internalsref{DotColumn}. @node Stems diff --git a/lily/hairpin.cc b/lily/hairpin.cc index f00cc045d1..629f825460 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -48,7 +48,7 @@ Hairpin::print (SCM smob) Direction d = LEFT; do { - bounds[d] =spanner->get_bound (d); + bounds[d] = spanner->get_bound (d); broken[d] = bounds[d]->break_status_dir () != CENTER; } while (flip (&d) != LEFT); @@ -59,7 +59,7 @@ Hairpin::print (SCM smob) do { Item *b = bounds[d]; - x_points[d] = b->relative_coordinate (common, X_AXIS); + x_points[d] = b->relative_coordinate (common, X_AXIS); if (broken [d]) { if (d == LEFT) @@ -74,15 +74,15 @@ Hairpin::print (SCM smob) adjacent to a text-dynamic, and we may move closer. We make the padding a little smaller, here. */ - Interval e =b->extent (common, X_AXIS); + Interval e = b->extent (common, X_AXIS); if (e.is_empty ()) e = Interval (0,0) + b->relative_coordinate (common, X_AXIS); - x_points[d] = e.center () - d * padding /3; // ugh. + x_points[d] = e.center () - d * padding / 3; // ugh. } else { - Interval e =b->extent (common, X_AXIS); + Interval e = b->extent (common, X_AXIS); if (!e.is_empty ()) x_points[d] = e[-d] - d*padding; } @@ -118,13 +118,13 @@ Hairpin::print (SCM smob) /* should do relative to staff-symbol staff-space? - */ + */ Stencil mol; mol = Line_interface::line (me, Offset (0, starth), Offset (width, endh)); mol.add_stencil (Line_interface::line (me, - Offset (0, -starth), - Offset (width, -endh))); + Offset (0, -starth), + Offset (width, -endh))); mol.translate_axis (x_points[LEFT] - bounds[LEFT]->relative_coordinate (common, X_AXIS), diff --git a/python/lilylib.py b/python/lilylib.py index a705e7d0fc..1ae32ad41a 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -491,13 +491,14 @@ def make_ps_images (ps_name, resolution = 90): map (os.unlink, rms) else: output_file = re.sub (r'\.e?ps', '-page%d.png', ps_name) + rmfile = base + '.png' if os.path.isfile (rmfile): os.unlink (rmfile) cmd = r'''gs -s -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=%s -dNOPAUSE -r%d %s -c quit''' % (output_file, resolution, ps_name) - + status = system (cmd) signal = 0xf & status exit_status = status >> 8 diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index f9c50825ec..9600afeb11 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -512,12 +512,14 @@ class Lilypond_snippet (Snippet): def is_outdated (self): base = self.basename () - require = ['.ly', '.tex'] + found = os.path.exists (base + '.ly') and \ + os.path.exists (base + '.tex') + if format == HTML or format == TEXINFO: - require.append ('.png') - require = [os.path.exists (base + x) for x in require] - if reduce (lambda a,b: a and b, require) \ - and (use_hash_p \ + found = found and (os.path.exists (base + '.png') + or glob.glob (base + '-page*.png')) + + if found and (use_hash_p \ or self.ly () == open (base + '.ly').read ()): # TODO: something smart with target formats # (ps, png) and m/ctimes diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make index 3212c9efa2..875a5e929c 100644 --- a/stepmake/stepmake/texinfo-targets.make +++ b/stepmake/stepmake/texinfo-targets.make @@ -17,14 +17,10 @@ install-info: local-install-info uninstall-info: local-uninstall-info install-info: $(INFO_FILES) - -$(INSTALL) -d $(DESTDIR)$(package_infodir) - $(INFOINSTALL) local-install - -install-info --info-dir=$(infodir) $(outdir)/$(package).info + $(INFO_INSTALL_COMMAND) local-install uninstall-info: - -install-info --info-dir=$(infodir) --remove $(outdir)/$(package).info - $(INFOINSTALL) local-uninstall - -rmdir $(infodir) + $(INFO_INSTALL_COMMAND) local-uninstall TEXINFO_ALL_MENUS_UPDATE_EL ='\ diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make index b71c8321b2..04a5385056 100644 --- a/stepmake/stepmake/texinfo-vars.make +++ b/stepmake/stepmake/texinfo-vars.make @@ -15,5 +15,8 @@ MAKEINFO = LANG= $(MAKEINFO_PROGRAM) # info stuff INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES))) -INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(DESTDIR)$(package_infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" -f $(stepdir)/install-out.sub.make - +INFO_INSTALL_COMMAND =$(if $(INFO_INSTALL_FILES),\ + $(INSTALL) -d $(DESTDIR)$(package_infodir) ; \ + $(MAKE) INSTALLATION_OUT_DIR=$(DESTDIR)$(package_infodir) \ + depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" \ + -f $(stepdir)/install-out.sub.make,true)