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

diff --combined Documentation/user/lilypond-book.itely
index d326bafb9d2113ce83d38cb9786d5385ccb39110,a493cbf38e627171ee78e90b403c2880fca2e50b..571bdbc199f3c1eeab5607e7d6f2c67b49a35f0a
--- 1/Documentation/user/lilypond-book.itely
--- 2/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@@ -35,11 -35,12 +35,12 @@@ This procedure may be applied to La@TeX
  * 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
  
@@@ -775,17 -776,6 +776,17 @@@ cd ou
  ...
  @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
@@@ -848,16 -838,13 +849,13 @@@ If you need to quote many fragments of 
  the clip systems feature, see @ref{Extracting fragments of notation}.
  
  
- @ignore 
- @n ode Inserting LilyPond output into OpenOffice.org
- @s ection Inserting LilyPond output into OpenOffice.org
+ @node Inserting LilyPond output into OpenOffice.org
+ @section Inserting LilyPond output into OpenOffice.org
  
- @c index OpenOffice.org
+ @cindex OpenOffice.org
  
  LilyPond notation can be added to OpenOffice.org with
- @u ref{http://@/ooolilypond@/.sourceforge@/.net@/,OOoLilyPond}
- 
- @end ignore
+ @uref{http://@/ooolilypond@/.sourceforge@/.net@/,OOoLilyPond}
  
  
  @node Inserting LilyPond output into other programs