From fbe603b3f54ca3df39e3778f67085d75c3e97547 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 16 Mar 2000 17:33:09 +0100 Subject: [PATCH] release: 1.3.35 ====== * Removed Documentation/programmer directory 1.3.34.j --- CHANGES | 11 +++--- Documentation/GNUmakefile | 9 ++--- .../{programmer => }/README-W32.texi | 0 Documentation/{programmer => }/hacking.texi | 0 Documentation/index.texi | 31 +++++++--------- Documentation/programmer/GNUmakefile | 36 ------------------- .../{programmer => }/regression-test.tely | 0 Documentation/topdocs/index.tely | 6 ---- Documentation/{ => user}/ly2dvi.texi | 0 Documentation/{ => user}/midi2ly.texi | 0 VERSION | 4 +-- input/test/GNUmakefile | 2 +- lily/lookup.cc | 2 ++ make/out/lilypond.lsm | 8 ++--- make/out/lilypond.spec | 4 +-- 15 files changed, 34 insertions(+), 79 deletions(-) rename Documentation/{programmer => }/README-W32.texi (100%) rename Documentation/{programmer => }/hacking.texi (100%) delete mode 100644 Documentation/programmer/GNUmakefile rename Documentation/{programmer => }/regression-test.tely (100%) rename Documentation/{ => user}/ly2dvi.texi (100%) rename Documentation/{ => user}/midi2ly.texi (100%) diff --git a/CHANGES b/CHANGES index 17988e6c44..a64562175a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.3.35 +====== + +* Removed Documentation/programmer directory + 1.3.34.jcn3 =========== @@ -7,18 +12,12 @@ - to change the alignment, use property marginScriptHorizontalAlignment (centred and right alignment require manual padding settings). -1.3.34.jcn2 -=========== - * Print a friendly message if the manual pages failed to build. * Bugfix: dynamicDirection now overrides verticalDirection setting. * Warning messages and nl.po -1.3.34.jcn1 -=========== - * Fixed vertical alignment for all dynamic items and (reluctantly) reinstated old directional behaviour for orphaned dynamics. diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index dd49ab04a3..f1b3fcddf2 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -1,17 +1,18 @@ depth = .. NAME = documentation -SUBDIRS= user programmer bibliography pictures topdocs ntweb misc -STEPMAKE_TEMPLATES=documentation texinfo +SUBDIRS=user bibliography pictures topdocs ntweb misc +STEPMAKE_TEMPLATES=documentation texinfo tex +LOCALSTEPMAKE_TEMPLATES=lilypond mudela README_TOP_FILES=NEWS DEDICATION CHANGES TODO -EXTRA_DIST_FILES = +EXTRA_DIST_FILES= include $(depth)/make/stepmake.make default: local-doc -local-WWW: copy-for-me +local-WWW: copy-for-me $(outdir)/regression-test.ps.gz $(outdir)/regression-test.html copy-for-me: $(foreach a, $(README_TOP_FILES),cp ../$(a) $(outdir)/$(a).txt && ) true diff --git a/Documentation/programmer/README-W32.texi b/Documentation/README-W32.texi similarity index 100% rename from Documentation/programmer/README-W32.texi rename to Documentation/README-W32.texi diff --git a/Documentation/programmer/hacking.texi b/Documentation/hacking.texi similarity index 100% rename from Documentation/programmer/hacking.texi rename to Documentation/hacking.texi diff --git a/Documentation/index.texi b/Documentation/index.texi index 023b144077..d3ee87f0cd 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -6,7 +6,7 @@ @top -@unnumberedsubsec Info +@unnumberedsubsec General information @itemize @bullet @item @uref{DEDICATION.txt,Dedication} @@ -17,8 +17,6 @@ @item @uref{faq.html,FAQ: Frequently asked questions}, with answers @end itemize - - @unnumberedsubsec Manuals @itemize @bullet @@ -29,17 +27,12 @@ terms}, includes translations. Also available in @uref{../user/out-www/glossary @item @uref{../user/out-www/mudela-book.html,mudela-book}, a tool for integrating text and music in LaTeX and texinfo; also available in @uref{../user/out-www/mudela-book.ps.gz,Postscript} -@item @uref{ly2dvi.html,ly2dvi} manual. Ly2dvi does page layout for -LilyPond prints -@item @uref{midi2ly.html,midi2ly} manual. midi2ly converts MIDI files to -LilyPond input -@item @uref{../programmer/out-www/regression-test.html, LilyPond test document} -@end itemize - - -@unnumberedsubsec Status - -@itemize @bullet +@item @uref{../user/out-www/ly2dvi.html,ly2dvi} does page layout for +LilyPond printout. +@item @uref{../user/out-www/midi2ly.html,midi2ly} +converts MIDI files to LilyPond input +@item @uref{regression-test.html, LilyPond test document} +Also available in @uref{regression-test.ps.gz,Postscript} @end itemize @@ -50,8 +43,6 @@ LilyPond input @item @uref{../pictures/out-www/lelie-icon.png, logo} in small size @end itemize - - @unnumberedsubsec Literature @itemize @bullet @@ -68,9 +59,13 @@ by computer}. @end itemize -@unnumberedsubsec Miscellaneous texts +@unnumberedsubsec Background information + + @itemize @bullet +@item @uref{hacking.html,Internals} details of the implementation +@item @uref{README-W32.html,Compiling and running on Windows32} @item @uref{../misc/out-www/CHANGES-0.0.txt, Change logs from 0.0 till 0.1 } @item @uref{../misc/out-www/CHANGES-0.1.txt, Change logs from 0.1 till 1.0 } @item @uref{../misc/out-www/CHANGES-1.0.txt, Change logs from 1.0 till 1.1 } @@ -82,7 +77,7 @@ changes)} changes)} @item @uref{../misc/out-www/ANNOUNCE-1.2.txt, Announcement of 1.2 (includes summary of changes)} @item @uref{../misc/out-www/AIMS.txt, Why LilyPond?} -pp@item @uref{../misc/out-www/interview.txt, Answers} to the Brave GNU world standard questions. +@item @uref{../misc/out-www/interview.txt, Answers} to the Brave GNU world standard questions. @end itemize diff --git a/Documentation/programmer/GNUmakefile b/Documentation/programmer/GNUmakefile deleted file mode 100644 index d54746320a..0000000000 --- a/Documentation/programmer/GNUmakefile +++ /dev/null @@ -1,36 +0,0 @@ -# Documentation/tex/Makefile - -depth=../.. - -TEX_FILES = $(wildcard *.tex) -DOC_FILES = $(wildcard *.doc) -DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(TELY_FILES:.tely=.dvi)) - -OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES)) -OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES)) - -EXTRA_DIST_FILES= $(DOC_FILES) $(TEX_FILES) $(wildcard *.sty) -HTML_FILES = $(addprefix $(outdir)/, $(TEXI_FILES:.texi=.html) $(TELY_FILES:.tely=.html)) -PS_FILES = $(DVI_FILES:.dvi=.ps) - -STEPMAKE_TEMPLATES=tex documentation texinfo -LOCALSTEPMAKE_TEMPLATES=lilypond mudela - -export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS) -include $(depth)/make/stepmake.make - -dvi: $(DVI_FILES) - -ps: $(PS_FILES) - -# urg -default: - - -localclean: - rm -f fonts.aux fonts.log feta*.tfm feta*.*pk - -local-WWW: $(HTML_FILES) $(addsuffix .gz, $(PS_FILES)) - $(PYTHON) $(step-bindir)/ls-latex.py --title 'Hacker documentation' \ - $(DOC_FILES) $(TEXI_FILES) $(TELY_FILES) \ - | sed "s!$(outdir)/!!g" > $(outdir)/index.html diff --git a/Documentation/programmer/regression-test.tely b/Documentation/regression-test.tely similarity index 100% rename from Documentation/programmer/regression-test.tely rename to Documentation/regression-test.tely diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index 88d28769e6..9677961953 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -18,9 +18,6 @@ | Mailing lists | - - Regression test - | News ] @end html @@ -207,9 +204,6 @@ then please mail us! | Mailing lists | - - Regression test - | News ] @end html diff --git a/Documentation/ly2dvi.texi b/Documentation/user/ly2dvi.texi similarity index 100% rename from Documentation/ly2dvi.texi rename to Documentation/user/ly2dvi.texi diff --git a/Documentation/midi2ly.texi b/Documentation/user/midi2ly.texi similarity index 100% rename from Documentation/midi2ly.texi rename to Documentation/user/midi2ly.texi diff --git a/VERSION b/VERSION index 8bbc082e15..85c8fef60c 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=34 -MY_PATCH_LEVEL=jcn3 +PATCH_LEVEL=35 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile index 85f2a1fbca..8fea0aed67 100644 --- a/input/test/GNUmakefile +++ b/input/test/GNUmakefile @@ -1,7 +1,7 @@ # input/test/Makefile depth = ../.. -examples= # font20 +examples= font20 LOCALSTEPMAKE_TEMPLATES=mutopia include $(depth)/make/stepmake.make diff --git a/lily/lookup.cc b/lily/lookup.cc index 72d188b18e..818ce69e3f 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -285,6 +285,8 @@ Lookup::text (String style, String text, Paper_def *paper_l) lines[i] = str; } + if (!lines.size()) + return Molecule(); SCM first = gh_list (ly_symbol2scm ("text"), ly_str02scm (lines[0].ch_C()), diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 8aa23b5e34..f0df4de561 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.34 -Entered-date: 15MAR00 +Version: 1.3.35 +Entered-date: 16MAR00 Description: Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.3.34.tar.gz + 1000k lilypond-1.3.35.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.34.tar.gz + 1000k lilypond-1.3.35.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 6556e08990..f3e0fbcedd 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.3.34 +Version: 1.3.35 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.34.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.35.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # get Packager from (undocumented?) ~/.rpmmacros! -- 2.39.5