lilypond-book: Remove obsolete fragment option `fontload'.

This option has no effect since inclusion of EPS fonts is controlled
via the program option 'include-eps-fonts, which defaults to #t.

diff --git a/Documentation/application/lilypond-book.itely b/Documentation/application/lilypond-book.itely
index 436f01701297c95102024bb969fc11277fbba24d..ced10dc01f5e4a23542fcf64a8fcde10202cfa9e 100644 (file)
--- a/Documentation/application/lilypond-book.itely
+++ b/Documentation/application/lilypond-book.itely
@@ -757,11 +757,6 @@ the file name right before the music snippet.  For HTML output, this
 is a link.  Only the base name of the file is printed, i.e. the
 directory part of the file path is stripped.
 
-@item fontload
-This option includes fonts in all of the generated EPS-files for this
-snippet.  This should be used if the snippet uses any font that @LaTeX{}
-cannot find on its own.
-
 @end table
 
 

diff --git a/Documentation/de/application/lilypond-book.itely b/Documentation/de/application/lilypond-book.itely
index 574ed5ab0567528ba7447fc4c32eb7e307c53e92..187d187be657449d819bfbf2009f2ec410886e0c 100644 (file)
--- a/Documentation/de/application/lilypond-book.itely
+++ b/Documentation/de/application/lilypond-book.itely
@@ -796,11 +796,6 @@ eingebunden wird, wird der Dateiname (ohne die Pfadangabe) unmittelbar vor
 dem Musikfragment ausgegeben. In HTML-Dateien ist er außerdem ein Link
 auf die LilyPond-Datei.
 
-@item fontload
-Diese Option inkludiert die Schriftarten in allen EPS-Dateien, die von
-diesem Fragment erzeugt werden. Dies ist nötig, wenn das Fragment
-Schriftarten benutzt, die @LaTeX{} nicht selbst findet.
-
 @end table
 
 

diff --git a/Documentation/es/application/lilypond-book.itely b/Documentation/es/application/lilypond-book.itely
index 88e4e8340e9e26cbb1024760c7ba51ab9add5b77..e1f94a5825332cdb6f94c9ded829dc128708c8b8 100644 (file)
--- a/Documentation/es/application/lilypond-book.itely
+++ b/Documentation/es/application/lilypond-book.itely
@@ -802,12 +802,6 @@ antes del fragmento musical.  Para la salida HTML, esto es un enlace.
 Sólo se imprime el nombre base del archivo, es decir, se elimina la
 parte del directorio de la ruta del archivo.
 
-@item fontload
-Esta opción incluye las fuentes tipográficas en todos los archivos EPS
-generados para este fragmento.  Se debe usar si el fragmento usa
-cualquier tipografía que @LaTeX{} no es capaz de encontrar por sí
-solo.
-
 @end table
 
 

diff --git a/Documentation/ja/application/lilypond-book.itely b/Documentation/ja/application/lilypond-book.itely
index be574ecaccc0311b5c6b6d86a1c11eb428818315..4f03a3a927b07d67027849741ef7747c34ddae7e 100644 (file)
--- a/Documentation/ja/application/lilypond-book.itely
+++ b/Documentation/ja/application/lilypond-book.itely
@@ -783,11 +783,6 @@ the file name right before the music snippet.  For HTML output, this
 is a link.  Only the base name of the file is printed, i.e. the
 directory part of the file path is stripped.
 
-@item fontload
-This option includes fonts in all of the generated EPS-files for this
-snippet.  This should be used if the snippet uses any font that @LaTeX{}
-cannot find on its own.
-
 @end table
 
 

diff --git a/ly/paper-defaults-init.ly b/ly/paper-defaults-init.ly
index 07ab1ae02fbc315e8a5266ac9ef84e7560157c39..33d8ee9a6baecaa05d2fbb7970908c85ffb1d8f1 100644 (file)
--- a/ly/paper-defaults-init.ly
+++ b/ly/paper-defaults-init.ly
@@ -23,7 +23,6 @@
     
     #(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/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 4aa5cb91339457c787d99883b68f8dbbbd8a3cbc..dc035b4b5cffa835906a0bea4e0bc9734e048276 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -272,7 +272,6 @@ TEXIDOC = 'texidoc'
 TEXINFO = 'texinfo'
 VERBATIM = 'verbatim'
 VERSION = 'lilypondversion'
-FONTLOAD = 'fontload'
 FILENAME = 'filename'
 ALT = 'alt'
 
@@ -600,7 +599,6 @@ simple_options = [
     TEXIDOC,
     LANG,
     VERBATIM,
-    FONTLOAD,
     FILENAME,
     ALT,
     ADDVERSION
@@ -830,7 +828,6 @@ PREAMBLE_LY = '''%%%% Generated by %(program_name)s
 %(preamble_string)s
 
 \paper {
-  %(font_dump_setting)s
   %(paper_string)s
   force-assignment = #""
   line-width = #(- line-width (* mm  %(padding_mm)f))
@@ -1225,9 +1222,6 @@ class LilypondSnippet (Snippet):
         notes_string = '\n  '.join (compose_dict[NOTES]) % vars ()
         preamble_string = '\n  '.join (compose_dict[PREAMBLE]) % override
         padding_mm = global_options.padding_mm
-        font_dump_setting = ''
-        if FONTLOAD in self.option_dict:
-            font_dump_setting = '#(define-public force-eps-font-include #t)\n'
 
         d = globals().copy()
         d.update (locals())