From 1b91955adaf3c89540c8ffff7228f0ec7a31dbe4 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 23 Sep 2003 20:23:11 +0000 Subject: [PATCH] remove bogus docstring. --- ChangeLog | 8 ++++++ Documentation/user/cheatsheet.itely | 40 +++++++++----------------- Documentation/user/lilypond-book.itely | 16 ++++++++--- THANKS | 4 +-- input/regression/clefs.ly | 12 ++++---- input/test/chord-names-jazz.ly | 1 - mf/GNUmakefile | 4 ++- scm/chord-name.scm | 4 +-- scripts/lilypond-book.py | 2 +- 9 files changed, 47 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b1c842d92..244f60fa4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-09-23 Han-Wen Nienhuys + + * input/regression/clefs.ly: remove bogus docstring. + 2003-09-23 Jan Nieuwenhuizen * GNUmakefile.in (SUBDIRS): Add elisp. @@ -30,6 +34,10 @@ 2003-09-23 Han-Wen Nienhuys + * scm/chord-name.scm (natural-chord-alteration): no quarter tones. + + * input/test/chord-names-jazz.ly (banterProperties): fix + * lily/parser.yy (bass_mod): bass figure alterations are semi tones, not quarter tones diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index 1aa9b63fc5..3128a11c68 100644 --- a/Documentation/user/cheatsheet.itely +++ b/Documentation/user/cheatsheet.itely @@ -19,7 +19,7 @@ c1 c2 c8 c16 @end lilypond -@item @code{. ..} +@item @code{c4. c4..} @tab augmentation dots @tab @lilypond[relative 1, notime] @@ -31,15 +31,13 @@ c4. c4.. @tab scale @tab @lilypond[relative 1, notime] -\property Staff.Clef = \turnOff c d e f g a b @end lilypond @item @code{fis bes} @tab alteration @tab -@lilypond[relative 1, notime] -\property Staff.Clef = \turnOff +@lilypond[relative 0, notime] fis bes @end lilypond @@ -73,13 +71,12 @@ s16_" " r4 r8 @end lilypond -@item @code{~} +@item @code{d ~ d} @tab tie @tab @lilypond[relative 1, notime] \property Score.timing = ##f \property Staff.autoBeaming = ##f -\property Staff.Clef = \turnOff d ~ d @end lilypond @@ -98,7 +95,6 @@ s4 @lilypond[relative 1, notime] \property Score.timing = ##f \property Staff.autoBeaming = ##f -\property Staff.Clef = \turnOff a a' @end lilypond @@ -108,43 +104,39 @@ a a' @lilypond[relative 1, notime] \property Score.timing = ##f \property Staff.autoBeaming = ##f -\property Staff.Clef = \turnOff c c, @end lilypond -@item @code{( )} +@item @code{c( d e)} @tab slur @tab @lilypond[fragment, relative 1] \property Score.timing = ##f \property Staff.TimeSignature = \turnOff \property Staff.autoBeaming = ##f -\property Staff.Clef = \turnOff c( d e) @end lilypond -@item @code{\( \)} +@item @code{c\( c( d) e\)} @tab phrasing slur @tab @lilypond[fragment, relative 1] \property Score.timing = ##f \property Staff.TimeSignature = \turnOff \property Staff.autoBeaming = ##f -\property Staff.Clef = \turnOff c\( c( d) e\) @end lilypond -@item @code{-[ -]} +@item @code{a8[ b]} @tab beam @tab @lilypond[fragment, relative 1] \property Score.timing = ##f \property Staff.TimeSignature = \turnOff \property Staff.autoBeaming = ##f -\property Staff.Clef = \turnOff a8-[ b-] @end lilypond @@ -158,45 +150,41 @@ a8-[ b-] @end lilypond -@item @code{-> -.} +@item @code{c-> c-.} @tab articulations @tab @lilypond[fragment, relative 1] \property Staff.TimeSignature = \turnOff -\property Staff.Clef = \turnOff c-> c-. @end lilypond -@item @code{\mf \sfz} +@item @code{c\mf c\sfz} @tab dynamics @tab @lilypond[fragment, relative 1] \property Staff.TimeSignature = \turnOff -\property Staff.Clef = \turnOff c\mf c\sfz @end lilypond -@item @code{\< \!} +@item @code{a\< b\!} @tab crescendo @tab @lilypond[fragment, relative 1] \property Score.timing = ##f \property Staff.TimeSignature = \turnOff \property Staff.autoBeaming = ##f -\property Staff.Clef = \turnOff a\< a \!a @end lilypond -@item @code{\> \!} +@item @code{a\> b\!} @tab decrescendo @tab @lilypond[fragment, relative 1] \property Score.timing = ##f \property Staff.TimeSignature = \turnOff \property Staff.autoBeaming = ##f -\property Staff.Clef = \turnOff a\> a a\! @end lilypond @@ -218,7 +206,7 @@ a\> a a\! @end lilypond -@item @code{\times 2/3} +@item @code{\times 2/3 @{f g a@}} @tab triplets @tab @lilypond[relative 1,fragment] @@ -263,11 +251,11 @@ a\> a a\! \context ChordNames \chords { c:dim f:maj7 } @end lilypond -@item @code{<< @dots{} \\ @dots{} >>} +@item @code{<<@{e f@} \\@{c d@}>>} @tab polyphony @tab -@lilypond[fragment,relative 1] -\context Staff << c \\ g' >> +@lilypond[fragment,relative 2] +\context Staff <<{e f} \\ {c d}>> @end lilypond diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 39e45ce83a..d37d12725e 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -218,10 +218,10 @@ A special feature not (yet) available in other output formats, is the @example trip.ly @end example -This runs @file{trip.ly} through @code{lilypond} (see also @ref{Invoking -lilypond}), and substitutes a preview image in the output. The image -links to a separate HTML file, so clicking it will take the viewer to -a menu, with links to images, midi and printouts. +This runs @file{trip.ly} through @code{lilypond} (see also +@ref{Invoking lilypond}), and substitutes a preview image in the +output. The image links to a separate HTML file, so clicking it will +take the viewer to a menu, with links to images, midi and printouts. @cindex titling in THML @cindex preview image @@ -315,6 +315,14 @@ where @var{unit} = cm, mm, in, or pt. This option affects LilyPond, not the text layout. For single-line fragments the default is to use no indentation. +For example +@example + \begin[indent=5cm,raggedright]{lilypond} + ... + \end{lilypond} +@end example + + @item noindent sets indentation of the first music system to zero. This option affects LilyPond, not the text layout. diff --git a/THANKS b/THANKS index 3bc491f72e..6cdc412042 100644 --- a/THANKS +++ b/THANKS @@ -28,6 +28,7 @@ Ian Bailey-Mortimer John Williams Josza Marton Marco Caliari +Matthieu Amiguet Michael Welsh Duggan Patrick Atamaniuk Paul Scott @@ -35,8 +36,7 @@ Pedro Kroeger Peter Lutek Richard Schoeller Thorkil Wolvendans -Matthieu Amiguet - +Werner Trobin Release 1.8 diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index 44c0fab82b..f3ca6dbc01 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,13 +1,11 @@ \version "1.9.8" \header{ -texidoc=" -The transparent clef should not occupy any space and with style -@code{fullSizeChanges}, the changing clef should be typeset in full -size. For octaviated clefs, the ``8'' should appear closely above or -below the clef respectively. The ``8'' is processed in a convoluted -way, so this is fragile as well. -" + + texidoc=" Clefs with @code{full-size-change} should be typeset in +full size. For octaviated clefs, the ``8'' should appear closely above +or below the clef respectively." + } diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index 1e9f800fd0..b3638d13f9 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -138,7 +138,6 @@ banterProperties = \sequential { indent = 3.\cm \translator { \ChordNamesContext - ChordName \override #'word-space = #1 \consists Instrument_name_engraver } } diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 4d273d75f6..df8e190139 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -81,6 +81,7 @@ get-debian-pfa: $(outdir)/$(debian-package) rm -rf $(outdir)/./usr ar p $< data.tar.gz | \ tar -C $(outdir) -zvxf - '*.pfa' + touch $(addprefix $(outdir)/, $(addsuffix .bla,$(SAUTER_FONTS))) cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/ @@ -89,7 +90,8 @@ $(outdir)/$(redhat-package): wget -P $(outdir) ftp://ftp.lilypond.org/pub/LilyPond/binaries/RedHat-9/$(redhat-package) get-rpm-pfa: $(outdir)/$(redhat-package) - cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -id '*.pfa' + cd $(outdir) ; rpm2cpio $(redhat-package) | cpio -uid '*.pfa' + touch $(addprefix $(outdir)/, $(addsuffix .bla,$(SAUTER_FONTS))) cp `find $(outdir)/usr/ -name '*.pfa'` $(outdir)/ # change this dependency diff --git a/scm/chord-name.scm b/scm/chord-name.scm index f910d38df0..6ffecfa843 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -10,7 +10,7 @@ (define (natural-chord-alteration p) "Return the natural alteration for step P." (if (= (ly:pitch-steps p) 6) - -1 + FLAT 0)) @@ -20,7 +20,7 @@ (define-public (alteration->text-accidental-markup alteration) (make-smaller-markup (make-raise-markup - (if (= alteration -1) + (if (= alteration FLAT) 0.3 0.6) (make-musicglyph-markup diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 091a1f6e13..c0ca09a553 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -756,7 +756,7 @@ def scan_latex_preamble (chunks): if not m: error ("Latex documents must start with a \documentclass command") if m.group (1): - options = re.split (',\s*', m.group (1)[1:-1]) + options = re.split (r',\s*', m.group (1)[1:-1]) else: options = [] if 'twocolumn' in options: -- 2.39.2