patch::: 1.1.39.mb2: Re: LilyPond 1.1.39 -- The Rantokil Release

pl 39.mb2
	- added more mensural style time signatures, old3/4, old6/8, old9/8
	- redesigned old6/4, old9/4
	- Updated refman.yo, lilypond-regtest.doc, clefs.ly, time.fly

---
Generated by (address unknown) using package-diff 0.62,
>From = lilypond-1.1.39.mb1, To = lilypond-1.1.39.mb2

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.39.mb2.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.

--state
1.1.39.mb1
1.1.39.mb2
++state

diff --git a/Documentation/tex/lilypond-regtest.doc b/Documentation/tex/lilypond-regtest.doc
index be31df81b48c91fa499ad40c88c22dd2d8c7e87f..777592ed0b862a95649471371aeefc27c3d9134b 100644 (file)
--- a/Documentation/tex/lilypond-regtest.doc
+++ b/Documentation/tex/lilypond-regtest.doc
@@ -7,7 +7,7 @@
 \maketitle
 
 This document tries give an brief overview of LilyPond features. When
-the text correspond with  the shown notation, we consider LilyPond
+the text correspond with the shown notation, we consider LilyPond
 Officially BugFree (tm).
 
 \section{Notes and rests} 
@@ -79,4 +79,21 @@ knowing it.  Consequently, they fall over quite often.
 \mudelafile{bar-scripts.ly}
 
 
+\section{Clefs and Time Signatures}
+
+For octaviated clefs, the ``8'' should appear closely above or below
+the clef respectively. The transparent clef should not occupy any space
+and with style \texttt{fullSizeChanges}, the changing clef should be
+typeset in full size.
+
+\mudelafile{clefs.ly}
+
+By default, time signatures are written with two numbers. With style
+``C'', 4/4 and 2/2 are written with their corresponding symbols and
+with style ``old'', 2/2, 3/2, 3/4, 4/4, 6/4, 9/4, 6/8 and 9/8 are
+typeset with symbols, all other signatures retain the default layout.
+The style ``1'', gives single number signatures for all signatures.
+
+\mudelafile{time.fly}
+
 \end{document}

diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index 2eba7062cde74a28b6394aba2be4571431cf4fb3..1271a61daf708fa7ef69ab30d89cefadc47212cd 100644 (file)
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/refman.yo
@@ -1080,7 +1080,7 @@ mudela(center)(
            \clef baritone; c'4_"\kern -10mm baritone"
            \clef varbaritone; c'4^"\kern -10mm varbaritone"
            \clef tenor;     c'4_"\kern -10mm tenor"
-%           \clef "G_8";   c'4^"\kern -6mm G\_8"  %%% BROKEN!
+           \clef "G_8";   c'4^"\kern -6mm G\_8" 
    }  
    \paper{ linewidth= 4.5 \in; }
 }
@@ -1542,20 +1542,21 @@ dit(code(timeSignatureStyle)) Changes the default two-digit layout
    description(
       dit(code(C)) 4/4 and 2/2 are typeset as C and struck C,
       respectively. All other time signatures are written with two digits.
-      dit(code(old)) 2/2, 3/2, 3/4, 4/4, 6/4 and 9/4 are typeset with
-      old-style mensuration marks. All other time signatures are 
+      dit(code(old)) 2/2, 3/2, 3/4, 4/4, 6/4, 9/4, 6/8 and 9/8 are typeset 
+      with old-style mensuration marks. All other time signatures are 
       written with two digits.
       dit(code(1)) All time signatures are typeset with a single
       digit, e.g. 3/2 is written as 3.
       dit(code(C2/2), code(C4/4), code(old2/2), code(old3/2),
-      code(old3/4), code(old4/4), code(old6/4) or
-      code(old9/4)) Tells Lilypond to use a specific symbol as time
-      signature.
+      code(old3/4), code(old4/4), code(old6/4), code(old9/4), 
+      code(old6/8) or code(old9/8))Tells Lilypond to use a 
+      specific symbol as time signature.
    )
 The different time signature characters are shown below with
 their names:
