From: Han-Wen Nienhuys Date: Mon, 12 Apr 2004 11:57:14 +0000 (+0000) Subject: * input/mutopia/J.S.Bach/wtk1-fugue2.ly (bassdux): use \book. X-Git-Tag: release/2.3.1~96 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8a79cd32eeeaffb4d1b6ad551b0b2a23a6029db7;p=lilypond.git * input/mutopia/J.S.Bach/wtk1-fugue2.ly (bassdux): use \book. * input/mutopia/W.A.Mozart/mozart-hrn-3.ly: use \book. * VERSION: release 2.3.0 --- diff --git a/ChangeLog b/ChangeLog index 9ad370622c..bd18b203d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-04-12 Han-Wen Nienhuys + * input/mutopia/J.S.Bach/wtk1-fugue2.ly (bassdux): use \book. + + * input/mutopia/W.A.Mozart/mozart-hrn-3.ly: use \book. + + * VERSION: release 2.3.0 + * mf/feta-nummer-code.mf: use ascii names for number glyphs. * buildscripts/mf-to-table.py (parse_logfile): only prepend group- diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index 21ffc0f99c..bb1a5db452 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -19,8 +19,8 @@ @item The @code{font-encoding} property can now be used to select differently encoded fonts. The previous default setting @code{TeX-text} has been replaced by latin1. LilyPond requires the -@uref{ec-fonts-mftraced,http://www.lilypond.org/download/fonts/} -installed to function properly. +@uref{http://www.lilypond.org/download/fonts/,ec-fonts-mftraced} +package installed to function properly. @item The encoding of a file can be switched with @code{\encoding}. The strings for markup texts are translated diff --git a/VERSION b/VERSION index b6bb35054f..7daa5baee8 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=3 -PATCH_LEVEL=0 +PATCH_LEVEL=1 MY_PATCH_LEVEL= diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index dcafad7c5f..851276ef41 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -13,15 +13,23 @@ style = "baroque" copyright = "Public Domain" maintainer = "hanwen@cs.uu.nl" - mutopiapublicdomain = "\\parbox{\\hsize}{\\thefooter\\quad\\small - \\\\This music is part of the Mutopia project, - \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset - and placed in the public domain by " + \maintainer + - ".\\\\Unrestricted modification and redistribution is permitted - and encouraged---copy this music and share it.}" - tagline = \mutopiapublicdomain - lastupdated = "2002/August/19" + %% TODO: handle \footer, \head[er] properly footer = "Mutopia-2002/08/19-6" + + tagline = \markup { \smaller + \column < + \fill-line < \footer "" > + \fill-line < { "This music is part of the Mutopia project, " + \typewriter { "http://sca.uwaterloo.ca/Mutopia/" } + "." } > + \fill-line < { "It has been typeset and placed in the public " + "domain by " \maintainer "." } > + \fill-line < { "Unrestricted modification and redistribution " + "is permitted and encouraged---copy this music " + "and share it!" } > + > + } + lastupdated = "2002/August/19" } @@ -189,6 +197,8 @@ bassdux = \context Voice=three \notes \relative c' { >> } + +\book { \score { \notes \context PianoStaff << \override Score.TimeSignature #'style = #'C @@ -220,3 +230,4 @@ bassdux = \context Voice=three \notes \relative c' { } } +} diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly index 434b07ed75..9decbe15a3 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly @@ -53,3 +53,33 @@ virtuoso that taught in Geneva. + +\book { +\score +{ + \notes { \transpose c' bes \allegro } + \paper{ } + \header { piece = "allegro" opus = "" } + \midi{ \tempo 4=90 } +} + + +\score +{ + \notes { \transpose c' bes \romanze } + \header { piece = "romanze" opus = "" } + \midi{ \tempo 4 = 70 } + \paper{} +} + + +\score +{ + \notes { \transpose c' bes \rondo } + \header { piece = "rondo" opus = "" } + \midi{ \tempo 4 = 100 } + \paper { } +} + + +} diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly index 06bd8ccab7..5a14ef8b30 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly @@ -194,12 +194,3 @@ allegro = } - -\score -{ - \notes { \transpose c' bes \allegro } - \paper{ } - \header { piece = "allegro" opus = "" } - \midi{ \tempo 4=90 } -} - diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly index 66afd7acc9..2508497ce9 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly @@ -88,12 +88,3 @@ romanze = \notes \relative c' { } - -\score -{ - \notes { \transpose c' bes \romanze } - \header { piece = "romanze" opus = "" } - \midi{ \tempo 4 = 70 } - \paper{} -} - diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly index e0b80bea96..5605285031 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly @@ -194,11 +194,3 @@ rondo = \notes \relative c' c4 r8 r4 r8 \bar "|." } -\score -{ - \notes { \transpose c' bes \rondo } - \header { piece = "rondo" opus = "" } - \midi{ \tempo 4 = 100 } - \paper { } -} - diff --git a/scm/output-lib.scm b/scm/output-lib.scm index c88dd2a033..943cf4c390 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -65,27 +65,25 @@ (define-public (make-stencil-boxer line-thick x-padding y-padding callback) - "Makes a routine that adds a box around the grob parsed as argument" + "Makes a routine that adds a box around the grob parsed as argument" (define (stencil-boxer grob) - (let* - ( - (mol (callback grob)) - (x-ext (interval-widen (ly:stencil-extent mol 0) x-padding)) - (y-ext (interval-widen (ly:stencil-extent mol 1) y-padding)) - (x-rule (make-filled-box-stencil (interval-widen x-ext line-thick) - (cons 0 line-thick))) - (y-rule (make-filled-box-stencil (cons 0 line-thick) y-ext)) - ) - - (set! mol (ly:stencil-combine-at-edge mol 0 1 y-rule x-padding)) - (set! mol (ly:stencil-combine-at-edge mol 0 -1 y-rule x-padding)) - (set! mol (ly:stencil-combine-at-edge mol 1 1 x-rule 0)) - (set! mol (ly:stencil-combine-at-edge mol 1 -1 x-rule 0)) - - mol - )) - stencil-boxer - ) + (let* + ( + (mol (callback grob)) + (x-ext (interval-widen (ly:stencil-extent mol 0) x-padding)) + (y-ext (interval-widen (ly:stencil-extent mol 1) y-padding)) + (x-rule (make-filled-box-stencil (interval-widen x-ext line-thick) + (cons 0 line-thick))) + (y-rule (make-filled-box-stencil (cons 0 line-thick) y-ext)) + ) + + (set! mol (ly:stencil-combine-at-edge mol 0 1 y-rule x-padding)) + (set! mol (ly:stencil-combine-at-edge mol 0 -1 y-rule x-padding)) + (set! mol (ly:stencil-combine-at-edge mol 1 1 x-rule 0)) + (set! mol (ly:stencil-combine-at-edge mol 1 -1 x-rule 0)) + + mol)) + stencil-boxer) (define-public (arg->string arg) (cond ((number? arg) (ly:inexact->string arg 10))