patch::: 1.0.13.mb1: Re: 1.0.13

pl 13.mb1
	- bf: Lookup::afm_find, the width was undefined for the feta fonts.
	- bf: refman.yo
	- The time signature warnings still remain, will be fixed later.

diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index 826b4569e4a1b3115fcfbe3ee237b92a646e3765..c4be31e720c98bce7b29d9cda164ecade1cb05ad 100644 (file)
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/refman.yo
@@ -1292,7 +1292,7 @@ dit(code(timeSignatureStyle)) Changes the default two-digit layout
       digit, e.g. 3/2 is written as 3.
       dit(code(C2/2,C4/4, old2/2, old3/2, old3/4, old4/4, old6/4 or
       old9/4)): Tells Lilypond to use a specific symbol as time
-      signature.
+      signature, independently of the actual time signature.
    )
 
 The different time signature characters are shown below with
@@ -1300,16 +1300,20 @@ their names:
 mudela(fragment,center)(
 \relative c'' {
 \property Voice.textstyle = typewriter
-\property Staff.timeSignatureStyle = "C"
-\time 2/2; a2^"C" a2 \time 2/2;
-\property Staff.timeSignatureStyle = "old3_2"
-a2_"old3\_2" a2 \time 2/2;
-\property Staff.timeSignatureStyle = "oldC"
-a2^"oldC" a2 \time 2/2;
-\property Staff.timeSignatureStyle = "old6_4"
-a2_"old6\_4" a2 \time 2/2;
-\property Staff.timeSignatureStyle = "old9_4"
-a2^"old9\_4" a2
+\property Staff.timeSignatureStyle = "C2/2"
+\time 2/2; a2^"C2/2" a2 
+\property Staff.timeSignatureStyle = "C4/4"
+\time 2/2; a2^"C4/4" a2 
+\property Staff.timeSignatureStyle = "old2/2"
+\time 2/2; a2^"old2/2" a2 
+\property Staff.timeSignatureStyle = "old3/2"
+\time 2/2; a2^"old3/2" a2 
+\property Staff.timeSignatureStyle = "old4/4"
+\time 2/2; a2^"old4/4" a2 
+\property Staff.timeSignatureStyle = "old6/4"
+\time 2/2; a2^"old6/4" a2 
+\property Staff.timeSignatureStyle = "old9/4"
+\time 2/2; a2^"old9/4" a2 
 }
 )
 

diff --git a/NEWS b/NEWS
index 13afbece6361a94ec13d736c024900de1284c299..036c700d182b261e7021e1cfe24553d48df57952 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+pl 13.mb1
+       - bf: Lookup::afm_find, the width was undefined for the feta fonts.
+       - bf: refman.yo
+       - The time signature warnings still remain, will be fixed later.
+
 pl 12.mb1
        - bf: feta-timesig.mf Added horizontal space, minor corrections.
        - Changed meaning of Staff.timeSignatureStyle:

diff --git a/VERSION b/VERSION
index e7a8da66cd99b8522d7e1718305ce763d27faa97..88db5c3e8f0804d0558a4bd65e92296461f62221 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=13
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/debian/control b/debian/control
index 08a7805a9ee0a3261cac747c460492a0f117e9c3..44a7467fdb917ff3d369a203629033e605c12794 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,12 +9,6 @@ Architecture: any
 Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.  
- LilyPond is the GNU Project music typesetter.  This program can print
- beautiful sheet music from a music definition file.  It can also play
- mechanical performances to a MIDI file.  Features include multiple
- staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,
- beams, slurs, triplets, formatting scores, part extraction.  It includes
- a nice font of musical symbols.
  .
   URL: http://www.cs.ruu.nl/people/hanwen/lilypond
        http://sca.uwaterloo.ca/~praetzel/lilypond/

diff --git a/lily/afm.cc b/lily/afm.cc
index afd43bf1afe47e9f9b1c34203e684f5116017caa..ac38313de73bcaeadfd86d31b1e1ad84e75280f8 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -39,7 +39,7 @@ Adobe_font_char_metric::width ()
 
 Adobe_font_char_metric::Adobe_font_char_metric ()
 {
-  C_ = 0;
+  C_ = -1;
 }
 
 Adobe_font_metric::Adobe_font_metric ()

diff --git a/lily/lookup.cc b/lily/lookup.cc
index fc6843a497801d45ccac418ee93d54e1002dd983..690d245531716e96d6bc0e48f0f7fe3eb6d04ef9 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -78,7 +78,7 @@ Lookup::afm_find (String s, String str) const
   Adobe_font_char_metric m = afm_p_->find_char (s);
 
   Atom a;
-  if (m.width () ==0)
+  if (m.code () < 0)
     return a;
   
   a.dim_ = m.B_;

diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index f416bba8c25d33b4c59c1bb105795b952fb83e3e..e80a35a668c3e5e7ffee735356e285072f661877 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -92,3 +92,4 @@
 1.0.12
 1.0.12.uu1
 1.0.13
+1.0.13.mb1