X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fweb%2Fintroduction.itexi;h=afce3d3bb5db08d33c051fe6f86d2fd96b612cd8;hb=515db29650106fefe87c2fad932431e732b7dc1f;hp=63c3c61aa1ae319b10a40ba4f07b571d21bc3e5a;hpb=cf7576678883f85d32137df21d5757a9a8f59629;p=lilypond.git

diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi
index 63c3c61aa1..afce3d3bb5 100644
--- a/Documentation/web/introduction.itexi
+++ b/Documentation/web/introduction.itexi
@@ -432,7 +432,7 @@ documentation explaining how to use these features -- we can
 achieve our goal with only a fraction of the individual effort.
 
 @item
-@qq{Gift culture}: the Free Software (or @qq{Open Source})
+@qq{Gift culture}: the Free Software
 movement has created many great software projects, such as
 @uref{http://kernel.org/, GNU/Linux},
 @uref{http://www.getfirefox.com/, Mozilla Firefox}, and
@@ -441,7 +441,7 @@ benefitted from these projects, some developers want to @qq{give
 back} to the community.
 
 @item
-Work experience: contributing to open-source projects is a great way to
+Work experience: contributing to free software projects is a great way to
 practice programming, documentation writing, documentation translation,
 or design.  This experience has helped some developers gain job offers
 or scholarships.
@@ -498,25 +498,72 @@ Some highlights:
 @itemize
 
 @item
-@emph{Affaire étrangère}, an opera by
-@uref{http://valentin.villenave.net/,Valentin Villenave}
-to a French libretto by
-@uref{http://en.wikipedia.org/wiki/Lewis_Trondheim, Lewis
-Trondheim}, premiered February 1, 2009 at
-@uref{http://www.orchestre-montpellier.com/, L'Opéra National de
-Montpellier}, France.
+A critical edition of Tommaso Traetta's @emph{Enea nel Lazio (1760)},
+opera series with libretto by Vittorio Amedeo Cigna-Santi, in four
+parts:
+@uref{http://www.academia.edu/1987651/Enea_nel_Lazio_opera_riformata_prima_lazione_poi_le_parole_-_Partitura_1_4_, Part One}
+@uref{http://www.academia.edu/1994533/Enea_nel_Lazio_opera_riformata_prima_lazione_poi_le_parole_-_Partitura_2_4_, Part Two}
+@uref{http://www.academia.edu/1994558/Enea_nel_Lazio_opera_riformata_prima_lazione_poi_le_parole_-_Partitura_3_4_, Part Three}
+@uref{http://www.academia.edu/1996242/Enea_nel_Lazio_opera_riformata_prima_lazione_poi_le_parole_-_Partitura_4_4_, Part Four}
+Created by
+@uref{http://unito.academia.edu/LucaRossettoCasel, Luca Rossetto Casel}
+for his Ph.D. Thesis.
+
+@item
+Mussorgsky's @emph{Pictures at an exhibition}, re-orchestrated and
+conducted by @uref{http://www.aurelienbello.com/,Aurélien Bello} with
+the @uref{http://www.junge-philharmonie-brandenburg.de/,
+Junge Philharmonie Brandenburg}
+on Oct 10 2011 and again on Apr 15-16 2012.
+
+@item
+@uref{http://www.kierenmacmillan.info/, Kieren MacMillan}, composer and
+musical director.  His many, recent works include; @emph{Go Thy Way},
+performed by the @uref{http://www.saltlakechoralartists.org/,
+Salt Lake Choral Artists} in March 2012; The
+@emph{Just Out of Reach Suite} performed
+by the
+@uref{http://www.herald-dispatch.com/news/marshall/x1883873762/Music-duo-Chrysalis-to-perform-at-Marshall-University-on-Jan-19,
+Chrysalis Duo} ; @emph{thrafsmata} performed in July 2011 by the
+@uref{http://www.pnme.org/CurrentSeason/PreviousSeasons.html, Pittsburgh
+New Music Ensemble}.
+
+@item
+@emph{Anonymous Student Compliment or Complaint}, by
+@uref{http://www.mikesolomon.org, Mike Solomon}, winner chosen from among
+172 entries from 22 countries of the
+@uref{http://leftcoastensemble.org, 2011 Left Coast Composition Contest}.
+Other works include, Norman (age 1) for clarinet solo, performed at the
+@uref{http://emu.music.ufl.edu/fems_concerts.html, University of Florida}'s
+Electroacoustic Music Festival (FEMF), October 2010.
+
+@item
+A modern edition of the @emph{Serenata Erminia} by Alessandro Scarlatti,
+edited by Thomas Griffin, Musicologist (Rome, Italy).  Performed on 22
+October 2010 in the Galleria of the Palazzo Zevallos Stigliano, Naples,
+Italy.  @uref{http://www.ascarlatti2010.net, Alessandro Scarlatti 2010},
+in celebration of the composer's 350th birthday.
 
 @item
-@uref{http://www.mercurybaroque.org/02/02109.aspx, Mercury Baroque}'s
-performance of Lully's @emph{Armide}, May 15-16, 2009, in Houston,
-Texas (engraving by @uref{http://nicolas.sceaux.free.fr/,
-Nicolas Sceaux}).
+@uref{http://www.mercurybaroque.org, Mercury Baroque}'s performance of
+Lully's @emph{Armide}, May 15-16, 2009, in Houston, Texas (engraving by
+@uref{http://nicolas.sceaux.free.fr/, Nicolas Sceaux}).
 
 @item
 Instrumental excerpts from Rameau's @emph{Hippolyte et Aricie} at
 St. James's Church in Manhattan, May 8, 2009, by Frederick Renz
 and his ensemble @uref{http://www.earlymusicny.org/, Early Music
-New York} (engraving by Nicolas Sceaux).
+New York} (engraving by
+@uref{http://nicolas.sceaux.free.fr/, Nicolas Sceaux}).
+
+@item
+@emph{Affaire étrangère}, an opera by
+@uref{http://valentin.villenave.net/,Valentin Villenave}
+to a French libretto by
+@uref{http://en.wikipedia.org/wiki/Lewis_Trondheim, Lewis
+Trondheim}, premiered February 1, 2009 at
+@uref{http://www.orchestre-montpellier.com/, L'Opéra National de
+Montpellier}, France.
 
 @end itemize
 @divEnd
@@ -679,7 +726,7 @@ A French article on the LilyPond 2.6 release appeared on
 October 2004
 
 The editors of Computer!Totaal, a Dutch computer magazine,
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg,
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
 describe LilyPond} in the October 2004 issue as: @qq{Wonderful
 free (open source) software [..] The sheet music produced by
 LilyPond is exceptionally pretty [..] a very powerful system that
@@ -920,8 +967,8 @@ entered with backslashes.
 @imageFloat{text-input-1-annotate,png,center}
 @imageFloat{text-input-1-output,png,center}
 
-Alterations are made with different names: add @code{-is} for
-sharp, and @code{-es} for flat (these are Dutch note names, other
+Alterations are made with different names: add @w{@code{-is}} for
+sharp, and @w{@code{-es}} for flat (these are Dutch note names, other
 languages are available).  LilyPond figures out where to put
 accidentals.
 
@@ -1007,6 +1054,31 @@ 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 Tunefl
+
+@sourceimage{logo-linux,,,}
+@sourceimage{logo-freebsd,,,}
+@sourceimage{logo-macosx,,,}
+@sourceimage{logo-windows,,,}
+
+@uref{http://www.tunefl.com}
+
+With tunefl you can typeset your scores directly online
+without needing to install lilypond locally. It allows
+trying out all the program's features using a convenient
+web interface.
+
+@divEnd
 
 @divClass{column-center-top}
 @subheading LilyPondTool
@@ -1038,14 +1110,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
 
@@ -1080,16 +1151,22 @@ the text view when printed from there.
 @sourceimage{logo-macosx,,,}
 @sourceimage{logo-windows,,,}
 
+@uref{http://elysium.thsoft.hu}
+
+Elysium is a LilyPond IDE for Eclipse with an integrated, side-by-side
+view for source and score.  It includes rapid visual & auditive feedback
+without having to switch contexts, and comes with many wizard-driven
+templates.
+
 @uref{http://www.gnu.org/software/emacs/}
 
 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.  As well, one of
-our developers has written
-@uref{http://nicolas.sceaux.free.fr/lilypond/lyqi.html,lyqi}, an
-Emacs major mode.
+definitions for working with LilyPond source files.  A developer
+has written @uref{https://github.com/nsceaux/lyqi,lyqi}, an Emacs major
+mode.
 
 @uref{http://www.vim.org}
 
@@ -1114,17 +1191,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}
@@ -1134,40 +1200,53 @@ git clone http://github.com/textmate/lilypond.tmbundle.git
 @subsubheading Score, tab and MIDI editors:
 
 @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.
+
+@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://www.rosegardenmusic.com,Rosegarden}, an audio and
-MIDI sequencer, which also has a score editor for single-staff
-editing.
+@uref{http://www.musescore.org,MuseScore}, a score editor, has incomplete
+LilyPond export but is being actively developed.
 
 @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://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.tuxguitar.com.ar/,TuxGuitar}, a multitrack
-tablature editor and player, includes a score viewer and can
-export to 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{http://www.musescore.org,MuseScore}, a score editor, has
-incomplete LilyPond export but is being actively developed.
+@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.canorus.org,Canorus}, a score editor, can also
-export to LilyPond, but is still beta-software.  Testers are
-welcome, though.
+@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.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.tuxguitar.com.ar/,TuxGuitar}, a multitrack tablature editor
+and player, includes a score viewer and can export to LilyPond.
 
 @end itemize