*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index ccacdb8c0ae79b77bdc67ad452622d5f86595f44..16e8e3293bf12ac2d89a33118a4b043f01ccf661 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,12 +8,18 @@
 
 2005-11-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
-       * GNUmakefile.in (SUBDIRS): remove debian/ directory.
+       * flower/offset.cc: idem.
 
-       * VERSION (PATCH_LEVEL): release 2.7.15
+       * mf/*.mf: update email address.
+
+       * lily/font-config-scheme.cc:  new file.
+
+       * GNUmakefile.in (SUBDIRS): remove debian/ directory.
 
        * lily/*:  cs.uu.nl -> xs4all.nl
 
+       * VERSION (PATCH_LEVEL): release 2.7.15
+
        * make/lilypond.mandrake.spec.in (Module): remove Mandrake & Suse
        spec files.
 

diff --git a/flower/axis.cc b/flower/axis.cc
index d26d2df06be1b12bc0f633dbc23f6fc2d12e564c..269a196d97c5d5a74da484f61a2136444c916463 100644 (file)
--- a/flower/axis.cc
+++ b/flower/axis.cc
@@ -1,7 +1,7 @@
 /*
   axis.cc -- implement Axis
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis.hh"

diff --git a/flower/cpu-timer.cc b/flower/cpu-timer.cc
index 832606b7018f9ae4416a1d321fa8511fc65e8588..9173ca588b6721174c476d8431c1f96d7e5cb7a3 100644 (file)
--- a/flower/cpu-timer.cc
+++ b/flower/cpu-timer.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "cpu-timer.hh"

diff --git a/flower/direction.cc b/flower/direction.cc
index db1ef4768e48b1d910fb1392a09a46c0200ff2ec..f6691ae21b9ecece218261b50919736e58ac808e 100644 (file)
--- a/flower/direction.cc
+++ b/flower/direction.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "direction.hh"

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 74a45fd6514c93f8d1c45c5ad52601f8874b5c95..7eb7267d55d7f43bebf13e83e95c9eab6488f987 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 

diff --git a/flower/file-path.cc b/flower/file-path.cc
index b4478c23a0309bcaec4d182fb61cfd9bf55f2b55..e5f485212fea35bfcfb50a02f23a1f503d773a70 100644 (file)
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index 31cab7a22d8a97429a0f5bc5d74e9a96c142fa02..a1ba68e766e6b853e55c7a2c69819b3a5611465e 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -1,7 +1,7 @@
 /*
   process command line, GNU style.
 
-  this is Copyleft (c) 1996--2005 Han-Wen Nienhuys, <hanwen@cs.uu.nl>
+  this is Copyleft (c) 1996--2005 Han-Wen Nienhuys, <hanwen@xs4all.nl>
 */
 
 #include "getopt-long.hh"

diff --git a/flower/include/arithmetic-operator.hh b/flower/include/arithmetic-operator.hh
index de07f21a1bb2e6ed3a79b3b6090edb16ba439f35..08585d8bc7b83672e5f77c158181f14a03d2d94a 100644 (file)
--- a/flower/include/arithmetic-operator.hh
+++ b/flower/include/arithmetic-operator.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ARITHMETIC_OPERATOR_HH

diff --git a/flower/include/array.icc b/flower/include/array.icc
index a3b0c1af87b087749a4330c5cbed235a0a3d2b14..2a3fcbbf9afdd968a0344bd25196b4290c55e0e4 100644 (file)
--- a/flower/include/array.icc
+++ b/flower/include/array.icc
@@ -1,5 +1,5 @@
 /*
-  (c) 1995--2005  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+  (c) 1995--2005  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
   Distributed under GNU GPL
 */

diff --git a/flower/include/axis.hh b/flower/include/axis.hh
index f0ffb4187094d1a8bb397adc6823d3b9c0e20055..1a781fa05e93c34127dfa47bb1e9e988d80d765a 100644 (file)
--- a/flower/include/axis.hh
+++ b/flower/include/axis.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef AXES_HH

diff --git a/flower/include/cons.hh b/flower/include/cons.hh
index cb63fd2e2f878aef51b0e444bd062e3d2da78c84..31fc4ede97033b0e00a6ad780474c3fb0849f1e3 100644 (file)
--- a/flower/include/cons.hh
+++ b/flower/include/cons.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CONS_HH

