Doc: NR added snippet for Alt Bar Numbering

Tracker item 2093

Added snippet showing #'numbers and #'numbers-with-letters tweak.

Added to NR in two places (Bar Numbers 1.2.5 and Long Repeats 1.4.1)
as a user would probably look for it in either place.

Updated changes.tely

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 89ca12f4e87978cbb8825aa047c64bd5221a3069..50f2022cb29c087161107d3d1c074a52f692e37e 100644 (file)
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -60,6 +60,32 @@ which scares away people.
 * only show user-visible changes.
 
 @end ignore
+
+@item
+Two alternative methods for bar numbering can be set, especially for
+when using repeated music;
+
+@lilypond[fragment,quote,relative=1,noragged-right]
+\relative c'{
+  \set Score.alternativeNumberingStyle = #'numbers
+  \repeat volta 3 { c4 d e f | }
+    \alternative {
+      { c4 d e f | c2 d \break }
+      { f4 g a b | f4 g a b | f2 a | \break }
+      { c4 d e f | c2 d }
+    }
+  c1 \break
+  \set Score.alternativeNumberingStyle = #'numbers-with-letters
+  \repeat volta 3 { c,4 d e f | }
+    \alternative {
+      { c4 d e f | c2 d \break }
+      { f4 g a b | f4 g a b | f2 a | \break }
+      { c4 d e f | c2 d }
+    }
+  c1
+}
+@end lilypond
+
 @item
 Scheme expressions inside of embedded Lilypond (@code{#@{@dots{}#@}})
 are now executed in lexical closure of the surrounding Scheme code.
@@ -173,7 +199,6 @@ LilyPond creates. Possible values are ERROR, WARN, BASIC_PROGRESS, PROGRESS, DEB
   <e-1>-"left"
 @end lilypond
 
-
 @item
 The alignment of dynamic spanners (hairpins, text crescendo, etc.) is now
 automatically broken if a different direction is explicitly given.

diff --git a/Documentation/notation/repeats.itely b/Documentation/notation/repeats.itely
index 57a5dfb8fea3cf0901be361cff50d39565e8ebdb..2a0d5fdbd89b8179bc1abc1708ad13af8211da1b 100644 (file)
--- a/Documentation/notation/repeats.itely
+++ b/Documentation/notation/repeats.itely
@@ -239,10 +239,10 @@ g1 |
 The @code{measureLength} property is described in @ref{Time
 administration}.
 
-@cindex repeats with ties
-@cindex alternative endings with ties
-@cindex ties in repeats
-@cindex ties in alternative endings
+@cindex repeats, with ties
+@cindex alternative endings, with ties
+@cindex ties, in repeats
+@cindex ties, alternative endings
 @funindex \repeatTie
 
 Ties may be added to a second ending:
@@ -257,7 +257,6 @@ c1
 @end lilypond
 
 @snippets
-
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {shortening-volta-brackets.ly}
 
@@ -267,6 +266,12 @@ c1
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {setting-the-double-repeat-default-for-volte.ly}
 
+@cindex repeats, bar numbers letters
+@cindex repeats, alternative bar numbers
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{alternative-bar-numbering.ly}
+
 @seealso
 Music Glossary:
 @rglos{repeat},
@@ -286,9 +291,7 @@ Internals Reference:
 @rinternals{VoltaRepeatedMusic},
 @rinternals{UnfoldedRepeatedMusic}.
 
-
 @knownissues
-
 @cindex repeat, ambiguous
 @cindex nested repeat
 @cindex repeat, nested

diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index 5719c73ea7e0eca3c1a02cefc77aeff049756ce3..6b86eb6a3c9e8697009ef182226e4872a413d0a9 100644 (file)
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -2747,9 +2747,7 @@ c1 | c | c | c
 c1 | c | c | c
 @end lilypond
 
-
 @snippets
-
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {printing-the-bar-number-for-the-first-measure.ly}
 
@@ -2762,6 +2760,12 @@ c1 | c | c | c
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {printing-bar-numbers-inside-boxes-or-circles.ly}
 
+@cindex bar numbers, with letters
+@cindex bar numbers, with repeats
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{alternative-bar-numbering.ly}
+
 @cindex bar number alignment
 
 @lilypondfile[verbatim,quote,texidoc,doctitle]
@@ -2770,7 +2774,6 @@ c1 | c | c | c
 @lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {removing-bar-numbers-from-a-score.ly}
 
-
 @seealso
 Snippets:
 @rlsr{Rhythms}.
@@ -2779,7 +2782,6 @@ Internals Reference:
 @rinternals{BarNumber},
 @rinternals{Bar_number_engraver}.
 
-
 @cindex bar number collision
 @cindex collision, bar number
 

diff --git a/Documentation/snippets/alternative-bar-numbering.ly b/Documentation/snippets/alternative-bar-numbering.ly
new file mode 100644 (file)
index 0000000..aead8fc
--- /dev/null
+++ b/Documentation/snippets/alternative-bar-numbering.ly
@@ -0,0 +1,35 @@
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.15.24
+\version "2.15.24"
+
+\header {
+  lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides"
+  texidoc = "Two alternative methods for bar numbering can be set,
+  especially for when using repeated music."
+  doctitle = "Alternative bar numbering"
+} % begin verbatim
+
+
+\relative c'{
+  \set Score.alternativeNumberingStyle = #'numbers
+  \repeat volta 3 { c4 d e f | }
+    \alternative {
+      { c4 d e f | c2 d \break }
+      { f4 g a b | f4 g a b | f2 a | \break }
+      { c4 d e f | c2 d }
+    }
+  c1 \break
+  \set Score.alternativeNumberingStyle = #'numbers-with-letters
+  \repeat volta 3 { c,4 d e f | }
+    \alternative {
+      { c4 d e f | c2 d \break }
+      { f4 g a b | f4 g a b | f2 a | \break }
+      { c4 d e f | c2 d }
+    }
+  c1
+}

diff --git a/Documentation/snippets/editorial-annotations.snippet-list b/Documentation/snippets/editorial-annotations.snippet-list
index 2d819b39c3d8f106e06b115b81a824c31409dfad..8b488aae5c89519e45e122d66bc68f82c618632e 100644 (file)
--- a/Documentation/snippets/editorial-annotations.snippet-list
+++ b/Documentation/snippets/editorial-annotations.snippet-list
@@ -1,5 +1,6 @@
 adding-fingerings-to-a-score.ly
 allowing-fingerings-to-be-printed-inside-the-staff.ly
+alternative-bar-numbering.ly
 analysis-brackets-above-the-staff.ly
 applying-note-head-styles-depending-on-the-step-of-the-scale.ly
 avoiding-collisions-with-chord-fingerings.ly

diff --git a/Documentation/snippets/new/alternative-bar-numbering.ly b/Documentation/snippets/new/alternative-bar-numbering.ly
new file mode 100644 (file)
index 0000000..e270df4
--- /dev/null
+++ b/Documentation/snippets/new/alternative-bar-numbering.ly
@@ -0,0 +1,27 @@
+\version "2.15.24"
+
+\header {
+  lsrtags = "editorial-annotations, staff-notation, tweaks-and-overrides"
+  texidoc = "Two alternative methods for bar numbering can be set,
+  especially for when using repeated music."
+  doctitle = "Alternative bar numbering"
+}
+
+\relative c'{
+  \set Score.alternativeNumberingStyle = #'numbers
+  \repeat volta 3 { c4 d e f | }
+    \alternative {
+      { c4 d e f | c2 d \break }
+      { f4 g a b | f4 g a b | f2 a | \break }
+      { c4 d e f | c2 d }
+    }
+  c1 \break
+  \set Score.alternativeNumberingStyle = #'numbers-with-letters
+  \repeat volta 3 { c,4 d e f | }
+    \alternative {
+      { c4 d e f | c2 d \break }
+      { f4 g a b | f4 g a b | f2 a | \break }
+      { c4 d e f | c2 d }
+    }
+  c1
+}

