Merge with master

[lilypond.git] / Documentation / user / lilypond-book.itely

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 974d7bf25d9566a09b5e33e8c883f9054470ab06..543a4cdd429b884170bfdaa59cf354f2218e6fbd 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -1,4 +1,11 @@
-c -*- coding: utf-8; mode: texinfo; -*-
+@c -*- coding: utf-8; mode: texinfo; -*-
+@c This file is part of lilypond.tely
+@ignore
+    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+@end ignore
 
 
 @ignore
@@ -35,11 +42,12 @@ This procedure may be applied to La@TeX{}, HTML, Texinfo or DocBook documents.
 * Integrating LaTeX and music::  
 * Integrating Texinfo and music::  
 * Integrating HTML and music::  
-* Integrating DocBook and music::
+* Integrating DocBook and music::  
 * Music fragment options::      
 * Invoking lilypond-book::      
 * Filename extensions::         
 * Many quotes of a large score::  
+* Inserting LilyPond output into OpenOffice.org::  
 * Inserting LilyPond output into other programs::  
 @end menu
 
@@ -116,6 +124,9 @@ dvips -o -Ppdf -h lilybook.psfonts lilybook
 ps2pdf lilybook.ps
 @end example
 
+If you are running latex in twocolumn mode, remember to add
+@code{-t landscape} to the dvips options.
+
 Running @command{lilypond-book} and @command{latex} creates a lot of
 temporary files, which would clutter up the working directory.  To
 remedy this, use the @code{--output=@var{dir}} option.  It will create
@@ -305,6 +316,9 @@ can then be produced with a PostScript to PDF translator like
 will produce some warnings about fonts; these are harmless and may
 be ignored.
 
+If you are running latex in twocolumn mode, remember to add
+@code{-t landscape} to the dvips options.
+
 @cindex international characters
 @cindex latin1
 
@@ -532,7 +546,7 @@ For HTML (HTML Help, JavaHelp etc.) generation you can use the official DocBook
 @node Music fragment options
 @section Music fragment options
 
-In the following, a ``LilyPond command'' refers to any command described
+In the following, a @q{LilyPond command} refers to any command described
 in the previous sections which is handled by @command{lilypond-book} to
 produce a music snippet.  For simplicity, LilyPond commands are only
 shown in La@TeX{} syntax.
@@ -604,7 +618,7 @@ LilyPond, not the text layout.  Since no indentation is the default,
 
 @item quote
 Reduce line length of a music snippet by @math{2*0.4}@dmn{in} and put
-the output into a quotation block.  The value `0.4@dmn{in}' can be
+the output into a quotation block.  The value @q{0.4@dmn{in}} can be
 controlled with the @code{exampleindent} option.
 
 @item exampleindent
@@ -682,7 +696,7 @@ cannot find on its own.
 
 @command{lilypond-book} produces a file with one of the following
 extensions: @file{.tex}, @file{.texi}, @file{.html}  or @file{.xml}, depending on the
-output format.  All of @file{.tex}, @file{.texi} and @{.xml} files need further
+output format.  All of @file{.tex}, @file{.texi} and @file{.xml} files need further
 processing.
 
 @command{lilypond-book} can also create a PSFONTS file, which is required
@@ -769,6 +783,17 @@ cd out
 ...
 @end example
 
+@itemx --padding=@var{amount}
+Pad EPS boxes by this much. @var{amount} is measured in milimeters,
+and is 3.0 by default.  This option should be used if the lines of
+music stick out of the right margin.
+
+The width of a tightly clipped systems can vary, due to notation
+elements that stick into the left margin, such as bar numbers and
+instrument names. This option will shorten each line and move each 
+line to the right by the same amount.
+
+
 @item -P @var{process}
 @itemx --process=@var{command}
 Process LilyPond snippets using @var{command}.  The default command is
@@ -823,12 +848,23 @@ output format based on the input filename's extension.
 @end multitable
 @end quotation
 
+
 @node Many quotes of a large score
 @section Many quotes of a large score
 
 If you need to quote many fragments of a large score, you can also use
 the clip systems feature, see @ref{Extracting fragments of notation}.
 
+
+@node Inserting LilyPond output into OpenOffice.org
+@section Inserting LilyPond output into OpenOffice.org
+
+@cindex OpenOffice.org
+
+LilyPond notation can be added to OpenOffice.org with
+@uref{http://@/ooolilypond@/.sourceforge@/.net@/,OOoLilyPond}
+
+
 @node Inserting LilyPond output into other programs
 @section Inserting LilyPond output into other programs