* input/test/trills.ly (endHorizScript): fixes.

* input/test/chord-names-jazz.ly: merge in alternate Jazz
notation, move from regression.

diff --git a/ChangeLog b/ChangeLog
index 5870e8ba804f3fd065d8edd7a8f5320e3f1866e8..0a628fb95648ac8571a8219dd907b099bd8f499b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-07-15  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/test/trills.ly (endHorizScript): fixes.
+
+       * input/test/chord-names-jazz.ly: merge in alternate Jazz
+       notation, move from regression.
+
        * input/test/script-stack.ly: change name from stacked-scripts
 
        * input/test/ossia.ly: octave errors.
@@ -7,8 +12,6 @@
        * input/no-notation/midi-tuplets.ly: move from input/test/, idem
        for midi-volume-equaliser
 
-       * 
-
 m2003-07-15  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * scm/output-ps.scm (lily-traced-cm-fonts): substitution for lily

diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib
index b4a52eb99ad5a763f6c444b548d9e95278f1b9cb..991204dba1d14df4f0cd8767162f0e80940d1fa7 100644 (file)
--- a/Documentation/bibliography/engraving.bib
+++ b/Documentation/bibliography/engraving.bib
@@ -339,3 +339,11 @@ printouts to publication quality.
   note =        {Swedish book on music notation.}
 }
 
+@Book{jaschinski00:_notat,
+  author =      {Andreas Jaschinski},
+  title =       {Notation},
+  publisher =   {Bärenreiter Verlag},
+  year =        2000,
+  number =      {BVK1625}
+}
+

diff --git a/Documentation/user/appendices.itely b/Documentation/user/appendices.itely
index 9fe3cb5503efb681e89b48e875c9925ced8fa30e..974a7e532fd455d627394fc8a31863d616e0901f 100644 (file)
--- a/Documentation/user/appendices.itely
+++ b/Documentation/user/appendices.itely
@@ -9,15 +9,11 @@
 @end menu
 
 
-@node American Chords 
-@section American Chords
 
-[TODO]
+@node Chord name chart
+@section chord name chart
 
-@node Jazz chords
-@section Jazz chords
-
-@lilypondfile[notexidoc]{chords-ignatzek.ly}
+@lilypondfile[notexidoc]{chord-names-jazz.ly}
 
 @node MIDI instruments
 @section MIDI instruments

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 6a29bb4636febce03c5720e2a9943f6388b4a313..0f7ac4003a8b56bcf023ac9462452c73459d9f27 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -1,5 +1,36 @@
 @c -*-texinfo-*-
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 @node Introduction
 @chapter Introduction
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index e542edc3a138f6e97a16450419c41bf045ea66bc..ff2cfa3ced5501bfe58e7c5289a394ac2cbc15c1 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -3788,16 +3788,31 @@ in lower case for the base note.
 
 @end table
 
+
+There are also two other chord name schemes implemented: an alternate
+Jazz chord notation, and a systematic scheme called Banter chords. The
+alternate jazz notation is also shown on the chart in @ref{Chord name
+chart}.  Turning on these styles is described in the input file
+@inputfileref{input/test/,chord-names-jazz.ly}.
+
+@cindex Banter
+@cindex jazz chords
+@cindex chords, jazz  
+
+
 @refcommands
 
 @refcommand germanChords 
 @refcommand semiGermanChords 
 
 
+
+
 @seealso
 
 @inputfileref{input/regression,chord-name-major7.ly},
 @inputfileref{input/regression,chord-name-exceptions.ly},
+@inputfileref{input/test,chord-names-jazz.ly},
 @inputfileref{input/test,chord-names-german.ly},
 @file{scm/chords-ignatzek.scm}, @file{scm/chord-entry.scm}
 

