From 0f0860112a07a4eab33ac36d8c1b9b01d431ddfa Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 3 Feb 1999 20:06:45 +0100 Subject: [PATCH] release: 1.1.27 --- Documentation/faq.yo | 2 +- Documentation/footer.html.in | 2 +- Documentation/gnu-page.yo | 32 + Documentation/tex/refman.yo | 1 + Documentation/tex/tutorial.yo | 146 ++- NEWS | 37 +- TODO | 51 +- TODO.orig | 913 ------------------- VERSION | 4 +- input/test/hara-kiri.ly | 2 +- lily/all-font-metrics.cc | 6 +- lily/dynamic-engraver.cc | 7 +- lily/lookup.cc | 8 +- lily/stem.cc | 10 + ly/engraver.ly | 11 +- make/lilypond.spec.in | 2 +- make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 6 +- make/toplevel.make.in | 2 +- mf/GNUmakefile | 6 +- mf/feta-din10.mf | 8 + mf/feta-ital-f.mf | 3 +- mf/feta-ital-m.mf | 3 +- mf/feta-ital-p.mf | 2 +- mf/feta-ital-r.mf | 3 +- mf/feta-ital-s.mf | 2 +- mf/feta-ital-z.mf | 2 +- mutopia/Coriolan/GNUmakefile | 7 +- stepmake/stepmake/documentation-targets.make | 2 +- stepmake/stepmake/texinfo-rules.make | 2 +- tex/dyndefs.tex | 18 +- 32 files changed, 303 insertions(+), 1013 deletions(-) create mode 100644 Documentation/gnu-page.yo delete mode 100644 TODO.orig diff --git a/Documentation/faq.yo b/Documentation/faq.yo index 0f733e7386..2aa9ca4e1a 100644 --- a/Documentation/faq.yo +++ b/Documentation/faq.yo @@ -359,7 +359,7 @@ Upgrade to 4.17. question(Why do I need g++ >= 2.8 / EGCS-1.1 ?) -Supporting more compilers then EGCS/G++ 2.8 is unlikely to make +Supporting more compilers than EGCS/G++ 2.8 is unlikely to make LilyPond run on more platforms. It would give us an enormous headache in detecting and catering for every variant of every compiler: not having to support other compilers saves us a em(lot) of trouble. diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index 4f0a023856..3797a9c564 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -20,7 +20,7 @@ send other FSF & GNU inquiries and questions to -Copyright (c) 1997, 1998 Han-Wen Nienhuys and Jan Nieuwenhuizen. +Copyright (c) 1997, 1998, 1999 Han-Wen Nienhuys and Jan Nieuwenhuizen.

Verbatim copying and distribution of this entire article is permitted in any medium, provided this notice is preserved.