-mudela(fragment,center)(
-\relative c'' {
+mudela(center)(
+\score{
+  \notes\relative c'' {
 \property Voice.textstyle = typewriter
 \property Staff.timeSignatureStyle = "C2/2"
 \time 2/2; a2^"C2/2" a2 
@@ -1571,6 +1572,12 @@ mudela(fragment,center)(
 \time 2/2; a2^"old6/4" a2 
 \property Staff.timeSignatureStyle = "old9/4"
 \time 2/2; a2^"old9/4" a2 
+\property Staff.timeSignatureStyle = "old6/8"
+\time 2/2; a2^"old6/8" a2 
+\property Staff.timeSignatureStyle = "old9/8"
+\time 2/2; a2^"old9/8" a2 
+}
+   \paper{ linewidth= 4.5 \in; }
 }
 )
 

diff --git a/NEWS b/NEWS
index d561e5e3aee1b152f3c7af96611abf63e731e085..7402eb06ceacb1c6330bfa30cc27b38322a23761 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
---- ../lilypond-1.1.39/NEWS    Tue Apr 13 21:32:36 1999
+--- ../lilypond-1.1.39.mb1/NEWS        Tue Apr 13 22:32:12 1999
+++ b/NEWS      Fri Apr 16 00:27:00 1999
+@@ -1,3 +1,8 @@
+pl 39.mb2
+       - added more mensural style time signatures, old3/4, old6/8, old9/8
+       - redesigned old6/4, old9/4
+       - Updated refman.yo, lilypond-regtest.doc, clefs.ly, time.fly
+
+ pl 39.mb1
+       - bf: invisible clefs don't take any space, moved _8 below clef
+       - updated incipit example and macro--- ../lilypond-1.1.39/NEWS  Tue Apr 13 21:32:36 1999
 ++ b/NEWS      Tue Apr 13 22:43:46 1999
 @@ -1,3 +1,7 @@
 pl 39.hwn1

diff --git a/VERSION b/VERSION
index c6610d636ac704351affea3003a4be450076c976..454983ee754bc0312a189156aca273d053adb91c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=39
-MY_PATCH_LEVEL=hwn1
+MY_PATCH_LEVEL=mb2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/clefs.ly b/input/test/clefs.ly
index d79ab9a22f787d7c76cecc9e40deda00fb217dbb..3874a441c03d22de7315ac56f1e09aa60f9bd655 100644 (file)
--- a/input/test/clefs.ly
+++ b/input/test/clefs.ly
@@ -2,7 +2,7 @@
 
 \score {
        \notes{ 
-         \clef "violin"; c'1^"{violin}" \bar "||";
+         \clef "treble"; c'1^"{treble}" \bar "||";
          \clef "french";c'1^"{french}" \bar "||";
          \clef "soprano";c'1^"{soprano}" \bar "||";
          \clef "mezzosoprano";c'1^"{mezzosoprano}" \bar "||";
@@ -11,9 +11,13 @@
          \clef "baritone";c'1^"{baritone}" \bar "||";
          \clef "varbaritone";c'1^"{varbaritone}" \bar "||";
          \clef "G_8";c'1^"{sub 8?}" \bar "||";
-         \clef "G^8";c'1^"{sup 8?}" \bar "|.";
+         \clef "G^8";c'1^"{sup 8?}" \bar "||";
          \clef "bass";c'1^"{bass}" \bar "||";
-         \clef "subbass";c'1^"{subbass}" \bar "|.";
+         \clef "subbass";c'1^"{subbass}" \bar "||";
+       \property Staff.clefStyle="transparent"
+         \clef "treble"; c'1^"clefStyle=\"transparent\"" \bar "||";
+       \property Staff.clefStyle="fullSizeChanges"
+         \clef "treble"; c'1^"clefStyle=\"fullSizeChanges\"" \bar "|.";
          }
          \paper{
          }

diff --git a/input/test/time.fly b/input/test/time.fly
index a7fd1d68b3dfef894f415d078f20f63b7535ad6a..1fdfbf05594746022eb22e5b619882b918fad24a 100644 (file)
--- a/input/test/time.fly
+++ b/input/test/time.fly
@@ -1,3 +1,4 @@
+\property Staff.textEmptyDimension = 1
 \property Staff.timeSignatureStyle = "C"
 \time 1/1;
 c''1^"timeSignatureStyle = \"C\"" 
@@ -41,6 +42,10 @@ c1 c2.
 c\breve 
 \time 9/4; 
 c2. c2. c2. 
+\time 6/8; 
+c2. 
+\time 9/8; 
+c4. c4. c4. 
 \break
 \property Staff.timeSignatureStyle = ""
 \time 1/1; 
@@ -71,11 +76,8 @@ c1^"timeSignatureStyle = \"1\""
 c1
 \time 3/4; 
 c2.
-%{   % Error if these lines are uncommented:
-     % Line ... [0guile: Wrong type to apply: #<unknown-type (0x7f . 0x4026a148) @ 0x4026a150>
 \time 4/4; 
 c1
-%}
 \time 5/4; 
 c2. c2
 \time 6/4; 
@@ -89,25 +91,31 @@ c\breve
 \time 9/4; 
 c2. c2. c2. 
 \break
-\property Staff.timeSignatureStyle = "old9/4"
 \property Staff.textalignment = \center
+\property Staff.timeSignatureStyle = "old9/8"
+\time 1/1; 
+c1^"old9/8" 
+\property Staff.timeSignatureStyle = "old6/8" 
+\time 1/1; 
+c1^"old6/8" 
+\property Staff.timeSignatureStyle = "old9/4"
 \time 1/1; 
 c1^"old9/4" 
 \property Staff.timeSignatureStyle = "old6/4" 
-\time 2/2; 
+\time 1/1; 
 c1^"old6/4" 
 \property Staff.timeSignatureStyle = "old3/2"
-\time 3/4; 
-c2.^"old3/2" 
+\time 1/1; 
+c1^"old3/2" 
 \property Staff.timeSignatureStyle = "old4/4"
-\time 4/4; 
+\time 1/1; 
 c1^"old4/4" 
 \property Staff.timeSignatureStyle = "old2/2"
-\time 5/4; 
-c2.^"old2/2" c2
+\time 1/1; 
+c1^"old2/2"
 \property Staff.timeSignatureStyle = "C4/4"
-\time 6/4; 
-c1.^"C4/4" 
+\time 1/1; 
+c1^"C4/4" 
 \property Staff.timeSignatureStyle = "C2/2"
-\time 3/2; 
-c1.^"C2/2" 
+\time 1/1; 
+c1^"C2/2" 

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index 58be0e457691c537c7f27a104fdb7290da68c4ea..397628db30fb4db7d9c70cffbb8b5f7ab1210e9a 100644 (file)
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -37,11 +37,11 @@ if test = 0:
 else:
 %      input feta-bolletjes;   
 %      input feta-banier;
-       input feta-eindelijk;
+%      input feta-eindelijk;
 %      input feta-klef;
 %      input feta-toevallig;
 %      input feta-schrift;
 %      input feta-schrift;
 %      input feta-haak;
-%      input feta-timesig;
+       input feta-timesig;
 fi

diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf
index 3cb794c58687009060b219966aa9ed0900d0799f..afe2d28c10e2b84243f3560967fdae5ee677fcc6 100644 (file)
--- a/mf/feta-timesig.mf
+++ b/mf/feta-timesig.mf
@@ -84,6 +84,7 @@ fet_beginchar ("Mensural 4/4 meter", "old4/4", "oldfourfourmeter")
        draw threequartercircle rotated 45 scaled Cdiameter;
 fet_endchar;
 
+%% tempus imperfectum cum prolatione imperfecta proportio dupla
 fet_beginchar ("Mensural 2/2 meter", "old2/2", "oldallabreve")
        set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
                interline#, interline#);
@@ -105,25 +106,57 @@ fet_endchar;
 %% tempus imperfectum cum prolatione perfecta
 fet_beginchar ("Mensural 6/4 meter", "old6/4", "oldsixfourmeter")
        set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
-               .5 Cdiameter# + .5 interline#, .5 Cdiameter#+ .5 interline#);
+               .5 Cdiameter#, .5 Cdiameter#);
        
        pickup pencircle scaled Cthickness;
-       draw threequartercircle rotated 45 scaled Cdiameter 
-               shifted (0,.5 interline);
-       pickup pencircle scaled 3 stafflinethickness;
-       draw (0,.5 interline);
+       draw threequartercircle rotated 45 scaled Cdiameter;
+       pickup pencircle scaled 4 stafflinethickness;
+       draw (0,0);
 fet_endchar;
 
 %% tempus perfectum cum prolatione perfecta
 fet_beginchar ("Mensural 9/4 meter", "old9/4", "oldninefourmeter")
        set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
-               .5 Cdiameter# + .5 interline#, .5 Cdiameter#+ .5 interline#);
+               .5 Cdiameter#, .5 Cdiameter#);
+       
+       pickup pencircle scaled Cthickness;
+       draw fullcircle scaled Cdiameter;
+       pickup pencircle scaled 4 stafflinethickness;
+       draw (0,0);
+fet_endchar;
+
+%% tempus perfectum cum prolatione imperfecta proportio dupla
+fet_beginchar ("Mensural 3/4 meter", "old3/4", "oldthreefourmeter")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               interline#, interline#);
        
        pickup pencircle scaled Cthickness;
-       draw fullcircle scaled Cdiameter shifted (0,.5 interline);
-       pickup pencircle scaled 3 stafflinethickness;
-       draw (0,.5 interline);
+       draw fullcircle scaled Cdiameter;
+       draw_block((-Cthickness/2, -d), (Cthickness/2, h));
 fet_endchar;
 
+%% tempus imperfectum cum prolatione perfecta proportio dupla
+fet_beginchar ("Mensural 6/8 meter", "old6/8", "oldsixeightmeter")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+                interline#, interline#);
+       
+       pickup pencircle scaled Cthickness;
+       draw threequartercircle rotated 45 scaled Cdiameter;
+       pickup pencircle scaled 4 stafflinethickness;
+       draw (0,0);
+       draw_block((-Cthickness/2, -d), (Cthickness/2, h));
+fet_endchar;
+
+%% tempus perfectum cum prolatione perfecta proportio dupla
+fet_beginchar ("Mensural 9/8 meter", "old9/8", "oldnineeight")
+       set_char_box(.5 Cdiameter# + interline#, .5 Cdiameter# + interline#, 
+               interline#, interline#);
+       
+       pickup pencircle scaled Cthickness;
+       draw fullcircle scaled Cdiameter;
+       pickup pencircle scaled 4 stafflinethickness;
+       draw (0,0);
+       draw_block((-Cthickness/2, -d), (Cthickness/2, h));
+fet_endchar;
 
 fet_endgroup("timesig");