diff --git a/input/regression/chords-ignatzek.ly b/input/regression/chords-ignatzek.ly
deleted file mode 100644 (file)
index 3f0e675..0000000
--- a/input/regression/chords-ignatzek.ly
+++ /dev/null
@@ -1,72 +0,0 @@
-\version "1.7.23"
-
-
-\header {
-
-texidoc = " Chord names are generated from a list pitches.  The
-functions constructing the names are customisable. This file shows
-Jazz chords, following Ignatzek (1995), page 17 and 18."
-
-}
-
-chs = \notes \transpose c' c' 
-{
-       <<c e g>>1
-       <<c es g>>% m = minor triad
-       <<c e gis>>
-       <<c es ges>> \break
-       <<c e g bes>>
-       <<c es g bes>>
-       <<c e g b>>             % triangle = maj
-       <<c es ges beses>> 
-       <<c es ges b>> \break
-       <<c e gis bes>>
-       <<c es g b>>
-       <<c e gis b>> 
-       <<c es ges bes>>\break
-       <<c e g a>>   % 6 = major triad with added sixth
-       <<c es g a>>  % m6 = minor triad with added sixth
-       <<c e g bes d'>> 
-       <<c es g bes d'>> \break
-       <<c es g bes d' f' a' >>
-       <<c es g bes d' f' >>
-       <<c es ges bes d' >> 
-       <<c e g bes des' >> \break
-       <<c e g bes dis'>>
-       <<c e g bes d' f'>>
-       <<c e g bes d' fis'>>
-       <<c e g bes d' f' a'>>\break
-       <<c e g bes d' fis' as'>>
-       <<c e gis bes dis'>>
-       <<c e g bes dis' fis'>>
-       <<c e g bes d' f' as'>>\break
-       <<c e g bes des' f' as'>>
-       <<c e g bes d' fis'>>
-       <<c e g b d'>>
-       <<c e g bes d' f' as'>>\break
-       <<c e g bes des' f' as'>>
-       <<c e g bes des' f' a'>>
-       <<c e g b d'>>
-       <<c e g b d' f' a'>>\break
-       <<c e g b d' fis'>>
-       <<c e g bes des' f ' a'>>
-       <<c f g>>
-       <<c f g bes>>\break
-       <<c f g bes d'>>
-       <<c e g d'>>    % add9
-       <<c es g f'>>
-}
-
-\score{
-    <
-       \context ChordNames { \chs }
-       \context Staff \notes \transpose c c' { \chs }
-    >
-    \paper{
-       \translator { 
-           \ChordNamesContext
-           ChordName \override #'word-space = #1 
-       }
-    }
-}
-       

diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index 3c57618fe86d01c4a563463f8932fdd08600ab46..4d6737eace7315f4007e7ae619b5da36b5b72105 100644 (file)
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,75 +1,146 @@
-\version "1.7.18"
-% FIXME: doesn't display anything useful.
+\version "1.7.23"
+
+
 \header {
-texidoc = "Jazz notation for chord names.
 
-FIXME.
+texidoc = " Chord names are generated from a list pitches.  The
+functions constructing the names are customisable. This file shows
+Jazz chords, following Ignatzek (1995), page 17 and 18, Banter chords,
+and an alternative Jazz  chord notation.
+
 
 "
 
 }
-\score { \notes { c4^"fixme"}}
 
