Change all instances of \partcombine to \partCombine in the documentation (issue 326870043 by pkx1...@gmail.com)

[PhilEHolmes]

A note on snippets.


https://codereview.appspot.com/326870043/diff/1/Documentation/snippets/changing-partcombine-texts.ly
File Documentation/snippets/changing-partcombine-texts.ly (right):

https://codereview.appspot.com/326870043/diff/1/Documentation/snippets/changing-partcombine-texts.ly#newcode24
Documentation/snippets/changing-partcombine-texts.ly:24: \partCombine
If files in the snippets directory are changed, the changes will be
reverted as soon as anyone runs makelsr.  The best way to change
snippets is to edit the LSR and then follow the CG instructions for
transferring those changes over to the docs.  HTH.

https://codereview.appspot.com/326870043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Correct accidental type for mensural fictas (issue 297540043 by philehol...@googlemail.com)

[PhilEHolmes]

Something of a hack, but makes the example acceptable as an example of
Lilypond engraving.

Note: I forgot to reset git-cl, so the Rietveld issue is now two issues.
 Still reviewable, I hope.

https://codereview.appspot.com/297540043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Doc: Contrib 2.3 Updating git-cl - change source directory (issue 299880043 by gre...@fastmail.co.uk)

[PhilEHolmes]

https://codereview.appspot.com/299880043/diff/1/Documentation/contributor/quick-start.itexi
File Documentation/contributor/quick-start.itexi (right):

https://codereview.appspot.com/299880043/diff/1/Documentation/contributor/quick-start.itexi#newcode501
Documentation/contributor/quick-start.itexi:501: cd ~/src/git-cl/
That's not where my git-cl repository is, and I don't know whether
anyone else's is.  Why do you suggest this change?

https://codereview.appspot.com/299880043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: issue 4813: replace urchin.js with analytics.js and fix redundant hostnames (issue 294020043 by fedel...@gmail.com)

[PhilEHolmes]

Try now.  Problem was with the website build system.  If you edit the
_real_ .htaccess, it is replaced at some point be the one in the website
build directory.  I've now edited both, so I hope that the current
version will be permanent until I change it again...  Works for me in
IE, Chrome and Firefox.

https://codereview.appspot.com/294020043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: issue 4813: replace urchin.js with analytics.js and fix redundant hostnames (issue 294020043 by fedel...@gmail.com)

[PhilEHolmes]

Update:


https://codereview.appspot.com/294020043/diff/1/Documentation/web/server/lilypond.org.htaccess
File Documentation/web/server/lilypond.org.htaccess (left):

https://codereview.appspot.com/294020043/diff/1/Documentation/web/server/lilypond.org.htaccess#oldcode19
Documentation/web/server/lilypond.org.htaccess:19: # Deny following of
symlinks by robots.
This version causes Firefox to complain, with "Firefox has detected that
the server is redirecting the request for this address in a way that
will never complete"

A bit more research led me to:

# Permanent redirect from www.lilypond.org to lilypond.org
RewriteCond "%{HTTP_HOST}" "^www\.(.+)$" [NC]
RewriteRule "^(.*)$" "http://%1/$1; [R=301,L,NE]

which does work, and is in place currently.

https://codereview.appspot.com/294020043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

08:43:24 (UTC) Begin LilyPond compile, previous commit at   
85559b2545524db25e44ef7360aff31cbc85e191
08:44:08 From ssh://git.sv.gnu.org/srv/git/lilypond
 * [new branch]  dev/fedelibre/nr-chapter5 -> 
origin/dev/fedelibre/nr-chapter5
 + 2306bcf...c0a8eec dev/guilev2 -> origin/dev/guilev2  (forced update)
 * [new branch]  dev/guilev21 -> origin/dev/guilev21
 * [new branch]  dev/urs/beaming -> origin/dev/urs/beaming
 * [new branch]  dev/urs/subdivide-beams -> origin/dev/urs/subdivide-beams
   85559b2..f44fba3  master -> origin/master
   1397ca1..37149c1  release/unstable -> origin/release/unstable
   85559b2..7a2e1ee  staging-> origin/staging
   4a91e58..da68c81  translation -> origin/translation
 * [new tag] release/2.19.37-1 -> release/2.19.37-1
>From ssh://git.sv.gnu.org/srv/git/lilypond
 * [new tag] release/2.19.33-1 -> release/2.19.33-1
 * [new tag] release/2.19.34-1 -> release/2.19.34-1
 * [new tag] release/2.19.35-1 -> release/2.19.35-1
 * [new tag] release/2.19.36-1 -> release/2.19.36-1
08:44:16 Merged staging, now at:7a2e1ee2b4ed1d81cf61b39aa4142cc917e14aec
08:44:17Success:./autogen.sh --noconfigure
08:44:31Success:
/home/patchy/patchybuild/autobuild/configure --disable-optimising
08:44:33Success:nice make clean
08:45:42Success:nice make -j9 CPU_COUNT=9 -s
08:48:54 *** FAILED BUILD ***
nice make test -j9 CPU_COUNT=9 -s
Previous good commit:   85559b2545524db25e44ef7360aff31cbc85e191
Current broken commit:  7a2e1ee2b4ed1d81cf61b39aa4142cc917e14aec
08:48:54 *** FAILED STEP ***
merge from staging
Failed runner: nice make test -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-test--j9-CPU_COUNT=9--s.txt
08:48:54 Traceback (most recent call last):
  File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", 
line 528, in handle_staging
self.build (issue_id=issue_id)
  File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", 
line 328, in build
issue_id)
  File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", 
line 266, in runner
raise FailedCommand ("Failed runner: %s\nSee the log file %s" % (command, 
this_logfilename))
FailedCommand: Failed runner: nice make test -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-test--j9-CPU_COUNT=9--s.txt

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Document all outside-staff-priority values; neaten table (issue 280580043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: ,

Message:
Please review.

Description:
Follows on from a question on -user.  There aren't that many values of
outside-staff-priority, so it seems easiest to list them all if we're
going to list most.  The adjustments to the column widths get rid of
unnecessary line wrapping.

Please review.

Please review this at https://codereview.appspot.com/280580043/

Affected files (+26, -5 lines):
  M Documentation/learning/tweaks.itely


Index: Documentation/learning/tweaks.itely
diff --git a/Documentation/learning/tweaks.itely  
b/Documentation/learning/tweaks.itely
index  
d5d5951b1255d811a58b441252088d33ebba2bc3..b8e193b09099a93c46897186d3aef8d1b3c2d6e5  
100644

--- a/Documentation/learning/tweaks.itely
+++ b/Documentation/learning/tweaks.itely
@@ -2179,7 +2179,7 @@ change @code{outside-staff-priority} of the associated
 placed at the start of the spanner, which might include several
 linked hairpins and dynamics.

-@multitable @columnfractions .3 .3 .3
+@multitable @columnfractions .3 .15 .45
 @headitem Layout Object
   @tab Priority
   @tab Controls position of:
@@ -2189,15 +2189,33 @@ linked hairpins and dynamics.
 @item @code{MetronomeMark}
   @tab @code{1000}
   @tab Metronome marks
+@item @code{SostenutoPedalLineSpanner}
+  @tab @code{1000}
+  @tab Pedal indication
+@item @code{SustainPedalLineSpanner}
+  @tab @code{1000}
+  @tab
+@item @code{UnaCordaPedalLineSpanner}
+  @tab @code{1000}
+  @tab
+@item @code{MeasureCounter}
+  @tab @code{750}
+  @tab Measure number
 @item @code{VoltaBracketSpanner}
   @tab @code{600}
   @tab Volta brackets
+@item @code{InstrumentSwitch}
+  @tab @code{500}
+  @tab Instrument switch text
 @item @code{TextScript}
   @tab @code{450}
   @tab Markup text
 @item @code{MultiMeasureRestText}
   @tab @code{450}
-  @tab Markup text over full-bar rests
+  @tab Markup text over multimeasure rests
+@item @code{CombineTextScript}
+  @tab @code{450}
+  @tab Part-combine text
 @item @code{OttavaBracket}
   @tab @code{400}
   @tab Ottava brackets
@@ -2208,11 +2226,14 @@ linked hairpins and dynamics.
   @tab @code{250}
   @tab All dynamic markings
 @item @code{BarNumber}
-  @tab @code{ 100}
+  @tab @code{100}
   @tab Bar numbers
 @item @code{TrillSpanner}
   @tab @code{50}
   @tab Spanning trills
+@item @code{AccidentalSuggestion}
+  @tab @code{0}
+  @tab Annotational accidentals
 @end multitable

 Here is an example showing the default placement of some of
@@ -2271,8 +2292,8 @@ If the default values of  
@code{outside-staff-priority} do not give you

 the placing you want, the priority of any of the objects may be
 overridden.  Suppose we would like the ottava bracket to be placed
 below the text spanner in the example above.  All we need to do is to
-look up the priority of @code{OttavaBracket} in the IR or in the
-tables above, and reduce it to a value lower than that of a
+look up the priority of @code{OttavaBracket} in the
+table above, and reduce it to a value lower than that of a
 @code{TextSpanner}, remembering that @code{OttavaBracket} is created
 in the @code{Staff} context:




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

13:48:07 (UTC) Begin LilyPond compile, previous commit at   
ae17151de4ab4d007bc8683d506ed670c06379cb
13:48:30 Warning: Permanently added the RSA host key for IP address 
'208.118.235.72' to the list of known hosts.
>From ssh://git.sv.gnu.org/srv/git/lilypond
   ae17151..e860e14  master -> origin/master
   c284000..8617401  release/unstable -> origin/release/unstable
   ae17151..626874c  staging-> origin/staging
   dc612d0..192b0ee  translation -> origin/translation
>From ssh://git.sv.gnu.org/srv/git/lilypond
 * [new tag] release/2.19.19-1 -> release/2.19.19-1
 * [new tag] release/2.19.20-1 -> release/2.19.20-1
 * [new tag] release/2.19.21-1 -> release/2.19.21-1
 * [new tag] release/2.19.22-1 -> release/2.19.22-1
 * [new tag] release/2.19.23-1 -> release/2.19.23-1
 * [new tag] release/2.19.24-1 -> release/2.19.24-1
 * [new tag] release/2.19.25-1 -> release/2.19.25-1
 * [new tag] release/2.19.26-1 -> release/2.19.26-1
 * [new tag] release/2.19.27-1 -> release/2.19.27-1
 * [new tag] release/2.19.28-1 -> release/2.19.28-1
13:48:37 Merged staging, now at:626874c8eecfbeb04ca8ffec3fb78da48859b42f
13:48:39Success:./autogen.sh --noconfigure
13:48:49 *** FAILED BUILD ***
/home/patchy/patchybuild/autobuild/configure --disable-optimising
Previous good commit:   ae17151de4ab4d007bc8683d506ed670c06379cb
Current broken commit:  626874c8eecfbeb04ca8ffec3fb78da48859b42f
13:48:49 *** FAILED STEP ***
merge from staging
Failed runner: /home/patchy/patchybuild/autobuild/configure 
--disable-optimising
See the log file log-staging-configure.txt
13:48:49 Traceback (most recent call last):
  File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", 
line 527, in handle_staging
self.configure (issue_id)
  File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", 
line 300, in configure
issue_id, "configure", env=dict (config.items ("configure_environment")))
  File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", 
line 266, in runner
raise FailedCommand ("Failed runner: %s\nSee the log file %s" % (command, 
this_logfilename))
FailedCommand: Failed runner: /home/patchy/patchybuild/autobuild/configure 
--disable-optimising
See the log file log-staging-configure.txt

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

13:52:09 (UTC) Begin LilyPond compile, previous commit at   
626874c8eecfbeb04ca8ffec3fb78da48859b42f
13:52:12 Merged staging, now at:626874c8eecfbeb04ca8ffec3fb78da48859b42f
13:52:13Success:./autogen.sh --noconfigure
13:52:18 *** FAILED BUILD ***
/home/patchy/patchybuild/autobuild/configure --disable-optimising
Previous good commit:   ae17151de4ab4d007bc8683d506ed670c06379cb
Current broken commit:  626874c8eecfbeb04ca8ffec3fb78da48859b42f
13:52:18 *** FAILED STEP ***
merge from staging
Failed runner: /home/patchy/patchybuild/autobuild/configure 
--disable-optimising
See the log file log-staging-configure.txt
13:52:18 Traceback (most recent call last):
  File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", 
line 527, in handle_staging
self.configure (issue_id)
  File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", 
line 300, in configure
issue_id, "configure", env=dict (config.items ("configure_environment")))
  File "/home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py", 
line 266, in runner
raise FailedCommand ("Failed runner: %s\nSee the log file %s" % (command, 
this_logfilename))
FailedCommand: Failed runner: /home/patchy/patchybuild/autobuild/configure 
--disable-optimising
See the log file log-staging-configure.txt

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Doc: Usage - Updated 'Running LilyPond' intros (issue 261240043 by pkx1...@gmail.com)

[PhilEHolmes]

LGTM

https://codereview.appspot.com/261240043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Remove CR LF from snippets using makelsr (issue 238520043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: ,

Message:
Please review.

Description:
Some of the snippets imported from the LSR (notably some of the
headwords) have CR LF at the end of their lines.  This appears to be
viewed as excess whitespace and stripped when the git repo is updated.
As a result, any import of the LSR flags these snippets as changed.
This simple fix replaces CR LF with LF during the import with makelsr.
This fixes the excess whitespace problem.

Please review this at https://codereview.appspot.com/238520043/

Affected files (+1, -0 lines):
  M scripts/auxiliar/makelsr.py


Index: scripts/auxiliar/makelsr.py
diff --git a/scripts/auxiliar/makelsr.py b/scripts/auxiliar/makelsr.py
index  
d17fd53c71263e02bfd042f41bc4bbe6f854263d..71c8179f36721a047821e23cd25d9bf20fbe3618  
100755

--- a/scripts/auxiliar/makelsr.py
+++ b/scripts/auxiliar/makelsr.py
@@ -251,6 +251,7 @@ def copy_ly (srcdir, name, tags):
 s = strip_white_spaces_re.sub ('', s)
 s = final_empty_lines_re.sub ('\n', s)
 s = escape_backslashes_in_header (s)
