X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb%2Fintroduction.itexi;h=e33e5219003c434224d886674c6d6e2c88bb6685;hb=5d63c084289874d6f81f175e1415403c0c534e5e;hp=8ffc56d05285b84cdeccbfd6cabdd02afd3aa3c9;hpb=38c1148ef2d73151379e9a694c3c061d8a31d548;p=lilypond.git

diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index 8ffc56d052..e33e521900 100644
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -1043,6 +1043,15 @@ convinced?  Read about @ref{Easier editing}.
 @node Easier editing
 @unnumberedsec Easier editing
 
+@ignore
+GNU policy forbids us from linking to non-Free software, so don't
+add such links.
+
+In particular, don't link to:
+- the LilyPond bundle for TextMate (a commercial editor for MacOS).
+
+@end ignore
+
 
 @divClass{column-center-top}
 @subheading LilyPondTool
@@ -1074,14 +1083,13 @@ viewer with advanced point-and-click support.
 
 @sourceimage{logo-linux,,,}
 @sourceimage{logo-freebsd,,,}
+@sourceimage{logo-windows,,,}
 
 @uref{http://www.frescobaldi.org}
 
-Frescobaldi is a dedicated LilyPond music and text editor with a
-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.
+Frescobaldi is lightweight, yet powerful LilyPond music and text editor
+with a built-in PDF viewer.  It is easy to use and will run on all major
+operating systems (GNU/Linux, Mac OS X and Windows).
 
 @divEnd
 
@@ -1150,17 +1158,6 @@ using the extensions available at:
 @uref{http://users.dimi.uniud.it/~nicola.vitacolonna/home/content/lilypond-scripts}
 @end example
 
-@sourceimage{logo-macosx,,,}
-There is a LilyPond bundle for TextMate, a commercial editor for MacOS.
-It may be installed by running:
-
-@example
-mkdir -p /Library/Application\ Support/TextMate/Bundles
-cd /Library/Application\ Support/TextMate/Bundles
-git clone http://github.com/textmate/lilypond.tmbundle.git
-
-@end example
-
 @divEnd
 
 @divClass{column-center-top}
@@ -1172,43 +1169,51 @@ git clone http://github.com/textmate/lilypond.tmbundle.git
 @itemize
 
 @item
-@uref{http://www.canorus.org,Canorus}, a score editor, can also
-export to LilyPond, but is still beta-software.  Testers are
-welcome, though.
+@uref{http://www.canorus.org,Canorus}, a score editor, can also export to
+LilyPond, but is still beta-software. Testers are welcome, though.
+
+@item
+@uref{http://enc2ly.sourceforge.net/en/,Enc2ly} is a GNU/Linux program
+which converts an @uref{http://www.gvox.com/,Encore} music score into
+a LilyPond one.
+
+@item
+@uref{https://github.com/hanwen/go-enc2ly,go-enc2ly} is a Go tool that converts
+@uref{http://www.gvox.com/,Encore} files to LilyPond. It was created using
+Felipe Castro's research and reverse engineering by tweaking existing .enc files
+and loading them using the 4.55 demo version.
 
 @item
-@uref{http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml,
-NtEd}, a score editor based on the
-@uref{http://www.cairographics.org,Cairo} library, has experimental
-support for exporting to LilyPond.
+@uref{http://www.musescore.org,MuseScore}, a score editor, has incomplete
+LilyPond export but is being actively developed.
 
 @item
-@uref{http://www.musescore.org,MuseScore}, a score editor, has
-incomplete LilyPond export but is being actively developed.
+@uref{http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml,NtEd}, a
+score editor based on the @uref{http://www.cairographics.org,Cairo} library,
+has experimental support for exporting to LilyPond.
 
 @item
-@uref{http://www.holmessoft.co.uk/homepage/software/NWC2LY/index.htm,
-NW2LY} is a C# program which converts a
-@uref{http://www.noteworthysoftware.com/,NoteWorthy} song into
-LilyPond.
+@uref{http://www.holmessoft.co.uk/homepage/software/NWC2LY/index.htm,NW2LY} is
+a C# program which converts a
+@c @uref{http://www.noteworthysoftware.com/,NoteWorthy}
+NoteWorthy composer song into LilyPond.
 
 @item
-@uref{https://github.com/ciconia/ripple/blob/master/README.markdown,
-Ripple} is a program that helps create scores and parts, including a
-mode for mixing different musical works together in a single score or
-part.
+@uref{https://github.com/ciconia/ripple/blob/master/README.markdown,Ripple} is
+a program that helps create scores and parts, including a mode for mixing
+different musical works together in a single score or part.
 
 @item
-@uref{http://www.rosegardenmusic.com,Rosegarden}, an audio and MIDI
-sequencer, which also has a score editor for single-staff editing.
+@uref{http://www.rosegardenmusic.com,Rosegarden}, an audio and MIDI sequencer,
+which also has a score editor for single-staff editing.
 
 @item
-@uref{http://www.volny.cz/smilauer/rumor/rumor.html,Rumor}, a
-realtime monophonic MIDI to LilyPond converter.
+@uref{https://launchpad.net/rumor/,Rumor}, a realtime monophonic MIDI to
+LilyPond converter.
 
 @item
-@uref{http://www.tuxguitar.com.ar/,TuxGuitar}, a multitrack tablature
-editor and player, includes a score viewer and can export to LilyPond.
+@uref{http://www.tuxguitar.com.ar/,TuxGuitar}, a multitrack tablature editor
+and player, includes a score viewer and can export to LilyPond.
 
 @end itemize