`begin verbatim' glitches in snippet files

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

`begin verbatim' glitches in snippet files

Werner LEMBERG

Attached is a diff file that fixes a bunch of incorrect `begin
verbatim' marks in files from the `snippet' directory, causing
omissions in the manual in case the snippet gets included.

Since I'm unsure how to apply this correctly I post it here so that a
knowledgeable person can proceed.


    Werner


PS: Maybe there are more glitches; I've just looked for files that
    contain a second, badly positioned `begin verbatim' entry.

diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
index 10825f8b5d..24a62e5ac4 100644
--- a/Documentation/snippets/adding-drum-parts.ly
+++ b/Documentation/snippets/adding-drum-parts.ly
@@ -25,7 +25,7 @@ lines is possible.
 drh = \drummode {
         cymc4.^"crash" hhc16^"h.h." hh hhc8 hho hhc8 hh16 hh
         hhc4 r4 r2
-      } % begin verbatim
+      }
 
 drl = \drummode {
         bd4 sn8 bd bd4 << bd ss >>
diff --git a/Documentation/snippets/aiken-head-thin-variant-noteheads.ly b/Documentation/snippets/aiken-head-thin-variant-noteheads.ly
index 92ede6b34d..5b288e1618 100644
--- a/Documentation/snippets/aiken-head-thin-variant-noteheads.ly
+++ b/Documentation/snippets/aiken-head-thin-variant-noteheads.ly
@@ -26,7 +26,5 @@ appear as quarter notes.
     % Switch to thin-variant noteheads
     \set shapeNoteStyles = ##(doThin reThin miThin faThin sol laThin tiThin)
     c'' a' c' a
-  } % begin verbatim
-
+  }
 }
-% END EXAMPLE
diff --git a/Documentation/snippets/automatic-fretboards-barre.ly b/Documentation/snippets/automatic-fretboards-barre.ly
index 3430a15ee8..333d0569e1 100644
--- a/Documentation/snippets/automatic-fretboards-barre.ly
+++ b/Documentation/snippets/automatic-fretboards-barre.ly
@@ -25,4 +25,4 @@ there is no way to identify where barres should be placed.
 \new FretBoards {
   <f,-1 c-3 f-4 a-2 c'-1 f'-1>1
   <f, c f a c' f'>1
-} % begin verbatim
+}
diff --git a/Documentation/snippets/clip-systems.ly b/Documentation/snippets/clip-systems.ly
index ed8ac5596c..fcdb1c6e3e 100644
--- a/Documentation/snippets/clip-systems.ly
+++ b/Documentation/snippets/clip-systems.ly
@@ -39,7 +39,7 @@ are generated.
 
 origScore = \score {
   \relative c' {
-    \new Staff \with { instrumentName = "Instrument" } % begin verbatim
+    \new Staff \with { instrumentName = "Instrument" }
 
     c1
     d1
diff --git a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
index da1dd248e4..e84ab1a640 100644
--- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
+++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
@@ -38,7 +38,7 @@ musicUp = \relative c'' {
   a4 c4.( g8) a4 |
   g4 e' g,( a8 b) |
   c b a2.
-} % begin verbatim
+}
 
 
 musicDown = \relative c'' {
diff --git a/Documentation/snippets/figured-bass-headword.ly b/Documentation/snippets/figured-bass-headword.ly
index f15b8974c4..ca0e21057f 100644
--- a/Documentation/snippets/figured-bass-headword.ly
+++ b/Documentation/snippets/figured-bass-headword.ly
@@ -30,9 +30,7 @@ extendOff = \bassFigureExtendersOff
 \score {
   \new StaffGroup <<
     \new GrandStaff <<
-      \new Staff = "violinoI" \with { instrumentName = "Violino I." } % begin verbatim
-
-
+      \new Staff = "violinoI" \with { instrumentName = "Violino I." }
     {
       \time 4/4
       \mark \markup { \italic Adagio. }
diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
index 79bb34efc0..50c65a3174 100644
--- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
+++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
@@ -28,7 +28,7 @@ melody = \relative c'' {
   c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 \break
   c4. d4 c4 d4. c4 d c2 d4. e4-^ d4
   c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 \break
-} % begin verbatim
+}
 
 
 drum = \new DrumStaff \drummode {
diff --git a/Documentation/snippets/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly
index fa1acd5a04..38369658df 100644
--- a/Documentation/snippets/jazz-combo-template.ly
+++ b/Documentation/snippets/jazz-combo-template.ly
@@ -30,8 +30,7 @@ music is within a @code{\\transpose} section.
     \column {
       "LilyPond example file by Amelie Zapf,"
       "Berlin 07/07/2003"
-    } % begin verbatim
-
+    }
   }
 }
 % To make the example display in the documentation
diff --git a/Documentation/snippets/piano-template-simple.ly b/Documentation/snippets/piano-template-simple.ly
index 278d0195da..414cc132fc 100644
--- a/Documentation/snippets/piano-template-simple.ly
+++ b/Documentation/snippets/piano-template-simple.ly
@@ -23,8 +23,7 @@ upper = \relative c'' {
   \time 4/4
 
   a4 b c d
-} % begin verbatim
-
+}
 
 lower = \relative c {
   \clef bass
diff --git a/Documentation/snippets/quoting-another-voice-with-transposition.ly b/Documentation/snippets/quoting-another-voice-with-transposition.ly
index f1a2651283..932f3d3d6d 100644
--- a/Documentation/snippets/quoting-another-voice-with-transposition.ly
+++ b/Documentation/snippets/quoting-another-voice-with-transposition.ly
@@ -23,8 +23,7 @@ quoted ones) are transposed.
 
 \addQuote clarinet {
   \transposition bes
-  \repeat unfold 8 { d'16 d' d'8 } % begin verbatim
-
+  \repeat unfold 8 { d'16 d' d'8 }
 }
 
 \addQuote sax {
diff --git a/Documentation/snippets/quoting-another-voice.ly b/Documentation/snippets/quoting-another-voice.ly
index 666e6fa55b..eaf0fede62 100644
--- a/Documentation/snippets/quoting-another-voice.ly
+++ b/Documentation/snippets/quoting-another-voice.ly
@@ -28,7 +28,7 @@ the Internals Reference.
 
 quoteMe = \relative c' {
   fis4 r16 a8.-> b4\ff c
-} % begin verbatim
+}
 
 \addQuote quoteMe \quoteMe
 
diff --git a/Documentation/snippets/string-quartet-template-simple.ly b/Documentation/snippets/string-quartet-template-simple.ly
index 6e7f6e1a23..6ea885a57a 100644
--- a/Documentation/snippets/string-quartet-template-simple.ly
+++ b/Documentation/snippets/string-quartet-template-simple.ly
@@ -21,8 +21,7 @@ This template demonstrates a simple string quartet. It also uses a
 global= {
   \time 4/4
   \key c \major
-} % begin verbatim
-
+}
 
 violinOne = \new Voice \relative c'' {
   c2 d
diff --git a/Documentation/snippets/string-quartet-template-with-separate-parts.ly b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
index e4e82c5ec0..26cd166d5c 100644
--- a/Documentation/snippets/string-quartet-template-with-separate-parts.ly
+++ b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
@@ -35,8 +35,7 @@ Do not forget to remove specified comments when using separate files!
 global= {
   \time 4/4
   \key c \major
-} % begin verbatim
-
+}
 
 
 Violinone = \new Voice {
diff --git a/Documentation/snippets/turkish-makam-example.ly b/Documentation/snippets/turkish-makam-example.ly
index 7bb8d50fa2..440643448d 100644
--- a/Documentation/snippets/turkish-makam-example.ly
+++ b/Documentation/snippets/turkish-makam-example.ly
@@ -24,8 +24,7 @@ of Turkish music notation.
 \header {
     title = "Hüseyni Saz Semaisi"
     composer = "Lavtacı Andon"
-} % begin verbatim
-
+}
 
 \relative {
   \set Staff.extraNatural = ##f

_______________________________________________
lilypond-devel mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/lilypond-devel
dak
Reply | Threaded
Open this post in threaded view
|

Re: `begin verbatim' glitches in snippet files

