commit 84bc7aa3ec9b70709e9f18f867f52a5abd0a1e2f
Author: Christopher Antila <crantila(a)fedoraproject.org>
Date: Sun Jan 2 17:19:36 2011 -0500
Finished bug 654187
en-US/Book_Info.xml | 4 +-
en-US/LilyPond/LilyPond-syntax.xml | 42 ++++++++++++++++---
en-US/Revision_History.xml | 45 ++++++++++++++------
en-US/files/LilyPond/Bar-Check_Example-result.pdf | Bin 0 -> 17793 bytes
en-US/files/LilyPond/Bar-Check_Example-source.ly | 22 ++++++++++
en-US/files/LilyPond/Bar-Check_Example-source.pdf | Bin 0 -> 18083 bytes
6 files changed, 90 insertions(+), 23 deletions(-)
---
diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index 9bcbcda..330ec4c 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -9,11 +9,11 @@
<!-- Haydn: <subtitle>A guide to Fedora Linux's audio creation and music
capabilities, written in a new and special way.</subtitle> -->
<productname>Fedora Draft Documentation</productname>
<pubsnumber>0</pubsnumber> <!-- NB: I have no idea why this is here, but
the book doesn't work without it -CRA -->
- <edition>15.0</edition>
+ <edition>14.9.2</edition>
<abstract>
<para>
- This document explores some audio-creation and music activities possible with
Fedora Linux. Computer audio concepts are explained, and a selection of programs are
demonstrated with tutorials showing typical usage.
+ This document explores some audio creation and music activities possible with
Fedora Linux. Computer audio concepts are explained, and a selection of programs are
demonstrated with tutorials that show their typical usage.
</para>
</abstract>
diff --git a/en-US/LilyPond/LilyPond-syntax.xml b/en-US/LilyPond/LilyPond-syntax.xml
index 2160bdc..f68ed6c 100644
--- a/en-US/LilyPond/LilyPond-syntax.xml
+++ b/en-US/LilyPond/LilyPond-syntax.xml
@@ -328,31 +328,59 @@ violin = \relative c''
<section
id="sect-Musicians_Guide-LilyPond-Syntax-Avoiding_Errors-Bar_Check_Symbol">
<title>The Bar-Check Symbol</title>
<para>
- The bar-check symbol tests whether a barline is printed at that point in the music.
<application>LilyPond</application> prints a warning if the bar-check symbol
does not line up with a barline in the score, then processes the rest of the file. You
must correct an inputting mistake when <application>LilyPond</application>
prints a warning.
+ The bar-check symbol tests whether a measure line is printed at that point in the
music. <application>LilyPond</application> prints a warning if the bar-check
symbol does not line up with a measure line in the score.
<application>LilyPond</application> continues to process the music, and does
not automatically change any durations.
</para>
<para>
- The bar-check symbol is <literal>|</literal>. We recommend including a
bar-check symbol at the end of every bar, and inputting only one bar on every line, so
that errors are easier to find.
+ The bar-check symbol is the pipe character, <literal>|</literal>. We
recommend that you put a bar-check symbol at the end of every measure, and that you input
only one measure on every line. If you follow this recommendation, you will make fewer
mistakes.
</para>
<para>
- This example is correct, and will not trigger a warning:
+ This example is correct, so <application>LilyPond</application> will not
print a warning:
<programlisting><![CDATA[
\time 4/4
c4 c c c |
c4 c c c |
]]></programlisting>
- There are four quarter-notes between each bar-check symbol, which is the right number
of beats.
+ There are four quarter notes between each bar-check symbol, which is the right number
of beats in the indicated metre.
</para>
<para>
- This example is incorrect, and will trigger a warning:
+ This example is incorrect, so <application>LilyPond</application> will
print a warning.
+<programlisting><![CDATA[
+\time 4/4
+c4 c2 c4 |
+c4 c2 c |
+c4 c2 c4 |
+]]></programlisting>
+ This example shows three measures of the same pattern: <literal>c4 c2
c4</literal>. The second measure is missing the last quarter-note symbol (a
<literal>4</literal>), so <application>LilyPond</application>
outputs one quarter note followed by two half notes. The second measure is five beats, so
the bar-check symbol does not coincide with the measure line after the fourth beat.
<application>LilyPond</application> prints a warning when it reaches the
bar-check symbol at the end of the second measure.
+ </para>
+ <para>
+ Consider this example.
<programlisting><![CDATA[
\time 4/4
c2 c c c |
c4 c c c |
]]></programlisting>
- The first bar has four half-notes, which is twice as many beats as are allowed.
<application>LilyPond</application> will print a warning at the first
bar-check symbol.
+ The first bar has four half-notes, which is twice as many beats as are allowed in one
measure. A bar-check symbol only triggers a warning if it is placed where there is no bar
line. Therefore, <application>LilyPond</application> will not print a warning
for this example, even though only two of the three bar lines has a bar-line check
symbol.
+ </para>
+ <para> <!-- This has a source-file example and PDF/graphic output in the
"files" directory; not yet incorporated here -CRA -->
+ One mistake in a file will sometimes cause
<application>LilyPond</application> to print multiple warnings. A bar-check
symbol does not force <application>LilyPond</application> to insert a bar
line. <application>LilyPond</application> continues to insert notes with the
duration shown in the file. Look at the following example, and the
<application>LilyPond</application> output.
+<!-- Input -->
+<programlisting><![CDATA[
+\time 4/4
+c4 c2 c4 |
+c4 c2 c |
+c4 c2 c4 |
+]]></programlisting>
+<!-- LilyPond log output -->
+<programlisting><![CDATA[
+Interpreting music...
+example.ly:3:10: warning: barcheck failed at: 1/4
+ c4 c2 c
+ |
+]]></programlisting>
+ The mistake in the second measure causes a warning at the bar-check symbol.
<application>LilyPond</application> does not modify note durations, so the
half note at the end of the second measure occupies the fourth beat of the second measure
<emphasis>and</emphasis> the first beat of the third measure. The third
measure is correct, with four beats, but the bar-check symbol causes a warning to be
printed because <application>LilyPond</application> expects a bar line before
the last quarter note, not after it.
</para>
<para>
- You should always fix the first warning printed by
<application>LilyPond</application>, then reprocess the file and fix remaining
warnings. One mistake sometimes triggers more than one bar-check warning, so if you fix
the first warning, the rest may disappear.
+ You can avoid confusion if you fix the first warning, then reprocess the file before
you fix other warnings. One mistake may cause many warnings.
</para>
</section>
</section>
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index a266dd8..97ea13a 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -9,7 +9,7 @@
<revhistory>
<revision>
<revnumber>0.0</revnumber>
- <date>Tue Jul 27 2010</date>
+ <date>27 July 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -24,7 +24,7 @@
<revision>
<revnumber>0.1</revnumber>
- <date>Mon Aug 2 2010</date>
+ <date>2 August 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -39,7 +39,7 @@
<revision>
<revnumber>0.2</revnumber>
- <date>Tue Aug 3 2010</date>
+ <date>3 August 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -55,7 +55,7 @@
<revision>
<revnumber>0.3</revnumber>
- <date>Wed Aug 4 2010</date>
+ <date>4 August 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -71,7 +71,7 @@
<revision>
<revnumber>0.4</revnumber>
- <date>Thu Aug 5 2010</date>
+ <date>5 August 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -87,7 +87,7 @@
<revision>
<revnumber>0.5</revnumber>
- <date>Fri Aug 6 2010</date>
+ <date>6 August 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -103,7 +103,7 @@
<revision>
<revnumber>0.6</revnumber>
- <date>Sat Aug 7 2010</date>
+ <date>7 August 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -119,7 +119,7 @@
<revision>
<revnumber>0.7</revnumber>
- <date>Sun Aug 8 2010</date>
+ <date>8 August 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -136,7 +136,7 @@
<revision>
<revnumber>0.8</revnumber>
- <date>Fri Aug 27 2010</date>
+ <date>27 August 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -152,7 +152,7 @@
<revision>
<revnumber>0.9</revnumber>
- <date>Mon Sept 6 2010</date>
+ <date>6 September 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -171,8 +171,8 @@
</revision>
<revision>
- <revnumber>15.0</revnumber>
- <date>Thurs Dec 23 2010</date>
+ <revnumber>14.9</revnumber>
+ <date>23 December 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -190,8 +190,8 @@
</revision>
<revision>
- <revnumber>15.0.1</revnumber>
- <date>Sun Dec 26 2010</date>
+ <revnumber>14.9.1</revnumber>
+ <date>26 December 2010</date>
<author>
<firstname>Christopher</firstname>
<surname>Antila</surname>
@@ -206,6 +206,22 @@
</revdescription>
</revision>
+ <revision>
+ <revnumber>14.9.2</revnumber>
+ <date>2 January 2011</date>
+ <author>
+ <firstname>Christopher</firstname>
+ <surname>Antila</surname>
+ <email>crantila(a)fedoraproject.org</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Reformatted dates in Revision History</member>
+ <member>Re-wrote Section 12.4.8.2 to fix the second error in Bug
654187.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+
<!-- NOTE: When adding a revision above, be sure to update the <edition> tag
in "Book_Info.xml" -->
<!-- Finite Tasks -->
@@ -214,6 +230,7 @@
<!-- TODO: Bug 665662 ("SuperCollider Chapters Are in First Person")
-->
<!-- TODO: Bug 665664 ("LilyPond Example Scores Are Incomplete") -->
<!-- TODO: Bug 622168 ("Rosegarden Tutorial Is Boring") -->
+ <!-- TODO: add source-file and PDF/graphics examples to LilyPond-syntax.xml;
already started for example at line 365 -->
<!-- TODO: fix the example around line 630 of SC Basic Programming -->
<!-- TODO: convert images to format given by R. Landmann (as line 164 of Audacity?)
-->
<!-- TODO: convert SuperCollider examples to <xi:include ... /> -->
diff --git a/en-US/files/LilyPond/Bar-Check_Example-result.pdf
b/en-US/files/LilyPond/Bar-Check_Example-result.pdf
new file mode 100644
index 0000000..64e3fe1
Binary files /dev/null and b/en-US/files/LilyPond/Bar-Check_Example-result.pdf differ
diff --git a/en-US/files/LilyPond/Bar-Check_Example-source.ly
b/en-US/files/LilyPond/Bar-Check_Example-source.ly
new file mode 100644
index 0000000..16c3bb9
--- /dev/null
+++ b/en-US/files/LilyPond/Bar-Check_Example-source.ly
@@ -0,0 +1,22 @@
+\version "2.12.3"
+
+\header
+{
+ tagline = ##f % Remove default LilyPond tagline
+}
+
+trebleClefVoice = \relative c''
+{
+ % This example shows the bar-check symbol at work.
+ \key c \major
+ \time 4/4
+ c4 c2 c4 |
+ c4 c2 c | % This bar contains five beats. The bar-check symbol prints a warning.
+ c4 c2 c4 | % This bar-check symbol also prints a warning -- but for some reason it
doesn't?!?!
+}
+
+\score
+{
+ \new Staff { \trebleClefVoice }
+ \layout { }
+}
diff --git a/en-US/files/LilyPond/Bar-Check_Example-source.pdf
b/en-US/files/LilyPond/Bar-Check_Example-source.pdf
new file mode 100644
index 0000000..5ebd3a8
Binary files /dev/null and b/en-US/files/LilyPond/Bar-Check_Example-source.pdf differ