From a0d2c201eaad10371f94ce6bd2aa999f7bd7f35b Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 16 Aug 2009 03:34:21 -0700 Subject: [PATCH] Doc build: use separate argument for extension and new Example macro. Mostly just s/.png/,png and s/.jpg/,jpg --- Documentation/general.texi | 2 +- Documentation/general/download.itexi | 36 +++++++------ Documentation/general/introduction.itexi | 69 ++++++++++++------------ 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/Documentation/general.texi b/Documentation/general.texi index 9cf1e2508f..e81f4d9f31 100644 --- a/Documentation/general.texi +++ b/Documentation/general.texi @@ -67,7 +67,7 @@ Free Documentation License''. @divEnd @c @imageId{cmws,web-clef-g-eight-alpha.png,Catchy Musical Web Snippet} -@imageId{lilylogo,double-lily-modified3.png,LilyPond logo} +@imageId{lilylogo,double-lily-modified3,png,LilyPond logo} @c @im ageId{cmws,web-snippet-alpha.png,Catchy Musical Web Snippet} @divId{quickSummary} diff --git a/Documentation/general/download.itexi b/Documentation/general/download.itexi index d5234cacd7..47d546bc15 100644 --- a/Documentation/general/download.itexi +++ b/Documentation/general/download.itexi @@ -26,15 +26,16 @@ our @ref{Text input}.} @item @c TODO: duplicate to avoid underlined refs in HTML? icky. -@ref{Unix, @sourceimage{logo-linux} @sourceimage{logo-freebsd}} +@ref{Unix, @sourceimage{logo-linux,,,} +@sourceimage{logo-freebsd,,,}} @ref{Unix, Unix (Linux and FreeBSD)} @item -@ref{MacOS X, @sourceimage{logo-macosx}} +@ref{MacOS X, @sourceimage{logo-macosx,,,}} @ref{MacOS X, MacOS X} @item -@ref{Windows, @sourceimage{logo-windows}} +@ref{Windows, @sourceimage{logo-windows,,,}} @ref{Windows, Microsoft Windows} @end itemize @@ -78,7 +79,8 @@ Many thanks to @uref{http://www.vt.edu/, Virgina Tech} and @uref{http://www.linuxaudio.org/, linuxaudio.org} for sponsoring our bandwidth. -@sourceimage{VTlogo_ITF} @sourceimage{lao_banner_06_on_white_demo} +@sourceimage{VTlogo_ITF,,,} +@sourceimage{lao_banner_06_on_white_demo,,,} @subheading Legalese @@ -135,27 +137,27 @@ package manager. @itemize @item -@sourceimage{logo-linux} +@sourceimage{logo-linux,,,} @uref{http://download.linuxaudio.org/lilypond/binaries/linux-x86/lilypond-2.12.2-1.linux-x86.sh, Linux x86: LilyPond 2.12.2} (if in doubt, use this) @item -@sourceimage{logo-linux} +@sourceimage{logo-linux,,,} @uref{http://download.linuxaudio.org/lilypond/binaries/linux-64/lilypond-2.12.2-1.linux-64.sh, Linux 64-bit: LilyPond 2.12.2} @item -@sourceimage{logo-linux} +@sourceimage{logo-linux,,,} @uref{http://download.linuxaudio.org/lilypond/binaries/linux-ppc/lilypond-2.12.2-1.linux-ppc.sh, Linux PPC: LilyPond 2.12.2} @item -@sourceimage{logo-freebsd} +@sourceimage{logo-freebsd,,,} @uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-x86/lilypond-2.12.2-1.freebsd-x86.sh, FreeBSD i386: LilyPond 2.12.2} @item -@sourceimage{logo-freebsd} +@sourceimage{logo-freebsd,,,} @uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-64/lilypond-2.12.2-1.freebsd-64.sh, FreeBSD amd64: LilyPond 2.12.2} @@ -191,27 +193,27 @@ upgrade to these versions. @itemize @item -@sourceimage{logo-fedora} +@sourceimage{logo-fedora,,,} @uref{https://admin.fedoraproject.org/pkgdb/packages/name/lilypond, Fedora: LilyPond 2.12.0} @item -@sourceimage{logo-ubuntu} +@sourceimage{logo-ubuntu,,,} @uref{https://launchpad.net/ubuntu/+source/lilypond, Ubuntu: LilyPond 2.12.1} @item -@sourceimage{logo-slackware} +@sourceimage{logo-slackware,,,} @uref{http://www.johannes-schoepfer.de/lilypond/, Slackware: LilyPond 2.12.1} @item -@sourceimage{logo-debian} +@sourceimage{logo-debian,,,} @uref{http://packages.debian.org/search?keywords=lilypond, Debian: LilyPond 2.10.33} @item -@sourceimage{logo-suse} +@sourceimage{logo-suse,,,} @uref{http://opensuse.org/?fixme=urg-no-lilypond-package-page, openSUSE: LilyPond 2.10.33} @@ -246,14 +248,14 @@ acknowledged. @itemize @item -@sourceimage{logo-macosx} +@sourceimage{logo-macosx,,,} @uref{ http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-2.12.2-1.darwin-x86.tar.bz2, lilypond-2.12.2-1.darwin-x86.tar.bz2} For Intel chips (if in doubt, use this). @item -@sourceimage{logo-macosx} +@sourceimage{logo-macosx,,,} @uref{ http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-2.12.2-1.darwin-ppc.tar.bz2, lilypond-2.12.2-1.darwin-ppc.tar.bz2} @@ -386,7 +388,7 @@ acknowledged. @itemize @item -@sourceimage{logo-windows} +@sourceimage{logo-windows,,,} @uref{ http://download.linuxaudio.org/lilypond/binaries/mingw/lilypond-2.12.2-1.mingw.exe, lilypond-2.12.2-1.mingw-exe} diff --git a/Documentation/general/introduction.itexi b/Documentation/general/introduction.itexi index 54a756d4ac..8ad9debac8 100644 --- a/Documentation/general/introduction.itexi +++ b/Documentation/general/introduction.itexi @@ -12,7 +12,7 @@ @divClass{column-center-top} @subheading Our Goal -@imageFloat{flat-design.png,right} +@imageFloat{flat-design,png,right} The inspiration for LilyPond came when two musicians became annoyed with the bland and boring look of computer-printed @@ -102,7 +102,7 @@ http://lilypond.org/web/switch/advantages @subsubheading Excellent classical engraving -@imageFloat{flat-design.png,right} +@imageFloat{flat-design,png,right} The point of using LilyPond is to produce elegant sheet music that is easy to read. LilyPond's developer community has spent @@ -134,7 +134,7 @@ for later reference. @subsubheading Mix music and text -@imageFloat{lilypond-book.png,right} +@imageFloat{lilypond-book,png,right} Put fragments of music into texts without cutting and pasting pictures. Integrate music into LaTeX or HTML seamlessly, or add @@ -196,7 +196,7 @@ algorithms, without tweaks of any kind. It handles cross-staff beaming gracefully and puts the system brace perfectly around all three staves. -@imageClickable{examples/liszt-wagner-small.png, (click to enlarge), examples/liszt-wagner.png, center} +@exampleImage{liszt-wagner} @end ignore @newsItem @@ -204,7 +204,7 @@ perfectly around all three staves. This organ work by J.S. Bach is a fairly typical engraving project in Lilypond. -@imageClickable{examples/bach-bwv610-small.png, (click to enlarge), examples/bach-bwv610.png, center} +@exampleImage{bach-bwv610} @newsEnd @newsItem @@ -214,7 +214,7 @@ This example from @emph{Goyescas} by Enrique Granados shows some of the more advanced features of typesetting, including kneed beams, cross-staff stems, and voice-follow lines. -@imageClickable{examples/granados-small.png, (click to enlarge), examples/granados.png, center} +@exampleImage{granados} @newsEnd @newsItem @@ -222,7 +222,7 @@ beams, cross-staff stems, and voice-follow lines. Lilypond also supports various types of ancient notation, such as this passage of Gregorian chant. -@imageClickable{examples/ancient-headword-small.png, (click to enlarge), examples/ancient-headword.png, center} +@exampleImage{ancient-headword} @newsEnd @newsItem @@ -231,7 +231,7 @@ Contemporary composers find Lilypond well-suited to displaying unusual notation. Here is an excerpt from Trevor Bača's @emph{Čáry}, for unaccompanied bass flute. -@imageClickable{examples/cary-small.png, (click to enlarge), examples/cary.png, center} +@exampleImage{cary} @newsEnd @@ -242,14 +242,11 @@ code. This is an excerpt of @uref{http://nicolas.sceaux.free.fr/, Nicolas Sceaux's} engraving of Handel's @emph{Giulio Cesare}, in full score, piano-vocal reduction, and a violin part. -@imageClickable{examples/sesto-full-small.png, (click to enlarge), -examples/sesto-full.png, center} +@exampleImage{sesto-full} -@imageClickable{examples/sesto-piano-small.png, (click to enlarge), -examples/sesto-piano.png, center} +@exampleImage{sesto-piano} -@imageClickable{examples/sesto-violin-small.png, (click to enlarge), -examples/sesto-violin.png, center} +@exampleImage{sesto-violin} @newsEnd @@ -262,7 +259,7 @@ suit any instrument that reads from tablature. Here is a passage from a Bach Lute Suite, with tablature generated automatically from the notes entered for the traditional staff. -@imageClickable{examples/bach-tab-example-small.png, (click to enlarge), examples/bach-tab-example.png, center} +@exampleImage{bach-tab-example} @newsEnd @newsItem @@ -270,7 +267,7 @@ from the notes entered for the traditional staff. Standard output can be modified heavily. Here someone has created an impressive Schenkerian analysis. -@imageClickable{examples/bach-schenker-small.png, (click to enlarge), examples/bach-schenker.png, center} +@exampleImage{bach-schenker} @newsEnd @newsItem @@ -283,7 +280,7 @@ Lilypond handles this most elegantly. Note also the incipits with Vaticana style clefs, the slashed stems indicating plicated notes, and the ligature braces above certain groups of notes. -@imageClickable{examples/aucun-snippet-small.png, (click to enlarge), examples/aucun-snippet.png, center} +@exampleImage{aucun-snippet} @newsEnd @newsItem @@ -291,7 +288,7 @@ and the ligature braces above certain groups of notes. Lilypond is perfectly suited for educational purposes as well. Here is an example of a simple counterpoint exercise. -@imageClickable{examples/theory-small.png, (click to enlarge), examples/theory.png, center} +@exampleImage{theory} @newsEnd @help NEED BETTER POP EXAMPLE!! Also a better theory example would be nice. @@ -303,7 +300,7 @@ chord names, and fretboards. In this example you see some of the predefined fretboard diagrams, but these can be heavily customized to suit nearly any situation. -@imageClickable{examples/chart-small.png, (click to enlarge), examples/chart.png, center} +@exampleImage{chart} @newsEnd @help NEED DIFFERENT ORCHESTRAL OR OPERA EXAMPLE?! @@ -314,7 +311,7 @@ Lilypond is excellent for large projects like operas or works for full symphony orchestra, as well. Score, parts, piano reductions, and conductors' scores can be produced from the same source files. -@imageClickable{examples/orchestral-small.png, (click to enlarge), examples/orchestral.png, center} +@exampleImage{orchestral} @newsEnd @@ -503,7 +500,7 @@ If you've already decided to try LilyPond, first read about our @unnumberedsec Testimonials @divClass{testimonial-item} -@imageFloat{carter-brey.jpg, right} +@imageFloat{carter-brey,jpg, right} @subsubheading @uref{http://nyphil.org/meet/orchestra/index.cfm?page=profile&personNum=7, Carter Brey}, Principal Cellist, New York Philharmonic @qq{... I've written a couple of encore pieces for solo cello @@ -514,7 +511,7 @@ look half as sharp as mine!} @divClass{testimonial-item} -@imageFloat{orm-finnendahl.jpg, left} +@imageFloat{orm-finnendahl,jpg, left} @subsubheading @uref{http://icem-www.folkwang-hochschule.de/~finnendahl/, Orm Finnendahl}, professor of Composition, Musikhochschule Freiburg @qq{Although I don't know [LilyPond] very well yet, I'm *very* @@ -526,7 +523,7 @@ and look!} @divClass{testimonial-item} -@imageFloat{darius-blasband.jpg, right} +@imageFloat{darius-blasband,jpg, right} @subsubheading Darius Blasband, composer (Brussels, Belgium) @qq{[..after the first orchestra rehearsal] I got numerous @@ -649,7 +646,8 @@ Read about our @ref{Text input}. @subheading @qq{Compiling} Music -@imageClickable{examples/nereid-shot-small.png, (click to enlarge), examples/nereid-shot.png, right} +@c FIXME: broken image? +@c @imageClickable{examples/nereid-shot-small,png, (click to enlarge), examples/nereid-shot,png, right} LilyPond is a @emph{compiled} system: it is run on a text file containing the notes. The resulting output is viewed on-screen or @@ -675,16 +673,17 @@ everything at a much more gradual pace.} Notes are encoded with letters and numbers. Special commands are entered with backslashes. -@imageFloat{text-input-1-annotate.png,center} -@imageFloat{text-input-1-output.png,center} +@c why can't we fscking just conver the svg to png. :/ +@c @imageFloat{text-input-1-annotate,png,center} +@c @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 languages are available). LilyPond figures out where to put accidentals. -@imageFloat{text-input-2-annotate.png,center} -@imageFloat{text-input-2-output.png,center} +@c @imageFloat{text-input-2-annotate,png,center} +@c @imageFloat{text-input-2-output,png,center} @subsubheading Pop music @@ -693,8 +692,8 @@ Put chords and lyrics together to get a lead sheet: @help{change the lyrics. svg available} -@imageFloat{text-input-pop-annotate.png,center} -@imageFloat{text-input-pop-output.png,center} +@c @imageFloat{text-input-pop-annotate,png,center} +@c @imageFloat{text-input-pop-output,png,center} @@ -705,21 +704,21 @@ be made from a single input file. So, changing a note always affects both parts and score. To share the notes, the music is assigned to a variable: -@imageFloat{text-input-parts-both-annotate.png,center} +@c @imageFloat{text-input-parts-both-annotate,png,center} This variable is then used in a single part (here transposed, with condensed multi rests): -@imageFloat{text-input-parts-single-annotate.png,center} -@imageFloat{text-input-parts-single-output.png,center} +@c @imageFloat{text-input-parts-single-annotate,png,center} +@c @imageFloat{text-input-parts-single-output,png,center} The same variable is used in the full score (here in concert pitch): -@imageFloat{text-input-score-annotate.png,center} -@imageFloat{text-input-score-output.png,center} +@c @imageFloat{text-input-score-annotate,png,center} +@c @imageFloat{text-input-score-output,png,center} @subsubheading Beginner Documentation -- 2.39.5