From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 7 Apr 2004 13:00:10 +0000 (+0000)
Subject: * ly/nederlands.ly: add comment about digits.
X-Git-Tag: release/2.3.0~69
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8d186301cf0f02616e0002a6b111ba6db3ff8fbf;p=lilypond.git

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

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

diff --git a/ChangeLog b/ChangeLog
index 71467515f2..dd6880b79d 100644
--- 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 8b6b7076fc..68ce73ab64 100644
--- 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 7358bd8666..0597ee23bf 100644
--- 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 3e6770201a..9c0869c8d8 100644
--- 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)