From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 7 Apr 2004 12:47:23 +0000 (+0000)
Subject: * lily/scaled-font-metric.cc (derived_mark): is a const method.
X-Git-Tag: release/2.3.0~71
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=518df0d18ed7f106b425f5d3d92fe5a9e2805a87;p=lilypond.git

* lily/scaled-font-metric.cc (derived_mark): is a const method.
(Modified_font_metric): make alist for coding_description_
(LY_DEFINE): remove coding-name.

* lily/scaled-font-metric.cc (ly_font_encoding): return vector
---

diff --git a/ChangeLog b/ChangeLog
index 1b4a440c0d..292dec9942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2004-04-07  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* lily/scaled-font-metric.cc (derived_mark): is a const method.
+	(Modified_font_metric): make alist for coding_description_
+	(LY_DEFINE): remove coding-name.
 
 	* scm/output-tex.scm (text): remove debugging code.
 
diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc
index e62421300b..72e0e75245 100644
--- a/lily/scaled-font-metric.cc
+++ b/lily/scaled-font-metric.cc
@@ -53,18 +53,41 @@ Modified_font_metric::Modified_font_metric (String coding, Font_metric* m, Real
 					 coding_vector_,
 					 coding_table_);
 
-      coding_description_= scm_list_5 (scm_makfrom0str (coding_scheme_.to_str0 ()),
-				       coding_vector_,
+      coding_description_= SCM_EOL;
+
+      coding_description_ = scm_acons (ly_symbol2scm ("input-name"),
+				       scm_makfrom0str (coding_scheme_.to_str0 ()),
+				       coding_description_);
+
+      coding_description_ = scm_acons (ly_symbol2scm ("input-vector"),
+				       coding_vector_, coding_description_);
+      coding_description_ = scm_acons (ly_symbol2scm ("output-name"),
 				       scm_makfrom0str (orig_->coding_scheme ().to_str0 ()),
+				       coding_description_);
+      coding_description_ = scm_acons (ly_symbol2scm ("output-table"),
 				       coding_table_,
-				       coding_permutation_);
-
-      /*
-	TODO: use alist
-       */
-      coding_description_ = scm_vector (coding_description_);
+				       coding_description_);
+      
+      coding_description_ = scm_acons (ly_symbol2scm ("coding-permutation"),
+				       coding_permutation_,
+				       coding_description_);
     } 
+}
+
+
+
+LY_DEFINE (ly_font_encoding, "ly:font-encoding-alist",
+	   1, 0, 0,
+	   (SCM font),
+	   "Given the Modified_font_metric @var{font}, return an "
+	   "alist. Keys are input-name, input-vector, "
+	   "output-name, output-table, permutation.")
+{
+  Modified_font_metric *fm
+    = dynamic_cast<Modified_font_metric*> (unsmob_metrics (font));
   
+  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "Modified_font_metric");
+  return fm->coding_description_;
 }
 
 SCM
@@ -266,29 +289,3 @@ Modified_font_metric::text_dimension (String text)
   b.scale (magnification_);
   return b;
 }
-
-LY_DEFINE (ly_font_encoding, "ly:font-encoding",
-	   1, 0, 0,
-	   (SCM font),
-	   "Given the Modified_font_metric @var{font}, return a "
-	   "vector containing (input-coding-name, input-coding, "
-	   "output-coding-name, output-coding, permutation).")
-{
-  Modified_font_metric *fm
-    = dynamic_cast<Modified_font_metric*> (unsmob_metrics (font));
-  
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "Modified_font_metric");
-  return fm->coding_description_;
-}
-
-LY_DEFINE (ly_font_coding_name, "ly:font-coding-name",
-	   1, 0, 0,
-	   (SCM font),
-	   "Return the CODING-NAME of the Modified_font_metric @var{font}.")
-{
-  Modified_font_metric *fm
-    = dynamic_cast<Modified_font_metric*> (unsmob_metrics (font));
-  
-  SCM_ASSERT_TYPE (fm, font, SCM_ARG1, __FUNCTION__, "Modified_font_metric");
-  return scm_makfrom0str (fm->coding_scheme ().to_str0 ());
-}
diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index f96051b08a..881034ef1a 100644
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -205,14 +205,14 @@
 	   (fontname (ly:font-name font))
 	   (mangled (possibly-mangle-fontname fontname))
 	   (coding (ly:font-encoding font))
-	   (encoding (vector-ref coding 2)) 
+	   (encoding (vector-ref coding 2))
 	   (designsize (ly:font-design-size font))
 	   (magnification (* (ly:font-magnification font)))
 	   (ops (ly:paper-lookup paper 'outputscale))
 	   (scaling (* ops magnification designsize)))
 
       (if
-       #f
+       #t
        (begin
 	 (newline)
 	 (format (current-error-port) "fontname ~S\n" fontname)