From 13fa4b98f628bdb74f82cdc70fc328dbf118b659 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 1 Mar 2001 11:44:35 +0100 Subject: [PATCH] patch::: 1.3.133.jcn4 1.3.133.jcn4 ============ * convert-ly: Added and fixed various entries (our strings with optional "" really suck). --- CHANGES | 7 +- Documentation/user/tricks.itely | 2 +- VERSION | 2 +- input/tricks/metronome.ly | 2 +- lily/midi-walker.cc | 3 - make/ly.make | 4 +- mutopia/Coriolan/bassi.ly | 2 +- mutopia/Coriolan/c-midi.ly | 92 ------------------- mutopia/Coriolan/coriolan.ly | 67 -------------- mutopia/J.S.Bach/Duette/global-i.ly | 2 +- mutopia/J.S.Bach/Duette/global-ii.ly | 4 +- mutopia/J.S.Bach/Duette/viola-i.ly | 2 +- mutopia/J.S.Bach/Duette/viola-ii.ly | 2 +- mutopia/J.S.Bach/Duette/viola-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-i.ly | 42 +++++++-- mutopia/J.S.Bach/Duette/violino-ii.ly | 12 +-- mutopia/J.S.Bach/Duette/violino-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-viola.ly | 2 +- .../J.S.Bach/Duette/violino-violoncello.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-i.ly | 6 +- mutopia/J.S.Bach/Duette/violoncello-ii.ly | 5 +- mutopia/J.S.Bach/Duette/violoncello-part.ly | 2 +- scripts/convert-ly.py | 33 +++++-- 23 files changed, 91 insertions(+), 208 deletions(-) diff --git a/CHANGES b/CHANGES index a5127e2557..13885158f0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,10 +1,13 @@ +1.3.133.jcn4 +============ + +* convert-ly: Added and fixed various entries (our strings with optional "" really suck). + 1.3.133.jcn3 ============ * Small ez play tweaks. Guess I'm a sucker too. -* - 1.3.133.jcn2 ============ diff --git a/Documentation/user/tricks.itely b/Documentation/user/tricks.itely index 87381bec1f..8a7e3a539d 100644 --- a/Documentation/user/tricks.itely +++ b/Documentation/user/tricks.itely @@ -252,7 +252,7 @@ Metrome hack... \score { \notes\relative c'' { - a1^#`(rows ,dotted-eight-note " = 64") + a1^#`((rows (font-relative-size . -1)) ,dotted-eight-note " = 64") } \paper { linewidth = -1.; diff --git a/VERSION b/VERSION index deaf83e0fe..80d24b236e 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=133 -MY_PATCH_LEVEL=jcn3 +MY_PATCH_LEVEL=jcn4 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/tricks/metronome.ly b/input/tricks/metronome.ly index 1b5bacfa58..859f09f4c5 100644 --- a/input/tricks/metronome.ly +++ b/input/tricks/metronome.ly @@ -18,7 +18,7 @@ \score { \notes\relative c'' { - a1^#`(rows ,dotted-eight-note " = 64") + a1^#`((rows (font-relative-size . -1)) ,dotted-eight-note " = 64") } \paper { linewidth = -1.; diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index c63e046fde..986a58ebdb 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -60,12 +60,9 @@ Midi_walker::do_start_note (Midi_note* note_p) /* let stopnote in queue be ignored, new stop note wins */ stop_note_queue[i].ignore_b_ = true; - -#if 1 /* don't replay start note, */ play_start = false; break; -#endif } else { diff --git a/make/ly.make b/make/ly.make index e41d3bd055..f3a595d95d 100644 --- a/make/ly.make +++ b/make/ly.make @@ -70,7 +70,7 @@ $(outdir)/%-book.ps: $(outdir)/%.ps # # Also clean hand-compiled stuff in cwd # -localclean: local-auto-gen-clean local-letter-clean +localclean: local-auto-gen-clean # Compose string from two parts: must not remove myself. auto-gen-tag=Generated @@ -80,5 +80,3 @@ local-auto-gen-clean: rm -f `grep -l '$(auto-gen-tag)' *` rm -f *.dvi *.png -local-letter-clean: - rm -f $(outdir)-letter/* diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index d78dae7a97..a676500b7f 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -21,7 +21,7 @@ bassiGroup = \context PianoStaff = bassi_group \notes < \property Staff.midiInstrument = #"contrabass" \property Staff.instrument = #"Contrabasso" \property Staff.instr = #"Cb." -% \property Staff.transposing = #-12 + \property Staff.transposing = #-12 \clef "bass"; %\property Staff.clefGlyph = #"clefs-F" %\property Staff.clefPosition = #2 diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly index ca461d2371..e69de29bb2 100644 --- a/mutopia/Coriolan/c-midi.ly +++ b/mutopia/Coriolan/c-midi.ly @@ -1,92 +0,0 @@ - -%% -%% Hopefully, this can be junked when part-combiner+midi+dynamics work ok. -%% - -\version "1.3.117"; - -\include "header.ly" -\include "global.ly" - -\include "flauto-1.ly" -\include "flauto-2.ly" -\include "oboe-1.ly" -\include "oboe-2.ly" -\include "clarinetto-1.ly" -\include "clarinetto-2.ly" -\include "fagotto-1.ly" -\include "fagotto-2.ly" -\include "corno-1.ly" -\include "corno-2.ly" -\include "trombo-1.ly" -\include "trombo-2.ly" -\include "timpani.ly" -\include "violino-1.ly" -\include "violino-2.ly" -\include "viola-1.ly" -\include "viola-2.ly" -\include "violoncello.ly" -\include "contrabasso.ly" - -\score{ - < - \global - \context Staff=flauti < - \property Staff.midiInstrument = #"flute" - \flautoI - \flautoII - > - \context Staff=oboi < - \property Staff.midiInstrument = #"oboe" - \oboeI - \oboeII - > - \context Staff=clarinetti < - \property Staff.midiInstrument = #"clarinet" - \property Staff.transposing = #-2 - \clarinettoI - \clarinettoII - > - \context Staff=fagotti < - \property Staff.midiInstrument = #"bassoon" - \fagottoI - \fagottoII - > - \context Staff=corni < - \property Staff.midiInstrument = #"french horn" - \property Staff.transposing = #3 - \cornoI - \cornoII - > - \context Staff=trombe < - \property Staff.midiInstrument = #"trumpet" - \tromboI - \tromboII - > - \context Staff=timpani < - \property Staff.midiInstrument = #"timpani" - \timpani - > - \context Staff=violini < - \property Staff.midiInstrument = #"violin" - \violinoI - \violinoII - > - \context Staff=violi < - \property Staff.midiInstrument = #"viola" - \violaI - \violaII - > - \context Staff=violoncello < - \property Staff.midiInstrument = #"cello" - \violoncello - > - \context Staff=contrabasso < - \property Staff.midiInstrument = #"contrabass" - \property Staff.transposing = #-12 - \contrabasso - > - > - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index d3a9333039..73bd1d222e 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -62,72 +62,5 @@ archiGroup = \context StaffGroup = archi_group < instrument = ""; } \include "coriolan-paper.ly" -% \include "coriolan-midi.ly" -} - - - -%% -%% Hopefully, this can be junked when part-combiner+midi+dynamics work ok. -%% -\score{ - < - \global - \context Staff=flauti < - \property Staff.midiInstrument = #"flute" - \flautoI - \flautoII - > - \context Staff=oboi < - \property Staff.midiInstrument = #"oboe" - \oboeI - \oboeII - > - \context Staff=clarinetti < - \property Staff.midiInstrument = #"clarinet" - \property Staff.transposing = #-2 - \clarinettoI - \clarinettoII - > - \context Staff=fagotti < - \property Staff.midiInstrument = #"bassoon" - \fagottoI - \fagottoII - > - \context Staff=corni < - \property Staff.midiInstrument = #"french horn" - \property Staff.transposing = #3 - \cornoI - \cornoII - > - \context Staff=trombe < - \property Staff.midiInstrument = #"trumpet" - \tromboI - \tromboII - > - \context Staff=timpani < - \property Staff.midiInstrument = #"timpani" - \timpani - > - \context Staff=violini < - \property Staff.midiInstrument = #"violin" - \violinoI - \violinoII - > - \context Staff=violi < - \property Staff.midiInstrument = #"viola" - \violaI - \violaII - > - \context Staff=violoncello < - \property Staff.midiInstrument = #"cello" - \violoncello - > - \context Staff=contrabasso < - \property Staff.midiInstrument = #"contrabass" - \property Staff.transposing = #-12 - \contrabasso - > - > \include "coriolan-midi.ly" } diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index a365e6653a..acfdc4ed95 100644 --- a/mutopia/J.S.Bach/Duette/global-i.ly +++ b/mutopia/J.S.Bach/Duette/global-i.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; +\version "1.3.122"; globalI = \notes{ \time 12/8; diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly index 056f9a2dde..4bae8e8b01 100644 --- a/mutopia/J.S.Bach/Duette/global-ii.ly +++ b/mutopia/J.S.Bach/Duette/global-ii.ly @@ -1,7 +1,7 @@ -\version "1.3.117"; +\version "1.3.122"; globalIi = \notes{ \time 4/4; - \property Staff.timeSignatureStyle = "C2/2" + \property Staff.TimeSignature \override #'style = #'C2/2 \key a\minor; } diff --git a/mutopia/J.S.Bach/Duette/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly index e775ffc451..713333dc53 100644 --- a/mutopia/J.S.Bach/Duette/viola-i.ly +++ b/mutopia/J.S.Bach/Duette/viola-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; \include "global-i.ly" \include "violoncello-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly index e8f02155cc..502a52cafb 100644 --- a/mutopia/J.S.Bach/Duette/viola-ii.ly +++ b/mutopia/J.S.Bach/Duette/viola-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; \include "global-ii.ly" \include "violoncello-ii.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly index acec5f0502..843ff1af78 100644 --- a/mutopia/J.S.Bach/Duette/viola-part.ly +++ b/mutopia/J.S.Bach/Duette/viola-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 801484af2c..d9378651b3 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -8,13 +8,37 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; violinoI = \notes\relative c'' { - \property Voice.beamAutoEnd = "3/8" - %% should fix autobeamer: not only check shortest type's end in beam, - %%% but also the newly added type's end - \property Voice."beamAutoEnd_8" = "1/16" + \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 3 8) + %{ + should fix autobeamer: not only check shortest type's end in beam, + but also the newly added type's end + + %\property Voice.autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 16) + + Normally, we want + + [c8 c c] and [c16 c c c c c], + + ie '(end *) = 3/8 + + However, we don't want + + [c16 c c c c8] c8, TODO: manually correct these + + but rather + + [c16 c c c] c8 c8, + + ie '(end X) = 1/4 + + X can't be 1/16 or 1/8 + + Hmm. + %} + %r4 r8 [g16(fis e)d] b'8 a r r [g16(fis e)d] c'8 | r4 r8 g16(fis e)d b'8 a r r g16(fis e)d c'8 | b r r d16(b)a g(e')c d(b)a g(c)a c(b)a g(a)fis | @@ -68,8 +92,8 @@ violinoI = \notes\relative c'' { ~c16 b(a g)e' c()d b(a g)c a()c b(a)g \context Staff< %\context Voice { a16 f | g1. } - \context Voice { \property Voice.verticalDirection=1 a16 fis | g1. } - \context Voice=x { \property Voice.verticalDirection=-1 c,16 c | b1. } + \context Voice { \stemUp\slurUp\tieUp a16 fis | g1. } + \context Voice=x { \stemDown\slurDown\tieDown c,16 c | b1. } > \bar "|."; } @@ -78,8 +102,8 @@ violinoI = \notes\relative c'' { violinoIStaff = \context Staff = violino < %urg - % \notes\property Voice.textStyle = "large" s4^"Moderato" - % \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"} + % \notes\property Voice.TextScript \set #'font-style = #'large s4^"Moderato" + % \notes {s4. \property Voice.TextScript \set #'font-style = #'large s4^"Moderato"} % urg, timidity violino patches broken? %\property Staff.instrument = "violin" \property Staff.instrument = "viola" diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly index 0f62881ea3..9ea395694f 100644 --- a/mutopia/J.S.Bach/Duette/violino-ii.ly +++ b/mutopia/J.S.Bach/Duette/violino-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; violinoIi = \notes\relative c''{ R1*8 | @@ -68,7 +68,7 @@ violinoIi = \notes\relative c''{ %| checkme \context Staff< \context Voice { - \property Voice.verticalDirection=1 + \stemUp\slurUp\tieUp gis\prall|a8 g f4~f8 e(d)cis| %105 d c bes4~bes8 a(gis)fis|gis4 e | @@ -77,7 +77,7 @@ violinoIi = \notes\relative c''{ a1| } \context Voice=x { - \property Voice.verticalDirection=-1 + \stemDown\slurDown\tieDown d,4 ss| s2| %105 s2|s1| @@ -93,12 +93,12 @@ violinoIi = \notes\relative c''{ violinoIiStaff = \context Staff = violino < %urg - % \notes\property Voice.textStyle = "large" s4^"Moderato" - % \notes {s4. \property Voice.textStyle = "large" s4^"Moderato"} + % \notes\property Voice.TextScript \set #'font-style = #'large s4^"Moderato" + % \notes {s4. \property Voice.TextScript \set #'font-style = #'large s4^"Moderato"} % urg, timidity violino patches broken? %\property Staff.instrument = "violin" \property Staff.instrument = "viola" \violinoIi \globalIi > -\version "1.3.117"; +\version "1.3.122"; diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index 4f535e7fd8..25b0782c3d 100644 --- a/mutopia/J.S.Bach/Duette/violino-part.ly +++ b/mutopia/J.S.Bach/Duette/violino-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index 7cc2dcd082..615caf450f 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly index 222fb716e7..7bd4401da9 100644 --- a/mutopia/J.S.Bach/Duette/violino-violoncello.ly +++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly index fb2ca5202f..36bd5f4828 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-i.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly @@ -8,10 +8,12 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; violoncelloI = \notes\relative c{ - \property Voice.beamAutoEnd = "3/8" + \property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 3 8) + %\property Voice.autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 16) + g8()a d, g b()g d()fis a d a()fis | g()d b' g b()c b()e fis g d()d, | g r r [d'16(b a )g] e'8 d r r [c16(b a )b] g'8 | diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly index ac3bbd788a..f0a6cef080 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-ii.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; violoncelloIi = \notes\relative c{ r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis| @@ -52,7 +52,8 @@ violoncelloIi = \notes\relative c{ %75 e dis8 cis dis2\prall|e4 b' e2~|e dis\prall|e r4 d|cis bes(a\prall)g| %80 - bes, g'(()f\prall)e|g, e'(()d\prall)cis|d8()a d e f g as f|d e f4.(e8 d)c| + %FIXME: did Bach really use phrasing marks? + bes, g'\(()f\prall\)e|g, e'\(()d\prall\)cis|d8()a d e f g as f|d e f4.(e8 d)c| b c d4.(c8 b)a| %85 b()g b c d()e b d|e4 e, a2~|a4 g8 fis g2~|g4 a8 b c2~|c4 bes8 a bes2~| diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly index ba58376170..135d9c04e6 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-part.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.117"; +\version "1.3.122"; % { diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index c8a19658b7..3481615241 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -389,7 +389,7 @@ if 1: if 1: def conv (str): - str = re.sub ('beamAuto([^=]+)= *"([0-9]+)/([0-9]+)" *;', + str = re.sub ('"?beamAuto([^"=]+)"? *= *"([0-9]+)/([0-9]+)" *;*', 'beamAuto\\1 = #(make-moment \\2 \\3)', str) return str @@ -506,15 +506,19 @@ if 1: str = re.sub ('basicLocalKeyProperties' ,"Accidentals", str) str = re.sub ('basicMarkProperties' ,"Accidentals", str) str = re.sub ('basic([A-Za-z_]+)Properties', '\\1', str) + return str conversions.append (((1,3,92), conv, 'basicXXXProperties -> XXX')) if 1: def conv (str): + # Ugh, but meaning of \stemup changed too + # maybe we should do \stemup -> \stemUp\slurUp\tieUp ? str = re.sub ('\\\\stemup', '\\\\stemUp', str) str = re.sub ('\\\\stemdown', '\\\\stemDown', str) str = re.sub ('\\\\stemboth', '\\\\stemBoth', str) + str = re.sub ('\\\\slurup', '\\\\slurUp', str) str = re.sub ('\\\\slurboth', '\\\\slurBoth', str) str = re.sub ('\\\\slurdown', '\\\\slurDown', str) @@ -531,7 +535,13 @@ if 1: str = re.sub ('\\\\voicetwo', '\\\\voiceTwo', str) str = re.sub ('\\\\voicethree', '\\\\voiceThree', str) str = re.sub ('\\\\voicefour', '\\\\voiceFour', str) - + + # I don't know exactly when these happened... + str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?(1|(\\\\up))', '\\\\stemUp\\\\slurUp\\\\tieUp', str) + str = re.sub ('\\\\property *[^ ]*verticalDirection[^=]*= *#?((-1)|(\\\\down))', '\\\\stemDown\\\\slurDown\\\\tieDown', str) + str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?(1|(\\\\up))', '\\\\\\1Up', str) + str = re.sub ('\\\\property *[^ .]*[.]?([a-z]+)VerticalDirection[^=]*= *#?((-1)|(\\\\down))', '\\\\\\1Down', str) + return str conversions.append (((1,3,93), conv, @@ -550,10 +560,17 @@ if 1: conversions.append (((1,3,97), conv, 'ChordName -> ChordNames')) + +## TODO: add lots of these + if 1: def conv (str): - str = re.sub ('\\\\property *Voice *[.] *textStyle *= *"([^"]*)"', '\\\\property Voice.TextScript \\\\set #\'font-style = #\'\\1', str) - str = re.sub ('\\\\property *Lyrics *[.] *textStyle *= *"([^"]*)"', '\\\\property Lyrics.LyricText \\\\set #\'font-style = #\'\\1', str) + str = re.sub ('\\\\property *"?Voice"? *[.] *"?textStyle"? *= *"([^"]*)"', '\\\\property Voice.TextScript \\\\set #\'font-style = #\'\\1', str) + str = re.sub ('\\\\property *"?Lyrics"? *[.] *"?textStyle"? *= *"([^"]*)"', '\\\\property Lyrics.LyricText \\\\set #\'font-style = #\'\\1', str) + + str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?timeSignatureStyle"? *= *"([^"]*)"', '\\\\property \\1.TimeSignature \\\\override #\'style = #\'\\2', str) + + str = re.sub ('\\\\property *"?([^.]+)"? *[.] *"?horizontalNoteShift"? *= *"?#?([0-9]+)"?', '\\\\property \\1.NoteColumn \\\\override #\'horizonta-shift = #\\2', str) return str @@ -561,10 +578,10 @@ if 1: if 1: def conv (str): - str = re.sub ('beamAutoEnd_([0-9]*) *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end 1 \\1 * *) = \\2', str) - str = re.sub ('beamAutoBegin_([0-9]*) *= *(#\\([^)]*\))', 'autoBeamSettings \\push #\'(begin 1 \\1 * *) = \\2', str) - str = re.sub ('beamAutoEnd *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end * * * *) = \\1', str) - str = re.sub ('beamAutoBegin *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(begin * * * *) = \\1', str) + str = re.sub ('"?beamAutoEnd_([0-9]*)"? *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end 1 \\1 * *) = \\2', str) + str = re.sub ('"?beamAutoBegin_([0-9]*)"? *= *(#\\([^)]*\))', 'autoBeamSettings \\push #\'(begin 1 \\1 * *) = \\2', str) + str = re.sub ('"?beamAutoEnd"? *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(end * * * *) = \\1', str) + str = re.sub ('"?beamAutoBegin"? *= *(#\\([^)]*\\))', 'autoBeamSettings \\push #\'(begin * * * *) = \\1', str) return str -- 2.39.5