From 3bd4eb36475a791badf9941375809cdecec942f3 Mon Sep 17 00:00:00 2001
From: Neil Puttock <n.puttock@gmail.com>
Date: Sat, 1 Aug 2009 21:55:13 +0100
Subject: [PATCH] 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.
---
 Documentation/application/lilypond-book.itely    | 5 -----
 Documentation/de/application/lilypond-book.itely | 5 -----
 Documentation/es/application/lilypond-book.itely | 6 ------
 Documentation/ja/application/lilypond-book.itely | 5 -----
 ly/paper-defaults-init.ly                        | 1 -
 scripts/lilypond-book.py                         | 6 ------
 6 files changed, 28 deletions(-)

diff --git a/Documentation/application/lilypond-book.itely b/Documentation/application/lilypond-book.itely
index 436f017012..ced10dc01f 100644
--- 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 574ed5ab05..187d187be6 100644
--- 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 88e4e8340e..e1f94a5825 100644
--- 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 be574ecacc..4f03a3a927 100644
--- 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 07ab1ae02f..33d8ee9a6b 100644
--- 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 4aa5cb9133..dc035b4b5c 100644
--- 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())
-- 
2.39.5