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

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

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index cbd18b4b630bcfe29f68153e6c15684bdf87430a..571bdbc199f3c1eeab5607e7d6f2c67b49a35f0a 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -35,11 +35,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 +117,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 +309,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
 
@@ -512,10 +519,10 @@ Including LilyPond code is possible by using a @code{programlisting}, where the
 <inlinemediaobject>
   <textobject>
     <programlisting language="lilypond" role="fragment verbatim staffsize=16 ragged-right relative=2">
-\context Staff \with {
+\context Staff \with @{
   \remove Time_signature_engraver
-  \remove Clef_engraver} 
-  { c4( fis) }
+  \remove Clef_engraver@} 
+  @{ c4( fis) @}
     </programlisting>
   </textobject>
 </inlinemediaobject>
@@ -682,7 +689,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 +776,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 +841,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