* Documentation/user/notation-appendices.itely (The Feta font):

use it.

* input/test/font-table.ly: new file. Generate font table within lily.

* Documentation/user/notation-appendices.itely (The Feta font):
use new font-table.ly file.

diff --git a/ChangeLog b/ChangeLog
index da74094d046198261d8dc5ccd96399b8456e035f..377742ae4e920c9b469a1f6a4aa2a3181850e2f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-01-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/user/notation-appendices.itely (The Feta font):
+       use it.
+
+       * input/test/font-table.ly: new file. Generate font table within lily.
+
+       * Documentation/user/notation-appendices.itely (The Feta font):
+       use new font-table.ly file. 
+
        * stepmake/stepmake/install-out-targets.make
        (local-install-outfiles): only create directory if
        $(INSTALLATION_OUT_DIR) is defined. This fixes install on Gentoo.

diff --git a/Documentation/user/notation-appendices.itely b/Documentation/user/notation-appendices.itely
index 59f53d449bed56b80976ecd3102e3cdf10b6efd3..426cc4b5e38dbdbdc1247d0d340098a7bdb9a266 100644 (file)
--- a/Documentation/user/notation-appendices.itely
+++ b/Documentation/user/notation-appendices.itely
@@ -173,15 +173,11 @@ Where N is in the range 0-100.
 @node The Feta font
 @appendixsec The Feta font
 
-The following symbols are available in the Feta font and may be
+The following symbols are available in the Emmentaler font and may be
 accessed directly using text markup such as @code{g^\markup @{
 \musicglyph #"scripts.segno" @}}, see @ref{Text markup}.
 
-
-@lilypondfile[noindent]{feta16list.ly}
-
-
-@lilypondfile[noindent]{parmesan16list.ly}
+@lilypondfile[noindent]{font-table.ly}
 
 
 @ignore

diff --git a/input/test/font-table.ly b/input/test/font-table.ly
new file mode 100644 (file)
index 0000000..fa1a5f6
--- /dev/null
+++ b/input/test/font-table.ly
@@ -0,0 +1,71 @@
+
+
+\paper {
+  %% ugh. text on toplevel is a bit broken... .
+  
+  oddHeaderMarkup = \markup {}
+  evenHeaderMarkup = \markup {}
+  oddFooterMarkup = \markup {}
+  evenFooterMarkup = \markup {}
+  }
+
+#(define (doc-char name)
+  (make-line-markup
+   (list
+    (make-pad-to-box-markup
+     '(0 . 30)
+     '(-2 . 2)
+     (make-typewriter-markup (make-small-markup name)))
+    (make-pad-to-box-markup
+     '(-2 . 2)
+     '(-2 . 2)
+     (make-musicglyph-markup name)))))
+
+#(define (min-length lst n)
+  "(min  (length lst) n)"
+  
+  (if (or (null? lst) (<= n 0))
+   0
+   (1+ (min-length (cdr lst) (1- n)) )))
+
+#(define (doc-chars names)
+  (let*
+   ((n (min-length names 2))
+    (head (take names n))
+    (tail (drop names n))
+    )
+
+   (cons
+    (make-line-markup (map doc-char head))
+    (if (null? tail)
+     '()
+     (doc-chars tail)))))
+
+#(define (group-lines lines)
+  (let*
+   ((n (min-length lines 25))
+    (head (take lines n))
+    (tail (drop lines n))
+    )
+
+   (cons
+    (make-column-markup head)
+    (if (null? tail)
+     '()
+     (group-lines tail)))))
+                       
+#(let*
+  ((lines (doc-chars
+          (ly:font-glyph-list (format  "~a/share/lilypond/~a/fonts/otf/emmentaler-20.otf"
+                               (getenv "LILYPONDPREFIX")
+                               (lilypond-version)
+                             ))))
+   (pages (group-lines lines)))
+
+  (for-each 
+   (lambda (x)
+    (collect-scores-for-book parser
+     (make-override-markup '(word-space . 8) x)))
+                       pages))
+
+

diff --git a/lily/font-config-scheme.cc b/lily/font-config-scheme.cc
index 90211f83539d4f0765a3ced06cc0bbd53c802d95..99e8f453c69bad2a8657bed148c2a225fbb480d8 100644 (file)
--- a/lily/font-config-scheme.cc
+++ b/lily/font-config-scheme.cc
@@ -60,7 +60,7 @@ display_list (FcConfig *fcc)
   if (!os)
     os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, (char *) 0);
 
-  FcFontSet   * fs = FcFontList (fcc, pat, os);
+  FcFontSet *fs = FcFontList (fcc, pat, os);
   FcObjectSetDestroy (os);
   if (pat)
     FcPatternDestroy (pat);
@@ -73,7 +73,6 @@ display_list (FcConfig *fcc)
 }
 
 
-
 LY_DEFINE (ly_font_config_display_fonts, "ly:font-config-display-fonts", 0, 0, 0,
           (),
           "Dump a list of all fonts visible to FontConfig.")

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 52779ceef4feaa52c835f98bbea335783804feb2..5788f37a355e8440be2b0165a5e5123e92742503 100644 (file)
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -110,8 +110,6 @@
        (set! base (format #f "~a-~a" base count)))
 
     (ly:parser-define! parser 'output-count (1+ count))
-    
-
     (ly:score-process score header paper layout base)
     ))