diff --git a/flower/include/cpu-timer.hh b/flower/include/cpu-timer.hh
index eb9dc211652ab15ab9abb3a7b3d2abec8581a841..c22e445111f8a17259968bb5d4426cfb1e2e72b2 100644 (file)
--- a/flower/include/cpu-timer.hh
+++ b/flower/include/cpu-timer.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef CPU_TIMER_HH

diff --git a/flower/include/direction.hh b/flower/include/direction.hh
index 0ea760c168f712da244459e0bb87cd99b7133adf..417c34146143aeb4d0518de8afc35e93ee82c83f 100644 (file)
--- a/flower/include/direction.hh
+++ b/flower/include/direction.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DIRECTION_HH

diff --git a/flower/include/drul-array.hh b/flower/include/drul-array.hh
index bce7f0a5812f1955da6c12a73eec94be7cd98c66..e5a75db72b763ba8c78e6d83713ed2b2e4f15cde 100644 (file)
--- a/flower/include/drul-array.hh
+++ b/flower/include/drul-array.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DRUL_ARRAY_HH

diff --git a/flower/include/file-name.hh b/flower/include/file-name.hh
index fb3e3ff13af246efcebe3abccd365647e750beca..68ba6d8f4626e2913d60aa706c6d908e0605672d 100644 (file)
--- a/flower/include/file-name.hh
+++ b/flower/include/file-name.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_NAME_HH

diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index 780b74c0dd3f80c5070675af5a9cbdf033ed5970..307b5b591cff9d550bd8ef043f98586325657029 100644 (file)
--- a/flower/include/file-path.hh
+++ b/flower/include/file-path.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_PATH_HH

diff --git a/flower/include/file-storage.hh b/flower/include/file-storage.hh
index 425a61c3d7b6c2faae69a48315dc5257fe1f094c..1a7d7b61cb3a24370358601e1df74316ba3737b5 100644 (file)
--- a/flower/include/file-storage.hh
+++ b/flower/include/file-storage.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef FILE_STORAGE_HH

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 94186ada15d63a388849266f19335f54b410a963..93cb3b62655d9c6f5d2989faadd9cf25d928373f 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INTERVAL_TCC

diff --git a/flower/include/killing-cons.tcc b/flower/include/killing-cons.tcc
index 07a741ff1ceb3352a79972c97f13e0ce03eb71e9..c5da62cfe0e89ff1ea98c85c4a6b92d80618725d 100644 (file)
--- a/flower/include/killing-cons.tcc
+++ b/flower/include/killing-cons.tcc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef KILLING_CONS_TCC

diff --git a/flower/include/libc-extension.hh b/flower/include/libc-extension.hh
index abf5a549d1a68bf5888834da3277122adb4e6495..2a5924ef373320086e2247cb94570b34dc98f800 100644 (file)
--- a/flower/include/libc-extension.hh
+++ b/flower/include/libc-extension.hh
@@ -3,7 +3,7 @@
 
   source file of the flowerlib
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LIBC_EXTENSION_HH

diff --git a/flower/include/parray.hh b/flower/include/parray.hh
index 58a78d7892a35173b9092332cd3742006fff4643..2a5b965d1833a9a1bed30315249555903160482c 100644 (file)
--- a/flower/include/parray.hh
+++ b/flower/include/parray.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PARRAY_HH

diff --git a/flower/include/pqueue.hh b/flower/include/pqueue.hh
index ae750e5ac83c2a5afe2d1556376e7b1b1f76370e..cd33ae8f0ea08c9c88d6e7e4960d1e55b1750bea 100644 (file)
--- a/flower/include/pqueue.hh
+++ b/flower/include/pqueue.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PQUEUE_HH

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index cee96eed87c66267ddc818f3138ac097e3dbc9d9..6635c7e6222afaffff1b2fb0723e966045c6f4ff 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef RATIONAL_HH

diff --git a/flower/include/real.hh b/flower/include/real.hh
index 657c0cb677aef8e4d3e79f1d435f1cca4d6f6623..c564953430bcfd0b9d2c768e48a66d3776853561 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef REAL_HH

