X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fusage%2Flatex-lilypond-example.latex;h=30d680c3a03d7d3aef08741658b56f47906d8caf;hb=46cf3e09145fe5b25ac507e071634c0e94896ed6;hp=bd278d3dcaaaf66cb44591c43856bec96512049e;hpb=0945e7219a3995158d76267d26f77f57659c8578;p=lilypond.git diff --git a/Documentation/usage/latex-lilypond-example.latex b/Documentation/usage/latex-lilypond-example.latex index bd278d3dca..30d680c3a0 100644 --- a/Documentation/usage/latex-lilypond-example.latex +++ b/Documentation/usage/latex-lilypond-example.latex @@ -21,8 +21,8 @@ \section{LilyPond-book + LaTeX} -This is an examplefile for mixing LilyPond and Latex. It is also -used to test lilypond-book. View the source to see how it is done. +This is an examplefile for mixing LilyPond and Latex. It is also +used to test lilypond-book. View the source to see how it is done. A simple scale: @@ -33,7 +33,7 @@ A simple scale: \end{lilypond} LilyPond-book search for the \verb|\score| command when it decides -if the code is only a fragment. Thus, in the following code, you have +if the code is only a fragment. Thus, in the following code, you have to use \verb|fragment| option, because the comment confuses lilypond-book. \begin{lilypond}[fragment] @@ -52,12 +52,12 @@ c' e' g' \end{verbatim} This C major -%%\begin{lilypond}[staffsize=11\pt,fragment] -\begin{lilypond}[11pt,fragment] +%%\begin{lilypond}[staffsize=11,fragment] +\begin{lilypond}[staffsize=11,fragment] \context Voice <> \end{lilypond} and C minor -\lilypond[fragment,11pt]{\context Voice <>} chords are floating inside the text. +\lilypond[fragment,staffsize=11]{\context Voice <>} chords are floating inside the text. \subsection{verb and verbatim} @@ -116,9 +116,9 @@ c' e' \end{lilypond} has also the \verb|eps| options, but is not floating because there -are an empty line before and after the lilypond block. That is +are an empty line before and after the lilypond block. That is correct behaviour because it follows La\TeX{} convention that an -empty line signals a new paragraph. The \verb|eps| option +empty line signals a new paragraph. The \verb|eps| option is not necessary when you want the music in a paragraph on its own. \subsection{More examples} @@ -126,36 +126,36 @@ is not necessary when you want the music in a paragraph on its own. Itemize environment: \begin{itemize} \item -\lilypond[11pt,fragment]{ c'} do +\lilypond[staffsize=11,fragment]{ c'} do \item -\lilypond[11pt,fragment]{d'} re +\lilypond[staffsize=11,fragment]{d'} re \item -\lilypond[11pt,fragment]{e'} mi +\lilypond[staffsize=11,fragment]{e'} mi \item -\lilypond[11pt,fragment]{f'} fa +\lilypond[staffsize=11,fragment]{f'} fa \item -\lilypond[11pt,fragment]{g'} sol +\lilypond[staffsize=11,fragment]{g'} sol \end{itemize} Tables\footnote{ and footnote: -\lilypond[11pt,fragment]{c' e' g'} }: +\lilypond[staffsize=11,fragment]{c' e' g'} }: \marginpar{ Yes, even as marginpar -\lilypond[11pt,fragment]{c' d' e'} } +\lilypond[staffsize=11,fragment]{c' d' e'} } \begin{tabular}{|l|l|r|} \hline \em Notes & \em Name \\ \hline -\lilypond[11pt,fragment,filename="cdur"]{\context Voice <>} & major \\ -\lilypond[11pt,fragment]{\context Voice <>} & minor \\ -\lilypond[11pt,fragment]{\context Voice <>} & diminished \\ -\lilypond[11pt,fragment]{\context Voice <>} & augmented \\ +\lilypond[staffsize=11,fragment,filename="cdur"]{\context Voice <>} & major \\ +\lilypond[staffsize=11,fragment]{\context Voice <>} & minor \\ +\lilypond[staffsize=11,fragment]{\context Voice <>} & diminished \\ +\lilypond[staffsize=11,fragment]{\context Voice <>} & augmented \\ \hline \end{tabular} \pagebreak -Testing of spacing. The next music is surrounded by an empty line. +Testing of spacing. The next music is surrounded by an empty line. text text text text text text text text text text text text text text text text text text text text text text text text