From: Jan Nieuwenhuizen Date: Sat, 21 Oct 2000 19:09:14 +0000 (+0200) Subject: patch::: 1.3.96.jcn8 X-Git-Tag: release/1.3.97~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=60dd8eb0afbed0abae97e96b1f2c98b90da00bf5;p=lilypond.git patch::: 1.3.96.jcn8 --- diff --git a/VERSION b/VERSION index 0716cceb70..bcd827905b 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=96 -MY_PATCH_LEVEL=jcn7 +MY_PATCH_LEVEL=jcn8 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/denneboom.ly b/input/denneboom.ly index 3fa6b727a0..2600ab0ed0 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -7,7 +7,7 @@ copyright = "public domain"; \include "paper20.ly" -\version "1.3.93"; +\version "1.3.96"; oden = \lyrics{ O | diff --git a/input/example-1.ly b/input/example-1.ly index 839690d4c7..f9ac3b298b 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -17,4 +17,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/example-2.ly b/input/example-2.ly index 982027eb40..1c7c56208c 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -17,4 +17,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/example-3.ly b/input/example-3.ly index 7446e2eb47..1819d76805 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; one = \notes\relative c{ c'' d e f diff --git a/input/just-friends.ly b/input/just-friends.ly index 82b34fc94d..8eef71faa1 100644 --- a/input/just-friends.ly +++ b/input/just-friends.ly @@ -48,7 +48,7 @@ of a certain tune (Jazz, Real Book, for example), like indent = 0.0\mm; linewidth = 100.0\mm; \translator{ - \ChordNameContext + \ChordNamesContext barAuto = "1"; \consists Bar_engraver; \consists "Repeat_engraver"; @@ -56,4 +56,4 @@ of a certain tune (Jazz, Real Book, for example), like } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index e6680033fb..6fe81a6229 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -22,7 +22,7 @@ * organ staff... %} -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/rhythm.ly b/input/rhythm.ly index c0eebab78b..ded45e1890 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.3.93"; +\version "1.3.96"; ritme = \notes\transpose c'' { \time 4/4; diff --git a/input/scarlatti-properties.ly b/input/scarlatti-properties.ly index b364b406d2..52e9c4fb8a 100644 --- a/input/scarlatti-properties.ly +++ b/input/scarlatti-properties.ly @@ -1,7 +1,7 @@ -\version "1.3.93"; +\version "1.3.96"; rh=\property Thread.NoteHead \push #'style = #'default lh=\property Thread.NoteHead \push #'style = #'diamond diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 1416f5bf83..f3033e00f8 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -4,7 +4,7 @@ http://www.Arkkra.com/doc/star.html http://www.Arkkra.com/doc/star.ps %} -\version "1.3.93"; +\version "1.3.96"; % TODO: % diff --git a/input/test/accid.ly b/input/test/accid.ly index fb00fbc50e..ec686fadc0 100644 --- a/input/test/accid.ly +++ b/input/test/accid.ly @@ -10,4 +10,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/accidental-spacing.ly b/input/test/accidental-spacing.ly index 19d07f138b..22217e1208 100644 --- a/input/test/accidental-spacing.ly +++ b/input/test/accidental-spacing.ly @@ -7,4 +7,4 @@ linewidth=-1.0; } \midi { } -} \ No newline at end of file +} diff --git a/input/test/as.ly b/input/test/as.ly index 3aa062eec9..06cc24dea3 100644 --- a/input/test/as.ly +++ b/input/test/as.ly @@ -6,4 +6,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/as1.ly b/input/test/as1.ly index cd66621667..2003013d42 100644 --- a/input/test/as1.ly +++ b/input/test/as1.ly @@ -7,4 +7,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/auto-isknee.ly b/input/test/auto-isknee.ly index b53ec2924a..ea22d212a7 100644 --- a/input/test/auto-isknee.ly +++ b/input/test/auto-isknee.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \notes \context PianoStaff < \context Staff = "up" { diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 89689d4358..e9be547c7a 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "1.3.80"; +\version "1.3.96"; % bagpipe music. \header @@ -12,20 +12,20 @@ \translator { \GraceContext - basicNoteHeadProperties \push #'font-size = #-2 - basicNoteHeadProperties \push #'font-size = #-2 - basicStemProperties \push #'flag-style = ##f + NoteHead \push #'font-size = #-2 + NoteHead \push #'font-size = #-2 + Stem \push #'flag-style = ##f % The following determines the length of stems without beams % default is between 2.8 and 4.0 depending on the number of flags - basicStemProperties \push #'length = #6 - basicStemProperties \push #'font-size = #-2 - basicGraceAlignItemProperties \push #'horizontal-space = #1 - basicStemProperties \push #'flag-style = #"" + Stem \push #'length = #6 + Stem \push #'font-size = #-2 + GraceAlignItem \push #'horizontal-space = #1 + Stem \push #'flag-style = #"" } \translator { \StaffContext - basicTimeSignatureProperties \push #'style = #"C4/4" - basicTimeSignatureProperties \push #'visibility-function = #begin-of-line-visible + TimeSignature \push #'style = #"C4/4" + TimeSignature \push #'visibility-function = #begin-of-line-visible } } @@ -72,7 +72,7 @@ gcdg = \notes{ \grace { [g'32 c d]}} \score { \notes { \time 6/8; \partial 4; \property Voice.tieVerticalDirection = \up - \slurup + \slurUp f4 | \gg f4 e8 \thrd d4. | \eg a4.()a4 d8 | diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index 91691f5978..f1f0284d9f 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \header{ enteredby = "jcn"; diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index c40ab56b41..2ab1966e14 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.96"; onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-abbrev.ly b/input/test/beam-abbrev.ly index e23cb2d407..3d64f71efa 100644 --- a/input/test/beam-abbrev.ly +++ b/input/test/beam-abbrev.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \context Voice \notes\relative c { c'1:16 diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index ac00bc9b3c..447c03554e 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly index 0c27c6b744..f15ddae723 100644 --- a/input/test/beam-control.ly +++ b/input/test/beam-control.ly @@ -20,4 +20,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index 7bdd5232b4..7ba56ff437 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -22,4 +22,4 @@ > } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/beam-damp.ly b/input/test/beam-damp.ly index 5cfc6bcd04..b4d50f4560 100644 --- a/input/test/beam-damp.ly +++ b/input/test/beam-damp.ly @@ -17,4 +17,4 @@ linewidth=-1.; } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/beam-dir.ly b/input/test/beam-dir.ly index 3b431ef15b..6b95542399 100644 --- a/input/test/beam-dir.ly +++ b/input/test/beam-dir.ly @@ -5,4 +5,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/beam-extreme.ly b/input/test/beam-extreme.ly index 9d84d55709..d538b2318d 100644 --- a/input/test/beam-extreme.ly +++ b/input/test/beam-extreme.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes\relative c''{ [g8 c c,] diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index d8e3197d30..376bb4b369 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -16,4 +16,4 @@ } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/beam-length.ly b/input/test/beam-length.ly index c408e64b2c..0b39c8e46a 100644 --- a/input/test/beam-length.ly +++ b/input/test/beam-length.ly @@ -7,4 +7,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/beam-position.ly b/input/test/beam-position.ly index 2d912fd9e3..940843afc5 100644 --- a/input/test/beam-position.ly +++ b/input/test/beam-position.ly @@ -9,4 +9,4 @@ linewidth=-1.0; } \midi { } -} \ No newline at end of file +} diff --git a/input/test/beam-slope.ly b/input/test/beam-slope.ly index 90316d2ea4..47eb49c3b5 100644 --- a/input/test/beam-slope.ly +++ b/input/test/beam-slope.ly @@ -5,4 +5,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/beam-suspect.ly b/input/test/beam-suspect.ly index 9ae29bcfd1..46fc2afd7f 100644 --- a/input/test/beam-suspect.ly +++ b/input/test/beam-suspect.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes\relative c'{ \stemUp diff --git a/input/test/beam-trend.ly b/input/test/beam-trend.ly index 7c1357fec4..7182e5c82d 100644 --- a/input/test/beam-trend.ly +++ b/input/test/beam-trend.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes\relative c'{ \stemUp diff --git a/input/test/beams.ly b/input/test/beams.ly index f219590cc5..018bd4c032 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.3.93"; +\version "1.3.96"; \score{ < diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index 9eaaa673b8..634ee257f2 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \notes \relative c' { diff --git a/input/test/broken.ly b/input/test/broken.ly index 38cf583388..ed1f191cbd 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.93"; +\version "1.3.96"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index fe78836b81..5d717e02f9 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{ > } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index 6527e63723..3ec0e0ec1a 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{ } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/chords.ly b/input/test/chords.ly index 8a6b07823f..c5b31dcfb5 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; %{ Would this be acceptable/good enough/convenient for entry? @@ -61,8 +61,8 @@ keys = \notes{ > \paper{ \translator { - \ChordNameContext - ChordName \push #'word-space = #1 + \ChordNamesContext + ChordNames \push #'word-space = #1 } } } diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 7a70aaf0c1..6ede9ce6cc 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \notes{ diff --git a/input/test/collision-merge-dotted.ly b/input/test/collision-merge-dotted.ly index 9fa2d0749c..21bec97b81 100644 --- a/input/test/collision-merge-dotted.ly +++ b/input/test/collision-merge-dotted.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \context Voice \notes\relative c { diff --git a/input/test/collisions.ly b/input/test/collisions.ly index e31e717b57..6ae299fb0b 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,7 +5,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.3.93"; +\version "1.3.96"; twovoice = \context Staff \notes < \context Voice=i { \stemDown c4 d e f g2~ g4 a [c8 d e f] c2| } diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index 05fa27508e..4eaee53619 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { diff --git a/input/test/dots.ly b/input/test/dots.ly index a4ffc101a2..b21cd00eee 100644 --- a/input/test/dots.ly +++ b/input/test/dots.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \context Voice \notes\relative c'' { \time 6/8; diff --git a/input/test/drarn-chords.ly b/input/test/drarn-chords.ly index 5842761fb9..875761201a 100644 --- a/input/test/drarn-chords.ly +++ b/input/test/drarn-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; %{ Would this be acceptable/good enough/convenient for entry? @@ -31,7 +31,7 @@ scales = \notes \transpose c'' \chords{ \paper{ % \paper_as_nine \translator { - \ChordNameContext + \ChordNamesContext } } } diff --git a/input/test/dynamics.ly b/input/test/dynamics.ly index cd8b8d8a9f..05fca1aaca 100644 --- a/input/test/dynamics.ly +++ b/input/test/dynamics.ly @@ -7,4 +7,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 0effb0a789..25580ed50b 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/font-body.ly b/input/test/font-body.ly index 846928eede..f1643d5438 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 415401f2f5..32ed3fbaab 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.93"; +\version "1.3.96"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 95564bde08..1126c75eea 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.93"; +\version "1.3.96"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 6d43a2be28..04b49aa649 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index b70d20084e..097ddc3812 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \context Voice \notes\relative c { diff --git a/input/test/generic-property-override.ly b/input/test/generic-property-override.ly index adb56e4b3c..c6b503c983 100644 --- a/input/test/generic-property-override.ly +++ b/input/test/generic-property-override.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \notes \relative c'' \context Voice { diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index 8f20ee9a0b..71b5dd5042 100644 --- a/input/test/gmsusd.ly +++ b/input/test/gmsusd.ly @@ -3,7 +3,7 @@ % perhaps the current modifier approach is too simplistic -\version "1.3.93"; +\version "1.3.96"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index e0f5a644d8..53f5258c61 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; %{ diff --git a/input/test/grace-end.ly b/input/test/grace-end.ly index d61b1047b7..0fbacee532 100644 --- a/input/test/grace-end.ly +++ b/input/test/grace-end.ly @@ -6,4 +6,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/hara-kiri-short.ly b/input/test/hara-kiri-short.ly index 5a27380cdc..3566b27fa0 100644 --- a/input/test/hara-kiri-short.ly +++ b/input/test/hara-kiri-short.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.96"; zager = \context Staff = zager \notes \relative c'' { \clef treble; c1 diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index ae042f764d..e1c41c282c 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 30dce01a5c..918b085f27 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; toeter_i = \notes\relative c <{ \property Staff.instrument = #"Toeters" diff --git a/input/test/harmonics.ly b/input/test/harmonics.ly index 1a8eb47295..30c4db4622 100644 --- a/input/test/harmonics.ly +++ b/input/test/harmonics.ly @@ -4,4 +4,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/hshift.ly b/input/test/hshift.ly index 44fc980698..be09c586ab 100644 --- a/input/test/hshift.ly +++ b/input/test/hshift.ly @@ -14,4 +14,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 8813591d7e..9cfe6f60e2 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.3.93"; +\version "1.3.96"; incipit = \notes\relative c'{ diff --git a/input/test/keys.ly b/input/test/keys.ly index c5bd953e7f..c4809ee7e5 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \notes \relative c'' diff --git a/input/test/keys2.ly b/input/test/keys2.ly index 66c040fc5f..5c161a0641 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; blah = \notes { diff --git a/input/test/knee-mult.ly b/input/test/knee-mult.ly index e710d252e3..c1116065af 100644 --- a/input/test/knee-mult.ly +++ b/input/test/knee-mult.ly @@ -16,4 +16,4 @@ } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/knee.ly b/input/test/knee.ly index 3b86f0c937..2c61a32858 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes\relative c'{ [c16 \stemDown c'' \stemBoth c,, d] diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly index bfb58c36aa..85ac0efab4 100644 --- a/input/test/lyric-combine.ly +++ b/input/test/lyric-combine.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.96"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/lyric-extender.ly b/input/test/lyric-extender.ly index 42a416b99b..a238fbd742 100644 --- a/input/test/lyric-extender.ly +++ b/input/test/lyric-extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/lyric-hyphen.ly b/input/test/lyric-hyphen.ly index a27a19b1d7..4efb6251f4 100644 --- a/input/test/lyric-hyphen.ly +++ b/input/test/lyric-hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/lyric-phrasing.ly b/input/test/lyric-phrasing.ly index 0e2dbec581..8c790f35fd 100644 --- a/input/test/lyric-phrasing.ly +++ b/input/test/lyric-phrasing.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.96"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t @@ -40,4 +40,4 @@ textIII = \lyrics { la -- da __ doo dah; dargh la dargh loo. } \paper { } -} \ No newline at end of file +} diff --git a/input/test/lyrics-multi-stanza.ly b/input/test/lyrics-multi-stanza.ly index d998078f91..d80bcba78b 100644 --- a/input/test/lyrics-multi-stanza.ly +++ b/input/test/lyrics-multi-stanza.ly @@ -3,7 +3,7 @@ % * Stanza_number_engraver % * Automatic melismata on beamed notes -\version "1.3.93"; +\version "1.3.96"; \include "english.ly" \header{ diff --git a/input/test/lyrics.ly b/input/test/lyrics.ly index 31b8354b63..72a2f9a8b6 100644 --- a/input/test/lyrics.ly +++ b/input/test/lyrics.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; $somewhat_long = \lyrics{ \property Lyrics . textStyle = "roman" diff --git a/input/test/mark.ly b/input/test/mark.ly index 754beeedd5..f48ceba0ff 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; global = \notes { s1 | \mark "A"; diff --git a/input/test/memory.ly b/input/test/memory.ly index ae76027ad9..00c039596a 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/multi-measure-rest.ly b/input/test/multi-measure-rest.ly index ba4aedffa2..def26a27f3 100644 --- a/input/test/multi-measure-rest.ly +++ b/input/test/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \notes { \time 3/4; \key cis \major; R2.*15 R2. R2.*7 } diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index 0738d53849..88e11166bf 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; voice_one = \notes\transpose c''{ \stemUp R1 * 2 | f'4-. r r2 | R1 * 3 | diff --git a/input/test/multi-slope.ly b/input/test/multi-slope.ly index 1cea6506b3..045d649728 100644 --- a/input/test/multi-slope.ly +++ b/input/test/multi-slope.ly @@ -5,4 +5,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/no-stem-extend.ly b/input/test/no-stem-extend.ly index 2f43ce8586..fe48d84f5d 100644 --- a/input/test/no-stem-extend.ly +++ b/input/test/no-stem-extend.ly @@ -17,4 +17,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/non-empty-text.ly b/input/test/non-empty-text.ly index ade385f569..51b38a8bc6 100644 --- a/input/test/non-empty-text.ly +++ b/input/test/non-empty-text.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes\relative c''{ diff --git a/input/test/note-shift.ly b/input/test/note-shift.ly index c81ae2efe3..d4affe5ea9 100644 --- a/input/test/note-shift.ly +++ b/input/test/note-shift.ly @@ -29,4 +29,4 @@ linewidth=-1.0; } \midi { } -} \ No newline at end of file +} diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index 4e2185811e..70e879a476 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -40,4 +40,4 @@ c4 c2 c8 c16 c16 c1 c\breve c\longa } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 60fb93fe1c..9290c19b05 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes \transpose c''{ diff --git a/input/test/number-staff-lines.ly b/input/test/number-staff-lines.ly index d1d42d05af..f275c84ccf 100644 --- a/input/test/number-staff-lines.ly +++ b/input/test/number-staff-lines.ly @@ -6,4 +6,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index f938c5bc3f..0668bd2b50 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; m = \notes \relative c''{ diff --git a/input/test/ossia.ly b/input/test/ossia.ly index bab09a904b..6de5602752 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { diff --git a/input/test/perform-grace.ly b/input/test/perform-grace.ly index 39a88c14fe..7842d17156 100644 --- a/input/test/perform-grace.ly +++ b/input/test/perform-grace.ly @@ -9,4 +9,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/perform-tie.ly b/input/test/perform-tie.ly index 7ec02e5e6a..e4cbd45844 100644 --- a/input/test/perform-tie.ly +++ b/input/test/perform-tie.ly @@ -6,4 +6,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/pushproperty.ly b/input/test/pushproperty.ly index 31e996899e..c91a964ede 100644 --- a/input/test/pushproperty.ly +++ b/input/test/pushproperty.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; %{ diff --git a/input/test/repeatbar.ly b/input/test/repeatbar.ly index 4631d472e9..b606718f09 100644 --- a/input/test/repeatbar.ly +++ b/input/test/repeatbar.ly @@ -7,4 +7,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index 7e65f5cd47..5dc05f149b 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -49,4 +49,4 @@ restsII = \context Staff \notes { } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/rests.ly b/input/test/rests.ly index a52025ae07..7c944f5f98 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -9,4 +9,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/scripts.ly b/input/test/scripts.ly index b426bd6129..80e18cbbbc 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.96"; blah = \notes{ \transpose c'' { diff --git a/input/test/sizes.ly b/input/test/sizes.ly index 420decf0b9..c4a32baebf 100644 --- a/input/test/sizes.ly +++ b/input/test/sizes.ly @@ -14,4 +14,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 0d3ccb443e..bc329381ab 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.93"; +\version "1.3.96"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index 1dcc5cfd20..3cb178686a 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -28,4 +28,4 @@ > } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index b7c52f3bfd..aac38e2428 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.93"; +\version "1.3.96"; \score{ \notes\relative c'{ diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index f7473dacbd..14da7cbc58 100644 --- a/input/test/slur-dash.ly +++ b/input/test/slur-dash.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes{ diff --git a/input/test/slur-follow-music.ly b/input/test/slur-follow-music.ly index 04da8d37d6..8787b5cd91 100644 --- a/input/test/slur-follow-music.ly +++ b/input/test/slur-follow-music.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \context Voice \notes\relative c { % CASE 3 diff --git a/input/test/slur-nice.ly b/input/test/slur-nice.ly index 5bf4da02bc..5e30aca285 100644 --- a/input/test/slur-nice.ly +++ b/input/test/slur-nice.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes\relative c''{ \time 3/4; diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 6b3cf27f35..05ab47eca7 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 7492df7db9..4b9413cb5d 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 6b9b98dfbd..8ef16c4cfa 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.3.93"; +\version "1.3.96"; multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index 8723c11a9e..a5bbdb81e9 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.96"; nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < \context Staff = stone { \nt } diff --git a/input/test/staccato-pos.ly b/input/test/staccato-pos.ly index a6a3489511..dc0150a477 100644 --- a/input/test/staccato-pos.ly +++ b/input/test/staccato-pos.ly @@ -9,4 +9,4 @@ linewidth=-1.0; } \midi { } -} \ No newline at end of file +} diff --git a/input/test/staff-margin-partial.ly b/input/test/staff-margin-partial.ly index d9648fc673..40bfe1d92c 100644 --- a/input/test/staff-margin-partial.ly +++ b/input/test/staff-margin-partial.ly @@ -1,6 +1,6 @@ % test staff margin with partial measure. -\version "1.3.93"; +\version "1.3.96"; \score { \notes { \property Staff.instrument = "foo" \partial 4; c4 c1 } diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly index 0737be1ff9..981b2a598f 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -1,6 +1,6 @@ -\version "1.3.93"; +\version "1.3.96"; \score { diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index e4a04ba2bb..f4c0541ac1 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 486ead240b..d53dbc0401 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -14,4 +14,4 @@ > \paper { linewidth = -1.; } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly index ca1aec2324..2061a8262d 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -6,4 +6,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/stem-spacing.ly b/input/test/stem-spacing.ly index 9c391a6142..772cca797b 100644 --- a/input/test/stem-spacing.ly +++ b/input/test/stem-spacing.ly @@ -8,4 +8,4 @@ linewidth=-1.0; } \midi { } -} \ No newline at end of file +} diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index 5c9d7d86e3..9dce9f94d4 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.96"; \score{ \context Voice\notes \relative c''{ %%? diff --git a/input/test/stem.ly b/input/test/stem.ly index af01e1e777..f884cc1aab 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.3.93"; +\version "1.3.96"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index 81542e6a0a..9f70867255 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.93"; +\version "1.3.96"; % this is an example of extreme dynamics diff --git a/input/test/thumb.ly b/input/test/thumb.ly index e23b193a64..7dc3a251b7 100644 --- a/input/test/thumb.ly +++ b/input/test/thumb.ly @@ -7,7 +7,7 @@ % the thumb-script is used in cello music to indicate a note that should % be played with your thumb. -\version "1.3.93"; +\version "1.3.96"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/tie-sparse.ly b/input/test/tie-sparse.ly index a3b30ae2dc..e00e10e648 100644 --- a/input/test/tie-sparse.ly +++ b/input/test/tie-sparse.ly @@ -10,4 +10,4 @@ linewidth=-1.0; } \midi { } -} \ No newline at end of file +} diff --git a/input/test/time.ly b/input/test/time.ly index e9cae53f81..d97e700df6 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -143,4 +143,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/timing.ly b/input/test/timing.ly index cd8ba855c4..4c0f7a5f80 100644 --- a/input/test/timing.ly +++ b/input/test/timing.ly @@ -20,4 +20,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/title.ly b/input/test/title.ly index dd96c2ff6a..ea16a1a0ff 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.3.93"; +\version "1.3.96"; \score{ \notes diff --git a/input/test/transposing.ly b/input/test/transposing.ly index 3c2ebc2478..f4439b5529 100644 --- a/input/test/transposing.ly +++ b/input/test/transposing.ly @@ -14,4 +14,4 @@ } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 1f483df4e0..926600cd78 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.96"; vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/tup.ly b/input/test/tup.ly index 0be36c81c9..4b1e671760 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -8,4 +8,4 @@ } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly index 0afb1f27dd..375e9b5c7c 100644 --- a/input/test/tuplet.ly +++ b/input/test/tuplet.ly @@ -1,4 +1,4 @@ -\version "1.3.93" +\version "1.3.96" \score { \context Voice \notes\relative c'' { diff --git a/input/test/twinkle-as5.ly b/input/test/twinkle-as5.ly index 78e40399d5..43fa026a46 100644 --- a/input/test/twinkle-as5.ly +++ b/input/test/twinkle-as5.ly @@ -6,7 +6,7 @@ enteredby = "hwn and jcn"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.96"; \include "paper-as5.ly" diff --git a/input/test/two-slurs.ly b/input/test/two-slurs.ly index 9475f78274..854080fe56 100644 --- a/input/test/two-slurs.ly +++ b/input/test/two-slurs.ly @@ -1,4 +1,4 @@ -\version "1.3.93"; +\version "1.3.96"; % % We'd want to combine the stems, but have two slurs too... % Looks like the a-due engraver diff --git a/input/test/updown.ly b/input/test/updown.ly index fe5faf77fc..3ae0713b60 100644 --- a/input/test/updown.ly +++ b/input/test/updown.ly @@ -10,9 +10,9 @@ {\voiceTwo c}> - \version "1.3.93"; + \version "1.3.96"; } \paper { } \midi { } -} \ No newline at end of file +} diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 57fff1e03f..4262f80194 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.93"; +\version "1.3.96"; \score { \notes < diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index c497223856..f51f88c136 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.3.93"; +\version "1.3.96"; diff --git a/input/trip.ly b/input/trip.ly index 4b588fe39b..071311620e 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -19,7 +19,7 @@ TODO: %} -\version "1.3.93"; +\version "1.3.96"; praeludiumRight = \notes { \key e \major; \clef violin; diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 24bf8face8..b82341d10b 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.93"; +\version "1.3.96"; melodie = \notes\relative c'' { \clef "violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index 759ccbc25f..d5788e083d 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -20,7 +20,7 @@ Tested Features: lyrics, interleaving lyrics and staffs, repeats, auto beaming, adding lyrics to notes, hyphens %} -\version "1.3.93"; +\version "1.3.96"; melody = \notes \relative c'' { \clef violin; diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 7578496b8e..9a0944e2ee 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -116,7 +116,7 @@ void Chord_name_engraver::create_chord_name () { assert (chord_p_); - chord_name_p_ = new Item (get_property ("ChordName")); + chord_name_p_ = new Item (get_property ("ChordNames")); /* Hmm, why not represent complete chord as list? ((tonic third fifth) (inversion bass)) diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index 2ed7db67fb..3124f362a1 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.93"; +\version "1.3.96"; \include "declarations.ly" diff --git a/ly/book-init.ly b/ly/book-init.ly index b88f349620..adf2523e79 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.93"; +\version "1.3.96"; \include "declarations.ly"; diff --git a/ly/catalan.ly b/ly/catalan.ly index 1c71d9722f..1739ae0862 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -71,4 +71,4 @@ -\version "1.3.93"; +\version "1.3.96"; diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index 6f87babb9b..52ac0fde26 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.93"; +\version "1.3.96"; \include "declarations.ly" diff --git a/ly/center.ly b/ly/center.ly index ebd09b43fd..1ccfa5bc74 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.93"; +\version "1.3.96"; \include "declarations.ly" diff --git a/ly/deutsch.ly b/ly/deutsch.ly index ae99df64f9..25f2f87431 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,4 +49,4 @@ -\version "1.3.93"; +\version "1.3.96"; diff --git a/ly/english.ly b/ly/english.ly index bd89faceb7..4f125fe764 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -77,5 +77,5 @@ (bss . ( -1 6 2 )) ) -\version "1.3.93"; +\version "1.3.96"; diff --git a/ly/engraver.ly b/ly/engraver.ly index b99cb6ffd3..ee09f7bee8 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -1,5 +1,5 @@ -\version "1.3.93" +\version "1.3.96" % % setup for Request->Element conversion. Guru-only % @@ -266,23 +266,23 @@ LyricsContext = \translator { \accepts "LyricVoice"; } -ChordNameVoiceContext = \translator { +ChordNamesVoiceContext = \translator { \type "Engraver_group_engraver"; - \name ChordNameVoice ; + \name ChordNamesVoice ; \consists "Output_property_engraver"; \consistsend "Axis_group_engraver"; \consists "Separating_line_group_engraver"; \consists "Chord_name_engraver"; } -ChordNameContext = \translator { +ChordNamesContext = \translator { \type "Engraver_group_engraver"; \name ChordNames; Generic_property_list = #generic-chord-staff-properties \consists "Property_engraver"; \consists "Output_property_engraver"; - \accepts "ChordNameVoice"; + \accepts "ChordNamesVoice"; \consistsend "Axis_group_engraver"; } @@ -524,12 +524,16 @@ ScoreContext = \translator { (name . "Clef") ) - ChordName = #`( + ChordNames = #`( (molecule-callback . ,Chord_name::brew_molecule) (interfaces . (chord-name-interface)) (after-line-breaking-callback . ,Chord_name::after_line_breaking) (chord-name-function . ,default-chord-name-function) - (name . "ChordName") + (properties-to-font-name . ,properties-to-font-name) + (style-to-font-name . ,style-to-font-name) + (markup-to-properties . ,markup-to-properties) + (font-family . roman) + (name . "ChordNames") ) NoteCollision = #`( diff --git a/ly/fragment.ly b/ly/fragment.ly index 3989fbe6aa..13973739a0 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.93"; +\version "1.3.96"; \include "declarations.ly" diff --git a/ly/init-as.fly b/ly/init-as.fly index 76d3082bb8..1b73300c31 100644 --- a/ly/init-as.fly +++ b/ly/init-as.fly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.93"; +\version "1.3.97"; \include "declarations-as.ly" diff --git a/ly/init-as.ly b/ly/init-as.ly index 0c581e9733..191ae8741e 100644 --- a/ly/init-as.ly +++ b/ly/init-as.ly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.93"; +\version "1.3.96"; \include "declarations-as.ly" diff --git a/ly/init.fly b/ly/init.fly index 40f7f94c06..423594cb63 100644 --- a/ly/init.fly +++ b/ly/init.fly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.93"; +\version "1.3.97"; \include "declarations.ly" diff --git a/ly/init.ly b/ly/init.ly index f26b2cc1f4..ae95b0139f 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.93"; +\version "1.3.96"; \include "declarations.ly"; diff --git a/ly/init.sly b/ly/init.sly index 4484454982..34bcf9312d 100644 --- a/ly/init.sly +++ b/ly/init.sly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.93"; +\version "1.3.97"; \include "declarations.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index 4f741f6b1e..28bbc05995 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -48,4 +48,4 @@ (sidd . ( -1 6 2 )) ) -\version "1.3.93"; +\version "1.3.96"; diff --git a/ly/norsk.ly b/ly/norsk.ly index 3ef63e733e..8af9f332a7 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -104,4 +104,4 @@ -\version "1.3.93"; +\version "1.3.96"; diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index 78974f206e..2c7689ef9a 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,6 +1,6 @@ % paper-as5.ly -\version "1.3.93"; +\version "1.3.96"; paper_as_five = \paper { staffheight = 5.\char; diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index 323bd921a4..2c183e4e6c 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,6 +1,6 @@ % paper-as9.ly -\version "1.3.93"; +\version "1.3.96"; paper_as_nine = \paper { staffheight = 9.\char; diff --git a/ly/paper11.ly b/ly/paper11.ly index ea8f9973f6..a842af3e9e 100644 --- a/ly/paper11.ly +++ b/ly/paper11.ly @@ -1,6 +1,6 @@ % paper11.ly -\version "1.3.93"; +\version "1.3.96"; paper_eleven = \paper { staffheight = 11.0\pt; diff --git a/ly/paper13.ly b/ly/paper13.ly index fafc2bbc47..11c7697aff 100644 --- a/ly/paper13.ly +++ b/ly/paper13.ly @@ -1,6 +1,6 @@ % paper13.ly -\version "1.3.93"; +\version "1.3.96"; paper_thirteen = \paper { staffheight = 13.0\pt; diff --git a/ly/paper16.ly b/ly/paper16.ly index ebad799920..f5b6bdb5d5 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -1,12 +1,10 @@ % paper16.ly - - -\version "1.3.93"; +\version "1.3.96"; paper_sixteen = \paper { staffheight = 16.0\pt; - style_sheet = "paper20"; + style_sheet = "paper16"; 0 = \font "feta16" -1 = \font "feta13" diff --git a/ly/paper20.ly b/ly/paper20.ly index 1264bfad23..d4dbebacc9 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,7 +1,7 @@ % paper20.ly -\version "1.3.93"; +\version "1.3.96"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/ly/paper23.ly b/ly/paper23.ly index 748707df81..79008874cc 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,7 +1,7 @@ % paper23.ly -\version "1.3.93"; +\version "1.3.96"; paper_twentythree = \paper { staffheight = 23.0\pt; diff --git a/ly/paper26.ly b/ly/paper26.ly index e500651333..28902384c6 100644 --- a/ly/paper26.ly +++ b/ly/paper26.ly @@ -1,6 +1,6 @@ % paper26.ly -\version "1.3.93"; +\version "1.3.96"; paper_twentysix = \paper { staffheight = 26.0\pt; diff --git a/ly/params.ly b/ly/params.ly index 5e89fd3f35..209e4da951 100644 --- a/ly/params.ly +++ b/ly/params.ly @@ -127,8 +127,8 @@ compression_energy_factor = 0.6; \translator { \StaffContext } \translator { \VoiceContext} \translator { \StaffGroupContext } -\translator { \ChordNameContext } -\translator { \ChordNameVoiceContext} +\translator { \ChordNamesContext } +\translator { \ChordNamesVoiceContext} \translator { \GrandStaffContext} \translator { \LyricsContext } \translator { \ThreadContext} diff --git a/ly/property.ly b/ly/property.ly index d5e2211674..15656a9161 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -1,6 +1,6 @@ % property.ly -\version "1.3.93"; +\version "1.3.96"; stemUp = \property Voice.Stem \push #'direction = #1 stemDown = \property Voice.Stem \push #'direction = #-1 diff --git a/ly/svenska.ly b/ly/svenska.ly index 39c808c5df..09cfad936e 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -40,4 +40,4 @@ (hiss . ( -1 6 1 )) (hississ . ( -1 6 2 )) ) -\version "1.3.93"; +\version "1.3.96"; diff --git a/scm/chord-names.scm b/scm/chord-names.scm index 27f4314bfb..ed54054cee 100644 --- a/scm/chord-names.scm +++ b/scm/chord-names.scm @@ -50,19 +50,19 @@ ; C iso C.no5 (((0 . 0) (2 . 0)) . #f) ; Cm iso Cm.no5 - (((0 . 0) (2 . -1)) . ("m")) + (((0 . 0) (2 . -1)) . (("m"))) ; C2 iso C2.no3 - (((0 . 0) (1 . 0) (4 . 0)) . (("2" (type . "super")))) + (((0 . 0) (1 . 0) (4 . 0)) . (super "2")) ; C4 iso C4.no3 - (((0 . 0) (3 . 0) (4 . 0)) . (("4" (type . "super")))) + (((0 . 0) (3 . 0) (4 . 0)) . (super "4")) ; Cdim iso Cm5- (((0 . 0) (2 . -1) (4 . -1)) . ("dim")) ; Co iso Cm5-7- ; urg - (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (("o" (type . "super")))) + (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (super "o")) ; Cdim9 - (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1)) . ("dim" ("9" (type . "super")))) - (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1) (3 . -1)) . ("dim" ("11" (type . "super")))) + (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1)) . ("dim" (super "9"))) + (((0 . 0) (2 . -1) (4 . -1) (6 . -2) (1 . -1) (3 . -1)) . ("dim" (super "11"))) ) chord::names-alist-banter)) diff --git a/scm/font.scm b/scm/font.scm index 403cca5399..a0df641b4d 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -116,7 +116,8 @@ (bold . (font-series . "bold")) (italic . (font-shape . "italic")) (named . (lookup . name)) - (text . (lookup . value))) + (text . (lookup . value)) + (super . (font-size . -1))) (map (lambda (x) (cons (car x) (cons 'font-style (car x)))) style-to-font-alist))) diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index 33401136d1..3dfc56f3b5 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -538,7 +538,13 @@ if 1: 'property definiton case (eg. onevoice -> oneVoice)') +if 1: + def conv (str): + str = re.sub ('ChordNames*', 'ChordNames', str) + return str + + conversions.append ((1,3,97), conv, 'ChordName -> ChordNames') ############################