diff --git a/flower/include/string-data.hh b/flower/include/string-data.hh
index 001d5641c4879a06fc1812a75befe79f53de05bd..9f6c534482aa595e289544f994239cf9ea053eac 100644 (file)
--- a/flower/include/string-data.hh
+++ b/flower/include/string-data.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STRINGDATA_HH

diff --git a/flower/include/string-data.icc b/flower/include/string-data.icc
index fac7bd056eed88442284da71c44a864698de9fce..aff01bb4f34b3896793941562afdd45ba423ed71 100644 (file)
--- a/flower/include/string-data.icc
+++ b/flower/include/string-data.icc
@@ -3,7 +3,7 @@
 
    source file of Flower lib
 
-   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+   (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STRINGDATA_INL

diff --git a/flower/include/string-handle.hh b/flower/include/string-handle.hh
index 25d6a631de0321137008b7d9286b8daa07c87508..0b7e044b20bbbf9aa2d61eb169b72e917e272150 100644 (file)
--- a/flower/include/string-handle.hh
+++ b/flower/include/string-handle.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STRINGHANDLE_HH

diff --git a/flower/include/string-handle.icc b/flower/include/string-handle.icc
index 7e6342dfb8b9da293e44b5517e63a22d01bd277a..fc2efcb2b6e9ecd618d6c8f99f464bc560f957d7 100644 (file)
--- a/flower/include/string-handle.icc
+++ b/flower/include/string-handle.icc
@@ -4,7 +4,7 @@ stringhandle.inl -- implement String_handle
 
 source file of Flower lib
 
-(c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STRINGHANDLE_INL

diff --git a/flower/include/string.icc b/flower/include/string.icc
index 158be0c2a5f62769111791ad335a6789b2480f99..f0ceee1fac63b95fe7889b9fdf29a0bba80f573d 100644 (file)
--- a/flower/include/string.icc
+++ b/flower/include/string.icc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef STRING_ICC

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 4cca1db2a3541d215556fc36619e311b39a96aeb..682b38162a4e116da588172a25c9a58035dc5548 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef VIRTUAL_METHODS_HH

diff --git a/flower/include/warn.hh b/flower/include/warn.hh
index 245d944de1889b69b87641f59ff41dc6ab0659c8..872980fdfbd47dc4b5cd063d19e6da8fe24dc8c2 100644 (file)
--- a/flower/include/warn.hh
+++ b/flower/include/warn.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef WARN_HH

diff --git a/flower/interval.cc b/flower/interval.cc
index d833d3151fe1306e164b7e4e2c017e2761b07c84..0cd778576a09c4b8f1f2eea0c575de9ffbd1e6ce 100644 (file)
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "interval.hh"

diff --git a/flower/libc-extension.cc b/flower/libc-extension.cc
index f6268e1849ccec04889770dd909388bfcaeaf85a..1540b279d029fadad994fc4da47205598f85396a 100644 (file)
--- a/flower/libc-extension.cc
+++ b/flower/libc-extension.cc
@@ -3,7 +3,7 @@
 
   source file of the flowerlib
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 

diff --git a/flower/offset.cc b/flower/offset.cc
index a4e7ee90e9fbdf7b414f4041919be0645b0931bf..3fecbe70dae6e561682a5f508a5e4a13a672e616 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "offset.hh"

diff --git a/flower/polynomial.cc b/flower/polynomial.cc
index 82617d3db45136710ce31eb0b6ec321a5e284e71..3b456c14cb9cadf7d792312b78a62ec3f1e6374c 100644 (file)
--- a/flower/polynomial.cc
+++ b/flower/polynomial.cc
@@ -1,7 +1,7 @@
 /*
   poly.cc -- routines for manipulation of polynomials in one var
 
-  (c) 1993--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1993--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "polynomial.hh"

diff --git a/flower/rational.cc b/flower/rational.cc
index 65672f5bcbb3547e1553a54c9d9e8388f4460c3e..5b0657a49aac5014e0700c36d565706173bc78a5 100644 (file)
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "rational.hh"

diff --git a/flower/stringutil.cc b/flower/stringutil.cc
index 8516a275522f724f74f25ae06dbba1bcd4317b63..5fcd958f4c54529a7447b8c45962f3e1ccdaba96 100644 (file)
--- a/flower/stringutil.cc
+++ b/flower/stringutil.cc
@@ -6,7 +6,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl> */
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl> */
 
 #ifdef STRING_DEBUG
 #define memmove mymemmove

diff --git a/flower/warn.cc b/flower/warn.cc
index 6399aad4b7bf5bbed00bcd40509c3d7f21a260d3..3aac67f2558151e39baa92d9e35d1b488eb8fa60 100644 (file)
--- a/flower/warn.cc
+++ b/flower/warn.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "warn.hh"

diff --git a/lily/font-config-scheme.cc b/lily/font-config-scheme.cc
new file mode 100644 (file)
index 0000000..94ba57b
--- /dev/null
+++ b/lily/font-config-scheme.cc
@@ -0,0 +1,66 @@
+/*
+  font-config-scheme.cc -- implement FontConfig bindings.
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+*/
+
+#include "lily-guile.hh"
+
+#include <fontconfig/fontconfig.h>
+
+void
+display_fontset (FcFontSet *fs)
+{
+  int j;
+  for (j = 0; j < fs->nfont; j++)
+    {
+      FcChar8 *font;
+      FcChar8 *str;
+
+      font = FcNameUnparse (fs->fonts[j]);
+      if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &str) == FcResultMatch)
+       printf ("FILE %s\n", str);
+      if (FcPatternGetString (fs->fonts[j], FC_FAMILY, 0, &str) == FcResultMatch)
+       printf ("family %s\n ", str);
+      if (FcPatternGetString (fs->fonts[j], "designsize", 0, &str) == FcResultMatch)
+       printf ("designsize %s\n ", str);
+      printf ("%s\n", font);
+      free (font);
+    }
+}
+
+
+void
+display_list (FcConfig *fcc)
+{
+  FcPattern*pat = FcPatternCreate ();
+
+  FcObjectSet *os = 0;
+  if (!os)
+    os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, (char *) 0);
+
+  FcFontSet   * fs = FcFontList (fcc, pat, os);
+  FcObjectSetDestroy (os);
+  if (pat)
+    FcPatternDestroy (pat);
+
+  if (fs)
+    {
+      display_fontset (fs);
+      FcFontSetDestroy (fs);
+    }
+}
+
+
+LY_DEFINE (ly_font_config_display_fonts, "ly:font-config-display-fonts", 0, 0, 0,
+          (),
+          "Dump a list of all fonts visible to FontConfig.")
+
+{
+  display_list (NULL);
+  
+  return SCM_UNSPECIFIED;
+}

diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
index 0181d0746cae930b43a3d572bde564165c3cd7b5..07237fbcad94c98cdf7c89872703907b10853eed 100644 (file)
--- a/mf/feta-autometric.mf
+++ b/mf/feta-autometric.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (not an acronym for Font-En-Tja)
 % pretty-but-neat music font
 %
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %          Jan Nieuwenhuizen <janneke@gnu.org>
 %
 % these macros help create ascii logging output

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index ca51120425bf84ab42617c623d3be2ccb87b0189..3d378cadf747459ca42a11917565a66f8a8dc78c 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (not an acronym for Font-En-Tja)
 % pretty-but-neat music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %                Jan Nieuwenhuizen <janneke@gnu.org>
 
 input feta-autometric;

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index ca405b5a60cefdf8b14f51ac77fb60d5de32fd5a..526e0c6bebe76d80f924661c84e549561ffdabb6 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -4,7 +4,7 @@
 % source file of LilyPond's pretty-but-neat music font
 %
 % (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-% & Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% & Han-Wen Nienhuys <hanwen@xs4all.nl>
 % & Juergen Reuter <reuter@ipd.uka.de>
 %
 

diff --git a/mf/feta-braces-a.mf b/mf/feta-braces-a.mf
index b672a5bdf6e8ec862367ec1bbcc639e96f2cf5ab..d44baac6f95121238b3f692ca94552de92a5c59d 100644 (file)
--- a/mf/feta-braces-a.mf
+++ b/mf/feta-braces-a.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 0;

diff --git a/mf/feta-braces-b.mf b/mf/feta-braces-b.mf
index 78f9421f8a1bd987ed50dbf39a1d74c83eeba941..cc3fd46e1d1374aed3f25aefde2b8a57dcf78a1e 100644 (file)
--- a/mf/feta-braces-b.mf
+++ b/mf/feta-braces-b.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 1;

diff --git a/mf/feta-braces-c.mf b/mf/feta-braces-c.mf
index 1ddeac7c988b458a7c8a16f80a8be09b52c58aff..9dc8343c520caa70ced7375adeee68713e2b74dd 100644 (file)
--- a/mf/feta-braces-c.mf
+++ b/mf/feta-braces-c.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 2;

diff --git a/mf/feta-braces-d.mf b/mf/feta-braces-d.mf
index 636a64e2d2b53621da5bf016a43368892d82abf0..440b1bf877777484a00100d1bc2f8751c0f4ef43 100644 (file)
--- a/mf/feta-braces-d.mf
+++ b/mf/feta-braces-d.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 3;

diff --git a/mf/feta-braces-e.mf b/mf/feta-braces-e.mf
index 2085ce663c80783679616f9c6f16ea3666b2e002..bfa112ea7ac864238e5f1a1d23579124bacab0a8 100644 (file)
--- a/mf/feta-braces-e.mf
+++ b/mf/feta-braces-e.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 4;

diff --git a/mf/feta-braces-f.mf b/mf/feta-braces-f.mf
index bf6b024ee98f781e78b4eca58f64b7876f85789e..ab28784d7869079c117c52347a5f1c5528fab11e 100644 (file)
--- a/mf/feta-braces-f.mf
+++ b/mf/feta-braces-f.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 5;

diff --git a/mf/feta-braces-g.mf b/mf/feta-braces-g.mf
index 1fc7d2af9cfea49639a3df57e645bd46b9977f85..2ff9f6386e811084583fe604a58c90c1bc1a5697 100644 (file)
--- a/mf/feta-braces-g.mf
+++ b/mf/feta-braces-g.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 6;

diff --git a/mf/feta-braces-h.mf b/mf/feta-braces-h.mf
index 22ec13f33ab1ae1eaf1ea64682caef2ec6e05aa3..6509c75edcc627a63041df0f3de4e2b8dc89d747 100644 (file)
--- a/mf/feta-braces-h.mf
+++ b/mf/feta-braces-h.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 7;

diff --git a/mf/feta-braces-i.mf b/mf/feta-braces-i.mf
index 57b6ba451f8e5f3faed3b639bb8f157983d3aeab..6a1e2b528cefc2abdd7fef11f765048631e8ae71 100644 (file)
--- a/mf/feta-braces-i.mf
+++ b/mf/feta-braces-i.mf
@@ -3,7 +3,7 @@
 % 
 % source file of the Feta (Font-En-Tja) music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 font_count := 8;

diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf
index dd508285aa5daf0a77cc06aca567ffddec66ca6d..c5644af55578a4bffa876192907c4ba264384120 100644 (file)
--- a/mf/feta-generic.mf
+++ b/mf/feta-generic.mf
@@ -5,7 +5,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 % 
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 % 
 
 

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index dd0ccbfdc0b2a55256dc8f64bd068e0ce712e6a9..90a3a838aba9238024b67938694b9e9d6211808d 100644 (file)
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -4,7 +4,7 @@
 %
 % source file of the Feta (not the Font-En-Tja) music font
 %
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>,
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>,
 % Jan Nieuwenhuizen <janneke@gnu.org>,
 % Juergen Reuter <reuter@ipd.uka.de>
 

diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf
index a09dec08ff141a999f45cbd3bd9ce9294d67a9d8..9048afc5b9c11ca3491f41e970036acf328187aa 100644 (file)
--- a/mf/feta-schrift.mf
+++ b/mf/feta-schrift.mf
@@ -4,7 +4,7 @@
 % source file of the Feta (defintively not an abbreviation for Font-En-Tja)
 % music font
 %
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %      Jan Nieuwenhuizen <janneke@gnu.org>
 %
 

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index 3964f38025dcc873fb715f5d0c2128b721351811..b6ee76e3ac4b28e5b733dd24499ee653e1aa1d0a 100644 (file)
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -3,7 +3,7 @@
 %
 % source file of the Feta (Font-En-Tja) music font
 %
-% (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+% (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 %