dak
Werner LEMBERG <[hidden email]> writes:

> Attached is a diff file that fixes a bunch of incorrect `begin
> verbatim' marks in files from the `snippet' directory, causing
> omissions in the manual in case the snippet gets included.
>
> Since I'm unsure how to apply this correctly I post it here so that a
> knowledgeable person can proceed.

I'll try fixing those.

> PS: Maybe there are more glitches; I've just looked for files that
>     contain a second, badly positioned `begin verbatim' entry.
>
> diff --git a/Documentation/snippets/adding-drum-parts.ly b/Documentation/snippets/adding-drum-parts.ly
> index 10825f8b5d..24a62e5ac4 100644
> --- a/Documentation/snippets/adding-drum-parts.ly
> +++ b/Documentation/snippets/adding-drum-parts.ly
> @@ -25,7 +25,7 @@ lines is possible.
>  drh = \drummode {
>          cymc4.^"crash" hhc16^"h.h." hh hhc8 hho hhc8 hh16 hh
>          hhc4 r4 r2
> -      } % begin verbatim
> +      }
>  
>  drl = \drummode {
>          bd4 sn8 bd bd4 << bd ss >>
> diff --git a/Documentation/snippets/aiken-head-thin-variant-noteheads.ly b/Documentation/snippets/aiken-head-thin-variant-noteheads.ly
> index 92ede6b34d..5b288e1618 100644
> --- a/Documentation/snippets/aiken-head-thin-variant-noteheads.ly
> +++ b/Documentation/snippets/aiken-head-thin-variant-noteheads.ly
> @@ -26,7 +26,5 @@ appear as quarter notes.
>      % Switch to thin-variant noteheads
>      \set shapeNoteStyles = ##(doThin reThin miThin faThin sol laThin tiThin)
>      c'' a' c' a
> -  } % begin verbatim
> -
> +  }
>  }
> -% END EXAMPLE
> diff --git a/Documentation/snippets/automatic-fretboards-barre.ly b/Documentation/snippets/automatic-fretboards-barre.ly
> index 3430a15ee8..333d0569e1 100644
> --- a/Documentation/snippets/automatic-fretboards-barre.ly
> +++ b/Documentation/snippets/automatic-fretboards-barre.ly
> @@ -25,4 +25,4 @@ there is no way to identify where barres should be placed.
>  \new FretBoards {
>    <f,-1 c-3 f-4 a-2 c'-1 f'-1>1
>    <f, c f a c' f'>1
> -} % begin verbatim
> +}
> diff --git a/Documentation/snippets/clip-systems.ly b/Documentation/snippets/clip-systems.ly
> index ed8ac5596c..fcdb1c6e3e 100644
> --- a/Documentation/snippets/clip-systems.ly
> +++ b/Documentation/snippets/clip-systems.ly
> @@ -39,7 +39,7 @@ are generated.
>  
>  origScore = \score {
>    \relative c' {
> -    \new Staff \with { instrumentName = "Instrument" } % begin verbatim
> +    \new Staff \with { instrumentName = "Instrument" }
>  
>      c1
>      d1
> diff --git a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
> index da1dd248e4..e84ab1a640 100644
> --- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
> +++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
> @@ -38,7 +38,7 @@ musicUp = \relative c'' {
>    a4 c4.( g8) a4 |
>    g4 e' g,( a8 b) |
>    c b a2.
> -} % begin verbatim
> +}
>  
>  
>  musicDown = \relative c'' {
> diff --git a/Documentation/snippets/figured-bass-headword.ly b/Documentation/snippets/figured-bass-headword.ly
> index f15b8974c4..ca0e21057f 100644
> --- a/Documentation/snippets/figured-bass-headword.ly
> +++ b/Documentation/snippets/figured-bass-headword.ly
> @@ -30,9 +30,7 @@ extendOff = \bassFigureExtendersOff
>  \score {
>    \new StaffGroup <<
>      \new GrandStaff <<
> -      \new Staff = "violinoI" \with { instrumentName = "Violino I." } % begin verbatim
> -
> -
> +      \new Staff = "violinoI" \with { instrumentName = "Violino I." }
>      {
>        \time 4/4
>        \mark \markup { \italic Adagio. }
> diff --git a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
> index 79bb34efc0..50c65a3174 100644
> --- a/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
> +++ b/Documentation/snippets/heavily-customized-polymetric-time-signatures.ly
> @@ -28,7 +28,7 @@ melody = \relative c'' {
>    c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 \break
>    c4. d4 c4 d4. c4 d c2 d4. e4-^ d4
>    c4. d4 c4 d4. c4 d c2 d4. e4-^ d4 \break
> -} % begin verbatim
> +}
>  
>  
>  drum = \new DrumStaff \drummode {
> diff --git a/Documentation/snippets/jazz-combo-template.ly b/Documentation/snippets/jazz-combo-template.ly
> index fa1acd5a04..38369658df 100644
> --- a/Documentation/snippets/jazz-combo-template.ly
> +++ b/Documentation/snippets/jazz-combo-template.ly
> @@ -30,8 +30,7 @@ music is within a @code{\\transpose} section.
>      \column {
>        "LilyPond example file by Amelie Zapf,"
>        "Berlin 07/07/2003"
> -    } % begin verbatim
> -
> +    }
>    }
>  }
>  % To make the example display in the documentation
> diff --git a/Documentation/snippets/piano-template-simple.ly b/Documentation/snippets/piano-template-simple.ly
> index 278d0195da..414cc132fc 100644
> --- a/Documentation/snippets/piano-template-simple.ly
> +++ b/Documentation/snippets/piano-template-simple.ly
> @@ -23,8 +23,7 @@ upper = \relative c'' {
>    \time 4/4
>  
>    a4 b c d
> -} % begin verbatim
> -
> +}
>  
>  lower = \relative c {
>    \clef bass
> diff --git a/Documentation/snippets/quoting-another-voice-with-transposition.ly b/Documentation/snippets/quoting-another-voice-with-transposition.ly
> index f1a2651283..932f3d3d6d 100644
> --- a/Documentation/snippets/quoting-another-voice-with-transposition.ly
> +++ b/Documentation/snippets/quoting-another-voice-with-transposition.ly
> @@ -23,8 +23,7 @@ quoted ones) are transposed.
>  
>  \addQuote clarinet {
>    \transposition bes
> -  \repeat unfold 8 { d'16 d' d'8 } % begin verbatim
> -
> +  \repeat unfold 8 { d'16 d' d'8 }
>  }
>  
>  \addQuote sax {
> diff --git a/Documentation/snippets/quoting-another-voice.ly b/Documentation/snippets/quoting-another-voice.ly
> index 666e6fa55b..eaf0fede62 100644
> --- a/Documentation/snippets/quoting-another-voice.ly
> +++ b/Documentation/snippets/quoting-another-voice.ly
> @@ -28,7 +28,7 @@ the Internals Reference.
>  
>  quoteMe = \relative c' {
>    fis4 r16 a8.-> b4\ff c
> -} % begin verbatim
> +}
>  
>  \addQuote quoteMe \quoteMe
>  
> diff --git a/Documentation/snippets/string-quartet-template-simple.ly b/Documentation/snippets/string-quartet-template-simple.ly
> index 6e7f6e1a23..6ea885a57a 100644
> --- a/Documentation/snippets/string-quartet-template-simple.ly
> +++ b/Documentation/snippets/string-quartet-template-simple.ly
> @@ -21,8 +21,7 @@ This template demonstrates a simple string quartet. It also uses a
>  global= {
>    \time 4/4
>    \key c \major
> -} % begin verbatim
> -
> +}
>  
>  violinOne = \new Voice \relative c'' {
>    c2 d
> diff --git a/Documentation/snippets/string-quartet-template-with-separate-parts.ly b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
> index e4e82c5ec0..26cd166d5c 100644
> --- a/Documentation/snippets/string-quartet-template-with-separate-parts.ly
> +++ b/Documentation/snippets/string-quartet-template-with-separate-parts.ly
> @@ -35,8 +35,7 @@ Do not forget to remove specified comments when using separate files!
>  global= {
>    \time 4/4
>    \key c \major
> -} % begin verbatim
> -
> +}
>  
>  
>  Violinone = \new Voice {
> diff --git a/Documentation/snippets/turkish-makam-example.ly b/Documentation/snippets/turkish-makam-example.ly
> index 7bb8d50fa2..440643448d 100644
> --- a/Documentation/snippets/turkish-makam-example.ly
> +++ b/Documentation/snippets/turkish-makam-example.ly
> @@ -24,8 +24,7 @@ of Turkish music notation.
>  \header {
>      title = "Hüseyni Saz Semaisi"
>      composer = "Lavtacı Andon"
> -} % begin verbatim
> -
> +}
>  
>  \relative {
>    \set Staff.extraNatural = ##f
>
> _______________________________________________
> lilypond-devel mailing list
> [hidden email]
> https://lists.gnu.org/mailman/listinfo/lilypond-devel
>

--
David Kastrup

_______________________________________________
lilypond-devel mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/lilypond-devel
Reply | Threaded
Open this post in threaded view
|

Re: `begin verbatim' glitches in snippet files

