Web: reorganise Introduction - Easier editing

re-arranged LPT, Frescobaldi & Denemo
added pointer to Usage Text editor support for Emacs & vim
re-organised "Other programs can export"
added "Algorithmic code generators

diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index e49ae7be03f334fa6279aa13a6b15037576b34d1..d1f539ed55e0c0960ad3fe99c36fb0cb8467971d 100644 (file)
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -946,34 +946,9 @@ convinced?  Read about @ref{Easier editing}.
 @node Easier editing
 @unnumberedsec Easier editing
 
-@divClass{column-center-top}
-@subheading Graphical environment: Denemo
-
-@imageClickable{screenshot-denemo-small,png,
-  (click to enlarge),screenshot-denemo,png,right}
-
-@sourceimage{logo-linux,,,}
-@sourceimage{logo-windows,,,}
-
-@uref{http://denemo.org}
-
-Denemo is a graphical editor which generates LilyPond source code,
-and also allows audio playback.  It allows users to view the
-LilyPond source code in parallel to the graphical view. Extra
-LilyPond tweaks can be attached to notes, chords etc. and are stored
-with the Denemo file, so that users can continue to edit graphically.
-
-Moving the cursor in the LilyPond text moves the cursor in the graphical
-view, and any syntax errors in your LilyPond tweaks are highlighted in
-the text view when printed from there.
-
-@warning{Denemo officially supports an outdated Lilypond version 2.8.7,
-which lacks many of the features added since then. The Denemo developers
-are actively working to bring it up to our present stable version, 2.12.}
-@divEnd
 
 @divClass{column-center-top}
-@subheading Mixed environment: LilyPondTool
+@subheading LilyPondTool
 
 @imageClickable{lilypondtool-2.12-screenshot-400wide,png,
   (click to enlarge),lilypondtool-2.12-screenshot,png,right}
@@ -995,7 +970,7 @@ viewer with advanced point-and-click support.
 @divEnd
 
 @divClass{column-center-top}
-@subheading Mixed environment: Frescobaldi
+@subheading Frescobaldi
 
 @imageClickable{frescobaldi-lilypond-editor-small,png,
   (click to enlarge),frescobaldi-lilypond-editor,png,right}
@@ -1013,6 +988,32 @@ systems.
 
 @divEnd
 
+@divClass{column-center-top}
+@subheading Denemo
+
+@imageClickable{screenshot-denemo-small,png,
+  (click to enlarge),screenshot-denemo,png,right}
+
+@sourceimage{logo-linux,,,}
+@sourceimage{logo-windows,,,}
+
+@uref{http://denemo.org}
+
+Denemo is a graphical editor which generates LilyPond source code,
+and also allows audio playback.  It allows users to view the
+LilyPond source code in parallel to the graphical view. Extra
+LilyPond tweaks can be attached to notes, chords etc. and are stored
+with the Denemo file, so that users can continue to edit graphically.
+
+Moving the cursor in the LilyPond text moves the cursor in the graphical
+view, and any syntax errors in your LilyPond tweaks are highlighted in
+the text view when printed from there.
+
+@warning{Denemo officially supports an outdated Lilypond version 2.8.7,
+which lacks many of the features added since then. The Denemo developers
+are actively working to bring it up to our present stable version, 2.12.}
+@divEnd
+
 @divClass{column-center-top}
 @subheading Text environment: Emacs and Vim
 
@@ -1027,7 +1028,9 @@ Emacs is a text editor with language-sensitive capabilities for
 many different computer languages.  Emacs is a highly extensible
 editor and can be used as an Integrated Development Environment.
 There is a @q{lilypond mode} which supplies the language
-definitions for working with LilyPond source files.
+definitions for working with LilyPond source files. As well, one of
+our developers has written @uref{http://nicolas.sceaux.free.fr/
+lilypond/lyqi.html,lyqi}, an Emacs major mode.
 
 @uref{http://www.vim.org}
 
@@ -1038,8 +1041,14 @@ As a general rule, if you are not already familiar with Emacs or
 Vim, then you would probably prefer to use a different editor for
 writing LilyPond input files.
 
+More information on setting up Emacs and Vim can be found in
+@rprogram{Text editor support}.
+
 @divEnd
 
+@ignore these may not need to be here at all, as they are purely
+MacOS scripts.
+
 @divClass{column-center-top}
 @subheading Other
 
@@ -1072,12 +1081,13 @@ svn co http://svn.textmate.org/trunk/Bundles/LilyPond.tmbundle/
 @end example
 
 @divEnd
+@end ignore
 
 @divClass{column-center-top}
 @subheading Other programs can export LilyPond code
 
 
-@subsubheading Graphical environments:
+@subsubheading Score, tab and MIDI editors:
 
 @itemize
 @item
@@ -1104,23 +1114,27 @@ export but is being actively developed.
 is still beta-software. Testers are welcome, though.
 
 @item
-@uref{http://strasheela.sourceforge.net, Strasheela} is @qq{a
-highly expressive constraint-based music composition system}.
+@uref{http://www.volny.cz/smilauer/rumor/rumor.html,Rumor}, a realtime
+monophonic MIDI to LilyPond converter.
 
 @end itemize
 
-@subsubheading Command Line Tools:
+@subsubheading Algorithmic code generators
 
 @itemize
+
 @item
-@uref{http://www.volny.cz/smilauer/rumor/rumor.html,Rumor}, a realtime
-monophonic MIDI to LilyPond converter.
+@uref{http://strasheela.sourceforge.net, Strasheela} is @qq{a
+highly expressive constraint-based music composition system}.
 
 @item
-@uref{http://nicolas.sceaux.free.fr/lilypond/lyqi.html,lyqi}, an
-Emacs major mode.
+@uref{http://common-lisp.net/project/fomus/,FOMUS}, a LISP library
+to generate music notation from computer music software environments.
 
 @end itemize
+@divEnd
+
+@divClass{column-center-top}
 
 @subheading Other programs not being actively developed
 
@@ -1138,10 +1152,6 @@ into
 @uref{http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml,NtEd}
 and @uref{http://canorus.org,Canorus}.
 
-@item
-@uref{http://common-lisp.net/project/fomus/,FOMUS}, a LISP library
-to generate music notation a LISP library to generate music
-notation.
 
 @item
 @uref{http://lilycomp.sourceforge.net, LilyComp} is a graphical