From: Han-Wen Nienhuys Date: Thu, 17 Jul 2003 21:49:43 +0000 (+0000) Subject: * GNUmakefile.in: remove no kpathsea hack. X-Git-Tag: release/1.7.26~19 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=d915ae794be635301e275cd659886f4315f78035;p=lilypond.git * GNUmakefile.in: remove no kpathsea hack. * Documentation/topdocs/INSTALL.texi (Top): remove web-doc from doco. * GNUmakefile.in: remove web-doc target. * lily/all-font-metrics.cc (find_afm): add message about buildscripts/clean-fonts.sh * Documentation/user/refman.itely (Percussion staves): use set-drum-kit --- diff --git a/ChangeLog b/ChangeLog index 6b65895a48..d915714709 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2003-07-17 Han-Wen Nienhuys + * GNUmakefile.in: remove no kpathsea hack. + + * Documentation/topdocs/INSTALL.texi (Top): remove web-doc from + doco. + + * GNUmakefile.in: remove web-doc target. + + * lily/all-font-metrics.cc (find_afm): add message about + buildscripts/clean-fonts.sh + * scm/define-music-properties.scm (figure): use string for 'figure * lily/parser.yy (bass_number): allow strings for bassfigure too. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 136076112f..cc64d3221e 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -240,7 +240,7 @@ can also build it locally. This process requires a successful compile of lilypond. The documentation is built by issuing @example - make web-doc + make web @end example diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 0f7ac4003a..d5015cfbca 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -1,38 +1,91 @@ @c -*-texinfo-*- +@node Introduction +@chapter Introduction +There are a lot of programs that let you print sheet music with a +computer. Unfortunately, most of them do not do good job. If you +regularly from both recent and old music, you can probably agree with +us on that. Most computer printouts have a bland, mechanical look, +and are unpleasant to play from. Musicians are usually more absorbed +with performing the music than with studying its looks, so they +usually cannot pinpoint what exactly is so disconcerting about +computer prints. +However, it only takes a little attention to see for yourself what is + oftenmostly itself, +than studying the looks of , and will so most l playing Since we +normally don't For normal users, it is difficult If you are familiar +with this sensation, you will probably not be able to pinpoint what +exactly causes this feeling. + Normally, one notices these details only subconsiously. The best way +to become conscious of these differences is to compare a traditionally +printed and a computer printed edition of the same piece, preferably +with a magnifying glass. If you are not sure: traditional engraving is +photographically reproduced hand-work, and can be recognized by +slightly irregularities in symbol placement, and small blotches due to +the reproduction process. +By contrast, we try to mimick traditional plate engraving in the +general impression, layout algorithms, and the font +design. Consequently, our output often beats our competitors when it +comes to good looks. +LilyPond is an automated music engraving system. + +With LilyPond is a program that lets you print sheet music. It is +certainly not unique in that sense. +it is more than that + If you are reading this +What is LilyPond? +Automatic notation, so that means I can play the music, and then it +rolls out of the printer? +There are other program that do notation. What's so special about yours? +What is wrong with other computer printed scores? +What is engraving? +Music notation vs. Engraving. (vs. composing) +Why do you care about engraving? +Why would I care about engraving? +You say your program is special; you must be trying to sell it? +Freedom + +Preserving/reinventing the art of engraving + +Typography in LilyPond. + +Input format. Issue is overrated. + + + + +************ -@node Introduction -@chapter Introduction LilyPond is a program to print sheet music. If you have used notation programs before, then the way to use this program might be surprising @@ -120,17 +173,22 @@ attached. @cindex typography Making sheet music may seem trivial at first (``you print 5 lines, and -then put in the notes at different heights''), @emph{music engraving}, -i.e. professional music typography, is in another ballpark. The term -`music engraving' derives from the traditional process of music -printing. Only a few decades ago, sheet music was made by cutting and -stamping the music into zinc or pewter plates, mirrored. The plate -would be inked, and the depressions caused by the cutting and stamping -would hold ink. An image was formed by pressing paper to the -plate. Stamping and cutting was completely done by hand. Making -corrections was cumbersome, so engraving had to be done correctly in -one go. As you can imagine this was a highly specialized skill, much -more so than the traditional process of printing books. +then put in the notes at different heights''), + + +Hier over notatie. + +@emph{music engraving}, i.e. professional music typography, is in +another ballpark. The term `music engraving' derives from the +traditional process of music printing. Only a few decades ago, sheet +music was made by cutting and stamping the music into zinc or pewter +plates, mirrored. The plate would be inked, and the depressions caused +by the cutting and stamping would hold ink. An image was formed by +pressing paper to the plate. Stamping and cutting was completely done +by hand. Making corrections was cumbersome, so engraving had to be +done correctly in one go. As you can imagine this was a highly +specialized skill, much more so than the traditional process of +printing books. @cindex craftsmanship @cindex master In the traditional German craftsmanship six years of full-time diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index d524ac706c..f99c663a6e 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -6508,8 +6508,8 @@ In figures input mode, a group of bass figures is delimited by \figures { <4 6> } @end lilypond -Accidentals are added to the numbers if you alterate them by -appending @code{-}, @code{!} and @code{+}. +Accidentals are added when you append @code{-}, @code{!} and @code{+} +to the numbers. @example <4- 6+ 7!> diff --git a/GNUmakefile.in b/GNUmakefile.in index 710db8f04c..0af9324cad 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -44,31 +44,17 @@ web-reqs: run-reqs pfa-fonts doc: run-reqs $(MAKE) -C Documentation -web-doc: web-reqs - $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/regression/ WWW - $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/template/ WWW - $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/test/ WWW - $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C Documentation WWW - $(MAKE) footify - pfa-fonts: $(MAKE) MAKE_PFA_FILES=1 -C mf (cd $(builddir)/share/lilypond/fonts && \ tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* ) -install-html-doc: web-doc top-web +install-html-doc: top-web $(INSTALL) -m 755 -d $(local_package_docdir) tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz -# KPATHSEA=0: Hack for compiling without kpathsea -- not recommended -my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp - local-install: $(INSTALL) -d $(local_lilypond_datadir) -ifeq ($(KPATHSEA),0) - $(foreach i, 1 2 3 4 5, rm -f $(local_lilypond_datadir)/tfm.$(i); $(LN_S) $(word $(i), $(my_tfm_path)) $(local_lilypond_datadir)/tfm.$(i) ; ) -endif - final-install: @echo @@ -88,7 +74,7 @@ lily: lily/$(outdir)/lilypond lily/$(outdir)/lilypond: $(MAKE) -C lily -local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web +local-web: $(TOP_HTMLS:%.html=%) footify do-top-doc top-web web-ext = gz html midi pdf png txt ly diff --git a/input/example-1.ly b/input/example-1.ly index d2fcede10f..b3c9599755 100644 --- a/input/example-1.ly +++ b/input/example-1.ly @@ -7,6 +7,11 @@ % xdvi example-1 # or your dvi viewer here % +%% +%% For learning LilyPond, please read the tutorial, included in the +%% user-manual. +%% + \score { \context Voice \notes\relative c { c' d e f g a b c diff --git a/input/example-2.ly b/input/example-2.ly index 1033383cf0..76c66e9e60 100644 --- a/input/example-2.ly +++ b/input/example-2.ly @@ -7,6 +7,11 @@ % xdvi example-2 # or your dvi viewer here % +%% +%% For learning LilyPond, please read the tutorial, included in the +%% user-manual. +%% + \score { \context Voice \notes\relative c { a''2 ~ c4( [e8 )e] [a,16 a a a] diff --git a/input/example-3.ly b/input/example-3.ly index 8b5188170a..b457695f0a 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -24,3 +24,8 @@ two = \notes\relative c{ % % ly2dvi example-3 % xdvi example-3 # or your dvi viewer here + +%% +%% For learning LilyPond, please read the tutorial, included in the +%% user-manual. +%% diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index f0c377c034..219b1643c8 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -100,7 +100,8 @@ All_font_metrics::find_afm (String name) s += " AFM: " + to_string ((int) afm->checksum_); s += "\n"; s += _ (" Rebuild all .afm files, and remove all .pk and .tfm files. Rerun with -V to show font paths."); - + s += _("A script for removing font-files is delivered with the source-code,\n" + "in buildscripts/clean-fonts.sh") error (s); } } diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 68f65a7624..b02bb9ff16 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -46,7 +46,9 @@ CONVERT_LY = $(script-dir)/convert-ly.py LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond LILYPOND_BOOK = $(script-dir)/lilypond-book.py LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/ -I $(builddir)/mf/out/ -LILYPOND_BOOK_FORMAT = texi + +#texi-html for www only: +LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html) LY2DVI = $(script-dir)/ly2dvi.py LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in index 80c53fda3a..fff822a448 100644 --- a/make/lilypond.mandrake.spec.in +++ b/make/lilypond.mandrake.spec.in @@ -58,7 +58,7 @@ make -C mf/ pfa make -C Documentation # make html -make web-doc top-web +make web make -C Documentation/user omf %install diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 8d0dd7b647..b4821c51b3 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -53,7 +53,7 @@ make -C mf/ pfa make -C Documentation # make html -make web-doc top-web +make web top-web make -C Documentation/user omf %install diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in index 822678420e..5f9175c3d0 100644 --- a/make/lilypond.suse.spec.in +++ b/make/lilypond.suse.spec.in @@ -102,8 +102,7 @@ make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all # ok, now make sure that lilypond package will succeed, # even if documentation fails to build -make -C Documentation || true -make web-doc top-web || true +make web %install diff --git a/stepmake/stepmake/www-targets.make b/stepmake/stepmake/www-targets.make index 259d06fe85..8eaa76f7e5 100644 --- a/stepmake/stepmake/www-targets.make +++ b/stepmake/stepmake/www-targets.make @@ -11,10 +11,10 @@ endif #ugh, this is (but whole make web/www/WWW is) lilypond specific local-web: - $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html local-WWW + $(MAKE) out=www local-WWW web: - $(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html WWW + $(MAKE) out=www WWW local-WWW-clean: rm -f $(outdir)/*