From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 2 Jan 2004 10:52:19 +0000 (+0000)
Subject: release commit
X-Git-Tag: release/2.1.23~286
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e808cad5173e801c47eb3140dda0dd3843f98200;p=lilypond.git
release commit
---
diff --git a/ChangeLog b/ChangeLog
index bc577d684a..e69eca0b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2004-01-02 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * Documentation/user/lilypond-book.itely (Integrating LaTeX and
+ music): move note about dvips to more visible place.
+
* lily/lyric-phrasing-engraver.cc: move from
new-phrasing-engraver.cc, remove old cruft (syllable-group,
lyric-phrasing-engraver.hh)
diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 3508f9cacf..852d621f7d 100644
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -135,7 +135,10 @@ or
@end example
Running lilypond-book yields a file that can be processed with
-La@TeX{}. We show some examples here:
+La@TeX{}.
+
+
+We show some examples here:
@example
\begin[26pt]@{lilypond@}
@@ -183,6 +186,33 @@ imported by adding the following to the top of the La@TeX{} file:
The music will be surrounded by @code{\preLilyPondExample} and
@code{\postLilyPondExample}, which are defined to be empty by default.
+@cindex titling and lilypond-book
+@cindex lilypond-book and titling
+@cindex @code{\header} in La@TeX{} documents
+
+To add titling from the @code{\header} section of the files, add the
+following to the top of the La@TeX{} file:
+@example
+\input titledefs.tex
+\def\preLilyPondExample@{\def\mustmakelilypondtitle@{@}@}
+@end example
+
+@cindex outline fonts
+@cindex type1 fonts
+@cindex dvips
+@cindex invoking dvips
+
+For printing the LaTeX document, you will need to use dvips. For
+producing PostScript with scalable fonts, add the following options to
+the dvips command line:
+@example
+ -Ppdf -u +lilypond.map
+@end example
+
+@noindent
+PDF can then be produced with @code{ps2pdf}.
+
+
@node Integrating HTML and music
@section Integrating HTML and music
@@ -359,6 +389,7 @@ starting note, where the default @code{1} is central C.
@node Invoking lilypond-book
@section Invoking lilypond-book
+
Running @command{lilypond-book} generates lots of small files that
LilyPond will process. To avoid all that garbage in the source
directory, it is advisable to change to a temporary directory first:
@@ -375,33 +406,6 @@ lilypond-book --outdir=out yourfile.tex
cd out && latex yourfile.latex
@end example
-For La@TeX{} input, the file to give to La@TeX{} has extension @file{.latex}.
-Texinfo input will be written to a file with extension @file{.texi}.
-
-@cindex titling and lilypond-book
-@cindex lilypond-book and titling
-@cindex @code{\header} in La@TeX{} documents
-
-To add titling from the @code{\header} section of the files, add the
-following to the top of the La@TeX{} file:
-@example
-\input titledefs.tex
-\def\preLilyPondExample@{\def\mustmakelilypondtitle@{@}@}
-@end example
-
-@cindex outline fonts
-@cindex type1 fonts
-@cindex dvips
-@cindex invoking dvips
-
-For printing the LaTeX document, you will need to use dvips. For
-producing PS with scalable fonts, add the following options to the dvips
-command line:
-@example
- -Ppdf -u +lilypond.map
-@end example
-
-
@command{lilypond-book} accepts the following command line options:
@@ -456,6 +460,11 @@ Print a short help message.
@end table
+For La@TeX{} input, the file to give to La@TeX{} has extension
+@file{.latex}. Texinfo input will be written to a file with extension
+@file{.texi}.
+
+
@section Bugs
diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index cd7afdc323..4b2f2b0d1e 100644
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -187,7 +187,7 @@ accidental.
gis1 s s gisis s s ges s s geses s s g!
}
\context Lyrics \lyrics {
- \property Lyrics . LyricText \override #'alignment = #-1
+ \property Lyrics . LyricText \set #'self-alignment-X = #-1
"sharp " "db. sharp " "flat " "db. flat " natural
}
@end lilypond
@@ -686,7 +686,7 @@ lines.
\clef baritone c s s
}
\context Lyrics \lyrics {
- \property Lyrics . LyricText \override #'alignment = #-1
+ \property Lyrics . LyricText \override #'self-alignment-X = #-1
"Soprano " "Mezzosoprano " "Alto " "Tenor " Baritone
}
@end lilypond
@@ -785,7 +785,7 @@ chords are denoted open chords
<g b d f a> s s
}
\context Lyrics \lyrics{
- \property Lyrics . LyricText \override #'alignment = #-1
+ \property Lyrics . LyricText \set #'self-alignment-X = #-1
"major " "minor " "diminished " "augmented "
"seventh-chord " "ninth-chord "
}
@@ -1668,7 +1668,7 @@ but equal pitch.
gis1 s s as s s <des g,!> s s <cis g!> s s
}
\context Lyrics \lyrics {
- \property Lyrics . LyricText \override #'alignment = #-1
+ \property Lyrics . LyricText \set #'self-alignment-X = #-1
"g sharp " "a flat " "dim fifth " "augm fourth"
}
@end lilypond
@@ -1749,7 +1749,7 @@ symbol indicates playing an octave lower (for example on double bass
f1
}
\context Lyrics \lyrics {
- \property Lyrics . LyricText \override #'alignment = #-1
+ \property Lyrics . LyricText \set #'self-alignment-X = #-1
"baritone "
"bass "
"sub-bass "
@@ -1963,7 +1963,7 @@ scores are notated like that).
g s s
}
\context Lyrics \lyrics {
- \property Lyrics . LyricText \override #'alignment = #-1
+ \property Lyrics . LyricText \set #'self-alignment-X = #-1
"french violin clef "
"violin clef "
"octaved up "
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 94717a81b1..96d4eafe67 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -156,11 +156,5 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
\translator { \PianoStaffContext
VerticalAlignment \override #'forced-distance = #10
}
- \translator {
- \ScoreContext
- \remove "Lyric_phrasing_engraver"
- \consists "New_phrasing_engraver"
- }
-
}
}
diff --git a/input/regression/lyric-phrasing-new.ly b/input/regression/lyric-phrasing-new.ly
index af1e074ffd..7e3886f835 100644
--- a/input/regression/lyric-phrasing-new.ly
+++ b/input/regression/lyric-phrasing-new.ly
@@ -27,11 +27,6 @@ texidoc = "Lyric phrasing:
\paper { raggedright = ##t
- \translator {
- \ScoreContext
- \remove "Lyric_phrasing_engraver"
- \consists "New_phrasing_engraver"
- }
\translator {
\VoiceContext
diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index a49a4c1247..fd028918df 100644
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -21,6 +21,9 @@ use of the scheme function @code{set-octavation}.
a, #(set-octavation 1) b
#(set-octavation 0)
c a
+ #(set-octavation -1) b a g
+ #(set-octavation 0)
+ c
}
}
diff --git a/lily/lyric-phrasing-engraver.cc b/lily/lyric-phrasing-engraver.cc
index c813a5a91d..63697ebcb8 100644
--- a/lily/lyric-phrasing-engraver.cc
+++ b/lily/lyric-phrasing-engraver.cc
@@ -28,7 +28,6 @@ struct Phrasing_association
{
melisma_ = false;
}
-
};
class Lyric_phrasing_engraver : public Engraver
@@ -206,6 +205,6 @@ ENTER_DESCRIPTION(Lyric_phrasing_engraver,
"",
"",
"lyric-syllable-interface note-head-interface lyric-extender-interface",
- "automaticPhrasing associatedVoice",
+ "associatedVoice",
"");
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 43db20f3bd..4fca0d7521 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -449,9 +449,6 @@ AncientRemoveEmptyStaffContext = \translator {
clefPosition = #-2
centralCPosition = #-6
- automaticPhrasing = ##t
- phrasingPunctuation = #".,:!?\""
-
defaultBarType = #"|"
barNumberVisibility = #default-bar-number-visibility
automaticBars = ##t
@@ -562,7 +559,7 @@ AncientRemoveEmptyStaffContext = \translator {
\grobdescriptions #all-grob-descriptions
}
-\translator {
+OrchestralScoreContext = \translator {
\ScoreContext
}
diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm
index 0f116b84f1..08c99b85c7 100644
--- a/scm/define-grob-interfaces.scm
+++ b/scm/define-grob-interfaces.scm
@@ -8,11 +8,6 @@
; should include default value?
-(ly:add-interface
-'note-name-interface
- "Note name"
- '(style))
-
(ly:add-interface
'cluster-beacon-interface
@@ -47,11 +42,15 @@ extents of a cluster spanner at this X position.
"A bracket indicating a ligature in the original edition"
'(width thickness height ligature-primitive-callback))
+(ly:add-interface
+ 'lyric-syllable-interface
+ "a single piece of lyrics"
+ '())
+
(ly:add-interface
'mark-interface
"a rehearsal mark"
- '(
- ))
+ '())
(ly:add-interface
'metronome-mark-interface
@@ -59,6 +58,11 @@ extents of a cluster spanner at this X position.
'(
))
+(ly:add-interface
+'note-name-interface
+ "Note name"
+ '(style))
+
(ly:add-interface
'rhythmic-grob-interface
"Any object with a rhythmic basis. Used to determine which grobs
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 3303f0014c..2ee3ec233a 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -465,10 +465,6 @@ containing (TRANSPARENT . EMPTY).
(grob-property-description 'when ly:moment? "when does this column happen?.")
(grob-property-description 'word-space ly:dimension? "elongate left (?) by this much (FIXME: cumbersome semantics).")
-(grob-property-description 'alignment number? "alignment of lyrics on notehead, -1 is LEFT, 0 is CENTRE, 1 is RIGHT .")
-(grob-property-description 'ignore-length-mismatch boolean? "if #t, stanzas with shorter lyrics can be moved away from their respective note-head by the lyric alignment code.")
-(grob-property-description 'begin-alignment number? "proportion of lyric length from beginning to align with note-head for left-aligned lyrics.")
-(grob-property-description 'end-alignment number? "proportion of lyric length from end to align with note-head for right-aligned lyrics.")
(grob-property-description 'width ly:dimension? "width of a grob measured in staff space.")
(grob-property-description 'width-correct ly:dimension? "width correction for (de)cresc. text spanners.")
(grob-property-description 'x-gap ly:dimension? "horizontal gap between notehead and tie.")
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index b3cfa72bb7..3cf74b20b1 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -491,9 +491,6 @@
(X-offset-callbacks . (,Self_alignment_interface::aligned_on_parent))
(self-alignment-X . 0)
(word-space . 0.6)
- (ignore-length-mismatch . #f)
- (begin-alignment . 4)
- (end-alignment . 2)
(font-family . roman)
(font-shape . upright)
@@ -853,7 +850,7 @@
(padding . 1.5)
(X-offset-callbacks . (,Side_position_interface::aligned_side))
(direction . ,LEFT)
- (meta . ((interfaces . (text-interface font-interface item-interface ))))
+ (meta . ((interfaces . (side-position-interface text-interface font-interface item-interface ))))
))
(StaffSpacing
diff --git a/scm/define-translator-properties.scm b/scm/define-translator-properties.scm
index fa2ebec41b..fdd449715c 100644
--- a/scm/define-translator-properties.scm
+++ b/scm/define-translator-properties.scm
@@ -105,13 +105,6 @@ wins. In case of draw, a normal accidental is typeset.
still counted. Bar generation will resume according to that
count if this property is set to zero.
")
-(translator-property-description 'automaticPhrasing boolean? " If set,
-the @ref{Lyric_phrasing_engraver} will match note heads of context
-called Voice X to syllables from LyricsVoice called
-X-<something>. This feature is turned on by default. See the example
-file @file{lyrics-multi-stanza.ly}.
-")
-
(translator-property-description 'barAlways boolean? "If set to true a bar line is drawn after each note.
")
@@ -350,9 +343,6 @@ that indicates how to print sustain pedals: text, bracket or mixed
(translator-property-description 'pedalUnaCordaStyle symbol? "see pedalSustainStyle.")
(translator-property-description 'pedalSostenutoStyle symbol? "see pedalSustainStyle.")
-(translator-property-description 'phrasingPunctuation string?
- "A string of characters that are considered
-lyric punctuation")
(translator-property-description 'rehearsalMark number-or-string? "The
last rehearsal mark printed.")
(translator-property-description 'repeatCommands list? "This property is read to find any command of the form (volta . X), where X is a string or #f")
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 758314b0de..2c6d519f1c 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1631,8 +1631,11 @@ def conv (str):
c = match.group (1)
b = match.group (2)
- if b == 't' and c <> 'Score':
- return r"\unset \property %s.melismaBusyProperties" % c
+ if b == 't':
+ if c == 'Score':
+ return ''
+ else:
+ return r"\unset \property %s.melismaBusyProperties" % c
elif b == 'f':
return r"\property %s.melismaBusyProperties = #'(melismaBusy)" % c