diff --git a/Documentation/snippets/staff-notation.snippet-list b/Documentation/snippets/staff-notation.snippet-list
index 66e304c880345b7ebaa5e9befa3caad26a338499..68d68be232d6feddfae803a101b5c7d9af024e9b 100644 (file)
--- a/Documentation/snippets/staff-notation.snippet-list
+++ b/Documentation/snippets/staff-notation.snippet-list
@@ -3,6 +3,7 @@ adding-an-extra-staff-at-a-line-break.ly
 adding-an-extra-staff.ly
 adding-indicators-to-staves-which-get-split-after-a-break.ly
 adding-orchestral-cues-to-a-vocal-score.ly
+alternative-bar-numbering.ly
 changing-the-number-of-lines-in-a-staff.ly
 changing-the-staff-size.ly
 creating-blank-staves.ly

diff --git a/Documentation/snippets/tweaks-and-overrides.snippet-list b/Documentation/snippets/tweaks-and-overrides.snippet-list
index 971ed8b08fe58831676f0ea9bd139470d1285243..2a20fe21911655f19f275bc03c6011360f016c4c 100644 (file)
--- a/Documentation/snippets/tweaks-and-overrides.snippet-list
+++ b/Documentation/snippets/tweaks-and-overrides.snippet-list
@@ -1,5 +1,6 @@
 adjusting-grace-note-spacing.ly
 altering-the-length-of-beamed-stems.ly
+alternative-bar-numbering.ly
 analysis-brackets-above-the-staff.ly
 asymmetric-slurs.ly
 avoiding-collisions-with-chord-fingerings.ly