From f8ba564f5a8cd8bdbfceaf4334465a972c6b2860 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:27:01 +0000 Subject: [PATCH] lilypond-0.0.20 --- NEWS | 6 ++++++ Variables.make | 12 ++++++------ init/Makefile | 5 +++++ lilyponddefs.tex | 16 ++++++++++++---- maartje.ly | 6 ++---- src/simplewalker.cc | 17 ++++++++--------- 6 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 init/Makefile diff --git a/NEWS b/NEWS index ab7f8437f6..27be7f4bd2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +pl 20: + - Rational for time measurement + - updated doco to .pod + - directionalspanner/textspanner + - include files + pl 19: - struct Moment - grouping code: LilyPond can set advanced multibeams. diff --git a/Variables.make b/Variables.make index 32bffdfc97..ac306c7832 100644 --- a/Variables.make +++ b/Variables.make @@ -5,14 +5,14 @@ #PROFILEFLAG=-pg OPTIFLAG=-DNDEBUG -DNPRINT -O2 DEBUGFLAG=-g + # turn off -pipe if linker doesn't support it EXTRACXXFLAGS=-pipe -Wall -W -Wmissing-prototypes -# -Woverloaded-virtual # # -lefence = ElectricFence. # -# ElectricFence is memory debugger which uses the +# ElectricFence is a memory debugger which uses the # VM hardware to trap malloc/free errors. # #EXTRALIB+=-lefence @@ -37,7 +37,7 @@ endif # version info MAJVER=0 MINVER=0 -PATCHLEVEL=19 +PATCHLEVEL=20 VERSION=$(MAJVER).$(MINVER).$(PATCHLEVEL) CXXVER=`$(CXX) --version` @@ -49,7 +49,7 @@ TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) OBJECTDIR=objects HEADERDIR=hdr CCDIR=src - +INITDIR=init vpath %.cc $(CCDIR) vpath %.hh $(HEADERDIR) vpath %.y $(CCDIR) @@ -77,7 +77,7 @@ DNAME=$(PACKAGENAME)-$(VERSION) othersrc=lexer.l parser.y SCRIPTS=make_version make_patch genheader IFILES=dimen.tex symbol.ini kortjakje.ly pavane.ly maartje.ly\ - lilyponddefs.tex test.tex .dstreamrc + lilyponddefs.tex test.tex .dstreamrc cadenza.ly OFILES=Makefile Variables.make Sources.make COPYING README NEWS DFILES=$(OFILES) $(IFILES) $(SCRIPTS) @@ -91,4 +91,4 @@ BISON=bison exe=$(PACKAGENAME) OUTPUT_OPTION=$< -o $@ DDIR=$(TOPDIR)/$(DNAME) -SUBDIRS=Documentation $(OBJECTDIR) $(CCDIR) $(HEADERDIR) +SUBDIRS=Documentation $(OBJECTDIR) $(CCDIR) $(HEADERDIR) $(INITDIR) diff --git a/init/Makefile b/init/Makefile new file mode 100644 index 0000000000..9e9b75f0f9 --- /dev/null +++ b/init/Makefile @@ -0,0 +1,5 @@ +DFILES=dutch.ini table_sixteen.ini table_twenty.ini\ + english.ini + +dist: + ln Makefile $(DFILES) $(DDIR)/$(INITDIR) diff --git a/lilyponddefs.tex b/lilyponddefs.tex index 0c70462bc0..da2c971f2f 100644 --- a/lilyponddefs.tex +++ b/lilyponddefs.tex @@ -23,6 +23,7 @@ \font\hslurdfont=xslhd20 \font\hslurhfont=xslhz20 \font\musicfnt=musix20 + \font\italicfont=cmti10 \balkhoog=20pt \notewidth=6pt \staffrulethickness=0.4pt @@ -31,6 +32,7 @@ } \def\musixsixteendefs{ \font\textfont=cmr8 + \font\italicfont=cmti8 \font\slurufont=xslu16 \font\slurdfont=xsld16 \font\slurhfont=xslz20 % sigh @@ -112,7 +114,7 @@ \vskip 10pt } \def\ugly{\nointerlineskip\par -\vskip 40pt\par\vbox{\hbox to 0pt{\vrule width30pt height1pt\hss}}\par\vskip 40pt +\vskip 40pt\par\vbox{\leftalign{\vrule width30pt height1pt}}\par\vskip 40pt } \def\interscoreline{\beauty} @@ -134,7 +136,7 @@ % % a staffsymbol with #1 lines, width #2 % bottom at baseline -\def\linestafsym#1#2{\hbox to 0pt{\vbox to 0pt{\vss\lines{#1}{#2}}\hss}} +\def\linestafsym#1#2{\leftalign{\vbox to 0pt{\vss\lines{#1}{#2}}}} \def\vcenter#1{\vbox to 0pt{\vss #1\vss}} \def\topalign#1{\vbox to 0pt{#1\vss}} @@ -157,9 +159,15 @@ \def\stem#1#2{\vrule height#2 depth-#1} \def\placebox#1#2#3{% - \vbox to 0pt{\vss\hbox{\raise #1\hbox to 0pt{\kern #2{}#3\hss}}}% + \vbox to 0pt{\vss\hbox{\raise #1\leftalign{\kern #2{}#3}}}% } \def\beamslope#1#2{{\count0=#2\advance\count0 by#1\musicfnt\char\count0}} -\def\rulesym#1#2{\vrule height #1 width #2} \ No newline at end of file +\def\rulesym#1#2{\vrule height #1 width #2} + +\def\settext#1{\textfont #1} +\def\setitalic#1{\italicfont #1} + +\def\centeralign#1{\hbox to 0pt{\hss#1\hss}} +\def\leftalign#1{\hbox to 0pt{#1\hss}} diff --git a/maartje.ly b/maartje.ly index 2ce1ab655a..d0ca0dfb75 100644 --- a/maartje.ly +++ b/maartje.ly @@ -1,9 +1,9 @@ ritme = staff {rhythmic music {$ c8 - [a8 a8. a8 a16 a16 a16] c4. + [a8() a8. a8 a16 a16 a16] c4. - %[c8( )'a8 c8 c8] + %[c8( )'a8() c8 c8]% BUG! c2 c2 [fis16 'dis16( fis16 'dis16 ][fis16) 'dis16 fis16 'dis16] @@ -61,11 +61,9 @@ score { paper { geometric 1.4 unitspace 3.0 cm -% symboltables { table_sixteen} } staff { ritme } staff { melody } -% staff { melody } commands { meter 4 4 partial 8 diff --git a/src/simplewalker.cc b/src/simplewalker.cc index 9f5f0033f2..458e071c9a 100644 --- a/src/simplewalker.cc +++ b/src/simplewalker.cc @@ -21,22 +21,21 @@ #include "localkeyitem.hh" Rhythmic_grouping -parse_grouping(svec a) +parse_grouping(svec a, Moment one_beat) { - Real one_beat =a[0]; - a.del(0); + svec r; for (int i= 0 ; i < a.sz(); i++) r.add(a[i]); - Real here =0.0; + Moment here =0.0; svec children; for (int i=0; i < r.sz(); i++) { - Real last = here; + Moment last = here; here += one_beat * r[i]; children.add( - new Rhythmic_grouping(Interval(last, here), r[i] ) + new Rhythmic_grouping(MInterval(last, here), r[i] ) ); } return Rhythmic_grouping(children); @@ -48,7 +47,7 @@ Simple_walker::do_INTERPRET_command(Command*com) svec args(com->args); args.del(0); if (com->args[0] == "GROUPING") { - default_grouping = parse_grouping(args); + default_grouping = parse_grouping(args, col()->tdescription_->one_beat); }else if (com->args[0] == "BAR") { local_key_.reset(key_); @@ -136,7 +135,7 @@ Simple_walker::do_note(Rhythmic_req*rq) stem_->add(n); if (current_grouping) { current_grouping->add_child( - c->moment_->whole_in_measure, rq->duration()); + c->tdescription_->whole_in_measure, rq->duration()); } noteheads.add(n); int sidx =find_slur(v); @@ -170,7 +169,7 @@ Simple_walker::process_requests() if (sl->spantype == Span_req::START) { if (find_slur(sl->elt->voice_ )>=0) - error("Too many slurs in voice"); + error_t("Too many slurs in voice", col()->when()); pending_slur_reqs.add(sl); pending_slurs.add(new Slur); } -- 2.39.5