From: fred Date: Tue, 26 Mar 2002 22:42:11 +0000 (+0000) Subject: lilypond-1.3.0 X-Git-Tag: release/1.5.59~2042 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c66debc7d372f59709e2c7ad95b8f031f9d651d5;p=lilypond.git lilypond-1.3.0 --- diff --git a/Documentation/bibliography/GNUmakefile b/Documentation/bibliography/GNUmakefile index 899251880a..ca0c7ae4a4 100644 --- a/Documentation/bibliography/GNUmakefile +++ b/Documentation/bibliography/GNUmakefile @@ -2,23 +2,9 @@ depth=../.. -DATA_FILES = $(wildcard *.data) -datafiles = $(addprefix $(outdir)/,$(DATA_FILES:.data=.html)) -TEX_FILES = $(wildcard *.tex) -DOC_FILES = $(wildcard *.doc) -DVI_FILES = $(addprefix $(outdir)/,$(DOC_FILES:.doc=.dvi) $(YO_FILES:.yo=.dvi)) OUT_BIB_FILES = $(addprefix $(outdir)/, $(BIB_FILES)) - -# just include me -YO_URG_FILES = $(wildcard *.yo-urg) - -OUTTEX_FILES = $(addprefix $(outdir)/, $(TEX_FILES)) -OUTDOC_FILES = $(addprefix $(outdir)/, $(DOC_FILES)) -EL_FILES = $(wildcard *.el) BIB_FILES= $(wildcard *.bib) -EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_FILES) $(TEX_FILES) $(wildcard *.sty) -HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html)) -PS_FILES = $(DVI_FILES:.dvi=.ps) +EXTRA_DIST_FILES= $(BIB_FILES) STEPMAKE_TEMPLATES=tex documentation LOCALSTEPMAKE_TEMPLATES=lilypond mudela @@ -26,12 +12,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond mudela export BIBINPUTS:=$(shell pwd)//$(PATHSEP)$(BIBINPUTS) include $(depth)/make/stepmake.make - - - - - -dvi: $(OUT_BIB_FILES) $(DVI_FILES) +dvi: $(DVI_FILES) $(OUT_BIB_FILES) ps: $(PS_FILES) @@ -41,18 +22,7 @@ default: GENHTMLS = engraving colorado computer-notation OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html)) -#urg should generalise and move Lilypond -> StepMake -# URG. Lilypond specific. Move out. -$(outdir)/%.html: %.data $(depth)/VERSION - $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' -o $@ $< - $(PYTHON) $(step-bindir)/add-html-footer.py $@ - -$(outdir)/%.tex: %.data $(depth)/VERSION - $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep=' ' -o $@ --latex $< - - - -local-WWW: $(HTML_FILES) $(OUTTEX_FILES:.tex=.ps.gz) $(OUTYO_FILES:.yo=.latex) $(OUTYO_FILES:.yo=.ps.gz) $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(datafiles) +local-WWW: $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html)) $(PYTHON) $(step-bindir)/ls-latex.py --title 'References on Music Notation' \ $(YO_FILES) $(OUTYO_FILES:.yo=.latex) $(BIB_FILES) $(DOC_FILES) $(TEX_FILES) \ | sed "s!$(outdir)/!!g" > $(outdir)/index.html @@ -63,12 +33,7 @@ $(outdir)/%.bib: %.bib # ignore result since bib2html is nonstandard. Errors would halt the RPM build.j $(outdir)/%.html: %.bib -bib2html $< $@ +# $(footify) $@ -# Yeah right: -# make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi - -#out/%: $(outdir)/% -# cp -f $< $@ - -locamlclean: +localclean: rm -f fonts.aux fonts.log feta*.tfm feta*.*pk diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index 4b99be2c58..50bcaf5b2d 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -11,7 +11,7 @@ footer substitutions: * ENV:WEBMASTER, * ENV:WEBMASTER -> +-->
Go back to index of LilyPond. @@ -23,7 +23,7 @@ Please send GNU LilyPond questions and comments to gnu-music-discuss@gnu.org.

