Web: more cleanup of Alternate Input, thanks Christian!

diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index d9cc7b3a9a20e0e08937176dd3ae8d23de726f9a..7bb299cb440bf060474ebf8f5c1448ad8fa0c1e2 100644 (file)
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -861,6 +861,25 @@ viewer with advanced point-and-click support.
 
 @divEnd
 
+@divClass{column-center-top}
+@subheading Mixed environment: Frescobaldi
+
+@imageClickable{frescobaldi-lilypond-editor-small,png,
+  (click to enlarge),frescobaldi-lilypond-editor,png,right}
+
+@sourceimage{logo-linux,,,}
+@sourceimage{logo-freebsd,,,}
+
+@uref{http://www.frescobaldi.org}
+
+Frescobaldi is a dedicated LilyPond music and text editor with
+built-in PDF previewer, a powerful score wizard and many editing
+features.  It is built on top of the KDE4 libraries and runs
+currently on all flavours of Linux and other UNIX-like operating
+systems.
+
+@divEnd
+
 @divClass{column-center-top}
 @subheading Text environment: Emacs and Vim
 
@@ -891,22 +910,26 @@ writing LilyPond input files.
 
 @help insert text and a graphic(s)
 
-@subsubheading Mixed environment: Frescobaldi
+@subsubheading Mixed environment: LilyKDE
 
-@imageClickable{frescobaldi-lilypond-editor-small,png,
-  (click to enlarge),frescobaldi-lilypond-editor,png,right}
+@imageClickable{lilykde-screenshot-small,png,
+  (click to enlarge),lilykde-screenshot,png,right}
 
 @sourceimage{logo-linux,,,}
 @sourceimage{logo-freebsd,,,}
 
-@uref{http://www.frescobaldi.org}
+@uref{http://lilykde.googlecode.com/}
 
-Frescobaldi is a dedicated LilyPond music and text editor with
-built-in PDF previewer, a powerful score wizard and many editing
-features.  It is built on top of the KDE4 libraries and runs
-currently on all flavours of Linux and other UNIX-like operating
-systems.
+LilyKDE is a plugin for KDE's text editor
+@uref{http://kate-editor.org/,Kate}.  It has a powerful Score
+Wizard to quickly setup a LilyPond document and an embedded
+PDF viewer.
+
+LilyKDE can use @uref{http://www.volny.cz/smilauer/rumor/,Rumor},
+so music can entered by playing on a MIDI keyboard.
 
+Other features are lyric hyphenation and running LilyPond on
+multiple files at once from within the KDE file manager.
 
 @subsubheading Text environment: TexShop
 
@@ -914,14 +937,11 @@ systems.
 
 @uref{http://@/www@/.uoregon@/.edu/~koch/texshop}
 
-The
-@uref{http://@/www@/.uoregon@/.edu/~koch/texshop/index@/.html,TexShop}
-editor for MacOS@tie{}X can be extended to run LilyPond,
+The TexShop editor for MacOS@tie{}X can be extended to run LilyPond,
 @command{lilypond-book} and @command{convert-ly} from within the editor,
 using the extensions available at
 @uref{http://@/www@/.dimi@/.uniud@/.it/vitacolo/freesoftware@/.html#desktoppub}.
 
-
 @ignore
 TODO: ask somebody to sponsor/check these.  -gp
 
@@ -935,50 +955,25 @@ running:
 @example
 mkdir -p /Library/Application\ Support/TextMate/Bundles
 cd /Library/Application\ Support/TextMate/Bundles
-svn co http://macromates.com/svn/Bundles/trunk/Bundles/Lilypond.tmbundle/
+svn co http://svn.textmate.org/trunk/Bundles/LilyPond.tmbundle/
 @end example
 @end ignore
 
-@subsubheading Mixed environment: LilyKDE
-
-@imageClickable{lilykde-screenshot-small,png,
-  (click to enlarge),lilykde-screenshot,png,right}
-
-@sourceimage{logo-linux,,,}
-@sourceimage{logo-freebsd,,,}
-
-@uref{http://lilykde.googlecode.com/}
-
-@uref{http://lilykde.googlecode.com/,LilyKDE} is a plugin for
-KDE's text editor @uref{http://kate-editor.org/,Kate}.  It has a
-powerful Score Wizard to quickly setup a LilyPond document and an
-embedded PDF viewer.
-
-LilyKDE can use @uref{http://www.volny.cz/smilauer/rumor/,Rumor},
-so music can entered by playing on a MIDI keyboard.
+@divEnd
 
-Other features are lyric hyphenation and running LilyPond on
-multiple files at once from within the KDE file manager.
+@divClass{column-center-top}
+@subheading Other programs can export LilyPond code
 
+@ignore
+TODO: change url back to full adress, to make it readable in printouts -ch
+@end ignore
 
 @help clean up this list, check links, etc.
 
-Other programs can export LilyPond code:
+@subsubheading Graphical environments:
 
 @itemize
 @item
-@uref{http://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, a realtime
-monophonic MIDI to LilyPond converter.
-@item
-@uref{http://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, an
-Emacs major mode.
-@item
-@uref{http://@/www@/.nongnu@/.org/@/xml2ly/,xml2ly}, which imports
-@uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
-@item
-@uref{http://@/common-lisp@/.net/project/fomus/,FOMUS},
-a LISP library to generate music notation
-@item
 @uref{http://@/noteedit@/.berlios@/.de,NoteEdit}
 which imports @uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
 @item
@@ -995,6 +990,23 @@ has experimental export for LilyPond.
 @uref{http://canorus.org,Canorus} can also export to LilyPond, but is still
 beta-software. Testers welcome though.
 @end itemize
+
+@subsubheading Command Line Tools:
+
+@itemize
+@item
+@uref{http://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, a realtime
+monophonic MIDI to LilyPond converter.
+@item
+@uref{http://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, an
+Emacs major mode.
+@item
+@uref{http://@/www@/.nongnu@/.org/@/xml2ly/,xml2ly}, which imports
+@uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
+@item
+@uref{http://@/common-lisp@/.net/project/fomus/,FOMUS},
+a LISP library to generate music notation
+@end itemize
 @divEnd
 
 
@@ -1031,7 +1043,3 @@ acknowledged.
 @divEnd
 
 @divEnd
-
-
-
-