* ly/nederlands.ly: add comment about digits.

* scm/output-tex.scm (text): remove debugging code.

diff --git a/ChangeLog b/ChangeLog
index 71467515f2ae32b874fbb6b54e4e58a5dafe86c3..dd6880b79d46a42525f7ec72e4321aadebca02d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-04-07  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * ly/nederlands.ly: add comment about digits.
+
        * lily/scaled-font-metric.cc (derived_mark): idem.
 
        * scm/encoding.scm (make-encoding-mapping): change permutation to mapping.

diff --git a/ly/nederlands.ly b/ly/nederlands.ly
index 8b6b7076fcab31547245a98d6f3fa1a25efc901f..68ce73ab649868961854617f3b307246c4c90a3e 100644 (file)
--- a/ly/nederlands.ly
+++ b/ly/nederlands.ly
@@ -1,6 +1,9 @@
 \version "2.1.36"
 %{
  common dutch names for notes. es means flat, is means sharp
+
+notenames should only contain letters. No digits or punctuation.
+
 %}
 
 dutchPitchnames = #`(

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 7358bd8666e1018f5f09e56773348f70ab37bc5d..0597ee23bf2b79690ff056f715e19b422a3d4f0d 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -212,7 +212,7 @@
           (scaling (* ops magnification designsize)))
 
       (if
-       #t
+       #f
        (begin
         (newline)
         (format (current-error-port) "fontname ~S\n" fontname)

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 3e6770201a9b3e05d39c6cf3bae214bb6fb1fa67..9c0869c8d8cdd8e0baab374457858f3464e5b32c 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -312,9 +312,8 @@
 
 (define (text font s)
   (let*
-      ((perm (assoc-get  'mapping (ly:font-encoding-alist font))))
+      ((perm (assoc-get  'char-mapping (ly:font-encoding-alist font))))
 
-    (display (ly:font-encoding-alist font))
     (string-append "\\hbox{\\" (font-command font) "{}"
                   (output-tex-string
                    (if (vector? perm)