From 7283d78766fba1039d0d4b3138b6825ca0695092 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 15 May 2013 21:18:51 -0700 Subject: [PATCH 1/1] Fix texinfo syntax errors --- Documentation/changes.tely | 2 +- Documentation/contributor/quick-start.itexi | 2 +- Documentation/included/compile.itexi | 14 +++++++------- Documentation/topdocs/INSTALL.texi | 9 +++++++++ Documentation/usage/lilypond-book.itely | 16 ++++++++-------- debian/changelog | 7 +++++++ 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/Documentation/changes.tely b/Documentation/changes.tely index d3db01ee76..b37c952b5b 100644 --- a/Documentation/changes.tely +++ b/Documentation/changes.tely @@ -41,7 +41,7 @@ See user manual, \NAME\ @finalout @node Top, Fixes and changes after 2.16.0, (dir), (dir) -@top New features in 2.16 +@chapter New features in 2.16 @menu * Fixes and changes after 2.16.0:: diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi index 2172677054..4221107403 100644 --- a/Documentation/contributor/quick-start.itexi +++ b/Documentation/contributor/quick-start.itexi @@ -344,7 +344,7 @@ to @ref{Compiling with LilyDev} before reading on. @warning{Throughout the rest of this manual, most command-line input should be entered from @file{~/lilypond-git/}. This is known as the @emph{top source directory} and is often referred to as -@var{$LILYPOND_GIT}}. +@var{$LILYPOND_GIT}.} @warning{Only work on one set of changes at once. Do not start work on any new changes until your first set has been accepted.} diff --git a/Documentation/included/compile.itexi b/Documentation/included/compile.itexi index eb24c59180..fef82f133b 100644 --- a/Documentation/included/compile.itexi +++ b/Documentation/included/compile.itexi @@ -922,7 +922,7 @@ bug reports to @email{bug-lilypond@@gnu.org}. Bugs that are not fault of LilyPond are documented here. -@unnumberedsubsubsec Bison 1.875 +@unnumberedsubsec Bison 1.875 There is a bug in bison-1.875: compilation fails with "parse error before `goto'" in line 4922 due to a bug in bison. To fix, please @@ -937,7 +937,7 @@ $ make @end example -@unnumberedsubsubsec Compiling on MacOS@tie{}X +@unnumberedsubsec Compiling on MacOS@tie{}X Here are special instructions for compiling under MacOS@tie{}X. These instructions assume that dependencies are installed using @@ -989,7 +989,7 @@ automatic font detection, add @end example -@unnumberedsubsubsec Solaris +@unnumberedsubsec Solaris Solaris7, ./configure @@ -1008,7 +1008,7 @@ or CONFIG_SHELL=/bin/bash bash -c ./configure @end example -@unnumberedsubsubsec FreeBSD +@unnumberedsubsec FreeBSD To use system fonts, dejaview must be installed. With the default port, the fonts are installed in @file{usr/X11R6/lib/X11/fonts/dejavu}. @@ -1022,7 +1022,7 @@ for your hierarchy.) @end example -@unnumberedsubsubsec International fonts +@unnumberedsubsec International fonts On Mac OS X, all fonts are installed by default. However, finding all system fonts requires a bit of configuration; see @@ -1049,7 +1049,7 @@ Debian GNU/Linux @end verbatim -@unnumberedsubsubsec Using lilypond python libraries +@unnumberedsubsec Using lilypond python libraries If you want to use lilypond's python libraries (either running certain build scripts manually, or using them in other programs), @@ -1123,7 +1123,7 @@ We currently use make and stepmake, which is complicated and only used by us. Hopefully this will change in the future. -@subsubheading Version-specific texinfo macros +@subheading Version-specific texinfo macros @itemize diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 47f0a70703..0523661daa 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -10,9 +10,18 @@ @node Top @top +@menu +* Compile:: +@end menu + + @contents @include macros.itexi + +@node Compile +@chapter Compile + @include included/compile.itexi @bye diff --git a/Documentation/usage/lilypond-book.itely b/Documentation/usage/lilypond-book.itely index 5225b67d5c..2f5ea9e9a5 100644 --- a/Documentation/usage/lilypond-book.itely +++ b/Documentation/usage/lilypond-book.itely @@ -1001,20 +1001,20 @@ cd out ... @end example -@itemx --skip-lily-check +@item --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 +@item --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} +@item --lily-output-dir=@var{dir} Write lily-XXX files to directory @var{dir}, link into @option{--output} directory. Use this option to save building time for documents in different directories which share a lot of identical snippets. -@itemx --lily-loglevel=@var{loglevel} +@item --lily-loglevel=@var{loglevel} Set the output verbosity of the invoked @command{lilypond} calls to @var{loglevel}. Possible values are @code{NONE}, @code{ERROR}, @code{WARNING}, @code{BASIC_PROGRESS}, @code{PROGRESS}, @code{INFO} @@ -1023,16 +1023,16 @@ environment variable @code{LILYPOND_LOGLEVEL} is set, its value is used as the loglevel. -@itemx --info-images-dir=@var{dir} +@item --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} +@item --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} +@item --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 music stick out of the right margin. @@ -1055,7 +1055,7 @@ Create PDF files for use with PDF@LaTeX{}. By default, output is displayed on the terminal. This option redirects all output to log files in the same directory as the source files. -@itemx --use-source-file-names +@item --use-source-file-names Write snippet output files with the same base name as their source file. This option works only for snippets included with @code{lilypondfile} and only if directories implied by @option{--output-dir} and diff --git a/debian/changelog b/debian/changelog index d9d5da1ccc..7463e562d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lilypond (2.16.2-2) unstable; urgency=low + + * Fix bad syntax in texinfo documentation exposed by texinfo >= 5.1 + (closes: #707190) + + -- Don Armstrong Wed, 15 May 2013 11:40:14 -0700 + lilypond (2.16.2-1) unstable; urgency=low * Release 2.16.2-1 to unstable -- 2.39.2