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
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)
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='\r' -o $@ $<
- $(PYTHON) $(step-bindir)/add-html-footer.py $@
-
-$(outdir)/%.tex: %.data $(depth)/VERSION
- $(PYTHON) $(step-bindir)/table-to-html.py --columns=7 --linesep='\r' -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
# 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
* ENV:WEBMASTER,
* ENV:WEBMASTER
->
+-->
<hr>
Go <a href=%s>back</a> to index of LilyPond.
<em>gnu-music-discuss@gnu.org</em></a>.
<p>
-<!-- package %s %s >
+<!-- package %s %s -->
Please send comments on these web pages to
<a href="mailto:%s"><em>%s</em></a>
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
if [ -f ../.gdbinit.lilypond ];
then
- showln -f ../.gdbinit.lilypond .
+ showln -f ../.gdbinit.lilypond .gdbinit
fi
if [ -f ../.dstreamrc ]
--- /dev/null
+% 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
+ }
+>
--- /dev/null
+%{
+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;
+ }
+}
+
+
#include "dimensions.hh"
#include "direction.hh"
-#include <iostream.h>
Breathing_sign::Breathing_sign ()
{
{
energy_f_ = infinity_f;
satisfies_constraints_b_ = false;
+ force_f_ = 0;
}
Column_x_positions::~Column_x_positions()
{
-
}
{
prev_break_i_ = -1;
line_i_ = 0;
+ demerits_f_ = 0;
}
};
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;
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);
#ifndef MIDI_STREAM_HH
#define MIDI_STREAM_HH
-#include <iostream.h>
#include "string.hh"
/// Midi outputfile
#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;
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 &
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;
}
{
if (object_)
{
- UNPROTECT (object_);
- object_ =0L; // be nice to conservative GC
+ scm_unprotect_object (object_);
}
}
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);
}
% 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;
-
\version "1.2.0";
\include "allemande-urtext.ly";
;(debug-enable 'backtrace)
;;; library funtions
+
+; :use-module (ice-9 regex))
+
(define
(xnumbers->string l)
(string-append
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)
' -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 ()
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)
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 ()
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'
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)
$(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
projects / lilypond.git / commitdiff