From cccd2bf82ebfb55b6423346037fa4d2793fc4c3b Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Fri, 25 Jan 2013 21:35:00 +0100 Subject: [PATCH] Rerun scripts/auxiliar/update-with-convert-ly.sh Simulates unrunning it first in order to get two convert-ly rule changes obeyed. --- Documentation/cs/learning/tweaks.itely | 4 +-- .../de/extending/scheme-tutorial.itely | 24 +++++++------- Documentation/de/learning/tweaks.itely | 4 +-- Documentation/de/notation/ancient.itely | 2 +- Documentation/de/notation/editorial.itely | 4 +-- Documentation/de/notation/repeats.itely | 4 +-- Documentation/de/notation/rhythms.itely | 22 ++++++------- Documentation/de/notation/spacing.itely | 30 ++++++++--------- Documentation/de/notation/vocal.itely | 2 +- .../es/extending/scheme-tutorial.itely | 22 ++++++------- Documentation/es/notation/ancient.itely | 2 +- Documentation/es/notation/editorial.itely | 4 +-- Documentation/es/notation/repeats.itely | 4 +-- Documentation/es/notation/rhythms.itely | 22 ++++++------- Documentation/es/notation/spacing.itely | 30 ++++++++--------- Documentation/es/notation/vocal.itely | 2 +- Documentation/extending/scheme-tutorial.itely | 22 ++++++------- .../fr/extending/scheme-tutorial.itely | 22 ++++++------- Documentation/fr/notation/ancient.itely | 2 +- Documentation/fr/notation/editorial.itely | 4 +-- Documentation/fr/notation/input.itely | 4 +-- Documentation/fr/notation/repeats.itely | 4 +-- Documentation/fr/notation/rhythms.itely | 22 ++++++------- Documentation/fr/notation/spacing.itely | 26 +++++++-------- Documentation/fr/notation/vocal.itely | 2 +- .../display-predefined-string-tunings.ly | 4 +-- Documentation/included/script-chart.ly | 6 ++-- Documentation/it/learning/tweaks.itely | 4 +-- Documentation/ja/learning/tweaks.itely | 4 +-- Documentation/ja/notation/editorial.itely | 4 +-- Documentation/ja/notation/repeats.itely | 4 +-- Documentation/ja/notation/rhythms.itely | 18 +++++------ Documentation/ja/notation/spacing.itely | 30 ++++++++--------- Documentation/ja/notation/vocal.itely | 2 +- Documentation/ly-examples/cary-layout.ily | 4 +-- Documentation/ly-examples/granados.ly | 4 +-- Documentation/notation/ancient.itely | 2 +- Documentation/notation/editorial.itely | 4 +-- Documentation/notation/repeats.itely | 4 +-- Documentation/notation/rhythms.itely | 20 ++++++------ Documentation/notation/spacing.itely | 30 ++++++++--------- Documentation/notation/vocal.itely | 2 +- .../snippets/anglican-psalm-template.ly | 4 +-- .../snippets/automatic-beam-subdivisions.ly | 6 ++-- .../snippets/beam-endings-in-score-context.ly | 4 +-- ...olymetric-section-using--scaledurations.ly | 6 ++-- ...efined-fretboards-for-other-instruments.ly | 4 +-- Documentation/snippets/expressive-headword.ly | 4 +-- .../snippets/generating-random-notes.ly | 4 +-- ...arts-in-scheme-without-using-the-parser.ly | 4 +-- .../grid-lines--changing-their-appearance.ly | 4 +-- ...izing-rhythms-and-notes-synchronization.ly | 4 +-- ...olymetric-section-using--scaledurations.ly | 6 ++-- .../new/score-for-diatonic-accordion.ly | 4 +-- ...ng-music-with-different-time-signatures.ly | 2 +- .../proportional-strict-notespacing.ly | 2 +- Documentation/snippets/rhythms-headword.ly | 4 +-- .../snippets/score-for-diatonic-accordion.ly | 4 +-- .../snippets/shortening-volta-brackets.ly | 4 +-- .../snippets/simultaneous-headword.ly | 4 +-- Documentation/snippets/subdividing-beams.ly | 6 ++-- Documentation/snippets/text-headword.ly | 4 +-- Documentation/snippets/unfretted-headword.ly | 2 +- .../regression/auto-beam-beaming-override.ly | 4 +-- input/regression/autobeam-3-4-rules.ly | 4 +-- input/regression/beam-concave.ly | 4 +-- input/regression/beam-feather.ly | 4 +-- input/regression/beam-subdivide-tuplets.ly | 2 +- input/regression/completion-heads-unit.ly | 4 +-- .../duration-identifier-compressed.ly | 4 +-- input/regression/general-scheme-bindings.ly | 4 +-- input/regression/grid-lines.ly | 4 +-- input/regression/metronome-range.ly | 4 +-- input/regression/scheme-book-scores.ly | 4 +-- input/regression/spacing-measure-length.ly | 4 +-- input/regression/spacing-proportional.ly | 2 +- input/regression/spacing-space-to-barline.ly | 4 +-- .../regression/spacing-strict-notespacing.ly | 2 +- input/regression/tuplet-subdivision.ly | 2 +- ly/articulate.ly | 32 +++++++++---------- ly/engraver-init.ly | 6 ++-- ly/gregorian.ly | 4 +-- ly/performer-init.ly | 8 ++--- 83 files changed, 314 insertions(+), 314 deletions(-) diff --git a/Documentation/cs/learning/tweaks.itely b/Documentation/cs/learning/tweaks.itely index 18c9bae587..da64832a2f 100644 --- a/Documentation/cs/learning/tweaks.itely +++ b/Documentation/cs/learning/tweaks.itely @@ -1048,8 +1048,8 @@ wenn sie in einem @code{\override}-Befehl benutzt werden. @item Moment @tab Ein Bruch einer ganzen Note, mit der make-moment-Funktion konstruiert - @tab @code{(ly:make-moment 1 4)}, - @code{(ly:make-moment 3 8)} + @tab @code{(ly:make-moment 1/4)}, + @code{(ly:make-moment 3/8)} @item Zahl @tab Eine beliebige positive oder negative Dezimalzahl @tab @code{3.5}, @code{-2.45} diff --git a/Documentation/de/extending/scheme-tutorial.itely b/Documentation/de/extending/scheme-tutorial.itely index a66fa13199..f5d248033c 100644 --- a/Documentation/de/extending/scheme-tutorial.itely +++ b/Documentation/de/extending/scheme-tutorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Scheme-Übung @chapter Scheme-Übung @@ -1134,7 +1134,7 @@ zeigt: 'text "f")) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1169,7 +1169,7 @@ einfacher zu lesen: (make-music 'AbsoluteDynamicEvent 'text "f")) - 'duration (ly:make-duration 2 0 1 1) + 'duration (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1205,7 +1205,7 @@ someNote = c' (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)) @end example @@ -1223,7 +1223,7 @@ someNote = (list (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1241,7 +1241,7 @@ eines musikalischen Ausdrucks anzuzeigen. (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)) @end example @@ -1297,7 +1297,7 @@ das Endergebnis darstellt: 'span-direction -1)) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)) (make-music @@ -1308,7 +1308,7 @@ das Endergebnis darstellt: 'span-direction 1)) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)))) @end example @@ -1325,7 +1325,7 @@ Jetzt folgt eine Betrachtung der Eingabe: (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)))) @end example @@ -1400,7 +1400,7 @@ Ausgabe examiniert: (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch -1 0 0)))) ===== @@ -1415,7 +1415,7 @@ Ausgabe examiniert: 'articulation-type "accent")) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch -1 0 0)) \displayMusic c4 @@ -1426,7 +1426,7 @@ Ausgabe examiniert: (list (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch -1 0 0)))) @end example diff --git a/Documentation/de/learning/tweaks.itely b/Documentation/de/learning/tweaks.itely index 2ee7f5a46d..0d08ee053b 100644 --- a/Documentation/de/learning/tweaks.itely +++ b/Documentation/de/learning/tweaks.itely @@ -1070,8 +1070,8 @@ wenn sie in einem @code{\override}-Befehl benutzt werden. @item Moment @tab Ein Bruch einer ganzen Note, mit der make-moment-Funktion konstruiert - @tab @code{(ly:make-moment 1 4)}, - @code{(ly:make-moment 3 8)} + @tab @code{(ly:make-moment 1/4)}, + @code{(ly:make-moment 3/8)} @item Zahl @tab Eine beliebige positive oder negative Dezimalzahl @tab @code{3.5}, @w{@code{-2.45}} diff --git a/Documentation/de/notation/ancient.itely b/Documentation/de/notation/ancient.itely index 09edea0c02..a7d79a6606 100644 --- a/Documentation/de/notation/ancient.itely +++ b/Documentation/de/notation/ancient.itely @@ -666,7 +666,7 @@ werden, weil sie nicht konstant sind. Zum Beispiel kann das Verhältnis 1@tie{} wird: @example -breveTP = #(ly:make-duration -1 0 3 2) +breveTP = #(ly:make-duration -1 0 3/2) @dots{} @{ c\breveTP f1 @} @end example diff --git a/Documentation/de/notation/editorial.itely b/Documentation/de/notation/editorial.itely index c256ccf4cc..f01a51d270 100644 --- a/Documentation/de/notation/editorial.itely +++ b/Documentation/de/notation/editorial.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Till Paala @@ -617,7 +617,7 @@ den Linien festgesetzt. \context { \Staff \consists "Grid_point_engraver" - gridInterval = #(ly:make-moment 1 4) + gridInterval = #(ly:make-moment 1/4) } \context { \Score diff --git a/Documentation/de/notation/repeats.itely b/Documentation/de/notation/repeats.itely index 020cbc5fd6..2e2d5198cf 100644 --- a/Documentation/de/notation/repeats.itely +++ b/Documentation/de/notation/repeats.itely @@ -228,11 +228,11 @@ zu Beginn jeder Alternative außer der ersten. \alternative { { f2 d | - \set Timing.measureLength = #(ly:make-moment 3 4) + \set Timing.measureLength = #(ly:make-moment 3/4) g4 g g % optional bar check is allowed here } { - \set Timing.measureLength = #(ly:make-moment 4 4) + \set Timing.measureLength = #(ly:make-moment 4/4) a2 a | } } diff --git a/Documentation/de/notation/rhythms.itely b/Documentation/de/notation/rhythms.itely index 355f66a158..903f5a7445 100644 --- a/Documentation/de/notation/rhythms.itely +++ b/Documentation/de/notation/rhythms.itely @@ -1431,7 +1431,7 @@ So wird etwa aus @code{\partial 8}: @lilypond[quote,verbatim,relative=1] \time 3/4 -\set Timing.measurePosition = #(ly:make-moment -1 8) +\set Timing.measurePosition = #(ly:make-moment -1/8) e8 | a4 c8 b c4 | @end lilypond @@ -1476,7 +1476,7 @@ benutzen. \time 6/8 \partial 8 e8 | a4 c8 b[ c b] | -\set Timing.measurePosition = #(ly:make-moment -1 4) +\set Timing.measurePosition = #(ly:make-moment -1/4) r8 e,8 | a4 c8 b[ c b] | @end lilypond @@ -2144,12 +2144,12 @@ werden, wenn die Bebalkung von @code{beatStructure} bestimmt werden soll. \time 4/4 a8^"default" a a a a a a a -\set Timing.baseMoment = #(ly:make-moment 1 4) +\set Timing.baseMoment = #(ly:make-moment 1/4) \set Timing.beatStructure = #'(1 1 1 1) a8^"no change" a a a a a a a \set Timing.beamExceptions = #'() -\set Timing.baseMoment = #(ly:make-moment 1 4) +\set Timing.baseMoment = #(ly:make-moment 1/4) \set Timing.beatStructure = #'(1 1 1 1) a8^"changed" a a a a a a a @end lilypond @@ -2203,7 +2203,7 @@ er kompatibel mit dem neuen Wert von @code{baseMoment} ist. @lilypond[quote,verbatim,relative=2] \time 5/8 -\set Timing.baseMoment = #(ly:make-moment 1 16) +\set Timing.baseMoment = #(ly:make-moment 1/16) \set Timing.beatStructure = #'(7 3) \repeat unfold 10 { a16 } @end lilypond @@ -2296,7 +2296,7 @@ Die @code{beamExceptions}-Regel kann die @code{beatStructure}-Einstellung @lilypond[quote,verbatim,relative=2] \time 4/4 -\set Timing.baseMoment = #(ly:make-moment 1 8) +\set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(3 3 2) % This won't beam (3 3 2) because of beamExceptions \repeat unfold 8 {c8} | @@ -2434,7 +2434,7 @@ vermeiden, ist es, die Taktart nur in einem System zu setzen. << \new Staff { \time 3/4 - \set Timing.baseMoment = #(ly:make-moment 1 8) + \set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(1 5) \repeat unfold 6 { a8 } } @@ -2606,10 +2606,10 @@ gleichmäßiges Tempo haben. @lilypond[relative=1,verbatim,quote] \override Beam.grow-direction = #LEFT -\featherDurations #(ly:make-moment 2 1) +\featherDurations #(ly:make-moment 2/1) { c16[ c c c c c c c] } \override Beam.grow-direction = #RIGHT -\featherDurations #(ly:make-moment 2 3) +\featherDurations #(ly:make-moment 2/3) { c32[ d e f] } % revert to non-feathered beams \override Beam.grow-direction = #'() @@ -3649,11 +3649,11 @@ dass der Takt im Ergebnis 1/8 kürzer ist. Die nächste Taktlinie wird dann auch bei 9/8 gezogen und nicht bei 5/4. @lilypond[quote,verbatim,relative=1] -\set Score.measureLength = #(ly:make-moment 5 4) +\set Score.measureLength = #(ly:make-moment 5/4) c1 c4 c1 c4 c4 c4 -\set Score.measurePosition = #(ly:make-moment 5 8) +\set Score.measurePosition = #(ly:make-moment 5/8) b4 b4 b8 c4 c1 @end lilypond diff --git a/Documentation/de/notation/spacing.itely b/Documentation/de/notation/spacing.itely index 9ce951b8a7..617f04cc6d 100644 --- a/Documentation/de/notation/spacing.itely +++ b/Documentation/de/notation/spacing.itely @@ -1639,7 +1639,7 @@ Doppelstrich), wird der Befehl nach diesem Taktstrich gesetzt. Der @code{Page_turn_engraver} liest die Kontexteigenschaft @code{minimumPageTurnLength} um zu erkennen, wie lang eine Stelle frei von Noten sein muss, damit ein Seitenumbruch in Frage kommt. Der -Standardwert hierfür ist @code{(ly:make-moment 1 1)}. Wenn Sie +Standardwert hierfür ist @code{(ly:make-moment 1/1)}. Wenn Sie Seitenumbrüche zum Umblättern ausschalten wollen, können Sie einen sehr großen Wert angeben. @@ -1649,7 +1649,7 @@ einen sehr großen Wert angeben. a4 b c d | R1 | % Ein Seitenumbruch zum Umblättern erlaubt a4 b c d | - \set Staff.minimumPageTurnLength = #(ly:make-moment 5 2) + \set Staff.minimumPageTurnLength = #(ly:make-moment 5/2) R1 | % Seitenumbruch nicht erlaubt a4 b r2 | R1*2 | % Seitenumbruch erlaubt @@ -3041,7 +3041,7 @@ eine größere Dauer ist als @code{1 16}. \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 16) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16) } } } @@ -3235,7 +3235,7 @@ eingeschaltet: \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3256,10 +3256,10 @@ Die Eigenschaft @code{proportionalNotationDuration} braucht ein Argument, welches die Referenzdauer ist, anhand welcher alle Noten platziert werden. Hier wird die LilyPond Scheme-Funktion @code{make-moment} eingesetzt. Sie braucht zwei Argumente: einen Zähler und einen Nenner, die einen Bruch einer -Ganzen darstellen. Die Funktion @code{(ly:make-moment 1 20)} ergibt also +Ganzen darstellen. Die Funktion @code{(ly:make-moment 1/20)} ergibt also eine Referenzdauer von einer Zwanzigstel. Genauso gut können etwa die Dauern -@code{(ly:make-moment 1 16)}, @code{(ly:make-moment 1 8)} oder -@code{(ly:make-moment 3 97)} eingesetzt werden. +@code{(ly:make-moment 1/16)}, @code{(ly:make-moment 1/8)} oder +@code{(ly:make-moment 3/97)} eingesetzt werden. Die richtige Referenzdauer, mit der eine vernünftige Verteilung der Noten proportional möglich ist, muss durch Ausprobieren herausgefunden werden. @@ -3281,7 +3281,7 @@ erscheinen, größere Referenzdauern zwingen sie dichter zusammen. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 8) + proportionalNotationDuration = #(ly:make-moment 1/8) } } } @@ -3299,7 +3299,7 @@ erscheinen, größere Referenzdauern zwingen sie dichter zusammen. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 16) + proportionalNotationDuration = #(ly:make-moment 1/16) } } } @@ -3317,7 +3317,7 @@ erscheinen, größere Referenzdauern zwingen sie dichter zusammen. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 32) + proportionalNotationDuration = #(ly:make-moment 1/32) } } } @@ -3381,7 +3381,7 @@ dieser Situation deutlich: \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3411,7 +3411,7 @@ sollte auch noch die gleichmäßige Dehnung (@code{uniform-stretching}) angescha \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) \override SpacingSpanner.uniform-stretching = ##t } } @@ -3501,7 +3501,7 @@ die beiden Partituren unten: @lilypond[quote,verbatim,ragged-right] \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) c''8 c''8 c''8 @@ -3511,7 +3511,7 @@ die beiden Partituren unten: } \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \override Score.SpacingSpanner.strict-note-spacing = ##t c''8 c''8 @@ -3742,7 +3742,7 @@ angegeben wird: \layout { \context { \Score - \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/2) } } } diff --git a/Documentation/de/notation/vocal.itely b/Documentation/de/notation/vocal.itely index 8ac7d3e17a..8c42e5b442 100644 --- a/Documentation/de/notation/vocal.itely +++ b/Documentation/de/notation/vocal.itely @@ -3120,7 +3120,7 @@ global = { \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2) } \context { \Staff diff --git a/Documentation/es/extending/scheme-tutorial.itely b/Documentation/es/extending/scheme-tutorial.itely index e62c1cafca..dfa8bb8345 100644 --- a/Documentation/es/extending/scheme-tutorial.itely +++ b/Documentation/es/extending/scheme-tutorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Tutorial de Scheme @appendix Tutorial de Scheme @@ -1226,7 +1226,7 @@ imprime lo siguiente: 'text "f")) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1262,7 +1262,7 @@ leer: (make-music 'AbsoluteDynamicEvent 'text "f")) - 'duration (ly:make-duration 2 0 1 1) + 'duration (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1297,7 +1297,7 @@ someNote = c' (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)) @end example @@ -1315,7 +1315,7 @@ someNote = (list (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1333,7 +1333,7 @@ Scheme de una expresión musical. (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)) @end example @@ -1386,7 +1386,7 @@ representación interna de la música con la que queremos terminar. 'span-direction -1)) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)) (make-music @@ -1397,7 +1397,7 @@ representación interna de la música con la que queremos terminar. 'span-direction 1)) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)))) @end example @@ -1414,7 +1414,7 @@ Ahora examinamos la entrada, (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)))) @end example @@ -1485,7 +1485,7 @@ Scheme. Empezamos examinando nuestra entrada y la salida deseada, (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch -1 0 0)))) ===== @@ -1500,7 +1500,7 @@ Scheme. Empezamos examinando nuestra entrada y la salida deseada, 'articulation-type "accent")) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch -1 0 0)) @end example diff --git a/Documentation/es/notation/ancient.itely b/Documentation/es/notation/ancient.itely index 17b8451044..af4537bf15 100644 --- a/Documentation/es/notation/ancient.itely +++ b/Documentation/es/notation/ancient.itely @@ -659,7 +659,7 @@ la razón de 1@tie{}breve = 3@tie{}semibreves establecimiento de @example -breveTP = #(ly:make-duration -1 0 3 2) +breveTP = #(ly:make-duration -1 0 3/2) @dots{} @{ c\breveTP f1 @} @end example diff --git a/Documentation/es/notation/editorial.itely b/Documentation/es/notation/editorial.itely index ff59b6b6ad..475c468644 100644 --- a/Documentation/es/notation/editorial.itely +++ b/Documentation/es/notation/editorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Anotaciones editoriales @section Anotaciones editoriales @@ -616,7 +616,7 @@ especificar la duración entre las líneas de rejilla. \context { \Staff \consists "Grid_point_engraver" - gridInterval = #(ly:make-moment 1 4) + gridInterval = #(ly:make-moment 1/4) } \context { \Score diff --git a/Documentation/es/notation/repeats.itely b/Documentation/es/notation/repeats.itely index 2024ad458e..ab46c49ff4 100644 --- a/Documentation/es/notation/repeats.itely +++ b/Documentation/es/notation/repeats.itely @@ -237,11 +237,11 @@ primero. \alternative { { f2 d | - \set Timing.measureLength = #(ly:make-moment 3 4) + \set Timing.measureLength = #(ly:make-moment 3/4) g4 g g % optional bar check is allowed here } { - \set Timing.measureLength = #(ly:make-moment 4 4) + \set Timing.measureLength = #(ly:make-moment 4/4) a2 a | } } diff --git a/Documentation/es/notation/rhythms.itely b/Documentation/es/notation/rhythms.itely index b235489e12..5539435c4e 100644 --- a/Documentation/es/notation/rhythms.itely +++ b/Documentation/es/notation/rhythms.itely @@ -1442,7 +1442,7 @@ Así, @code{\partial 8} se convierte en: @lilypond[quote,verbatim,relative=1] \time 3/4 -\set Timing.measurePosition = #(ly:make-moment -1 8) +\set Timing.measurePosition = #(ly:make-moment -1/8) e8 | a4 c8 b c4 | @end lilypond @@ -1476,7 +1476,7 @@ advertencias o efectos desagradables, en este caso utilice en su lugar \time 6/8 \partial 8 e8 | a4 c8 b[ c b] | -\set Timing.measurePosition = #(ly:make-moment -1 4) +\set Timing.measurePosition = #(ly:make-moment -1/4) r8 e,8 | a4 c8 b[ c b] | @end lilypond @@ -2142,12 +2142,12 @@ determinado por @code{beatStructure}. \time 4/4 a8^"default" a a a a a a a -\set Timing.baseMoment = #(ly:make-moment 1 4) +\set Timing.baseMoment = #(ly:make-moment 1/4) \set Timing.beatStructure = #'(1 1 1 1) a8^"no change" a a a a a a a \set Timing.beamExceptions = #'() -\set Timing.baseMoment = #(ly:make-moment 1 4) +\set Timing.baseMoment = #(ly:make-moment 1/4) \set Timing.beatStructure = #'(1 1 1 1) a8^"changed" a a a a a a a @end lilypond @@ -2202,7 +2202,7 @@ el nuevo valor de @code{baseMoment}. @lilypond[quote,verbatim,relative=2] \time 5/8 -\set Timing.baseMoment = #(ly:make-moment 1 16) +\set Timing.baseMoment = #(ly:make-moment 1/16) \set Timing.beatStructure = #'(7 3) \repeat unfold 10 { a16 } @end lilypond @@ -2297,7 +2297,7 @@ ajuste @code{beatStructure} si no se reinicia @code{beamExceptions}. @lilypond[quote,verbatim,relative=2] \time 4/4 -\set Timing.baseMoment = #(ly:make-moment 1 8) +\set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(3 3 2) % This won't beam (3 3 2) because of beamExceptions \repeat unfold 8 {c8} | @@ -2435,7 +2435,7 @@ la indicación de compás en un pentagrama solamente. << \new Staff { \time 3/4 - \set Timing.baseMoment = #(ly:make-moment 1 8) + \set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(1 5) \repeat unfold 6 { a8 } } @@ -2610,10 +2610,10 @@ mientras que las últimas cuatro fusas están a un tempo constante. @lilypond[relative=1,verbatim,quote] \override Beam.grow-direction = #LEFT -\featherDurations #(ly:make-moment 2 1) +\featherDurations #(ly:make-moment 2/1) { c16[ c c c c c c c] } \override Beam.grow-direction = #RIGHT -\featherDurations #(ly:make-moment 2 3) +\featherDurations #(ly:make-moment 2/3) { c32[ d e f] } % revert to non-feathered beams \override Beam.grow-direction = #'() @@ -3743,11 +3743,11 @@ divisoria cae en 9/8 en vez de hacerlo en 5/4. @lilypond[quote,verbatim] \new Voice \relative c' { - \set Timing.measureLength = #(ly:make-moment 5 4) + \set Timing.measureLength = #(ly:make-moment 5/4) c1 c4 | c1 c4 | c4 c - \set Timing.measurePosition = #(ly:make-moment 5 8) + \set Timing.measurePosition = #(ly:make-moment 5/8) b4 b b8 | c4 c1 | } diff --git a/Documentation/es/notation/spacing.itely b/Documentation/es/notation/spacing.itely index 62ca280890..26d9562e08 100644 --- a/Documentation/es/notation/spacing.itely +++ b/Documentation/es/notation/spacing.itely @@ -1728,7 +1728,7 @@ El grabador @code{Page_turn_engraver} lee la propiedad de contexto @code{minimumPageTurnLength} para determinar qué longitud debe tener una sección sin notas antes de que se considere la posibilidad de un paso de página. El valor predeterminado para -@code{minimumPageTurnLength} es @code{(ly:make-moment 1 1)}. Si +@code{minimumPageTurnLength} es @code{(ly:make-moment 1/1)}. Si quiere inhabilitar las vueltas de página, puede establecerlo a algún valor muy grande. @@ -1738,7 +1738,7 @@ valor muy grande. a4 b c d | R1 | % aquí se permite un salto de página a4 b c d | - \set Staff.minimumPageTurnLength = #(ly:make-moment 5 2) + \set Staff.minimumPageTurnLength = #(ly:make-moment 5/2) R1 | % aquí no se permite un salto de página a4 b r2 | R1*2 | % aquí se permite un salto de página @@ -3085,7 +3085,7 @@ que @code{ly:make-moment} construye una duración, por lo que @code{1 \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 16) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16) } } } @@ -3268,7 +3268,7 @@ ajuste @code{proportionalNotationDuration}. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3293,11 +3293,11 @@ argumento, que es la duración de referencia contra el que se aplica el espaciado de toda la música. La función Scheme de LilyPond @code{make-moment} acepta dos argumentos: un numerador y un denominador que, juntos, expresan una cierta fracción de redonda. La -llamada @code{(ly:make-moment 1 20)}, por tanto, produce una duración +llamada @code{(ly:make-moment 1/20)}, por tanto, produce una duración de referencia de una nota de un veinteavo de redonda (semicorcheas de cinquillo). Son también posibles valores como -@code{(ly:make-moment 1 16)}, -@code{(ly:make-moment 1 8)} y @code{(ly:make-moment 3 97)}. +@code{(ly:make-moment 1/16)}, +@code{(ly:make-moment 1/8)} y @code{(ly:make-moment 3/97)}. ¿Cómo seleccionamos la duración correcta de referencia para pasarla a @code{proportionalNotationDuration}? Normalmente mediante un proceso @@ -3320,7 +3320,7 @@ más largas aplican un espaciado más apretado. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 8) + proportionalNotationDuration = #(ly:make-moment 1/8) } } } @@ -3338,7 +3338,7 @@ más largas aplican un espaciado más apretado. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 16) + proportionalNotationDuration = #(ly:make-moment 1/16) } } } @@ -3356,7 +3356,7 @@ más largas aplican un espaciado más apretado. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 32) + proportionalNotationDuration = #(ly:make-moment 1/32) } } } @@ -3422,7 +3422,7 @@ soluciona. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3453,7 +3453,7 @@ propiedad de @code{SpacingSpanner}. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) \override SpacingSpanner.uniform-stretching = ##t } } @@ -3548,7 +3548,7 @@ Compare las dos partituras siguientes: @lilypond[quote,verbatim,ragged-right] \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) c''8 c''8 c''8 @@ -3558,7 +3558,7 @@ Compare las dos partituras siguientes: } \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \override Score.SpacingSpanner.strict-note-spacing = ##t c''8 c''8 @@ -3783,7 +3783,7 @@ duración se produce un efecto de @q{apretujamiento}: \layout { \context { \Score - \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/2) } } } diff --git a/Documentation/es/notation/vocal.itely b/Documentation/es/notation/vocal.itely index 95e8fc6e52..0d20efef21 100644 --- a/Documentation/es/notation/vocal.itely +++ b/Documentation/es/notation/vocal.itely @@ -3134,7 +3134,7 @@ global = { \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2) } \context { \Staff diff --git a/Documentation/extending/scheme-tutorial.itely b/Documentation/extending/scheme-tutorial.itely index b73c2bb9fd..f944a053e5 100644 --- a/Documentation/extending/scheme-tutorial.itely +++ b/Documentation/extending/scheme-tutorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Scheme tutorial @chapter Scheme tutorial @@ -1127,7 +1127,7 @@ will display 'text "f")) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1162,7 +1162,7 @@ A bit of reformatting makes the above information easier to read: (make-music 'AbsoluteDynamicEvent 'text "f")) - 'duration (ly:make-duration 2 0 1 1) + 'duration (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1194,7 +1194,7 @@ someNote = c' (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)) @end example @@ -1212,7 +1212,7 @@ someNote = (list (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1230,7 +1230,7 @@ expression. (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)) @end example @@ -1281,7 +1281,7 @@ representation of the desired result. 'span-direction -1)) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)) (make-music @@ -1292,7 +1292,7 @@ representation of the desired result. 'span-direction 1)) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)))) @end example @@ -1309,7 +1309,7 @@ Now we examine the input, (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)))) @end example @@ -1375,7 +1375,7 @@ Scheme. We begin by examining our input and desired output, (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch -1 0 0)))) ===== @@ -1390,7 +1390,7 @@ Scheme. We begin by examining our input and desired output, 'articulation-type "accent")) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch -1 0 0)) @end example diff --git a/Documentation/fr/extending/scheme-tutorial.itely b/Documentation/fr/extending/scheme-tutorial.itely index 749dbd55ee..6b65cf820c 100644 --- a/Documentation/fr/extending/scheme-tutorial.itely +++ b/Documentation/fr/extending/scheme-tutorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Jean-Charles Malahieude @@ -1258,7 +1258,7 @@ affichera 'text "f")) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1293,7 +1293,7 @@ L'information sera encore plus lisible après un peu de mise en forme : (make-music 'AbsoluteDynamicEvent 'text "f")) - 'duration (ly:make-duration 2 0 1 1) + 'duration (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1329,7 +1329,7 @@ someNote = c' (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)) @end example @@ -1348,7 +1348,7 @@ someNote = (list (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)))) @end example @@ -1365,7 +1365,7 @@ pour afficher la représentation en Scheme d'une expression musicale : (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)) @end example @@ -1418,7 +1418,7 @@ comment le résultat est représenté en interne. 'span-direction -1)) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)) (make-music @@ -1429,7 +1429,7 @@ comment le résultat est représenté en interne. 'span-direction 1)) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)))) @end example @@ -1446,7 +1446,7 @@ Examinons à présent la saisie : (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 5 0)))) @end example @@ -1514,7 +1514,7 @@ le résultat auquel nous désirons aboutir : (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch -1 0 0)))) ===== @@ -1529,7 +1529,7 @@ le résultat auquel nous désirons aboutir : 'articulation-type "accent")) 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch -1 0 0)) @end example diff --git a/Documentation/fr/notation/ancient.itely b/Documentation/fr/notation/ancient.itely index 98488cd668..45708b3cb4 100644 --- a/Documentation/fr/notation/ancient.itely +++ b/Documentation/fr/notation/ancient.itely @@ -670,7 +670,7 @@ semi-brèves (@emph{tempus perfectum}) doit s'effectuer à la main en entrant : @example -breveTP = #(ly:make-duration -1 0 3 2) +breveTP = #(ly:make-duration -1 0 3/2) @dots{} @{ c\breveTP f1 @} @end example diff --git a/Documentation/fr/notation/editorial.itely b/Documentation/fr/notation/editorial.itely index 31fb96822f..677da1255f 100644 --- a/Documentation/fr/notation/editorial.itely +++ b/Documentation/fr/notation/editorial.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Jean-Charles Malahieude @@ -626,7 +626,7 @@ spécifie quant à elle l'espace de temps entre chaque ligne. \context { \Staff \consists "Grid_point_engraver" %% active les guides - gridInterval = #(ly:make-moment 1 4) + gridInterval = #(ly:make-moment 1/4) } \context { \Score diff --git a/Documentation/fr/notation/input.itely b/Documentation/fr/notation/input.itely index 0e6e671bc4..a5fbb526f8 100644 --- a/Documentation/fr/notation/input.itely +++ b/Documentation/fr/notation/input.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Jean-Charles Malahieude, Valentin Villenave @@ -2946,7 +2946,7 @@ Par exemple, indiquer 90 à la noire pointée est équivalent à spécifier 270 croches à la minute : @example -tempoWholesPerMinute = #(ly:make-moment 270 8) +tempoWholesPerMinute = #(ly:make-moment 270/8) @end example @cindex MIDI et définition de contexte diff --git a/Documentation/fr/notation/repeats.itely b/Documentation/fr/notation/repeats.itely index 2f27c3bf69..898f9d9eeb 100644 --- a/Documentation/fr/notation/repeats.itely +++ b/Documentation/fr/notation/repeats.itely @@ -223,11 +223,11 @@ au début de chaque alternative à l'exception de la première. \alternative { { f2 d | - \set Timing.measureLength = #(ly:make-moment 3 4) + \set Timing.measureLength = #(ly:make-moment 3/4) g4 g g % optional bar check is allowed here } { - \set Timing.measureLength = #(ly:make-moment 4 4) + \set Timing.measureLength = #(ly:make-moment 4/4) a2 a | } } diff --git a/Documentation/fr/notation/rhythms.itely b/Documentation/fr/notation/rhythms.itely index e9596fbea0..2d1bfa5264 100644 --- a/Documentation/fr/notation/rhythms.itely +++ b/Documentation/fr/notation/rhythms.itely @@ -1439,7 +1439,7 @@ De fait, @code{\partial 8} équivaut à : @lilypond[quote,verbatim,relative=1] \time 3/4 -\set Timing.measurePosition = #(ly:make-moment -1 8) +\set Timing.measurePosition = #(ly:make-moment -1/8) e8 | a4 c8 b c4 | @end lilypond @@ -1473,7 +1473,7 @@ s'afficher, voire des problèmes inopinés surgir. Utilisez plutôt \time 6/8 \partial 8 e8 | a4 c8 b[ c b] | -\set Timing.measurePosition = #(ly:make-moment -1 4) +\set Timing.measurePosition = #(ly:make-moment -1/4) r8 e,8 | a4 c8 b[ c b] | @end lilypond @@ -2136,12 +2136,12 @@ tout moment, avant de déterminer les ligatures par @code{beatStructure}. \time 4/4 a8^"default" a a a a a a a -\set Timing.baseMoment = #(ly:make-moment 1 4) +\set Timing.baseMoment = #(ly:make-moment 1/4) \set Timing.beatStructure = #'(1 1 1 1) a8^"no change" a a a a a a a \set Timing.beamExceptions = #'() -\set Timing.baseMoment = #(ly:make-moment 1 4) +\set Timing.baseMoment = #(ly:make-moment 1/4) \set Timing.beatStructure = #'(1 1 1 1) a8^"changed" a a a a a a a @end lilypond @@ -2197,7 +2197,7 @@ valeur de @code{baseMoment}. @lilypond[quote,verbatim,relative=2] \time 5/8 -\set Timing.baseMoment = #(ly:make-moment 1 16) +\set Timing.baseMoment = #(ly:make-moment 1/16) \set Timing.beatStructure = #'(7 3) \repeat unfold 10 { a16 } @end lilypond @@ -2300,7 +2300,7 @@ de cette dérogation. @lilypond[quote,verbatim,relative=2] \time 4/4 -\set Timing.baseMoment = #(ly:make-moment 1 8) +\set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(3 3 2) % This won't beam (3 3 2) because of beamExceptions \repeat unfold 8 {c8} | @@ -2439,7 +2439,7 @@ métrique que dans une seule portée. << \new Staff { \time 3/4 - \set Timing.baseMoment = #(ly:make-moment 1 8) + \set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(1 5) \set Timing.beamExceptions = #'() \repeat unfold 6 { a8 } @@ -2612,10 +2612,10 @@ quatre dernières gardent un tempo régulier. @lilypond[relative=1,verbatim,quote] \override Beam.grow-direction = #LEFT -\featherDurations #(ly:make-moment 2 1) +\featherDurations #(ly:make-moment 2/1) { c16[ c c c c c c c] } \override Beam.grow-direction = #RIGHT -\featherDurations #(ly:make-moment 2 3) +\featherDurations #(ly:make-moment 2/3) { c32[ d e f] } % revert to non-feathered beams \override Beam.grow-direction = #'() @@ -3714,11 +3714,11 @@ La barre de mesure suivante tombera donc à 9/8 et non à 5/8. @lilypond[quote,verbatim] \new Voice \relative c' { - \set Timing.measureLength = #(ly:make-moment 5 4) + \set Timing.measureLength = #(ly:make-moment 5/4) c1 c4 | c1 c4 | c4 c - \set Timing.measurePosition = #(ly:make-moment 5 8) + \set Timing.measurePosition = #(ly:make-moment 5/8) b4 b b8 | c4 c1 | } diff --git a/Documentation/fr/notation/spacing.itely b/Documentation/fr/notation/spacing.itely index fec8c15a0c..ef870bff42 100644 --- a/Documentation/fr/notation/spacing.itely +++ b/Documentation/fr/notation/spacing.itely @@ -1740,7 +1740,7 @@ la manière suivante : a4 b c d | R1 | % une tourne peut se placer ici a4 b c d | - \set Staff.minimumPageTurnLength = #(ly:make-moment 5 2) + \set Staff.minimumPageTurnLength = #(ly:make-moment 5/2) R1 | % il ne peut pas y avoir de tourne ici a4 b r2 | R1*2 | % une tourne peut se placer ici @@ -3098,7 +3098,7 @@ resserrée. En effet, @code{ly:make-moment} construit une durée : \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 16) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16) } } } @@ -3289,7 +3289,7 @@ définissant la propriété @code{proportionalNotationDuration}. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3316,8 +3316,8 @@ prend deux arguments : un numérateur et un dénominateur qui représentent une fraction de ronde. L'appel de @w{@code{(ly:make-moment 1 20)}} produit donc une durée de référence égale à un vingtième de ronde. Vous pourriez tout aussi bien utiliser -@code{(ly:make-moment 1 16)}, @code{(ly:make-moment 1 8)} ou -@code{(ly:make-moment 3 97)}. +@code{(ly:make-moment 1/16)}, @code{(ly:make-moment 1/8)} ou +@code{(ly:make-moment 3/97)}. Se pose alors le problème de fournir la juste durée de référence à @code{proportionalNotationDuration}. Il faut en l'occurrence procéder par @@ -3340,7 +3340,7 @@ une durée de référence élevée produira une musique resserrée. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 8) + proportionalNotationDuration = #(ly:make-moment 1/8) } } } @@ -3358,7 +3358,7 @@ une durée de référence élevée produira une musique resserrée. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 16) + proportionalNotationDuration = #(ly:make-moment 1/16) } } } @@ -3376,7 +3376,7 @@ une durée de référence élevée produira une musique resserrée. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 32) + proportionalNotationDuration = #(ly:make-moment 1/32) } } } @@ -3441,7 +3441,7 @@ les règles qu'elle applique peuvent amener à ce résultat. Le recours à \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3472,7 +3472,7 @@ allons activer le @code{uniform-stretching}, propriété attachée au \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) \override SpacingSpanner.uniform-stretching = ##t } } @@ -3566,7 +3566,7 @@ les deux portées suivantes : @lilypond[quote,verbatim,ragged-right] \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) c''8 c''8 c''8 @@ -3576,7 +3576,7 @@ les deux portées suivantes : } \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \override Score.SpacingSpanner.strict-note-spacing = ##t c''8 c''8 @@ -3801,7 +3801,7 @@ valeur plus longue -- donnera un effet @qq{resserré} à la musique : \layout { \context { \Score - \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/2) } } } diff --git a/Documentation/fr/notation/vocal.itely b/Documentation/fr/notation/vocal.itely index bf812408ca..59a4bec2e8 100644 --- a/Documentation/fr/notation/vocal.itely +++ b/Documentation/fr/notation/vocal.itely @@ -3142,7 +3142,7 @@ global = { \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2) } \context { \Staff diff --git a/Documentation/included/display-predefined-string-tunings.ly b/Documentation/included/display-predefined-string-tunings.ly index 5e0181f6aa..455d953757 100644 --- a/Documentation/included/display-predefined-string-tunings.ly +++ b/Documentation/included/display-predefined-string-tunings.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" #(define (filter-instrument instrument-name tuning-alist) (filter (lambda (entry) @@ -16,7 +16,7 @@ 'text (symbol->string tuning-symbol)) (map (lambda (pitch) (make-music 'NoteEvent - 'duration (ly:make-duration 0 0 1 1) + 'duration (ly:make-duration 0 0 1/1) 'pitch pitch)) pitches))))) diff --git a/Documentation/included/script-chart.ly b/Documentation/included/script-chart.ly index ef64790ffd..59424615c9 100644 --- a/Documentation/included/script-chart.ly +++ b/Documentation/included/script-chart.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc ="@cindex Feta scripts @@ -98,7 +98,7 @@ This chart shows all articulations, or scripts, that the feta font contains. (list (make-music 'NoteEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 0 0)) (make-music @@ -129,7 +129,7 @@ This chart shows all articulations, or scripts, that the feta font contains. (list (make-music 'LyricEvent 'duration - (ly:make-duration 2 0 1 1) + (ly:make-duration 2 0 1/1) 'text script)))) diff --git a/Documentation/it/learning/tweaks.itely b/Documentation/it/learning/tweaks.itely index 74da8683f0..9e6e96ccde 100644 --- a/Documentation/it/learning/tweaks.itely +++ b/Documentation/it/learning/tweaks.itely @@ -942,8 +942,8 @@ preceduto da un apostrofo @item Moment @tab Una frazione di una nota intera costruita con la funzione make-moment - @tab @code{(ly:make-moment 1 4)}, - @code{(ly:make-moment 3 8)} + @tab @code{(ly:make-moment 1/4)}, + @code{(ly:make-moment 3/8)} @item Number @tab Qualsiasi valore decimale positivo o negativo @tab @code{3.5}, @w{@code{-2.45}} diff --git a/Documentation/ja/learning/tweaks.itely b/Documentation/ja/learning/tweaks.itely index ec99a79306..b688efff09 100644 --- a/Documentation/ja/learning/tweaks.itely +++ b/Documentation/ja/learning/tweaks.itely @@ -1012,8 +1012,8 @@ Slur へのリンクを選択すると、Slur のプロパティがリスト ア @tab @code{\markup @{ \italic "cresc." @}} @item Moment @tab make-moment 関数で構築される全音符の分数 - @tab @code{(ly:make-moment 1 4)}, - @code{(ly:make-moment 3 8)} + @tab @code{(ly:make-moment 1/4)}, + @code{(ly:make-moment 3/8)} @item Number @tab 正または負の小数 @tab @code{3.5}, @w{@code{-2.45}} diff --git a/Documentation/ja/notation/editorial.itely b/Documentation/ja/notation/editorial.itely index 9140d55281..213c498934 100644 --- a/Documentation/ja/notation/editorial.itely +++ b/Documentation/ja/notation/editorial.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @c Translators: Yoshiki Sawada @@ -634,7 +634,7 @@ altered: \context { \Staff \consists "Grid_point_engraver" - gridInterval = #(ly:make-moment 1 4) + gridInterval = #(ly:make-moment 1/4) } \context { \Score diff --git a/Documentation/ja/notation/repeats.itely b/Documentation/ja/notation/repeats.itely index 2562f4e5d2..d5b64eb646 100644 --- a/Documentation/ja/notation/repeats.itely +++ b/Documentation/ja/notation/repeats.itely @@ -236,11 +236,11 @@ g1 | \alternative { { f2 d | - \set Timing.measureLength = #(ly:make-moment 3 4) + \set Timing.measureLength = #(ly:make-moment 3/4) g4 g g % optional bar check is allowed here } { - \set Timing.measureLength = #(ly:make-moment 4 4) + \set Timing.measureLength = #(ly:make-moment 4/4) a2 a | } } diff --git a/Documentation/ja/notation/rhythms.itely b/Documentation/ja/notation/rhythms.itely index 7ac549478f..81e2140ccb 100644 --- a/Documentation/ja/notation/rhythms.itely +++ b/Documentation/ja/notation/rhythms.itely @@ -1391,7 +1391,7 @@ r4 e8 | a4 c8 b c4 | @lilypond[quote,verbatim,relative=1] \time 3/4 -\set Timing.measurePosition = #(ly:make-moment -1 8) +\set Timing.measurePosition = #(ly:make-moment -1/8) e8 | a4 c8 b c4 | @end lilypond @@ -1427,7 +1427,7 @@ e8 | a4 c8 b c4 | \time 6/8 \partial 8 e8 | a4 c8 b[ c b] | -\set Timing.measurePosition = #(ly:make-moment -1 4) +\set Timing.measurePosition = #(ly:make-moment -1/4) r8 e,8 | a4 c8 b[ c b] | @end lilypond @@ -2116,7 +2116,7 @@ c16^"(3+2)" c c c c | @lilypond[quote,verbatim,relative=2] \time 5/8 -\set Timing.baseMoment = #(ly:make-moment 1 16) +\set Timing.baseMoment = #(ly:make-moment 1/16) \set Timing.beatStructure = #'(7 3) \repeat unfold 10 { a16 } @end lilypond @@ -2203,7 +2203,7 @@ c16 c c | @c KEEP LY @lilypond[quote,verbatim,relative=2] \time 4/4 -\set Timing.baseMoment = #(ly:make-moment 1 8) +\set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(3 3 2) % 以下は beamExceptions のため、(3 3 2) の連桁にはなりません \repeat unfold 8 {c8} | @@ -2339,7 +2339,7 @@ r4. a8 a a | << \new Staff { \time 3/4 - \set Timing.baseMoment = #(ly:make-moment 1 8) + \set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(1 5) \repeat unfold 6 { a8 } } @@ -2510,10 +2510,10 @@ ritardando (徐々に緩やかに) や accelerando (次第に速く) を@c @lilypond[relative=1,verbatim,quote] \override Beam.grow-direction = #LEFT -\featherDurations #(ly:make-moment 2 1) +\featherDurations #(ly:make-moment 2/1) { c16[ c c c c c c c] } \override Beam.grow-direction = #RIGHT -\featherDurations #(ly:make-moment 2 3) +\featherDurations #(ly:make-moment 2/3) { c32[ d e f] } % revert to non-feathered beams \override Beam.grow-direction = #'() @@ -3528,11 +3528,11 @@ MyCadenza = \relative c' { @lilypond[quote,verbatim] \new Voice \relative c' { - \set Timing.measureLength = #(ly:make-moment 5 4) + \set Timing.measureLength = #(ly:make-moment 5/4) c1 c4 | c1 c4 | c4 c - \set Timing.measurePosition = #(ly:make-moment 5 8) + \set Timing.measurePosition = #(ly:make-moment 5/8) b4 b b8 | c4 c1 | } diff --git a/Documentation/ja/notation/spacing.itely b/Documentation/ja/notation/spacing.itely index 6812334ce4..478940a1bd 100644 --- a/Documentation/ja/notation/spacing.itely +++ b/Documentation/ja/notation/spacing.itely @@ -1641,7 +1641,7 @@ LilyPond が改ページを決定するためのデフォルトの手法です コンテキスト プロパティ @code{minimumPageTurnLength} を読み込んで、@c どれくらい音符が無いセクションが続いたらページめくりを考慮するかを決定します。@c @code{minimumPageTurnLength} のデフォルト値は -@code{(ly:make-moment 1 1)} です。@c +@code{(ly:make-moment 1/1)} です。@c ページめくりを不可にしたいのならば、@c @code{minimumPageTurnLength} に非常に大きな値をセットします。 @@ -1651,7 +1651,7 @@ LilyPond が改ページを決定するためのデフォルトの手法です a4 b c d | R1 | % ここでページめくりが許可されます a4 b c d | - \set Staff.minimumPageTurnLength = #(ly:make-moment 5 2) + \set Staff.minimumPageTurnLength = #(ly:make-moment 5/2) R1 | % ここではページめくりは許可されません a4 b r2 | R1*2 | % ここでページめくりが許可されます @@ -3003,7 +3003,7 @@ c16[ c c8] \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 16) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16) } } } @@ -3191,7 +3191,7 @@ LilyPond はプロポーショナル ノーテーション用に 5 つの設定 \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3216,10 +3216,10 @@ LilyPond はプロポーショナル ノーテーション用に 5 つの設定 これはすべての音楽要素へのスペースに関係する参照演奏時間です。@c LilyPond Scheme 関数 @code{make-moment} は 2 つの引数をとります -- 全音符の分数を表す分子と分母です。@c -それゆえ、@code{(ly:make-moment 1 20)} という呼び出しは、@c +それゆえ、@code{(ly:make-moment 1/20)} という呼び出しは、@c 20 分音符の参照演奏時間となります。@c -@code{(ly:make-moment 1 16)}, @code{(ly:make-moment 1 8)}, それに -@code{(ly:make-moment 3 97)} という値はすべてとり得る値です。 +@code{(ly:make-moment 1/16)}, @code{(ly:make-moment 1/8)}, それに +@code{(ly:make-moment 3/97)} という値はすべてとり得る値です。 では、どのように @code{proportionalNotationDuration} に渡す@c 適切な参照演奏時間を決めるのでしょうか？@c @@ -3242,7 +3242,7 @@ LilyPond Scheme 関数 @code{make-moment} は 2 つの引数をとります \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 8) + proportionalNotationDuration = #(ly:make-moment 1/8) } } } @@ -3260,7 +3260,7 @@ LilyPond Scheme 関数 @code{make-moment} は 2 つの引数をとります \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 16) + proportionalNotationDuration = #(ly:make-moment 1/16) } } } @@ -3278,7 +3278,7 @@ LilyPond Scheme 関数 @code{make-moment} は 2 つの引数をとります \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 32) + proportionalNotationDuration = #(ly:make-moment 1/32) } } } @@ -3342,7 +3342,7 @@ LilyPond Scheme 関数 @code{make-moment} は 2 つの引数をとります \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3374,7 +3374,7 @@ LilyPond Scheme 関数 @code{make-moment} は 2 つの引数をとります \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) \override SpacingSpanner.uniform-stretching = ##t } } @@ -3471,7 +3471,7 @@ OFF であるかのどちらかであるということです。@c @lilypond[quote,verbatim,ragged-right] \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) c''8 c''8 c''8 @@ -3481,7 +3481,7 @@ OFF であるかのどちらかであるということです。@c } \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \override Score.SpacingSpanner.strict-note-spacing = ##t c''8 c''8 @@ -3707,7 +3707,7 @@ e4 c g-\tweak X-offset #-2.7 -\tweak Y-offset #2.5 \f c \layout { \context { \Score - \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/2) } } } diff --git a/Documentation/ja/notation/vocal.itely b/Documentation/ja/notation/vocal.itely index e01ac3f025..bcbd2cfb98 100644 --- a/Documentation/ja/notation/vocal.itely +++ b/Documentation/ja/notation/vocal.itely @@ -3098,7 +3098,7 @@ global = { \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2) } \context { \Staff diff --git a/Documentation/ly-examples/cary-layout.ily b/Documentation/ly-examples/cary-layout.ily index 85db19169c..3075225e23 100644 --- a/Documentation/ly-examples/cary-layout.ily +++ b/Documentation/ly-examples/cary-layout.ily @@ -1,5 +1,5 @@ -\version "2.17.6" +\version "2.17.11" \layout { indent = #0 @@ -7,7 +7,7 @@ \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 64) + proportionalNotationDuration = #(ly:make-moment 1/64) \override Beam.breakable = ##t autoBeaming = ##f tupletFullLength = ##t diff --git a/Documentation/ly-examples/granados.ly b/Documentation/ly-examples/granados.ly index 09f4e630d4..1e13d1b29e 100644 --- a/Documentation/ly-examples/granados.ly +++ b/Documentation/ly-examples/granados.ly @@ -44,7 +44,7 @@ upperVoiceOne = \relative c'' { \voiceOne 8\([ \tuplet 5/4{32( aes' g f g]) } \set subdivideBeams = ##t - \set baseMoment = #(ly:make-moment 1 8) + \set baseMoment = #(ly:make-moment 1/8) \set beatStructure = #'(2 2 2) 16 \tuplet 5/4{ bes'32( c bes aes bes]) } \set subdivideBeams = ##f @@ -89,7 +89,7 @@ lowerVoiceOne = \relative c, { bes8 \csm \stemDown 8 s2 \csl \stemUp \set subdivideBeams = ##t - \set baseMoment = #(ly:make-moment 1 16) + \set baseMoment = #(ly:make-moment 1/16) \set beatStructure = #'(4 4 4) s8 \hideNotes \slurUp \stemDown es,,64( bes'' s64 \unHideNotes \stemUp g64[ bes c d c]) s2 diff --git a/Documentation/notation/ancient.itely b/Documentation/notation/ancient.itely index 970fa0a535..6d122875f8 100644 --- a/Documentation/notation/ancient.itely +++ b/Documentation/notation/ancient.itely @@ -635,7 +635,7 @@ example, the ratio of 1@tie{}breve = 3@tie{}semibreves (@emph{tempus perfectum}) can be made by hand, by setting @example -breveTP = #(ly:make-duration -1 0 3 2) +breveTP = #(ly:make-duration -1 0 3/2) @dots{} @{ c\breveTP f1 @} @end example diff --git a/Documentation/notation/editorial.itely b/Documentation/notation/editorial.itely index fa7999e76b..002dafbe66 100644 --- a/Documentation/notation/editorial.itely +++ b/Documentation/notation/editorial.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.6" +@c \version "2.17.11" @node Editorial annotations @section Editorial annotations @@ -598,7 +598,7 @@ lines. \context { \Staff \consists "Grid_point_engraver" - gridInterval = #(ly:make-moment 1 4) + gridInterval = #(ly:make-moment 1/4) } \context { \Score diff --git a/Documentation/notation/repeats.itely b/Documentation/notation/repeats.itely index ef22c2835e..63c2b7a9bd 100644 --- a/Documentation/notation/repeats.itely +++ b/Documentation/notation/repeats.itely @@ -225,11 +225,11 @@ at the start of each alternative, except the first. \alternative { { f2 d | - \set Timing.measureLength = #(ly:make-moment 3 4) + \set Timing.measureLength = #(ly:make-moment 3/4) g4 g g % optional bar check is allowed here } { - \set Timing.measureLength = #(ly:make-moment 4 4) + \set Timing.measureLength = #(ly:make-moment 4/4) a2 a | } } diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely index 9121d09f3e..1fcdcc3e1f 100644 --- a/Documentation/notation/rhythms.itely +++ b/Documentation/notation/rhythms.itely @@ -1402,7 +1402,7 @@ So @code{\partial 8} becomes: @lilypond[quote,verbatim,relative=1] \time 3/4 -\set Timing.measurePosition = #(ly:make-moment -1 8) +\set Timing.measurePosition = #(ly:make-moment -1/8) e8 | a4 c8 b c4 | @end lilypond @@ -1434,7 +1434,7 @@ occur, so use @code{\set Timing.measurePosition} instead. \time 6/8 \partial 8 e8 | a4 c8 b[ c b] | -\set Timing.measurePosition = #(ly:make-moment -1 4) +\set Timing.measurePosition = #(ly:make-moment -1/4) r8 e,8 | a4 c8 b[ c b] | @end lilypond @@ -2080,7 +2080,7 @@ a8^"default" a a a a a a a % Disable beamExceptions because they are definitely % defined for 4/4 time \set Timing.beamExceptions = #'() -\set Timing.baseMoment = #(ly:make-moment 1 4) +\set Timing.baseMoment = #(ly:make-moment 1/4) \set Timing.beatStructure = #'(1 1 1 1) a8^"changed" a a a a a a a @end lilypond @@ -2137,7 +2137,7 @@ compatible with the new value of @code{baseMoment}. @lilypond[quote,verbatim,relative=2] \time 5/8 % No need to disable beamExceptions as they are not defined for 5/8 time -\set Timing.baseMoment = #(ly:make-moment 1 16) +\set Timing.baseMoment = #(ly:make-moment 1/16) \set Timing.beatStructure = #'(7 3) \repeat unfold 10 { a16 } @end lilypond @@ -2228,7 +2228,7 @@ if @code{beamExceptions} is not reset. @lilypond[quote,verbatim,relative=2] \time 4/4 -\set Timing.baseMoment = #(ly:make-moment 1 8) +\set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(3 3 2) % This won't beam (3 3 2) because of beamExceptions \repeat unfold 8 {c8} | @@ -2364,7 +2364,7 @@ in only one staff. << \new Staff { \time 3/4 - \set Timing.baseMoment = #(ly:make-moment 1 8) + \set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(1 5) \repeat unfold 6 { a8 } } @@ -2535,10 +2535,10 @@ the last four 32nd notes are at a constant tempo. @lilypond[relative=1,verbatim,quote] \override Beam.grow-direction = #LEFT -\featherDurations #(ly:make-moment 2 1) +\featherDurations #(ly:make-moment 2/1) { c16[ c c c c c c c] } \override Beam.grow-direction = #RIGHT -\featherDurations #(ly:make-moment 2 3) +\featherDurations #(ly:make-moment 2/3) { c32[ d e f] } % revert to non-feathered beams \override Beam.grow-direction = #'() @@ -3634,11 +3634,11 @@ The next bar line then falls at 9/8 rather than 5/4. @lilypond[quote,verbatim] \new Voice \relative c' { - \set Timing.measureLength = #(ly:make-moment 5 4) + \set Timing.measureLength = #(ly:make-moment 5/4) c1 c4 | c1 c4 | c4 c - \set Timing.measurePosition = #(ly:make-moment 5 8) + \set Timing.measurePosition = #(ly:make-moment 5/8) b4 b b8 | c4 c1 | } diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely index 16e27488d7..ad892f96eb 100644 --- a/Documentation/notation/spacing.itely +++ b/Documentation/notation/spacing.itely @@ -1607,7 +1607,7 @@ the section. The @code{Page_turn_engraver} reads the context property @code{minimumPageTurnLength} to determine how long a note-free section must be before a page turn is considered. The default value for -@code{minimumPageTurnLength} is @code{(ly:make-moment 1 1)}. If you want +@code{minimumPageTurnLength} is @code{(ly:make-moment 1/1)}. If you want to disable page turns, you can set it to something very large. @example @@ -1616,7 +1616,7 @@ to disable page turns, you can set it to something very large. a4 b c d | R1 | % a page turn will be allowed here a4 b c d | - \set Staff.minimumPageTurnLength = #(ly:make-moment 5 2) + \set Staff.minimumPageTurnLength = #(ly:make-moment 5/2) R1 | % a page turn will not be allowed here a4 b r2 | R1*2 | % a page turn will be allowed here @@ -2902,7 +2902,7 @@ than @code{1 16}. \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 16) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16) } } } @@ -3079,7 +3079,7 @@ setting. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3102,10 +3102,10 @@ The @code{proportionalNotationDuration} setting takes a single argument, which is the reference duration against that all music will be spaced. The LilyPond Scheme function @code{make-moment} takes two arguments -- a numerator and denominator which together express some fraction of -a whole note. The call @code{(ly:make-moment 1 20)} therefore produces +a whole note. The call @code{(ly:make-moment 1/20)} therefore produces a reference duration of a twentieth note. Values such as -@code{(ly:make-moment 1 16)}, @code{(ly:make-moment 1 8)}, and -@code{(ly:make-moment 3 97)} are all possible as well. +@code{(ly:make-moment 1/16)}, @code{(ly:make-moment 1/8)}, and +@code{(ly:make-moment 3/97)} are all possible as well. How do we select the right reference duration to pass to @code{proportionalNotationDuration}? Usually by a process of trial @@ -3127,7 +3127,7 @@ larger reference durations space music tightly. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 8) + proportionalNotationDuration = #(ly:make-moment 1/8) } } } @@ -3145,7 +3145,7 @@ larger reference durations space music tightly. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 16) + proportionalNotationDuration = #(ly:make-moment 1/16) } } } @@ -3163,7 +3163,7 @@ larger reference durations space music tightly. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 32) + proportionalNotationDuration = #(ly:make-moment 1/32) } } } @@ -3224,7 +3224,7 @@ result. Setting @code{proportionalNotationDuration} fixes this. \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) } } } @@ -3255,7 +3255,7 @@ turn on @code{uniform-stretching}, which is a property of \layout { \context { \Score - proportionalNotationDuration = #(ly:make-moment 1 20) + proportionalNotationDuration = #(ly:make-moment 1/20) \override SpacingSpanner.uniform-stretching = ##t } } @@ -3344,7 +3344,7 @@ property of @code{SpacingSpanner}. Compare the two scores below: @lilypond[quote,verbatim,ragged-right] \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) c''8 c''8 c''8 @@ -3354,7 +3354,7 @@ property of @code{SpacingSpanner}. Compare the two scores below: } \new Staff { - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \override Score.SpacingSpanner.strict-note-spacing = ##t c''8 c''8 @@ -3568,7 +3568,7 @@ duration longer, a @q{squeezing} effect occurs: \layout { \context { \Score - \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/2) } } } diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely index f9e51ffa90..c6d3ee02bc 100644 --- a/Documentation/notation/vocal.itely +++ b/Documentation/notation/vocal.itely @@ -3027,7 +3027,7 @@ global = { \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2) } \context { \Staff diff --git a/Documentation/snippets/anglican-psalm-template.ly b/Documentation/snippets/anglican-psalm-template.ly index 055fd10b3c..81f5816c0a 100644 --- a/Documentation/snippets/anglican-psalm-template.ly +++ b/Documentation/snippets/anglican-psalm-template.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "template, vocal-music" @@ -87,7 +87,7 @@ tick = \markup { \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 2) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2) } \context { \Staff diff --git a/Documentation/snippets/automatic-beam-subdivisions.ly b/Documentation/snippets/automatic-beam-subdivisions.ly index d824ef92e5..40e9e04d68 100644 --- a/Documentation/snippets/automatic-beam-subdivisions.ly +++ b/Documentation/snippets/automatic-beam-subdivisions.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "automatic-notation, connecting-notes, rhythms" @@ -34,10 +34,10 @@ specified in @code{baseMoment}). } >> \oneVoice - \set baseMoment = #(ly:make-moment 1 8) + \set baseMoment = #(ly:make-moment 1/8) \set beatStructure = #'(2 2 2 2) b32^"baseMoment 1 8"[ a g f c' b a g] - \set baseMoment = #(ly:make-moment 1 16) + \set baseMoment = #(ly:make-moment 1/16) \set beatStructure = #'(4 4 4 4) b32^"baseMoment 1 16"[ a g f c' b a g] } diff --git a/Documentation/snippets/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly index d5b9e07ea9..a09e8853d0 100644 --- a/Documentation/snippets/beam-endings-in-score-context.ly +++ b/Documentation/snippets/beam-endings-in-score-context.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "rhythms" @@ -22,7 +22,7 @@ levels: \relative c'' { \time 5/4 % Set default beaming for all staves - \set Score.baseMoment = #(ly:make-moment 1 8) + \set Score.baseMoment = #(ly:make-moment 1/8) \set Score.beatStructure = #'(3 4 3) << \new Staff { diff --git a/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly b/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly index 4da77bd852..64afc105e2 100644 --- a/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly +++ b/Documentation/snippets/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly @@ -5,7 +5,7 @@ % % This file is in the public domain. %% Note: this file works from version 2.16.0 -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "workaround, contexts-and-engravers, contemporary-notation, rhythms" @@ -32,10 +32,10 @@ \new Staff { \scaleDurations 8/5 { \time 6/8 - \set Timing.measureLength = #(ly:make-moment 6 5) + \set Timing.measureLength = #(ly:make-moment 6/5) b8 b b b b b \time 2/4 - \set Timing.measureLength = #(ly:make-moment 4 5) + \set Timing.measureLength = #(ly:make-moment 4/5) b4 b } } diff --git a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly index bdd354fce7..6ba7858cca 100644 --- a/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly +++ b/Documentation/snippets/defining-predefined-fretboards-for-other-instruments.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "fretted-strings" @@ -108,7 +108,7 @@ primeros = { \layout { \context { \Score - \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 16) + \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/16) } } \midi { } diff --git a/Documentation/snippets/expressive-headword.ly b/Documentation/snippets/expressive-headword.ly index 6f469e15c1..f9f5e9b908 100644 --- a/Documentation/snippets/expressive-headword.ly +++ b/Documentation/snippets/expressive-headword.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "headword" @@ -28,7 +28,7 @@ Expressive headword % \context { % \Score % \override SpacingSpanner.base-shortest-duration = -% #(ly:make-moment 1 20) +% #(ly:make-moment 1/20) % } %} diff --git a/Documentation/snippets/generating-random-notes.ly b/Documentation/snippets/generating-random-notes.ly index af7d81868d..cf2bfb23e9 100644 --- a/Documentation/snippets/generating-random-notes.ly +++ b/Documentation/snippets/generating-random-notes.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "pitches, really-cool, scheme-language" @@ -29,7 +29,7 @@ get different random note patterns, just change this number. (make-event-chord (list (make-music 'NoteEvent - 'duration (ly:make-duration 2 0 1 1) + 'duration (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch (quotient idx 7) (remainder idx 7) diff --git a/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly index c2182e123a..cc30a8b2bf 100644 --- a/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly +++ b/Documentation/snippets/generating-whole-scores-also-book-parts-in-scheme-without-using-the-parser.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "automatic-notation, really-cool, scheme-language" @@ -78,7 +78,7 @@ modified to inser all collected scores so far to the book. (lambda (parser) (let* ((music (make-music 'EventChord 'elements (list (make-music 'NoteEvent - 'duration (ly:make-duration 2 0 1 1) + 'duration (ly:make-duration 2 0 1/1) 'pitch (ly:make-pitch 0 pitch 0))))) (score (scorify-music music parser)) (layout (ly:output-def-clone $defaultlayout)) diff --git a/Documentation/snippets/grid-lines--changing-their-appearance.ly b/Documentation/snippets/grid-lines--changing-their-appearance.ly index abb031df09..254a266304 100644 --- a/Documentation/snippets/grid-lines--changing-their-appearance.ly +++ b/Documentation/snippets/grid-lines--changing-their-appearance.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "editorial-annotations" @@ -49,7 +49,7 @@ properties. % set up grids \consists "Grid_point_engraver" % set the grid interval to one quarter note - gridInterval = #(ly:make-moment 1 4) + gridInterval = #(ly:make-moment 1/4) } \context { \Score diff --git a/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly b/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly index cd425b79cb..f8203c6646 100644 --- a/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly +++ b/Documentation/snippets/grid-lines--emphasizing-rhythms-and-notes-synchronization.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "editorial-annotations" @@ -58,7 +58,7 @@ this snippet. \context { \Staff \consists "Grid_point_engraver" - gridInterval = #(ly:make-moment 1 8) + gridInterval = #(ly:make-moment 1/8) % set line length and positioning: % two staff spaces above center line on hidden staff % to four spaces below center line on visible staff diff --git a/Documentation/snippets/new/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly b/Documentation/snippets/new/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly index 0aff0ba5e7..cedf58cd32 100644 --- a/Documentation/snippets/new/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly +++ b/Documentation/snippets/new/changing-time-signatures-inside-a-polymetric-section-using--scaledurations.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "workaround, contexts-and-engravers, contemporary-notation, rhythms" @@ -24,10 +24,10 @@ \new Staff { \scaleDurations 8/5 { \time 6/8 - \set Timing.measureLength = #(ly:make-moment 6 5) + \set Timing.measureLength = #(ly:make-moment 6/5) b8 b b b b b \time 2/4 - \set Timing.measureLength = #(ly:make-moment 4 5) + \set Timing.measureLength = #(ly:make-moment 4/5) b4 b } } diff --git a/Documentation/snippets/new/score-for-diatonic-accordion.ly b/Documentation/snippets/new/score-for-diatonic-accordion.ly index 6c005c2009..fbefd5445e 100644 --- a/Documentation/snippets/new/score-for-diatonic-accordion.ly +++ b/Documentation/snippets/new/score-for-diatonic-accordion.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "template, real-music, specific-notation" @@ -150,7 +150,7 @@ AccordionTab= { \dynamicUp \context { \Staff \consists "Grid_point_engraver" - gridInterval = #(ly:make-moment 4 4) % 4/4 - tact. How many beats per bar + gridInterval = #(ly:make-moment 4/4) % 4/4 - tact. How many beats per bar % The following line has to be adjusted O-F-T-E-N. \override GridPoint.Y-extent = #'(-2 . -21) } diff --git a/Documentation/snippets/printing-music-with-different-time-signatures.ly b/Documentation/snippets/printing-music-with-different-time-signatures.ly index 6b817fd1fc..8d52ffd405 100644 --- a/Documentation/snippets/printing-music-with-different-time-signatures.ly +++ b/Documentation/snippets/printing-music-with-different-time-signatures.ly @@ -43,7 +43,7 @@ global = { \time 3/4 { s2.*3 } \bar "" \break { s2.*3 } } \remove "Bar_number_engraver" \override SpacingSpanner.uniform-stretching = ##t \override SpacingSpanner.strict-note-spacing = ##t - proportionalNotationDuration = #(ly:make-moment 1 64) + proportionalNotationDuration = #(ly:make-moment 1/64) } \context { \Staff diff --git a/Documentation/snippets/proportional-strict-notespacing.ly b/Documentation/snippets/proportional-strict-notespacing.ly index 3598d57811..be85c96e04 100644 --- a/Documentation/snippets/proportional-strict-notespacing.ly +++ b/Documentation/snippets/proportional-strict-notespacing.ly @@ -21,7 +21,7 @@ the note that occurs at the same time. This may cause collisions. \relative c'' << \override Score.SpacingSpanner.strict-note-spacing = ##t - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \new Staff { c8[ c \clef alto c c \grace { d16 } c8 c] c4 c2 \grace { c16[ c16] } c2 diff --git a/Documentation/snippets/rhythms-headword.ly b/Documentation/snippets/rhythms-headword.ly index 895de25a79..b0c99b7dc4 100644 --- a/Documentation/snippets/rhythms-headword.ly +++ b/Documentation/snippets/rhythms-headword.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "headword" @@ -27,7 +27,7 @@ Rhythms headword \context { \Score \override SpacingSpanner.base-shortest-duration = - #(ly:make-moment 1 40) + #(ly:make-moment 1/40) %\override SpacingSpanner.strict-grace-spacing = ##t } } diff --git a/Documentation/snippets/score-for-diatonic-accordion.ly b/Documentation/snippets/score-for-diatonic-accordion.ly index 4cdddcad38..311776013c 100644 --- a/Documentation/snippets/score-for-diatonic-accordion.ly +++ b/Documentation/snippets/score-for-diatonic-accordion.ly @@ -5,7 +5,7 @@ % % This file is in the public domain. %% Note: this file works from version 2.17.6 -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "template, real-music, specific-notation" @@ -158,7 +158,7 @@ AccordionTab= { \dynamicUp \context { \Staff \consists "Grid_point_engraver" - gridInterval = #(ly:make-moment 4 4) % 4/4 - tact. How many beats per bar + gridInterval = #(ly:make-moment 4/4) % 4/4 - tact. How many beats per bar % The following line has to be adjusted O-F-T-E-N. \override GridPoint.Y-extent = #'(-2 . -21) } diff --git a/Documentation/snippets/shortening-volta-brackets.ly b/Documentation/snippets/shortening-volta-brackets.ly index a518debae4..611057d4cb 100644 --- a/Documentation/snippets/shortening-volta-brackets.ly +++ b/Documentation/snippets/shortening-volta-brackets.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "repeats" @@ -23,7 +23,7 @@ lasts one measure, which is a duration of 3/4. \relative c'' { \time 3/4 c4 c c - \set Score.voltaSpannerDuration = #(ly:make-moment 3 4) + \set Score.voltaSpannerDuration = #(ly:make-moment 3/4) \repeat volta 5 { d4 d d } \alternative { { diff --git a/Documentation/snippets/simultaneous-headword.ly b/Documentation/snippets/simultaneous-headword.ly index dec4e68295..a08838f8f8 100644 --- a/Documentation/snippets/simultaneous-headword.ly +++ b/Documentation/snippets/simultaneous-headword.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "headword" @@ -29,7 +29,7 @@ Simultaneous notes \context { \Score \override SpacingSpanner.base-shortest-duration = - #(ly:make-moment 1 18) + #(ly:make-moment 1/18) \override NonMusicalPaperColumn.line-break-system-details = #'((alignment-distances . (12))) } diff --git a/Documentation/snippets/subdividing-beams.ly b/Documentation/snippets/subdividing-beams.ly index 41ffdce540..e7080e65a5 100644 --- a/Documentation/snippets/subdividing-beams.ly +++ b/Documentation/snippets/subdividing-beams.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.17.11" \header { lsrtags = "rhythms" @@ -34,12 +34,12 @@ in this snippet. Also, when @code{baseMoment} is changed, c32[ c c c c c c c] % Set beam sub-group length to an eighth note - \set baseMoment = #(ly:make-moment 1 8) + \set baseMoment = #(ly:make-moment 1/8) \set beatStructure = #'(2 2 2 2) c32[ c c c c c c c] % Set beam sub-group length to a sixteenth note - \set baseMoment = #(ly:make-moment 1 16) + \set baseMoment = #(ly:make-moment 1/16) \set beatStructure = #'(4 4 4 4) c32[ c c c c c c c] } diff --git a/Documentation/snippets/text-headword.ly b/Documentation/snippets/text-headword.ly index 05ec402058..011e59d17c 100644 --- a/Documentation/snippets/text-headword.ly +++ b/Documentation/snippets/text-headword.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.17.6" +\version "2.17.11" \header { lsrtags = "headword" @@ -28,7 +28,7 @@ Text headword \context { \Score \override SpacingSpanner.base-shortest-duration = - #(ly:make-moment 1 20) + #(ly:make-moment 1/20) } } diff --git a/Documentation/snippets/unfretted-headword.ly b/Documentation/snippets/unfretted-headword.ly index 9c6a9184f9..de2d700e78 100644 --- a/Documentation/snippets/unfretted-headword.ly +++ b/Documentation/snippets/unfretted-headword.ly @@ -178,7 +178,7 @@ ViolinSolo = \relative c' { %% Measure 6 \time 5/8 - \once \override Beam.grow-direction = #RIGHT % \featherDurations #(ly:make-moment 2 3) + \once \override Beam.grow-direction = #RIGHT % \featherDurations #(ly:make-moment 2/3) { d16 \staccato [ d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato d \staccato] } diff --git a/input/regression/auto-beam-beaming-override.ly b/input/regression/auto-beam-beaming-override.ly index 6798aa8e83..c811a5d963 100644 --- a/input/regression/auto-beam-beaming-override.ly +++ b/input/regression/auto-beam-beaming-override.ly @@ -8,14 +8,14 @@ beaming pattern related functions at the start of an autobeam." } -\version "2.16.0" +\version "2.17.11" \paper { ragged-right = ##t } { \time 2/4 b16 b b b b16 b b b \set subdivideBeams = ##t - \set Score.baseMoment = #(ly:make-moment 1 8) + \set Score.baseMoment = #(ly:make-moment 1/8) b16 b b b b16 b b b } diff --git a/input/regression/autobeam-3-4-rules.ly b/input/regression/autobeam-3-4-rules.ly index 4a098e33d8..79aad6b6bb 100644 --- a/input/regression/autobeam-3-4-rules.ly +++ b/input/regression/autobeam-3-4-rules.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { @@ -27,7 +27,7 @@ is changed, beams should start at the beginning of the measure. r8^\markup "Beam to the beat" c c c c c c c c r r4 \bar "||" - \set Timing.baseMoment = #(ly:make-moment 1 8) + \set Timing.baseMoment = #(ly:make-moment 1/8) \set Timing.beatStructure = #'(3 3) r8^\markup "Override to beam groups of 3 eighth notes" c c c c c r4. c8 c c c c c r4. diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 29edf9e7f3..d165f4e5f4 100644 --- a/input/regression/beam-concave.ly +++ b/input/regression/beam-concave.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header{ texidoc = "Fully concave beams should be horizontal. Informally spoken, @@ -12,7 +12,7 @@ } -resetMeasure = \set Score.measurePosition = #(ly:make-moment 0 1) +resetMeasure = \set Score.measurePosition = #(ly:make-moment 0/1) %% examples from Ross. rossFourBeams =\relative c'' { diff --git a/input/regression/beam-feather.ly b/input/regression/beam-feather.ly index b21658c46b..0006976c6e 100644 --- a/input/regression/beam-feather.ly +++ b/input/regression/beam-feather.ly @@ -6,7 +6,7 @@ } -\version "2.17.6" +\version "2.17.11" \paper { ragged-right = ##t @@ -18,7 +18,7 @@ % a linear decrease instead? % -\featherDurations #(ly:make-moment 3 4) \relative c'' { +\featherDurations #(ly:make-moment 3/4) \relative c'' { \override Beam.grow-direction = #LEFT c16[ c c c diff --git a/input/regression/beam-subdivide-tuplets.ly b/input/regression/beam-subdivide-tuplets.ly index 516ba7141f..5db5ea1f54 100644 --- a/input/regression/beam-subdivide-tuplets.ly +++ b/input/regression/beam-subdivide-tuplets.ly @@ -14,7 +14,7 @@ the beams should be subdivided every 1/8. \relative c' { \tupletSpan 4 - \set baseMoment = #(ly:make-moment 1 8) + \set baseMoment = #(ly:make-moment 1/8) \set subdivideBeams = ##t \tuplet 6/4 { \repeat unfold 24 { c16 } } } diff --git a/input/regression/completion-heads-unit.ly b/input/regression/completion-heads-unit.ly index c4d9289af9..e35e639344 100644 --- a/input/regression/completion-heads-unit.ly +++ b/input/regression/completion-heads-unit.ly @@ -17,10 +17,10 @@ Note head completion may be broken into sub-bar units by setting the \context Staff \relative f { \time 9/8 - \set completionUnit = #(ly:make-moment 3 8) + \set completionUnit = #(ly:make-moment 3/8) g'1.. g2 \time 6/4 - \set completionUnit = #(ly:make-moment 1 4) + \set completionUnit = #(ly:make-moment 1/4) \tupletSpan 4 \tuplet 3/2 { e4 c8 f g a4 b8 c4 b8 a4 g8 a e f4 } } diff --git a/input/regression/duration-identifier-compressed.ly b/input/regression/duration-identifier-compressed.ly index 71f32a35eb..96b59cb81c 100644 --- a/input/regression/duration-identifier-compressed.ly +++ b/input/regression/duration-identifier-compressed.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = "The compression factor of a duration identifier is @@ -6,7 +6,7 @@ correctly accounted for by the parser." } % looks like a whole note, has duration of half note -wholeHalved = #(ly:make-duration 0 0 1 2) +wholeHalved = #(ly:make-duration 0 0 1/2) \relative c' { diff --git a/input/regression/general-scheme-bindings.ly b/input/regression/general-scheme-bindings.ly index d3af8ab84e..bf00be2fc4 100644 --- a/input/regression/general-scheme-bindings.ly +++ b/input/regression/general-scheme-bindings.ly @@ -5,7 +5,7 @@ } -\version "2.16.0" +\version "2.17.11" %% todo : use macro, to show the statement tested. #(ly:progress "~a\n" (ly:expand-environment "${HOME} $HOME $$ ")) @@ -14,7 +14,7 @@ %% very platform dependent. %% #(ly:font-config-display-fonts) -#(ly:progress "~A\n" (ly:duration->string (ly:make-duration 2 2 3 7))) +#(ly:progress "~A\n" (ly:duration->string (ly:make-duration 2 2 3/7))) #(ly:parser-parse-string (ly:parser-clone parser) "foo = #1 #(ly:progress \"hello there\n\")") #(ly:progress "~a\n" (ly:truncate-list! (iota 5) 10)) diff --git a/input/regression/grid-lines.ly b/input/regression/grid-lines.ly index e43000956c..ed4e054c62 100644 --- a/input/regression/grid-lines.ly +++ b/input/regression/grid-lines.ly @@ -5,7 +5,7 @@ staves synchronized with the notes." } -\version "2.17.6" +\version "2.17.11" skips = { @@ -39,7 +39,7 @@ skips = \context { \RhythmicStaff \consists "Grid_point_engraver" - gridInterval = #(ly:make-moment 1 8) + gridInterval = #(ly:make-moment 1/8) \override BarLine.bar-extent = #'(-0.025 . 0.025) } \context { diff --git a/input/regression/metronome-range.ly b/input/regression/metronome-range.ly index ac6b5c67a3..d692c22359 100644 --- a/input/regression/metronome-range.ly +++ b/input/regression/metronome-range.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { texidoc = " @@ -11,7 +11,7 @@ printed with an en-dash character, separated by thin-spaces. \tempo 4 = 66 ~ 72 c1 | c $(make-event-chord (list (make-music 'TempoChangeEvent - 'tempo-unit (ly:make-duration 2 0 1 1) + 'tempo-unit (ly:make-duration 2 0 1/1) 'metronome-count (cons 124 132)))) c1 | c } diff --git a/input/regression/scheme-book-scores.ly b/input/regression/scheme-book-scores.ly index 5e24ef5f39..fd1609f1b6 100644 --- a/input/regression/scheme-book-scores.ly +++ b/input/regression/scheme-book-scores.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.17.11" \header { @@ -19,7 +19,7 @@ informations from top- and booklevel stack correctly." (let* ((scmpitch (ly:make-pitch 0 pitch 0)) (music (make-music 'EventChord 'elements (list (make-music 'NoteEvent - 'duration (ly:make-duration 2 0 1 1) + 'duration (ly:make-duration 2 0 1/1) 'pitch scmpitch)))) (score (scorify-music music parser)) (layout (ly:output-def-clone $defaultlayout)) diff --git a/input/regression/spacing-measure-length.ly b/input/regression/spacing-measure-length.ly index fa57806571..2400a0343a 100644 --- a/input/regression/spacing-measure-length.ly +++ b/input/regression/spacing-measure-length.ly @@ -6,7 +6,7 @@ This means that the 3/8 setting does not affect the whole rest spacing." } -\version "2.17.6" +\version "2.17.11" \layout { ragged-right = ##t @@ -18,7 +18,7 @@ This means that the 3/8 setting does not affect the whole rest spacing." } { \relative c' { \override Score.SpacingSpanner.uniform-stretching = ##t - \set Score.proportionalNotationDuration = #(ly:make-moment 4 25) + \set Score.proportionalNotationDuration = #(ly:make-moment 4/25) r1 \time 3/8 r4. } diff --git a/input/regression/spacing-proportional.ly b/input/regression/spacing-proportional.ly index dcd83eba4c..73c13dcdf2 100644 --- a/input/regression/spacing-proportional.ly +++ b/input/regression/spacing-proportional.ly @@ -12,7 +12,7 @@ to the distance for the given duration." \relative c'' << - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \new Staff { c8[ c c c c c] c4 c2 r2 } \new Staff { c2 \tuplet 3/2 { c8 c c } c4 c1 } >> diff --git a/input/regression/spacing-space-to-barline.ly b/input/regression/spacing-space-to-barline.ly index fb568a06d7..e1539e59b8 100644 --- a/input/regression/spacing-space-to-barline.ly +++ b/input/regression/spacing-space-to-barline.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.17.11" \header { texidoc = "When space-to-barline is false, we measure the space between the note and the @@ -9,7 +9,7 @@ the start of the barline." \paper {ragged-right = ##t} { - \override Score.SpacingSpanner.common-shortest-duration = #(ly:make-moment 1 16) + \override Score.SpacingSpanner.common-shortest-duration = #(ly:make-moment 1/16) c'2 \clef bass c'2 \clef treble \override NoteSpacing.space-to-barline = ##f c'2 \clef bass c'2 \clef treble diff --git a/input/regression/spacing-strict-notespacing.ly b/input/regression/spacing-strict-notespacing.ly index d91bacf38d..cfe63c8bc8 100644 --- a/input/regression/spacing-strict-notespacing.ly +++ b/input/regression/spacing-strict-notespacing.ly @@ -24,7 +24,7 @@ time. This may cause collisions. " \relative c'' << \override Score.SpacingSpanner.strict-note-spacing = ##t - \set Score.proportionalNotationDuration = #(ly:make-moment 1 16) + \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \new Staff { c8[ c \clef alto c c \grace { d16 } c8 c] c4 c2 \grace { c16[ c16] } diff --git a/input/regression/tuplet-subdivision.ly b/input/regression/tuplet-subdivision.ly index a8370d35d4..82fd4b9780 100644 --- a/input/regression/tuplet-subdivision.ly +++ b/input/regression/tuplet-subdivision.ly @@ -9,7 +9,7 @@ Subdivision works properly for tuplets \relative c'' { \set subdivideBeams = ##t - \set baseMoment = #(ly:make-moment 1 8) + \set baseMoment = #(ly:make-moment 1/8) \set beatStructure = #'(2 2 2 2) \repeat unfold 8 { \tuplet 3/2 { c16 e d } diff --git a/ly/articulate.ly b/ly/articulate.ly index ed4e7aa752..985c680e35 100644 --- a/ly/articulate.ly +++ b/ly/articulate.ly @@ -89,7 +89,7 @@ % * Add Mordents (reported by Patrick Karl) % -\version "2.16.0" +\version "2.17.11" #(use-modules (srfi srfi-1)) #(use-modules (srfi srfi-11)) @@ -115,12 +115,12 @@ % How much to slow down for a rall. or a poco rall. % (or speed up for accel or poco accel) -#(define ac:rallFactor (ly:make-moment 60 100)) % 40% slowdown -#(define ac:pocoRallFactor (ly:make-moment 90 100)) % 10% slowdown +#(define ac:rallFactor (ly:make-moment 60/100)) % 40% slowdown +#(define ac:pocoRallFactor (ly:make-moment 90/100)) % 10% slowdown % The absolute time for a twiddle in a trill, in minutes. % Start with 1/4 seconds == 1/240 minutes -#(define ac:maxTwiddleTime (ly:make-moment 1 240)) +#(define ac:maxTwiddleTime (ly:make-moment 1/240)) % How long ordinary grace notes should be relative to their notated % duration. 9/40 is LilyPond's built-in behaviour for MIDI output @@ -160,12 +160,12 @@ (cons 6 0)))) -#(define ac:currentTempo (ly:make-moment 15 1)) % 4 = 60, measured wholes per minute +#(define ac:currentTempo (ly:make-moment 15/1)) % 4 = 60, measured wholes per minute #(define ac:lastTempo ac:currentTempo) % for 'a tempo' or 'tempo I' % The duration of the current note. Start at a crotchet % for no good reason. -#(define ac:currentDuration (ly:make-duration 2 0 1 1)) +#(define ac:currentDuration (ly:make-duration 2 0 1/1)) % Amount of musical time (in whole notes) that we need to steal from the % next events seen. @@ -352,7 +352,7 @@ pre-t (let loop ((len (ly:music-length music))) (if (ly:momentexact (round (/ (ly:moment-main-numerator c1) @@ -411,7 +411,7 @@ 'metronome-count tempo 'tempo-unit - (ly:make-duration 0 0 1 1)) + (ly:make-duration 0 0 1/1)) (context-spec-music (make-property-set 'tempoWholesPerMinute tempo) 'Score)))) @@ -688,12 +688,12 @@ ; We implement as a half-shake. (let* ((totallength (ly:music-length music)) - (newlen (ly:moment-sub totallength (ly:make-moment 3 32))) + (newlen (ly:moment-sub totallength (ly:make-moment 3/32))) (newdur (ly:make-duration 0 0 (ly:moment-main-numerator newlen) (ly:moment-main-denominator newlen))) - (gracedur (ly:make-duration 5 0 1 1)) + (gracedur (ly:make-duration 5 0 1/1)) (gracenote (ly:music-deep-copy music)) (abovenote (ly:music-deep-copy music)) (mainnote (ly:music-deep-copy music)) @@ -726,7 +726,7 @@ ((totaldur (ly:music-property (car (ly:music-property music 'elements)) 'duration)) (dur (ly:duration-length totaldur)) - (newlen (ly:moment-sub dur (ly:make-moment 2 32))) + (newlen (ly:moment-sub dur (ly:make-moment 2/32))) (newdur (ly:make-duration 0 0 (ly:moment-main-numerator newlen) @@ -740,7 +740,7 @@ (music-map (lambda (n) (if (eq? 'NoteEvent (ly:music-property n 'name)) (set! (ly:music-property n 'duration) - (ly:make-duration 5 0 1 1))) + (ly:make-duration 5 0 1/1))) n) mordent) (music-map (lambda (n) @@ -906,10 +906,10 @@ appoggiatura = (main-orig-len (ly:music-length main)) (numerator (ly:moment-main-numerator maindur)) (factor (if (eq? (remainder numerator 3) 0) - (ly:make-moment 1 3) (ly:make-moment 1 2)))) + (ly:make-moment 1/3) (ly:make-moment 1/2)))) (ly:music-compress grace (ly:moment-mul factor (ly:moment-div main-orig-len grace-orig-len))) - (ly:music-compress main (ly:moment-sub (ly:make-moment 1 1) factor)) + (ly:music-compress main (ly:moment-sub (ly:make-moment 1/1) factor)) (set! (ly:music-property grace 'elements) (append (ly:music-property grace 'elements) diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index daf1aed3d3..1c900d0964 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -16,7 +16,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see . -\version "2.17.6" +\version "2.17.11" \context { \name "Global" @@ -625,8 +625,8 @@ automatically when an output definition (a @code{\\score} or %% These defaults should be the same as the rules established in %% scm/time-signature-settings.scm for 4/4 time - measureLength = #(ly:make-moment 4 4) - baseMoment = #(ly:make-moment 1 4) + measureLength = #(ly:make-moment 4/4) + baseMoment = #(ly:make-moment 1/4) beatStructure = #'(1 1 1 1) beamExceptions = #'((end . (((1 . 8) . (4 4)) ((1 . 12) . (3 3 3 3))))) diff --git a/ly/gregorian.ly b/ly/gregorian.ly index e16fc683ba..b5b088b95c 100644 --- a/ly/gregorian.ly +++ b/ly/gregorian.ly @@ -3,7 +3,7 @@ $Id$ %} -\version "2.17.6" +\version "2.17.11" % % Declare memorable shortcuts for special unicode characters @@ -260,7 +260,7 @@ ligature = #(define-music-function %%% causes tons of "programming error: adding reverse spring, %%% setting to unit" messages. %%% - %\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1 4) + %\override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/4) %\override SpacingSpanner.shortest-duration-space = #0 %\override SpacingSpanner.average-spacing-wishes = ##f %\override SpacingSpanner.spacing-increment = #0.0 diff --git a/ly/performer-init.ly b/ly/performer-init.ly index f26ed9f87d..18a58fd9a3 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -16,7 +16,7 @@ %%%% You should have received a copy of the GNU General Public License %%%% along with LilyPond. If not, see . -\version "2.16.0" +\version "2.17.11" %% %% setup for Request->Element conversion. @@ -198,7 +198,7 @@ midiChannelMapping = #'staff %% quarter = 60 - tempoWholesPerMinute = #(ly:make-moment 15 1) + tempoWholesPerMinute = #(ly:make-moment 15/1) \accepts Staff \accepts DrumStaff @@ -234,8 +234,8 @@ %% These defaults should be the same as the rules established in %% scm/time-signature-settings.scm for 4/4 time - measureLength = #(ly:make-moment 4 4) - baseMoment = #(ly:make-moment 1 4) + measureLength = #(ly:make-moment 4/4) + baseMoment = #(ly:make-moment 1/4) \consists "Timing_translator" -- 2.39.2