From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 26 Feb 2005 13:10:31 +0000 (+0000)
Subject: * Documentation/user/changing-defaults.itely (Text encoding): add
X-Git-Tag: release/2.5.14~84
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8e5c2ee0d5b45438ce00e909712ab1daff30ef88;p=lilypond.git

* 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 23e492e12f..4bde807e1a 100644
--- 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 400fbf6428..a7beaca764 100644
--- 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 e5d9ee8864..06796d7d04 100644
--- 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 75f283fd6b..6917cf216e 100644
--- 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 e0b5767757..208942b11f 100644
--- 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 ()