From: Graham Percival <graham@percival-music.ca>
Date: Mon, 31 Aug 2009 01:18:49 +0000 (+0100)
Subject: Doc: clarify early Learning.
X-Git-Tag: release/2.13.4-1~112
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ac45df6e4714fc6c7e3a5832b0fcc7de6ea64a81;p=lilypond.git

Doc: clarify early Learning.
---

diff --git a/Documentation/learning/introduction.itely b/Documentation/learning/introduction.itely
index 67b456bfde..4b6ebe9874 100644
--- a/Documentation/learning/introduction.itely
+++ b/Documentation/learning/introduction.itely
@@ -66,7 +66,7 @@ the result looks like this:
 @end lilypond
 
 @warning{Notes and lyrics in LilyPond input must always be
-surrounded by @strong{@{ curly braces @}}.  The braces
+surrounded by @w{@strong{@{ curly braces @}}}.  The braces
 should also be surrounded by a space unless they are at the
 beginning or end of a line to avoid ambiguities.  The braces may
 be omitted in some examples in this manual, but don't forget them
@@ -77,10 +77,12 @@ In addition, LilyPond input is @strong{case sensitive}.
 @w{@code{@{ c d e @}}} is valid input; @w{@code{@{ C D E @}}} will
 produce an error message.
 
+
 @smallspace
 
-@subheading Entering music and viewing output
+@subheading Viewing output
 
+@c TODO: move index entries
 @cindex PDF file
 @cindex viewing music
 @cindex text editors
@@ -91,12 +93,32 @@ produce an error message.
 @cindex running LilyPond under Unix
 @cindex Unix, running LilyPond
 
-In this section we will explain what commands to run and how to
-view or print the output.
+Producing output depends on your operating system and the
+program(s) you use.
+
+@itemize
+
+@item
+@ref{MacOS X, @sourceimage{logo-macosx,,,}}
+@ref{MacOS X, MacOS X} (graphical)
 
-Note that there are several other text editors available with
-better support for LilyPond.  For more information, see
-@rgeneral{Alternate input}.
+@item
+@ref{Windows, @sourceimage{logo-windows,,,}}
+@ref{Windows, Microsoft Windows} (graphical)
+
+@item
+@ref{Command-line, @sourceimage{logo-linux,,,}
+@sourceimage{logo-freebsd,,,}
+@sourceimage{logo-macosx,,,}
+@sourceimage{logo-windows,,,}
+}
+@ref{Command-line, All operating systems} (command-line)
+
+@end itemize
+
+There are several other text editors available with better support
+for LilyPond.  For more information, see @rgeneral{Alternate
+input}.
 
 @warning{The first time you ever run LilyPond, it may take a
 minute or two because all of the system fonts have to be analyzed
@@ -122,6 +144,7 @@ For future use of LilyPond, you should begin by selecting @q{New}
 or @q{Open}.  You must save your file before typesetting it.  If
 any errors occur in processing, please see the log window.
 
+@c FIXME: add screenshots
 
 @node Windows
 @subsection Windows
@@ -129,7 +152,7 @@ any errors occur in processing, please see the log window.
 @warning{These instructions assume that you are using the built-in
 LilyPad editor.  If you are using any of the programs described in
 @rgeneral{Alternate input}, please consult the documentation for
-programs if you have any problems compiling a file.}
+those programs if you have any problems compiling a file.}
 
 On Windows, if you double-click in the LilyPond icon on the
 Desktop, it will open a simple text editor with an example file.
@@ -154,14 +177,17 @@ also produces a @file{.log} file that contains some information on
 what LilyPond has done to the file.  If any errors occur, please
 examine this file.
 
+@c FIXME: add screenshots
+
 
 @node Command-line
 @subsection Command-line
 
-@warning{These instructions assume that you are using the built-in
-LilyPad editor.  If you are using any of the programs described in
-@rgeneral{Alternate input}, please consult the documentation for
-programs if you have any problems compiling a file.}
+@warning{These instructions assume that you are using commond unix
+command-line programs.  If you are using any of the programs
+described in @rgeneral{Alternate input}, please consult the
+documentation for those programs if you have any problems
+compiling a file.}
 
 
 Create a text file called @file{test.ly} and enter:
@@ -195,6 +221,7 @@ Layout output to `test.ps'...
 Converting to `test.pdf'...
 @end example
 
+You may view or print the resulting @file{text.pdf}.
 
 
 @node How to write input files