From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 18 May 2004 21:09:39 +0000 (+0000)
Subject: * scm/stencil.scm (fontify-text): reinstate function
X-Git-Tag: release/2.3.2~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=feef5e0d897345a88595671e0f54e1127a20d09f;p=lilypond.git

* scm/stencil.scm (fontify-text): reinstate function

* tex/lily-ps-defs.tex: remove lilypondblotdiam def.

* lily/book-paper-def.cc (Book_paper_def): add copy ctor.
---

diff --git a/ChangeLog b/ChangeLog
index 1da1117208..96c808f649 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-05-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scm/stencil.scm (fontify-text): reinstate function
+
+	* tex/lily-ps-defs.tex: remove lilypondblotdiam def.
+
 	* lily/book-paper-def.cc (Book_paper_def): add copy ctor.
 
 	* lily/parser.yy (book_paper_head): \bookpaper {} 
diff --git a/lily/book-paper-def.cc b/lily/book-paper-def.cc
index 7aa837dc90..1c4d048d6f 100644
--- a/lily/book-paper-def.cc
+++ b/lily/book-paper-def.cc
@@ -196,3 +196,18 @@ LY_DEFINE (ly_bookpaper_outputscale, "ly:bookpaper-outputscale",
   SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "bookpaper");
   return scm_make_real (b->output_scale_);
 }
+
+
+SCM
+Book_paper_def::lookup_variable (SCM sym) const
+{
+  SCM var = ly_module_lookup (scope_, sym);
+
+  return scm_variable_ref (var);
+}
+
+SCM
+Book_paper_def::c_variable (String s) const
+{
+  return lookup_variable (ly_symbol2scm (s.to_str0 ()));
+}
diff --git a/lily/include/book-paper-def.hh b/lily/include/book-paper-def.hh
index 144df004a7..e022e315b3 100644
--- a/lily/include/book-paper-def.hh
+++ b/lily/include/book-paper-def.hh
@@ -25,6 +25,8 @@ public:
   Real output_scale_;
 
   Book_paper_def ();
+  SCM c_variable (String id) const;
+  SCM lookup_variable (SCM sym) const;
 
   Font_metric *find_scaled_font (Font_metric *f, Real m, SCM input_enc_name);
   Paper_def *scale_paper (Paper_def *pd) const;
diff --git a/scm/stencil.scm b/scm/stencil.scm
index 2b1720f131..8f60fa0bec 100644
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -74,3 +74,10 @@ encloses the contents.
     (set! stil (ly:stencil-combine-at-edge stil Y -1 x-rule 0.0))
     
     stil))
+
+(define-public (fontify-text font-metric text)
+  "Set TEXT with font FONT-METRIC, returning a stencil."
+  (let* ((b  (ly:text-dimension font-metric text)))
+    (ly:make-stencil
+     `(text ,font-metric ,text) (car b) (cdr b))))
+
diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index 8a4522a2e7..d3c4fc07c6 100644
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -42,10 +42,6 @@
       \string"
       lyscale\lilypondpaperoutputscale\lilypondspace ##1}
   }
-
-  \lilypondifundefined{lilypondpaperblotdiameterps}
-    {\lilypondsetdimen{lilypondpaperblotdiameter}}
-    {}
 }
 
 \gdef\lilypondexperimentalfeatures{}