Corrections to input/new snippets from Neil

diff --git a/input/new/changing-form-of-multi--measure-rests.ly b/input/new/changing-form-of-multi--measure-rests.ly
index 53b7a276491fb8fb53425d6d70a77e98b1fa4cbe..cd5161271d24779196d081c20e638553c500b693 100644 (file)
--- a/input/new/changing-form-of-multi--measure-rests.ly
+++ b/input/new/changing-form-of-multi--measure-rests.ly
@@ -1,14 +1,14 @@
 \version "2.11.42"
-\layout { ragged-right= ##t }
+\layout { ragged-right = ##t }
 \header {
   doctitle = "Changing form of multi-measure rests"
   lsrtags = "rhythms,tweaks-and-overrides"
   texidoc = "
-If there are ten or fewer measures of rests, LilyPond prints
-a series of longa and breve rests (called in German
-\"Kirchenpausen\" - church rests) within the staff and
-prints a simple line otherwise.  This default number of ten
-may be changed by an override:
+If there are ten or fewer measures of rests, a series of longa
+and breve rests (called in German \"Kirchenpausen\" - church rests)
+is printed within the staff; otherwise a simple line is shown.
+This default number of ten may be changed by overriding the
+@code{expand-limit} property:
 "}
 
 \relative c'' {

diff --git a/input/new/clip-systems.ly b/input/new/clip-systems.ly
index 1eaead2f343bba02261e2c7eb05aa033d246e551..9b63e760fc7f1397363c7a8ea4f1cc75c552c901 100644 (file)
--- a/input/new/clip-systems.ly
+++ b/input/new/clip-systems.ly
@@ -5,7 +5,7 @@
   lsrtags = "paper-and-layout"  % a new tag like "Mixing text and music" or
 % "Special output" might be more adequate -jm
   texidoc = "
-This code shows how to clip (extracts) snippets from a full score.
+This code shows how to clip (extract) snippets from a full score.
 
 This file needs to be run separately with @code{-dclip-systems}; the
 snippets page may not adequately show the results.
@@ -14,7 +14,7 @@ The result will be files named
 @file{@var{base}-from-@var{start}-to-@var{end}[-@var{count}].eps}.
 
 @itemize @bullet
-@item If system starts and ends are included, they include extents of the System grob, eg. instrument names.
+@item If system starts and ends are included, they include extents of the System grob, e.g., instrument names.
 @item Grace notes at the end point of the region are not included.
 @item Regions can span multiple systems. In this case, multiple EPS files are generated.
 @end itemize
@@ -22,50 +22,45 @@ The result will be files named
 }
 
 #(ly:set-option 'clip-systems)
-
 #(set! output-count 1)
 
-origScore = \score{
-    \relative {
-      \set Staff.instrumentName = #"bla"
-      c1
-      d
-      \grace c16
-      e1
-      \key d\major
-      
-      f
-      \break  \clef bass
-      g,
-      fis
-    }  
+origScore = \score {
+  \relative c' {
+    \set Staff.instrumentName = #"bla"
+    c1
+    d
+    \grace c16 e1
+    \key d \major
+    f \break
+    \clef bass
+    g,
+    fis
+  }
 }
 
-\book { 
+\book {
   \score {
     \origScore
     \layout {
-
-      %% each clip-region is a (START . END) pair
-      %% where both are rhythmic-locations.
+      % Each clip-region is a (START . END) pair
+      % where both are rhythmic-locations.
       
-      %% (make-rhythmic-locations BAR-NUMBER NUM DEN)
-      %% means NUM/DEN whole-notes into bar numbered BAR-NUMBER
+      % (make-rhythmic-locations BAR-NUMBER NUM DEN)
+      % means NUM/DEN whole-notes into bar numbered BAR-NUMBER
 
-      clip-regions
-      = #(list
-         (cons
-          (make-rhythmic-location 2 0 1)
-          (make-rhythmic-location 4 0 1))
+      clip-regions = #(list
+      (cons
+       (make-rhythmic-location 2 0 1)
+       (make-rhythmic-location 4 0 1))
+      
+      (cons
+       (make-rhythmic-location 0 0 1)
+       (make-rhythmic-location 4 0 1))
 
-         (cons
-          (make-rhythmic-location 0 0 1)
-          (make-rhythmic-location 4 0 1))
-         
-         (cons
-          (make-rhythmic-location 0 0 1)
-          (make-rhythmic-location 6 0 1))
-       )
+      (cons
+       (make-rhythmic-location 0 0 1)
+       (make-rhythmic-location 6 0 1))
+      )
     }
   }
 }

diff --git a/input/new/drawing-boxes-around-grobs.ly b/input/new/drawing-boxes-around-grobs.ly
index 23e11fe75cf0a14781862dc9d24fa24e14f01990..bebe56e5aeaf7d9fdd78ee7912d51fa4b7e30680 100644 (file)
--- a/input/new/drawing-boxes-around-grobs.ly
+++ b/input/new/drawing-boxes-around-grobs.ly
@@ -12,16 +12,14 @@ arbitrary grob.
 \relative c'' {
   \override TextScript  #'stencil =
   #(make-stencil-boxer 0.1 0.3 ly:text-interface::print)
-
   c'4^"foo"
 
   \override Stem  #'stencil =
   #(make-stencil-boxer 0.05 0.25 ly:stem::print)
-
   \override Score.RehearsalMark  #'stencil =
   #(make-stencil-boxer 0.15 0.3 ly:text-interface::print)
   b8
+  
   \revert Stem #'stencil
-
   c4. c4 \mark "F" c1
 }

diff --git a/input/new/makam.ly b/input/new/makam.ly
index a3ae111e6dae94c70867391cf665d9ecec0f240b..7e42bb25b3c073cf158c2531b49c55a1e5e67303 100644 (file)
--- a/input/new/makam.ly
+++ b/input/new/makam.ly
@@ -1,138 +1,19 @@
 \version "2.11.6"
-\layout { ragged-right = ##t }
 \header {
   doctitle = "Makam"
   lsrtags = "pitches"
   texidoc = "Makam is a type of melody from Turkey using 1/9th-tone
-  microtonal alterations."
+  microtonal alterations.  Consult the initialization file
+  @code{makam-init.ly} (in @code{/usr/share/lilypond/current/ly})
+  for details of pitch names and alterations.
+  "
 }
 
-% Define 1/9 alterations.
+% Initialize makam settings
+\include "makam-init.ly"
 
-#(define-public KOMA 1/9)
-#(define-public BAKIYE 4/9)
-#(define-public KUCUK 5/9)
-#(define-public BUYUKMUCENNEB 8/9)
-
-
-% Define pitch names
-
-makamPitchNames = #`(
-  (c . ,(ly:make-pitch -1 0 NATURAL))
-  (d . ,(ly:make-pitch -1 1 NATURAL))
-  (e . ,(ly:make-pitch -1 2 NATURAL))
-  (f . ,(ly:make-pitch -1 3 NATURAL))
-  (g . ,(ly:make-pitch -1 4 NATURAL))
-  (a . ,(ly:make-pitch -1 5 NATURAL))
-  (b . ,(ly:make-pitch -1 6 NATURAL))
-  
-  (cc . ,(ly:make-pitch -1 0 KOMA))
-  (dc . ,(ly:make-pitch -1 1 KOMA))
-  (ec . ,(ly:make-pitch -1 2 KOMA))
-  (fc . ,(ly:make-pitch -1 3 KOMA))
-  (gc . ,(ly:make-pitch -1 4 KOMA))
-  (ac . ,(ly:make-pitch -1 5 KOMA))
-  (bc . ,(ly:make-pitch -1 6 KOMA))
-  
-  (cb . ,(ly:make-pitch -1 0 BAKIYE))
-  (db . ,(ly:make-pitch -1 1 BAKIYE))
-  (eb . ,(ly:make-pitch -1 2 BAKIYE))
-  (fb . ,(ly:make-pitch -1 3 BAKIYE))
-  (gb . ,(ly:make-pitch -1 4 BAKIYE))
-  (ab . ,(ly:make-pitch -1 5 BAKIYE))
-  (bb . ,(ly:make-pitch -1 6 BAKIYE))
-  
-  (ck . ,(ly:make-pitch -1 0 KUCUK))
-  (dk . ,(ly:make-pitch -1 1 KUCUK))
-  (ek . ,(ly:make-pitch -1 2 KUCUK))
-  (fk . ,(ly:make-pitch -1 3 KUCUK))
-  (gk . ,(ly:make-pitch -1 4 KUCUK))
-  (ak . ,(ly:make-pitch -1 5 KUCUK))
-  (bk . ,(ly:make-pitch -1 6 KUCUK))
-  
-  (cbm . ,(ly:make-pitch -1 0 BUYUKMUCENNEB))
-  (dbm . ,(ly:make-pitch -1 1 BUYUKMUCENNEB))
-  (ebm . ,(ly:make-pitch -1 2 BUYUKMUCENNEB))
-  (fbm . ,(ly:make-pitch -1 3 BUYUKMUCENNEB))
-  (gbm . ,(ly:make-pitch -1 4 BUYUKMUCENNEB))
-  (abm . ,(ly:make-pitch -1 5 BUYUKMUCENNEB))
-  (bbm . ,(ly:make-pitch -1 6 BUYUKMUCENNEB))
-  
-  ;; f for flat.
-  (cfc . ,(ly:make-pitch -1 0 (- KOMA)))
-  (dfc . ,(ly:make-pitch -1 1 (- KOMA)))
-  (efc . ,(ly:make-pitch -1 2 (- KOMA)))
-  (ffc . ,(ly:make-pitch -1 3 (- KOMA)))
-  (gfc . ,(ly:make-pitch -1 4 (- KOMA)))
-  (afc . ,(ly:make-pitch -1 5 (- KOMA)))
-  (bfc . ,(ly:make-pitch -1 6 (- KOMA)))
-  
-  (cfb . ,(ly:make-pitch -1 0 (- BAKIYE)))
-  (dfb . ,(ly:make-pitch -1 1 (- BAKIYE)))
-  (efb . ,(ly:make-pitch -1 2 (- BAKIYE)))
-  (ffb . ,(ly:make-pitch -1 3 (- BAKIYE)))
-  (gfb . ,(ly:make-pitch -1 4 (- BAKIYE)))
-  (afb . ,(ly:make-pitch -1 5 (- BAKIYE)))
-  (bfb . ,(ly:make-pitch -1 6 (- BAKIYE)))
-  
-  (cfk . ,(ly:make-pitch -1 0 (- KUCUK)))
-  (dfk . ,(ly:make-pitch -1 1 (- KUCUK)))
-  (efk . ,(ly:make-pitch -1 2 (- KUCUK)))
-  (ffk . ,(ly:make-pitch -1 3 (- KUCUK)))
-  (gfk . ,(ly:make-pitch -1 4 (- KUCUK)))
-  (afk . ,(ly:make-pitch -1 5 (- KUCUK)))
-  (bfk . ,(ly:make-pitch -1 6 (- KUCUK)))
-  
-  (cfbm . ,(ly:make-pitch -1 0 (- BUYUKMUCENNEB)))
-  (dfbm . ,(ly:make-pitch -1 1 (- BUYUKMUCENNEB)))
-  (efbm . ,(ly:make-pitch -1 2 (- BUYUKMUCENNEB)))
-  (ffbm . ,(ly:make-pitch -1 3 (- BUYUKMUCENNEB)))
-  (gfbm . ,(ly:make-pitch -1 4 (- BUYUKMUCENNEB)))
-  (afbm . ,(ly:make-pitch -1 5 (- BUYUKMUCENNEB)))
-  (bfbm . ,(ly:make-pitch -1 6 (- BUYUKMUCENNEB)))
-)
-
-% Set pitch names.
-pitchnames = \makamPitchNames
-#(ly:parser-set-note-names parser makamPitchNames)
-
-makamGlyphs = #'(
-       (1 . "accidentals.doublesharp")
-       (8/9 . "accidentals.sharp.slashslashslash.stemstem")
-       (5/9 . "accidentals.sharp.slashslashslash.stem")
-       (4/9 . "accidentals.sharp")
-       (1/9 . "accidentals.sharp.slashslash.stem")
-       (0 . "accidentals.natural")
-       (-1/9 . "accidentals.mirroredflat")
-       (-4/9 . "accidentals.flat.slash")
-       (-5/9 . "accidentals.flat")
-       (-8/9 . "accidentals.flat.slashslash")
-       (-1 . "accidentals.flatflat")
-       )
-
-\relative {
-  
-  %{ define alteration <-> symbol mapping. The following glyphs are available.
-  accidentals.sharp 
-  accidentals.sharp.slashslash.stem 
-  accidentals.sharp.slashslashslash.stemstem 
-  accidentals.sharp.slashslashslash.stem 
-  accidentals.sharp.slashslash.stemstemstem 
-  accidentals.natural 
-  accidentals.flat 
-  accidentals.flat.slash 
-  accidentals.flat.slashslash 
-  accidentals.mirroredflat.flat 
-  accidentals.mirroredflat 
-  accidentals.flatflat 
-  accidentals.flatflat.slash 
-  accidentals.doublesharp 
-  %}
-  
-  \override Accidental #'glyph-name-alist =  \makamGlyphs
-  \override Staff.KeySignature #'glyph-name-alist = \makamGlyphs
-  \set Staff.keySignature =  #'((3 .  4/9) (6 . -1/9))
-  
+\relative c' {
+  \set Staff.keySignature =  #`((3 . ,BAKIYE) (6 . ,(- KOMA)))  
   c cc db fk
   gbm gfc gfb efk
   fk db cc c

diff --git a/input/new/positioning-multi--measure-rests.ly b/input/new/positioning-multi--measure-rests.ly
index 54d8a858a7eff9e5ab8c39d62181159318ef135e..188e6eeaf09d3520c69efbf1a4192223c6af68c1 100644 (file)
--- a/input/new/positioning-multi--measure-rests.ly
+++ b/input/new/positioning-multi--measure-rests.ly
@@ -26,7 +26,7 @@ of multi-measure rests can be controlled as follows:
   << { R1 } \\ { a1 } >>
   % Multi-measure rests in even-numbered voices are under the bottom line
   << { c1 } \\ { R1 } >>
-  % They remain separated even in empty bars
+  % They remain separated even in empty measures
   << { R1 } \\ { R1 } >>
   % This brings them together even though there are two voices
   \compressFullBarRests

diff --git a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
index bfcdee28d7a682de5d6e70837f7d7eeed03ba164..899659fc88c99d37a14c5d714485cf01984a081a 100644 (file)
--- a/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
+++ b/input/new/transposing-pitches-with-minimum-accidentals-smart-transpose.ly
@@ -2,12 +2,27 @@
 \header {
   doctitle = "Transposing music with minimum accidentals"
   lsrtags = "pitches"
- texidoc = "There is a way to enforce enharmonic modifications for
+ texidoc = "This example uses some Scheme code to enforce enharmonic modifications for
 notes in order to have the minimum number of accidentals. In this
 case, the following rules apply:
 
-\"Double accidentals should be removed, as well as E sharp (-> F),
-C flat (-> B), F flat (-> E) and B sharp (-> C)\".
+@itemize
+@item
+Double accidentals should be removed
+
+@item
+B sharp -> C
+
+@item
+E sharp -> F
+
+@item
+C flat -> B
+
+@item
+F flat -> E
+
+@end itemize
 
 In this manner, the most natural enharmonic notes are chosen.
 "}