From 35b14e31601212911184b68cb33b5f866954e60d Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 20 Jul 2006 12:51:30 +0000
Subject: [PATCH] * lily/spacing-spanner.cc (calc_common_shortest_duration):
 use callback to compute common shortest duration. (set_springs): typo.

* lily/spacing-determine-loose-columns.cc (is_loose_column):
support float_grace_columns_.

* Documentation/topdocs/NEWS.tely (Top): doc tupletFullLengthNote.

* Documentation/topdocs/NEWS.tely (Top): document new feature.
---
 ChangeLog                |  1 +
 lily/spacing-spanner.cc  |  2 +-
 scripts/lilypond-book.py | 27 ++++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c50dca338..0c5cb13365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* lily/spacing-spanner.cc (calc_common_shortest_duration): use
 	callback to compute common shortest duration.
+	(set_springs): typo.
 
 	* scm/define-grob-properties.scm (all-user-grob-properties): add
 	strict-grace-spacing.
diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 77f3f07f3a..04ad54765e 100644
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -55,7 +55,7 @@ Spacing_spanner::set_springs (SCM smob)
   Spacing_options options;
   options.init_from_grob (me);
   options.global_shortest_ = robust_scm2moment (me->get_property ("common-shortest-duration"),
-						Moment (Rational (1,8)).main_part_;
+						Moment (Rational (1,8))).main_part_;
 
   prune_loose_columns (me, &all, &options);
   set_implicit_neighbor_columns (all);
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 3fe9421fa2..c6702f09f3 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -166,6 +166,12 @@ def get_option_parser ():
                   help = _ ("process ly_files using COMMAND FILE..."),
                   action='store', 
                   dest='process_cmd', default='lilypond -b eps')
+
+    p.add_option ('--pdf',
+                  action="store_true",
+                  dest="create_pdf",
+                  help="Create PDF files for use with PDFTeX",
+                  default=False)
     
     p.add_option ('', '--psfonts', action="store_true", dest="psfonts",
                   help=_ ('''extract all PostScript fonts into INPUT.psfonts for LaTeX'''
@@ -557,7 +563,7 @@ output = {
  \preLilyPondExample%%
 \fi%%
 \def\lilypondbook{}%%
-\input %(base)s-systems.tex%%
+\input %(base)s-systems.%(texextension)s%%
 \ifx\postLilyPondExample \undefined%%
  \relax%%
 \else%%
@@ -1157,7 +1163,10 @@ class Lilypond_snippet (Snippet):
             if VERBATIM in self.option_dict:
                 verb = self.substring ('code')
                 str += (output[LATEX][VERBATIM] % vars ())
-        
+
+        texextension = 'tex'
+        if global_options.create_pdf:
+            texextension = 'pdftex'
         str += (output[LATEX][OUTPUT] % vars ())
 
         ## todo: maintain breaks
@@ -1712,9 +1721,17 @@ def main ():
     formats = 'ps'
     if global_options.format in (TEXINFO, HTML):
         formats += ',png'
+
+    if (global_options.format in (TEXINFO, LATEX)
+        and global_options.create_pdf):
+        formats += ",pdf"
+        
     if global_options.process_cmd == '':
-        global_options.process_cmd = lilypond_binary \
-               + ' --formats=%s --backend eps ' % formats
+        global_options.process_cmd = (lilypond_binary 
+                                      + ' --formats=%s --backend eps ' % formats)
+
+        if global_options.create_pdf:
+            global_options.process_cmd += ' -dgs-font-load -deps-font-include '
 
     if global_options.process_cmd:
         global_options.process_cmd += string.join ([(' -I %s' % commands.mkarg (p))
@@ -1746,7 +1763,7 @@ def main ():
         psfonts_file = os.path.join (global_options.output_name, basename + '.psfonts')
         output = os.path.join (global_options.output_name, basename +  '.dvi' )
         
-        if not global_options.psfonts:
+        if not global_options.psfonts and not global_options.create_pdf:
             warning (_ ("option --psfonts not used"))
             warning (_ ("processing with dvips will have no fonts"))
         else:
-- 
2.39.5