From: Jan Nieuwenhuizen Date: Wed, 31 Jan 2001 16:14:52 +0000 (+0100) Subject: patch::: 1.3.126.jcn2 X-Git-Tag: release/1.3.127~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fbdafe30e8cd0713b6564cf2e212e599fcd9247c;p=lilypond.git patch::: 1.3.126.jcn2 --- diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index f7fb0eb9d2..d910b1f7c8 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -64,6 +64,7 @@ and documenting bugfixes. @section Chord names @lilypondfile[printfilename]{chord-names.ly} +@lilypondfile[printfilename]{chord-changes.ly} diff --git a/VERSION b/VERSION index a368ddfc58..ddbba8d68d 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=126 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/chord-changes.ly b/input/bugs/chord-changes.ly index 49e8c4cc14..e69de29bb2 100644 --- a/input/bugs/chord-changes.ly +++ b/input/bugs/chord-changes.ly @@ -1,29 +0,0 @@ -\header{ -texidoc="property chordChanges: only display chord names when -there's a change in the chords scheme, but always display the -chord name after a line break. -"; -} - -scheme = \chords { - % ugh ugh: this breaks the output of notes in the regular staff - \property ChordNamesVoice.chordChanges = ##t - % and this even breaks the chord names - \property ChordNames.chordChanges = ##t - c1:m \break c:m c:m c:m d - c1:m \break c:m c:m c:m d -} - -\score { - \notes < - \context ChordNames \scheme - \context Staff \transpose c'' \scheme - > - \paper{ - linewidth = 40 * \staffspace; - \translator { - \ChordNamesVoiceContext - chordChanges = ##t - } - } -} diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly new file mode 100644 index 0000000000..60258e2407 --- /dev/null +++ b/input/regression/chord-changes.ly @@ -0,0 +1,25 @@ +\header{ +texidoc="property chordChanges: only display chord names when +there's a change in the chords scheme, but always display the +chord name after a line break. +"; +} + +scheme = \chords { + c1:m \break c:m c:m c:m d + c1:m \break c:m c:m c:m d +} + +settings = { + \property ChordNames.chordChanges = ##t +} + +\score { + \notes < + \context ChordNames < \scheme \settings > + \context Staff \transpose c'' \scheme + > + \paper{ + linewidth = 40 * \staffspace; + } +} diff --git a/mutopia/Coriolan/header.ly b/mutopia/Coriolan/header.ly index f483e962a3..6774cba1bf 100644 --- a/mutopia/Coriolan/header.ly +++ b/mutopia/Coriolan/header.ly @@ -7,14 +7,21 @@ % mutopia headers. mutopiatitle = "Ouverture Coriolan"; - mutopiacomposer = "L.v.Beethoven"; - mutopiaopus = "LvB62"; - style = "baroque"; - maintainername = "Jan Nieuwenhuizen"; - - copyright = "\\\\This music is part of the Mutopia project, http://www.mutopiaproject.org/\\\\It has been typeset and placed in the public domain by " + \maintainername + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; - - tagline = \copyright; - lastupdated = "2001/Jan/29"; + mutopiacomposer = "L.v.Beethoven (1770-1827)"; + mutopiaopus = "O62"; + mutopiainstrument = "Orchestra"; + date = "1807"; + source = "Edition Dr. Max Unger 1936 from original published parts and autograph."; + style = "Classical"; + copyright = "Public Domain"; + maintainer = "Jan Nieuwenhuizen"; + maintainer_email = "janneke@gnu.org"; + lastupdated = "2001/Jan/31"; + mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small + \\\\This music is part of the Mutopia project, + \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset + and placed in the public domain by " + \maintainer + + ".\\\\Unrestricted modification and redistribution is permitted + and encouraged---copy this music and share it!}"; + tagline = \mutopiapublicdomain; } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly index c8fd2c0c2c..eb755bf2a0 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/header.ly @@ -20,14 +20,21 @@ information is taken to the extreme. % mutopia headers. mutopiatitle = "Solo Cello Suites, Suite II"; - mutopiacomposer = "J.S.Bach"; + mutopiacomposer = "J.S.Bach (1685-1750)"; mutopiaopus = "BWV1008"; - style = "baroque"; - maintainername = "Jan Nieuwenhuizen"; - - copyright = "\\\\This music is part of the Mutopia project, http://www.mutopiaproject.org/\\\\It has been typeset and placed in the public domain by " + \maintainername + ".\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!"; - maintainer = "janneke@gnu.org"; - - tagline = \copyright; - lastupdated = "2001/Jan/28"; + mutopiainstrument = \intrument; + date = "1710s, 1720s"; + source = "Baerenreiter urtext"; + style = "Baroque"; + copyright = "Public Domain"; + maintainer = "Jan Nieuwenhuizen"; + maintainer_email = "janneke@gnu.org"; + lastupdated = "2001/Jan/31"; + mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small + \\\\This music is part of the Mutopia project, + \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset + and placed in the public domain by " + \maintainer + + ".\\\\Unrestricted modification and redistribution is permitted + and encouraged---copy this music and share it!}"; + tagline = \mutopiapublicdomain; } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index 5b9f37c81c..087edfd4ea 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -6,6 +6,7 @@ \include "menuetto-urtext.ly"; menuettoICelloGlobal = \notes{ + \context Voice=i \time 3/4; \key f \major; \clef bass; @@ -14,7 +15,7 @@ menuettoICelloGlobal = \notes{ } \repeat "volta" 2 { \skip 2.*1; - \slurDotted + %\slurDotted \skip 2.*14; \emptyText s2._"Fine" @@ -63,6 +64,7 @@ menuettoICelloStaff = \context Staff < } menuettoIiCelloGlobal = \notes{ + \context Voice=i \time 3/4; \key d \major; \clef bass; @@ -71,7 +73,7 @@ menuettoIiCelloGlobal = \notes{ } \repeat "volta" 2 { \skip 2.*1; - \slurDotted + %\slurDotted \skip 2.*14; \emptyText s2._"Menuetto I da Capo" diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly index ed0026a3c7..33b8dc2f10 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -135,7 +135,7 @@ menuettoIi = \context Staff\notes \relative c { b,8()a g()fis g b | %13 e, d'( cis )b cis()ais | - d,( b' a! g fis )e | + d, b'( a! g fis )e | g( fis e d cis )d | b( cis d e fis )g | a( g fis g a )b | diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index 69db680783..990842621a 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -6,6 +6,7 @@ \include "menuetto-urtext.ly"; menuettoIViolaGlobal = \notes{ + \context Voice=i \time 3/4; \key f \major; \clef alto; @@ -14,7 +15,7 @@ menuettoIViolaGlobal = \notes{ \clef violin; \skip 2.*1; } \repeat "volta" 2 { - \slurDotted + %\slurDotted \skip 2.*3; \clef alto; \skip 2.*11; @@ -48,7 +49,6 @@ menuettoIViolaStaff = \context Staff < \score{ \menuettoIViolaStaff \paper{ - \include "scs-paper.ly"; gourlay_maxmeasures = 7.0; \translator{ \VoiceContext @@ -64,6 +64,7 @@ menuettoIViolaStaff = \context Staff < } menuettoIiViolaGlobal = \notes{ + \context Voice=i \time 3/4; \key d \major; \clef alto; @@ -71,7 +72,7 @@ menuettoIiViolaGlobal = \notes{ \skip 2.*8; } \repeat "volta" 2 { \skip 2.*1; - \slurDotted + %\slurDotted \skip 2.*14; \emptyText s2._"Menuetto I da Capo" diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/scs-paper.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/scs-paper.ly index f71c9a130e..e69de29bb2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/scs-paper.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/scs-paper.ly @@ -1 +0,0 @@ -linewidth = 180.\mm; diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index f0bb67d77e..1fb2c7f9e0 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -100,10 +100,7 @@ key signatures after the bar lines: @end example ") (translator-property-description 'centralCPosition number? "Place of the central C. Usually determined by looking at clefPosition and clefGlyph.") -(translator-property-description 'chordInversion boolean? " Determines whether LilyPond should look for chord inversions when - translating from notes to chord names. Set to 1 to find - inversions. The default is 0 which does not look for - inversions.") +(translator-property-description 'chordChanges boolean? "Only show changes in chords scheme?") (translator-property-description 'clefGlyph string? "Name of the symbol within the music font") (translator-property-description 'clefOctavation integer? "Add this much extra octavation. Values of 7 and -7 are common.")