Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index 6ca65b7e6085d2de8c79b02d7f115c63ebe8242c..c03e68de01e5716f705f7a7a9426d5e64a6fc8c5 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -71,7 +71,8 @@ using the @code{rounded-box} command.
 
 @item
 @command{lilypond-book} can run any program instead of @command{latex}
-to guess the line width, thanks to @code{--latex} command line option.
+to guess the line width, thanks to @code{--latex-program} command line
+option.
 
 @item
 @code{\setEasyHeads} has been renamed to @code{\easyHeadsOn}, and a new

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 65f5e85325a1c29ff6b1ae22e8cc84bbb742fe3f..cfbae202ec7978384293bde034fb830758e1e5c3 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -725,9 +725,6 @@ extensions: @file{.tex}, @file{.texi}, @file{.html} or @file{.xml},
 depending on the output format.  All of @file{.tex}, @file{.texi} and
 @file{.xml} files need further processing.
 
-@command{lilypond-book} can also create a @file{.psfonts} file, which is
-required by @command{dvips} to produce PostScript and PDF files.
-
 @subheading Format-specific instructions
 
 @subsubheading @LaTeX{}
@@ -757,9 +754,9 @@ To produce PDF output via @LaTeX{}/@command{dvips}/@command{ps2pdf}, you
 should do
 
 @example
-lilypond-book --psfonts yourfile.lytex
+lilypond-book yourfile.lytex
 latex yourfile.tex
-dvips -o -h yourfile.psfonts -Ppdf yourfile.dvi
+dvips -Ppdf yourfile.dvi
 ps2pdf yourfile.ps
 @end example
 
@@ -768,7 +765,7 @@ The @file{.dvi} file created by this process will not contain
  note heads.  This is normal; if you follow the instructions, they
 will be included in the @file{.ps} and @file{.pdf} files.
 
-Running @command{dvips} will produce some warnings about fonts; these
+Running @command{dvips} may produce some warnings about fonts; these
 are harmless and may be ignored.  If you are running @command{latex} in
 twocolumn mode, remember to add @code{-t landscape} to the
 @command{dvips} options.
@@ -833,7 +830,7 @@ invoke further processing commands such as @command{makeinfo} or
 @itemx --output=@var{dir}
 Place generated files in directory @var{dir}.  Running
 @command{lilypond-book} generates lots of small files that LilyPond will
-process.  To avoid all that garbage in the source directory use the
+process.  To avoid all that garbage in the source directory, use the
 @option{--output} command line option, and change to that directory
 before running @command{latex} or @command{makeinfo}.
 
@@ -843,6 +840,28 @@ cd out
 ...
 @end example
 
+@itemx --skip-lily-check
+Do not fail if no lilypond output is found.  It is used for LilyPond
+Info documentation without images.
+
+@itemx --skip-png-check
+Do not fail if no PNG images are found for EPS files.  It is used for
+LilyPond Info documentation without images.
+
+@itemx --lily-output-dir=@var{dir}
+Write lily-XXX files to directory @var{dir}, link into @code{--output}
+directory.  Use this option to save building time for documents in
+different directories which share a lot of identical snippets.
+
+@itemx --info-images-dir=@var{dir}
+Format Texinfo output so that Info will look for images of music in
+@var{dir}.
+
+@itemx --latex-program=@var{prog}
+Run executable @command{prog} instead of @command{latex}.  This is
+useful if your document is processed with @command{xelatex}, for
+example.
+
 @itemx --left-padding=@var{amount}
 Pad EPS boxes by this much. @var{amount} is measured in millimeters,
 and is 3.0 by default.  This option should be used if the lines of
@@ -863,10 +882,6 @@ Process LilyPond snippets using @var{command}.  The default command is
 @item --pdf
 Create PDF files for use with PDFLaTeX.
 
-@itemx --psfonts
-Extract all PostScript fonts into @file{@var{file}.psfonts} for dvips.
-This is necessary for @command{dvips -h @var{file}.psfonts}.
-
 @item -V
 @itemx --verbose
 Be verbose.

diff --git a/python/langdefs.py b/python/langdefs.py
index d8bd17c286fd2b3fbe1c200c6e3a2b72cc7c5844..80a1c7f244e51b9175aced2480c3eda490b31169 100644 (file)
--- a/python/langdefs.py
+++ b/python/langdefs.py
@@ -7,6 +7,7 @@ Documentation i18n module
 
 import re
 import sys
+import os
 
 def lang_file_name (p, langext, ext):
     if langext != '':
@@ -66,7 +67,6 @@ else:
 
     try:
         import gettext
-        import os
 
         translation = {}
         for l in LANGUAGES:
@@ -76,5 +76,6 @@ else:
                                         [l.code])
                 translation[l.code] = t.gettext
     except:
-        sys.stderr.write ('langdefs.py: warning: lilypond-doc gettext domain not found.\n')
+        if os.environ.has_key ('LYDOC_LOCALEDIR'):
+            sys.stderr.write ('langdefs.py: warning: lilypond-doc gettext domain not found.\n')
         translation = dict ([(l.code, lambda x: x) for l in LANGUAGES])

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 9ed3cff2268bc0ab2d09e11872de9cc39d5af538..a57333e2338ac4b6a1e1b1b8f9af921b4395478a 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -136,8 +136,8 @@ def get_option_parser ():
                   action='store', dest='info_images_dir',
                   default='')
 
-    p.add_option ('--latex',
-                  help=_ ("Run executable PROG instead of latex"),
+    p.add_option ('--latex-program',
+                  help=_ ("run executable PROG instead of latex"),
                   metavar=_ ("PROG"),
                   action='store', dest='latex_program',
                   default='latex')
@@ -183,11 +183,6 @@ def get_option_parser ():
                   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
-must use this with dvips -h INPUT.psfonts'''),
-                  default=None)
-
     p.add_option ('-V', '--verbose', help=_ ("be verbose"),
                   action="store_true",
                   default=False,