From 92d6547c55c4b085948e0571da9fbc7eef7beacd Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 13 Nov 2002 01:02:43 +0000 Subject: [PATCH] *** empty log message *** --- input/regression/abe.ly | 2 +- input/regression/accidental-cautionary.ly | 2 +- input/regression/accidental-double.ly | 2 +- input/regression/accidental-ledger.ly | 2 +- input/regression/accidental-octave.ly | 2 +- input/regression/accidental-placement.ly | 2 +- input/regression/accidental-single-double.ly | 2 +- input/regression/accidental-unbroken-tie-spacing.ly | 2 +- input/regression/accidental-voice.ly | 2 +- input/regression/accidental.ly | 2 +- input/regression/accidentals.ly | 2 +- input/regression/arpeggio-collision.ly | 2 +- input/regression/arpeggio.ly | 6 +++--- input/regression/auto-beam-bar.ly | 2 +- input/regression/auto-beam-triplet.ly | 2 +- input/regression/auto-beam-tuplets.ly | 2 +- input/regression/auto-change.ly | 2 +- scm/grob-property-description.scm | 1 + scripts/convert-ly.py | 7 ++++--- 19 files changed, 24 insertions(+), 22 deletions(-) diff --git a/input/regression/abe.ly b/input/regression/abe.ly index d2e948b0df..30bb881b98 100644 --- a/input/regression/abe.ly +++ b/input/regression/abe.ly @@ -1,7 +1,7 @@ \header { texidoc="Automatic beamer behaves nicely." } -\version "1.5.68" +\version "1.7.6" \include "paper16.ly" \paper { linewidth = 390.000000 \pt } diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index 3980f84f02..55896b3cff 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.6" \header { texidoc = "Cautionary accidentals are indicated using either diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index 58707bb0c8..4451276f91 100644 --- a/input/regression/accidental-double.ly +++ b/input/regression/accidental-double.ly @@ -1,4 +1,4 @@ -\version "1.7.5" +\version "1.7.6" \header { texidoc = "If two forced accidentals happen at the same time, only one sharp sign is printed." diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly index 9128d022f5..d55a9ca93b 100644 --- a/input/regression/accidental-ledger.ly +++ b/input/regression/accidental-ledger.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.6" \header { texidoc = "Ledger lines are shortened when there are accidentals" diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index 5c3bfd727a..3ed18f9309 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -1,5 +1,5 @@ -\version "1.7.5" +\version "1.7.6" \header { texidoc=" diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index a0b6ab656f..80f8b6e003 100644 --- a/input/regression/accidental-placement.ly +++ b/input/regression/accidental-placement.ly @@ -1,4 +1,4 @@ -\version "1.7.5" +\version "1.7.6" \header { texidoc ="Accidentals are placed as closely as possible. Accidentals in corresponding octaves are aligned. diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly index 8b3f5ab943..4ce483a997 100644 --- a/input/regression/accidental-single-double.ly +++ b/input/regression/accidental-single-double.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.6" \header{ texidoc=" A sharp sign after a double sharp sign, as well as a flat sign diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 7d4e017b7f..e4361d1f1e 100644 --- a/input/regression/accidental-unbroken-tie-spacing.ly +++ b/input/regression/accidental-unbroken-tie-spacing.ly @@ -3,7 +3,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wrea the spacing when unbroken." } -\version "1.5.68" +\version "1.7.6" \include "deutsch.ly" rechts = \notes \relative c' { diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index d50af32d93..521fc43558 100644 --- a/input/regression/accidental-voice.ly +++ b/input/regression/accidental-voice.ly @@ -1,4 +1,4 @@ -\version "1.7.5" +\version "1.7.6" \header{ texidoc=" diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly index 598d8a0767..4d48f7b307 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.6" \header{ texidoc=" diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index b18a0e89a1..6369ad13b0 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -1,4 +1,4 @@ -\version "1.7.5" +\version "1.7.6" \header{ texidoc=" diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index 9c371ca772..ecf776a67e 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,4 +1,4 @@ -\version "1.7.5" +\version "1.7.6" \header { texidoc = "arpeggio stays clear of accidentals and flipped note heads. diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index e956dc4e7f..507e23c2e6 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.6" \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. @@ -15,14 +15,14 @@ Arpeggios are supported, both cross-staff and broken single staff. \context Voice < fis,-\arpeggio d a > %%\property PianoStaff.SpanArpeggio \override #'connect = ##t \property PianoStaff.connectArpeggios = ##t - + } \context Staff=two \notes\relative c{ \clef bass \context Voice < g b d-\arpeggio > \property Staff.Arpeggio \override #'arpeggio-direction = #-1 \context Voice < g b d-\arpeggio > - + } > } diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index 83d3683ad2..57b932873c 100644 --- a/input/regression/auto-beam-bar.ly +++ b/input/regression/auto-beam-bar.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.6" \header{ texidoc=" diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index d48d74f8a9..cdc88b9335 100644 --- a/input/regression/auto-beam-triplet.ly +++ b/input/regression/auto-beam-triplet.ly @@ -3,7 +3,7 @@ texidoc = "Automatic beaming is also done on tuplets." } -\version "1.5.68" +\version "1.7.6" \score{ \notes\relative c''{ diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly index f1ace500bc..ffc037e1e3 100644 --- a/input/regression/auto-beam-tuplets.ly +++ b/input/regression/auto-beam-tuplets.ly @@ -1,4 +1,4 @@ -\version "1.7.3" +\version "1.7.6" \header { texidoc = "Tuplet-spanner should not put (visible) brackets on diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index a7bfcc2cc7..98ee678409 100644 --- a/input/regression/auto-change.ly +++ b/input/regression/auto-change.ly @@ -1,4 +1,4 @@ -\version "1.5.68" +\version "1.7.6" \header { diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index a64711dba4..abef417f2d 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -384,6 +384,7 @@ reference point. TODO: revise typing.") (grob-property-description 'self-alignment-Y number? "like self-alignment-X but for Y axis.") +(grob-property-description 'segments list? "DOCME. ") (grob-property-description 'shape symbol? "shape of cluster segments. Valid values include 'leftsided-stairs', 'rightsided-stairs', 'centered-stairs', and 'ramp'.") (grob-property-description 'shorten number? "the amount of space that a stem should be shortened (DOCME!)") (grob-property-description 'shorten-pair number-pair? "the length on each side to shorten a text-spanner, for example a pedal bracket") diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index d9fe48c397..6c19829bfa 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1089,7 +1089,7 @@ if 1: return str conversions.append (((1,7,5), conv, '\transpose TO -> \transpose FROM TO')) -if 0: +if 1: def conv(str): kws = ['arpeggio', 'sustainDown', @@ -1106,8 +1106,9 @@ if 0: ] origstr = string.join (kws, '|') - str = re.sub (r'([^-])\\(%s)\b' % origstr, r'\1-\\\2', str) - conversions.append (((1,7,4), conv, 'note\\script -> note-\script')) + str = re.sub (r'([^_^-])\\(%s)\b' % origstr, r'\1-\\\2', str) + return str + conversions.append (((1,7,6), conv, 'note\\script -> note-\script')) ################################ -- 2.39.5