input/bugs cleanup

diff --git a/ChangeLog b/ChangeLog
index b4746929db5c62c12a4d00f410850c15f4129276..e09aae12ae3d6a23778edfccde23cccd4cf317e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-05-22  Han-Wen  <hanwen@cs.uu.nl>
 
+       * mf/feta-beugel.mf (code): use autometric macros for braces.
+       This fixes input/bugs/braces.
+
+       * lily/afm.cc (count): return numOfChars, not size of array
+       (always equals 256.)
+
        * lily/script.cc (before_line_breaking): postpone setting the
        X-parent of vertical scripts. This fixes the case of scripts on
        chords with seconds 

diff --git a/input/bugs/accid.ly b/input/bugs/accid.ly
deleted file mode 100644 (file)
index c04b3dd..0000000
--- a/input/bugs/accid.ly
+++ /dev/null
@@ -1,11 +0,0 @@
-\header {
-texidoc="The sharp is printed too far to the left."
-}
-
-\version "1.4.0"
-\score {
-\notes \context Staff <
-  \context Voice = up {\stemUp gis''4}
-  \context Voice = dwn {\stemDown <ces' d'>}
->
-}

diff --git a/input/bugs/accidental-collision.ly b/input/bugs/accidental-collision.ly
deleted file mode 100644 (file)
index 3844066..0000000
--- a/input/bugs/accidental-collision.ly
+++ /dev/null
@@ -1,16 +0,0 @@
-\header {
-texidoc="The two sharps overstrike, the flat and sharp overstrike"
-}
-\version "1.3.148"
-
-\include "paper16.ly"
-\score {
-  \notes {
-    \relative c'' \context Voice \sequential {
-     <dis1 ais e> <bes dis>
-   }
-  }
-  \paper{
-      linewidth = 5.0\cm
-  }
-}

diff --git a/input/bugs/braces.ly b/input/bugs/braces.ly
deleted file mode 100644 (file)
index 94ee08d..0000000
--- a/input/bugs/braces.ly
+++ /dev/null
@@ -1,83 +0,0 @@
-\version "1.3.148"
-
-
-\header {
-texidoc = "Braces at different sizes don't attach exactly to the staffs.
-Previously, some braces were too small, while others were too big; this was
-apparently caused by dvips + mf rounding.  Now, braces are just a bit
-too big."
-}
-
-\include "paper11.ly"
-\paper { linewidth = -1.0 }
-
-\score {
-  \context GrandStaff <
-    \context Staff = a \notes c''1
-    \context Staff = b \notes c''1
-  >
-}
-
-
-\include "paper13.ly"
-\paper { linewidth = -1.0 }
-
-\score {
-  \context GrandStaff <
-    \context Staff = a \notes c''1
-    \context Staff = b \notes c''1
-  >
-  \paper {
-    \translator {
-      \GrandStaffContext
-      SystemStartDelimiter \override #'weird = #-5
-    }
-  }
-}
-
-
-\include "paper16.ly"
-\paper { linewidth = -1.0 }
-
-\score {
-  \context GrandStaff <
-    \context Staff = a \notes c''1
-    \context Staff = b \notes c''1
-  >
-  \paper {
-    \translator {
-      \GrandStaffContext
-      SystemStartDelimiter \override #'weird = #5
-    }
-  }
-}
-
-
-\include "paper20.ly"
-\paper { linewidth = -1.0 }
-
-\score {
-  \context GrandStaff <
-    \context Staff = a \notes c''1
-    \context Staff = b \notes c''1
-  >
-  \paper {
-    \translator {
-      \GrandStaffContext
-      SystemStartDelimiter \override #'weird = #-7
-    }
-  }
-}
-
-
-\include "paper26.ly"
-\paper { linewidth = -1.0 }
-
-\score {
-  \context GrandStaff <
-    \context Staff = a \notes c''1
-    \context Staff = b \notes c''1
-    \context Staff = c \notes c''1
-    \context Staff = d \notes c''1
-  >
-}