+s = s.replace (\r\n, \n)
 sys.stderr.write (makelsr.py: writing %s\n % dest)
 open (dest, 'w').write (s)




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Adds snippet showing transcription of mensural music to modern (issue 235660043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: Trevor Daniels, J_lowe,

Message:
Please review.

Description:
I've now taken the snippet I added to the LSR concerning using the same
underlying music to create both mensural and modern music, and added it
to the NR where previously there was a ToDo.  It's probably not perfect,
but seems an improvement to me.

Please ignore the headword snippets: this seems a feature of LSR import
and the final push doesn't normally show them.

Please review this at https://codereview.appspot.com/235660043/

Affected files (+569, -478 lines):
  M Documentation/notation/ancient.itely
  M Documentation/snippets/ancient-notation.snippet-list
  M Documentation/snippets/repeats-headword.ly
  M Documentation/snippets/simultaneous-headword.ly
  M Documentation/snippets/text-headword.ly
  A  
Documentation/snippets/using-tags-to-produce-mensural-and-modern-music-from-the-same-source.ly

  M Documentation/snippets/vocal-music.snippet-list



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Some updates to the ancient music section (issue 240810043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: Trevor Daniels,

Message:
Please review.

Description:
Spelling correction.  Remove the description of non-ancient rests since
it is no longer exhaustive and duplicates other parts of the NR.
Grammar. Remove out-commented example. Edit ligature example to get rid
of ledger lines, which are not appropriate with mensural music.

Please review this at https://codereview.appspot.com/240810043/

Affected files (+17, -34 lines):
  M Documentation/notation/ancient.itely


Index: Documentation/notation/ancient.itely
diff --git a/Documentation/notation/ancient.itely  
b/Documentation/notation/ancient.itely
index  
e8352162ee7aa3b7304993d714b1f95e9297e939..69cd6c19741ac6593a452e6a05f330bebdc529f0  
100644

--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -682,7 +682,7 @@ mensural notation or coloratio sections in white  
mensural notation.

 Because note head style does not influence flag count, in
 this style a semiminima should be notated as @code{a8*2}, not
 @code{a4}, otherwise it will look like a minima.
-The multiplyer can be different if coloratio is used e.g. to notate
+The multiplier can be different if coloratio is used e.g. to notate
 triplets.

 Use @code{semipetrucci} style to draw half-colored
@@ -763,29 +763,21 @@ scope for mensural notation).
 @cindex rests, ancient

 Use the @code{style} property of grob @code{Rest} to select
-ancient rests.  Supported styles are @code{classical},
-@code{neomensural}, and @code{mensural}.  @code{classical} differs
-from the @code{default} style only in that the quarter rest looks
-like a horizontally mirrored 8th rest.  The @code{mensural} and
-the @code{neomensural} styles mimic the appearance of rests in
-manuscripts and prints up to the 16th century.
+ancient rests.  Supported ancient styles are
+@code{neomensural}, and @code{mensural}.

-The following example demonstrates the @code{mensural} and
-@code{neomensural} styles:
+The following example demonstrates these styles:

 @lilypond[quote,fragment,ragged-right,verbatim]
 \set Score.skipBars = ##t
-\override Rest.style = #'classical
-r\longa^classical r\breve r1 r2 r4 r8 r16 s \break
 \override Rest.style = #'mensural
 r\longa^mensural r\breve r1 r2 r4 r8 r16 s \break
 \override Rest.style = #'neomensural
 r\longa^neomensural r\breve r1 r2 r4 r8 r16
 @end lilypond

-There are no 32th and 64th rests specifically for the mensural or
-neo-mensural style.  Instead, the rests from the default style will be
-taken.
+There are no 32nd and 64th rests specifically for the mensural or
+neo-mensural styles.  Rests from the default style are used.

 @seealso
 Music Glossary:
@@ -811,8 +803,11 @@ using pitched rests.
 @cindex key signature

 The @code{mensural} style provides a sharp and a flat sign
-different from the default style.  If called for, the natural sign
-will be taken from the @code{vaticana} style.
+different from the default style.  Mensural notation rarely used a natural
+sign: instead the appropriate sharp or flat is used.  For example, a B
+natural in the key of F major would be indicated with a sharp.  However,
+if specifically called for, the natural sign is taken from the  
@code{vaticana}

+style.

 @lilypond[quote,ragged-right,staffsize=26]
 \markup {
@@ -935,17 +930,6 @@ head.  The length of a flexa can be set by the note  
head property


 For example,

-@c @example
-@c \set Score.timing = ##f
-@c \set Score.defaultBarType = -
-@c \override NoteHead.style = #'neomensural
-@c \override Staff.TimeSignature.style = #'neomensural
-@c \clef petrucci-g
-@c \[ c'\maxima g \]
-@c \[ d\longa c\breve f e d \]
-@c \[ c'\maxima d'\longa \]
-@c \[ e'1 a g\breve \]
-@c @end example
 @lilypond[quote,ragged-right,verbatim]
 \score {
   \relative c' {
@@ -955,11 +939,11 @@ For example,
 \override Staff.TimeSignature.style = #'mensural
 \clef petrucci-g
 \[ c'\maxima g \]
-\[ d\longa
+\[ d'\longa
\override NoteHead.ligature-flexa = ##t
\once \override NoteHead.flexa-width = #3.2
c\breve f e d \]
-\[ c'\maxima d\longa \]
+\[ c\maxima d\longa \]
 \[ e1 a, g\breve \]
   }
   \layout {
@@ -973,8 +957,7 @@ For example,
 @end lilypond

 Without replacing @code{Ligature_bracket_engraver} with
-@code{Mensural_ligature_engraver}, the same music transcribes
-to the following
+@code{Mensural_ligature_engraver}, the same music looks as follows:

 @lilypond[quote,ragged-right]
 \relative c' {
@@ -984,11 +967,11 @@ to the following
   \override Staff.TimeSignature.style = #'mensural
   \clef petrucci-g
   \[ c'\maxima g \]
-  \[ d\longa
+  \[ d'\longa
  \override NoteHead.ligature-flexa = ##t
  \once \override NoteHead.flexa-width = #3.2
  c\breve f e d \]
-  \[ c'\maxima d\longa \]
+  \[ c\maxima d\longa \]
   \[ e1 a, g\breve \]
 }
 @end lilypond
@@ -1002,7 +985,7 @@ Notation Reference:
 @ref{Ligatures}.

 @knownissues
-Horizontal spacing of ligatures is poor.
+Horizontal spacing of ligatures may be poor.
 

Update incipit snippets (issue 235980043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
This is in response to Issue 3981, which identified multiple methods of
creating incipits in the LSR and docs.  I have deleted 2 of the LSR
snippets in the LSR and updated the 3rd to match the syntax introduced
in 2.19.16.  I have imported the LSR and edited the templates to use the
newly named snippet.  Finally nuked build and rebuilt docs with success.

Since this is almost all LSR work, we wouldn't normally actually review
it, but I'd like a patchy sanity check and ditto from contributors.

Please review this at https://codereview.appspot.com/235980043/

Affected files (+298, -701 lines):
  M Documentation/ca/learning/templates.itely
  M Documentation/cs/learning/templates.itely
  M Documentation/de/learning/templates.itely
  M Documentation/es/learning/templates.itely
  M Documentation/fr/learning/templates.itely
  M Documentation/it/learning/templates.itely
  M Documentation/ja/learning/templates.itely
  M Documentation/learning/templates.itely
  M Documentation/nl/learning/templates.itely
  M Documentation/snippets/ancient-notation.snippet-list
  D  
Documentation/snippets/ancient-notation-templatemodern-transcription-of-mensural-music.ly

  M Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
  M Documentation/snippets/incipit.ly
  A Documentation/snippets/new/incipit.ly
  M Documentation/snippets/real-music.snippet-list
  M Documentation/snippets/really-cool.snippet-list
  M Documentation/snippets/specific-notation.snippet-list
  M Documentation/snippets/template.snippet-list
  D Documentation/snippets/transcription-of-ancient-music-with-incipit.ly
  M Documentation/snippets/tweaks-and-overrides.snippet-list
  M Documentation/snippets/workaround.snippet-list



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Document incipit command (issue 232180043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: dak, Trevor Daniels, J_lowe,

Message:
Please review

Description:
Docstring and index entries added

Please review this at https://codereview.appspot.com/232180043/

Affected files (+4, -0 lines):
  M Documentation/notation/ancient.itely
  M ly/property-init.ly


Index: Documentation/notation/ancient.itely
diff --git a/Documentation/notation/ancient.itely  
b/Documentation/notation/ancient.itely
index  
8df2029c62e000c90de37cec14bdeb6cf7840c35..71a2685ff337b2a1f76e5f75692cf962c7c24574  
100644

--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -2647,6 +2647,8 @@ same source.

 @node Incipits
 @unnumberedsubsubsec Incipits
+@funindex \incipit
+@funindex incipit

 It is customary when transcribing mensural music into modern notation to  
place
 an indication of how the initial rests and note or notes of the original  
version

Index: ly/property-init.ly
diff --git a/ly/property-init.ly b/ly/property-init.ly
index  
8077aa231e3880bcd458d000a2db762702073b35..a50cf82635b857aad7f4327fc65fb5b7516c583c  
100644

--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -278,6 +278,8 @@ improvisationOff = {

 incipit =
 #(define-music-function (parser location incipit-music) (ly:music?)
+  (_i Output @var{incipit-music} before the main staff as an indication of
+its appearance in the original music.)
   #{
 \once \override Staff.InstrumentName.stencil =
   #(lambda (grob)



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Update NR font size section (Issue 3370) (issue 235920043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: Trevor Daniels, J_lowe,

Message:
Please review

Description:
Update NR font size section (Issue 3370)

Please review this at https://codereview.appspot.com/235920043/

Affected files (+9, -0 lines):
  M Documentation/notation/text.itely


Index: Documentation/notation/text.itely
diff --git a/Documentation/notation/text.itely  
b/Documentation/notation/text.itely
index  
ac5436b94b6fcde8e9119c01396a6e4aef43f745..221e2fdcfff717b4dc7dec71419debd61c82f037  
100644

--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -573,6 +573,15 @@ b1^\markup { \abs-fontsize #8 da }
 b1-\markup { \abs-fontsize #14 camera }
 @end lilypond

+If the text includes spaces, then it is best to put it all inside quote
+marks, so that the size of each space is appropriate for the size of the
+other characters.
+
+@lilypond[quote,verbatim]
+\markup \fontsize #6 \bold { Sinfonia da camera }
+\markup \fontsize #6 \bold { Sinfonia da camera }
+@end lilypond
+
 @cindex subscript
 @cindex superscript




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Partcombiner documentation (Issue 4307) (issue 233110043 by philehol...@googlemail.com)

[PhilEHolmes]

Thanks for the comments.


https://codereview.appspot.com/233110043/diff/1/Documentation/notation/simultaneous.itely
File Documentation/notation/simultaneous.itely (right):

https://codereview.appspot.com/233110043/diff/1/Documentation/notation/simultaneous.itely#newcode931
Documentation/notation/simultaneous.itely:931: @notation{a due} note,
and separates notes more than a ninth apart into
On 2015/05/02 17:34:32, Trevor Daniels wrote:

For the avoidance of doubt, perhaps insert here:



@notation{a due} note, combines notes less than a ninth apart with the

same

rhythm as chords, and separates ...



Otherwise, LGTM.


Done.

https://codereview.appspot.com/233110043/diff/1/Documentation/notation/simultaneous.itely#newcode937
Documentation/notation/simultaneous.itely:937: a second or more, setting
it to one splits notes of a third or more, and so one.
On 2015/05/03 05:19:13, Keith wrote:

Extra 'e' on and so on.



You might turn around the order of explanation so you don't have to

translate

between interval names and number of scale steps, but just let the

example show

it.


I decided to give examples of what value corresponded to what interval,
since the way it's been implemented actually seemed counterintuitive to
me and I had to check what was actually going on in my example.  Given
this, I thought being explicit was best.

https://codereview.appspot.com/233110043/diff/1/Documentation/notation/simultaneous.itely#newcode941
Documentation/notation/simultaneous.itely:941: c4 d e f |
On 2015/05/03 05:19:13, Keith wrote:

Starting at a, will clarify what happens when the parts cross


Done.

https://codereview.appspot.com/233110043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Partcombiner documentation (Issue 4307) (issue 233110043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: Keith, Trevor Daniels,

Message:
Please review

Description:
Adds a section documenting the use of the optional argument to the
partcombiner

Please review this at https://codereview.appspot.com/233110043/

Affected files (+29, -0 lines):
  M Documentation/notation/simultaneous.itely


Index: Documentation/notation/simultaneous.itely
diff --git a/Documentation/notation/simultaneous.itely  
b/Documentation/notation/simultaneous.itely
index  
0e7b8092eaca2097a2d3a9a0e122da9cc1b493d7..1a2657c0f71313a927d0a7be8b00bfd7497b5665  
100644

--- a/Documentation/notation/simultaneous.itely
+++ b/Documentation/notation/simultaneous.itely
@@ -927,6 +927,35 @@ and second parts get marked with @qq{Solo} and  
@qq{Solo II},

 respectively.  The unison (@notation{a due}) parts are marked with the
 text @qq{a2}.

+By default, the partcombiner merges two notes of the same pitch as an
+@notation{a due} note, and separates notes more than a ninth apart into
+separate voices.  This can be overridden with an optional argument of a  
pair

+of numbers after the @code{\partcombine} command: the first specifies
+the interval where notes start to be combined (the default is zero) and the
+second where the notes are split into separate voices.  Setting the second
+argument to zero means that the partcombiner splits notes with an interval  
of
+a second or more, setting it to one splits notes of a third or more, and  
so one.

+
+@lilypond[quote,verbatim]
+instrumentOne = \relative c' {
+  c4 d e f |
+  g a b c |
+  d e f g |
+}
+
+instrumentTwo = \relative c' {
+  c4 c c c |
+  c c c c |
+  c c c c |
+}
+
+
+  \new Staff \partcombine \instrumentOne \instrumentTwo
+  \new Staff \partcombine #'(2 . 3) \instrumentOne \instrumentTwo
+
+@end lilypond
+
+
 Both arguments to @code{\partcombine} will be interpreted as separate
 @code{Voice} contexts, so if the music is being specified in relative
 mode then @emph{both} parts must contain a @code{\relative} function,



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Fix TODO with markup padding and fix buggy example in LM (issue 225840043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
This fixes the issue of buggy documentation reported by Pierre and gets
rid of a TODO concerning padding not being needed now, replacing it with
changed alignment.

Please review this at https://codereview.appspot.com/225840043/

Affected files (+8, -9 lines):
  M Documentation/learning/fundamental.itely


Index: Documentation/learning/fundamental.itely
diff --git a/Documentation/learning/fundamental.itely  
b/Documentation/learning/fundamental.itely
index  
108d200ca02a6298bb783ea019c07a25ebc58437..9bc66bd27ddb64ef7032b1c67e4c506730c7461d  
100644

--- a/Documentation/learning/fundamental.itely
+++ b/Documentation/learning/fundamental.itely
@@ -3014,11 +3014,11 @@ violin = \new Staff {
 However, you can also use these variables (also known as
 macros, or user-defined commands) for tweaks:

-@c TODO Avoid padtext - not needed with skylining
 @lilypond[quote,verbatim,ragged-right]
 dolce = \markup { \italic \bold dolce }

-padText = { \once \override TextScript.padding = #5.0 }
+centreText = { \once \override TextScript.self-alignment-X = #CENTER }
+
 fthenp =_\markup {
   \dynamic f \italic \small { 2nd } \hspace #0.1 \dynamic p
 }
@@ -3026,8 +3026,8 @@ fthenp =_\markup {
 violin = \relative c'' {
   \repeat volta 2 {
 c4._\dolce b8 a8 g a b |
-\padText
-c4.^hi there! d8 e' f g d |
+\centreText
+c4.^hi there! d8 e f g d |
 c,4.\fthenp b8 c4 c-. |
   }
 }
@@ -3036,7 +3036,6 @@ violin = \relative c'' {
   {
 \violin
   }
-  \layout { ragged-right = ##t }
 }
 @end lilypond

@@ -3051,9 +3050,9 @@ the last line.
 violin = \relative c'' @{
   \repeat volta 2 @{
 c4._\markup @{ \italic \bold dolce @} b8 a8 g a b |
-\once \override TextScript.padding = #5.0
+\once \override TextScript.self-alignment-X = #CENTER
 c4.^hi there! d8 e' f g d |
-c,4.\markup @{
+c,4._\markup @{
   \dynamic f \italic \small @{ 2nd @} \hspace #0.1 \dynamic p
 @}
 b8 c4 c-. |
@@ -3062,9 +3061,9 @@ violin = \relative c'' @{
 @end example

 So far we've seen static substitution -- when LilyPond
-sees @code{\padText}, it replaces it with the stuff that
+sees @code{\centreText}, it replaces it with the stuff that
 we've defined it to be (ie the stuff to the right of
-@code{padtext=}).
+@code{centreText=}).

 LilyPond can handle non-static substitution, too (you
 can think of these as functions).



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Adds incipit section to NR (issue 108270043 by philehol...@googlemail.com)

[PhilEHolmes]

I hope this is close to what is required...

https://codereview.appspot.com/108270043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Adds incipit section to NR (issue 108270043 by philehol...@googlemail.com)

[PhilEHolmes]

Please review further updates to this patch

https://codereview.appspot.com/108270043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Adds incipit section to NR (issue 108270043 by philehol...@googlemail.com)

[PhilEHolmes]

Please review.

https://codereview.appspot.com/108270043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Phase two of pruning snippets/new (issue 113670043 by philehol...@googlemail.com)

[PhilEHolmes]

Please review.

https://codereview.appspot.com/113670043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Changes from LSR doc run (issue 116040043 by philehol...@googlemail.com)

[PhilEHolmes]

Please review.

https://codereview.appspot.com/116040043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Adds incipit section to NR (issue 108270043 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: ,

Message:
Please review.

Description:
Adds incipit section to NR

Please review this at https://codereview.appspot.com/108270043/

Affected files (+126, -4 lines):
  M Documentation/notation/ancient.itely



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Minor update to Gregorian section of NR (issue 109230044 by philehol...@googlemail.com)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
Some minor changes to the Transcribing Gregorian chant section of the
NR: this positions the comment about stems more closely to the example
it refers to, and rationalises some removes and hides.

Please review this at https://codereview.appspot.com/109230044/

Affected files (+14, -11 lines):
  M Documentation/notation/ancient.itely


Index: Documentation/notation/ancient.itely
diff --git a/Documentation/notation/ancient.itely  
b/Documentation/notation/ancient.itely
index  
67aefbd86d0fbb92a38dec37565962d91c9f8029..e4ded2fa4f88b7a93582d05e085085e49e6b43d0  
100644

--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -2699,13 +2699,6 @@ the @code{Stem_engraver} from the Voice context:
 @}
 @end example

-However, in some transcription styles, stems are used
-occasionally, for example to indicate the transition from a
-single-tone recitative to a fixed melodic gesture.  In these cases,
-one can use either @code{\hide Stem} or
-@code{\override Stem.length = #0} instead, and restore the stem
-when needed with the corresponding @code{\once \override Stem.transparent  
= ##f} (see example below).

-
 @b{Timing.} For unmetered chant, there are several alternatives.

 The Time_signature_engraver can be removed from the Staff context
@@ -2751,7 +2744,10 @@ verba = \lyricmode {
   \Staff
   \remove Time_signature_engraver
   \remove Bar_engraver
-  \hide Stem
+}
+\context {
+  \Voice
+  \remove Stem_engraver
 }
   }
 }
@@ -2759,17 +2755,25 @@ verba = \lyricmode {

 This works fine, as long as the text doesn't span a line break.  If
 that is the case, an alternative is to add hidden notes to the
-score, here in combination with changing stem visibility:
+score, as below.

+In some transcription styles, stems are used
+occasionally, for example to indicate the transition from a
+single-tone recitative to a fixed melodic gesture.  In these cases,
+one can use either @code{\hide Stem} or
+@code{\override Stem.length = #0} instead of @code{\remove}-ing
+the @code{Stem_engraver} and restore the stem
+when needed with the corresponding @code{\undo \hide Stem}.

 @lilypond[verbatim,ragged-right]
 \include gregorian.ly
 chant = \relative c' {
   \clef G_8
   \set Score.timing = ##f
+  \hide Stem
   c\breve \hide NoteHead  c c c c c
   \undo \hide NoteHead
-  \override Stem.transparent = ##f \stemUp c4 b4 a
+  \undo \hide Stem \stemUp c4 b4 a
   \hide Stem c2 c4  \divisioMaior
   c\breve \hide NoteHead c c c c c c c
   \undo \hide NoteHead c4 c f, f \finalis
@@ -2790,7 +2794,6 @@ verba = \lyricmode {
   \Staff
   \remove Time_signature_engraver
   \hide BarLine
-  \hide Stem
 }
   }
 }



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reposition voiced rests (Issue 3902) (issue 101720045)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
This moves voiced rests closer together, more closely matching the
recommendations of Gould, Read, etc.  There are a lot of regression test
changes, but all associated with repositioned rests.

Please review this at https://codereview.appspot.com/101720045/

Affected files (+1, -1 lines):
  M lily/rest.cc


Index: lily/rest.cc
diff --git a/lily/rest.cc b/lily/rest.cc
index  
2dbb2c9f9b3d465d135f65a376fce240cb709c36..f8746ce4d2ec29e5a8ed4eb18ba52f6d65659317  
100644

--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -72,7 +72,7 @@ Rest::staff_position_internal (Grob *me, int  
duration_log, int dir)

   return pos;
 }

-  pos = 4 * dir;
+  pos = 2 * dir;

   if (duration_log  1)
 /* Only half notes or longer want alignment with staff lines */



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Add Editing page/node (issue 60530047)

[PhilEHolmes]

Some proposed changes that help to make it easier to read, I hope.


https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi
File Documentation/web/introduction.itexi (right):

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1190
Documentation/web/introduction.itexi:1190: and how you actually
@emph{work} with these text files you may
Think it's simpler and better to say:

But if you don't have a clear idea yet how you actually @emph{work}
with these text files

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1202
Documentation/web/introduction.itexi:1202: LilyPond isn't one monolithic
program as you may be used
one - a single

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1203
Documentation/web/introduction.itexi:1203: from graphical notation
tools.  Instead it is a system with
graphical music notation tools.

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1204
Documentation/web/introduction.itexi:1204: several independent parts.
This may seem irritating at first,
This may seem irritating at first, - This may not be what you're
used to,

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1213
Documentation/web/introduction.itexi:1213: of other options, including
MIDI.
there is a variety of other options is grammatically correct, but
sounds odd to a native.  there are a variety of other options sounds
better.  Alternatively a variety of other options are available,
including MIDI avoids the issue.

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1219
Documentation/web/introduction.itexi:1219: support you in working with
LilyPond files.
This would read better as:

It can be unnecessarily difficult editing LilyPond input with a plain
text editor, but fortunately there are a number of tools that actively
support working with LilyPond files.

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1236
Documentation/web/introduction.itexi:1236: automatic command completion
that helps you remembering
remembering - remember

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1237
Documentation/web/introduction.itexi:1237: the available commands and
reduces misspelling errors at the
misspelling - spelling

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1240
Documentation/web/introduction.itexi:1240: While these are quite basic
tools some programs offer you a
While these are quite basic tools some programs offer - Some other
programs offer

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1241
Documentation/web/introduction.itexi:1241: complete editing environment
for working with LilyPond score.
score - scores

https://codereview.appspot.com/60530047/diff/40001/Documentation/web/introduction.itexi#newcode1242
Documentation/web/introduction.itexi:1242: They may include templates
and entry palettes, may support
may support - support

https://codereview.appspot.com/60530047/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Add Editing page/node (issue 60530047)

[PhilEHolmes]

An initial comment:


https://codereview.appspot.com/60530047/diff/1/Documentation/web/introduction.itexi
File Documentation/web/introduction.itexi (left):

https://codereview.appspot.com/60530047/diff/1/Documentation/web/introduction.itexi#oldcode78
Documentation/web/introduction.itexi:78:
If I build the web page, this added menu item appears as a different
colour, and if I check the source, it fails to have the correct color as
its class.  I'm wondering whether 8 items is regarded as the maximum: I
know GP was always _very_ _very_ anti adding extra width to the menu.
Would it be possible to have a menu item called editing, and easier
editing as part of that?

Apart from noting that the patch has 2 whitespace errors, I'll wait
until we can resolve that before I review the patch further.

https://codereview.appspot.com/60530047/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Web:Introduction: Rename Our Goal box (issue 48430043)

[PhilEHolmes]

Please see my comment below.


https://codereview.appspot.com/48430043/diff/1/Documentation/web/introduction.itexi
File Documentation/web/introduction.itexi (right):

https://codereview.appspot.com/48430043/diff/1/Documentation/web/introduction.itexi#newcode14
Documentation/web/introduction.itexi:14: @subheading Our Mission
I dislike this intensely.  It smacks of corporate nonsense - read the
text that large conglomerates have under Our mission.  Please leave it
as goal, or something similar and non-corporate.

https://codereview.appspot.com/48430043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Doc: Change Balloon Text example (issue 14626043)

[PhilEHolmes]

Minor nit


https://codereview.appspot.com/14626043/diff/1/Documentation/notation/editorial.itely
File Documentation/notation/editorial.itely (right):

https://codereview.appspot.com/14626043/diff/1/Documentation/notation/editorial.itely#newcode541
Documentation/notation/editorial.itely:541: Balloon text does not
influences note spacing, but this can be
Change influences to influence

https://codereview.appspot.com/14626043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Add backup option to convert-ly (Issue 3572) (issue 14040043)

[PhilEHolmes]

Julien - I'm not convinced that's a good idea.  It would mean that, once
you'd turned numbering on, then you couldn't turn it off except by
deleting all the numbered files.  I think it's better to let the user
select, based on the command line switches.

https://codereview.appspot.com/14040043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Add backup option to convert-ly (Issue 3572) (issue 14040043)

[PhilEHolmes]

Please review.

https://codereview.appspot.com/14040043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Add backup option to convert-ly (Issue 3572) (issue 14040043)

[PhilEHolmes]

Reviewers: Julien Rioux, dak,

Message:
Initial patch to check the principle is OK.  Will require documentation
updates before it's pushed.  Please review Eluze's Python.

Description:
Add backup option to convert-ly (Issue 3572)

Please review this at https://codereview.appspot.com/14040043/

Affected files (+23, -13 lines):
  M scripts/convert-ly.py


Index: scripts/convert-ly.py
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index  
7acd2e29dac7ee1f908a9bc0f5ec50131d798041..0bb7c98f08d8238e372975d30177eef0495cd6b5  
100644

--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -24,6 +24,7 @@
 import os
 import sys
 import re
+import shutil

 
 @relocate-preamble@
@@ -129,18 +130,25 @@ def get_option_parser ():
   action='store_true',
   dest='diff_version_update',
   default=False)
-
+
 p.add_option (-s, '--show-rules',
   help=_ (show rules [default: -f 0, -t %s]) %  
program_version,

   dest='show_rules',
   action='store_true', default=False)
-
+
 p.add_option ('-t', '--to',
   help=_ (convert to VERSION [default: %s]) %  
program_version,

   metavar=_ ('VERSION'),
   action='store',
   dest=to_version,
   default='')
+
+p.add_option ('-b', '--backup-numbered',
+  help=_ (make a numbered backup [default: filename.ext~]),
+  action='store_true',
+  dest=backup_numbered,
+  default='')
+
 p.add_option ('-w', '--warranty', help=_ (show warranty and  
copyright),

action='store_true',
),
@@ -152,8 +160,6 @@ def get_option_parser ():

 return p

-
-
 def str_to_tuple (s):
 return tuple ([int(n) for n in s.split ('.')])

@@ -208,8 +214,6 @@ string.

 return (last_conversion, str, errors)

-
-
 def guess_lilypond_version (input):
 m = lilypond_version_strict_re.search (input)
 if m:
@@ -230,6 +234,18 @@ class InvalidVersion (Exception):
 def __init__ (self, version):
   self.version = version

+def back_up(file, numbered):
+back_up = file
+if numbered:
+  n = 0
+  while os.path.exists(back_up) and os.path.isfile(back_up):
+n = n + 1
+back_up = file + '.' + str(n) + '~'
+else:
+  back_up = file + '~'
+shutil.copy2(file, back_up)
+return back_up
+
 def do_one_file (infile_name):
 ly.progress (_ (uProcessing `%s\'... ) % infile_name, True)

@@ -258,7 +274,6 @@ def do_one_file (infile_name):
 if len (from_version) != 3:
 raise InvalidVersion (..join ([str(n) for n in from_version]))

-
 (last, result, errors) = do_conversion (input, from_version,  
to_version)


 if global_options.force_current_version and \
@@ -287,11 +302,7 @@ def do_one_file (infile_name):
 ly.progress ('\n')

 if global_options.edit:
-try:
-os.remove (infile_name + '~')
-except:
-pass
-os.rename (infile_name, infile_name + '~')
+backup = back_up(infile_name, global_options.backup_numbered)
 outfile = open (infile_name, 'w')
 else:
 outfile = sys.stdout
@@ -363,5 +374,4 @@ def main ():
 There were %d errors., errors) % errors)
 sys.exit (1)

-
 main ()



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Adds a little curve to harmonic note heads (issue 13518047)

[PhilEHolmes]

Reviewers: lemzwerg,

Message:
Please review

Description:
Adds a little curve to harmonic note heads

Please review this at https://codereview.appspot.com/13518047/

Affected files (+22, -22 lines):
  M mf/parmesan-noteheads.mf


Index: mf/parmesan-noteheads.mf
diff --git a/mf/parmesan-noteheads.mf b/mf/parmesan-noteheads.mf
index  
dbeb87530d11880a501cf03f46059bb4b00439f7..cf1bfae111f97d683063ec938276762e038ed450  
100644

--- a/mf/parmesan-noteheads.mf
+++ b/mf/parmesan-noteheads.mf
@@ -166,7 +166,7 @@ def draw_neomensural_longa (expr wid, holeheight,  
direction) =

 enddef;


-def draw_neomensural_black_head (expr width, height) =
+def draw_neomensural_black_head (expr width, height, concaveness) =
save head_width, head_height, stem_width;
save ne, nw, ne_dist, nw_dist;
pair ne, nw, ne_dist, nw_dist;
@@ -197,25 +197,25 @@ def draw_neomensural_black_head (expr width, height) =
ne_dist := (nw rotated -90) * blot_diameter / 2;

fill lft z1
-.. (z1 + nw_dist)
--- (z2 + nw_dist)
+.. (z1 + nw_dist){ ne rotated -concaveness }
+.. { ne rotated concaveness }(z2 + nw_dist)
 .. top z2
-.. (z2 + ne_dist)
--- (z3 + ne_dist)
+.. (z2 + ne_dist){ nw rotated (180 - concaveness) }
+.. { nw rotated (180 + concaveness) }(z3 + ne_dist)
 .. rt z3
-.. (z3 - nw_dist)
--- (z4 - nw_dist)
+.. (z3 - nw_dist){ ne rotated (180 - concaveness) }
+.. { ne rotated (180 + concaveness) }(z4 - nw_dist)
 .. bot z4
-.. (z4 - ne_dist)
--- (z1 - ne_dist)
+.. (z4 - ne_dist){ nw  rotated -concaveness }
+.. { nw  rotated concaveness }(z1 - ne_dist)
 .. cycle;

labels (1, 2, 3, 4);
 enddef;


-def draw_neomensural_open_head (expr width, height)=
-   draw_neomensural_black_head (width, height);
+def draw_neomensural_open_head (expr width, height, concaveness)=
+   draw_neomensural_black_head (width, height, concaveness);

save headNW, headSW, stem_width;

@@ -317,15 +317,15 @@ save nm_height, nm_width;
 nm_height := noteheight#;
 nm_width := staff_space#;
 fet_beginchar (Neo-mensural semibrevis head, s0neomensural);
-   draw_neomensural_open_head (nm_width, nm_height);
+   draw_neomensural_open_head (nm_width, nm_height, 0);
 fet_endchar;

 fet_beginchar (Neo-mensural minima head, s1neomensural);
-   draw_neomensural_open_head (nm_width, nm_height);
+   draw_neomensural_open_head (nm_width, nm_height, 0);
 fet_endchar;

 fet_beginchar (Neo-mensural semiminima head, s2neomensural);
-   draw_neomensural_black_head (nm_width, nm_height);
+   draw_neomensural_black_head (nm_width, nm_height, 0);
 fet_endchar;

 
@@ -342,13 +342,13 @@ fet_endchar;
 %

 fet_beginchar (Harmonic notehead (Neo-mensural open), s0harmonic);
-   draw_neomensural_open_head (1.3 staff_space#, 1.3 noteheight#);
+   draw_neomensural_open_head (1.3 staff_space#, 1.3 noteheight#, 5);
charwx := head_width#;
charwy := 0;
 fet_endchar;

 fet_beginchar (Harmonic notehead (Neo-mensural black), s2harmonic);
-   draw_neomensural_black_head (1.3 staff_space#, 1.3 noteheight#);
+   draw_neomensural_black_head (1.3 staff_space#, 1.3 noteheight#, 5);
charwx := head_width#;
charwy := 0;
 fet_endchar;
@@ -737,15 +737,15 @@ petrucci_height := 1.4 noteheight#;
 petrucci_width := .72 petrucci_height;

 fet_beginchar (Petrucci semibrevis head, s0petrucci);
-   draw_neomensural_open_head (petrucci_width, petrucci_height);
+   draw_neomensural_open_head (petrucci_width, petrucci_height, 0);
 fet_endchar;

 fet_beginchar (Petrucci minima head, s1petrucci);
-   draw_neomensural_open_head (petrucci_width, petrucci_height);
+   draw_neomensural_open_head (petrucci_width, petrucci_height, 0);
 fet_endchar;

 fet_beginchar (Petrucci semiminima head, s2petrucci);
-   draw_neomensural_black_head (petrucci_width, petrucci_height);
+   draw_neomensural_black_head (petrucci_width, petrucci_height, 0);
 fet_endchar;


@@ -754,15 +754,15 @@ fet_endchar;
 %

 fet_beginchar (Petrucci colored semibrevis head, s0blackpetrucci);
-   draw_neomensural_black_head (petrucci_width, petrucci_height);
+   draw_neomensural_black_head (petrucci_width, petrucci_height, 0);
 fet_endchar;

 fet_beginchar (Petrucci colored minima head, s1blackpetrucci);
-   draw_neomensural_black_head (petrucci_width, petrucci_height);
+   draw_neomensural_black_head (petrucci_width, petrucci_height, 0);
 fet_endchar;

 fet_beginchar (Petrucci colored semiminima head, s2blackpetrucci);
-   draw_neomensural_black_head (petrucci_width, petrucci_height);
+   draw_neomensural_black_head (petrucci_width, petrucci_height, 0);
 fet_endchar;





___
lilypond-devel mailing list

Correct headings in LM (Issue 3495) (issue 13508044)

[PhilEHolmes]

Reviewers: Trevor Daniels,

Message:
Please review.  Passes make doc.

Description:
Changes headings to those specified in the CG

Please review this at https://codereview.appspot.com/13508044/

Affected files (+119, -31 lines):
  M Documentation/learning/common-notation.itely
  M Documentation/learning/tutorial.itely



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Metafont formatting instructions (issue 13400046)

[PhilEHolmes]

Please review if needed.  As this is the CG, I'll assume no comments =
LGTM and push to staging quite quickly.

https://codereview.appspot.com/13400046/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Metafont formatting instructions (issue 13400046)

[PhilEHolmes]

Reviewers: lemzwerg, dak,

Message:
Please review

Description:
An attempt to codify and illustrate how to indent LilyPond's metafont
formatting rules.

Please review this at https://codereview.appspot.com/13400046/

Affected files (+14, -6 lines):
  M Documentation/contributor/feta-font.itexi


Index: Documentation/contributor/feta-font.itexi
diff --git a/Documentation/contributor/feta-font.itexi  
b/Documentation/contributor/feta-font.itexi
index  
78021ae8d73c858a3be151dc9e3888c90aa7b983..67987b949798977504eec2a671042ba4032d3b8c  
100644

--- a/Documentation/contributor/feta-font.itexi
+++ b/Documentation/contributor/feta-font.itexi
@@ -118,15 +118,23 @@ make

 There are special formatting rules for METAFONT files.

-Tabs are used for indentation.
+Tabs are used for the indentation of commands.

 When a path contains more than two points, put each point on a
-separate line, with the operator at the beginning  of the line:
+separate line, with the operator at the beginning of the line.
+The operators are indented to the same depth as the initial point
+on the path using spaces.  The indentation mechanism is illustrated
+below, with @code{---} indicating a tab character and any other
+indentation created using spaces.

 @example
-fill z1
- -- z2
- -- z3
- .. cycle;
+def draw_something (test) =
+---if test:
+--fill z1
+-- -- z2
+-- -- z3
+-- .. cycle;
+---fi;
+enddef;
 @end example




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

07:58:57 (UTC) Begin LilyPond compile, previous commit at   
c0a691181c981f55ef28e5daa8410b41e37ef808
07:59:10 *** FAILED STEP ***
merge from staging
Command '['git', 'fetch']' returned non-zero exit status 1
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory
From ssh://git.sv.gnu.org/srv/git/lilypond
 ! [new branch]  dev/janek/experimental-fix-for-issue-2462 - 
origin/dev/janek/experimental-fix-for-issue-2462  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory
 ! [new branch]  dev/janek/experimental-fix-for-issue-2658 - 
origin/dev/janek/experimental-fix-for-issue-2658  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/feta-modification: Not a directory
 ! [new branch]  dev/janek/feta-modification - 
origin/dev/janek/feta-modification  (unable to update local ref)
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches
07:59:10 Traceback (most recent call last):
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 497, in merge_branch
self.merge_git_branch (branch, **kwargs)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 423, in merge_git_branch
self.update_git ()
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 233, in update_git
run (git fetch)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 105, in run
raise FailedCommand (Command '%s' returned non-zero exit status %d\n%s % 
(cmd, returncode, stderr.strip ()))
FailedCommand: Command '['git', 'fetch']' returned non-zero exit status 1
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory
From ssh://git.sv.gnu.org/srv/git/lilypond
 ! [new branch]  dev/janek/experimental-fix-for-issue-2462 - 
origin/dev/janek/experimental-fix-for-issue-2462  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory
 ! [new branch]  dev/janek/experimental-fix-for-issue-2658 - 
origin/dev/janek/experimental-fix-for-issue-2658  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/feta-modification: Not a directory
 ! [new branch]  dev/janek/feta-modification - 
origin/dev/janek/feta-modification  (unable to update local ref)
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

07:58:14 (UTC) Begin LilyPond compile, previous commit at   
a71356bae841fad9b08f8d29f7fc26688de3f302
07:58:35 *** FAILED STEP ***
merge from staging
Command '['git', 'fetch']' returned non-zero exit status 1
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory
From ssh://git.sv.gnu.org/srv/git/lilypond
 ! [new branch]  dev/janek/experimental-fix-for-issue-2462 - 
origin/dev/janek/experimental-fix-for-issue-2462  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory
 ! [new branch]  dev/janek/experimental-fix-for-issue-2658 - 
origin/dev/janek/experimental-fix-for-issue-2658  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/feta-modification: Not a directory
 ! [new branch]  dev/janek/feta-modification - 
origin/dev/janek/feta-modification  (unable to update local ref)
   a71356b..6d209bd  master - origin/master
   cbd3478..07adeda  release/unstable - origin/release/unstable
   a71356b..c0a6911  staging- origin/staging
   a1c9d9b..afad23a  translation - origin/translation
 * [new tag] release/2.17.25-1 - release/2.17.25-1
 * [new tag] release/2.17.26-1 - release/2.17.26-1
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches
07:58:35 Traceback (most recent call last):
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 497, in merge_branch
self.merge_git_branch (branch, **kwargs)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 423, in merge_git_branch
self.update_git ()
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 233, in update_git
run (git fetch)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 105, in run
raise FailedCommand (Command '%s' returned non-zero exit status %d\n%s % 
(cmd, returncode, stderr.strip ()))
FailedCommand: Command '['git', 'fetch']' returned non-zero exit status 1
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory
From ssh://git.sv.gnu.org/srv/git/lilypond
 ! [new branch]  dev/janek/experimental-fix-for-issue-2462 - 
origin/dev/janek/experimental-fix-for-issue-2462  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory
 ! [new branch]  dev/janek/experimental-fix-for-issue-2658 - 
origin/dev/janek/experimental-fix-for-issue-2658  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/feta-modification: Not a directory
 ! [new branch]  dev/janek/feta-modification - 
origin/dev/janek/feta-modification  (unable to update local ref)
   a71356b..6d209bd  master - origin/master
   cbd3478..07adeda  release/unstable - origin/release/unstable
   a71356b..c0a6911  staging- origin/staging
   a1c9d9b..afad23a  translation - origin/translation
 * [new tag] release/2.17.25-1 - release/2.17.25-1
 * [new tag] release/2.17.26-1 - release/2.17.26-1
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

08:05:40 (UTC) Begin LilyPond compile, previous commit at   
c0a691181c981f55ef28e5daa8410b41e37ef808
08:07:32 *** FAILED STEP ***
merge from staging
Command '['git', 'fetch']' returned non-zero exit status 1
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory
From ssh://git.sv.gnu.org/srv/git/lilypond
 ! [new branch]  dev/janek/experimental-fix-for-issue-2462 - 
origin/dev/janek/experimental-fix-for-issue-2462  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory
 ! [new branch]  dev/janek/experimental-fix-for-issue-2658 - 
origin/dev/janek/experimental-fix-for-issue-2658  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/feta-modification: Not a directory
 ! [new branch]  dev/janek/feta-modification - 
origin/dev/janek/feta-modification  (unable to update local ref)
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches
08:07:32 Traceback (most recent call last):
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 497, in merge_branch
self.merge_git_branch (branch, **kwargs)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 423, in merge_git_branch
self.update_git ()
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 233, in update_git
run (git fetch)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 105, in run
raise FailedCommand (Command '%s' returned non-zero exit status %d\n%s % 
(cmd, returncode, stderr.strip ()))
FailedCommand: Command '['git', 'fetch']' returned non-zero exit status 1
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory
From ssh://git.sv.gnu.org/srv/git/lilypond
 ! [new branch]  dev/janek/experimental-fix-for-issue-2462 - 
origin/dev/janek/experimental-fix-for-issue-2462  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory
 ! [new branch]  dev/janek/experimental-fix-for-issue-2658 - 
origin/dev/janek/experimental-fix-for-issue-2658  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/feta-modification: Not a directory
 ! [new branch]  dev/janek/feta-modification - 
origin/dev/janek/feta-modification  (unable to update local ref)
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

08:56:20 (UTC) Begin LilyPond compile, previous commit at   
c0a691181c981f55ef28e5daa8410b41e37ef808
08:56:23 *** FAILED STEP ***
merge from staging
Command '['git', 'fetch']' returned non-zero exit status 1
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory
From ssh://git.sv.gnu.org/srv/git/lilypond
 ! [new branch]  dev/janek/experimental-fix-for-issue-2462 - 
origin/dev/janek/experimental-fix-for-issue-2462  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory
 ! [new branch]  dev/janek/experimental-fix-for-issue-2658 - 
origin/dev/janek/experimental-fix-for-issue-2658  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/feta-modification: Not a directory
 ! [new branch]  dev/janek/feta-modification - 
origin/dev/janek/feta-modification  (unable to update local ref)
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches
08:56:23 Traceback (most recent call last):
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 497, in merge_branch
self.merge_git_branch (branch, **kwargs)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 423, in merge_git_branch
self.update_git ()
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 233, in update_git
run (git fetch)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 105, in run
raise FailedCommand (Command '%s' returned non-zero exit status %d\n%s % 
(cmd, returncode, stderr.strip ()))
FailedCommand: Command '['git', 'fetch']' returned non-zero exit status 1
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2462: Not a directory
From ssh://git.sv.gnu.org/srv/git/lilypond
 ! [new branch]  dev/janek/experimental-fix-for-issue-2462 - 
origin/dev/janek/experimental-fix-for-issue-2462  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/experimental-fix-for-issue-2658: Not a directory
 ! [new branch]  dev/janek/experimental-fix-for-issue-2658 - 
origin/dev/janek/experimental-fix-for-issue-2658  (unable to update local ref)
error: unable to resolve reference 
refs/remotes/origin/dev/janek/feta-modification: Not a directory
 ! [new branch]  dev/janek/feta-modification - 
origin/dev/janek/feta-modification  (unable to update local ref)
error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Changes how mensural flags are drawn (issue 13122044)

[PhilEHolmes]

Please review.

https://codereview.appspot.com/13122044/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Windows tutorial updates (issue 12980044)

[PhilEHolmes]

Draft 3 - now with translations including updated images (although the
words aren't correct now).

https://codereview.appspot.com/12980044/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Changes how mensural flags are drawn (issue 13122044)

[PhilEHolmes]

Reviewers: lemzwerg,

Message:
Please review.

Description:
Issue 3105 complains that mensural flags do not attach to stems very
well.  This patch makes them attach in the same way as modern flags, and
changes how they're drawn - I think the way this is now done is more
metafont-y.  It also gets them looking closer to all the 16C flags I can
find.

Please review this at https://codereview.appspot.com/13122044/

Affected files:
  M mf/parmesan-flags.mf


Index: mf/parmesan-flags.mf
diff --git a/mf/parmesan-flags.mf b/mf/parmesan-flags.mf
index  
f7c903f874bbaf2a4c65a8eb8797d6fe3f1c7508..596f87e09bbf95adf832ac768f6d91f4a321a6aa  
100644

--- a/mf/parmesan-flags.mf
+++ b/mf/parmesan-flags.mf
@@ -40,56 +40,39 @@ dir_down := -1;
 %

 def draw_mensural_outermost_flare (expr staffline_adjustment, d_) =
-   define_pixels (linethickness, staff_space);
-
-   save ellipse, pat, T;
-   path ellipse, pat;
-   transform T;
-
-   T := identity xscaled 1.00 linethickness
- yscaled 0.22 staff_space
- rotated -35;
-   pickup pencircle transformed T;
-   ellipse := fullcircle transformed T;
-
-   z11 = (+0.00 staff_space, -0.00 staff_space);
-   z12 = (+0.15 staff_space, -0.00 staff_space);
+save flag_end, flag_right;

if staffline_adjustment = between_staff_lines:
-   z13 = (+0.45 staff_space, -0.35 staff_space);
-   z14 = (+0.45 staff_space, -0.85 staff_space);
-   z15 = (+0.00 staff_space, -2.00 staff_space);
+   flag_end := 1.9;
+   flag_right := 0.6;
elseif staffline_adjustment = on_staff_line:
-   z13 = (+0.20 staff_space, -0.05 staff_space);
-   z14 = (+0.20 staff_space, -1.15 staff_space);
-   z15 = (+0.00 staff_space, -1.40 staff_space);
+   flag_end := 1.4;
+   flag_right := 0.5;
else: % staffline_adjustment = anywhere
-   z13 = (+0.33 staff_space, -0.20 staff_space);
-   z14 = (+0.33 staff_space, -1.00 staff_space);
-   z15 = (+0.00 staff_space, -1.70 staff_space);
+   flag_end := 1.7;
+   flag_right := 0.6;
fi;

-   pat := z13{z13 - z12}
-  .. {z15 - z14}z14;
-
-   fill get_subpath (ellipse, z11 - z12, z12 - z11, z11)
--- get_subpoint (ellipse, z12 - z11, z12)
--- get_subpoint (ellipse, z13 - z12, z12)
--- get_subpoint (ellipse, direction 0 of pat, z13)
- {direction 0 of pat}
-.. {direction 1 of pat}
- get_subpoint (ellipse, direction 1 of pat, z14)
--- get_subpath (ellipse, z15 - z14, z14 - z15, z15)
--- get_subpoint (ellipse, -direction 1 of pat, z14)
- {-direction 1 of pat}
-.. {-direction 0 of pat}
- get_subpoint (ellipse, -direction 0 of pat, z13)
--- get_subpath (ellipse, z12 - z13, z11 - z12, z12)
--- cycle;
+   penpos1 (0.25 staff_space, 90);
+   penpos2 (0.2 staff_space, 0);
+   penpos3 (0.1 staff_space, -35);
+   z1r = (0, 0);
+   z2r = (flag_right * staff_space, -0.4 staff_space);
+   z3l = (0, -1.0 * flag_end * staff_space);
+   fill z1l ..
+   tension 2.0 ..
+   z2l ..
+   tension 3.0 ..
+   { dir -125 } z3l { dir -125 } ..
+   { dir 55 } z3r {dir 55 } ..
+   tension 3.0 ..
+   z2r ..
+   tension 2.0 ..
+   z1r --
+   cycle ;
+   draw_square_block ((-0.5 stemthickness_rounded, 0),
+  (0, -0.25 staff_space));

-   if d_ = dir_up:
-   labels (11, 12, 13, 14, 15);
-   fi;
 enddef;


@@ -184,7 +167,8 @@ def draw_mensural_flag (expr staffline_adjustment,  
flares, d_) =


if d_ = dir_down:
currentpicture := currentpicture xscaled -1
-yscaled -1;
+yscaled -1
+shifted (-0.5 
stemthickness_rounded, 0);
fi;
 enddef;




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Windows tutorial updates (issue 12980044)

[PhilEHolmes]

The patch set on Rietveld now includes the new images (thanks, Julien).

https://codereview.appspot.com/12980044/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Windows tutorial updates (issue 12980044)

[PhilEHolmes]

Reviewers: Trevor Daniels,

Message:
Please review.

Description:
As previously discussed, updates to the Windows tutorial to match the
way LilyPond currently works and fit the images into the PDF better.

Please review this at https://codereview.appspot.com/12980044/

Affected files:
  M Documentation/included/generating-output.itexi
  A Documentation/pictures/BadLog.png
  A Documentation/pictures/BadLog2.png
  A Documentation/pictures/DragDrop.png
  A Documentation/pictures/EditFile.png
  A Documentation/pictures/FileSave.png
  A Documentation/pictures/GenPDF.png
  D Documentation/pictures/Learning_Win7_All_Files_Created.png
  D Documentation/pictures/Learning_Win7_Log_File.png
  D Documentation/pictures/Learning_Win7_New_Menu.png
  D Documentation/pictures/Learning_Win7_Open_Context_Menu.png
  D Documentation/pictures/Learning_Win7_Open_Dragndrop.png
  D Documentation/pictures/Learning_Win7_Open_Menu.png
  D Documentation/pictures/Learning_Win7_Pdf_Output.png
  D Documentation/pictures/Learning_Win7_Save_File_With_Name.png
  D Documentation/pictures/Learning_Win7_Save_Menu.png
  D Documentation/pictures/Learning_Win7_Welcome_File_Whole.png
  A Documentation/pictures/LilyPad.png
  A Documentation/pictures/PDFRead.png
  A Documentation/pictures/SaveAs.png


Index: Documentation/pictures/Learning_Win7_All_Files_Created.png
diff --git a/Documentation/pictures/Learning_Win7_All_Files_Created.png  
b/Documentation/pictures/Learning_Win7_All_Files_Created.png

deleted file mode 100644
index  
5d608555c30afa1413cb00821266ed37aed8ef32..
Binary files a/Documentation/pictures/Learning_Win7_All_Files_Created.png  
and /dev/null differ

Index: Documentation/pictures/Learning_Win7_Log_File.png
diff --git a/Documentation/pictures/Learning_Win7_Log_File.png  
b/Documentation/pictures/Learning_Win7_Log_File.png

deleted file mode 100644
index  
4a68339d458d64c5269c5def063489526bca3abe..
Binary files a/Documentation/pictures/Learning_Win7_Log_File.png and  
/dev/null differ

Index: Documentation/pictures/Learning_Win7_New_Menu.png
diff --git a/Documentation/pictures/Learning_Win7_New_Menu.png  
b/Documentation/pictures/Learning_Win7_New_Menu.png

deleted file mode 100644
index  
eebabd4eb570943d343bb735877a4238db0352ff..
Binary files a/Documentation/pictures/Learning_Win7_New_Menu.png and  
/dev/null differ

Index: Documentation/pictures/Learning_Win7_Open_Context_Menu.png
diff --git a/Documentation/pictures/Learning_Win7_Open_Context_Menu.png  
b/Documentation/pictures/Learning_Win7_Open_Context_Menu.png

deleted file mode 100644
index  
8e7d420ee6075af8611cf8b2353d7e9e1765668f..
Binary files a/Documentation/pictures/Learning_Win7_Open_Context_Menu.png  
and /dev/null differ

Index: Documentation/pictures/Learning_Win7_Open_Dragndrop.png
diff --git a/Documentation/pictures/Learning_Win7_Open_Dragndrop.png  
b/Documentation/pictures/Learning_Win7_Open_Dragndrop.png

deleted file mode 100644
index  
2df9b1714c0fc62cf8e864c3dc62c9d7a2ea6396..
Binary files a/Documentation/pictures/Learning_Win7_Open_Dragndrop.png and  
/dev/null differ

Index: Documentation/pictures/Learning_Win7_Open_Menu.png
diff --git a/Documentation/pictures/Learning_Win7_Open_Menu.png  
b/Documentation/pictures/Learning_Win7_Open_Menu.png

deleted file mode 100644
index  
68cdcb44c351a81481f6c67f9050163680e30b5d..
Binary files a/Documentation/pictures/Learning_Win7_Open_Menu.png and  
/dev/null differ

Index: Documentation/pictures/Learning_Win7_Pdf_Output.png
diff --git a/Documentation/pictures/Learning_Win7_Pdf_Output.png  
b/Documentation/pictures/Learning_Win7_Pdf_Output.png

deleted file mode 100644
index  
57190f3255468bbe3e77600b5f3a7a907bb55135..
Binary files a/Documentation/pictures/Learning_Win7_Pdf_Output.png and  
/dev/null differ

Index: Documentation/pictures/Learning_Win7_Save_File_With_Name.png
diff --git a/Documentation/pictures/Learning_Win7_Save_File_With_Name.png  
b/Documentation/pictures/Learning_Win7_Save_File_With_Name.png

deleted file mode 100644
index  
ba605da09da076dc3badca672236185de29022fb..
Binary files a/Documentation/pictures/Learning_Win7_Save_File_With_Name.png  
and /dev/null differ

Index: Documentation/pictures/Learning_Win7_Save_Menu.png
diff --git a/Documentation/pictures/Learning_Win7_Save_Menu.png  
b/Documentation/pictures/Learning_Win7_Save_Menu.png

deleted file mode 100644
index  
f9b3dd759bc98e407e746760f82768bbced728e7..
Binary files a/Documentation/pictures/Learning_Win7_Save_Menu.png and  
/dev/null differ

Index: Documentation/pictures/Learning_Win7_Welcome_File_Whole.png
diff --git a/Documentation/pictures/Learning_Win7_Welcome_File_Whole.png  

Re: Increase tagline spacing (Issue 3214) (issue 12562050)

[PhilEHolmes]

Updating 2 regtests to prevent new overflow.  Overflow would be
expected, so allowing one regtest to compress a little more by using
lyrics with smaller vertical extent, and getting rid of the tagline on
the other, which is not really appropriate for paper of this size.

https://codereview.appspot.com/12562050/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Increase tagline spacing (Issue 3214) (issue 12562050)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
Spacing from the tagline to any text is far too small to be pleasing.
This patch increases it to be far more reasonable.

Please review this at https://codereview.appspot.com/12562050/

Affected files:
  M ly/titling-init.ly


Index: ly/titling-init.ly
diff --git a/ly/titling-init.ly b/ly/titling-init.ly
index  
546efac4fac66106297b1cc99432ca9a0e44430f..373a955c9d27a76663b81108f4866baf4bb57a5f  
100644

--- a/ly/titling-init.ly
+++ b/ly/titling-init.ly
@@ -12,6 +12,7 @@ tagline = \markup {

   #http://lilypond.org/;
   \line {
+\vspace #1.5

 %% 2014 = em dash.




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Increase tagline spacing (Issue 3214) (issue 12562050)

[PhilEHolmes]

Alterntive spacing mechanism - please review.

https://codereview.appspot.com/12562050/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Adds bar line section to LM (Issue 3408) (issue 12724043)

[PhilEHolmes]

Reviewers: Trevor Daniels,

Message:
Please review.

Description:
Adds bar line section to LM (Issue 3408)

Please review this at https://codereview.appspot.com/12724043/

Affected files:
  M Documentation/learning/common-notation.itely


Index: Documentation/learning/common-notation.itely
diff --git a/Documentation/learning/common-notation.itely  
b/Documentation/learning/common-notation.itely
index  
55f91d66734d83c07e88ce59a3633cb05c161c78..4e5753f24f3275c5cf072b2af4031b0a339d489c  
100644

--- a/Documentation/learning/common-notation.itely
+++ b/Documentation/learning/common-notation.itely
@@ -51,7 +51,7 @@ This section introduces common notation that is used for  
one voice

 on one staff.

 @menu
-* Bar checks::
+* Bar lines and bar checks::
 * Accidentals and key signatures::
 * Ties and slurs::
 * Articulation and dynamics::
@@ -61,8 +61,23 @@ on one staff.
 @end menu


-@node Bar checks
-@subsection Bar checks
+@node Bar lines and bar checks
+@subsection Bar lines and bar checks
+
+@subheading Bar lines
+
+Single bar lines are automatically placed in the music so
+there is no need to add them manually.  Other types of bar
+lines are added using @code{\bar}, for example
+@code{\bar ||} for a double bar line, or @code{\bar |.}
+for an ending bar line.  For a full list of bar lines see
+the @ruser{Bar lines}.
+
+@lilypond[verbatim,quote,relative=2]
+g1 e1 \bar || c2. c'4 \bar |.
+@end lilypond
+
+@subheading Bar checks

 Though not strictly necessary, @emph{bar checks} should be
 used in the input code to show where bar lines are expected



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Fixes bounding boxes for breves, improves longas (Issue 3480) (issue 12030043)

[PhilEHolmes]

Reviewers: wl_gnu.org,

Message:
Please review

Description:
Fixes bounding boxes for breves, improves longas (Issue 3480)

Please review this at https://codereview.appspot.com/12030043/

Affected files:
  M mf/feta-noteheads.mf


Index: mf/feta-noteheads.mf
diff --git a/mf/feta-noteheads.mf b/mf/feta-noteheads.mf
index  
d976b2df947dd3fcf00ca3aff66984e9eb6478eb..df433e98d22dfb48f9ea7ae701d8f83a15f76d62  
100644

--- a/mf/feta-noteheads.mf
+++ b/mf/feta-noteheads.mf
@@ -98,11 +98,6 @@ def draw_longa (expr up) =
draw_outside_ellipse (1.80, 0, 0.707, 0);
undraw_inside_ellipse (1.30, 125, 0.68, 2 stafflinethickness#);

-   set_char_box (stemthick#,
- width# + stemthick#,
- noteheight# / 2,
- noteheight# / 2);
-
pickup pencircle scaled stemthick;

% Longas of smaller design sizes should have their lines longer.
@@ -117,6 +112,11 @@ def draw_longa (expr up) =
quanted_line_length := max (0.77, line_length);
fi;

+   set_char_box (stemthick#,
+ width# + stemthick#,
+ staff_space# * quanted_line_length,
+ staff_space# * quanted_line_length);
+
final_line_length := quanted_line_length * staff_space;

if up:
@@ -200,11 +200,6 @@ def draw_brevis (expr linecount,  
line_thickness_multiplier) =

draw_outside_ellipse (1.80, 0, 0.707, 0);
undraw_inside_ellipse (1.30, 125, 0.68, 2 stafflinethickness#);

-   set_char_box (stemthick# * linecount + gap# * (linecount - 1),
- width# + stemthick# * linecount + gap# * (linecount - 1),
- noteheight# / 2,
- noteheight# / 2);
-
define_pixels (gap);
pickup pencircle scaled stemthick;

@@ -220,6 +215,11 @@ def draw_brevis (expr linecount,  
line_thickness_multiplier) =

quanted_line_length := max (0.77, line_length);
fi;

+   set_char_box (stemthick# * linecount + gap# * (linecount - 1),
+ width# + stemthick# * linecount + gap# * (linecount - 1),
+ staff_space# * quanted_line_length,
+ staff_space# * quanted_line_length);
+
bot y1 = -quanted_line_length * staff_space;
top y2 = quanted_line_length * staff_space;
rt x1 - fudge = 0;



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Vertical spacing tutorial (Issue 2809) (issue 11966043)

[PhilEHolmes]

Reviewers: Graham Percival, Trevor Daniels,

Message:
Please review

Description:
First stab at a vertical spacing tutorial (Issue 2809).  Passes make
doc.

Please review this at https://codereview.appspot.com/11966043/

Affected files:
  M Documentation/learning/tweaks.itely



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Corrections to LM (Issue 3407) (issue 11455046)

[PhilEHolmes]

Reviewers: Graham Percival, Trevor Daniels,

Message:
Please review.

Description:
A minor change to try to make the dynamics spacing section at least
accurate - ditto a small change on fingering placement.

Please review this at https://codereview.appspot.com/11455046/

Affected files:
  M Documentation/learning/tweaks.itely


Index: Documentation/learning/tweaks.itely
diff --git a/Documentation/learning/tweaks.itely  
b/Documentation/learning/tweaks.itely
index  
7d731aad7708905b680c7b490d1b516f6e225862..f01b0428b63bc6d96862d5c1edfcf3fb395f6cfc  
100644

--- a/Documentation/learning/tweaks.itely
+++ b/Documentation/learning/tweaks.itely
@@ -2351,7 +2351,7 @@ shows:

 @lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 \dynamicUp
-a4\f b\mf c\mp b\p
+a4\f b\mf a\mp b\p
 @end lilypond

 @noindent
@@ -2384,16 +2384,17 @@ These are properties of all grobs which support the

 By default, outside-staff objects are given a width of zero so
 that they may overlap in the horizontal direction.  This is done
-by the trick of adding infinity to the leftmost extent and
-minus infinity to the rightmost extent by setting the
-@code{extra-spacing-width} to @code{'(+inf.0 . -inf.0)}.  So
-to ensure they do not overlap in the horizontal direction we
-must override this value of @code{extra-spacing-width} to
-@code{'(0 . 0)} so the true width shines through.  This is
-the command to do this for dynamic text:
+by the trick of setting the leftmost extent to infinity and
+the rightmost extent to minus infinity by setting the
+@code{extra-spacing-width} to @code{'(+inf.0 . -inf.0)}.  To
+ensure they do not overlap in the horizontal direction we
+must override this value of @code{extra-spacing-width} to give them
+a little extra spacing.  The units are the space between two staff
+lines, so moving the left edge half a unit to the left and the
+right edge half a unit to the right should do it:

 @example
-\override DynamicText.extra-spacing-width = #'(0 . 0)
+\override DynamicText.extra-spacing-width = #'(-0.5 . 0.5)
 @end example

 @noindent
@@ -2402,31 +2403,12 @@ Let's see if this works in our previous example:
 @cindex DynamicText, example of overriding
 @cindex extra-spacing-width property, example

-@lilypond[quote,fragment,ragged-right,verbatim,relative=2]
-\dynamicUp
-\override DynamicText.extra-spacing-width = #'(0 . 0)
-a4\f b\mf c\mp b\p |
-@end lilypond
-
-@noindent
-Well, it has certainly stopped the dynamic marks being
-displaced, but two problems remain.  The marks should be
-spaced a little further apart and it would be better
-if they were all the same distance from the staff.
-We can solve the first problem easily.  Instead of making
-the @code{extra-spacing-width} zero we could add a little
-more to it.  The units are the space between two staff
-lines, so moving the left edge half a unit to the left and the
-right edge half a unit to the right should do it:
-
-@cindex DynamicText, example of overriding
-@cindex extra-spacing-width property, example

 @lilypond[quote,fragment,ragged-right,verbatim,relative=2]
 \dynamicUp
 % Extend width by 1 staff space
 \override DynamicText.extra-spacing-width = #'(-0.5 . 0.5)
-a4\f b\mf c\mp b\p
+a4\f b\mf a\mp b\p
 @end lilypond

 @noindent
@@ -2808,15 +2790,15 @@ example taken from the previous section:
 \override DynamicText.extra-spacing-width = #'(-0.5 . 0.5)
 % Align dynamics to a base line 2 units above staff
 \override DynamicLineSpanner.staff-padding = #2
-a4\f b\mf c\mp b\p
+a4\f b\mf a\mp b\p
 @end lilypond


 @node The self-alignment-X property
 @unnumberedsubsubsec The @code{self-alignment-X} property

-The following example shows how this can resolve the collision
-of a string fingering object with a note's stem by aligning the
+The following example shows how to adjust the position
+of a string fingering object with reference to a note's stem by aligning  
the

 right edge with the reference point of the parent note:

 @cindex StringNumber, example of overriding



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Issue 3451: anacrucis - anacrusis. (issue 11014044)

[PhilEHolmes]

LGTM

https://codereview.appspot.com/11014044/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Fix some oversights of \layout in \book (issue 10794044)

[PhilEHolmes]

LGTM



https://codereview.appspot.com/10794044/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

15:12:19 (UTC) Begin LilyPond compile, previous commit at   
52b2991eb4ecb24cbdc5fbdde59e04f1bd80f4b3
15:12:30 From ssh://git.sv.gnu.org/srv/git/lilypond
   7598824..b4a0633  master - origin/master
   3bbd487..000f14a  release/unstable - origin/release/unstable
   52b2991..c791c16  staging- origin/staging
   f52c66a..e6e64de  translation - origin/translation
 * [new tag] release/2.17.21-1 - release/2.17.21-1
15:12:33 Merged staging, now at:c791c16d2fe9dae0f0ce564b1c28d80a1a728ff2
15:12:34Success:./autogen.sh --noconfigure
15:12:46Success:
/home/patchy/patchybuild/autobuild/configure --disable-optimising
15:12:50Success:nice make clean
15:13:50Success:nice make -j9 CPU_COUNT=9 -s
15:16:00Success:nice make test -j9 CPU_COUNT=9 -s
15:19:05 *** FAILED BUILD ***
nice make doc -j9 CPU_COUNT=9 -s
Previous good commit:   12e1a760b52addfcb209c1caa07f297d5197c8d6
Current broken commit:  c791c16d2fe9dae0f0ce564b1c28d80a1a728ff2
15:19:05 *** FAILED STEP ***
merge from staging
Failed runner: nice make doc -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-doc--j9-CPU_COUNT=9--s.txt
15:19:05 Traceback (most recent call last):
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 523, in handle_staging
self.build (issue_id=issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 328, in build
issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 266, in runner
raise FailedCommand (Failed runner: %s\nSee the log file %s % (command, 
this_logfilename))
FailedCommand: Failed runner: nice make doc -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-doc--j9-CPU_COUNT=9--s.txt

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Make format for key changes consistent; minor formatting corrections for affected regtests (issue 10868043)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
Following my NR updates, David identified other places where there is no
space between the key signature and the \major or \minor.  It's not an
error, but it is inconsistent, so this addresses the inconsistency.  It
also fixes the formatting on some of the affected regression tests.
Passes make doc and make test.

Please review this at https://codereview.appspot.com/10868043/

Affected files:
  M Documentation/changes.tely
  M Documentation/included/engraver-example.ily
  M Documentation/notation/input.itely
  M Documentation/notation/pitches.itely
  M input/regression/accidental-clef-change.ly
  M input/regression/clip-systems.ly
  M input/regression/grace-sync.ly
  M input/regression/key-signature-space.ly
  M input/regression/tuplet-full-length.ly


Index: Documentation/changes.tely
diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index  
683cdb54fc88e62d6c63f9121911e46d31420160..419dad0e81ca638476c8d33abbe33f3b35e46fa5  
100644

--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -317,10 +317,10 @@ than their traditional positions, or in multiple  
octaves.

 @lilypond[quote,relative=0]
 \override Staff.KeySignature #'flat-positions = #'((-5 . 5))
 \override Staff.KeyCancellation #'flat-positions = #'((-5 . 5))
-\clef bass \key es\major es g bes d
-\clef treble \bar || \key es\major es g bes d
+\clef bass \key es \major es g bes d
+\clef treble \bar || \key es \major es g bes d
 \override Staff.KeySignature #'sharp-positions = #'(2)
-\bar || \key d\major b fis b2
+\bar || \key d \major b fis b2
 @end lilypond

 @end itemize
Index: Documentation/included/engraver-example.ily
diff --git a/Documentation/included/engraver-example.ily  
b/Documentation/included/engraver-example.ily
index  
e9278d3e52c72fb69f0e383f92d83879d2a30dff..548742e14fc513836159b7c963263b155df1e4e2  
100644

--- a/Documentation/included/engraver-example.ily
+++ b/Documentation/included/engraver-example.ily
@@ -1,7 +1,7 @@
 %% texidoc = Include file for engraver example.
 \version 2.16.0
 topVoice =  \relative c' {
-  \key d\major
+  \key d \major
   es8([ g] a[ fis])
   b4
   b16[-. b-. b-. cis-.]
@@ -9,7 +9,7 @@ topVoice =  \relative c' {
 }

 botVoice =  \relative c' {
-  \key d\major
+  \key d \major
   c8[( f] b[ a)]
   es4
   es16[-. es-. es-. fis-.]
Index: Documentation/notation/input.itely
diff --git a/Documentation/notation/input.itely  
b/Documentation/notation/input.itely
index  
80cdd1794c53b33d6a1ad37d172be4faaa668b33..c7a5142f10b0eee617c8fd5c80109100b0a5ca86  
100644

--- a/Documentation/notation/input.itely
+++ b/Documentation/notation/input.itely
@@ -1470,7 +1470,7 @@ context.
 \footnote #'(-0.5 . 1) Bar line Staff.BarLine
 q q
 \footnote #'(0.5 . -1) Key change Staff.KeySignature
-\key c\minor
+\key c \minor
 q
   }
 }
Index: Documentation/notation/pitches.itely
diff --git a/Documentation/notation/pitches.itely  
b/Documentation/notation/pitches.itely
index  
d2c9171fd8ec6ff780b1ed1c9bd82b70cb1abbb4..66be5908a99c326129cd73416e96141e3398c5aa  
100644

--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -1330,11 +1330,11 @@ position.
 @lilypond[verbatim, quote,relative=0]
 \override Staff.KeySignature.flat-positions = #'((-5 . 5))
 \override Staff.KeyCancellation.flat-positions = #'((-5 . 5))
-\clef bass \key es\major es g bes d
-\clef treble \bar || \key es\major es g bes d
+\clef bass \key es \major es g bes d
+\clef treble \bar || \key es \major es g bes d

 \override Staff.KeySignature.sharp-positions = #'(2)
-\bar || \key b\major b fis b2
+\bar || \key b \major b fis b2
 @end lilypond

 @snippets
@@ -1486,7 +1486,7 @@ to a B-flat clarinet.

 @lilypond[verbatim,quote]
 flute = \relative c'' {
-  \key f\major
+  \key f \major
   \cueDuring #clarinet #DOWN {
 R1 _\markup\tiny clarinet
 c4 f e d
Index: input/regression/accidental-clef-change.ly
diff --git a/input/regression/accidental-clef-change.ly  
b/input/regression/accidental-clef-change.ly
index  
44200865653bde0e17f47ce48edb3bd070452bd7..bab45b8d9342c7fc27a3c79acab3901f45a9ae11  
100644

--- a/input/regression/accidental-clef-change.ly
+++ b/input/regression/accidental-clef-change.ly
@@ -9,10 +9,10 @@

 \version 2.16.0
 \new Staff \relative c' {
-\key g\major
-\clef treble
-cis dis f
-\clef bass
-c dis fis
+  \key g \major
+  \clef treble
+  cis dis f
+  \clef bass
+  c dis fis
 }

Index: input/regression/clip-systems.ly
diff --git a/input/regression/clip-systems.ly  
b/input/regression/clip-systems.ly
index  
24cb829c422563eef542147a7b3fba76ff1dc64b..5757b9c8a7e4f678abe4323692979dbb518ab72d  
100644

--- a/input/regression/clip-systems.ly
+++ b/input/regression/clip-systems.ly
@@ -31,13 +31,13 @@ origScore = \score{
   d
   \grace c16
   e1
-  \key d\major
-
+  \key d \major
+
   f
   \break  \clef bass
   g,
   fis
-}
+}
 }

 \book {
Index: 

Updates to NR chapter 5 (issue 10813044)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
My final patch of this set.  Mostly formatting niggles.

Please review this at https://codereview.appspot.com/10813044/

Affected files:
  M Documentation/notation/changing-defaults.itely


Index: Documentation/notation/changing-defaults.itely
diff --git a/Documentation/notation/changing-defaults.itely  
b/Documentation/notation/changing-defaults.itely
index  
edae3236e0561ca86418855f24816a3849ffeedc..7b54ca26e1bea5f1e7fb057530d96b1abcdae746  
100644

--- a/Documentation/notation/changing-defaults.itely
+++ b/Documentation/notation/changing-defaults.itely
@@ -429,7 +429,6 @@ Alternatively, variables may be employed to similar  
effect.  See

 @rlearning{Organizing pieces with variables}.

 @item
-
 @code{\context} with no name will match the first of any previously
 created contexts of the same type in the same context heirarchy,
 even one that has been given a name, and its music expression will be
@@ -472,7 +471,6 @@ musical content.  If a single context is to be  
modified, a @code{\with}

 block must be used, see @ref{Changing just one specific context}.

 @seealso
-
 Learning Manual:
 @rlearning{Organizing pieces with variables}.

@@ -721,14 +719,16 @@ time signature.
 \new Staff \with {
   \consists Timing_translator
   \consists Default_bar_line_engraver
-} {
+}
+\relative c'' {
 \time 3/4
 c4 c c c c c
 }
   \new Staff \with {
 \consists Timing_translator
 \consists Default_bar_line_engraver
-  } {
+  }
+  \relative c'' {
   \time 2/4
   c4 c c c c c
   }
@@ -953,10 +953,8 @@ must be placed immediately after the @code{\new}  
@var{context-type}

 command:

 @example
-\new Staff
-\with @{
-  [context settings for this context instance only]
-@} @{
+\new Staff \with @{ [context settings for this context instance only] @}
+@{
   @dots{}
 @}
 @end example
@@ -970,10 +968,7 @@ An @code{\override} command, but with the context name  
omitted

 @lilypond[quote,verbatim]
 \score {
   \new Staff {
-\new Voice
-\with {
-  \override Stem.thickness = #4.0
-}
+\new Voice \with { \override Stem.thickness = #4.0 }
 {
   \relative c'' {
 a4^Thick stems a a a
@@ -996,10 +991,8 @@ Directly setting a context property
 a4 a a a
   }
 }
-\new Staff
-\with {
-  fontSize = #-4
-} {
+\new Staff \with { fontSize = #-4 }
+{
   \relative c'' {
 a4^Smaller font a a a
 a4 a a a
@@ -1023,11 +1016,9 @@ A predefined command such as @code{\dynamicUp}
 }
   }
 }
-\new Staff
-\with { \accidentalStyle dodecaphonic }
+\new Staff \with { \accidentalStyle dodecaphonic }
 {
-  \new Voice
-  \with { \dynamicUp }
+  \new Voice \with { \dynamicUp }
   {
 \relative c'' {
   a4^Dynamics above a a a
@@ -2853,11 +2844,11 @@ Works not at all for:
 @end ignore

 @lilypond[verbatim,quote,relative=2]
-a~a
+a~ a
 a
 % increase the length of the tie
 -\tweak minimum-length #5
-~a
+~ a
 @end lilypond

 @lilypond[verbatim,quote,relative=2]
@@ -2881,15 +2872,15 @@ This override can also be used to increase the  
length of slurs and

 phrasing slurs:

 @lilypond[verbatim,quote,relative=2]
-a( a)
+a( g)
 a
 -\tweak minimum-length #5
-( a)
+( g)

-a\( a\)
+a\( g\)
 a
 -\tweak minimum-length #5
-\( a\)
+\( g\)
 @end lilypond

 For some layout objects, the @code{minimum-length} property becomes
@@ -4453,12 +,12 @@ padText =
  \once \override TextScript.padding = #padding
#})

-\relative c''' {
+\relative c'' {
   c4^piu mosso b a b
   \padText #1.8
-  c4^piu mosso d e f
+  c4^piu mosso b a b
   \padText #2.6
-  c4^piu mosso fis a g
+  c4^piu mosso b a b
 }
 @end lilypond




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Updates to NR sections 3 and 4 (issue 10782045)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
There's a fair number of changes here: generally they fall into 2 camps:
1) changing paper size to make the example display properly and 2)
closing up examples with too many line breaks or restated note values.
There are also a few over-long lines with breaks put in them.  Passes
make doc.  Really needs checking with the PDF NR to show the benefits.

Please review this at https://codereview.appspot.com/10782045/

Affected files:
  M Documentation/notation/input.itely
  M Documentation/notation/spacing.itely



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Updates to NR chapter 2 (issue 10543044)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
2nd tranche of proposed changes to the NR.

Please review this at https://codereview.appspot.com/10543044/

Affected files:
  M Documentation/notation/ancient.itely
  M Documentation/notation/chords.itely
  M Documentation/notation/fretted-strings.itely
  M Documentation/notation/vocal.itely
  M Documentation/notation/wind.itely


Index: Documentation/notation/ancient.itely
diff --git a/Documentation/notation/ancient.itely  
b/Documentation/notation/ancient.itely
index  
0dbcffaa327048a136f371c8e314bd5ec5c0b9f6..431966679a8b5342947c57c75f0c783b25aed6f0  
100644

--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -556,34 +556,35 @@ to particular time fractions.  In other words, to get  
a particular mensuration s

 {
   \set Score.timing = ##f
   \set Score.barAlways = ##t
-  s_\markup { \\time 4/4 }^\markup { \musicglyph
+  \textLengthOn
+  s^\markup { \\time 4/4 }_\markup { \musicglyph
 #timesig.neomensural44 }
   s
-  s_\markup { \\time 2/2 }^\markup { \musicglyph
+  s^\markup { \\time 2/2 }_\markup { \musicglyph
 #timesig.neomensural22 }
   s
-  s_\markup { \\time 6/4 }^\markup { \musicglyph
+  s^\markup { \\time 6/4 }_\markup { \musicglyph
 #timesig.neomensural64 }
   s
-  s_\markup { \\time 6/8 }^\markup { \musicglyph
+  s^\markup { \\time 6/8 }_\markup { \musicglyph
 #timesig.neomensural68 }
   \break
-  s_\markup { \\time 3/2 }^\markup { \musicglyph
+  s^\markup { \\time 3/2 }_\markup { \musicglyph
 #timesig.neomensural32 }
   s
-  s_\markup { \\time 3/4 }^\markup { \musicglyph
+  s^\markup { \\time 3/4 }_\markup { \musicglyph
 #timesig.neomensural34 }
   s
-  s_\markup { \\time 9/4 }^\markup { \musicglyph
+  s^\markup { \\time 9/4 }_\markup { \musicglyph
 #timesig.neomensural94 }
   s
-  s_\markup { \\time 9/8 }^\markup { \musicglyph
+  s^\markup { \\time 9/8 }_\markup { \musicglyph
 #timesig.neomensural98 }
   \break
-  s_\markup { \\time 4/8 }^\markup { \musicglyph
+  s^\markup { \\time 4/8 }_\markup { \musicglyph
 #timesig.neomensural48 }
   s
-  s_\markup { \\time 2/4 }^\markup { \musicglyph
+  s^\markup { \\time 2/4 }_\markup { \musicglyph
 #timesig.neomensural24 }
 }
 @end lilypond
Index: Documentation/notation/chords.itely
diff --git a/Documentation/notation/chords.itely  
b/Documentation/notation/chords.itely
index  
80f716bd1b82aed00cfca5a1447c0358c250aa91..b1a24f21184fd0e76594df878538064da44463f4  
100644

--- a/Documentation/notation/chords.itely
+++ b/Documentation/notation/chords.itely
@@ -438,21 +438,20 @@ Chords can be entered as simultaneous notes or  
through the use of

 chord mode.  The displayed chord name will be the same, regardless
 of the mode of entry, unless there are inversions or added bass notes:

-@lilypond[verbatim,quote,relative=1]
+@lilypond[verbatim,quote]
+chordmusic = \relative c'{
+  c e g2 f bes c
+  f c' e g1
+  \chordmode {
+c2 f:sus4 c1:/f
+  }
+}
 
   \new ChordNames {
-c e g2  f bes c
-f c' e g1
-\chordmode {
-  c2 f:sus4 c1:/f
-}
+\chordmusic
   }
   {
-c e g2  f bes c
-f, c' e g1
-\chordmode {
-  c2 f:sus4 c1:/f
-}
+\chordmusic
   }
 
 @end lilypond
Index: Documentation/notation/fretted-strings.itely
diff --git a/Documentation/notation/fretted-strings.itely  
b/Documentation/notation/fretted-strings.itely
index  
2d791de85bb6ccba41c8014b87552e99397c666b..e415158c1e9d65f1ebac46e1782b542fe322ddd8  
100644

--- a/Documentation/notation/fretted-strings.itely
+++ b/Documentation/notation/fretted-strings.itely
@@ -1396,7 +1396,7 @@ the interface properties belong to  
@code{FretBoards.FretBoard}.

 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {defining-predefined-fretboards-for-other-instruments.ly}

-@lilypondfile[verbatim,quote,texidoc,doctitle]
+@lilypondfile[verbatim,quote,texidoc,doctitle,ragged-right]
 {chordchanges-for-fretboards.ly}

 @lilypondfile[verbatim,quote,texidoc,doctitle]
Index: Documentation/notation/vocal.itely
diff --git a/Documentation/notation/vocal.itely  
b/Documentation/notation/vocal.itely
index  
3d082ce8293da5e1d0e8c79097f905fd78928ec8..ea9581171485c6dce87649fed90b76d7a5087327  
100644

--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -383,7 +383,7 @@ the named Voice context containing the melody with
 @lilypond[quote,verbatim,relative=2]
 
   \new Voice = melody {
-a4 a a a
+a1 a4. a8 a2
   }
   \new Lyrics \lyricsto melody {
 These are the words
@@ -596,11 +596,16 @@ spaces between the syllables, you can surround the  
phrase with

 quotes or use a @code{_} character.  Alternatively, you can use
 the tilde symbol (@code{~}) to get a lyric tie.

-@lilypond[quote,ragged-right,verbatim]
+@lilypond[quote,ragged-right,verbatim,relative=2]
 {
-  \relative c'' { \autoBeamOff
-r8 b c 

Adds version number to web page side bar (Issue 3367) (issue 10506043)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
Adds version number to web page side bar (Issue 3367)

Please review this at https://codereview.appspot.com/10506043/

Affected files:
  M Documentation/lilypond-texi2html.init
  M python/auxiliar/postprocess_html.py


Index: Documentation/lilypond-texi2html.init
diff --git a/Documentation/lilypond-texi2html.init  
b/Documentation/lilypond-texi2html.init
index  
928366317d497e3420a050f3ccaab3d0e65c0068..1cc6671c330348829bab3935e7d8a7027debaae2  
100644

--- a/Documentation/lilypond-texi2html.init
+++ b/Documentation/lilypond-texi2html.init
@@ -1682,7 +1682,7 @@ sub lilypond_print_toc_div ($$)

   print $fh 'h4 class=toc_header ' . $anchor('',
 $Texi2HTML::HREF{'Top'},
-$topname,
+$topname .  !-- Sidebar Version Tag   
-- ,

 'title=Start of the manual'
) . /h4\n;
 }
Index: python/auxiliar/postprocess_html.py
diff --git a/python/auxiliar/postprocess_html.py  
b/python/auxiliar/postprocess_html.py
index  
538f79a7988d8142241fd8124e79db6c95b4370e..d9a91fa37a8738afe62e3662e1482319796914b6  
100644

--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -57,6 +57,7 @@ web_footer = '''
 footer_name_version = _doc ('This page is  
for %(package_name)s-%(package_version)s (%(branch_str)s).')
 # ugh, must not have _doc in strings because it is naively replaced  
with _ in hacked gettext process
 footer_report_links = _doc ('We welcome your aid; please a  
href=%(help_us_url)shelp us/a by reporting errors to our a  
href=%(mail_address_url)sbug list/a.')

+sidebar_version = _doc (' V%(package_version)s (%(branch_str)s).')


 mail_address  
= 'http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'

@@ -363,6 +364,9 @@ def process_html_files (package_name = '',
 s = s.replace ('%', '%%')
 s = hack_urls (s, prefix, target, bool (int  
(versiontup[1]) %  2))

 s = add_header (s, prefix)
+
+### add sidebar information
+s = s.replace ('!-- Sidebar Version Tag  --',  
sidebar_version)


 ### add footer
 if footer_tag_re.search (s) == None:



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Updates to NR chapter 1 (issue 10237048)

[PhilEHolmes]

Reviewers: ,

Message:
Please review.

Description:
A set of minor changes to tidy up the NR somewhat.  (Note that there are
a number of others that will come from updated snippets in the LSR).

Please review this at https://codereview.appspot.com/10237048/

Affected files:
  M Documentation/notation/expressive.itely
  M Documentation/notation/pitches.itely
  M Documentation/notation/rhythms.itely
  M Documentation/notation/simultaneous.itely
  M Documentation/notation/text.itely


Index: Documentation/notation/expressive.itely
diff --git a/Documentation/notation/expressive.itely  
b/Documentation/notation/expressive.itely
index  
7a9867dc6fcb77ce700f0bcbe0044b9ba226d750..d1a4ad7fe0b9a583b1c7ea4fdb4678d0f8c6fe52  
100644

--- a/Documentation/notation/expressive.itely
+++ b/Documentation/notation/expressive.itely
@@ -1265,8 +1265,8 @@ It is not possible to mix connected arpeggios and  
unconnected

 arpeggios in one @code{PianoStaff} at the same point in
 time.

-The parenthesis-style arpeggio brackets do not work for
-cross-staff arpeggios.
+The simple way of setting parenthesis-style arpeggio brackets does not  
work for

+cross-staff arpeggios; see @ref{Cross-staff stems}.


 @node Trills
Index: Documentation/notation/pitches.itely
diff --git a/Documentation/notation/pitches.itely  
b/Documentation/notation/pitches.itely
index  
a090078a221822306f30872c2fb3903b9405f2c6..3b8622e3f1ffa65caa80b3d4425b74cf221fea58  
100644

--- a/Documentation/notation/pitches.itely
+++ b/Documentation/notation/pitches.itely
@@ -404,7 +404,7 @@ cis cis cis! cis? c c c! c?
 Accidentals on tied notes are only printed at the beginning of a
 new system:

-@lilypond[verbatim,quote,relative=2]
+@lilypond[verbatim,quote,relative=2,ragged-right]
 cis1~ cis~
 \break
 cis
@@ -1313,7 +1313,7 @@ freygish = #`((0 . ,NATURAL) (1 . ,FLAT)  
(2 . ,NATURAL)

 (3 . ,NATURAL) (4 . ,NATURAL) (5 . ,FLAT) (6 . ,FLAT))

 \relative c' {
-  \key c\freygish c4 des e f
+  \key c \freygish c4 des e f
   \bar || \key d\freygish d es fis g
 }
 @end lilypond
Index: Documentation/notation/rhythms.itely
diff --git a/Documentation/notation/rhythms.itely  
b/Documentation/notation/rhythms.itely
index  
a9acae8e84bb07b2d6af1a35075f470a382a2a64..d8901517fc1e5ad86ae81f5876abd0375bf08bef  
100644

--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -1345,13 +1345,16 @@ to prevent tempo indications from overlapping, and  
@code{\markLengthOff}

 restores the default behavior of ignoring tempo marks
 for horizontal spacing.

-@lilypond[quote,relative=0]
+@lilypond[verbatim,quote,relative=0]
 \compressFullBarRests
 \markLengthOn
 \tempo Molto vivace
 R1*12
 \tempo Meno mosso
 R1*16
+\markLengthOff
+\tempo Tranquillo
+R1*20
 @end lilypond

 @snippets
@@ -2731,7 +2734,7 @@ a1

 Additionally, a bar line can be printed as a simple tick:
 @lilypond[quote,relative=1,verbatim]
-f1 \bar '
+f1 \bar ' g1
 @end lilypond
 However, as such ticks are typically used in Gregorian chant, it is
 preferable to use @code{\divisioMinima} there instead, described in
Index: Documentation/notation/simultaneous.itely
diff --git a/Documentation/notation/simultaneous.itely  
b/Documentation/notation/simultaneous.itely
index  
62ce5461ce46e6b4d922d3ed89064380d509c422..27d8e9e36b77fd8264efe9a77d64d8e0c3225ed6  
100644

--- a/Documentation/notation/simultaneous.itely
+++ b/Documentation/notation/simultaneous.itely
@@ -681,8 +681,7 @@ in bar 2, where the automatic merging fails.
 
 @end lilypond

-Notes with different note heads may be merged, with the
-exception of half-note heads and quarter-note heads, as shown
+Notes with different note heads may be merged as shown
 below.  Here the note heads on beat 1 of bar 1 are now merged:

 @lilypond[quote,verbatim,relative=2]
@@ -702,6 +701,9 @@ below.  Here the note heads on beat 1 of bar 1 are now  
merged:

 
 @end lilypond

+Quarter and half notes are not merged in this way, since it would be  
difficult

+to tell them apart.
+
 Note heads with different dots as shown in beat 3 of bar 1 may be
 also be merged:

Index: Documentation/notation/text.itely
diff --git a/Documentation/notation/text.itely  
b/Documentation/notation/text.itely
index  
82c7a209a3476f2a6f1f5535d172fb835f7fc595..89c82c7d217f4b4cc936ed19681c25c0b6c921f5  
100644

--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -261,7 +261,7 @@ bar, they can be placed above the bar line or between  
notes.  When

 specified at a line break, the mark will be printed at the beginning of
 the next line.

-@lilypond[quote,verbatim,relative=2]
+@lilypond[quote,verbatim,relative=2,ragged-right]
 \mark Allegro
 c1 c
 \mark assai \break



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

23:48:36 (UTC) Begin LilyPond compile, previous commit at   
c3fe361fb560eefdad073bec49dc2923c536b9eb
23:48:46 From ssh://git.sv.gnu.org/srv/git/lilypond
   83b0787..7598824  master - origin/master
   b44050a..3bbd487  release/unstable - origin/release/unstable
   c3fe361..52b2991  staging- origin/staging
   ef282e9..f52c66a  translation - origin/translation
 * [new tag] release/2.17.20-1 - release/2.17.20-1
23:48:49 Merged staging, now at:52b2991eb4ecb24cbdc5fbdde59e04f1bd80f4b3
23:48:50Success:./autogen.sh --noconfigure
23:49:04Success:
/home/patchy/patchybuild/autobuild/configure --disable-optimising
23:49:08Success:nice make clean
23:50:07Success:nice make -j9 CPU_COUNT=9 -s
23:52:15Success:nice make test -j9 CPU_COUNT=9 -s
23:55:19 *** FAILED BUILD ***
nice make doc -j9 CPU_COUNT=9 -s
Previous good commit:   12e1a760b52addfcb209c1caa07f297d5197c8d6
Current broken commit:  52b2991eb4ecb24cbdc5fbdde59e04f1bd80f4b3
23:55:19 *** FAILED STEP ***
merge from staging
Failed runner: nice make doc -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-doc--j9-CPU_COUNT=9--s.txt
23:55:19 Traceback (most recent call last):
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 523, in handle_staging
self.build (issue_id=issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 328, in build
issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 266, in runner
raise FailedCommand (Failed runner: %s\nSee the log file %s % (command, 
this_logfilename))
FailedCommand: Failed runner: nice make doc -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-doc--j9-CPU_COUNT=9--s.txt

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Fixes problem with -dpreview cropping staff brackets (Issue 3386) (issue 9894043)

[PhilEHolmes]

Reviewers: ,

Message:
Please review.

Description:
This is a simple revert of the problematic lines in the original commit
- I've not done any study as to why these are the problem, but this
change makes -dpreview function as it should once again when there are
braces and brackets present.  I've pixel-compared and the only change is
a very minor shift in the bar number on beam-broken-difficult.ly

Please review this at https://codereview.appspot.com/9894043/

Affected files:
  M scm/define-grobs.scm


Index: scm/define-grobs.scm
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index  
a810dcf1c68b41c7360fd7bc2ce54bff46d97449..bc4cf6ff4ad003f66b44b2b83ac4a5895ba99659  
100644

--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2250,7 +2250,6 @@
(collapse-height . 5.0)
(direction . ,LEFT)

-   (cross-staff . #t)
;; ugh--hardcoded.
(padding . -0.1)  ;; bar must cover rounded ending of staff line.
(stencil . ,ly:system-start-delimiter::print)
@@ -2267,7 +2266,6 @@
(collapse-height . 5.0)
(direction . ,LEFT)
(font-encoding . fetaBraces)
-   (cross-staff . #t)
(padding . 0.3)
(stencil . ,ly:system-start-delimiter::print)
(style . brace)
@@ -2282,7 +2280,6 @@
  . (
(collapse-height . 5.0)
(direction . ,LEFT)
-   (cross-staff . #t)
(padding . 0.8)
(stencil . ,ly:system-start-delimiter::print)
(style . bracket)
@@ -2297,7 +2294,6 @@
 (SystemStartSquare
  . (
(direction . ,LEFT)
-   (cross-staff . #t)
(stencil . ,ly:system-start-delimiter::print)
(style . line-bracket)
(thickness . 1.0)



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

07:41:03 (UTC) Begin LilyPond compile, previous commit at   
12e1a760b52addfcb209c1caa07f297d5197c8d6
07:41:20 From ssh://git.sv.gnu.org/srv/git/lilypond
   12e1a76..83b0787  master - origin/master
   3575512..b44050a  release/unstable - origin/release/unstable
   12e1a76..c3fe361  staging- origin/staging
   94345c6..ef282e9  translation - origin/translation
 * [new tag] release/2.17.19-1 - release/2.17.19-1
07:41:26 Merged staging, now at:c3fe361fb560eefdad073bec49dc2923c536b9eb
07:41:27Success:./autogen.sh --noconfigure
07:41:41Success:
/home/patchy/patchybuild/autobuild/configure --disable-optimising
07:41:45Success:nice make clean
07:42:46Success:nice make -j9 CPU_COUNT=9 -s
07:44:56Success:nice make test -j9 CPU_COUNT=9 -s
07:48:07 *** FAILED BUILD ***
nice make doc -j9 CPU_COUNT=9 -s
Previous good commit:   12e1a760b52addfcb209c1caa07f297d5197c8d6
Current broken commit:  c3fe361fb560eefdad073bec49dc2923c536b9eb
07:48:07 *** FAILED STEP ***
merge from staging
Failed runner: nice make doc -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-doc--j9-CPU_COUNT=9--s.txt
07:48:07 Traceback (most recent call last):
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 523, in handle_staging
self.build (issue_id=issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 328, in build
issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 266, in runner
raise FailedCommand (Failed runner: %s\nSee the log file %s % (command, 
this_logfilename))
FailedCommand: Failed runner: nice make doc -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-doc--j9-CPU_COUNT=9--s.txt

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Update essay to correct display of articulations (issue 8412044)

[PhilEHolmes]

Reviewers: ,

Message:
Please review - simple change to the essay to account for the changed
way to remove articulations.

Description:
Update essay to correct display of articulations

Please review this at https://codereview.appspot.com/8412044/

Affected files:
  M Documentation/essay/engraving.itely


Index: Documentation/essay/engraving.itely
diff --git a/Documentation/essay/engraving.itely  
b/Documentation/essay/engraving.itely
index  
f32934303c63476390c85c0d3c2e89462a31985d..5c93456f0b5e133bd590169c501746274ca66fbb  
100644

--- a/Documentation/essay/engraving.itely
+++ b/Documentation/essay/engraving.itely
@@ -1168,6 +1168,7 @@ heads, the @code{Note_heads_engraver}.
   \remove Phrasing_slur_engraver
   \remove Slur_engraver
   \remove Script_engraver
+  \remove New_fingering_engraver
   \remove Beam_engraver
   \remove Auto_beam_engraver
 }
@@ -1200,6 +1201,7 @@ Then a @code{Staff_symbol_engraver} adds the staff,
   \remove Phrasing_slur_engraver
   \remove Slur_engraver
   \remove Script_engraver
+  \remove New_fingering_engraver
   \remove Beam_engraver
   \remove Auto_beam_engraver
 }
@@ -1231,6 +1233,7 @@ the @code{Clef_engraver} defines a reference point  
for the staff,

   \remove Phrasing_slur_engraver
   \remove Slur_engraver
   \remove Script_engraver
+  \remove New_fingering_engraver
   \remove Beam_engraver
   \remove Auto_beam_engraver
 }
@@ -1259,6 +1262,7 @@ and the @code{Stem_engraver} adds stems.
   \remove Phrasing_slur_engraver
   \remove Slur_engraver
   \remove Script_engraver
+  \remove New_fingering_engraver
   \remove Beam_engraver
   \remove Auto_beam_engraver
 }



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Issue 2924: Doc: \startMeasureCount and \stopMeasureCount needs documenting (issue 7678047)

[PhilEHolmes]

I've not tested the snippets, but otherwise the patch LGTM.  I'm
assuming the only files you actually created were the ones in
snippets/new/ - the rest came from makelsr and make doc?

https://codereview.appspot.com/7678047/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Script for running pixel-based regtest comparisons (issue 7578046)

[PhilEHolmes]

Reviewers: ,

Message:
Please review.

Description:
I think this is reasonably self explanatory.  Running the script with -o
-j9 will create a set of old images in build/out-png-check.  Make
changes to lily, compile and run the script -n -jX and you'll be told
which images are different, and a set of image differences will be in
regtest-diffs.

Please review.

I'm aware that this will require updates to the CG, but think those
should come after this is accepted.

Please review this at https://codereview.appspot.com/7578046/

Affected files:
  A scripts/auxiliar/NoTagline.ly
  A scripts/auxiliar/make-regtest-pngs.sh


Index: scripts/auxiliar/NoTagline.ly
diff --git a/scripts/auxiliar/NoTagline.ly b/scripts/auxiliar/NoTagline.ly
new file mode 100644
index  
..84392737a8bb20b4a5451abea673ff22e3696061

--- /dev/null
+++ b/scripts/auxiliar/NoTagline.ly
@@ -0,0 +1,4 @@
+\paper {
+  #(set-paper-size A4)
+}
+\header { tagline = ##f }
Index: scripts/auxiliar/make-regtest-pngs.sh
diff --git a/scripts/auxiliar/make-regtest-pngs.sh  
b/scripts/auxiliar/make-regtest-pngs.sh

new file mode 100755
index  
..bfa713ccb2d2ea2058797229408e42c6c7df

--- /dev/null
+++ b/scripts/auxiliar/make-regtest-pngs.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+#  Make PNG files from regtests
+#
+#  Usage:  ./make-regtest-pngs.sh -j CPUs -o/-n
+#
+#where -j specifies the number of parallel processes to run
+#(normally CPUs+1).  e.g.:
+#
+#./make-regtest-pngs.sh -j9
+#
+#   -o means build an old regtest set - the PNGs go in the  
old-regtest-results

+#   directory
+#
+#   -n means build a new regtest set - the PNGs go in the  
new-regtest-results

+#   directory
+
+cpu_count=1
+
+while getopts j:on opts; do
+if [ $opts = j ]; then
+cpu_count=$OPTARG
+fi
+
+if [ $opts = o ]; then
+file_loc=old-regtest-results
+fi
+
+if [ $opts = n ]; then
+file_loc=new-regtest-results
+do_compare=y
+fi
+done
+
+if [ -z $file_loc ]; then
+echo Must specify old (-o) or new (-n) regtest PNG creation on  
command line

+exit 1
+fi
+
+rm -rf $LILYPOND_BUILD_DIR/out-png-check/$file_loc
+mkdir -p $LILYPOND_BUILD_DIR/out-png-check/$file_loc
+cd $LILYPOND_BUILD_DIR/out-png-check/$file_loc
+ls $LILYPOND_GIT/input/regression/*.ly  dir.txt
+$LILYPOND_BUILD_DIR/out/bin/lilypond --png --relocate  
-dinclude-settings=$LILYPOND_GIT/scripts/auxiliar/NoTagline.ly  
-djob-count=$cpu_count -dread-file-list dir.txt

+rm -rf dir.txt
+rm -rf *.log
+
+if [ -n $do_compare ]; then
+cd ..
+rm -rf regtest-diffs
+mkdir -p regtest-diffs
+diff_count=0
+for filename in new-regtest-results/*.png; do
+trimFile=$(basename $filename)
+if [ -e old-regtest-results/$trimFile ]; then
+convert new-regtest-results/$trimFile -level 50%  NewTest.png
+convert old-regtest-results/$trimFile -level 50%  OldTest.png
+difference=$(compare -metric AE NewTest.png OldTest.png null:  
21 )

+if [ $? -gt 0 ];then
+difference=
+fi
+if [ $difference -gt 1 ];then
+echo $trimFile: $difference differences
+compare -dissimilarity-threshold 1  
new-regtest-results/$trimFile old-regtest-results/$trimFile   
regtest-diffs/$trimFile
+convert regtest-diffs/$trimFile -trim  
regtest-diffs/$trimFile

+diff_count=$(($diff_count+1))
+fi
+else
+echo old-regtest-results/$trimFile does not exist
+fi
+done
+rm -rf NewTest.png
+rm -rf OldTest.png
+echo $diff_count differences found.
+fi



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Corrects links to manuals in many languages (issue 7311074)

[PhilEHolmes]

Reviewers: ,

Message:
Please review.

Description:
A number of the links on the Development pages for the various languages
point to pages that don't exist (e.g. the Czech page
http://lilypond.org/development.cs.html) or don't point to translated
pages when they do exist (e.g. http://lilypond.org/development.it.html).
 This patch _should_ fix many of these.  It's difficult to test
properly, since it relies on interactions between make doc in GUB and
make website on the server.  However, I believe it's a step forward and
would like to get it into master fairly quickly.

Please review this at https://codereview.appspot.com/7311074/

Affected files:
  M Documentation/cs/web/community.itexi
  D Documentation/cs/web/news-front.itexi
  D Documentation/hu/web/basic-authors.itexi
  M Documentation/hu/web/community.itexi
  M Documentation/it/web/community.itexi
  M Documentation/zh/web/community.itexi



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Add Czech translations (issue 7307088)

[PhilEHolmes]

Reviewers: ,

Message:
Please review.

Description:
This patch adds many Czech translations as I can manage, and gets rid of
a lot of warnings in make website and make doc.  Also deletes some old
2.12 code.

Please review this at https://codereview.appspot.com/7307088/

Affected files:
  M scripts/build/create-weblinks-itexi.py


Index: scripts/build/create-weblinks-itexi.py
diff --git a/scripts/build/create-weblinks-itexi.py  
b/scripts/build/create-weblinks-itexi.py
index  
7e0c6551a32d130d7a4a2e7955303b9c709cba8f..e7caa311610f8dc8f282b4099ce1459cf5e1f813  
100644

--- a/scripts/build/create-weblinks-itexi.py
+++ b/scripts/build/create-weblinks-itexi.py
@@ -38,6 +38,35 @@ done
 '''

 translations = {
+'cs': {
+'Source': 'Source',
+'Learning': 'Učení',
+'Music glossary': 'Slovníček',
+'Essay': 'Článek',
+'Notation': 'Notový zápis',
+'Usage': 'Používání',
+'Snippets': 'Úryvky',
+'Web': 'Web',
+'Changes': 'Změny',
+
+'Extending': 'Rozšíření',
+'Internals': 'Vnitřnosti',
+'Contributor': 'Vývojářské',
+
+' (split HTML)': ' (rozdělené HTML)',
+' (big HTML)': ' (velké HTML)',
+
+'Regression tests for ': 'Zkoušky regresí ',
+'PDF of regtests for ': 'PDF zkoušky regresí ',
+'abc2ly Regression tests for ': 'abc2ly zkoušky regresí ',
+'PDF of abc2ly regtests for ': 'PDF abc2ly zkoušky regresí ',
+'lilypond-book Regression tests for ': 'lilypond-book zkoušky  
regresí ',
+'PDF of lilypond-book regtests for ': 'PDF lilypond-book zkoušky  
regresí ',

+'MusicXML Regression tests for ': 'MusicXML zkoušky regresí ',
+'PDF of MusicXML regtests for ': 'PDF MusicXML zkoušky regresí ',
+
+'Doc tarball for ': 'Doc tarball for ',
+},
 'de': {
 'Source': 'Quellen',
 'Learning': 'Einführung',
@@ -66,7 +95,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF der MusicXML  
Regressionstests für ',


 'Doc tarball for ': 'Dokumentation tar-gepackt für ',
-' (did not exist in 2.12)': ' (nicht existent in 2.12)',
 },
 'es': {
 'Source': 'Código fuente',
@@ -97,7 +125,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'Pruebas de MusicXML en PDF  
para ',


 'Doc tarball for ': 'Tarball de la documentación para ',
-' (did not exist in 2.12)': ' (no existía en la versión 2.12)',
  },
 'fr': {
 'Source': 'Sources',
@@ -128,7 +155,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF des tests de régression de  
MusicXML pour ',


 'Doc tarball for ': 'Archive de la documentation pour ',
-' (did not exist in 2.12)': ' (non disponible pour la version  
2.12)',

 },
 'hu': {
 'Source': 'Forrás',
@@ -157,7 +183,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF formátumban - verzió: ',

 'Doc tarball for ': 'Tömörített csomag - verzió: ',
-' (did not exist in 2.12)': ' (nem létezett a 2.12-es verzióban)',
 },
 'it': {
 'Source': 'Sorgenti',
@@ -187,7 +212,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'PDF dei test di collaudo di  
MusicXML per ',


 'Doc tarball for ': 'Archivio della documentazione per ',
-' (did not exist in 2.12)': ' (non disponibile per la versione  
2.12)',

 },
 'ja': {
 'Source': 'ソース',
@@ -219,7 +243,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'MusicXML 回帰テスト (PDF 版) バー 
ジョン ',


 'Doc tarball for ': 'ドキュメント アーカイブ バージョン ',
-' (did not exist in 2.12)': ' (バージョン 2.12 には存在しません)',

 },
 'nl': {
@@ -251,7 +274,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'MusicXML regressietesten voor ',

 'Doc tarball for ': 'Tarball met documentation voor ',
-' (did not exist in 2.12)': ' (bestond nog niet in 2.12)',
  },
 'zh': {
 'Source': '源码',
@@ -282,7 +304,6 @@ translations = {
 'PDF of MusicXML regtests for ': 'MusicXML 的 PDF 回归测试 ',

 'Doc tarball for ': '为文档压缩包',
-' (did not exist in 2.12)': ' (在 2.12 中不存在)',
 },
 }

@@ -416,29 +437,7 @@ def translateNameToUrl(manual, version):
 ver_minor = ver_split[0] + '.' + ver_split[1]
 url = depth + doc/v + ver_minor + /Documentation/

-if (ver_minor == '2.12'):
-if (manual=='learning'):
-return url+'user/lilypond-learning'
-elif (manual=='internals'):
-return url+'user/lilypond-internals'
-elif (manual=='notation'):
-return url+'user/lilypond'
-elif (manual=='usage'):
-return url+'user/lilypond-program'
-elif (manual=='snippets'):
-return url+'../input/lsr/lilypond-snippets'
-elif (manual=='changes'):
-return url+'topdocs/NEWS.html'
-elif 

Updates ancient clefs (issue 7180043)

[PhilEHolmes]

Reviewers: ,

Message:
Minor change.  Please review.  Probably not worth a countdown - passes
make doc.

Description:
Updates ancient clefs

Adds c5 clef to mensural list, adds black mensural clefs
to list of clefs, replaces crochet with semi breve
(more common in ancient notation) and minor wording change.

Please review this at https://codereview.appspot.com/7180043/

Affected files:
  M Documentation/notation/ancient.itely


Index: Documentation/notation/ancient.itely
diff --git a/Documentation/notation/ancient.itely  
b/Documentation/notation/ancient.itely
index  
cc5a50d2dfba5b1c30bb1a7989a1880392a57221..170421af29e6c8654fc6ebc935472035ea92f7eb  
100644

--- a/Documentation/notation/ancient.itely
+++ b/Documentation/notation/ancient.itely
@@ -422,8 +422,8 @@ The following table shows all mensural clefs that are  
supported via

 the @code{\clef} command.  Some of the clefs use the same glyph,
 but differ only with respect to the line they are printed on.  In
 such cases, a trailing number in the name is used to enumerate
-these clefs, numbered from the lowest to the highest line.  Still,
-you can manually force a clef glyph to be typeset on an arbitrary
+these clefs, numbered from the lowest to the highest line.
+You can manually force a clef glyph to be typeset on an arbitrary
 line, as described in @ref{Clef}.  The note printed to the right
 side of each clef in the example column denotes the @code{c'} with
 respect to that clef.
@@ -443,12 +443,13 @@ beams, depending on which staff line it is printed.
 mensural C clef
 @tab
 @code{mensural-c1}, @code{mensural-c2},@*
-@code{mensural-c3}, @code{mensural-c4}
+@code{mensural-c3}, @code{mensural-c4},@*
+@code{mensural-c5}
 @tab
 @lilypond[relative=1,notime]
   \clef mensural-c2
   \override NoteHead.style = #'mensural
-  c
+  c1
 @end lilypond

 @item
@@ -459,7 +460,7 @@ mensural F clef
 @lilypond[relative=1,notime]
   \clef mensural-f
   \override NoteHead.style = #'mensural
-  c
+  c1
 @end lilypond

 @item
@@ -470,7 +471,20 @@ mensural G clef
 @lilypond[relative=1,notime]
   \clef mensural-g
   \override NoteHead.style = #'mensural
-  c
+  c1
+@end lilypond
+
+@item
+black mensural C clef
+@tab
+@code{blackmensural-c1}, @code{blackmensural-c2},@*
+@code{blackmensural-c3}, @code{blackmensural-c4},@*
+@code{blackmensural-c5}
+@tab
+@lilypond[relative=1,notime]
+  \clef blackmensural-c2
+  \override NoteHead.style = #'mensural
+  c1
 @end lilypond

 @item
@@ -480,7 +494,7 @@ neomensural C clef
 @code{neomensural-c3}, @code{neomensural-c4}
 @tab
 @lilypond[relative=1,notime]
-  \clef neomensural-c2 c
+  \clef neomensural-c2 c1
 @end lilypond

 @item
@@ -494,7 +508,7 @@ petrucci style C clefs, for use on different staff lines
 @lilypond[relative=1,notime]
   \clef petrucci-c2
   \override NoteHead.style = #'mensural
-  c
+  c1
 @end lilypond

 @item
@@ -507,7 +521,7 @@ petrucci style F clefs, for use on different staff lines
 @lilypond[relative=1,notime]
   \clef petrucci-f3
   \override NoteHead.style = #'mensural
-  c
+  c1
 @end lilypond

 @item
@@ -518,7 +532,7 @@ petrucci style G clef
 @lilypond[relative=1,notime]
   \clef petrucci-g
   \override NoteHead.style = #'mensural
-  c
+  c1
 @end lilypond
 @end multitable




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Removes incorrect issue (issue 7181043)

[PhilEHolmes]

Passes make doc.  Please review.

https://codereview.appspot.com/7181043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

DOC: Update CG 8.7 Patch Handling (issue 7101048)

[PhilEHolmes]

Suggested addition.


https://codereview.appspot.com/7101048/diff/1/Documentation/contributor/issues.itexi
File Documentation/contributor/issues.itexi (right):

https://codereview.appspot.com/7101048/diff/1/Documentation/contributor/issues.itexi#newcode850
Documentation/contributor/issues.itexi:850: to current master.  If it
passes, Patchy changes the status to
By default, it checks that the patch allows make and make test to
complete successfully.  It can also be configured to check that make doc
is also successful.

https://codereview.appspot.com/7101048/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Doc: CG Clarifying about Examples with overrides (issue 7013043)

[PhilEHolmes]

https://codereview.appspot.com/7013043/diff/3003/Documentation/contributor/doc-work.itexi
File Documentation/contributor/doc-work.itexi (right):

https://codereview.appspot.com/7013043/diff/3003/Documentation/contributor/doc-work.itexi#newcode158
Documentation/contributor/doc-work.itexi:158: @ref{Introduction to LSR}.
Thanks for the update.  I still think it's worth a simple reminder here:
'Dont' forget to tag the snippet with docs'.

https://codereview.appspot.com/7013043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Doc: CG Clarifying about Examples with overrides (issue 7013043)

[PhilEHolmes]

LGTM

https://codereview.appspot.com/7013043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Doc: CG Clarifying about Examples with overrides (issue 7013043)

[PhilEHolmes]

https://codereview.appspot.com/7013043/diff/1/Documentation/contributor/doc-work.itexi
File Documentation/contributor/doc-work.itexi (right):

https://codereview.appspot.com/7013043/diff/1/Documentation/contributor/doc-work.itexi#newcode161
Documentation/contributor/doc-work.itexi:161: it as a @emph{selected
snippet) in the position you suggest within the
This is Phil - as was the BealingsPlayford comment earlier.  Should the
closing ) be a } ?

https://codereview.appspot.com/7013043/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Adds 2.14 docs to list of stable documentation (issue 6996052)

[PhilEHolmes]

Reviewers: ,

Message:
Please review



Please review this at https://codereview.appspot.com/6996052/

Affected files:
  M Documentation/web/manuals.itexi


Index: Documentation/web/manuals.itexi
diff --git a/Documentation/web/manuals.itexi  
b/Documentation/web/manuals.itexi
index  
fd194de3a895544dc1b3a4b0e03fd76dcb6c05d2..956ac12976dcbda17d8f66337de64224b3f8e64d  
100644

--- a/Documentation/web/manuals.itexi
+++ b/Documentation/web/manuals.itexi
@@ -532,12 +532,12 @@ Downloadable tarballs only available at  
@uref{http://lilypond.org}

 @divClass{keep-bullets}
 @itemize

+@item @uref{http://lilypond.org/doc/v2.14/Documentation/web/manuals,
+LilyPond 2.14 Documentation}
+
 @item @uref{http://lilypond.org/doc/v2.12/Documentation/,
 LilyPond 2.12 Documentation}

-@item @uref{http://lilypond.org/doc/v2.11/Documentation/,
-LilyPond 2.11 Documentation}
-
 @item @uref{http://lilypond.org/doc/v2.10/Documentation/,
 LilyPond 2.10 Documentation}




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

15:43:05 (UTC) Begin LilyPond compile, previous commit at   
2c646d632acf0cf1d08a4843de5d536a34a7e2da
15:43:13 From ssh://git.sv.gnu.org/srv/git/lilypond
   2c646d6..4c4c59a  master - origin/master
   2c646d6..37ac57f  staging- origin/staging
   cb05c49..2865242  translation - origin/translation
15:43:20 Merged staging, now at:37ac57f59e452b5c1d84f466edadcc195db99b5a
15:43:20Success:./autogen.sh --noconfigure
15:43:33Success:
/home/patchy/patchybuild/autobuild/configure --disable-optimising
15:43:37Success:nice make clean
15:44:36Success:nice make -j9 CPU_COUNT=9 -s
15:46:39Success:nice make test -j9 CPU_COUNT=9 -s
15:52:34 *** FAILED BUILD ***
nice make doc -j9 CPU_COUNT=9 -s
Previous good commit:   2c646d632acf0cf1d08a4843de5d536a34a7e2da
Current broken commit:  37ac57f59e452b5c1d84f466edadcc195db99b5a
15:52:34 *** FAILED STEP ***
merge from staging
Failed runner: nice make doc -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-doc--j9-CPU_COUNT=9--s.txt
15:52:34 Traceback (most recent call last):
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 523, in handle_staging
self.build (issue_id=issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 328, in build
issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 266, in runner
raise FailedCommand (Failed runner: %s\nSee the log file %s % (command, 
this_logfilename))
FailedCommand: Failed runner: nice make doc -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-doc--j9-CPU_COUNT=9--s.txt

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Doc: NR typo for Midi Instuments used in example (issue 6940064)

[PhilEHolmes]

LGTM

https://codereview.appspot.com/6940064/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Add note to manuals.html describing formats of manuals (Issue 2895) (issue 6867054)

[PhilEHolmes]

Please review

https://codereview.appspot.com/6867054/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Add note to manuals.html describing formats of manuals (Issue 2895) (issue 6867054)

[PhilEHolmes]

Reviewers: ,

Message:
Please review.  Passes make doc.

Description:
Describes how to access the different formats of the manuals on the
stable manuals page.

Please review this at https://codereview.appspot.com/6867054/

Affected files:
  M Documentation/web/manuals.itexi


Index: Documentation/web/manuals.itexi
diff --git a/Documentation/web/manuals.itexi  
b/Documentation/web/manuals.itexi
index  
a46ab720da6d11303708974ac47b2d4a3808a775..aa8ee11911de8c22b4f4b7fd916043b009e53e79  
100644

--- a/Documentation/web/manuals.itexi
+++ b/Documentation/web/manuals.itexi
@@ -26,6 +26,12 @@

 @divEnd

+The LilyPond manuals generally come in three formats: split HTML, big HTML  
and
+PDF.  Split HTML is good for reading online.  Big HTML (and some of these  
can be

+very big) contains the whole manual in a single page.  PDF is available for
+downloading and using offline.  To get to these 3 formats, follow the links
+that read @code{details of} and then the manual name.
+
 @divClass{link-headings}

 @divClass{column-center-top}



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email

[phileholmes]

16:44:26 (UTC) Begin LilyPond compile, previous commit at   
1d142062f61e52ce23937cf697836aaecde2432b
16:44:33 From ssh://git.sv.gnu.org/srv/git/lilypond
   bcda814..ac895f8  release/unstable - origin/release/unstable
   1d14206..8a0594c  staging- origin/staging
16:44:39 Merged staging, now at:8a0594c1cbfe68e4fecbfb23f11af75c2186be50
16:44:41Success:./autogen.sh --noconfigure
16:44:55Success:
/home/patchy/patchybuild/autobuild/configure --disable-optimising
16:44:59Success:nice make clean
16:46:00Success:nice make -j9 CPU_COUNT=9 -s
16:46:51 *** FAILED BUILD ***
nice make test -j9 CPU_COUNT=9 -s
Previous good commit:   1d142062f61e52ce23937cf697836aaecde2432b
Current broken commit:  8a0594c1cbfe68e4fecbfb23f11af75c2186be50
16:46:51 *** FAILED STEP ***
merge from staging
Failed runner: nice make test -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-test--j9-CPU_COUNT=9--s.txt
16:46:51 Traceback (most recent call last):
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 523, in handle_staging
self.build (issue_id=issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 323, in build
issue_id)
  File /home/patchy/lilypond-extra/patches/compile_lilypond_test/__init__.py, 
line 266, in runner
raise FailedCommand (Failed runner: %s\nSee the log file %s % (command, 
this_logfilename))
FailedCommand: Failed runner: nice make test -j9 CPU_COUNT=9 -s
See the log file log-staging-nice-make-test--j9-CPU_COUNT=9--s.txt

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email from PhilH

[phileholmes]

Begin LilyPond compile, commit: 4ed5d7710416aff0a9e68f0d751b4e15c30fdf92

Merged staging, now at: c9d806f28ab690c3f210e14153c6bd31d506588e

Success:./autogen.sh --noconfigure

Success:../configure --disable-optimising

Success:nice make clean -j9 CPU_COUNT=9 -s

Success:nice make -j9 CPU_COUNT=9 -s

Success:nice make test -j9 CPU_COUNT=9 -s

*** FAILED BUILD ***

nice make doc -j9 CPU_COUNT=9 -s

Previous good commit:   4ed5d7710416aff0a9e68f0d751b4e15c30fdf92

Current broken commit:  c9d806f28ab690c3f210e14153c6bd31d506588e


___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Adds tick mark to scripts (issue 6568055)

[PhilEHolmes]

Updated glyph.  Please review.

http://codereview.appspot.com/6568055/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email from PhilH

[phileholmes]

Begin LilyPond compile, commit: cd09a4e7f2655f3bec65979a604d8f9f9bf454da

Merged staging, now at: 0d09cf7fd29ae8f746b58f4c6c3b97abee8ce8f7

Success:./autogen.sh --noconfigure

Success:../configure --disable-optimising

Success:nice make clean -j9 CPU_COUNT=9 -s

*** FAILED BUILD ***

nice make -j9 CPU_COUNT=9 -s

Previous good commit:   cd09a4e7f2655f3bec65979a604d8f9f9bf454da

Current broken commit:  0d09cf7fd29ae8f746b58f4c6c3b97abee8ce8f7


___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Adds tick mark to scripts (issue 6568055)

[PhilEHolmes]

http://codereview.appspot.com/6568055/diff/1/mf/feta-scripts.mf
File mf/feta-scripts.mf (right):

http://codereview.appspot.com/6568055/diff/1/mf/feta-scripts.mf#newcode1774
mf/feta-scripts.mf:1774: set_char_box (0, 1.7 staff_space# + epsilon,
Are you suggesting deleting the epsilon, or moving the base of the box
up, or the glyph down?  The glyph is above the baseline in order to move
it away from the staff lines, which is how it is typeset.  I added the
epsilon because without it there is a rounding error, leading to the box
being one unit too small.

http://codereview.appspot.com/6568055/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Adds tick mark to scripts (issue 6568055)

[PhilEHolmes]

Reviewers: lemzwerg, janek, Graham Percival,

Message:
Please review

Description:
As it says. A tick mark is a very common way of indicating a breath in
vocal music, but we have no good glyph for this.  This is an attempt to
create one.

Please review this at http://codereview.appspot.com/6568055/

Affected files:
  M mf/feta-scripts.mf


Index: mf/feta-scripts.mf
diff --git a/mf/feta-scripts.mf b/mf/feta-scripts.mf
index  
83859dbe66fc2b4af51bd7bf63947d9700db6913..89ccc25370fa58c9d23e436dc4698630e2874a57  
100644

--- a/mf/feta-scripts.mf
+++ b/mf/feta-scripts.mf
@@ -1736,8 +1736,49 @@ fet_beginchar (Straight  
caesura, caesura.straight);

labels(1a, 1b, 2a, 2b, 3a, 3b, 4a, 4b);
 fet_endchar;

+% A tick character to use instead of a comma or caesura as a breath mark,
+% Very common in vocal notation

-fet_beginchar (snap pizzicato (Bartok pizzicato), snappizzicato);
+fet_beginchar (Tick mark, tickmark);
+   save end_rad, bot_rad, pat, y_off;
+   end_rad = linethickness/2;
+   bot_rad = linethickness;
+   path pat;
+
+   y_off# := 0.2 staff_space#;
+   define_pixels (y_off);
+
+   pickup pencircle scaled end_rad;
+
+   lft x1 = 0;
+   y1 = 0.8 staff_space + y_off;
+
+   x2 = 0.6 staff_space;
+   y2l = 0  + y_off;
+
+   top rt z3 = (1.7 staff_space, 1.7 staff_space + y_off);
+   z4 = (0, staff_space + y_off);
+
+   penpos2(0.4 staff_space, 90);
+   penpos3(end_rad, angle(z4-z3)+90);
+   penpos1(end_rad, angle(z2-z1)+90);
+
+   pat = z1r..top z1..z1l{z2-z1}
+   ..{z2-(z1+(0.3 staff_space,0))}z2l+(-bot_rad, bot_rad)
+ ..z2l..z2l+(bot_rad, bot_rad){z3-(0.6 staff_space, 
0)-z2}
+   ..{z3-z4}z3r..rt z3..{z4-z3}z3l
+   ..{z2-(z3-(0.6 staff_space,0))}rt z2r..{z1-z2}lft 
z2r{z1-z2}
+   ..cycle;
+   fill pat;
+
+   set_char_box (0, 1.7 staff_space# + epsilon,
+   0, y_off# + 1.7 staff_space#);
+
+
+   penlabels (1,2,3,4);
+fet_endchar;
+
+fet_beginchar (snap pizzicato (Bartok pizzicato), snappizzicat);
save height, width, thickness, superness;

height# = 4/15 staffsize#;



___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Adds tick mark to scripts (issue 6568055)

[PhilEHolmes]

Correct.  Apologies - I did that to try an experiment and didn't reset
it.  Thanks for picking it up. Next patch set will correct that.

http://codereview.appspot.com/6568055/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Fixes position of mensural c clef (issue 6503091)

[PhilEHolmes]

Please review

http://codereview.appspot.com/6503091/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Fixes position of mensural c clef (issue 6503091)

[PhilEHolmes]

On 2012/09/25 14:04:03, lemzwerg wrote:

LGTM, except one small issue.



http://codereview.appspot.com/6503091/diff/20001/mf/parmesan-clefs.mf
File mf/parmesan-clefs.mf (right):



http://codereview.appspot.com/6503091/diff/20001/mf/parmesan-clefs.mf#newcode816

mf/parmesan-clefs.mf:816: 2.2 reduced_il#);
The bbox is still too small.


Agreed.  Will fix this in the next patch.  I tried a variety of ways of
displaying the bounding box, but can only seem to be able show the right
edge.  Is there a way of showing the whole box?



http://codereview.appspot.com/6503091/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Fixes position of mensural c clef (issue 6503091)

[PhilEHolmes]

Please review.  I can provide an image on the tracker if required.

http://codereview.appspot.com/6503091/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Fixes position of mensural c clef (issue 6503091)

[PhilEHolmes]

Please review, including image on the tracker.

http://codereview.appspot.com/6503091/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Fix numeric tempi and detached lyrics in abc2ly (issue 6526045)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
The previous version of abc2ly did not handle abc input for words below
the music correctly.  This fixes that, and adds the ability to specify
tempi as beats-per-minute, which is common in abc.

Please review this at http://codereview.appspot.com/6526045/

Affected files:
  M scripts/abc2ly.py


Index: scripts/abc2ly.py
diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index  
60900ca8315d78890eebea3a208b4a139790c8f0..15161032f2b251155b69cfc3b1ef4c58fb5775c0  
100644

--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -222,11 +222,11 @@ def dump_header (outf,hdr):

 def dump_lyrics (outf):
 if (len(lyrics)):
-outf.write(\n\\score\n{\n \\lyrics\n \n)
+outf.write(\n\\markup \\column {\n)
 for i in range (len (lyrics)):
-outf.write ( lyrics [i])
+outf.write (lyrics [i])
 outf.write (\n)
-outf.write(\n\\layout{}\n}\n)
+outf.write(}\n)

 def dump_default_bar (outf):
 
@@ -284,7 +284,15 @@ def try_parse_q(a):
 dur = duration_to_lilypond_duration ((numerator,denominator), 1, 0)
 voices_append (\\tempo  + descr +   + dur + = + tempo + \n)
 else:
-sys.stderr.write(abc2ly: Warning, unable to parse Q  
specification: %s\n % a)

+# Parsing of numeric tempi, as these are fairly
+# common.  The spec says the number is a beat so using
+# a quarter note as the standard time
+numericQ = re.compile ('[0-9]+')
+m = numericQ.match (a)
+if m:
+voices_append (\\tempo 4= + m.group(0))
+else:
+sys.stderr.write(abc2ly: Warning, unable to parse Q  
specification: %s\n % a)


 def dump_score (outf):
 outf.write (r
@@ -617,7 +625,7 @@ def repeat_prepend():
 def lyrics_append(a):
 a = re.sub ('#', '\\#', a)# latex does not like naked #'s
 a = re.sub ('', '\\', a)# latex does not like naked 's
-a = '\t{  ' + a + ' }\n'
+a = '  \\line { ' + a + ' }\n'
 stuff_append (lyrics, current_lyric_idx, a)

 # break lyrics to words and put 's around words containing numbers  
and ''s




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Re: Fixes position of mensural c clef (issue 6503091)

[PhilEHolmes]

A quick note to Werner.  1) apologies for being rather brusque, but I'd
pretty much killed my self getting this sorted - the original code had
some very odd calculation methods in it, and it's the first time I'd
ever touched metafont.  Your follow up is helpful - please ignore my
recent comment on Google - I'm minus a monitor at present and working on
a little used laptop and don't have mail at present, so I'm not working
linearly in time.  I'll look at changing the lengths - I was aware of a
slight difference, although actually I'm not certain it's that important
- these are machine drawn glyphs intending to replicate hand-drawn clefs
from the 15th century.  How important is 0.1 staff space?

As for the indents, I now understand what you're saying.  I use Gedit
and by default for mf files it puts tabs at 4 spaces, and so the
indenting looked completely awry.  IMHO mixing tabs and spaces is a
really bad idea for that reason - different editors indent different
ways.  I just tidied a few of the more obvious ones near my code, but
will get rid of those once I have a working monitor.

As for the overlaps.  Ditto I'll look at that.  The original code
calculated end points in a very odd way - it allowed, for example, of
different amounts of shift between the breves, and then ignored that in
the calculation of the decorations.  I'll see if I can improve this.



http://codereview.appspot.com/6503091/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Fixes position of mensural c clef (issue 6503091)

[PhilEHolmes]

Reviewers: ,

Message:
Please review

Description:
Well, after about a week of study of metafont code and debugging the
original, I've finally arrived at an updated version of the mensural C
clef. The previous version is undoubtedly misplaced - the centre of the
clef should align with a middle C note, but it was half a staff-space
low.  There were a number of logic errors in the code which meant that
the intended use of the shift parameter invariably failed except for the
special case that was in the original code.  I've also added support for
a clef on each staff line while I was at it.

Please review this at http://codereview.appspot.com/6503091/

Affected files:
  M mf/parmesan-clefs.mf
  M scm/parser-clef.scm


Index: mf/parmesan-clefs.mf
diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf
index  
34a09cf20bc40d7b0def688c2af66fc54731362f..934109fe54d5f63c00a006a99ded0370974ef534  
100644

--- a/mf/parmesan-clefs.mf
+++ b/mf/parmesan-clefs.mf
@@ -528,7 +528,7 @@ enddef;
 % The other parameters are the same as with `draw_brevis'.
 %
 def draw_triple_brevis (expr exact_center, bwidth, bheight,
-blinethickness, shift) =
+   blinethickness, shift) =
save brevis_width, brevis_height, linethickness;

brevis_width# = bwidth;
@@ -580,7 +580,7 @@ def draw_triple_brevis (expr exact_center, bwidth,  
bheight,

  shifted (2 xoffs + brevis_width, 0);
pat_out := pat_out
   -- reverse pat_out yscaled -1
- shifted (0, -2 yoffs)
+ shifted (0, 2 yoffs - 2 shift)
   -- cycle;

fill pat_out;
@@ -851,9 +851,9 @@ def draw_mensural_c_clef (expr exact_center, reduction)  
=


define_pixels (reduced_il);

-   draw_triple_brevis (exact_center + (0, 0.5 staff_space#),
-   2 reduced_il#, 0.8 staff_space#,
-   0.8 linethickness#, staff_space);
+   draw_triple_brevis (exact_center + (0, 1.0 staff_space#),
+   2 reduced_il#, 0.8 staff_space#,
+   0.8 linethickness#, staff_space);

save half_reduced_il;

@@ -862,10 +862,9 @@ def draw_mensural_c_clef (expr exact_center,  
reduction) =

define_pixels (half_reduced_il);

set_char_box (0 - xpart exact_center,
- 2 reduced_il# + xpart exact_center,
- 2.2 half_reduced_il# + staff_space# -
-   2 ypart exact_center,
- 2.2 half_reduced_il# + 2 ypart exact_center);
+   2 reduced_il# + xpart exact_center,
+   2.2 half_reduced_il# + staff_space# - 2 ypart 
exact_center,
+   2.2 half_reduced_il# + 2 ypart exact_center);

save xoffs, yoffs;

@@ -883,38 +882,35 @@ def draw_mensural_c_clef (expr exact_center,  
reduction) =

pickup pencircle transformed T;
ellipse := fullcircle transformed T;

-   lft x11 = lft x13 = xoffs;
-   top y11 = yoffs + 2.2 half_reduced_il;
-   bot y13 = yoffs - 2.2 half_reduced_il - staff_space;
-   rt x15 = rt x17 = xoffs + brevis_width;
-   y15 = yoffs + 1.4 half_reduced_il;
-   y17 = yoffs - 1.4 half_reduced_il - staff_space;
-
-   z12 = z14 yscaled -1 shifted (0, -staff_space);
-   z14 = z9;
-   z16 = z18 yscaled -1 shifted (0, -staff_space);
-   rt z18 = lft z14 shifted (brevis_width, 0);
+   z12 = z9 shifted (0, 2.5 staff_space);
+   z11 = z12 shifted (0, 1.8 staff_space);
+   z14 = z9;  % z9 is the bottom left of the drawn triple-clef
+   z13 = z14 shifted (0,  -1.1 staff_space);
+   z16 = z9 shifted (brevis_width - 1.4 linethickness, 0);
+   z15 = z16 shifted (0, -0.4 staff_space);
+   z18 = z16 shifted (0, 3.0 staff_space);
+   z17 = z18 shifted (0, 0.5 staff_space);

penpos12 (1.4 linethickness, 0);
penpos14 (1.4 linethickness, 0);
penpos16 (1.4 linethickness, 0);
penpos18 (1.4 linethickness, 0);

-   fill get_subpath (ellipse, up, down, z11)
+   fill get_subpath (ellipse, up, down, z11) %top left ornament
 -- z12l
 -- z12r
 -- cycle;
-   fill get_subpath (ellipse, down, up, z13)
+   fill get_subpath (ellipse, down, up, z13) %bottom left ornament
 -- z14r
 -- z14l
 -- cycle;
-   fill get_subpath (ellipse, up, down, z15)
--- z16l
+   fill get_subpath (ellipse, down, up, z15) %bottom right
 -- z16r
+-- z16l
 -- cycle;
-   fill get_subpath (ellipse, down, up, z17)
--- z18r
+   fill get_subpath (ellipse, up, down, z17) %top right
 -- z18l
+-- z18r
 -- cycle;

labels (11, 13, 15, 17);
Index: scm/parser-clef.scm
diff --git 

Re: Fixes position of mensural c clef (issue 6503091)

[PhilEHolmes]

http://codereview.appspot.com/6503091/diff/1/mf/parmesan-clefs.mf
File mf/parmesan-clefs.mf (left):

http://codereview.appspot.com/6503091/diff/1/mf/parmesan-clefs.mf#oldcode885
mf/parmesan-clefs.mf:885:
I'm sorry, but I find this incredibly unhelpful.  You've done it wrong
is insulting to someone who's spent about 40 hours trying to get it
right.  The original code was wrong, with any number of incorrect
assumtions.  If you could point me to what is incorrect, I'll try to fix
it.  I see nothing wrong with the images you've supplied.

http://codereview.appspot.com/6503091/diff/1/mf/parmesan-clefs.mf
File mf/parmesan-clefs.mf (right):

http://codereview.appspot.com/6503091/diff/1/mf/parmesan-clefs.mf#newcode854
mf/parmesan-clefs.mf:854: draw_triple_brevis (exact_center + (0, 1.0
staff_space#),
The mix of tabs and spaces made indentation difficult to follow.  Please
explain why mixing tabs and spaces is good.

http://codereview.appspot.com/6503091/diff/1/mf/parmesan-clefs.mf#newcode866
mf/parmesan-clefs.mf:866: 2.2 half_reduced_il# + staff_space# - 2 ypart
exact_center,
I found the line break hindered unserstanding of the syntax, to no
benefit.  Most editors extend part 80 characters these days.

http://codereview.appspot.com/6503091/

___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Hard-coded version numbers updated (issue 6492072)

[PhilEHolmes]

Reviewers: Graham Percival,

Description:
I've checked Google and it is now indexing the 2.17 pages and returning
hundreds of results - so we should update the search boxes.  There's no
issue tracker for this because my finger slipped when entering my google
credentials.

Please review this at http://codereview.appspot.com/6492072/

Affected files:
  M Documentation/de/search-box.ihtml
  M Documentation/es/search-box.ihtml
  M Documentation/fr/search-box.ihtml
  M Documentation/hu/search-box.ihtml
  M Documentation/it/search-box.ihtml
  M Documentation/nl/search-box.ihtml
  M Documentation/search-box.ihtml
  M Documentation/zh/search-box.ihtml
  M scripts/build/website_post.py


Index: Documentation/de/search-box.ihtml
diff --git a/Documentation/de/search-box.ihtml  
b/Documentation/de/search-box.ihtml
index  
1322170b71d91fe67a717dadead3391a638c9f8f..452f275938a829b2fc40a61dd604410c00f5e628  
100644

--- a/Documentation/de/search-box.ihtml
+++ b/Documentation/de/search-box.ihtml
@@ -16,11 +16,11 @@ search for a while and have a redirection from v2.15  
to v2.17.

 form action=http://google.com/search;
   method=get
   name=search
-  onSubmit=search.q.value='site:lilypond.org/doc/v2.15 '
+  onSubmit=search.q.value='site:lilypond.org/doc/v2.17 '
+ search.brute_query.value
-  onMouseMove=search.q.value='site:lilypond.org/doc/v2.15 '
+  onMouseMove=search.q.value='site:lilypond.org/doc/v2.17 '
   + search.brute_query.value
-  onKeyUp=search.q.value='site:lilypond.org/doc/v2.15 '
+  onKeyUp=search.q.value='site:lilypond.org/doc/v2.17 '
   + search.brute_query.value
   input type=hidden name=btnG value=Mit Google suchen
   input type=text name=brute_query onfocus=this.value=''  
value=Suche

Index: Documentation/es/search-box.ihtml
diff --git a/Documentation/es/search-box.ihtml  
b/Documentation/es/search-box.ihtml
index  
43ac87b84cebabdcfc3261fd73e5991b2d0eb96f..56fb87f9457b5e96038d06ff1c15df2959fdfda7  
100644

--- a/Documentation/es/search-box.ihtml
+++ b/Documentation/es/search-box.ihtml
@@ -14,11 +14,11 @@ search for a while and have a redirection from v2.15  
to v2.17.

 form action=http://google.com/search;
   method=get
   name=search
-  onSubmit=search.q.value='site:lilypond.org/doc/v2.15 '
+  onSubmit=search.q.value='site:lilypond.org/doc/v2.17 '
+ search.brute_query.value
-  onMouseMove=search.q.value='site:lilypond.org/doc/v2.15 '
+  onMouseMove=search.q.value='site:lilypond.org/doc/v2.17 '
   + search.brute_query.value
-  onKeyUp=search.q.value='site:lilypond.org/doc/v2.15 '
+  onKeyUp=search.q.value='site:lilypond.org/doc/v2.17 '
   + search.brute_query.value
   input type=hidden name=btnG value=Búsqueda en Google
   input type=text name=brute_query onfocus=this.value=''  
value=Buscar

Index: Documentation/fr/search-box.ihtml
diff --git a/Documentation/fr/search-box.ihtml  
b/Documentation/fr/search-box.ihtml
index  
0017b60ffc90c07846dd352c27feb630e79965fe..8a667800599398ca64b1b9e08d41f046ab83d999  
100644

--- a/Documentation/fr/search-box.ihtml
+++ b/Documentation/fr/search-box.ihtml
@@ -16,11 +16,11 @@ search for a while and have a redirection from v2.15  
to v2.17.

 form action=http://google.com/search;
   method=get
   name=search
-  onSubmit=search.q.value='site:lilypond.org/doc/v2.15 '
+  onSubmit=search.q.value='site:lilypond.org/doc/v2.17 '
+ search.brute_query.value
-  onMouseMove=search.q.value='site:lilypond.org/doc/v2.15 '
+  onMouseMove=search.q.value='site:lilypond.org/doc/v2.17 '
   + search.brute_query.value
-  onKeyUp=search.q.value='site:lilypond.org/doc/v2.15 '
+  onKeyUp=search.q.value='site:lilypond.org/doc/v2.17 '
   + search.brute_query.value
   input type=hidden name=btnG value=Recherche sur Google
   input type=text name=brute_query onfocus=this.value=''  
value=Rechercher

Index: Documentation/hu/search-box.ihtml
diff --git a/Documentation/hu/search-box.ihtml  
b/Documentation/hu/search-box.ihtml
index  
fb526ad72c6dc41455b47cc8272cac69c94beaa2..6dc413f820c2a06d230636c9fbab2f5fea990b31  
100644

--- a/Documentation/hu/search-box.ihtml
+++ b/Documentation/hu/search-box.ihtml
@@ -1,11 +1,11 @@
 form action=http://google.com/search;
   method=get
   name=search
-  onSubmit=search.q.value='site:lilypond.org +v2.12 '
+  onSubmit=search.q.value='site:lilypond.org +v2.17 '
+ search.brute_query.value
-  onMouseMove=search.q.value='site:lilypond.org +v2.12 '
+  onMouseMove=search.q.value='site:lilypond.org +v2.17 '
   + search.brute_query.value
-  onKeyUp=search.q.value='site:lilypond.org +v2.12 '
+  onKeyUp=search.q.value='site:lilypond.org +v2.17 '
   + search.brute_query.value
   input type=hidden name=btnG value=Google keresés
   input type=text name=brute_query 

Removes echoed information from make doc (issue 6496074)

[PhilEHolmes]

Reviewers: John Mandereau,

Message:
Please check.

Description:
I've tested this with a full make, make doc, make test and diffed the
files created with make doc - all is exactly the same.  Think this
should be good to go, but just want confirmation.

Please review this at http://codereview.appspot.com/6496074/

Affected files:
  M Documentation/GNUmakefile


Index: Documentation/GNUmakefile
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index  
aafcb0bc65455f61c1e9be7135a25de85c35c8d0..a3ef4bb6e7c6640249ed9244139374a09a5a2de1  
100644

--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -167,8 +167,6 @@ extra-local-help:
@echo

 info: $(INFO_FILES)
-   @echo export LILYPOND_DATADIR=$(LILYPOND_DATADIR)
-   @echo export PYTHONPATH=$(PYTHONPATH)

 xml: $(outdir)/notation/notation.xml $(outdir)/internals/internals.xml




___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Patchy email from PhilH

[phileholmes]

Begin LilyPond compile, commit: ecf25f33aa4c02efda0694280e956c147f5006ae

Merged staging, now at: 5a3e62fdcaa01c295f2c5a5d1d47f81752ac7e7f

Success:./autogen.sh --noconfigure

Success:../configure --disable-optimising

Success:nice make clean -j9 CPU_COUNT=9 -s

Success:nice make -j9 CPU_COUNT=9 -s

Success:nice make test -j9 CPU_COUNT=9 -s

Success:nice make doc -j9 CPU_COUNT=9 -s

Success:pushed to master



Begin LilyPond compile, commit: 5a3e62fdcaa01c295f2c5a5d1d47f81752ac7e7f

Merged staging, now at: 64c456fcb5c93fe504dad13c717cec2295986697

Success:./autogen.sh --noconfigure

Success:../configure --disable-optimising

Success:nice make clean -j9 CPU_COUNT=9 -s

Success:nice make -j9 CPU_COUNT=9 -s

*** FAILED BUILD ***

nice make test -j9 CPU_COUNT=9 -s

Previous good commit:   5a3e62fdcaa01c295f2c5a5d1d47f81752ac7e7f

Current broken commit:  64c456fcb5c93fe504dad13c717cec2295986697


___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel