+2004-09-13 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * ly/property-init.ly (hideStaffSwitch): remove turnOff.
+
+ * scripts/convert-ly.py (conv): change Both to Neutral in property
+ settings.
+
+ * ly/engraver-init.ly: increase extent of Staff.
+
2004-09-13 Graham Percival <gperlist@shaw.ca>
* scm/script.scm: change behaviour of slur and accent.
document them.
* scm/page-layout.scm (ly:optimal-page-breaks): use new parameters
- to get sane spaces for titles.
+ to get sane spaces for titles.
* ly/book-paper-defaults.ly: new parameters aftertitlespace,
beforetitlespace, betweentitlespace.
style mimics the look of historical printings of the 16th century.
The following examples shows the differences in style,
+
@lilypond[raggedright]
-{
+\relative c' {
\time 2/2
c1^\markup { \hspace #-2.0 \typewriter default }
#(ly:set-option 'old-relative)
-\version "2.3.16"
+\version "2.3.17"
\encoding "latin1"
\header {
composer = "ARTHUR GRAY"
<a'' eis cis>4)\arpeggio
\change Staff=bass
- \stemBoth
+ \stemNeutral
r8. cis,,16(\sustainUp <fis fis,>8 <gis gis,>
\stemDown
<b,, b,>4
\clef treble
- \stemBoth
+ \stemNeutral
<<
%urg: staff-change: ! on dis
<cis'' a fis dis!>\arpeggio
a,8\sustainDown e'[-5(<a cis>])-2-3
%%r b,-5 <e-3 gis-5 d'>4
r b,-5\sustainUp\sustainDown <e gis d'>4-3-5
- \slurBoth
+ \slurNeutral
\once \override Fingering #'extra-offset = #'(0 . -1) %tweak
e,8[-5(\sustainUp
a)-2]\sustainDown
\slurUp
e'[(<a cis>)] r b,\sustainUp\sustainDown <e gis d'>4
- \slurBoth
+ \slurNeutral
e,8[(\sustainUp
| %7
}
-\version "2.3.16"
+\version "2.3.17"
manuscriptBreak = { \break }
e4 c8
<<
\new Voice { \stemUp f8. g16 }
- { \stemDown f8.[ g16] } >> \stemBoth a8 |
+ { \stemDown f8.[ g16] } >> \stemNeutral a8 |
fis4 g8 c16[ b a g] f[ e] |
d4 f8 a16[ g fis g] f[ d] |
g4. r8 gis gis |
footer = "Mutopia-2001/04/27-xx"
}
-\version "2.3.16"
+\version "2.3.17"
dynamicUp = \override DynamicLineSpanner #'direction = #1
dynamicRevert = \revert DynamicLineSpanner #'direction
}
trebleEentje = \relative c' \context Voice {
- \stemBoth
+ \stemNeutral
<e e'>2 r4 |
<f as!>2\(\mf <as c>8.(-> <f as>16)\) |
% urg: slurs with staccati are ugly
}
trebleThrough = \relative c'{
- \stemBoth
+ \stemNeutral
<e e'>2. |
%61
R2. |
-\version "2.3.16"
+\version "2.3.17"
% #(ly:set-point-and-click 'line-column)
|
\stemUp
d4 d,16 a'( b cis d e f g) |
- \stemBoth
+ \stemNeutral
\forcedLastBreak
%%25
<< { a16(b c b) c4. b16(a) |
#(ly:set-option 'old-relative)
-\version "2.3.16"
+\version "2.3.17"
%{
Header for Petites Preludes.
\skip 1 |
\stemUp
r4 d''2 cis4 |
- \stemBoth
+ \stemNeutral
d16 a' g f e f cis d
e8.\mordent f16 d8.\prall cis16 |
\stemUp\tieUp
three = \relative c{
\stemUp
f2 e |
- \stemBoth
+ \stemNeutral
d16 d' c bes a bes f g
a8.\mordent bes16
g8.\prall f16 |
f2 g4 gis |
a2 ~ a16 a g f e f c d |
%5
- e8.\mordent f16 d8.\prall c16 \stemBoth c4. d8 |
+ e8.\mordent f16 d8.\prall c16 \stemNeutral c4. d8 |
\stemDown \tieDown
e4 ~ e16 f e d cis a b cis d e f d |
%}
-\version "2.3.16"
+\version "2.3.17"
f f16 e f8 c8 d4 r8 d |
es8 es16 d es8 bes c es16 d es8 f |
bes, es16 d es8 f as,16 bes c4 bes16 as |
- \stemBoth g16 es f g as bes c d es d c d es f g a |
+ \stemNeutral g16 es f g as bes c d es d c d es f g a |
bes f, g as bes c d e f es d es f g a b |
%%15
\stemUp c8 b16 a g f! es d c8 es d c |
c16 d es8~ es16 a, bes c d es f8~ f16 b, c d |
%%20
% es8 r r e f f, es! d | % -> \classic_accidentals
- es8 r r e \stemBoth \stemDown f f, es! d \stemBoth |
+ es8 r r e \stemNeutral \stemDown f f, es! d \stemNeutral |
r as' g f g f16 es f8 g |
c16 d es d c bes as g f bes' as g f es d c |
bes c d c bes as g f es as' g f es d c bes |
#(set-global-staff-size 16)
-\version "2.3.16"
+\version "2.3.17"
\header {
title = "Romanzen"
\m f,[( \u c^3 f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 cis16)] |
\m a,[( \u d^2 a d] \m c[ \u d c' d] \m b,[ \u d)^3] r8 |
\m c16[( \u f c' f] \m es[ \u f es' f] \m d[ \u f)^3] \m f[( \u as^2] |
- f'[ as)] \m f[( \u as f' as)] r8^\fermata r16 e'^2( f' g' | \stemBoth \tieBoth
+ f'[ as)] \m f[( \u as f' as)] r8^\fermata r16 e'^2( f' g' | \stemNeutral \tieNeutral
as' des'^1 c'8^\markup { \finger "2-3" } h~h c'16) \clef F e,16[(^2 f, g,] |
\forcedBreak
f) f'-5( e'-5 d'-4 c'-3 f')-5 <f^4 a^5>4( <e^3 g^5>8 |
<a, f^4>4 <g, e^3>8 f16^4 d'^5~ d'8.[ c'16^4] |
\forcedBreak
- << f8)^3_\pp \context Voice = another { \m a,16[ \u c8 c16] } >> \m g,[ \u c_3] \m b,[^\markup { \finger "2-1" } \u c8 c16] \m a,[ \u c]~ | \stemBoth
+ << f8)^3_\pp \context Voice = another { \m a,16[ \u c8 c16] } >> \m g,[ \u c_3] \m b,[^\markup { \finger "2-1" } \u c8 c16] \m a,[ \u c]~ | \stemNeutral
c16 c8_4 c c16~c c8_2 c c16~ |
c16 c8 c c16~c c8 c c16~ |
c16 c8 c c16 r4^\fermata r8 | \bar "|."
\revert Stem #'stroke-style }
f4) e8 |
f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 |
- \tieDown c4.~<f, c >16\< \tieBoth <f h>~ < f^3 h >8[\>\! < e b^2> \!] |
+ \tieDown c4.~<f, c >16\< \tieNeutral <f h>~ < f^3 h >8[\>\! < e b^2> \!] |
\change Staff=mid
\transpose c' c {
a4^1( g8^1 b4 a8^2 |
d4)^1 f8^1^\accent(~f e^. dis^1^. |
e4^1 d8^1~d c4)^1 |
}
- \d \tieBoth \slurDown
+ \d \tieNeutral \slurDown
<<
\transpose c' c {
g4 a8~a f g | a4 g8~g f e |
fis^1 d d, d a[ d_2] g, d g d_3 b,[_5( g_2] |
a) c_3 f, c c'[ f_2] b, f b f_3 d' as |
h, as d' as h, as( f'4.)^\fermata\arpeggio_2 ~
- \d \stemDown f'8. \clef G \stemBoth \tieBoth \phrasingSlurDown
+ \d \stemDown f'8. \clef G \stemNeutral \tieNeutral \phrasingSlurDown
\transpose c c' { e16[_4( f g] as[ des_3] c8[_4 <h, d f d'>)]~ |
<h, d f d'>} \clef F <c_3 f_1>[( <b,_4 e^2>] <a,_5 eis^1>8.) h,16_4\( c d |
\voiceTwo
-\version "2.3.16"
+\version "2.3.17"
\header{
texidoc="
Beams should behave reasonably well, even under extreme circumstances.
}
extreme = \relative c'' {
- \stemBoth
+ \stemNeutral
g8[ c c,]
c16[ c'' a f]
\stemUp
c,,32[ c'' a f]
%%%%%%%
- \stemBoth
+ \stemNeutral
\times 2/3{ d16[ fis' d,]} \times 2/3{ cis[ g'' cis,,]}
a'16 cis a, g''' % Used to give a nice beam directed upwards.
- \stemBoth
+ \stemNeutral
\transpose c c {
\stemDown e'8[ e e']
-\version "2.3.16"
+\version "2.3.17"
\header {
texidoc = "Kneed beams (often happens with cross-staff beams)
\context Staff = SA {
\stemDown
c8[ c16 \change Staff = SB \stemUp c16 ]
- \stemBoth
+ \stemNeutral
f[ g \change Staff = SA a c]
}
\context Staff = SB \relative c' {
texidoc = "Scoring based slur formatting."
}
-\version "2.3.16"
+\version "2.3.17"
\paper {
raggedright = ##t
% #(define debug-slur-scoring #t)
<c g>^( f <g b>) f
<c g>_( f <g b>)
<g b>_( g <b d>)
- <g b>_( \stemDown g \stemBoth <b d>)
+ <g b>_( \stemDown g \stemNeutral <b d>)
c,^( c'' c)
c,,^( c'')
c,,^( c')
-\version "2.3.16"
+\version "2.3.17"
\header{
texidoc="
a2.)
\stemUp
<d='' d'>8( <c c'> \break
- <bis f' b>)
-
+ <bis f' b>) s2..\break
+ \stemNeutral
+ \relative { c'8[( c c c] g2 ~ | \break
+ g1) | \break
+ \slurDown c8[( c] g4 ~ g2 ~ | \break
+ g2 ~ g2) }
}
-\version "2.3.16"
+\version "2.3.17"
\header{
texidoc="
Slurs should look nice and symmetric. The curvature may increase
\relative c''{
\time 3/4
\slurUp
- \stemBoth a ( \stemDown a \stemBoth a) a( c a) a( e' a,) a( g' a,)
+ \stemNeutral a ( \stemDown a \stemNeutral a) a( c a) a( e' a,) a( g' a,)
\stemUp a( e' a,)
\break
\slurDown
- \stemBoth c ( \stemUp c \stemBoth c) c ( a c) c( d, c') c( f, c')
+ \stemNeutral c ( \stemUp c \stemNeutral c) c ( a c) c( d, c') c( f, c')
\stemDown c( f, c')
}
\paper{
-\version "2.3.16"
+\version "2.3.17"
\header {
texidoc ="Space from a normal note (or barline) to a grace note is
{ \time 2/4
\relative c'' {
e8 e \grace d8 e e \grace f8 e es, d' d
- e8 e e e \grace { \stemDown f8 \stemBoth } e es, d'
+ e8 e e e \grace { \stemDown f8 \stemNeutral } e es, d'
}
-\version "2.3.16"
+\version "2.3.17"
\header {
\score {
\relative c'' {
\stemDown d c b a g f e
- \stemBoth
+ \stemNeutral
\stemUp a b c d e f g a
- \stemBoth
+ \stemNeutral
<g, e'>2 <b e g> <c e g> <d f g>
}
-\version "2.3.16"
+\version "2.3.17"
\header{
texidoc="
Stem tremolos or rolls are tremolo signs that look like beam segments
a4:32 a'4:64
\stemDown
c,4:32 c,4:64
- \stemBoth
+ \stemNeutral
c'8:16 c c c
a': a a: a
c,16:32 c: c c a16:32 a: a a
-\version "2.3.16"
+\version "2.3.17"
\include "deutsch.ly"
% possible rename to scheme- something. -gp
% TODO: ask if it needs to have so many empty bars in the middle. -gp
-\version "2.3.16"
+\version "2.3.17"
pat = \transpose c c' \repeat unfold 2 {
<< { \context Staff=up {r8 e16 f g e f g } }
}
enda = { r8 f,16 a, c f c a, \stemUp c \change Staff = down
- a, f, a, f, d, f, d, \change Staff = up \stemBoth
+ a, f, a, f, d, f, d, \change Staff = up \stemNeutral
r8 g16 h d' f' d' h d' h g h d f e\prall d <e g c'>1^\fermata \bar "|."
}
endb = {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar "|."}
%{
Common catalan names for notes. "b" means flat (bemoll), "d" means sharp (diesi).
- Also "s" is included for sharp (sostingut). Both "diesi" and "sostingut" are approved
+ Also "s" is included for sharp (sostingut). Neutral "diesi" and "sostingut" are approved
by "Diccionari de la Llengua Catalana" from "Institut d'Estudis Catalans".
Adapted from italiano.ly.
pitchnames = \pitchnamesCatalan
-\version "2.3.16"
+\version "2.3.17"
#(ly:parser-set-note-names parser pitchnames)
% property-init.ly
-\version "2.3.16"
+\version "2.3.17"
stemUp = \override Stem #'direction = #1
stemDown = \override Stem #'direction = #-1
-stemBoth= \revert Stem #'direction
+stemNeutral= \revert Stem #'direction
slurUp = \override Slur #'direction = #1
slurDown = \override Slur #'direction = #-1
-slurBoth = \revert Slur #'direction
+slurNeutral = \revert Slur #'direction
% There's also dash, but setting dash period/length should be fixed.
slurDotted = \override Slur #'dashed = #1
phrasingSlurUp = \override PhrasingSlur #'direction = #1
phrasingSlurDown = \override PhrasingSlur #'direction = #-1
-phrasingSlurBoth = \revert PhrasingSlur #'direction
+phrasingSlurNeutral = \revert PhrasingSlur #'direction
shiftOn = \override NoteColumn #'horizontal-shift = #1
shiftOnn = \override NoteColumn #'horizontal-shift = #2
tieUp = \override Tie #'direction = #1
tieDown = \override Tie #'direction = #-1
-tieBoth = \revert Tie #'direction
+tieNeutral = \revert Tie #'direction
tieDotted = \override Tie #'dashed = #1
tieSolid = \revert Tie #'dashed
\override DynamicText #'direction = #-1
\override DynamicLineSpanner #'direction = #-1
}
-dynamicBoth = {
+dynamicNeutral = {
\revert DynamicText #'direction
\revert DynamicLineSpanner #'direction
}
dotsUp = \override Dots #'direction = #1
dotsDown = \override Dots #'direction = #-1
-dotsBoth = \revert Dots #'direction
+dotsNeutral = \revert Dots #'direction
tupletUp = \override TupletBracket #'direction = #1
tupletDown = \override TupletBracket #'direction = #-1
-tupletBoth = \revert TupletBracket #'direction
+tupletNeutral = \revert TupletBracket #'direction
cadenzaOn = \set Timing.timing = ##f
cadenzaOff = {
-% To remove a Volta bracket or some other graphical object,
-% set it to turnOff. Example: \set Staff.VoltaBracket = \turnOff
-
-%%
-%% DO NOT USE THIS. IT CAN LEAD TO CRASHES.
-turnOff = #(cons '() '())
-
% For drawing vertical chord brackets with \arpeggio
% This is a shorthand for the value of the print-function property
% of either Staff.Arpeggio or PianoStaff.Arpeggio, depending whether
\revert Arpeggio #'print-function
\override Arpeggio #'arpeggio-direction = #-1
}
-arpeggioBoth = \sequential {
+arpeggioNeutral = \sequential {
\revert Arpeggio #'print-function
\revert Arpeggio #'arpeggio-direction
}
def lyrics_append(a):
- a = re.sub ( '#', '\\#', a) # latex does not like naked #'s
- a = re.sub ( '"', '\\"', a) # latex does not like naked "'s
+ a = re.sub ('#', '\\#', a) # latex does not like naked #'s
+ a = re.sub ('"', '\\"', a) # latex does not like naked "'s
a = '\t{ "' + a + '" }\n'
stuff_append (lyrics, current_lyric_idx, a)
'''\foo -> \foomode (for chords, notes, etc.)
fold \new FooContext \foomode into \foo.'''))
+def conv (str):
+ str = re.sub (r'(slur|stem|phrasingSlur|tie|dynamic|dots|tuplet|arpeggio|)Both', r'\1Neutral', str)
+
+ return str
+
+conversions.append (((2, 3, 17), conv,
+ '''\foo -> \foomode (for chords, notes, etc.)
+fold \new FooContext \foomode into \foo.'''))
+
################################
# END OF CONVERSIONS
################################
projects / lilypond.git / commitdiff