diff --git a/Documentation/gnu-page.yo b/Documentation/gnu-page.yo new file mode 100644 index 0000000000..ea08804be9 --- /dev/null +++ b/Documentation/gnu-page.yo @@ -0,0 +1,32 @@ +DEFINEMACRO(depth)(0)(.) +DEFINEMACRO(pic)(1)(url(ARG1)(DOEXPAND(docdir)/pictures/DOEXPAND(outdir)/ARG1.png +)) + +DEFINEMACRO(beginbold)(0)(whenhtml(htmlcommand())) +DEFINEMACRO(endbold)(0)(whenhtml(htmlcommand())) +redef(htmlnewfile)(0)() +setchapterstring() + +nchapter(LilyPond: The Music Typesetter) + +LilyPond is a compiler that transforms an ASCII definition of music +into beautifully engraved sheet music. A small example is included +here: + +center(mudela(fragment, verbatim)( + \relative c'' { \key es; r8 [c16 b] [c8 g] [as c16 b] [c8 d] | g,4 } +)) + + +Features include +itemize( +it() A concise yet easy-to-read input language. +it() Beautiful output, comes with its own font. +it() Easy interfacing with (La)TeX +it() Support for Lyrics and Chords +it() MIDI output +it() Multiple voices on a staff, multiple staffs, polymetric music, nested tuplets, cross staff beaming and slurring. +) + +Development releases can be had at lurl(ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/). For more information, consult the LilyPond webpage, lurl(http://www.lilypond.org). + diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index 97255bab01..f84468dc12 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -1,3 +1,4 @@ +mailto(gnu-music-discuss@gnu.org) COMMENT(-*-text-*-) redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\ diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo index 33add0a7ec..25f8d74ea6 100644 --- a/Documentation/tex/tutorial.yo +++ b/Documentation/tex/tutorial.yo @@ -1,3 +1,4 @@ +mailto(gnu-music-discuss@gnu.org) COMMENT(-*-text-*-) redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\ @@ -93,15 +94,15 @@ mudela(verbatim)( \score { \notes \relative c'' { - \key g; - \time 3/4; - - d4 [g,8 a b c] d4 g, g | - e'4 [c8 d e fis] g4 g, g | - c4 [d8( )c b a( ] )b4 [c8 b a g] | - a4 [b8 a g fis] g2. | + \key g; + \time 3/4; - \bar ":|"; + \repeat 2 { + d4 [g,8 a b c] d4 g, g | + e'4 [c8 d e fis] g4 g, g | + c4 [d8( )c b a( ] )b4 [c8 b a g] | + a4 [b8 a g fis] g2. | + } b'4 [g8 a b g] a4 [d,8 e fis d] | @@ -208,6 +209,12 @@ verb( this command comes after the code(\time) command, in the output, the key comes before the time signature: LilyPond knows about music typesetting conventions. +verb( + \repeat 2 { +) COMMENT( + +) This command tells LilyPond that the enclosed piece of music must +be played twice. verb( d4 ) COMMENT( @@ -220,7 +227,8 @@ designates the duration of the note (it is a quarter note). COMMENT( [g,8 )COMMENT( -)The open bracket starts a beam. This bracket is connected to the +)The open bracket starts a beam. Lily can set beams automatically, +but we want to specify them ourselves. This bracket is connected to the following note, which is an eighth with pitch code(g') (remember relative mode for pitches!) COMMENT( @@ -270,25 +278,18 @@ closing parenthesis respectively. In the line shown above this is done for two slurs. Note that parentheses (slur markers) are between the notes, and the brackets (beam markers) around the notes. As you can see, the brackets and parentheses do not have to nest. - verb( a4 [b8 a g fis] g2. | ) COMMENT( ) A duration that is to be augmented with a duration dot, is notated with a duration number followed by periods, as many as you want -augmentation dots.COMMENT( - -)verb( - \bar ":|"; % a repeat sign +augmentation dots. +verb( + } ) COMMENT( -) -Lily can not detect where you want your music to be repeated, so you -have to instruct her: a special bar symbol can be entered by the -code(\bar) command followed by a string that signifies the bar symbol -that you want. Then comes a semicolon to separate the string from the -rest of the notes, just like with code(\key) and code(\time). +) The end of the repeated music. LilyPond will typset a repeat bar. verb( cis'4 [b8 cis] a4 | ) COMMENT( @@ -495,6 +496,7 @@ note following the other. You can also use LilyPond to typeset chords. You do this by expressing in mudela simultaneous music, i.e., notes that are to be played concurrently. +subsect(Where the chords have no names) In Mudela you can form simultaneous music by enclosing notes in pointed parentheses, bind(i.e.)bind(langle())bind(and)rangle(). ASCII doesn't really have these delimiters, so Mudela uses the larger-than @@ -541,6 +543,42 @@ that is covered in bind(Section)ref(sec:polyphonic). [Chords and relative mode] +subsect(Chords with names) + +In the previous section we have been talking more about 'stacked notes' +rather than 'chords'. +If you need to enter a lot of chords that have proper names, you can use +the code(\chords) mode as an alternative: +COMMENT( +)mudela(verbatim,fragment,center)( + \chords\transpose c''{ c1 d e } +) +COMMENT( URG? + \chords\relative c''{ c1 d e } +) + +subsect(Names with chords) + +A more common problem is the typesetting of chord names. LilyPond has +a special kind of staff for this, the code(ChordNames) staff. +The code(ChordNames) staff accepts music just as a normal staff, +but typesets only the name of each chord: +COMMENT( + +)mudela(verbatim,center)( +\score{ + \type ChordNames { + \chords + { c1 d-min e-maj5+.9 } + \notes\relative c + { } + } + \paper{ + linewidth=-1.0; + } +} +) Because the ChordNames staff accepts normal music, it can be transposed, +and you may enter it any way you like, either as chords or as notes. sect(Adding nuances: articulation and dynamics) @@ -1340,8 +1378,7 @@ listen, especially if they involve accidentals. The only information that you need to enter is the tempo (Unfortunately, at this time, this the only thing that can be tuned.). The syntax for the tempo is code(\tempo )var(duration) = -var(beatsperminute);), for example: COMMENT( - +var(beatsperminute);, for example: COMMENT( )verb( \score { @@ -1592,8 +1629,35 @@ switch = \type Voice = voiceA \notes { s4 \translator Staff = staffB s4 } ) -Don't try to switch staffs when you are in the middle of a slur or -beam, though: the spanners won't switch along. +If you want to switch staffs you are in the middle of a slur or a +beam, you should take special precautions. In the paper block, +you must tell how far the staffs will be apart: +mudela(verbatim,center)( +\score{ + \type GrandStaff < + \type Staff=one \notes{ s2 } + \type Staff=two \notes\relative c{ + \time 4/8; + \clef "bass"; + \stemup [c8( e + \translator Staff=one \stemup + g )c] + } + > + \paper { + linewidth=-1.0; + % slur damping gets confused + slur_slope_damping = 100.0; + \translator{ + % we're using a grand staff + \GrandStaffContext + minVerticalAlign = 3.0*\staffheight; + maxVerticalAlign = 3.0*\staffheight; + } + } +} +) +as LilyPond cannot determine the interstaff distance. sect(Tuplets) @@ -1628,4 +1692,36 @@ the bracket, the bracket is omitted. sect(Repeats) -[todo] +A repeated piece of music can consist of two parts: one part to be +repeated, and optionally, a list of alternative endings: +COMMENT( +)mudela(verbatim,fragment,center)( + \relative c'{ + \time 2/4; + g' a + \repeat 2 { b c } + \alternative { + { d c } { d e } + } + f g + } +) The number code(repeat-count) defines how many times the piece should be +played. You may leave out the code(\alternative) part. There must not +be more alternative endings than the code(repeat-count). + +A somewhat less intuitive form may be needed for lyrics, when there are +a couple alternatives, but nothing is repeated. The code(\repeat) command +must be present, but it may specify an empty music list: +COMMENT( +)mudela(verbatim,fragment,center)( + \type Lyrics \lyrics { + \repeat 2 { } + \alternative < + { Let's not sing + this twice } + { Rather sing + this in- stead } + > + } +) + diff --git a/NEWS b/NEWS index bdb5641679..06c9a0038b 100644 --- a/NEWS +++ b/NEWS @@ -1,34 +1,39 @@ ---- ../lilypond-1.1.26.jcn3/NEWS Wed Feb 3 19:24:58 1999 -++ b/NEWS Wed Feb 3 19:22:08 1999 -@@ -1,3 +1,8 @@ +pl 27 (feb 3) + +pl 26.uu1 + - make TFMs too. + - bf: dynamics. (Don't hang on spanner!) + - read TFM before AFM. + - fix din-MF stuff (UGH) + pl 26.jcn4 - Chord: handle all chord stuff; lots of chord fixes - bf: Chord-name-engraver: find tonic - bf: my-lily-parser: get_chord - pl 26.jcn3 - - bf's: spring spacer end of measure - - bf: tie/slur rods (dankje, lieverd)--- ../lilypond-1.1.26.jcn2/NEWS Mon Feb 1 20:58:27 1999 -++ b/NEWS Tue Feb 2 21:06:00 1999 -@@ -1,3 +1,8 @@ + pl 26.jcn3 - bf's: spring spacer end of measure - bf: tie/slur rods (dankje, lieverd) - bf's: intl/ compile, install, uninstall - pl 26.jcn2 - - enforce {slur,tie}_x_minimum (urg, paper vars?) - - tie listens to tieydirection/ydirection--- ../lilypond-1.1.26.jcn1/NEWS Mon Feb 1 17:49:32 1999 -++ b/NEWS Mon Feb 1 20:58:27 1999 -@@ -1,3 +1,8 @@ pl 26.jcn2 - enforce {slur,tie}_x_minimum (urg, paper vars?) - tie listens to tieydirection/ydirection - bf: tie placement - pl 26.jcn1 - - tutorial fixes - - bf: OrchestralScore should do hara-kiri..25.jcn2 +pl 26.jcn1 + - tutorial fixes + - bf: OrchestralScore should do hara-kiri.. + - bf: makeinfo: + - info in rpm again + - update to yodl pl10, yodl2texinfo fixes + - use --force, .info should always be generated + +********* +pl 26 (feb 1, 99) + +25.jcn2 - bf: staffside axis init - bf: staffmargin stuff. - Timesig C fixes diff --git a/TODO b/TODO index 6c86fab73a..18ca8899f6 100644 --- a/TODO +++ b/TODO @@ -12,6 +12,43 @@ grep for TODO and ugh/ugr/urg TODO before 1.2 + - cf'able ly2dvi tagline. + + - make ly2dvi test page. + + - fix dynamics decently, ie. use kerning & ligatures. Junk +TeX macros. + + + - span bars. ->gallina + +******* +m=\notes\relative c'{ +\voiceone +c1 +\mark "A"; R1*3 \mark "B"; +<{R1*3}{s1 \mark "C";}> +} + +n=\notes\relative c'{ +\voicetwo +c1 | c1 | c1 | c1 | c1 | c1 | c1 | +} + +\score{ + \type StaffGroup < + \type Staff = m <\m> + \type Staff = n <\n> + > + + \paper { + \translator { \OrchestralScoreContext + markScriptPadding = "4.0"; + } + } +} +********* + * junk Text_def, use G_text_item in stead. * junk Script_def @@ -32,13 +69,15 @@ TODO before 1.2 * make a SMOB of Atom and Molecule - * use kerning for dynamics. - * sort out directory stuff. - --prefix option? - -I option per filetype? - kpathsea? + * is \break broken? input/test/hara-kiri.ly + + * fix OrchestralScore and Hara-kiri (i.e., fix Coriolan) + ************** I also found a few bugs: @@ -51,6 +90,14 @@ I also found a few bugs: * support_l_arr_ empty in staff-margin's G_staff_side_item + * todo doc left/rightbeamcount + + + * doc Single_malt_grouping_item + + * ly2dvi/lilypond logfile. + + * remove old preformats in RPM ************ diff --git a/TODO.orig b/TODO.orig deleted file mode 100644 index 05425d7e6e..0000000000 --- a/TODO.orig +++ /dev/null @@ -1,913 +0,0 @@ -Features you cannot find in the doco as working, should be mentioned -here. - -This is an assorted collection of stuff that will be done, might be -done, or is an idea that I want to think about - -Most of the items are marked in the code as well, with full explanation. -grep for TODO and ugh/ugr/urg - -*In a piece such as the Zipoli piece in mutopia/... there is a stray -`8' over every bar line when processed by LilyPond 1.1.25. - -TODO before 1.2 - - * junk Text_def, use G_text_item in stead. - - * junk Script_def - - * fix partial measures in meaningful way. - - * fix AFM for BlueSky AFM files. - - * working notehead style. - - * add scripts to bars eg. |^"bla" - - * relative mode for mi2mu - - * uniformise recent feta contributions. - - use SCM and Molecules for {accordeon stuff, } - - bigger and fatter 4/4 C - - * make a SMOB of Atom and Molecule - - * use kerning for dynamics. - - * sort out directory stuff. - - --prefix option? - - -I option per filetype? - - kpathsea? - -************** -I also found a few bugs: - -* The examples in input/test/bar-scripts.ly and score-bar-scripts.ly - don't work. The problem seems to be that you can't define a - a score identifier and then use it in the \score block. - - - - make separate MF chars for endings of ledger lines, and calc rest of lines. - - * support_l_arr_ empty in staff-margin's G_staff_side_item - - -************ - -How can I specify a chord whose duration is longer than a whole note? - - \type ChordNames { \chord{ A1*2-min } } - -gives me a parse error. And \times doesn't work either. I can't use -a spacer note. So it seems to be impossible to have long chords of -general length. Of course, in the example above I can use \breve. -But what if I want a chord that lasts for 3 whole notes? Or what -about 2.5 whole notes? Is there a mechanism for getting this kind of -length? - - -Why does my second extender request get junked in the following: - -\score{ -< \notes \relative c''{ - a4()b()c()d c()d()b()a } - \type Lyrics \lyrics { - foo1 __ bar2. __ _4 } -> } - -It seems that \cr and \decr don't work any more. - -\score{ - \notes{ - a \cr b \rc c } - \paper{linewidth=-1.;} -} - -Gives me - -qq.ly:3:9: warning: can't find (de)crescendo to end: - a \cr - b \rc c } - - - -Use of semicolons is still rather confusing. They are obligatory -after some types of assignments and illegal after others. - - \property foo=bar illegal - foo = 3 at top level illegal - foo = 3 inside \paper obligatory - foo = \notes{ ...} top level illegal - foo = \translator{ } in \paper obligatory - -As far as I can tell, the sole accomplishment of this syntactic -irregularity is to keep the user as confused as possible. - - -I was trying to get interstaff beams to work and did this: - -\score{ -\type GrandStaff < -\type Staff=one \notes\relative c'{ - \stemup - [c8 c \translator Staff=two \stemup c c] - \translator Staff=one - \stemdown - [ b8 \translator Staff=two a8] - \translator Staff=one - c4 - } -\type Staff=two \notes{ \clef bass; s1 } -> -\paper{ - \translator{ - \GrandStaffContext - minVerticalAlign = 3.0*\staffheight; - maxVerticalAlign = 3.0*\staffheight; - } - linewidth = -1.; -} -} - -The beams are at the right angle, but they aren't in the right place. - - - -******************* - - - * fractional chord durs. - - * hang Item on Spanner - - * remove Interval dim_ from Dimension_cache and rename the struct. - - * do --safe for PS output? - - * convert-mudela --output - - * Staff_margin (with a partial measure.) - - * fix "I've been drinking too much" - - * fix pletvisibility properties: - - bracket on/off/no-bracket-when-beam - - num on/off/no-num-when-beam - - * fix: standchen. - - * junk backlinks? - - * junk text{sharp,flat,etc} - - * fix convert-mudela manpage - - * decimal point in \paper {} - - *{ \voiceone [g''8 fis'' e''] d''4 |} - and=20 - { \voicetwo d'4 d'2.*2/3 } spacing - - * tied notes for MIDI - - * sharp /flat on trills (in MIDI ??) - - * scm-ify \property values. - - * move class Lookup {} into scm - -BUGS: - - * collisions/voices \voiceone \voicetwo are broken; see - input/praeludium-fuga-E.ly - mutopia/J.S.Bach/wtk1-fugue2.ly - - * fix: text on rests: rediculous dims - - * ly2dvi - - bottomnote for ly2dvi - - deps for ly2dvi - - * fix midi output: - - default duration? duration must be not entered - explicitely on first note. - - * turn slope-damping on/off - - * c4 \! \> c4 - - * tremolo stuff - - * gallina barlines. - - * fix height of / collisions with lyrics (chords), - see input/test/vertical-text.ly; input/test/repeat.ly - - * latex bla.tex broken (titles / \lilyfooter stuff?) - - * check/set minimum slur/tie length - - * msgfmt -o check? - - * \breathmark TeX macro - - * catch GUILE errors? - - * add new glyphs to font.ly - - * formatting of input stuff. - - * \notes{ a \< b \cr } vs \notes{ a \< b \! } - - * if possible, it might be nice for a warning to appear if someone does - \translator with no name and without assigning it to an - identifier. - - * space after bars? - - * 'hinterfleisch' before bar (e.g. wtk1-fugue2)? - - * \type Voice \times 2/3 { [c8 c16 c16 c16 c16] } - - * fix singleStaffBracket - - * repeat bars: need distance after ":|" and before "|:" - - Summary of minor spelling irregularities: - - capitalization/use of underscores in property names - - * fix SkipBars -> skipBars - - * \shape 1st dim skipped? - - * fix marks/barnumbers/marginal notes - - * broken scripts: - lbheel = \script { "bheel" 0 0 -1 0 0 } - rbheel = \script { "bheel" 0 0 1 0 0 } - lbtoe = \script { "btoe" 0 0 -1 0 0 } - rbtoe = \script { "btoe" 0 0 1 0 0 } - lfheel = \script { "fheel" 0 0 -1 0 0 } - rfheel = \script { "fheel" 0 0 1 0 0 } - lftoe = \script { "ftoe" 0 0 -1 0 0 } - rftoe = \script { "ftoe" 0 0 1 0 0 } - - and also - - portato= \script { "portato" 0 -1 0 1 0 } - -STUFF - * check out legal/(c) matters for scores. - - * check out GCC signatures? - - * Align_element::padding ? - - * uniformise property names... - - ydirection <-> yDirection - - rather allow '_' in identifiers first (i.e. junk ^ and _), - and do y_direction? - - typo checks on property names? - - * use streambufs and iostream - to provide IO handling for TeX stream, mudela stream, data-file. - - * seriously buffer TeX output (do profile of writing .5 mb TeX file.) - - * strip EXEs before installing - - * zip target for binary windows dist (JBR) - - * junking \skip req in lyrics - - * Language: - - \type -> \context ? - - \translator -> ? - - fix \partial - - \bla {} vs \bla ; - - mix engraver hacking with music ? - - \once\property KEY = VAL - - \addtranslator, \removetranslator - - junk ^ and _ for scripts - - junk _ for lyrics. - - abstract grammar. - - * percussion note heads - - * mi2mu empty staffs. - - * horizontal centering of dynamics - - * \font\fontA=feta20.afm (.afm?) - - * gzip RH manpage - - * stable make/config stuff - - * $DEPENDENCIES_OUTPUT support - - * Xdvi zooming ?! Try to understand GS garbage collection. - gs: Error: /undefined in draw_beam - gs: Operand stack: - - * fix vertical alignment and stafflines - - * GrandStaff needs more work -- I want a single word - `harpsichord' to the left of the grandstaff, not one on each - stave. (Organ staff -- with separate pedal -- but common - properties may be something to think about. Of course for - organ you want to be able to give stop indications on the way - through, so the \property Voice.Instrument would be a stop, - and \property GrandStaff.instrument would be PipeOrgan...) - - * revise the Score_priority_align_engraver concept. It sucks. - - * make new VoiceOne, VoiceTwo, VoiceThree contexts with -ydirection and hshift preset - - * *.yo: fix pod manpage layout legacy - - * text-items clash with stems/beams - - * --include, -I option for ly2dvi (pass on to lily) - - * fix placement of beam-less abbrev - - * \meter 3/4; - <{\voiceone cis4. cis8 cis4 | cis4 cis cis | r1 } - {\voicetwo cis,4 r r | r2. | r1 }> | - } - - * try to use template iso MACRO(Type) - - - NEWS: ... Musical_pitch (analogous to Duration and Rhythmic_req) - think about, analogous to pitch: - * { a4 a16 } c <-- duration of c? - * < a4 b8 > c <-- duration of c? - - * \tempo 4. = 90; - - * fix audio-items (don't use (input) requests, but copy data) - - * make sure all ex's have a mudela-version - - * do rest-collisions for Multi_measure_rests as well. - - * split error/warning in error/warning/non_fatal_error - - * add a Duration_convert member to Duration_iter to set parameters. - Junk global duration settings. - - * minimum length second part broken tie - - * en-,discouraged linebreaking: - - handle DISALLOW < penalty > FORCE - - discourage breaking of slurs - - * fix variable define/lookup parser global<->paper - - * fix title/instrument placements; see input/test/title.ly - - * <\voiceone c4. \voicetwo c4> - - * add full cello suites to web site (kom op, Maarten!) - - * Rethink Time_description - * \cadenza , \meter, \grouping should all be \properties - - * rename - - measure -> bar - - abbrev -> tremolo - - abbreviation-beam -> (measured/unmeasured) tremolo - - partial -> anacrouse - - * shared lib - - * robustify Beam (in case of no stems, 32nd notes) - - * decentralised spring factory - - * move paper vars into engraver properties - - * check for groff / troff/ nroff et - - * more intelligent file searching - - * make LilyPond RPM fully relocatable - - * disable spaces in TeX stuff - - * handle ^C for tmp/file creation. - - * dots & rest collisions. - - * documentation - - introduction? - - info? - - LaTeX? - - more manpages? - - * versioning for Feta - - * the warning about the negative slur/tie length appears twice - which is irritating. - - * The `3' in the meter key is a one or two pixels too thin (at 600dpi) - in the middle: - - * the bracket is ugly (wings are too parabolic, should be more circular) - - * better hshift (dots, distance, head dependent) - - * clefs (AG): The "8" should appear closer to the actual clef, - touching it. - - * put errorlevel in Input class - - * junk nesting slurs - - * integrate midi-elts from mi2mu and lily? - - -3RD PARTY BUGS: -**************** -/* -ICE -*/ -signature S { - int foo (); -}; - -signature V { - S * s(); -}; - - -V*v(); -f () -{ - return v( )->foo (); -} - -/* - - egcs-1.1 - -foo.cc: In function `int f()': -foo.cc:6: label `b' used but not defined -*/ -void -f () -{ - bool b; - if (b && && b) - ; -} -*************** - - * make GCC warn about ctor that leaves member vars uninitialised. - - * GNU diff 2.7: diff -rN does not see a new directory with empty file - - * glibc 2.0: - - f = fopen ("/dev/null", "r") - assert (feof (f)) - -3RD PARTY PROJECTS: - - * GNU patch - - 'double-fix' mode: ignore identical fix, rather than suggest - to revert patch direction when (more or less? exactly) the same - thing is fixed - -PROJECTS - - * Scripts: - - fix position of bar number - - stack scripts in chords: - % fingering: footing: - < a-4 c-2 g-1 > < c-\ltoe e-\lheel > - - script-spacing - - slur parts as a script - - stack parameterised scripts for fingering and footing: - - * convert-mudela: - - automatically add a \version if not present. - - better parsing - - make smarter - - convert-mudela -e empty.ly - - * emacs mudela-mode - - should handle block comments too. - - handle lexer modes (\header, \melodic, \lyric) etc. - - indentation - - notenames? - - fontlock: \melodic \melodic - - * use properties for: - - plet? - - Staff_sym size - - default tempo. - - font size - - bartypes (get rid of derived Span_bar_engravers) - - cadenza mode? - - * page handling: - - PS output - - optimal pagebreaking. - - * Unicode support? -> man 7 unicode - - 16 bit Strings - - -u switch - - detect of 16/8 bit files - - examples to go with it. - - * Spring_spacer: - - write a faster Spring_spacer (without matrices if possible) - - relate energybound to linelen unitspace fontsize etc. - - used fixed point fp? - - * \header - - output header info to MIDI too. - - * a musical dictionary. See Documentation/vocabulary-*, other - languages: - - explanations - - italian - - german - - dutch - - swedish - .. ? - - * chords - - guitar chords (fret diagrams) - - other chord name styles (american(?) style) - - basso continuo - - MIDI output? - - * Debug logs: - - derive lily_stream, Dstream, texstream from ostream? - - indentable stream as baseclass for TeX stream, lily stream, Dstream. - - use dstream feature in mi2mu - - integrate IO checking into stream class - - * input converters - - NIFF? - - ABC? - - SMDL? - - * add to MIDI output: - - tempo change - - ornaments (and trills?) - - repeat/volta - - slurs - - accents - - dynamics - - account for rhythmic position in measure - - etc. - - * grace notes - - make separate class for Grace_*_engravers - (which is at Voice_gravs level) - - make encapsulated spacing problems. - - * accidentals per Voice_group - - * Output class, handles : (smallish) - - help text /(c) notice? - - version line - - warning /errors/progress - - abort on error/warning; exit status - - quiet/ignore-version options - - logfile output - - * elaborate Staff_side baseclass: - - scripts - - text - - slur start/end - - * PS - - speed up PS code. - - PS lines to .eps files - - write custom prolog - - * Output an output format independent (ofi) typeset file; and - make ofi2 TeX, MusiXTex, Display PostScript, PostScript, - Ascii... interpreters. (difficult) - - - NIFF ? - - Common Music Notation - - PostScript output (esp. Beams, Slurs, etc) - - Move all Score_elems, into libmutype.a - - SGML - - * Documentation - - Doc (C) stuff of sheet music - - a better format? SGML? TeX? Info? - - a better tutorial - - * more spanners (smallish) - - Glissando - - trill - - * Rewrite Stem, Beam and Rhythmic_grouping (hairy) - - [c8. c32 c32] - - doc on Rhythmic_grouping - - general shaving on Beam and Stem - - use plet grouping - - separate visual from rhythmic info even more - - beams over bars - - * lines: - - Ledger lines, should be separate item: Ledger_lines, Ledger_lines - - set different line sizes / thicknesses - - beam stem showthrough, inter beam sizes (french vs german style) - - * Collisions - - left/right note balls should be handled by Collision: - < \multi 2; { \stem 1; } { } > - - * Keys: - - merge key{item} & localkey{item}? - - spacing, national styles? - - * Support for TAB - - redo Notehead to allow digits as heads - - add a \tablature {} lexer mode for easy entering - - * should adjust stemlength for flag number. - - * breaking: - - caching breakpoints - - saving them - - specify number of lines - -INPUTLANGUAGE - - * c4 4 4 4 for c4 c4 c4 c4? - - * neatly (and readably) expressing concurrent - voices - - * 4 ? - - * Viola mode? - - @c c g e g - for - c g es g, - - @A c g e g - for - cis gis e gis - - * relative mode for pitch entering - - * configure pitch_byte - - * rest name configurable - -SMALLISH PROJECTS - - * limit memory usage; the full coriolan takes up too much resources. - - * fix confusing naming in Engraver vs Engraver_group_engraver (context) - - * progress when creating MIDI elts. - - * A range for context errors (eg. mark both { and }. ) - - * lyric in staff (sharpsharp in staff, text below) - - * half sharps/flats - - * write Dynamic_line (to group dynamics horizontally) - - * use Real for all y positions. - - use translate_axis( .. ,Y_AXIS) iso separate variables. - - * half-sharps, half-flats - - * adaptive accidental spacing. - - * handle EOF graciously in error messages. - - * declare notenametab? - - * midi esp.: use I32 iso int where 32 bits are needed (or assumed...) - - * stafftypes: voice names/ instrument names. - - * lily \tempo - - * C meter iso 4/4, idem for alla breve, etc. - - * textspanner: center position - - * % toe to bheel four to five - % ^_u 4_5 - % - - % --|x-- --|x-- - % --|--- --|--- - % --|--- --|--- - (where "to" is a tiny bow) - - * auxilliary file for caching info. - - * Text_crescendo - - * clean solution for staffsize in items. - - * revise calcideal - -IDEAS - - * Output data structures of Mudela in XML/SGML. - - * create libmudela, or liblily_frontend - - * move MIDI stuff (including Quantization) to a ANSI C libmidi library. - - * Spacing_request for manually adjusting spacing - - * caching breakpoints - - * used fixedpoint arithmetic for min. energy. - - * move towards incremental algorithms. - - * far fetched language ideas - - design meta-language like TeX and Metafont - - programming/macros input - - * versioning stuff (cvt mudela, mudela, etc.) - - * Klavarskribo? - - * dynamic loading of engravers? - -SMOBS: - -**************************************** -Han-Wen Nienhuys writes: - -> mcmanus@IDT.NET writes: -> > > I want different C++ objects (with scheme embedded) to be linked by -> > > C++ pointers. I want to access these other objects from the Scheme -> > > code, and I want access to these pointers from C++. -> > -> > You can do this with a combination of smob's and primitive functions, -> > though it may not be be exactly what you wanted. You would have one -> > smob for each class in your application, and then you would write a -> > primitive function that would return the objects that are linked to a -> > base object. -> -> And the smob and the C++ class are interlinked? Like -> -> class Foo_class { -> Foo_smob *smob_ptr_; -> } -> -> struct Foo_smob { -> Foo_class *class_ptr_ -> } - -Usually you can get away without having this interlinked structure. -One piece of information you need when exporting objects to scheme is -the smob tag for your class. You might store this value (a long) into -a class static variable, or a file static variable. I'll use a class -static variable in this example. - -I typically use code that works like this (untested code ahead): - -class Foo_class { - static long *Foo_smob_tag; - SCM obj; // representation as a scheme object, description comes later -} - -// call this once on startup -void init_Foo_class { - static scm_smobfuns type_rec; - - type_rec.mark = foo_mark; - type_rec.free = foo_free; - type_rec.print = foo_display; - type_rec.equalp = 0; - Foo_class::Foo_smob_tag = new int(scm_new_smob(type_rec)); -} - -When you want to export an object to scheme, you put a pointer to the -object itself in the cdr of the cell, and the tag in the car of the -cell. The code looks like this: - -// Is this a Foo? -static int -foo_p(SCM obj) -{ - return(SCM_NIMP(obj) && SCM_CAR(obj) == Foo_class::Foo_smob_tag); -} - -// given a Scheme representation, return, a C++ representation -static Foo_class * -foo_unbox(SCM obj) -{ - return((Foo_class*)SCM_CDR(obj)); -} - -// the SCM representation of the object is stored inside itself -// this will become useful when destructor gets called -static SCM -foo_box(Foo_class *foo) -{ - SCM_DEFER_INTS; - SCM_NEWCELL(foo->obj); - SCM_SETCAR(foo->obj, Foo_class::Foo_smob_tag); - SCM_SETCDR(foo->obj, (SCM)foo); - SCM_ALLOW_INTS; - return foo->obj; -} - -> C++ determines life time, so what is the strategy? - -What happens now when the destructor gets called? Lets set the cdr to -NULL, and then check for that in all of the primitive functions that -use your smob. We'll call this notion 'live'; a scheme object is -'live' if the C++ representation still exists, it's dead if the C++ -object is gone. You can still have references to dead objects in -scheme code; it's just an error to use them. This idea is stolen from -Emacs's handling of buffers ('buffer-live-p' and friends). - -Add another function, foo_live_p: - -static int -foo_live_p(SCM obj) -{ - return(foo_p(obj) && SCM_CDR(obj) != NULL); -} - -In you destructor, you need to do: - -~Foo_class() -{ - SCM_CDR(this->obj, NULL); -} - -When writing new primitives, now just check foo_live_p(). - -I hope the above helps, - --russ - - --- -"Even if you are on the right track, you'll get run over -if you just sit there." - --Will Rogers (1879-1935) - -*************************** - -> I am still muddling along with integrating GUILE in LilyPond, and I -> have a question. I want to replace an existing C++ implementation of -> identifier tables by GUILE's code. I've managed to replace -> -> Hash_table -> -> by -> -> Hash_table -> -> and use interning and GUILE symbols for doing the identifier lookup. -> But I'd like to use GUILE's hash tables as well, and that's were my -> question comes in: is there an interface that allows me to iterate -> through the entries of a GUILE hash table? - -I use the following, which should definitely be provided somewhere -in guile, but isn't, AFAIK: - -(define (hash-table-for-each fn ht) - (do ((i 0 (+ 1 i))) - ((= i (vector-length ht))) - (do ((alist (vector-ref ht i) (cdr alist))) - ((null? alist) #t) - (fn (car (car alist)) (cdr (car alist)))))) - -(define (hash-table-map fn ht) - (do ((i 0 (+ 1 i)) - (ret-ls '())) - ((= i (vector-length ht)) (reverse ret-ls)) - (do ((alist (vector-ref ht i) (cdr alist))) - ((null? alist) #t) - (set! ret-ls (cons (fn (car (car alist)) (cdr (car alist))) ret-ls))))) - -If you want a C version, you can run the above code through hobbit, or -tranlate it to C by hand. - --russ - - --- -"Whenever you find yourself on the side of the majority, it is time to -pause and reflect." - -- Mark Twain -*********************** diff --git a/VERSION b/VERSION index 33e070e248..836eecaad1 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=26 -MY_PATCH_LEVEL=jcn4 +PATCH_LEVEL=27 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 52ad9ca67b..0ab043ba56 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -77,11 +77,11 @@ zagers = \type GrandStaff < > > \paper{ + linewidth = 40.0\mm; \translator { \HaraKiriStaffContext } %uh? % \translator { \OrchestralScoreContext } % \translator { \OrchestralPartStaffContext } - linewidth = 40.0\mm; } } diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index e01062ba33..751e7ab15a 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -59,12 +59,12 @@ All_font_metrics::find_tfm (String name) Font_metric * All_font_metrics::find_font (String name) -{ - Font_metric * f= find_afm (name); +{ Font_metric * f=0; + f = find_tfm (name); if (f) return f; - f = find_tfm (name); + f= find_afm (name); if (f) return f; diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 2a28d15410..d36eeb250a 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -102,6 +102,7 @@ Dynamic_engraver::do_process_requests() staff_side_p_ = new G_staff_side_item; staff_side_p_->set_victim (text_p_); + staff_side_p_->axis_ = Y_AXIS; prop = get_property ("dynamicDir", 0); @@ -173,8 +174,10 @@ Dynamic_engraver::do_pre_move_processing() if (to_end_cresc_p_) to_end_cresc_p_->add_support (s_l); if (staff_side_p_) - staff_side_p_->add_support (s_l); - + { + staff_side_p_->add_support (s_l); + // staff_side_p_->dim_cache_[Y_AXIS].parent_l_ = &s_l->dim_cache_[Y_AXIS]; + } typeset_all (); } diff --git a/lily/lookup.cc b/lily/lookup.cc index d63f467384..7efba44136 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -410,8 +410,7 @@ Lookup::text (String style, String text) const } Real w = 0; - Real h = 0; - Real d = 0; + Interval ydims (0,0); Font_metric* afm_l = all_fonts_global_p->find_font (style); DOUT << "\nChars: "; @@ -425,14 +424,13 @@ Lookup::text (String style, String text) const { Character_metric *c = afm_l->get_char (text[i],false); w += c->dimensions()[X_AXIS].length (); - h = h >? c->dimensions()[Y_AXIS].max (); - d = d dimensions()[Y_AXIS].min (); + ydims.unite (c->dimensions()[Y_AXIS]); } } DOUT << "\n" << to_str (w) << "\n"; a.dim_.x () = Interval (0, w); - a.dim_.y () = Interval (d, h); + a.dim_.y () = ydims; a.font_ = font_name_; return a; } diff --git a/lily/stem.cc b/lily/stem.cc index 740cb41666..7c780fadd7 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -49,6 +49,16 @@ Stem::Stem () Interval_t Stem::head_positions () const { + /* + Mysterious FreeBSD fix by John Galbraith. Somehow, the empty intervals + trigger FP exceptions on FreeBSD. Fix: do not return infinity + + */ + if (!head_l_arr_.size ()) + { + return Interval_t (100,-100); + } + Interval_t r; for (int i =0; i < head_l_arr_.size (); i++) { diff --git a/ly/engraver.ly b/ly/engraver.ly index 0b83367fef..6db19042b6 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -134,9 +134,10 @@ GrandStaffContext=\translator{ \name "PianoStaff"; } + \translator { - \type "Line_group_engraver_group"; -% \type "Hara_kiri_line_group_engraver"; + \type "Hara_kiri_line_group_engraver"; +% \type "Line_group_engraver_group"; \consists "Span_bar_engraver"; \consists "Vertical_align_engraver"; \consists "Staff_group_bar_engraver"; @@ -230,7 +231,6 @@ BarNumberingStaffContext = \translator { }; - HaraKiriStaffContext = \translator { \type "Hara_kiri_line_group_engraver"; \name Staff; @@ -252,9 +252,7 @@ HaraKiriStaffContext = \translator { \accepts "Voice"; }; -% huh, Score should do HaraKiri, not Part yes? OrchestralPartStaffContext = \translator { -% \HaraKiriStaffContext \StaffContext barColumnPriority = "0"; marginBreakPriority = "-4"; @@ -262,7 +260,6 @@ OrchestralPartStaffContext = \translator { \consists "Bar_number_engraver"; }; -% where to put HaraKiri here? OrchestralScoreContext= \translator { \type Score_engraver; \name Score; @@ -283,7 +280,7 @@ OrchestralScoreContext= \translator { \accepts "ChoirStaff"; \accepts "StaffGroup"; - \accepts "Staff"; + \accepts "HaraKiriStaff"; \accepts "RhythmicStaff"; \accepts "Lyrics"; \accepts "ChordNames"; diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index d2592ab89a..6f97f56cbe 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -21,7 +21,7 @@ Prereq: tetex make all ln -s /usr/share/texmf/fonts/tfm/public/cm/ tfm -# make -C Documentation info || true +make -C Documentation info || true make htmldoc || true diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index af4745f4fc..bc982d3c17 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.26 -Inschrijf datum: 01FEB99 +Versie: 1.1.27 +Inschrijf datum: 03FEB99 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.1.26.tar.gz + 770k lilypond-1.1.27.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.26.tar.gz + 770k lilypond-1.1.27.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 084f26fbfc..ccea93bd24 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.26 -Entered-date: 01FEB99 +Version: 1.1.27 +Entered-date: 03FEB99 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.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 - 770k lilypond-1.1.26.tar.gz + 770k lilypond-1.1.27.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.26.tar.gz + 770k lilypond-1.1.27.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index d3850e8478..2803e9f36d 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.26 +Version: 1.1.27 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.26.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.27.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys @@ -27,7 +27,7 @@ part extraction. It includes a nice font of musical symbols. make all ln -s /usr/share/texmf/fonts/tfm/public/cm/ tfm -# make -C Documentation info || true +make -C Documentation info || true make htmldoc || true diff --git a/make/toplevel.make.in b/make/toplevel.make.in index 00fcf03754..dae5f960c6 100644 --- a/make/toplevel.make.in +++ b/make/toplevel.make.in @@ -32,7 +32,7 @@ website: htmldoc examples doc++ examples: $(MAKE) CONFIGSUFFIX='www' -C input WWW $(MAKE) CONFIGSUFFIX='www' -C mutopia WWW - tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' -czf $(outdir)/examples.tar.gz `find input mutopia -type d -name 'out-www' -print` + tar --exclude='*.dvi' --exclude='*.tex' --exclude='*.ps' --exclude='*.ppm' -czf $(outdir)/examples.tar.gz `find input mutopia -type d -name 'out-www' -print` CMR10DIR=$(dir $(shell kpsewhich cmr10.tfm))#ugh! Need kpsewhich TEX_TFMDIR=$(CMR10DIR) diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 69c1f018d9..57f966047c 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -14,8 +14,9 @@ LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log)) TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex)) XPM_FONTS = feta20 AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) +TFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tfm)) -ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) +ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES) #PRE_INSTALL=$(MAKE) "$(ALL_GEN_FILES)" INSTALLATION_DIR=$(datadir)/mf/ @@ -25,10 +26,11 @@ INSTALLATION_OUT_DIR=$(datadir)/tex INSTALLATION_OUT_FILES=$(TEXTABLES) INSTALLATION_OUT_DIR1=$(datadir)/afm -INSTALLATION_OUT_FILES1=$(AFM_FILES) +INSTALLATION_OUT_FILES1=$(AFM_FILES) $(TFM_FILES)#ugh INSTALLATION_OUT_DIR2=$(datadir)/ly INSTALLATION_OUT_FILES2=$(LYTABLES) + export MFINPUTS:=.:$(MFINPUTS) include $(depth)/make/stepmake.make diff --git a/mf/feta-din10.mf b/mf/feta-din10.mf index f6f948fe3c..eb5107c5e2 100644 --- a/mf/feta-din10.mf +++ b/mf/feta-din10.mf @@ -117,6 +117,10 @@ fet_beginfont("feta-din", 10); num=-1; xbar:=u; + +save fcode; + +fcode = 101; input feta-ital-f; bar#:=17/36pt#; % lowercase bar thickness @@ -125,6 +129,10 @@ stem#:=58/36pt#; % lowercase stem breadth font_setup; xbar:=.4u; +save fcode; + +fcode = 102; + input feta-ital-f; stem#:=54/36pt#; % lowercase stem breadth hair#:=12/36pt#; % lowercase hairline breadth diff --git a/mf/feta-ital-f.mf b/mf/feta-ital-f.mf index 70faefa106..0272371e23 100644 --- a/mf/feta-ital-f.mf +++ b/mf/feta-ital-f.mf @@ -12,7 +12,8 @@ % cmchar "Italic letter f"; % beginchar("f",max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#); \"Dynamic letter f"; -beginchar(incr num,max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#); +beginchar(fcode ,max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#); + italcorr asc_height#*slant+.75u#; adjust_fit(if monospace:u#,u# else: 0,0 fi); pickup fine.nib; numeric theta; z88=(.5w-.5u,h); z89=(.5w+.5u,-d); theta=angle(z88-z89); diff --git a/mf/feta-ital-m.mf b/mf/feta-ital-m.mf index 5c39492c75..7b59000b69 100644 --- a/mf/feta-ital-m.mf +++ b/mf/feta-ital-m.mf @@ -13,7 +13,8 @@ % beginchar("m",15u#,x_height#,0); \"Dynamic letter m"; % beginchar(incr num,15u#,x_height#,0); -beginchar(incr num,12u#,x_height#,0); +beginchar( 109 ,12u#,x_height#,0); + italcorr 1/3x_height#*slant+.5hair#+.5u#; adjust_fit(if monospace:-1.5u#,-2u# else: 0,0 fi); pickup fine.nib; numeric shaved_stem; shaved_stem=mfudged.stem; diff --git a/mf/feta-ital-p.mf b/mf/feta-ital-p.mf index c9e0cdc888..54b42997fe 100644 --- a/mf/feta-ital-p.mf +++ b/mf/feta-ital-p.mf @@ -12,7 +12,7 @@ % cmchar "Italic letter p"; % beginchar("p",9u#,x_height#,desc_depth#); \"Dynamic letter p"; -beginchar(incr num,9u#,x_height#,desc_depth#); +beginchar(112, 9u#,x_height#,desc_depth#); italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; adjust_fit(0,0); pickup fine.nib; x0=0; x2-.5stem=hround(2.5u-.5stem); hook_in(0,1,2); % opening hook diff --git a/mf/feta-ital-r.mf b/mf/feta-ital-r.mf index 607774e2be..2256905086 100644 --- a/mf/feta-ital-r.mf +++ b/mf/feta-ital-r.mf @@ -12,7 +12,8 @@ % cmchar "Italic letter r"; % beginchar("r",5.5u#+max(1.75u#,flare#),x_height#,0); \"Dynamic letter r"; -beginchar(incr num,5.5u#+max(1.75u#,flare#),x_height#,0); +beginchar( 114 ,5.5u#+max(1.75u#,flare#),x_height#,0); + italcorr x_height#*slant; adjust_fit(if monospace:.25u#,.5u# else: 0,0 fi); pickup fine.nib; x0=0; x2=x3; pos3(stem,0); lft x3l=hround(2.5u-.5stem); y3-.5stem=-oo; diff --git a/mf/feta-ital-s.mf b/mf/feta-ital-s.mf index 60af94b6e5..b0d14d3316 100644 --- a/mf/feta-ital-s.mf +++ b/mf/feta-ital-s.mf @@ -12,7 +12,7 @@ % cmchar "Italic letter s"; % beginchar("s",5.25u#+max(1.75u#,flare#),x_height#,0); \"Dynamic letter s"; -beginchar(incr num,5.25u#+max(1.75u#,flare#),x_height#,0); +beginchar(115 ,5.25u#+max(1.75u#,flare#),x_height#,0); italcorr x_height#*slant-.5u#; adjust_fit(0,0); pickup fine.nib; numeric theta; theta=90-angle(40u,h); slope:=-h/40u; % angle at middle diff --git a/mf/feta-ital-z.mf b/mf/feta-ital-z.mf index 6c0f517aed..ba11a2b047 100644 --- a/mf/feta-ital-z.mf +++ b/mf/feta-ital-z.mf @@ -12,7 +12,7 @@ % cmchar "Italic letter z"; % beginchar("z",5.5u#+max(1.5u#,stem#),x_height#,0); \"Dynamic letter z"; -beginchar(incr num,5.5u#+max(1.5u#,stem#),x_height#,0); +beginchar(122,5.5u#+max(1.5u#,stem#),x_height#,0); italcorr x_height#*slant+.5hair#; adjust_fit(if monospace:.5u#,.5u# else: 0,0 fi); pickup fine.nib; pos1(hair,0); pos2(stem,-90); pos3(vair,-90); pos4(hair,0); diff --git a/mutopia/Coriolan/GNUmakefile b/mutopia/Coriolan/GNUmakefile index ea6d442405..5ce44985d0 100644 --- a/mutopia/Coriolan/GNUmakefile +++ b/mutopia/Coriolan/GNUmakefile @@ -2,11 +2,10 @@ depth = ../.. -# do Coriolan if you have plenty RAM / CPU -#examples=coriolan oboi-part viola-part - -examples= coriolan oboi-part viola-part +# do Coriolan if you have plenty RAM / CPU / quotum +examples= +examples= LOCALSTEPMAKE_TEMPLATES=mutopia include $(depth)/make/stepmake.make diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make index 59c1b1ecc0..d5f7c50f31 100644 --- a/stepmake/stepmake/documentation-targets.make +++ b/stepmake/stepmake/documentation-targets.make @@ -25,7 +25,7 @@ local-WWW: readme-top_FILES-txt readme-top_FILES-html $(OUTHTML_FILES) $(OUTREAD doc: do-doc $(outdir)/$(package).info: $(outdir)/topinfo.texinfo $(OUTTEXINFO_FILES) - $(MAKEINFO) -o $@ $(outdir)/topinfo.texinfo + $(MAKEINFO) --force -o $@ $(outdir)/topinfo.texinfo # what to do here? ifneq ($(strip $(INFO_FILES)),) diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 4e45a880ef..3177c3bd83 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -16,7 +16,7 @@ $(outdir)/%.1: %.texinfo $(texi2man) $(outdir)/%.info: $(outdir)/%.texinfo - $(MAKEINFO) -o $@ $< + $(MAKEINFO) --force -o $@ $< # $(outdir)/%.html: %.texinfo # $(texi2html) diff --git a/tex/dyndefs.tex b/tex/dyndefs.tex index 9ac3dae223..92362ae2a6 100644 --- a/tex/dyndefs.tex +++ b/tex/dyndefs.tex @@ -1,16 +1,18 @@ % dyndefs.tex % - +% +%%UGHGUHGUGHGGUGH JUNK THIS! +%% %\let\dyn\dynfont \def\dyn{\dynfont} -\chardef\dynaf = 0 -\chardef\dynnf = 1 -\chardef\dynnp = 2 -\chardef\dynnm = 3 -\chardef\dynnr = 4 -\chardef\dynns = 5 -\chardef\dynnz = 6 +\chardef\dynaf = 101 +\chardef\dynnf = 102 +\chardef\dynnp = 112 +\chardef\dynnm = 109 +\chardef\dynnr = 114 +\chardef\dynns = 115 +\chardef\dynnz = 122 \def\dynm{\raise .2ex\hbox{\dynnm}} \def\dynmm{\raise .1ex\hbox{\dynnm}} -- 2.39.2