From b9bf5b6d92c91f808a70d369daebe13cb4b53e30 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Sat, 9 Mar 2013 15:02:16 +0100 Subject: [PATCH] Update to lily 2.17, layout fix for backpage --- editionkainhofer.sty | 4 +--- measureCounterEngraver.ily | 2 +- oly_settings_choralscore.ily | 2 +- oly_settings_fullscore.ily | 2 +- oly_settings_global.ily | 2 +- oly_settings_instrument.ily | 6 +++--- oly_settings_instruments.ily | 2 +- oly_settings_names.ily | 2 +- oly_settings_vocalscore.ily | 2 +- oly_settings_vocalvoice.ily | 2 +- orchestrallily.ily | 8 ++++---- sceaux_clef-key.ily | 2 +- 12 files changed, 17 insertions(+), 19 deletions(-) diff --git a/editionkainhofer.sty b/editionkainhofer.sty index 6d9d590..f9a7590 100644 --- a/editionkainhofer.sty +++ b/editionkainhofer.sty @@ -264,7 +264,7 @@ \pagebreak \thispagestyle{empty}\null \pagebreak - \vfill\vfill\vfill\vfill\vfill\vfill + ${}$\vfill\vfill\vfill\vfill\vfill\vfill \backpage } @@ -393,9 +393,7 @@ \setlength{\parindent}{-3em} \setlength{\leftskip}{3em} \indent - }{ - \setlength{\parindent}{0em} \setlength{\leftskip}{0em} } diff --git a/measureCounterEngraver.ily b/measureCounterEngraver.ily index a0122c6..ff28e9d 100644 --- a/measureCounterEngraver.ily +++ b/measureCounterEngraver.ily @@ -1,4 +1,4 @@ -\version "2.15.40" +\version "2.17.6" % All this code was copied and adapted from lilypond's input/regression/scheme-text-spanner.ly % The real measure counter engraver was done by David Nalesnik in April 2012 diff --git a/oly_settings_choralscore.ily b/oly_settings_choralscore.ily index 614a882..841d84e 100644 --- a/oly_settings_choralscore.ily +++ b/oly_settings_choralscore.ily @@ -1,4 +1,4 @@ -\version "2.13.17" +\version "2.17.6" % lilypond input for Choral scores: A4, 5mm staff height #(ly:set-option 'relative-includes #t) #(ly:set-option 'incipit #t) diff --git a/oly_settings_fullscore.ily b/oly_settings_fullscore.ily index 8ec2c59..8b45f1c 100644 --- a/oly_settings_fullscore.ily +++ b/oly_settings_fullscore.ily @@ -1,4 +1,4 @@ -\version "2.13.17" +\version "2.17.6" % lilypond input for full scores % changes to the global score settings for full scores #(ly:set-option 'relative-includes #t) diff --git a/oly_settings_global.ily b/oly_settings_global.ily index 1953b64..cd4f24e 100644 --- a/oly_settings_global.ily +++ b/oly_settings_global.ily @@ -1,4 +1,4 @@ -\version "2.13.17" +\version "2.17.6" #(ly:set-option 'relative-includes #t) \include "orchestrallily.ily" diff --git a/oly_settings_instrument.ily b/oly_settings_instrument.ily index be9f7d9..a69c0bd 100644 --- a/oly_settings_instrument.ily +++ b/oly_settings_instrument.ily @@ -1,4 +1,4 @@ -\version "2.13.17" +\version "2.17.6" % lilypond settings for instrumental scores % changes to the global score settings for single-instrument sheets #(ly:set-option 'relative-includes #t) @@ -11,8 +11,8 @@ % Allow line-breaks only at rests! #(define page-breaking ly:page-turn-breaking) % Prevent blank pages inside the score - blank-page-force = #100000 - blank-after-score-page-force = #100000 + blank-page-penalty = #100000 + blank-after-score-page-penalty = #100000 left-margin = 1.5\cm right-margin = 1.5\cm line-width = 18\cm diff --git a/oly_settings_instruments.ily b/oly_settings_instruments.ily index 485b07b..f174555 100644 --- a/oly_settings_instruments.ily +++ b/oly_settings_instruments.ily @@ -1,4 +1,4 @@ -\version "2.13.17" +\version "2.17.6" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%% Defaults for instrument names, short names, cue names, etc. diff --git a/oly_settings_names.ily b/oly_settings_names.ily index a22b678..5c7cc41 100644 --- a/oly_settings_names.ily +++ b/oly_settings_names.ily @@ -1,4 +1,4 @@ -\version "2.13.17" +\version "2.17.6" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%% Defaults for instrument names, short names, cue names, etc. diff --git a/oly_settings_vocalscore.ily b/oly_settings_vocalscore.ily index 989d3d3..500e442 100644 --- a/oly_settings_vocalscore.ily +++ b/oly_settings_vocalscore.ily @@ -1,4 +1,4 @@ -\version "2.13.17" +\version "2.17.6" % lilypond input for vocal scores % changes to the full score settings for vocal scores #(ly:set-option 'relative-includes #t) diff --git a/oly_settings_vocalvoice.ily b/oly_settings_vocalvoice.ily index 1b5c875..ac8a992 100644 --- a/oly_settings_vocalvoice.ily +++ b/oly_settings_vocalvoice.ily @@ -1,4 +1,4 @@ -\version "2.13.17" +\version "2.17.6" % lilypond settings for vocal scores #(ly:set-option 'relative-includes #t) \include "oly_settings_global.ily" diff --git a/orchestrallily.ily b/orchestrallily.ily index 154df4f..02c7b91 100644 --- a/orchestrallily.ily +++ b/orchestrallily.ily @@ -1,4 +1,4 @@ -\version "2.15.19" +\version "2.17.6" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % OrchestralLily @@ -1825,7 +1825,7 @@ divisi = #(define-music-function (parser location vc1 vc2) (ly:music? ly:music?) bracketify = #(define-music-function (parser loc arg) (ly:music?) (_i "Tag @var{arg} to be parenthesized.") #{ - \tweak ParenthesesItem #'stencils #bracket-stencils \parenthesize $arg + \tweak ParenthesesItem.stencils #bracket-stencils \parenthesize $arg #}) @@ -1840,12 +1840,12 @@ bracketify = #(define-music-function (parser loc arg) (ly:music?) parenthesizeLeft = #(define-music-function (parser loc arg) (ly:music?) #{ - -\tweak ParenthesesItem #'stencils #parentheses-item::calc-parenthesis-left-stencils + -\tweak ParenthesesItem.stencils #parentheses-item::calc-parenthesis-left-stencils -\parenthesize $arg #}) parenthesizeRight = #(define-music-function (parser loc arg) (ly:music?) #{ - -\tweak ParenthesesItem #'stencils #parentheses-item::calc-parenthesis-right-stencils + -\tweak ParenthesesItem.stencils #parentheses-item::calc-parenthesis-right-stencils -\parenthesize $arg #}) diff --git a/sceaux_clef-key.ily b/sceaux_clef-key.ily index 383b0d0..65d89aa 100644 --- a/sceaux_clef-key.ily +++ b/sceaux_clef-key.ily @@ -1,4 +1,4 @@ -\version "2.13.17" +\version "2.17.6" %%% -*- Mode: scheme -*- %%% clef.ily -- ancient and modern clef command %%% -- 2.11.4.GIT