-%{
+chs = \notes \transpose c' c' 
+{
+       <<c e g>>1
+       <<c es g>>% m = minor triad
+       <<c e gis>>
+       <<c es ges>> \break
+       <<c e g bes>>
+       <<c es g bes>>
+       <<c e g b>>             % triangle = maj
+       <<c es ges beses>> 
+       <<c es ges b>> \break
+       <<c e gis bes>>
+       <<c es g b>>
+       <<c e gis b>> 
+       <<c es ges bes>>\break
+       <<c e g a>>   % 6 = major triad with added sixth
+       <<c es g a>>  % m6 = minor triad with added sixth
+       <<c e g bes d'>> 
+       <<c es g bes d'>> \break
+       <<c es g bes d' f' a' >>
+       <<c es g bes d' f' >>
+       <<c es ges bes d' >> 
+       <<c e g bes des' >> \break
+       <<c e g bes dis'>>
+       <<c e g bes d' f'>>
+       <<c e g bes d' fis'>>
+       <<c e g bes d' f' a'>>\break
+       <<c e g bes d' fis' as'>>
+       <<c e gis bes dis'>>
+       <<c e g bes dis' fis'>>
+       <<c e g bes d' f' as'>>\break
+       <<c e g bes des' f' as'>>
+       <<c e g bes d' fis'>>
+       <<c e g b d'>>
+       <<c e g bes d' f' as'>>\break
+       <<c e g bes des' f' as'>>
+       <<c e g bes des' f' a'>>
+       <<c e g b d'>>
+       <<c e g b d' f' a'>>\break
+       <<c e g b d' fis'>>
+       <<c e g bes des' f ' a'>>
+       <<c f g>>
+       <<c f g bes>>\break
+       <<c f g bes d'>>
+       <<c e g d'>>    % add9
+       <<c es g f'>>
+}
 
-%% This should only be necessary if your kpathsea setup is broken
-%
-% Make sure the correct msamxx.tfm is where lily can find it
-% (ie cwd or lily's tfm dir).
-%
-% For normal (20pt) paper, do
-%
-%   cp locate `msam9.tfm` LILYPONDPREFIXxtfm
-%
-
-scheme = \chords {
-  % major chords
-  c
-  c:6          % 6 = major triad with added sixth
-  c:maj                % triangle = maj
-  c:6.9^7      % 6/9 
-  c:9^7                % add9
-
-  % minor chords
-  c:m          % m = minor triad
-  c:m.6                % m6 = minor triad with added sixth
-  c:m.7+       % m triangle = minor major seventh chord
-  c:3-.6.9^7   % m6/9 
-  c:m.7                % m7
-  c:3-.9       % m9
-  c:3-.9^7     % madd9
-
-  % dominant chords
-  c:7          % 7 = dominant
-  c:7.5+       % +7 = augmented dominant
-  c:7.5-       % 7b5 = hard diminished dominant
-  c:9          % 7(9)
-  c:9-         % 7(b9)
-  c:9+         % 7(#9)
-  c:13^9.11    % 7(13)
-  c:13-^9.11   % 7(b13)
-  c:13^11      % 7(9,13)
-  c:13.9-^11   % 7(b9,13)
-  c:13.9+^11   % 7(#9,13)
-  c:13-^11     % 7(9,b13)
-  c:13-.9-^11  % 7(b9,b13)
-  c:13-.9+^11  % 7(#9,b13)
-
-  % half diminished chords
-  c:m5-.7              % slashed o = m7b5
-  c:9.3-.5-    % o/7(pure 9)
-
-  % diminished chords
-  c:m5-.7-     % o = diminished seventh chord
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% alternate Jazz notation
+
+efullmusicJazzAlt = \notes
+{
+    <<c e gis>>1-\markup { "+" }
+    <<c e g b>>-\markup { \normal-size-super
+    %                    \override #'(font-family . math) "N" }
+                         \override #'(font-family . math) "M" }
+    %%c:3.5.7 = \markup { \override #'(font-family . math) "M" }
+    %%c:3.5.7 = \markup { \normal-size-super "maj7" }
+
+   <<c es ges>>-\markup { \super "o" } % should be $\circ$ ?
+   <<c es ges bes>>-\markup { \super \combine "o" "/" }
+   <<c es ges beses>>-\markup { \super  "o7" }
 }
 
-\score {
-  \notes <
-    \context ChordNames {
-       #(set-chord-name-style 'jazz)
-       \scheme }
-    \context Staff \transpose c c' \scheme
-  >
+efullJazzAlt = #(sequential-music-to-chord-exceptions efullmusicJazzAlt #f)
+
+epartialmusicJazzAlt = \notes{
+    <<c d>>1-\markup { \normal-size-super "2" }
+    <<c es>>-\markup { "m" }
+    <<c f>>-\markup { \normal-size-super "sus4" }
+    <<c g>>-\markup { \normal-size-super "5" }
+    
+    %% TODO, partial exceptions
+    <<c es f>>-\markup { "m" }-\markup { \normal-size-super "sus4" }
+    <<c d es>>-\markup { "m" }-\markup { \normal-size-super "sus2" }
 }
 
+epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f)
+
+jazzAltProperties =
+
+\sequential { 
+           \property ChordNames.majorSevenSymbol = #whiteTriangleMarkup
+           \property ChordNames.chordNameSeparator = #(make-simple-markup  "/")
+           \property ChordNames.chordNameExceptionsFull = #efullJazzAlt
+           \property ChordNames.chordNameExceptionsPartial = #epartialJazzAlt
+           \property ChordNames.chordNameFunction = #jazz-chord-names
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+banterProperties = \sequential { 
+           \property ChordNames.chordNameFunction = #banter-chord-names
+}
+
+\score{
+    <
+       \context ChordNames {
+           \property ChordNames.instrument = #"Ignatzek (default)"
+           \property ChordNames.instr = #"Def"
+           \chs }
+       \context ChordNames = ALT {
+           \property ChordNames.instrument = #"Alternative"
+           \property ChordNames.instr = #"Alt"
+           \jazzAltProperties
+           \chs }
+
+       % This is the banter style.
+       % it gives exceedingly verbose (wide) names
+       % making this file take up to 4 pages.
+       
+%{
+               \context ChordNames = BANTER  {
+           \banterProperties
+           \chs
+           }
 %}
+       \context Staff \notes \transpose c c' { \chs }
+    >
+    \paper{
+       indent = 3.\cm
+       \translator { 
+           \ChordNamesContext
+           ChordName \override #'word-space = #1
+           \consists Instrument_name_engraver
+       }
+    }
+}
+       

diff --git a/input/test/trills.ly b/input/test/trills.ly
index 9116b30b225863fe4bcf199e55172f5ca3f49d7a..83fd5c7fd2a793f759bf5d74a0ad37f8dec41180 100644 (file)
--- a/input/test/trills.ly
+++ b/input/test/trills.ly
@@ -79,7 +79,7 @@ endHorizScript = {
        "Cadence"
        "autre"
        "Double"4 "cadence"4.
-       "autre"4 _4.
+%{     "autre"4 _4.
        _4 "sans tremblement"2
        "sur une tierce"4
        "Pinc\\'e"4
@@ -91,20 +91,23 @@ endHorizScript = {
        "autre"
        "autre"
        "Double cadence"2.
-      }
+%}
+
+    }
       \context Lyrics=two \lyrics {
        "simple"4
        "appuy\'e"4.
-       \skip 1*3
+%{     \skip 1*3
        \skip 4 \skip 4.
        "voix et montant"
        \skip 2.
        "de suite"1
+%}
       }
       \context Staff=lower \notes\relative c'' {
         % autobeamer has som problems here
        d32-[  \repeat unfold 3 { c d } c-]
-       d8 ~  d32-[\repeat unfold 3 { d32  } c-]
+       d8 ~  d32-[\repeat unfold 3 { d32 c  } c-]
        d32 c b c \repeat unfold 4 { d32 c }
        b32 c d c \repeat unfold 4 { d32 c }
        c32-[-( b a16 b  c-)-]

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index ef2cd25f2cab3a871fc8be5259f08a3185399058..82f996fee958a0ab79173df772c801ab4af84599 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -4,10 +4,15 @@ input feta-params;
 
 font_coding_scheme "feta braces";
 
-fet_beginfont("feta-braces", font_count);
+% we set the designsize arbitrarily at 10
+% if the * 10 is left out, pktrace gets confused  over the proper magnification,
+% and makes it too large.
+fet_beginfont("feta-braces", font_count * 10);
+
 mode_setup;
 
 
+
 save code;
 code := -1;
 

diff --git a/mf/feta-braces0.mf b/mf/feta-braces0.mf
deleted file mode 100644 (file)
index 3718664..0000000
--- a/mf/feta-braces0.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-% 
-% feta-braces0.mf --  256 smallest braces
-% 
-% source file of the Feta (Font-En-Tja) music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
-
-font_count := 0;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces00.mf b/mf/feta-braces00.mf
new file mode 100644 (file)
index 0000000..3718664
--- /dev/null
+++ b/mf/feta-braces00.mf
@@ -0,0 +1,11 @@
+% 
+% feta-braces0.mf --  256 smallest braces
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+font_count := 0;
+input feta-beugel;
+end.

diff --git a/mf/feta-braces1.mf b/mf/feta-braces1.mf
deleted file mode 100644 (file)
index 16bbd6a..0000000
--- a/mf/feta-braces1.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-% 
-% feta-braces1.mf --  next 256 braces
-% 
-% source file of the Feta (Font-En-Tja) music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
-
-font_count := 1;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces10.mf b/mf/feta-braces10.mf
new file mode 100644 (file)
index 0000000..16bbd6a
--- /dev/null
+++ b/mf/feta-braces10.mf
@@ -0,0 +1,11 @@
+% 
+% feta-braces1.mf --  next 256 braces
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+font_count := 1;
+input feta-beugel;
+end.

diff --git a/mf/feta-braces2.mf b/mf/feta-braces2.mf
deleted file mode 100644 (file)
index f31df5f..0000000
--- a/mf/feta-braces2.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-% 
-% feta-braces2.mf --  next 256 braces
-% 
-% source file of the Feta (Font-En-Tja) music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
-
-font_count := 2;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces20.mf b/mf/feta-braces20.mf
new file mode 100644 (file)
index 0000000..f31df5f
--- /dev/null
+++ b/mf/feta-braces20.mf
@@ -0,0 +1,11 @@
+% 
+% feta-braces2.mf --  next 256 braces
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+font_count := 2;
+input feta-beugel;
+end.

diff --git a/mf/feta-braces3.mf b/mf/feta-braces3.mf
deleted file mode 100644 (file)
index bcf9640..0000000
--- a/mf/feta-braces3.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-% 
-% feta-braces3.mf --  next 256 braces
-% 
-% source file of the Feta (Font-En-Tja) music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
-
-font_count := 3;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces30.mf b/mf/feta-braces30.mf
new file mode 100644 (file)
index 0000000..bcf9640
--- /dev/null
+++ b/mf/feta-braces30.mf
@@ -0,0 +1,11 @@
+% 
+% feta-braces3.mf --  next 256 braces
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+font_count := 3;
+input feta-beugel;
+end.

diff --git a/mf/feta-braces4.mf b/mf/feta-braces4.mf
deleted file mode 100644 (file)
index f76de55..0000000
--- a/mf/feta-braces4.mf
+++ /dev/null
@@ -1,13 +0,0 @@
-% 
-% feta-braces4.mf --  next 256 braces
-% 
-% source file of the Feta (Font-En-Tja) music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
-
-font_count := 4;
-input feta-beugel;
-end.
-
-

diff --git a/mf/feta-braces40.mf b/mf/feta-braces40.mf
new file mode 100644 (file)
index 0000000..f76de55
--- /dev/null
+++ b/mf/feta-braces40.mf
@@ -0,0 +1,13 @@
+% 
+% feta-braces4.mf --  next 256 braces
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+font_count := 4;
+input feta-beugel;
+end.
+
+

diff --git a/mf/feta-braces5.mf b/mf/feta-braces5.mf
deleted file mode 100644 (file)
index a048e21..0000000
--- a/mf/feta-braces5.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-% 
-% feta-braces5.mf --  next 256 braces
-% 
-% source file of the Feta (Font-En-Tja) music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
-
-font_count := 5;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces50.mf b/mf/feta-braces50.mf
new file mode 100644 (file)
index 0000000..a048e21
--- /dev/null
+++ b/mf/feta-braces50.mf
@@ -0,0 +1,11 @@
+% 
+% feta-braces5.mf --  next 256 braces
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+font_count := 5;
+input feta-beugel;
+end.

diff --git a/mf/feta-braces6.mf b/mf/feta-braces6.mf
deleted file mode 100644 (file)
index 6a114e3..0000000
--- a/mf/feta-braces6.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-% 
-% feta-braces6.mf --  next 256 braces
-% 
-% source file of the Feta (Font-En-Tja) music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
-
-font_count := 6;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces60.mf b/mf/feta-braces60.mf
new file mode 100644 (file)
index 0000000..6a114e3
--- /dev/null
+++ b/mf/feta-braces60.mf
@@ -0,0 +1,11 @@
+% 
+% feta-braces6.mf --  next 256 braces
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+font_count := 6;
+input feta-beugel;
+end.

diff --git a/mf/feta-braces7.mf b/mf/feta-braces7.mf
deleted file mode 100644 (file)
index 75f24c1..0000000
--- a/mf/feta-braces7.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-% 
-% feta-braces6.mf --  next 256 braces
-% 
-% source file of the Feta (Font-En-Tja) music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
-
-font_count := 7;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces70.mf b/mf/feta-braces70.mf
new file mode 100644 (file)
index 0000000..75f24c1
--- /dev/null
+++ b/mf/feta-braces70.mf
@@ -0,0 +1,11 @@
+% 
+% feta-braces6.mf --  next 256 braces
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+font_count := 7;
+input feta-beugel;
+end.

diff --git a/mf/feta-braces8.mf b/mf/feta-braces8.mf
deleted file mode 100644 (file)
index 5af9141..0000000
--- a/mf/feta-braces8.mf
+++ /dev/null
@@ -1,11 +0,0 @@
-% 
-% feta-braces6.mf --  next 256 braces
-% 
-% source file of the Feta (Font-En-Tja) music font
-% 
-% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-% 
-
-font_count := 8;
-input feta-beugel;
-end.

diff --git a/mf/feta-braces80.mf b/mf/feta-braces80.mf
new file mode 100644 (file)
index 0000000..5af9141
--- /dev/null
+++ b/mf/feta-braces80.mf
@@ -0,0 +1,11 @@
+% 
+% feta-braces6.mf --  next 256 braces
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% 
+
+font_count := 8;
+input feta-beugel;
+end.

diff --git a/scm/chord-generic-names.scm b/scm/chord-generic-names.scm
index 8caaa4c8d0ea304f56c923a574e93f565be19c24..a6d924054a108eb4c92d6979597b3453c457762f 100644 (file)
--- a/scm/chord-generic-names.scm
+++ b/scm/chord-generic-names.scm
@@ -1,4 +1,4 @@
-;;;; double-plus-new-chord-name.scm -- Compile chord names
+;;;; chord-generic-names.scm -- Compile chord names
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 

diff --git a/scm/font.scm b/scm/font.scm
index fa6835c34092e09307a075f1dfb7c85b07d0f81c..02a408038bff35a9f7ea57fd747554d824dc5e86 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -42,15 +42,15 @@
 
 (define size-independent-fonts
   `(
-    ((* * * braces *) . ("feta-braces0"
-                        "feta-braces1"
-                        "feta-braces2"
-                        "feta-braces3"
-                        "feta-braces4"
-                        "feta-braces5"
-                        "feta-braces6"
-                        "feta-braces7"
-                        "feta-braces8") )))
+    ((* * * braces *) . ("feta-braces00"
+                        "feta-braces10"
+                        "feta-braces20"
+                        "feta-braces30"
+                        "feta-braces40"
+                        "feta-braces50"
+                        "feta-braces60"
+                        "feta-braces70"
+                        "feta-braces80") )))
 
 ;; FIXME: what about this comment?:
 
@@ -96,8 +96,8 @@
     ((-3 medium italic roman 7) . "cmti7")    
 
     ;;; cmbx17 is sauter, not commonly available as Type1.
-    ((4 bold upright roman 17) . "cmr17") 
-    ((3 bold upright roman 17) . "cmr17")
+    ((4 bold upright roman 17) . "cmbx17") 
+    ((3 bold upright roman 17) . "cmbx17")
     
     ((2 bold upright roman 14) . "cmbx14")
     ((1 bold upright roman 12) . "cmbx12")
@@ -350,13 +350,8 @@ and warn if the selected font is not unique.
                    (display (filter-field 'font-name 'cmbx paper20-style-sheet-alist))
                    
                    (display (qualifiers-to-fontname '((font-name . cmbx)) paper20-style-sheet-alist))
-                   (display (style-to-font-name 'paper20 'large))
-                   )
-          )
-        )
-
-
-)
+                   (display (style-to-font-name 'paper20 'large)))
+          )))
 
 ;;; ascii-script font init
 (define as-font-sheet-alist