X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fweb%2Fdownload.itexi;h=4781d161b7134486f7d446c0246a6614000d8407;hb=681b14e151ada14fa98d5aed413aae4e5e4b9848;hp=08238c9ce538c358d030262e55f195deb50cfca4;hpb=de0fb7239295233a76b26fbda5b989142653cac7;p=lilypond.git diff --git a/Documentation/web/download.itexi b/Documentation/web/download.itexi index 08238c9ce5..4781d161b7 100644 --- a/Documentation/web/download.itexi +++ b/Documentation/web/download.itexi @@ -36,16 +36,18 @@ our @ref{Text input}.} @divEnd +@divClass{link-headings} + @divClass{column-left-top} @subheading For users @itemize @item -@c TODO: duplicate to avoid underlined refs in HTML? icky. +@c ref is duplicated to avoid underlining ref as image. @ref{Unix, @sourceimage{logo-linux,,,} @sourceimage{logo-freebsd,,,}} -@ref{Unix, Unix (Linux and FreeBSD)} +@ref{Unix, Unix (GNU/Linux and FreeBSD)} @item @ref{MacOS X, @sourceimage{logo-macosx,,,}} @@ -78,6 +80,7 @@ latest unstable version @end itemize @divEnd +@divEnd @divClass{column-center-bottom} @@ -139,13 +142,13 @@ acknowledged. @divClass{column-center-top} @subheading Generic Packages or Distribution-Specific Packages? -Many distributions include LilyPond in their normal package -system. These versions are easier to install and uninstall than -the generic packages, but they may be older. If you wish to use -our generic packages, please uninstall the official version from -your system using the normal package manager for your distribution. -See your distribution's documentation about how to use their -package manager. +Many distributions already include LilyPond within their normal +package repositories and these are often much easier to install than the +generic packages found here. However the version of LilyPond in those +repositories may be @emph{significantly} older than the current stable +version. If you wish to use our generic packages, please check that +your LilyPond editor is using the correct version of lilypond. See +@ref{Easier editing}. @divEnd @@ -204,19 +207,19 @@ In the shell, type: uninstall-lilypond @end example -@divEnd - +@subsubheading Help +In the shell, type: -@divClass{column-right-top} -@subheading Compiling a file - -@lilypadCommandLine +@example +sh lilypond-@versionStable{}-OS-TYPE.sh --help +@end example @divEnd -@divClass{column-left-top} + +@divClass{column-right-top} @subheading Distribution-specific Packages Please use your distribution's package manager to install or @@ -227,22 +230,22 @@ upgrade to these versions. @item @sourceimage{logo-fedora,,,} @uref{http://koji.fedoraproject.org/koji/packageinfo?packageID=2447, -Fedora: LilyPond 2.12.3} +Fedora: LilyPond 2.14.2} @item @sourceimage{logo-ubuntu,,,} @uref{http://packages.ubuntu.com/search?keywords=lilypond, -Ubuntu: LilyPond 2.12.2} +Ubuntu: LilyPond 2.14.2} @item @sourceimage{logo-slackware,,,} @uref{http://www.johannes-schoepfer.de/lilypond/, -Slackware: LilyPond 2.12.3} +Slackware: LilyPond 2.14.2} @item @sourceimage{logo-debian,,,} @uref{http://packages.debian.org/search?keywords=lilypond, -Debian: LilyPond 2.12.2} +Debian: LilyPond 2.12.3} @item @sourceimage{logo-suse,,,} @@ -254,6 +257,14 @@ openSUSE: LilyPond 2.12.3} @divEnd +@divClass{column-center-top} +@subheading Compiling a file + +@lilypadCommandLine + +@divEnd + + @divClass{column-center-bottom} @subheading Legalese @@ -286,12 +297,16 @@ acknowledged. @item @sourceimage{logo-macosx,,,} @downloadStableDarwinNormal -For Intel chips (if in doubt, use this). +For MacOS X 10.4 or higher, running on Intel CPUs (if in doubt, +use this). + @item @sourceimage{logo-macosx,,,} @downloadStableDarwinPPC -For G3 and G4 CPUs (old Apple computers). +For MacOS X 10.4 or higher, running on G3 and G4 CPUs (old Apple +computers). + @end itemize @@ -306,19 +321,12 @@ Delete the LilyPond.app folder. @divEnd -@divClass{column-right-top} -@subheading Compiling a file - -@lilypadOSX -@divEnd - - -@divClass{column-left-top} +@divClass{column-right-top} @subheading Running on the command-line -@warning{If you are happy with the GUI, then please ignore these -instructions.} +@warning{If you are happy with the GUI instructions below, then +please ignore these instructions.} @subsubheading MacOS X on the command line @@ -339,11 +347,12 @@ cd ~/bin @item Create a file called @command{lilypond} which contains -@help obvious css issue to be dealt with. :( -@c we need a small font here to fit. -gp -@smallexample +@divClass{h-scroll-auto} +@example +#!/bin/bash exec @var{DIR}/LilyPond.app/Contents/Resources/bin/lilypond "$@@" -@end smallexample +@end example +@divEnd @warning{@var{DIR} will generally be @code{/Applications/}} @@ -386,9 +395,11 @@ inside the @code{.app} file for MacOS@tie{}X. Scripts can also be run from the command line by invoking them directly: +@divClass{h-scroll-auto} @example @var{path/to}/LilyPond.app/Contents/Resources/bin/lilypond @end example +@divEnd The same is true for all other scripts in that directory, such as @command{lilypond-book} and @command{convert-ly}. @@ -396,6 +407,14 @@ The same is true for all other scripts in that directory, such as @divEnd +@divClass{column-center-top} +@subheading Compiling a file + +@lilypadOSX + +@divEnd + + @divClass{column-center-bottom} @subheading Legalese @@ -427,7 +446,7 @@ acknowledged. @item @sourceimage{logo-windows,,,} @downloadStableWindows -For Windows 2000, XP, Vista and Windows 7. +For Windows 2000, XP, Vista, Windows 7 and 8. @end itemize @@ -466,18 +485,10 @@ button when the uninstaller has completed. @divClass{column-right-top} -@subheading Compiling a file - -@lilypadWindows - -@divEnd - - -@divClass{column-left-top} @subheading Running on the command-line -@warning{If you are happy with the GUI, then please ignore these -instructions.} +@warning{If you are happy with the GUI instructions below, then +please ignore these instructions.} @subsubheading Windows on the command line @@ -507,7 +518,7 @@ which contains LilyPond executable files like this: [@var{pre-set paths}];@var{DIR}\LilyPond\usr\bin @end example -@warning{@var{DIR} will generally be @code{C:\Program Files}.} +@warning{@var{DIR} will generally be @code{C:@bs{}Program Files}.} @noindent and click @qq{OK} button to close the window. @@ -527,6 +538,14 @@ lilypond test.ly @divEnd +@divClass{column-center-top} +@subheading Compiling a file + +@lilypadWindows + +@divEnd + + @divClass{column-center-bottom} @subheading Legalese @@ -606,6 +625,3 @@ is given in @ref{Freedom}. @include gpl.itexi @divEnd - - -