* Documentation/user/changing-defaults.itely (Text encoding): add

fontload option to utf8 include

* scripts/lilypond-book.py (compose_ly): add fontload option

* scm/framework-eps.scm (dump-stencils-as-EPSes): add
force-eps-font-include option.

diff --git a/ChangeLog b/ChangeLog
index 23e492e12f207c980377d12494abbdf33b874f07..4bde807e1a83654642db720c224345f73d52e5bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-02-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * Documentation/user/changing-defaults.itely (Text encoding): add
+       fontload option to utf8 include
+
+       * scripts/lilypond-book.py (compose_ly): add fontload option
+
+       * scm/framework-eps.scm (dump-stencils-as-EPSes): add
+       force-eps-font-include option.
+
        * ly/chord-modifiers-init.ly (blackTriangleMarkup): reinstate
        black triangle
 

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 400fbf6428e6df81d7b050fefdc189b996a93304..a7beaca76448b9f4fa9a974e4a689ee4fd46e2ca 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1593,7 +1593,7 @@ interpreting non-ASCII strings.
 
 @seealso
 
-@inputfileref{input/regression,utf8.ly}
+@inputfileref[fontload]{input/regression,utf8.ly}
 
 
 @node Nested scores

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index e5d9ee886464477c3b05c9fa277008dc86da257d..06796d7d04780943242dc06ffc45658b9d9db2f7 100644 (file)
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -27,7 +27,8 @@
     
     #(define-public book-title (marked-up-title 'bookTitleMarkup))
     #(define-public score-title (marked-up-title 'scoreTitleMarkup))
-
+    #(define-public force-eps-font-include #f)
+    
     %%
     %% ugh. hard coded?
     %%

diff --git a/scm/framework-eps.scm b/scm/framework-eps.scm
index 75f283fd6be718c5d744ca482a2f90fdedc71334..6917cf216e915f55f401a98f1f7cc4892b5c074c 100644 (file)
--- a/scm/framework-eps.scm
+++ b/scm/framework-eps.scm
@@ -36,7 +36,7 @@
          (dump-stencil-as-EPS
           paper
           line (format "~a-~a" basename count)
-          #f)
+          (ly:output-def-lookup paper 'force-eps-font-include))
 
          (dump-stencils-as-separate-EPS rest (1+ count))
          )))

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index e0b57677573742b7c9f7b79c596a2fa312acad00..208942b11f1057d8e10c3938f2fff5cf3261f251 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -145,6 +145,8 @@ STAFFSIZE = 'staffsize'
 TEXIDOC = 'texidoc'
 TEXINFO = 'texinfo'
 VERBATIM = 'verbatim'
+FONTLOAD = 'fontload'
+
 
 # NOTIME has no opposite so it isn't part of this dictionary.
 # NOQUOTE is used internally only.
@@ -380,7 +382,8 @@ simple_options = [
        NOINDENT,
        PRINTFILENAME,
        TEXIDOC,
-       VERBATIM
+       VERBATIM,
+       FONTLOAD
 ]
 
 ly_options = {
@@ -538,6 +541,7 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 
 \paper {
   #(define dump-extents #t)
+  %(font_dump_setting)s
   %(paper_string)s
 }
 
@@ -675,6 +679,7 @@ def compose_ly (code, options, type):
        # environment for non-quoted snippets.
        override[EXAMPLEINDENT] = r'0.4\in'
        override[LINEWIDTH] = texinfo_linewidths['@smallbook']
+       override[FONTLOAD] = ''
        override.update (default_ly_options)
 
        option_list = []
@@ -750,6 +755,10 @@ def compose_ly (code, options, type):
        preamble_string = \
          string.join (compose_dict[PREAMBLE], '\n  ') % override
 
+        font_dump_setting = ''
+       if FONTLOAD in options.keys():
+               font_dump_setting = '#(define-public force-eps-font-include #t)\n'
+                                 
        return (PREAMBLE_LY + body) % vars ()