From: fred Date: Wed, 27 Mar 2002 00:35:09 +0000 (+0000) Subject: lilypond-1.3.121 X-Git-Tag: release/1.5.59~1015 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5407168fc708519ce5026af9f0f799d49ff8bc4d;p=lilypond.git lilypond-1.3.121 --- diff --git a/input/denneboom.ly b/input/denneboom.ly index 29a964f31b..7c2a080e46 100644 --- a/input/denneboom.ly +++ b/input/denneboom.ly @@ -7,7 +7,7 @@ copyright = "public domain"; \include "paper20.ly" -\version "1.3.117"; +\version "1.3.120"; oden = \lyrics{ O | @@ -81,7 +81,7 @@ verseTwoStaff = \context Lyrics = two denneboomShape = \paper{ - \paper_twenty + \paperTwenty indent = 20. \mm; % UGH -- THIS IS HAIRY diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 80d7ff72da..a4ee1e373d 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -4,7 +4,7 @@ http://www.Arkkra.com/doc/star.html http://www.Arkkra.com/doc/star.ps %} -\version "1.3.117"; +\version "1.3.120"; % TODO: % @@ -164,7 +164,7 @@ text = \lyrics { > > \paper{ - \paper_sixteen + \paperSixteen textheight = 230.\mm; linewidth= 180.\mm; \translator { diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 34a26de846..37e39a8e37 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -3,82 +3,101 @@ date = "2000"; } -\version "1.3.117"; +\version "1.3.120"; \include "paper26.ly" global = \notes { - \property Score.timing = 1 - \property Staff.TimeSignature \override #'style = #"old" - \time 2/2; + \property Score.timing = ##f +% \property Staff.TimeSignature \override #'style = #'old } upperVoice = \context Staff = upperVoice < \global - \property Staff.numberOfStaffLines = 4 + \property Staff.StaffSymbol \override #'line-count = #4 \notes \transpose c' { - \property Staff.Custos \override #'style = #'"vaticana" + \property Voice.NoteHead \override #'style = #'mensural + \property Voice.Stem \override #'stem-centered = ##t + \property Staff.Custos \override #'style = #'vaticana \clef "vaticana_fa2"; - c1 d e f g + c2 d e f g + +% \property Staff.clefGlyph = #"clefs-vaticana_do" +% \property Staff.clefPosition = #1 +% \property Staff.clefOctavation = #0 \clef "vaticana_do2"; - a b c' \bar "|"; + + a b c' b a g f \clef "vaticana_fa1"; - e d c\breve \bar "|"; + e d c1 \bar "|"; - \property Staff.Custos \override #'style = #"medicaea" + \property Staff.Custos \override #'style = #'medicaea \clef "medicaea_fa2"; - c1 d e f g + c2 d e f g \clef "medicaea_do2"; - a b c' \bar "|"; + a b c' b a g f \clef "medicaea_fa1"; - e d c\breve \bar "|"; + e d c1 \bar "|"; - \property Staff.Custos \override #'style = #'"hufnagel" + \property Staff.Custos \override #'style = #'hufnagel \clef "hufnagel_fa2"; - c1 d e f g + c2 d e f g \clef "hufnagel_do2"; - a b c' \bar "|"; + a b c' b a g f \clef "hufnagel_fa1"; - e d c\breve \bar "||"; + e d c1 \bar "||"; } > lowerVoice = \context Staff = lowerNotes < \global - \property Staff.numberOfStaffLines = 5 - \notes \transpose c'' { - \property Staff.Custos \override #'style = #'"mensural" + \property Staff.StaffSymbol \override #'line-count = #5 + \notes \transpose c' { + \property Voice.NoteHead \override #'style = #'mensural + \property Voice.Stem \override #'stem-centered = ##t + \property Staff.Custos \override #'style = #'mensural \clef "mensural1_c2"; - c1 d e f g + c2 d e f g \clef "mensural1_c2"; - a b c' \bar "|"; + a b c' b a g f \clef "mensural2_c2"; - e d c\breve \bar "|"; + e d c1 \bar "|"; \clef "mensural2_c2"; - c1 d e f g + c2 d e f g \clef "mensural3_c2"; - a b c' \bar "|"; + a b c' b a g f \clef "mensural3_c2"; - e d c\breve \bar "|"; + e d c1 \bar "|"; - \clef "mensural_f"; - c1 d e f g - \clef "mensural_f"; - a b c' \bar "|"; + \clef "mensural1_f"; + c2 d e f g + \clef "mensural1_f"; + a b c' b a g f - \clef "mensural_f"; - e d c\breve \bar "|"; + \clef "mensural2_f"; + e d c1 \bar "|"; - \clef "hufnagel"; - c,1 d, e, f, g, - \clef "hufnagel"; - a, b, c \bar "||"; + \clef "mensural2_f"; + c2 d e f g + \clef "mensural_g"; + a' b' c'' + b' a' g' f' + \clef "mensural_g"; + e' d' c'1 \bar "|"; + + \clef "mensural_g"; + c'2 d' e' f' g' + \clef "hufnagel_do_fa"; + a b c' + b a g f + \clef "hufnagel_do_fa"; + e d c1 \bar "||"; } > @@ -88,14 +107,16 @@ lowerVoice = \context Staff = lowerNotes < \lowerVoice > \paper { -% \paper_twentysix +% \paperTwentysix linewidth = 17.25\cm; textheight = 26.0\cm; indent = 0.0; \translator { \StaffContext - \consists "Custos_engraver"; -% custosStyle = "mensural"; + \consists Custos_engraver; +% Custos \override #'style = #'mensural; + \remove Time_signature_engraver; +% StaffSymbol \override #'line-count = #4 } } } diff --git a/input/test/drarn-chords.ly b/input/test/drarn-chords.ly index d8eb62b753..6acba0eaaf 100644 --- a/input/test/drarn-chords.ly +++ b/input/test/drarn-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; +\version "1.3.120"; %{ Would this be acceptable/good enough/convenient for entry? @@ -29,7 +29,7 @@ scales = \notes \transpose c'' \chords{ \context Staff \scales > \paper{ -% \paper_as_nine +% \paperAs_nine \translator { \ChordNamesContext } diff --git a/input/test/font.ly b/input/test/font.ly index 7c0843f268..513a42b887 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.117"; +\version "1.3.120"; \include "font-body.ly" \score{ @@ -18,7 +18,7 @@ description = "This file tests the Feta music font"; gourlay_maxmeasures =5.; } \paper{ - \paper_twenty + \paperTwenty linewidth = 17.5 \cm; gourlay_maxmeasures =5.; output = "font20.tex"; diff --git a/input/test/font16.ly b/input/test/font16.ly index 7431a833e9..ca8d872dc1 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.117"; +\version "1.3.120"; \include "paper16.ly" \include "font-body.ly" @@ -16,7 +16,7 @@ description = "This file tests the Feta music font"; \paper{ % don't change this. % otherwise 16pt and 20pt layouts differ. - \paper_sixteen + \paperSixteen linewidth = 12.5 \cm; gourlay_maxmeasures =5.; } diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index 4c1b4f5f99..99160b7dd1 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.3.117"; +\version "1.3.120"; m = \notes \relative c''{ @@ -89,7 +89,7 @@ c1 | c2 c | c c | R1*5 > > \paper { -% \paper_sixteen; +% \paperSixteen; linewidth = 185.\mm; textheight = 260.\mm; \translator { diff --git a/input/test/standchen-as5.ly b/input/test/standchen-as5.ly index 8cc60338a0..76187250dc 100644 --- a/input/test/standchen-as5.ly +++ b/input/test/standchen-as5.ly @@ -1,5 +1,5 @@ -\version "1.3.117"; +\version "1.3.120"; \include "paper-as5.ly" @@ -22,7 +22,7 @@ } > \paper { -% \paper_as_nine +% \paperAs_nine indent=4.0\char; linewidth=78.0\char; \translator { \StaffContext barSize = #4.5 } diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index ce0674f8eb..ec8ab984bb 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,12 +1,12 @@ % Toplevel initialisation file. -\version "1.3.110"; +\version "1.3.120"; \include "declarations.ly" \include "paper16.ly" - \paper { \paper_sixteen + \paper { \paperSixteen linewidth = -1.\cm; castingalgorithm = \Wordwrap; "unusedentry" = "}\\def\\nolilyfooter{"; diff --git a/ly/book-init.ly b/ly/book-init.ly index 994200cfb5..7f268f5787 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,13 +1,13 @@ % Toplevel initialisation file. -\version "1.3.110"; +\version "1.3.120"; \include "declarations.ly"; \include "paper16.ly" \paper{ - \paper_sixteen + \paperSixteen } diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index 64a127cb9c..af0b413a5d 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.3.110"; +\version "1.3.120"; \include "declarations.ly" @@ -9,7 +9,7 @@ \include "paper16.ly"; \paper { - \paper_sixteen + \paperSixteen linewidth = -1.0\cm; castingalgorithm = \Wordwrap; "unusedentry" = "}\\def\\nolilyfooter{"; diff --git a/ly/center.ly b/ly/center.ly index a53dc01fd9..53743596eb 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,13 +1,13 @@ % Toplevel initialisation file. -\version "1.3.110"; +\version "1.3.120"; \include "declarations.ly" \include "paper16.ly" \paper { - \paper_sixteen + \paperSixteen % linewidth = 7.\cm; linewidth = 11.\cm; } diff --git a/ly/fragment.ly b/ly/fragment.ly index 4e3d664877..be841ce576 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.3.110"; +\version "1.3.120"; \include "declarations.ly" @@ -8,7 +8,7 @@ \include "paper16.ly"; \paper { - \paper_sixteen + \paperSixteen linewidth = -1.0\cm; castingalgorithm = \Wordwrap; "unusedentry" = "}\\def\\nolilyfooter{"; diff --git a/ly/init-as.ly b/ly/init-as.ly index 3e727da657..1fe3c67e14 100644 --- a/ly/init-as.ly +++ b/ly/init-as.ly @@ -1,6 +1,6 @@ % Toplevel AsciiScript initialisation file. -\version "1.3.110"; +\version "1.3.120"; \include "declarations-as.ly" @@ -27,7 +27,7 @@ ) \paper { - \paper_as_nine + \paperAs_nine \translator { \StaffContext barSize = \staffheight; } % no beam-slope diff --git a/ly/paper-as5.ly b/ly/paper-as5.ly index f4ca1af14c..44f0842b92 100644 --- a/ly/paper-as5.ly +++ b/ly/paper-as5.ly @@ -1,8 +1,8 @@ % paper-as5.ly -\version "1.3.110"; +\version "1.3.120"; -paper_as_five = \paper { +paperAsFive = \paper { staffheight = 5.\char; font_large = 1.; @@ -35,4 +35,4 @@ paper_as_five = \paper { \include "params-as.ly"; } -\paper { \paper_as_five } +\paper { \paperAs_five } diff --git a/ly/paper-as9.ly b/ly/paper-as9.ly index c2bfcbec98..eae4c50c16 100644 --- a/ly/paper-as9.ly +++ b/ly/paper-as9.ly @@ -1,8 +1,8 @@ % paper-as9.ly -\version "1.3.110"; +\version "1.3.120"; -paper_as_nine = \paper { +paperAsNine = \paper { staffheight = 9.\char; % font_large = 4.; @@ -38,4 +38,4 @@ paper_as_nine = \paper { \include "params-as.ly"; } -\paper { \paper_as_nine } +\paper { \paperAs_nine } diff --git a/ly/paper11.ly b/ly/paper11.ly index 3880420dc0..6a87d8b2e8 100644 --- a/ly/paper11.ly +++ b/ly/paper11.ly @@ -1,12 +1,12 @@ % paper11.ly -\version "1.3.110"; +\version "1.3.120"; -paper_eleven = \paper { +paperEleven = \paper { staffheight = 11.0\pt; \stylesheet #(make-style-sheet 'paper11) \include "params.ly"; } -\paper { \paper_eleven } +\paper { \paperEleven } diff --git a/ly/paper13.ly b/ly/paper13.ly index 488165dca6..e5d03d652d 100644 --- a/ly/paper13.ly +++ b/ly/paper13.ly @@ -1,8 +1,8 @@ % paper13.ly -\version "1.3.110"; +\version "1.3.120"; -paper_thirteen = \paper { +paperThirteen = \paper { staffheight = 13.0\pt; \stylesheet #(make-style-sheet 'paper13) @@ -10,4 +10,4 @@ paper_thirteen = \paper { \include "params.ly"; } -\paper { \paper_thirteen } +\paper { \paperThirteen } diff --git a/ly/paper16.ly b/ly/paper16.ly index 779b810675..507e3ca5de 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -1,12 +1,12 @@ % paper16.ly -\version "1.3.110"; +\version "1.3.120"; -paper_sixteen = \paper { +paperSixteen = \paper { staffheight = 16.0\pt; \stylesheet #(make-style-sheet 'paper16) \include "params.ly"; } -\paper {\paper_sixteen } +\paper {\paperSixteen } diff --git a/ly/paper20.ly b/ly/paper20.ly index 7b30c4a7d2..d30ec07880 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,13 +1,13 @@ % paper20.ly -\version "1.3.110"; +\version "1.3.120"; -paper_twenty = \paper { +paperTwenty = \paper { staffheight = 20.0\pt; \stylesheet #(make-style-sheet 'paper20) \include "params.ly"; } -\paper { \paper_twenty } +\paper { \paperTwenty } diff --git a/ly/paper23.ly b/ly/paper23.ly index 6b6203078c..6e9ba50546 100644 --- a/ly/paper23.ly +++ b/ly/paper23.ly @@ -1,12 +1,12 @@ % paper23.ly -\version "1.3.110"; +\version "1.3.120"; -paper_twentythree = \paper { +paperTwentythree = \paper { staffheight = 23.0\pt; \stylesheet #(make-style-sheet 'paper23) \include "params.ly"; } -\paper { \paper_twentythree } +\paper { \paperTwentythree } diff --git a/ly/paper26.ly b/ly/paper26.ly index 593b6bd33b..db39985339 100644 --- a/ly/paper26.ly +++ b/ly/paper26.ly @@ -1,12 +1,12 @@ % paper26.ly -\version "1.3.110"; +\version "1.3.120"; -paper_twentysix = \paper { +paperTwentysix = \paper { staffheight = 26.0\pt; \stylesheet #(make-style-sheet 'paper26) \include "params.ly"; } -\paper { \paper_twentysix } +\paper { \paperTwentysix }