Werner LEMBERG

>> Since I'm unsure how to apply this correctly I post it here so that
>> a knowledgeable person can proceed.
>
> I'll try fixing those.

Thanks.


    Werner

_______________________________________________
lilypond-devel mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/lilypond-devel
dak
Reply | Threaded
Open this post in threaded view
|

Re: `begin verbatim' glitches in snippet files

dak
Werner LEMBERG <[hidden email]> writes:

>>> Since I'm unsure how to apply this correctly I post it here so that
>>> a knowledgeable person can proceed.
>>
>> I'll try fixing those.
>
> Thanks.

Current branch: verbatim
Tracker issue: 5557 (https://sourceforge.net/p/testlilyissues/issues/5557/)
Rietveld issue: 583000043 (https://codereview.appspot.com/583000043)
Issue description:
  Remove spurious '% begin verbatim' in Documentation/snippets/new
  Also:  Run scripts/auxiliar/makelsr.py

This was a purely mechanical change.  Please review to make sure that
the resulting spacing and content in the Documentation/snippets
directory given the mechanical changes in Documentation/snippets/new are
correct: there are likely some ugly spacings and possibly some
accidental removal of an actually intended % begin verbatim.

Particularly utf-8.ly looks suspicious but make doc appeared to succeed.

--
David Kastrup

_______________________________________________
lilypond-devel mailing list
[hidden email]
https://lists.gnu.org/mailman/listinfo/lilypond-devel