- Please send comments on these web pages to %s diff --git a/Documentation/misc/GNUmakefile b/Documentation/misc/GNUmakefile index 55a1efe7ed..d9b79c0e6e 100644 --- a/Documentation/misc/GNUmakefile +++ b/Documentation/misc/GNUmakefile @@ -4,10 +4,9 @@ NAME = documentation STEPMAKE_TEMPLATES=documentation texinfo -TEXTS =AIMS $(wildcard CHANGES-*) $(wildcard ANNOUNCE-*) $(wildcard NEWS-*) interview +TEXTS =AIMS $(wildcard CHANGES-*[0-9]) $(wildcard ANNOUNCE-*[0-9]) $(wildcard NEWS-*[0-9]) interview EXTRA_DIST_FILES = $(TEXTS) - include $(depth)/make/stepmake.make default: do-doc diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh index d69f24b3b7..f809aba7d3 100644 --- a/buildscripts/set-lily.sh +++ b/buildscripts/set-lily.sh @@ -81,7 +81,7 @@ rm -f cmtfm; showln -sf $TEX_TFMDIR $BUILDDIR/cmtfm if [ -f ../.gdbinit.lilypond ]; then - showln -f ../.gdbinit.lilypond . + showln -f ../.gdbinit.lilypond .gdbinit fi if [ -f ../.dstreamrc ] diff --git a/input/test/no-stem-extend.fly b/input/test/no-stem-extend.fly new file mode 100644 index 0000000000..35ef31eac4 --- /dev/null +++ b/input/test/no-stem-extend.fly @@ -0,0 +1,13 @@ +% test noStemExtend +\context Staff < + \context Voice = "a" { + f2 f8 g a b + \property Voice.noStemExtend = 1 + f2 f8 g a b + } + \context Voice = "b" { + c''2 c8 b a g + \property Voice.noStemExtend = 1 + c2 c8 b a g + } +> diff --git a/input/test/uniform-breaking.ly b/input/test/uniform-breaking.ly new file mode 100644 index 0000000000..b07a7b21a6 --- /dev/null +++ b/input/test/uniform-breaking.ly @@ -0,0 +1,112 @@ +%{ +Hmm, ik vraag me af of dit al helemaal koel is. + + return abs (this_one.force_f_) + abs (prev.force_f_ - this_one.force_f_) + + break_penalties; + +Neem als voorbeeld iets dat lijkt op allemande: keuze tussen 2 of drie +maten per regel. + +* 2 lange maten -> lelie kiest 2 /regel :beetje los +* 3 korte -> lelie kiest 3 /regel :beetje krap +* 2 korte, 1 lange -> 3/regel :krap +* 1 korte, 2 lange -> 3/regel :erg krap +* 3 lange -> 3/regel :urg krap + +als je naar beloningen kijkt, kan ik me goed voorstellen dat sprong +van 'al wat krapper' naar los te groot wordt, en ze dus steeds krapper +wordt, tot urg krap aan toe, want kracht lineair? Dat lijkt ook geval +in allemande. + +Zie hoe eerst 10 en 9 mooi op 2maat/regel staan terwijl later tot 14 +toe 3/regel. + +Heb niet zomaar beter idee, nog. +%} + +\score{ + \notes\relative c'{ + % 10 + c8 c c c c8 c c c + c8 c c c c8 c c c + c8 c c c c8 ces c ces + + % 9 + c8 c c c c8 c c c + c8 c c c c8 c c c + c8 c c c c8 c ces c + + % 1 + c4 c c c + c4 c c c + c4 c c c + + % 2 + c4 c c c + c4 c c c + c4 c c8 c c c + + % 3 + c4 c c c + c4 c c c + c8 c c c c8 c c c + + % 4 + c4 c c c + c4 c c8 c c c + c8 c c c c8 c c c + + % 5 + c4 c c c + c8 c c c c8 c c c + c8 c c c c8 c c c + + % 6 + c4 c c8 c c c + % c4 c c c8 c + c8 c c c c8 c c c + c8 c c c c8 c c c + + % 7 + c8 c c c c8 c c c + c8 c c c c8 c c c + c8 c c c c8 c c c + + % 8 + c8 c c c c8 c c c + c8 c c c c8 c c c + c8 c c c c8 c c ces + + % 9 + c8 c c c c8 c c c + c8 c c c c8 c c c + c8 c c c c8 c ces c + + % 10 + c8 c c c c8 c c c + c8 c c c c8 c c c + c8 c c c c8 ces c ces + + % 11 + c8 c c c c8 c c c + c8 c c c c8 c c c + c8 c c c ces8 c ces c + + % 12 + c8 c c c c8 c c c + c8 c c c c8 c c c + c8 c c ces c8 ces c ces + + % 13 + c8 c c c c8 c c c + c8 c c c c8 c c c + c8 c ces c ces8 c ces c + + } + \paper { + indent=0.0\mm; + linewidth=90.0\mm; + } +} + + diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 4c36f261aa..0fff51106f 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -18,7 +18,6 @@ TODO: --> see breathing-sign-engraver.cc #include "dimensions.hh" #include "direction.hh" -#include Breathing_sign::Breathing_sign () { diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc index eb4c983701..2532610973 100644 --- a/lily/column-x-positions.cc +++ b/lily/column-x-positions.cc @@ -14,11 +14,11 @@ Column_x_positions::Column_x_positions() { energy_f_ = infinity_f; satisfies_constraints_b_ = false; + force_f_ = 0; } Column_x_positions::~Column_x_positions() { - } diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index 63a6adc624..0e0ea46f4b 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -40,6 +40,7 @@ struct Break_node { { prev_break_i_ = -1; line_i_ = 0; + demerits_f_ = 0; } }; @@ -56,10 +57,7 @@ Gourlay_breaking::do_solve () const optimal_paths.set_size (breaks.size ()); Break_node first_node ; - first_node.prev_break_i_ = -1; - first_node.line_config_.force_f_ = 0; first_node.line_config_.energy_f_ = 0; - first_node.line_i_ = 0; optimal_paths[0] = first_node; int break_idx=1; diff --git a/lily/include/ly-symbols.hh b/lily/include/ly-symbols.hh index f0f3dd098d..0e3f1cf746 100644 --- a/lily/include/ly-symbols.hh +++ b/lily/include/ly-symbols.hh @@ -60,6 +60,7 @@ DECLARE_LY_SYMBOL(notewidth); DECLARE_LY_SYMBOL(non_default); DECLARE_LY_SYMBOL(non_rhythmic); DECLARE_LY_SYMBOL(no_staff_support); +DECLARE_LY_SYMBOL(no_stem_extend); DECLARE_LY_SYMBOL(octave_dir); DECLARE_LY_SYMBOL(origin); DECLARE_LY_SYMBOL(output); diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh index f367d62a2a..06c4f84ffc 100644 --- a/lily/include/midi-stream.hh +++ b/lily/include/midi-stream.hh @@ -7,7 +7,6 @@ #ifndef MIDI_STREAM_HH #define MIDI_STREAM_HH -#include #include "string.hh" /// Midi outputfile diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index cf06c84a5d..1d8fd16b2a 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -10,14 +10,6 @@ #include "lily-guile.hh" #include "main.hh" -#ifdef LYPROT -#define PROTECT ly_protect_scm -#define UNPROTECT ly_unprotect_scm -#else -#define PROTECT scm_protect_object -#define UNPROTECT scm_unprotect_object -#endif - Protected_scm::Protected_scm () { object_ = 0; @@ -25,12 +17,12 @@ Protected_scm::Protected_scm () Protected_scm::Protected_scm (SCM s) { - object_ = s ? PROTECT (s): 0; + object_ = s ? scm_protect_object (s): 0; } Protected_scm::Protected_scm (Protected_scm const &s) { - object_ = s.object_ ? PROTECT (s.object_) : 0; + object_ = s.object_ ? scm_protect_object (s.object_) : 0; } Protected_scm & @@ -39,9 +31,9 @@ Protected_scm::operator =(SCM s) if (object_ == s) return *this; if (object_) - UNPROTECT(object_); + scm_unprotect_object(object_); - object_ = s ? PROTECT (s): 0; + object_ = s ? scm_protect_object (s): 0; return *this; } @@ -56,8 +48,7 @@ Protected_scm::~Protected_scm () { if (object_) { - UNPROTECT (object_); - object_ =0L; // be nice to conservative GC + scm_unprotect_object (object_); } } diff --git a/lily/stem.cc b/lily/stem.cc index 919969187c..7c7797a385 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -201,7 +201,8 @@ Stem::set_default_stemlen () set_stemend ((dir_ > 0) ? head_positions()[BIGGER] + length_f: head_positions()[SMALLER] - length_f); - if (!grace_b && (dir_ * stem_end_f () < 0)) + bool no_extend_b = get_elt_property (no_stem_extend_scm_sym) != SCM_BOOL_F; + if (!grace_b && !no_extend_b && (dir_ * stem_end_f () < 0)) set_stemend (0); } diff --git a/ly/params.ly b/ly/params.ly index 96b0057fa8..a3e0eba66c 100644 --- a/ly/params.ly +++ b/ly/params.ly @@ -225,7 +225,7 @@ mmrest_x_minimum = 1.4*\staffheight; % chop off this much when next to pp / ff sign. crescendo_shorten = 4.0 * \interline; crescendo_thickness = \stafflinethickness; -crescendo_height = 1.5 * \interline; +crescendo_height = 0.666 * \interline; % in internote. restcollision_minimum_dist = 3.0; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly index da8e76a773..473a743eca 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -1,6 +1,5 @@ - \version "1.2.0"; \include "allemande-urtext.ly"; diff --git a/scm/lily.scm b/scm/lily.scm index 8eafa4922a..de49911154 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -8,6 +8,9 @@ ;(debug-enable 'backtrace) ;;; library funtions + +; :use-module (ice-9 regex)) + (define (xnumbers->string l) (string-append diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py index 1328087387..59bde3bbd7 100644 --- a/scripts/mudela-book.py +++ b/scripts/mudela-book.py @@ -682,7 +682,7 @@ def compile_all_files (chunks): system ('lilypond %s %s' % (lilyopts, texfiles)) for e in eps: - cmd = r"""tex %s; dvips -E -o %s %s""" % \ + cmd = r"""tex '\nonstopmode \input %s'; dvips -E -o %s %s""" % \ (e, e + '.eps', e) system (cmd) diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py index 3fc89f375f..927cb0999e 100644 --- a/stepmake/bin/package-diff.py +++ b/stepmake/bin/package-diff.py @@ -52,9 +52,23 @@ def help (): ' -T, --dir-to=TO diff to directory TO\n' ) +def cleanup (): + global from_diff, to_diff, prev_cwd + os.chdir ('/tmp/package-diff') + sys.stderr.write ('Cleaning ... ') + os.system ('rm -fr %s %s' % (from_diff, to_diff)) + sys.stderr.write ('\n') + os.chdir (prev_cwd) + def untar (fn): # os.system ('pwd'); - sys.stderr.write ('untarring ' + fn + '\n') + try: + open (fn) + except: + sys.stderr.write ("Can't find tarball: %s\n" % fn) + cleanup () + sys.exit (1) + sys.stderr.write ("Untarring: %s\n" % fn) os.system ('gzip --quiet -dc ' + fn + '| tar xf - ') sys.stderr.flush () @@ -62,8 +76,13 @@ def remove_automatic (dirnames): files = [] for d in dirnames: - for p in pats: - files = files + find.find (p, d) + try: + for p in pats: + files = files + find.find (p, d) + except: + sys.stderr.write ("Can't find dir: %s\n" % d) + cleanup () + sys.exit (1) dirs = map (lambda d: find.find ('out', d), dirnames) dirs = reduce (lambda x,y: x + y, dirs) @@ -271,10 +290,5 @@ else: os.chdir (to_diff) makediff (from_diff, to_diff, patch_name) -os.chdir ('/tmp/package-diff') -sys.stderr.write ('cleaning ... ') -os.system ('rm -fr %s %s' % (from_diff, to_diff)) -sys.stderr.write ('\n') -os.chdir (prev_cwd) - +cleanup () diff --git a/stepmake/bin/release.py b/stepmake/bin/release.py index 9cad793748..cc6d6ec5ed 100755 --- a/stepmake/bin/release.py +++ b/stepmake/bin/release.py @@ -60,6 +60,7 @@ except: pass os.link(orig, os.path.join (package.release_dir, tarball)) +# urg: howto check exit code? os.system(sys.executable + ' ' + package.topdir + '/stepmake/bin/package-diff.py --package=' + topdir) diffname = pn + '.diff.gz' @@ -67,6 +68,10 @@ rel_pn = package.patch_dir + diffname diffname = os.path.join (outdir, diffname) -os.rename(diffname, rel_pn) +try: + os.rename(diffname, rel_pn) +except: + sys.stderr.write ("Can't find diff: %s\n" % diffname) + sys.exit (1) os.link(rel_pn, diffname) diff --git a/stepmake/stepmake/metapost-rules.make b/stepmake/stepmake/metapost-rules.make index 2ecf0bc232..7f820ab4e5 100644 --- a/stepmake/stepmake/metapost-rules.make +++ b/stepmake/stepmake/metapost-rules.make @@ -9,5 +9,5 @@ mfplain.mem: $(MFPLAIN_MP) $(outdir)/%.pfa: $(outdir)/%.0 $(PYTHON) $(depth)/buildscripts/ps-to-pfa.py --output $(basename $<).pfa $< rm -f $(basename $(@F)).[0-9]* - rm -f $(basename $<).log $(basename $<).tfm + rm -f $(basename $<).log