From 3d60f2770c2f5c19be4aa2960f80a3b21e489638 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 13 Sep 2004 21:09:23 +0000 Subject: [PATCH] * ly/property-init.ly (hideStaffSwitch): remove turnOff. * scripts/convert-ly.py (conv): change Both to Neutral in property settings. --- ChangeLog | 11 +++++++- Documentation/user/notation.itely | 3 ++- input/les-nereides.ly | 10 ++++---- input/mutopia/F.Schubert/morgenlied.ly | 4 +-- input/mutopia/F.Schubert/standchen.ly | 6 ++--- .../J.S.Bach/baerenreiter-sarabande.ly | 4 +-- input/mutopia/J.S.Bach/bwv940.ly | 8 +++--- input/mutopia/J.S.Bach/wtk1-fugue2.ly | 6 ++--- input/mutopia/R.Schumann/romanze-op28-2.ly | 12 ++++----- input/regression/beam-extreme.ly | 8 +++--- input/regression/beam-multiple-cross-staff.ly | 4 +-- input/regression/new-slur.ly | 4 +-- input/regression/slur-broken-trend.ly | 10 +++++--- input/regression/slur-nice.ly | 6 ++--- input/regression/spacing-to-grace.ly | 4 +-- input/regression/stem-shorten.ly | 6 ++--- input/regression/stem-tremolo.ly | 4 +-- input/test/music-box.ly | 6 ++--- ly/catalan.ly | 4 +-- ly/property-init.ly | 25 +++++++------------ scripts/abc2ly.py | 4 +-- scripts/convert-ly.py | 9 +++++++ 22 files changed, 87 insertions(+), 71 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0465338287..94f6608bb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-09-13 Han-Wen Nienhuys + + * 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 * scm/script.scm: change behaviour of slur and accent. @@ -27,7 +36,7 @@ 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. diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index 02245471f2..699ed991a5 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -6064,8 +6064,9 @@ incipit of transcriptions of mensural pieces. The @code{mensural} 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 } diff --git a/input/les-nereides.ly b/input/les-nereides.ly index a1daa33427..0beb14cdb1 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.16" +\version "2.3.17" \encoding "latin1" \header { composer = "ARTHUR GRAY" @@ -136,7 +136,7 @@ bass = \new Voice \relative c{ 4)\arpeggio \change Staff=bass - \stemBoth + \stemNeutral r8. cis,,16(\sustainUp 8 @@ -157,7 +157,7 @@ bass = \new Voice \relative c{ \stemDown 4 \clef treble - \stemBoth + \stemNeutral << %urg: staff-change: ! on dis \arpeggio @@ -192,7 +192,7 @@ bass = \new Voice \relative c{ a,8\sustainDown e'[-5(])-2-3 %%r b,-5 4 r b,-5\sustainUp\sustainDown 4-3-5 - \slurBoth + \slurNeutral \once \override Fingering #'extra-offset = #'(0 . -1) %tweak e,8[-5(\sustainUp @@ -201,7 +201,7 @@ bass = \new Voice \relative c{ a)-2]\sustainDown \slurUp e'[()] r b,\sustainUp\sustainDown 4 - \slurBoth + \slurNeutral e,8[(\sustainUp | %7 diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 3c1a61456d..df43d3b4cc 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -27,7 +27,7 @@ been lowered } -\version "2.3.16" +\version "2.3.17" manuscriptBreak = { \break } @@ -59,7 +59,7 @@ melody = \relative c'' \repeat volta 2 \context Voice = singer { 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 | diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 07ce77bc62..4da834f27b 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -42,7 +42,7 @@ instrument = "Piano" footer = "Mutopia-2001/04/27-xx" } -\version "2.3.16" +\version "2.3.17" dynamicUp = \override DynamicLineSpanner #'direction = #1 dynamicRevert = \revert DynamicLineSpanner #'direction @@ -211,7 +211,7 @@ trebleVerseOne = \relative c{ } trebleEentje = \relative c' \context Voice { - \stemBoth + \stemNeutral 2 r4 | 2\(\mf 8.(-> 16)\) | % urg: slurs with staccati are ugly @@ -226,7 +226,7 @@ trebleEentje = \relative c' \context Voice { } trebleThrough = \relative c'{ - \stemBoth + \stemNeutral 2. | %61 R2. | diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index 9455ccd652..21467229ca 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.17" % #(ly:set-point-and-click 'line-column) @@ -107,7 +107,7 @@ sarabandeA = \context Voice \relative c { | \stemUp d4 d,16 a'( b cis d e f g) | - \stemBoth + \stemNeutral \forcedLastBreak %%25 << { a16(b c b) c4. b16(a) | diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index 3bdc0a1185..a0c40e148e 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.16" +\version "2.3.17" %{ Header for Petites Preludes. @@ -45,7 +45,7 @@ one = \relative c{ \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 @@ -84,14 +84,14 @@ two = \relative c{ 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 | diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index 26e46c959e..2a540d20dd 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -44,7 +44,7 @@ %} -\version "2.3.16" +\version "2.3.17" @@ -128,7 +128,7 @@ comes = \context Voice=one \relative c'' { 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 | @@ -180,7 +180,7 @@ bassdux = \context Voice=three \relative 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 | diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index c6272a3978..56c96735ff 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -5,7 +5,7 @@ #(set-global-staff-size 16) -\version "2.3.16" +\version "2.3.17" \header { title = "Romanzen" @@ -75,7 +75,7 @@ righta = \transpose c cis' { \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 @@ -85,7 +85,7 @@ righta = \transpose c cis' { f) f'-5( e'-5 d'-4 c'-3 f')-5 4( 8 | 4 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 "|." @@ -140,7 +140,7 @@ rightb = \transpose c cis' { \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.~16\< \tieBoth ~ < f^3 h >8[\>\! < e b^2> \!] | + \tieDown c4.~16\< \tieNeutral ~ < f^3 h >8[\>\! < e b^2> \!] | \change Staff=mid \transpose c' c { a4^1( g8^1 b4 a8^2 | @@ -162,7 +162,7 @@ lefta = \transpose c cis { 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 | @@ -225,7 +225,7 @@ leftb = \transpose c cis { 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 )]~ | } \clef F [( ] 8.) h,16_4\( c d | \voiceTwo diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 50f68d76af..30791698df 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -1,5 +1,5 @@ -\version "2.3.16" +\version "2.3.17" \header{ texidoc=" Beams should behave reasonably well, even under extreme circumstances. @@ -10,17 +10,17 @@ under normal circumstances, these beams would get knees here } 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'] diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index fbc5a4d54b..ce5636bcc0 100644 --- a/input/regression/beam-multiple-cross-staff.ly +++ b/input/regression/beam-multiple-cross-staff.ly @@ -1,4 +1,4 @@ -\version "2.3.16" +\version "2.3.17" \header { texidoc = "Kneed beams (often happens with cross-staff beams) @@ -13,7 +13,7 @@ to the last beam. \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' { diff --git a/input/regression/new-slur.ly b/input/regression/new-slur.ly index 40f182e57f..2908984fcf 100644 --- a/input/regression/new-slur.ly +++ b/input/regression/new-slur.ly @@ -3,7 +3,7 @@ texidoc = "Scoring based slur formatting." } -\version "2.3.16" +\version "2.3.17" \paper { raggedright = ##t % #(define debug-slur-scoring #t) @@ -35,7 +35,7 @@ ^( f ) f _( f ) _( g ) - _( \stemDown g \stemBoth ) + _( \stemDown g \stemNeutral ) c,^( c'' c) c,,^( c'') c,,^( c') diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index 9c0b040f99..5bcf479af4 100644 --- a/input/regression/slur-broken-trend.ly +++ b/input/regression/slur-broken-trend.ly @@ -1,5 +1,5 @@ -\version "2.3.16" +\version "2.3.17" \header{ texidoc=" @@ -31,7 +31,11 @@ in unbroken state. a2.) \stemUp 8( \break - ) - + ) s2..\break + \stemNeutral + \relative { c'8[( c c c] g2 ~ | \break + g1) | \break + \slurDown c8[( c] g4 ~ g2 ~ | \break + g2 ~ g2) } } diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index f062b78245..42f82ac598 100644 --- a/input/regression/slur-nice.ly +++ b/input/regression/slur-nice.ly @@ -1,5 +1,5 @@ -\version "2.3.16" +\version "2.3.17" \header{ texidoc=" Slurs should look nice and symmetric. The curvature may increase @@ -12,11 +12,11 @@ run through noteheads or stems. \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{ diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 8cfba1313b..599e40e51e 100644 --- a/input/regression/spacing-to-grace.ly +++ b/input/regression/spacing-to-grace.ly @@ -1,5 +1,5 @@ -\version "2.3.16" +\version "2.3.17" \header { texidoc ="Space from a normal note (or barline) to a grace note is @@ -12,7 +12,7 @@ { \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' } diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index 2fb1482bd6..332970160e 100644 --- a/input/regression/stem-shorten.ly +++ b/input/regression/stem-shorten.ly @@ -1,5 +1,5 @@ -\version "2.3.16" +\version "2.3.17" \header { @@ -12,9 +12,9 @@ \score { \relative c'' { \stemDown d c b a g f e - \stemBoth + \stemNeutral \stemUp a b c d e f g a - \stemBoth + \stemNeutral 2 } diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly index 10b3ffe91b..9befb9ecb7 100644 --- a/input/regression/stem-tremolo.ly +++ b/input/regression/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "2.3.16" +\version "2.3.17" \header{ texidoc=" Stem tremolos or rolls are tremolo signs that look like beam segments @@ -21,7 +21,7 @@ tremolo must be centered on the note. 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 diff --git a/input/test/music-box.ly b/input/test/music-box.ly index 52f2426200..30bc3c923c 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -1,4 +1,4 @@ -\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 @@ -53,7 +53,7 @@ using Scheme functions to avoid typing work. " } -\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 } } @@ -65,7 +65,7 @@ pat = \transpose c c' \repeat unfold 2 { } 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 1^\fermata \bar "|." } endb = {\stemUp \tieUp r16 c,8.~c,4~c,2 r16 h,,8.~h,,4~h,,2 c,1 \bar "|."} diff --git a/ly/catalan.ly b/ly/catalan.ly index e7021c167c..4be85c14ee 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -1,7 +1,7 @@ %{ 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. @@ -73,6 +73,6 @@ pitchnamesCatalan = #`( pitchnames = \pitchnamesCatalan -\version "2.3.16" +\version "2.3.17" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/property-init.ly b/ly/property-init.ly index e1ddfe47da..23149d1365 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,14 +1,14 @@ % 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 @@ -17,7 +17,7 @@ slurSolid = \revert Slur #'dashed 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 @@ -26,7 +26,7 @@ shiftOff = \revert NoteColumn #'horizontal-shift 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 @@ -45,7 +45,7 @@ dynamicDown = { \override DynamicText #'direction = #-1 \override DynamicLineSpanner #'direction = #-1 } -dynamicBoth = { +dynamicNeutral = { \revert DynamicText #'direction \revert DynamicLineSpanner #'direction } @@ -53,11 +53,11 @@ dynamicBoth = { 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 = { @@ -103,13 +103,6 @@ hideStaffSwitch = \set followVoice = ##f -% 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 @@ -125,7 +118,7 @@ arpeggioDown = \sequential { \revert Arpeggio #'print-function \override Arpeggio #'arpeggio-direction = #-1 } -arpeggioBoth = \sequential { +arpeggioNeutral = \sequential { \revert Arpeggio #'print-function \revert Arpeggio #'arpeggio-direction } diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 206d573c34..07f0df5a62 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -582,8 +582,8 @@ def repeat_prepend(): 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) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 3327953d56..ad5bfd3cc1 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -2197,6 +2197,15 @@ conversions.append (((2, 3, 16), conv, '''\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 ################################ -- 2.39.2