From 38f134e6a20904161c33faa37a67a7994c5e3b75 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 13 May 2005 10:31:02 +0000 Subject: [PATCH] * scm/framework-pdf.scm (Module): remove. * Documentation/topdocs/AUTHORS.texi (AUTHORS): clean up, update. * lily/ambitus-engraver.cc: formatting cleanups. * mf/feta-solfa.mf (Module): remove. * ChangeLog: more details about contributions. --- ChangeLog | 20 ++- Documentation/misc/ChangeLog-1.5 | 5 +- Documentation/misc/ChangeLog-2.1 | 2 +- Documentation/topdocs/AUTHORS.texi | 158 +++++++++++++------ Documentation/topdocs/NEWS.tely | 3 +- THANKS | 2 +- lily/ambitus-engraver.cc | 12 +- mf/feta-solfa.mf | 238 ----------------------------- mf/feta-test-generic.mf | 1 - scm/framework-pdf.scm | 55 ------- 10 files changed, 144 insertions(+), 352 deletions(-) delete mode 100644 mf/feta-solfa.mf delete mode 100644 scm/framework-pdf.scm diff --git a/ChangeLog b/ChangeLog index ef54dedb29..a0074cf42c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-05-13 Han-Wen Nienhuys + + * scm/framework-pdf.scm (Module): remove. + + * Documentation/topdocs/AUTHORS.texi (AUTHORS): clean up, update. + + * lily/ambitus-engraver.cc: formatting cleanups. + + * mf/feta-solfa.mf (Module): remove. + + * ChangeLog: more details about contributions. + 2005-05-12 Han-Wen Nienhuys * lily/align-interface.cc (align_elements_to_extents): warn if @@ -2269,7 +2281,8 @@ 2005-03-01 Jan Nieuwenhuizen - * flower/libc-extension.cc: Tested BSD compile fix (Matthias Neeracher). + * flower/libc-extension.cc: Tested BSD compile fix (Matthias + Neeracher). 2005-02-29 Graham Percival @@ -2572,7 +2585,8 @@ * THANKS: add Steve D - * ttftool/*.c: add TTF -> Type42 conversion library. + * ttftool/*.c: add TTF -> Type42 conversion library. Based on work + by Juliusz Chroboczek. 2005-02-20 Tatsuya Ono @@ -2667,7 +2681,7 @@ 2005-02-11 Han-Wen Nienhuys - * Slur-dash patch by Bertalan. + * lily/slur.cc: Slur-dash patch by Bertalan. * ly/engraver-init.ly (EasyNotation): glyph name dash -> period. diff --git a/Documentation/misc/ChangeLog-1.5 b/Documentation/misc/ChangeLog-1.5 index c561b28b6b..3ac14a47f7 100644 --- a/Documentation/misc/ChangeLog-1.5 +++ b/Documentation/misc/ChangeLog-1.5 @@ -1,4 +1,4 @@ -2002-08-19 Han-Wen Nienhuys + 2002-08-19 Han-Wen Nienhuys * VERSION: release 1.6.0 @@ -1340,7 +1340,7 @@ (quanting): add french beaming support (property french-beaming) (stem_beams): removed. -i2002-07-12 Mats Bengtsson +2002-07-12 Mats Bengtsson * lily/beam.cc (after_line_breaking): Set correct stem lengths also when beam positions are set manually. @@ -4143,6 +4143,7 @@ i2002-07-12 Mats Bengtsson score in a multiscore lilypond-file. 2001-12-09 Rune Zedeler + * lily/lily-guile.cc: Added ly_assoc_front_x() and ly_assoc_cdr() (FIXME: not accessible from guile) diff --git a/Documentation/misc/ChangeLog-2.1 b/Documentation/misc/ChangeLog-2.1 index e73add5d91..8c71ba20ef 100644 --- a/Documentation/misc/ChangeLog-2.1 +++ b/Documentation/misc/ChangeLog-2.1 @@ -5176,7 +5176,7 @@ 2003-08-25 Heikki Junes - * make/lilypond.mandrake.spec.in: syncronize the spec file with + * make/lilypond.mandrake.spec.in: synchronize the spec file with Torbjorn Turpeinen (tobbe@nyvalls.se): fix group, update reqs, package libs separately, fix conflicting php variable out=/dev/vc/ invoking `unset out', declare menus, use only one icon-file, fix diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index 5ff4b766e5..359843d153 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -15,69 +15,137 @@ @chapter AUTHORS This file lists authors of GNU LilyPond, and what they wrote. This -list is alphabetically ordered by surname. Authors are encouraged to -maintain their own entry. +list is alphabetically ordered by surname. This file lists people that +have contributed over 100 lines of code. + + +@c Authors are encouraged to maintain their own entry. + +Core code: @itemize @bullet -@item @email{tca@@gnu.org, Tom Cato Amundsen}, - Accordion symbols, some lilypond-book.py. +@item Erlend Aasland +@item Pal Benko + ancient notation +@item Bernard Hurley + x11 color. @item @email{jiba@@tuxfamily.org, Jean-Baptiste Lamy}, Tablature support. -@item @email{mats.bengtsson@@s3.kth.se, Mats Bengtsson}, - @uref{http://www.s3.kth.se/~mabe/}, - Lots of testing, fixes, general comments and contributions. -@item @email{lconrad@@laymusic.org, Laura Conrad}, - fixes to abc2ly. -@item @email{foka@@debian.org, Anthony Fok}, - Debian package: debian/*. -@item @email{, David González}, - Spanish glossary translations. -@item @email{bjoern.jacke@@gmx.de, Bjoern Jacke}, - German glossary stuff. @item @email{chris@@fluffhouse.org.uk, Chris Jackson}, Piano pedals, Emacs mode indentation, directed arpeggios. -@item @email{nj104@@cus.cam.ac.uk, Neil Jerram}, - Glossary translations. -@item @email{heikki.junes@@hut.fi, Heikki Junes}, - Finnish translations, Emacs- and Vim-mode updates, docs. @item @email{m.krause@@tu-harburg.de, Michael Krause}, Breathing signs. -@item @email{dlatt@@datenrat.de, Dirk Lattermann}, - Minor improvements on accidentals/ties/multi measure rests. @item @email{wl@@gnu.org, Werner Lemberg}, - misc bugfixes, some Beam and Stem code. -@item @email{, Adrian Mariano}, - Reference manual, tutorial fixes, glossary. + @TeX{} glue code. +@item @email{hanwen@@xs4all.nl, Han-Wen Nienhuys}, + @uref{http://www.xs4all.nl/~hanwen/}, + Main author +@item @email{janneke@@gnu.org, Jan Nieuwenhuizen}, + @uref{http://www.xs4all.nl/~jantien/}, + Main author +@item @uref{http://www.ipd.uka.de/~reuter, Jürgen Reuter}, + Ancient notation support (mensural notation, + Gregorian chant notation), ambitus, clusters. +@item Nicolas Sceaux + Scheme macros, \markup syntax + +@item Carl Sorensen + Fret diagrams. +@item @email{rune@@zedeler.dk, Rune Zedeler}, + Auto-accidental code, zigzag glissandi, rest bugfixes, minimum + fret, + + + @code{subdivideBeams}. +@end itemize + +Font + +@itemize @bullet + +@item @uref{http://www.ipd.uka.de/~reuter, Jürgen Reuter}, + Ancient notation font +@item Werner Lemberg + Exact Type1 font outlines for feta, feta-alphabet. +@item @email{chris@@fluffhouse.org.uk, Chris Jackson}, + Arpeggio arrow +@item @email{rune@@zedeler.dk, Rune Zedeler}, +16th and shorter rests, +@item @email{hanwen@@xs4all.nl, Han-Wen Nienhuys}, + @uref{http://www.xs4all.nl/~hanwen/}, + Main author +@item @email{janneke@@gnu.org, Jan Nieuwenhuizen}, + @uref{http://www.xs4all.nl/~jantien/}, + Main author +@item @email{tca@@gnu.org, Tom Cato Amundsen}, + Accordion symbols +@item Arno Waschk + "espressivo" mark + +@end itemize + + +Documentation and examples + +@itemize +@item @email{mats.bengtsson@@s3.kth.se, Mats Bengtsson}, + @uref{http://www.s3.kth.se/~mabe/}, + Example files, documentation + +@item @email{heikki.junes@@hut.fi, Heikki Junes}, + Cleanups in docs and example files + @item @email{scancm@@biobase.dk, Christian Mondrup}, Glossary. -@item @email{tdm@@dds.nl, Tineke de Munnik}, - Dutch website translation. -@item @email{hanwen@@cs.uu.nl, Han-Wen Nienhuys}, - @uref{http://www.cs.uu.nl/~hanwen/}, - Main author (initials: HWN). + +@item @email{hanwen@@xs4all.nl, Han-Wen Nienhuys}, + @uref{http://www.xs4all.nl/~hanwen/}, + Main author @item @email{janneke@@gnu.org, Jan Nieuwenhuizen}, @uref{http://www.xs4all.nl/~jantien/}, - Main author (initials: JCN). -@item @email{pinard@@iro.umontreal.ca, François Pinard}, - @uref{http://www.iro.umontreal.ca/~pinard/}, - Parts of Documentation/user/glossary*, started internationalization stuff. + Main author + @item @email{gperciva@@sfu.ca, Graham Percival}, @uref{http://www.sfu.ca/~gperciva/}, Documenation Editor. -@item @email{portnoy@@ai.mit.edu, Stephen Peters}, - pdf@TeX{} support. -@item @email{glenprideaux@@iname.com, Glen Prideaux}, - Minor bug fixes, lyric-phrasing. -@item @email{Roy.Rankin@@alcatel.com.au, Roy R. Rankin}, - Major extension, fixes to abc2ly, lilypond bug fixes. -@item @uref{http://www.ipd.uka.de/~reuter, Jürgen Reuter}, - Ancient notation support (mensural notation, - Gregorian chant notation), ambitus, clusters. + +@item @email{pinard@@iro.umontreal.ca, François Pinard}, + @uref{http://www.iro.umontreal.ca/~pinard/}, + Parts of Documentation/user/glossary*, started + internationalization stuff. + +@item @email{rune@@zedeler.dk, Rune Zedeler}, + Schumann example. +@end itemize + +Support (distributions, editor support, lilypond-book) + +@itemize +@item @email{foka@@debian.org, Anthony Fok}, + Debian package: debian/*. +@item @email{heikki.junes@@hut.fi, Heikki Junes}, + Emacs- and Vim-mode updates. +@item David Svoboda + what-beat emacs module. + +@end itemize + + +Translations + +@itemize +@item @email{bjoern.jacke@@gmx.de, Bjoern Jacke}, + German glossary translations. +@item @email{nj104@@cus.cam.ac.uk, Neil Jerram}, + Glossary translations. +@item @email{heikki.junes@@hut.fi, Heikki Junes}, + Finnish translations +@item @email{tdm@@dds.nl, Tineke de Munnik}, + Dutch website translation. @item @email{august@@infran.ru, August S. Sigov}, Russian translation. -@item @email{rune@@zedeler.dk, Rune Zedeler}, - Drum notation, beaming and auto-accidental code. Font - updates. Miscellaneous fixes. +@item @email{, David González}, + Spanish glossary translations. @end itemize @bye diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 50d507eb7a..24437a5402 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -196,8 +196,7 @@ Individual objects may be assigned colors, for example, The PostScript backend is now used by default. This backend requires less machinery to run, and gives more consistent results. - -GhostScript 8.x is required for PDF output. Earlier versions may hang +Ghostscript 8.x is required for PDF output. Earlier versions may hang while converting PostScript to PDF. @item diff --git a/THANKS b/THANKS index 2e7e12ca56..b6bd6ff8d5 100644 --- a/THANKS +++ b/THANKS @@ -19,7 +19,6 @@ Christian Hitz David Jedlinsky Erlend Aasland Heikki Junes -Jeff Smith John Williams Jonatan Liljedahl Juergen Reuter @@ -69,6 +68,7 @@ Erik Ronström Fernando Pablo Lopez-Lezcano Gilles Sadowski Jack O'Quin +Jeff Smith Johannes Schindelin Jose Miguel Pasini Josiah Boothby diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index f48668e755..a84f9d65ec 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -55,7 +55,8 @@ Ambitus_engraver::create_ambitus () heads_[d] = make_item ("AmbitusNoteHead", SCM_EOL); accidentals_[d] = make_item ("AmbitusAccidental", SCM_EOL); accidentals_[d]->set_parent (heads_[d], Y_AXIS); - heads_[d]->set_property ("accidental-grob", accidentals_[d]->self_scm ()); + heads_[d]->set_property ("accidental-grob", + accidentals_[d]->self_scm ()); Axis_group_interface::add_element (group_, heads_[d]); Axis_group_interface::add_element (group_, accidentals_[d]); Side_position_interface::add_support (accidentals_[d], heads_[d]); @@ -150,7 +151,9 @@ Ambitus_engraver::finalize () handle = scm_assoc (scm_from_int (p.get_notename ()), start_key_sig_); - int sig_alter = (handle != SCM_BOOL_F) ? scm_to_int (scm_cdr (handle)) : 0; + int sig_alter = (handle != SCM_BOOL_F) + ? scm_to_int (scm_cdr (handle)) : 0; + if (sig_alter == p.get_alteration ()) { accidentals_[d]->suicide (); @@ -158,8 +161,9 @@ Ambitus_engraver::finalize () } else { - accidentals_[d]->set_property ("accidentals", - scm_list_1 (scm_from_int (p.get_alteration ()))); + SCM l = scm_list_1 (scm_from_int (p.get_alteration ())); + accidentals_[d]->set_property ("accidentals", l); + } } while (flip (&d) != DOWN); diff --git a/mf/feta-solfa.mf b/mf/feta-solfa.mf deleted file mode 100644 index 865fe79b9d..0000000000 --- a/mf/feta-solfa.mf +++ /dev/null @@ -1,238 +0,0 @@ -% solfa.mf - implements solfa shaped notes -% -% (c) 2001--2005 Glen Prideaux - -% We can use the regular distorted-elliptical head in the feta font -% for the sol head, but we can't use the triangle or diamond heads for -% the do or me because they're too narrow and their lines too thin. - -fet_begingroup("solfa"); - -noteheight#:=staff_space# + overdone_heads * stafflinethickness#; -define_pixels(noteheight); - -fet_endgroup("solfa") - -def drawdoshape = - save noteshape, noteishape, dx, dy, ai_a, bi_b; - path noteshape, noteishape; - noteshape = noteishape = triangle; - (dx,dy)=(0,0.0); - (ai_a,bi_b)=(i_o,i_o); - draw_solfa_note_shape; -enddef; - - -fet_beginchar("Whole dohead", "s0do") - pickup pencircle scaled blot_diameter; - save a_b, i_o; - a_b = 1.8; - i_o = 0.6; - - drawdoshape; -fet_endchar; - -fet_beginchar("Half dohead", "s1do") - save a_b, i_o; - a_b = 1.5; - i_o = 0.6; - - drawdoshape; -fet_endchar; - -fet_beginchar("Quart dohead", "s2do") - save a_b, noteshape; - path noteshape; - a_b = 1.54; - - noteshape = triangle; - draw_solfa_quarter_note_shape; - -fet_endchar; -save reshape; path reshape; -reshape = (-1,1)--(-1,0.2){down} ... (0,-1) ... {up}(1,0.2)--(1,1)--cycle; - -fet_beginchar("Whole rehead", "s0re") - save a_b, ai_a, bi_b, dx, dy, noteshape, noteishape; - path noteshape, noteishape; - noteshape = reshape; - noteishape = reshape; - a_b = 1.8; - bi_b = 0.65; - ai_a = 0.8; - (dx,dy)=(0,-0.1); - draw_solfa_note_shape; -fet_endchar; - -fet_beginchar("Half rehead", "s1re") - save a_b, ai_a, bi_b, dx, dy, noteshape, noteishape; - path noteshape, noteishape; - noteshape = reshape; - noteishape = reshape; - a_b = 1.5; - bi_b = 0.65; - ai_a = 0.8; - (dx,dy)=(0,-0.1); - draw_solfa_note_shape; -fet_endchar; - -fet_beginchar("Quart rehead", "s2re") - save a_b, noteshape; - path noteshape; - a_b = 1.54; - - noteshape = reshape; - draw_solfa_quarter_note_shape; -fet_endchar; - - - - -% fa - scalene triangle: -% for stem up: (0,h/2) -- (w,h/2) -- (w,-h/2) -- cycle; -% for stem down: (w,-h/2) -- (0,1h/2) -- (0,h/2) -- cycle; -% (one is a 180 degree rotation of the other) -% stem attachment: (doesn't much matter) - -save fashape; path fashape; -fashape = (-1,1)--(1,1)--(1,-1)--cycle; - -fet_beginchar("Whole fahead", "s0fa") - save a_b, ai_a, bi_b, dx, dy, noteshape, noteishape; - path noteshape, noteishape; - noteshape = fashape; - noteishape = fashape; - a_b = 1.8; - bi_b = 0.6; - ai_a = 0.6; - (dx,dy)=(0.2,.05); - draw_solfa_note_shape; -fet_endchar; - -fet_beginchar("Half stemup fahead", "u1fa") - save a_b, ai_a, bi_b, dx, dy, noteshape, noteishape; - path noteshape, noteishape; - noteshape = fashape; - noteishape = fashape; - a_b = 1.5; - bi_b = 0.6; - ai_a = 0.6; - (dx,dy)=(0.2,.05); - draw_solfa_note_shape; -fet_endchar; - -fet_beginchar("Quart stemup fahead", "u2fa") - save a_b, noteshape; - path noteshape; - a_b = 1.54; - - noteshape = fashape; - draw_solfa_quarter_note_shape; -fet_endchar; - -fet_beginchar("Half stemdn fahead", "d1fa") - save a_b, ai_a, bi_b, dx, dy, noteshape, noteishape; - path noteshape, noteishape; - noteshape = fashape rotated 180; - noteishape = fashape rotated 180; - a_b = 1.5; - bi_b = 0.6; - ai_a = 0.6; - (dx,dy)=(-0.2,-.05); - draw_solfa_note_shape; -fet_endchar; - -fet_beginchar("Quart stemdn fahead", "d2fa") - save a_b, noteshape; - path noteshape; - a_b = 1.54; - - noteshape = fashape rotated 180; - draw_solfa_quarter_note_shape; -fet_endchar; - - -% sol - oval ... the standard "round" note - - -% la - rectangle: (0,h/2)--(w,h.2)--(w,-h/2)--(0,-h/2)--cycle; -% stem attachment: (doesn't much matter) -save lashape; path lashape; -lashape = (-1,-1)--(-1,1)--(1,1)--(1,-1)--cycle; - -fet_beginchar("Whole lahead", "s0la") - save a_b, ai_a, bi_b, dx, dy, noteshape, noteishape; - path noteshape, noteishape; - noteshape = lashape; - noteishape = lashape; - a_b = 1.8; - bi_b = 0.6; - ai_a = 0.85; - (dx,dy)=(0,0); - draw_solfa_note_shape; -fet_endchar; - -fet_beginchar("Half lahead", "s1la") - save a_b, ai_a, bi_b, dx, dy, noteshape, noteishape; - path noteshape, noteishape; - noteshape = lashape; - noteishape = lashape; - a_b = 1.5; - bi_b = 0.6; - ai_a = 0.85; - (dx,dy)=(0,0); - draw_solfa_note_shape; -fet_endchar; - -fet_beginchar("Quart lahead", "s2la") - save a_b, noteshape; - path noteshape; - a_b = 1.54; - - noteshape = lashape; - draw_solfa_quarter_note_shape; -fet_endchar; - - - -% ti - an "icecream cone" with about 2/3 of -% the height in the cone and only 1/3 in the curved top: -% (0,h/6)--(w/2,-h/2)--(w,h/6)..(w/2,h/2)..cycle; -% stem attachment: h/6 -save tishape; path tishape; -tishape = (0,-1)--(-1,0.3)..(0,1)..(1,0.3)--cycle; - -fet_beginchar("Whole tihead", "s0ti") - save a_b, ai_a, bi_b, dx, dy, noteshape, noteishape; - path noteshape, noteishape; - noteshape = tishape; - noteishape = tishape; - a_b = 1.8; - bi_b = 0.75; - ai_a = 0.75; - (dx,dy)=(0,-.02); - draw_solfa_note_shape; -fet_endchar; - -fet_beginchar("Half tihead", "s1ti") - save a_b, ai_a, bi_b, dx, dy, noteshape, noteishape; - path noteshape, noteishape; - noteshape = tishape; - noteishape = tishape; - a_b = 1.5; - bi_b = 0.75; - ai_a = 0.75; - (dx,dy)=(0,-.02); - draw_solfa_note_shape; -fet_endchar; - -fet_beginchar("Quart tihead", "s2ti") - save a_b, noteshape; - path noteshape; - a_b = 1.54; - - noteshape = tishape; - draw_solfa_quarter_note_shape; -fet_endchar; - - diff --git a/mf/feta-test-generic.mf b/mf/feta-test-generic.mf index 96bb44e36a..60e9a222fc 100644 --- a/mf/feta-test-generic.mf +++ b/mf/feta-test-generic.mf @@ -15,4 +15,3 @@ input feta-klef; %input feta-timesig; %input feta-pendaal; %input feta-accordion; -% input feta-solfa; diff --git a/scm/framework-pdf.scm b/scm/framework-pdf.scm deleted file mode 100644 index 94e01ffec0..0000000000 --- a/scm/framework-pdf.scm +++ /dev/null @@ -1,55 +0,0 @@ -;; WIP - -(define-module (scm framework-pdf)) - -(use-modules (ice-9 regex) - (ice-9 string-fun) - (ice-9 format) - (guile) - (srfi srfi-1) - (srfi srfi-13) - (lily)) - -(define framework-pdf-module (current-module)) - -;;(define pdebug stderr) -(define (pdebug . rest) #f) - -(define (pdf-ify lst) - (cond - ((pair? lst) - (cons (pdf-ify (car lst)) (pdf-ify (cdr lst)))) - ((vector? lst) - (vector-for-each pdf-ify lst)) - ((ly:pdf-object? lst) lst) - ((or - (string? lst) - (number? lst) - (symbol? lst)) - (pdf-ify lst)) - - (else - (ly:make-pdf-object '(null))))) - -(define (make-page-object parent contents) - (ly:make-pdf-object - (cons 'dictionary - (pdf-ify - `((Type . Page) - (Parent . ,parent) - (Contents . ,contents)))))) - -(define (make-page-node root)) - - -(define-public (output-framework basename book scopes fields) - (let* ((filename (format "~a.pdf" basename)) - (pdf (ly:open-pdf-file filename)) - (outputter - (ly:make-paper-outputter (format "~a.bla.pdf" basename) "pdf")) - (paper (ly:paper-book-paper book)) - (pages (ly:paper-book-pages book)) - (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t)) - (page-number (1- (ly:output-def-lookup paper 'firstpagenumber))) - (page-count (length pages)) - (port (ly:outputter-port outputter))))) -- 2.39.2