Re: `begin verbatim' glitches in snippet files
Werner LEMBERG 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: 58343 (https://codereview.appspot.com/58343) 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 lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: `begin verbatim' glitches in snippet files
>> 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 lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: `begin verbatim' glitches in snippet files
Werner LEMBERG 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 {
>1
>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 =
`begin verbatim' glitches in snippet files
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 {
1
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
---
Re: Python 3 (was: 2.20 where are we?)
On Mon, Sep 23, 2019 at 12:26 PM Matthew Peveler wrote: > Please see the attached for small patches for these two things, and got "make check" to run for me using Python 3.7.4 as well. Hm, not sure why the patch files got converted to binary when sending, though I've also made them available at https://gist.github.com/MasterOdin/8141656b872682a3a540f7af4a1c0d9f for good measure. Matt > 0001-add-__lt__-method-for-py2-old-style-class-sort-compa.patch Description: Binary data 0002-read-midi-files-as-binary.patch Description: Binary data ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Python 3 (was: 2.20 where are we?)
On Sat, Sep 21, 2019 at 5:52 AM Jonas Hahnfeld via lilypond-devel < lilypond-devel@gnu.org> wrote: > On top of that I've worked on the attached patches which brings the make targets check / test and doc back to life with Python 3.7.4. In applying your patches and running "make check", I encountered a couple of errors in scripts/build/output-distance.py, which would be summed up as: 1. Python 2 old style classes had a default __cmp__ which would compare the id() of the classes, and used implicitly for sort. Python 3 removed this, but need to define a __lt__ method for sort compat. 2. attempting to open midi files as str files, though they are filled with binary data (and python/midi.py seems to expect binary in interacting with the contents). Please see the attached for small patches for these two things, and got "make check" to run for me using Python 3.7.4 as well. Regards, Matt 0001-add-__lt__-method-for-py2-old-style-class-sort-compa.patch Description: Binary data 0002-read-midi-files-as-binary.patch Description: Binary data ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: end of Python2
I guess "more prepared" was an understatement ...
Verzonden vanaf mijn Huawei mobiele telefoon
Oorspronkelijk bericht
Onderwerp: Re: end of Python2
Van: Urs Liska
Aan: Martin Tarenskeen ,lilypond-user mailinglist ,lilypond-devel
mailinglist
Cc:
Hi Martin,
23. September 2019 11:17, "Martin Tarenskeen" schrieb:
> Hi,
>
> This has been discussed here before but https://pythonclock.org
made me
> wonder in which direction LilyPond and Frescobaldi are currently
going.
Well, if you're wondering about the direction then you might just
read up the corresponding threads from the last days.
>
> Unlike Lilypond, Frescobaldi3 is already more prepared for
Python3.
Frescobaldi is not "more prepared" for Python3. Frescobaldi is fully
ported to Python3 and hasn't even worked with Python2 anymore for
some years now.
Urs
___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: @cindex and friends in snippet files
Werner LEMBERG writes: >> A separate index for the snippets would likely be nice (we have >> categories, though) but I have no idea how we could sensibly manage >> that without messing up the main manual indexing and also the LSR >> coordination. > > It's not clear to me what you exactly mean with a `separate index for > snippets'. Where should this index be? In the notation reference, in > the snippets document? And what do you envision of its contents? Uh, it was second-guessing what you were trying to achieve here. If you were only talking about indexing snippets into NR and/or LM, then it does not apply. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: end of Python2
Hi Martin, 23. September 2019 11:17, "Martin Tarenskeen" schrieb: > Hi, > > This has been discussed here before but https://pythonclock.org made me > wonder in which direction LilyPond and Frescobaldi are currently going. Well, if you're wondering about the direction then you might just read up the corresponding threads from the last days. > > Unlike Lilypond, Frescobaldi3 is already more prepared for Python3. Frescobaldi is not "more prepared" for Python3. Frescobaldi is fully ported to Python3 and hasn't even worked with Python2 anymore for some years now. Urs ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
end of Python2
Hi, This has been discussed here before but https://pythonclock.org/ made me wonder in which direction LilyPond and Frescobaldi are currently going. Is there anything I have to worry about? With Lilypond Python2.4 is still bundled, without a bundled Python I have an already installed Python 2.7, and the Lilypond-related python tools (like musicxml2ly) I need all seem to work. Unlike Lilypond, Frescobaldi3 is already more prepared for Python3. Having to depend on all these different Python versions isn't an ideal situation. If we only had more manpower and active developers ... -- MT ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: @cindex and friends in snippet files
> A separate index for the snippets would likely be nice (we have > categories, though) but I have no idea how we could sensibly manage > that without messing up the main manual indexing and also the LSR > coordination. It's not clear to me what you exactly mean with a `separate index for snippets'. Where should this index be? In the notation reference, in the snippets document? And what do you envision of its contents? Werner ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