diff --git a/input/bugs/time.ly b/input/bugs/time.ly
deleted file mode 100644 (file)
index 3ffea81..0000000
--- a/input/bugs/time.ly
+++ /dev/null
@@ -1,11 +0,0 @@
-\version "1.3.148"
-\header {
-texidoc="Should use old style."
-}
-
-\score {
-  \notes { 
-    \property Staff.TimeSignature \override #'style = #'oldC4/4
-    s1 
-  }
-}

diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly
new file mode 100644 (file)
index 0000000..544aeda
--- /dev/null
+++ b/input/test/ancient-time.ly
@@ -0,0 +1,12 @@
+\version "1.3.148"
+\header {
+texidoc="Should use old style."
+}
+
+\score {
+  \notes { 
+    \property Staff.TimeSignature \override #'style = #'oldC4/4
+    \property Staff.TimeSignature \override #'font-family = #'ancient
+    s1 
+  }
+}

diff --git a/lily/afm.cc b/lily/afm.cc
index 1c760a181379560c5076fd4279fcdc2319f2f5ed..dc5c5519680cb737033a0c6c6ed73cfe7ea62414 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -83,7 +83,8 @@ Adobe_font_metric::find_char_metric (String nm, bool warn) const
 int
 Adobe_font_metric::count () const
 {
-  return ascii_to_metric_idx_.size ();
+  return font_inf_->numOfChars ;
+  //  return ascii_to_metric_idx_.size ();
 }
 
 Box

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index f7fa87e2a08194a127e22baf729c654023259087..ca60bbb4b3bb0579cf9bfd96e2e4b930619eb047 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -13,9 +13,11 @@ EXTRA_DIST_FILES += README feta.tex
 # don't try to make fonts from test files
 TEST_FILES = $(wildcard *test*.mf)
 FET_FILES = $(filter-out $(TEST_FILES),\
-  $(wildcard feta[0-9]*.mf) $(wildcard parmesan[0-9]*.mf))
+       $(wildcard feta[0-9]*.mf) $(wildcard parmesan[0-9]*.mf))\
+       $(wildcard feta-braces*[0-9].mf)
+
 FONT_FILES = $(filter-out $(TEST_FILES),\
-$(wildcard feta*[0-9].mf) $(wildcard parmesan*[0-9].mf))
+       $(wildcard feta*[0-9].mf) $(wildcard parmesan*[0-9].mf)) \
 
 XPM_FONTS = feta20 feta-nummer10 feta-braces20
 #CM_AFM_FILES = cmr10

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index 94218544ca856d03618b84cc982f6c823d5acd5a..419f3b59edc221e7e6653c750bdadb4ac00e0b81 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -11,6 +11,16 @@ save code;
 code := 0;
 
 
+def abc_encode_int (expr i) =
+       if i > 0:
+               abc_encode_int(i div 26)&char(65 + i mod 26)
+       else:
+               "A"
+       fi
+enddef ;
+
+message (abc_encode_int (26));
+
 def draw_brace (expr height_sharp, width_sharp, slt_sharp) =
 
        save pendir, height, width, thin, thick, slt;
@@ -19,8 +29,10 @@ def draw_brace (expr height_sharp, width_sharp, slt_sharp) =
        width# := width_sharp;
        slt# := slt_sharp;
 
-       beginchar(code, width#, height#/2, height#/2);
-       code := incr code;
+fet_beginchar("brace number "&(decimal code), "brace"&abc_encode_int(code),
+               "brace"&abc_encode_int (code))
+
+       set_char_box (0, width#, height#/2, height#/2);
          
        define_pixels (height, width, slt);
        thin = 2 slt;
@@ -44,7 +56,7 @@ def draw_brace (expr height_sharp, width_sharp, slt_sharp) =
                .. z2l .. simple_serif (z1l, z1r, 90) ..cycle;
 
        addto currentpicture also currentpicture yscaled -1;
-endchar;
+fet_endchar;
 enddef;