From ecc78dcec0897404eb18f103a82d7b192184084b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 18 Nov 1999 18:33:08 +0100 Subject: [PATCH] release: 1.3.7 --- AUTHORS.txt | 69 +++++ CHANGES | 28 +++ Documentation/bibliography/engraving.bib | 2 +- Documentation/index.texi | 6 +- Documentation/links.texi | 6 +- Documentation/misc/index.texi | 2 +- Documentation/topdocs/AUTHORS.texi | 3 +- Documentation/topdocs/INSTALL.texi | 11 +- Documentation/user/lilypond.tely | 2 +- Documentation/user/mudela-book.tely | 72 +++++- INSTALL.txt | 6 +- VERSION | 2 +- input/test/auto-staff-switch.ly | 2 +- input/test/banter-chords.ly | 2 +- input/test/bar-scripts.ly | 2 +- input/test/beam-chord.ly | 2 +- input/test/beam-cross-staff.ly | 2 +- input/test/beam-isknee.ly | 2 +- input/test/beam-pos.ly | 2 +- input/test/beams.ly | 2 +- input/test/breathing-sign.ly | 2 +- input/test/broken.ly | 2 +- input/test/chord-inversion.ly | 2 +- input/test/chord-table.ly | 2 +- input/test/chords.ly | 2 +- input/test/clefs.ly | 2 +- input/test/collisions.ly | 2 +- input/test/defaultbars.ly | 2 +- input/test/dotted-slur.ly | 2 +- input/test/extender.ly | 2 +- input/test/extra-staff.ly | 2 +- input/test/font-body.ly | 2 +- input/test/font.ly | 2 +- input/test/font16.ly | 2 +- input/test/font20.ly | 2 +- input/test/gmsusd.ly | 2 +- input/test/gourlay.ly | 2 +- input/test/hara-kiri-switch.ly | 2 +- input/test/hara-kiri.ly | 2 +- input/test/hyphen.ly | 2 +- input/test/incipit.ly | 2 +- input/test/keys.ly | 2 +- input/test/keys2.ly | 2 +- input/test/knee.ly | 2 +- input/test/lyric-combine.ly | 2 +- input/test/mark.ly | 2 +- input/test/memory.ly | 2 +- input/test/multi-rest.ly | 2 +- input/test/noteheadstyle.ly | 2 +- input/test/notemode-chords.ly | 2 +- input/test/orchestscore.ly | 2 +- input/test/ossia.ly | 2 +- input/test/rest-collision.ly | 2 +- input/test/scripts.ly | 2 +- input/test/sleur.ly | 2 +- input/test/slur-cross-staff.ly | 2 +- input/test/slur-damping.ly | 2 +- input/test/slurs.ly | 2 +- input/test/spacing-2.ly | 2 +- input/test/spacing.ly | 2 +- input/test/span-bars.ly | 2 +- input/test/staff-margin.ly | 2 +- input/test/staff-side-slur.ly | 2 +- input/test/staff-size.ly | 6 +- input/test/stem-tremolo.ly | 2 +- input/test/stem.ly | 2 +- input/test/tchaikovsky.ly | 2 +- input/test/test-lyrics.ly | 2 +- input/test/thumb.ly | 2 +- input/test/title.ly | 2 +- input/test/transposition.ly | 2 +- input/test/tup.ly | 2 +- input/test/vertical-align.ly | 2 +- input/test/vertical-text.ly | 2 +- lily/include/paper-stream.hh | 2 +- lily/lily-guile.cc | 8 + lily/paper-outputter.cc | 81 ++++-- lily/paper-stream.cc | 11 +- lily/stem-info.cc | 14 +- ly/generic-paper.ly | 2 +- ly/init.sly | 2 +- make/lilypond.spec.in | 3 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 7 +- make/toplevel.make.in | 2 +- mutopia/E.Satie/gnossienne-4-autochange.ly | 2 +- mutopia/E.Satie/gnossienne-4.ly | 4 +- mutopia/E.Satie/petite-ouverture-a-danser.ly | 6 +- mutopia/F.Schubert/standchen.ly | 14 +- mutopia/J.S.Bach/Duette/global-i.ly | 2 +- mutopia/J.S.Bach/Duette/global-ii.ly | 2 +- mutopia/J.S.Bach/Duette/viola-i.ly | 2 +- mutopia/J.S.Bach/Duette/viola-ii.ly | 2 +- mutopia/J.S.Bach/Duette/viola-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-i.ly | 2 +- mutopia/J.S.Bach/Duette/violino-ii.ly | 4 +- mutopia/J.S.Bach/Duette/violino-part.ly | 2 +- mutopia/J.S.Bach/Duette/violino-viola.ly | 2 +- .../J.S.Bach/Duette/violino-violoncello.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-i.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-ii.ly | 2 +- mutopia/J.S.Bach/Duette/violoncello-part.ly | 2 +- .../J.S.Bach/Petites-Preludes/preludes-5.ly | 2 +- .../Petites-Preludes/preludes-score.ly | 1 + .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 4 +- .../J.S.Bach/Solo-Cello-Suites/gigue-viola.ly | 4 +- .../Solo-Cello-Suites/menuetto-cello.ly | 5 +- .../Solo-Cello-Suites/menuetto-viola.ly | 6 +- mutopia/N.W.Gade/score.ly | 11 +- .../horn-concerto-3/horn-concerto-3.ly | 2 +- ps/lily.ps | 3 +- ps/lilyponddefs.ps | 2 +- scm/generic-property.scm | 1 + scm/lily.scm | 190 ++++++++------ scripts/convert-mudela.py | 9 + scripts/ly2dvi.py | 2 +- scripts/mudela-book.py | 6 +- stepmake/CHANGES | 5 + stepmake/VERSION | 2 +- stepmake/bin/add-html-footer.py | 36 +-- stepmake/bin/ls-latex.py | 236 +++++++++++------- stepmake/bin/package-diff.py | 8 +- stepmake/bin/package-zet.sh | 2 +- stepmake/make/out/stepmake.lsm | 8 +- stepmake/make/out/stepmake.spec | 4 +- stepmake/stepmake/yodl-targets.make | 1 + stepmake/stepmake/yodl-vars.make | 2 + 127 files changed, 706 insertions(+), 377 deletions(-) create mode 100644 AUTHORS.txt create mode 100644 stepmake/stepmake/yodl-targets.make diff --git a/AUTHORS.txt b/AUTHORS.txt new file mode 100644 index 0000000000..e0544a6241 --- /dev/null +++ b/AUTHORS.txt @@ -0,0 +1,69 @@ + + +AUTHORS - who did what on GNU LilyPond? +*************************************** + + This file lists authors of GNU LilyPond, and what they wrote. This +list is alphabetically ordered. + + * Tom Cato Amundsen , cembalo-partita in + mudela, accordion symbols, some mudela-book.py + + * Mats Bengtsson , + `http://www.s3.kth.se/~matsb/' lots of testing, fixes, general + comments and contributions. + + * Eric Bullinger , accidental transposition. + + * Laura Conrad (lconrad@world.std.com) fixes to abc2ly + + * Jan Arne Fagertun , TeX + titling and lytodvi.sh + + * Anthony Fok , debian package: debian/* + + * Bjoern Jacke german glossary stuff. + + * Neil Jerram . parts of + Documentation/Vocab* + + * Donald Ervin Knuth, `http://www-cs-staff.stanford.edu/~knuth/' + mf/ital-*.mf (these were taken from the CM fonts) + + * Michael Krause , breathing signs + + * Werner Lemberg , misc bugfixes, some Beam and Stem + code. + + * David R. Linn , Mailing list + maintenance. + + * Adrian Mariano <> Reference manual, tutorial fixes, glossary. + + * Han-Wen Nienhuys , + `http://www.cs.uu.nl/~hanwen/' Main author (initials: HWN). + + * Jan Nieuwenhuizen , + `http://www.xs4all.nl/~jantien/' Main author (initials: JCN). + + * Alexandre Oliva , + `http://sunsite.unicamp.br/~oliva/' testing + + * Francois Pinard , parts of + Documentation/Vocab*, started internationalization stuff + + * Stephen Peters , pdfTeX support + + * Glen Prideaux , minor bug fix to + script used to generate doc++ documentation + + * Roy R. Rankin , major extension, + fixes to abc2ly, lilypond bug fixes + + * Jeffrey B. Reed , Windows-NT support. + + * Shay Rojanski Some mudela source. + + Your name could be here! If you want to fix something, do it, and +send us a patch! + diff --git a/CHANGES b/CHANGES index 97960cac4e..1f9988ce1f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,31 @@ + +pl 6.uu2 + - bf: PS font selecting. + +pl 6.uu1 + - bf: ls-latex + - mudela-book --no-pictures + - bf: ly2dvi + - convert-mudela: beamAuto moment syntax. + +pl 6.jcn3 + - fixed scm output + +pl 6.jcn2 + - half-baken ly-gulp-file in scm + - resurrected scm output through guile + +pl 5.mb1 + - bf: version of init.sly, init.fly + - Clarify necessary version of texinfo + - bf: texi files, minor errors and syntax compatible with + older makeinfo + +pl 6.jcn1 + - bf: scm output + +******* + pl 5.hwn2 - Bach preludes: mutopification - dots are Directional_element too; use \property dotDirection diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib index c77ebdb40c..8a5d828289 100644 --- a/Documentation/bibliography/engraving.bib +++ b/Documentation/bibliography/engraving.bib @@ -316,7 +316,7 @@ year={1989} @Book{tyboni94:_noter_handb_i_tradit_noter, - author = {B\"oje Tyboni}, + author = {B\"orje Tyboni}, title = {Noter Handbok I Traditionell Notering}, publisher = {Gehrmans Musikf\"orlag}, year = 1994, diff --git a/Documentation/index.texi b/Documentation/index.texi index 0187a0a409..c01dbf6857 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -7,7 +7,7 @@ @unnumberedsubsec Introduction -@itemize +@itemize @bullet @item @uref{DEDICATION.txt,Dedication} @item @uref{../topdocs/out-www/AUTHORS.html, Authors} @item @uref{../topdocs/out-www/README.html, Readme file} @@ -29,7 +29,7 @@ @unnumberedsubsec Status -@itemize +@itemize @bullet @item @uref{TODO.txt, Thing to do} @item @uref{CHANGES.txt, Things recently done} @end itemize @@ -42,7 +42,7 @@ @end itemize @unnumberedsubsec Logo: -@itemize +@itemize @bullet @item @uref{../pictures/out-www/lelieblond.png, logo} in large size @item @uref{../pictures/out-www/lelie-logo.png, logo} in medium size @item @uref{../pictures/out-www/lelie-icon.png, logo} in small size diff --git a/Documentation/links.texi b/Documentation/links.texi index 52969f60b4..233bedb10e 100644 --- a/Documentation/links.texi +++ b/Documentation/links.texi @@ -10,7 +10,7 @@ users. @unnumberedsubsec Music -@itemize +@itemize @bullet @item @uref{http://www.geocities.com/Vienna/Studio/1714/} and @uref{http://johnsankey.webjump.com/} John Sankey has taken up the task of recording classical @@ -26,7 +26,7 @@ users. @unnumberedsubsec Software -@itemize +@itemize @bullet @item @uref{http://www.zib.de/Visual/software/doc++/index.html} A documentation system for C++ sources, which is used for the LilyPond sources. @@ -38,7 +38,7 @@ users. @unnumberedsubsec Philosophy -@itemize +@itemize @bullet @item @uref{http://www.gnu.org/} LilyPond is part of the GNU Project. The GNU project is the name of Richard Stallman's effort to create a freely available diff --git a/Documentation/misc/index.texi b/Documentation/misc/index.texi index 1f64da664e..15ea23440b 100644 --- a/Documentation/misc/index.texi +++ b/Documentation/misc/index.texi @@ -6,7 +6,7 @@ @top Miscellaneous texts -@itemize +@itemize @bullet @item @uref{CHANGES-0.0.txt, Change logs from 0.0 till 0.1 } @item @uref{CHANGES-0.1.txt, Change logs from 0.1 till 1.0 } @item @uref{CHANGES-1.0.txt, Change logs from 1.0 till 1.1 } diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index 5a6d60917b..7dc58f37de 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -52,8 +52,9 @@ list is alphabetically ordered. @item @email{oliva@@dcc.unicamp.br, Alexandre Oliva}, @uref{http://sunsite.unicamp.br/~oliva/} testing -@item @email{pinard@@iro.umontreal.ca, Franc@,ois Pinard}, +@item @email{pinard@@iro.umontreal.ca, Francois Pinard}, parts of Documentation/Vocab*, started internationalization stuff +@c urg: @c,{} in @email{} barfs. @item @email{portnoy@@ai.mit.edu,Stephen Peters}, pdfTeX support @item @email{glenprideaux@@iname.com, Glen Prideaux}, minor bug fix to script used to generate doc++ documentation diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index f4cd0c6efd..bf9bce87a1 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -72,7 +72,8 @@ Check out @uref{ftp://ftp.gnu.org/flex/,ftp://ftp.gnu.org/flex/}. @item Bison (version 1.25 or newer). Check out @uref{ftp://ftp.gnu.org/bison/,ftp://ftp.gnu.org/bison/}. -@item Texinfo. Check out @uref{ftp://ftp.gnu.org/pub/texinfo/,ftp://ftp.gnu.org/pub/texinfo/}. +@item Texinfo (version 4.0 or newer). +Check out @uref{ftp://ftp.gnu.org/pub/texinfo/,ftp://ftp.gnu.org/pub/texinfo/}. Most documentation is in texinfo. @item The geometry package for LaTeX is needed to use ly2dvi. @@ -369,7 +370,7 @@ Known bugs that are not LilyPond's fault are documented here. @unnumbered LinuxPPC Bugs: -@itemize +@itemize @bullet @item egcs-1.1.2-12c (stock LinuxPPC R5) has a serious bug, upgrade to fixed in egcs-1.1.2-12f or gcc-2.95-0a, @uref{ftp://dev.linuxppc.org/users/fsirl/R5/RPMS/ppc/} @@ -382,7 +383,7 @@ Lily herself will break. @unnumbered Linux-i386 -@itemize +@itemize @bullet @item SuSE6.2 and similar platforms (glibc 2.1, libstdc++ 2.9.0) Lily will crash during parsing (which suggests a C++ library @@ -425,7 +426,7 @@ versions (LinuxPPC feb '98, RedHat 4.x). @unnumbered Solaris: -@itemize +@itemize @bullet @item Sparc64/Solaris 2.6, GNU make-3.77 GNU make-3.77 is buggy on this platform, upgrade to 3.78.1 or newer. @@ -439,7 +440,7 @@ Not yet resolved. @unnumbered AIX -@itemize +@itemize @bullet @item AIX 4.3 ld The following is from the gcc install/SPECIFIC file. diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 1567ec748e..24e06721ab 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -5,7 +5,7 @@ @titlepage -@title LilyPond +@title LilyPond Reference Manual @subtitle The GNU Project Typesetter @author Han-Wen Nienhuys, Jan Nieuwenhuizen and Adrian Mariano diff --git a/Documentation/user/mudela-book.tely b/Documentation/user/mudela-book.tely index 10f115a116..37299dc14e 100644 --- a/Documentation/user/mudela-book.tely +++ b/Documentation/user/mudela-book.tely @@ -1,6 +1,74 @@ \input texinfo @c -*-texinfo-*- -@setfilename reference-manual.info -@settitle Reference Manual +@setfilename mudela-book.info +@settitle mudela-book Manual + + +@titlepage +@title mudela-book Manual +@subtitle Integrating mudela with LateX and TeXinfo +@author Tom Cato Amundsen and Han-Wen Nienhuys + + Copyright @copyright 1999 by the authors + +@vskip 0pt plus 1filll + +Permission is granted to make and distribute verbatim +copies of this manual provided the copyright notice and +this permission notice are preserved on all copies. + +Permission is granted to copy and distribute modified +versions of this manual under the conditions for +verbatim copying, provided also that the sections +entitled ``Copying'' and ``GNU General Public License'' +are included exactly as in the original, and provided +that the entire resulting derived work is distributed +under the terms of a permission notice identical to this +one. + +Permission is granted to copy and distribute +translations of this manual into another language, +under the above conditions for modified versions, +except that this permission notice may be stated in a +translation approved by the Free Software Foundation. + +@end titlepage + +@ifinfo +This file documents GNU LilyPond. + +Copyright 1999 Tom Cato Amundsen and Han-Wen Nienhuys + + +Permission is granted to make and distribute verbatim +copies of this manual provided the copyright notice and +this permission notice are preserved on all copies. + +@ignore +Permission is granted to process this file through TeX +and print the results, provided the printed document +carries a copying permission notice identical to this +one except for the removal of this paragraph (this +paragraph not being relevant to the printed manual). + +@end ignore + +Permission is granted to copy and distribute modified +versions of this manual under the conditions for +verbatim copying, provided also that the sections +entitled ``Copying'' and ``GNU General Public License'' +are included exactly as in the original, and provided +that the entire resulting derived work is distributed +under the terms of a permission notice identical to this +one. + +Permission is granted to copy and distribute +translations of this manual into another language, +under the above conditions for modified versions, +except that this permission notice may be stated in a +translation approved by the Free Software Foundation. + +@end ifinfo + @node Top, , , (dir) @top diff --git a/INSTALL.txt b/INSTALL.txt index b4ed349865..cb25f178c1 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -66,9 +66,9 @@ Prerequisites * Bison (version 1.25 or newer). Check out ftp://ftp.gnu.org/bison/ (ftp://ftp.gnu.org/bison/). - * Texinfo. Check out ftp://ftp.gnu.org/pub/texinfo/ - (ftp://ftp.gnu.org/pub/texinfo/). Most documentation is in - texinfo. + * Texinfo (version 4.0 or newer). Check out + ftp://ftp.gnu.org/pub/texinfo/ (ftp://ftp.gnu.org/pub/texinfo/). + Most documentation is in texinfo. * The geometry package for LaTeX is needed to use ly2dvi. Available at diff --git a/VERSION b/VERSION index 499da9327a..2f0e519cda 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=6 +PATCH_LEVEL=7 MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/input/test/auto-staff-switch.ly b/input/test/auto-staff-switch.ly index cd4e3f27e4..5439d0241d 100644 --- a/input/test/auto-staff-switch.ly +++ b/input/test/auto-staff-switch.ly @@ -35,4 +35,4 @@ }} -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index 27d9d30bb8..77ef6e5f06 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \header{ enteredby = "jcn"; diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index 244941017d..808d7b9186 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; onestaff = \context Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index 9632cff782..26d9920c70 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-cross-staff.ly b/input/test/beam-cross-staff.ly index 7b098fd15b..27e00e64b2 100644 --- a/input/test/beam-cross-staff.ly +++ b/input/test/beam-cross-staff.ly @@ -30,4 +30,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 979bff7762..3be056715d 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -21,4 +21,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly index b111d5001e..edcd5e9253 100644 --- a/input/test/beam-pos.ly +++ b/input/test/beam-pos.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\transpose c''{ diff --git a/input/test/beams.ly b/input/test/beams.ly index ca5100b1ab..d73c211332 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.3.4"; +\version "1.3.5"; \score{ < diff --git a/input/test/breathing-sign.ly b/input/test/breathing-sign.ly index 1f44591a0f..da77f7b461 100644 --- a/input/test/breathing-sign.ly +++ b/input/test/breathing-sign.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score { \notes \relative c' { diff --git a/input/test/broken.ly b/input/test/broken.ly index 54afc678e5..55d23edbed 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.4"; +\version "1.3.5"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index 5473e1f6e9..1de6ac3c50 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -20,4 +20,4 @@ inversions = \notes\transpose c''\chords{ > } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index c42e61bb12..04534576fa 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -41,4 +41,4 @@ tab = \notes\transpose c'''\chords{ } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/chords.ly b/input/test/chords.ly index d2ad6261cd..9c00e7f71e 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; %{ Would this be acceptable/good enough/convenient for entry? diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 5698f18caa..726e7fe9e3 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score { \notes{ diff --git a/input/test/collisions.ly b/input/test/collisions.ly index ddfb6fd32a..46e7c42e7e 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,7 +5,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.3.4"; +\version "1.3.5"; twovoice = \context Staff \notes < \context Voice=i { \stemdown c4 d e f g2~ g4 a [c8 d e f] c2| } diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index 3012e1f52e..434590731f 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score { diff --git a/input/test/dotted-slur.ly b/input/test/dotted-slur.ly index 663debb068..d6e63b23d0 100644 --- a/input/test/dotted-slur.ly +++ b/input/test/dotted-slur.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes{ diff --git a/input/test/extender.ly b/input/test/extender.ly index 594b0ed0e8..cce1ba02c4 100644 --- a/input/test/extender.ly +++ b/input/test/extender.ly @@ -5,4 +5,4 @@ > } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 68dfaf3125..ac340aed20 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -42,4 +42,4 @@ extra-staff.ly: } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/font-body.ly b/input/test/font-body.ly index 7e1a3dd1ff..9f8c70c30a 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 929ce40fc5..0aef283cba 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.4"; +\version "1.3.5"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 753f2cf8e3..8b0a2d1ba1 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.4"; +\version "1.3.5"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index 92ba14edc2..60bbb05da8 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -17,5 +17,5 @@ TestedFeatures = gourlay_maxmeasures =5.; } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/gmsusd.ly b/input/test/gmsusd.ly index 9d1f86f647..4e8ac8a0d9 100644 --- a/input/test/gmsusd.ly +++ b/input/test/gmsusd.ly @@ -3,7 +3,7 @@ % perhaps the current modifier approach is too simplistic -\version "1.3.4"; +\version "1.3.5"; gmsus=\notes\relative c \chords{ g1 diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index ae04bf9f9e..784eaff039 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; %{ diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index ecbf1ba2f0..8680850bb2 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; voiceOne = \notes \relative c'' { a1 a a diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index e7a968c567..dc0bcd1f98 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; toeter_i = \notes\relative c <{ \property Staff.instrument = "Toeters" diff --git a/input/test/hyphen.ly b/input/test/hyphen.ly index c0e9d5a096..26558228e0 100644 --- a/input/test/hyphen.ly +++ b/input/test/hyphen.ly @@ -5,7 +5,7 @@ > } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 482bc50876..3d06b9be56 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.3.4"; +\version "1.3.5"; incipit = \notes\relative c'{ diff --git a/input/test/keys.ly b/input/test/keys.ly index ff84c866d0..f173024633 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; %{ test key itemv breaking diff --git a/input/test/keys2.ly b/input/test/keys2.ly index 168dcd3032..bbef861b3c 100644 --- a/input/test/keys2.ly +++ b/input/test/keys2.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; blah = \notes { diff --git a/input/test/knee.ly b/input/test/knee.ly index 140006c1e8..eee5e3887e 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly index 19a347082d..3c63f9f257 100644 --- a/input/test/lyric-combine.ly +++ b/input/test/lyric-combine.ly @@ -7,7 +7,7 @@ enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } -\version "1.3.4"; +\version "1.3.5"; m =\notes \relative c'' { \property Staff.automaticMelismata = ##t diff --git a/input/test/mark.ly b/input/test/mark.ly index 7cc6b75cc2..6b82ae50d4 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; global = \notes { s1 | \mark "A"; diff --git a/input/test/memory.ly b/input/test/memory.ly index 5ac6035362..ba5bead23e 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -11,5 +11,5 @@ bla = \notes { > \paper { Gourlay_maxmeaures = 2.; } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index ababf37326..e6761b7fb9 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; voice_one = \notes\transpose c''{ \stemup R1 * 2 | f'4-. r r2 | R1 * 3 | diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index f772a5c03d..d89e365530 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -26,4 +26,4 @@ c4 c2 c8 c16 c16 c1 } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 03f2f6f866..56e220ce04 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index f4ccc6fe1e..5bda50efe0 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; m = \notes \relative c''{ c1 | c2 c | c c | c c | c c | c c | c c | c c | diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 7809c6578b..6fcd07e08f 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; \score { diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index c55e003f74..de22b4a611 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -38,4 +38,4 @@ restsII = \context Staff \notes { } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/scripts.ly b/input/test/scripts.ly index fee2ddbd59..73eb6c0455 100644 --- a/input/test/scripts.ly +++ b/input/test/scripts.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; blah = \notes{ \transpose c'' { diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 184240a7bf..f9f6cd1d8f 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.3.4"; +\version "1.3.5"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-cross-staff.ly b/input/test/slur-cross-staff.ly index 5304af6ab5..e0eca072b6 100644 --- a/input/test/slur-cross-staff.ly +++ b/input/test/slur-cross-staff.ly @@ -36,4 +36,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 0ed40df697..4a505be00b 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\relative c'{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index fc3a2cd7da..0c956ea94c 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 34034f0831..0488af9387 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -33,4 +33,4 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index 305c913de1..401725c56a 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.3.4"; +\version "1.3.5"; multipart = \notes \relative c'{ \context StaffGroup < diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index b0edad672d..e653b0b2d5 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < \context Staff = stone { \nt } diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly index 5dac9ee680..f2e5edf033 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -1,6 +1,6 @@ -\version "1.3.4"; +\version "1.3.5"; \score { diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index 89d7a4b456..61df82d328 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -18,4 +18,4 @@ } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index e983315c6b..37046fc5f0 100644 --- a/input/test/staff-size.ly +++ b/input/test/staff-size.ly @@ -4,14 +4,14 @@ \property Staff.fontSize = #-1 \property Voice.fontSize = #-1 - \property Voice . dynamicDirectionection = \up \stemdown + \property Voice . dynamicDirection = \up \stemdown %\key gis; c8 d [e f g a] b c \ff } -\context Staff = VB { \property Voice . dynamicDirectionection = \down c,,4 \ff c c c } +\context Staff = VB { \property Voice . dynamicDirection = \down c,,4 \ff c c c } > \paper { linewidth = -1.; } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/stem-tremolo.ly b/input/test/stem-tremolo.ly index 053b2acbb5..bc962393de 100644 --- a/input/test/stem-tremolo.ly +++ b/input/test/stem-tremolo.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; \score{ \notes \transpose c'''{ \stemup diff --git a/input/test/stem.ly b/input/test/stem.ly index 5322eefbe8..5621c4302e 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.3.4"; +\version "1.3.5"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index 4ccd618a2a..831c12ce21 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.3.4"; +\version "1.3.5"; % this is an example of extreme dynamics diff --git a/input/test/test-lyrics.ly b/input/test/test-lyrics.ly index d26b7c9876..89146f1c4e 100644 --- a/input/test/test-lyrics.ly +++ b/input/test/test-lyrics.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; $somewhat_long = \lyrics{ \property Lyrics . textStyle = "roman" diff --git a/input/test/thumb.ly b/input/test/thumb.ly index c2bac9dbe5..795af1647f 100644 --- a/input/test/thumb.ly +++ b/input/test/thumb.ly @@ -7,7 +7,7 @@ % the thumb-script is used in cello music to indicate a note that should % be played with your thumb. -\version "1.3.4"; +\version "1.3.5"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/title.ly b/input/test/title.ly index d33d3f0e9f..c20c9741f8 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.3.4"; +\version "1.3.5"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index f363613967..6c4d9b0e2c 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.3.4"; +\version "1.3.5"; vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/tup.ly b/input/test/tup.ly index ec251312cb..e228bfac84 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -8,4 +8,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index c57f946448..67f85f575f 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.3.4"; +\version "1.3.5"; \score { \notes < diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 87fe13892d..5a4f991628 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -15,4 +15,4 @@ } } -\version "1.3.4"; +\version "1.3.5"; diff --git a/lily/include/paper-stream.hh b/lily/include/paper-stream.hh index f7e3bf5624..ab5de0684e 100644 --- a/lily/include/paper-stream.hh +++ b/lily/include/paper-stream.hh @@ -12,7 +12,7 @@ class Paper_stream { public: - bool outputting_comment; + bool outputting_comment_b_; ostream *os; int nest_level; /// to check linelen in output. TeX has limits. diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 20f470b0bd..c88ba15d48 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -96,7 +96,15 @@ ly_parse_scm (char const* s, int* n) SCM ly_quote_scm (SCM s) { +#if 0 + /* + This internal quote symbol breaks list->string and display, + and thus scm output. + */ return scm_m_quote (scm_cons2 (SCM_EOL, s, SCM_EOL) ,SCM_EOL); +#else + return gh_list (ly_symbol2scm ("quote"), s, SCM_UNDEFINED); +#endif } diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 293475c0d6..dea59e6cf1 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -131,41 +131,78 @@ Paper_outputter::output_scheme (SCM scm) void -Paper_outputter::dump_onto (Paper_stream *os) +Paper_outputter::dump_onto (Paper_stream *ps) { - - if (output_global_ch == String ("scm")) - *os << "" - "(primitive-load-path 'lily.scm)\n" - "(eval (tex-scm 'all-definitions))\n" - ";(eval (ps-scm 'all-definitions))\n" - "(display (map (lambda (x) (string-append (eval x) \"\\n\")) '(\n" - ; - - for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) + if (String (output_global_ch) == "scm") +#if 1 // both are fine + { + /* + default to stdin + */ + int fd = 1; + if (ofstream* of = dynamic_cast (ps->os)) + fd = of->rdbuf ()->fd (); + SCM port = scm_fdes_to_port (fd, "a", SCM_EOL); + + /* + lilypond -f scm x.ly + guile -s x.scm + */ + scm_display (gh_str02scm ( + ";;; Usage: guile -s x.scm > x.tex\n" + "(primitive-load-path 'lily.scm)\n" + "(scm-tex-output)\n" + ";(scm-ps-output)\n" + "(map (lambda (x) (display (eval x))) '(\n" + ), port); + + SCM newline = gh_str02scm ("\n"); + for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) + { + scm_write (gh_car (s), port); + scm_display (newline, port); + scm_flush (port); + } + scm_display (gh_str02scm (")))"), port); + scm_display (newline, port); + scm_flush (port); + scm_close_port (port); + } +#else { - if (String (output_global_ch) == "scm") + /* + lilypond -f scm x.ly + guile -s x.scm + */ + if (output_global_ch == String ("scm")) + *ps << "" + ";;; Usage: guile -s x.scm > x.tex\n" + "(primitive-load-path 'lily.scm)\n" + "(scm-tex-output)\n" + ";(scm-ps-output)\n" + "(map (lambda (x) (display (eval x))) '(\n" + ; + for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) { SCM result = scm_eval (scm_listify (ly_symbol2scm ("scm->string"), ly_quote_scm (gh_car (s)), SCM_UNDEFINED)); - *os << ly_scm2string (result); + *ps << ly_scm2string (result); } - else + *ps << ")))"; + } +#endif + + else + { + for (SCM s = gh_cdr (molecules_); gh_pair_p (s); s = gh_cdr (s)) { SCM result = scm_eval (gh_car (s)); char *c=gh_scm2newstr (result, NULL); - *os << c; + *ps << c; free (c); } - - } - - - if (String (output_global_ch) == "scm") - { - *os << ")))"; } } diff --git a/lily/paper-stream.cc b/lily/paper-stream.cc index f7844a8995..fa6ec8c7a0 100644 --- a/lily/paper-stream.cc +++ b/lily/paper-stream.cc @@ -25,7 +25,7 @@ Paper_stream::Paper_stream (String filename) error (_f ("Can't open file: `%s'", filename)); nest_level = 0; line_len_i_ = 0; - outputting_comment=false; + outputting_comment_b_=false; } Paper_stream::~Paper_stream () @@ -46,13 +46,13 @@ Paper_stream::operator << (String s) { for (char const *cp = s.ch_C (); *cp; cp++) { - if (outputting_comment) + if (outputting_comment_b_) { *os << *cp; if (*cp == '\n') { - outputting_comment=false; - + outputting_comment_b_=false; + line_len_i_ =0; } continue; } @@ -60,7 +60,7 @@ Paper_stream::operator << (String s) switch (*cp) { case '%': - outputting_comment = true; + outputting_comment_b_ = true; *os << *cp; break; case '{': @@ -108,6 +108,7 @@ Paper_stream::break_line () { *os << '\n'; *os << to_str (' ', nest_level); + outputting_comment_b_ = false; line_len_i_ = 0; } diff --git a/lily/stem-info.cc b/lily/stem-info.cc index d7e80d2425..6269efb796 100644 --- a/lily/stem-info.cc +++ b/lily/stem-info.cc @@ -10,7 +10,7 @@ #include "proto.hh" #include "misc.hh" #include "cross-staff.hh" - +#include "debug.hh" #include "stem.hh" #include "paper-def.hh" #include "lookup.hh" @@ -41,8 +41,16 @@ Stem_info::Stem_info (Stem*s, int mult) set_direction (stem_l_->get_direction ()); SCM bd = stem_l_->remove_elt_property ("beam-dir"); - beam_dir_ = gh_scm2int (bd); - + if (gh_number_p (bd)) + { + beam_dir_ = gh_scm2int (bd); + } + else + { + programming_error ("Beam direction not set."); + beam_dir_ = UP; // GURAUGRNAGURAGU! urg ! + } + Paper_def* paper_l = stem_l_->paper_l (); Real internote_f = stem_l_->staff_line_leading_f ()/2; Real interbeam_f = paper_l->interbeam_f (mult_i_); diff --git a/ly/generic-paper.ly b/ly/generic-paper.ly index 1399f4c7bc..a4140bb73b 100644 --- a/ly/generic-paper.ly +++ b/ly/generic-paper.ly @@ -1,6 +1,6 @@ \paper { texsetting = ""; pssetting = ""; - scmsetting = "\"(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\";\n";% UGH. + scmsetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse;\n";% UGH. } diff --git a/ly/init.sly b/ly/init.sly index da942c0cfd..ea78a1782e 100644 --- a/ly/init.sly +++ b/ly/init.sly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.1.52"; +\version "1.3.4"; \include "declarations.ly" diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index 9e7850cfc0..f2d6958fd8 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -6,7 +6,8 @@ Group: Applications/Publishing Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond -Packager: Han-Wen Nienhuys +# get Packager from (undocumented?) ~/.rpmmacros! +# Packager: Han-Wen Nienhuys # Icon: @package@-icon.gif BuildRoot: /tmp/lilypond-install Prereq: tetex diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 6dcf43f81e..d6be3ee426 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.6 -Entered-date: 15NOV99 +Version: 1.3.7 +Entered-date: 18NOV99 Description: Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.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 - 1000k lilypond-1.3.6.tar.gz + 1000k lilypond-1.3.7.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.6.tar.gz + 1000k lilypond-1.3.7.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index dbed56825b..13af3c1aed 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,12 +1,13 @@ Name: lilypond -Version: 1.3.6 +Version: 1.3.7 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.6.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.7.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond -Packager: Han-Wen Nienhuys +# get Packager from (undocumented?) ~/.rpmmacros! +# Packager: Han-Wen Nienhuys # Icon: lilypond-icon.gif BuildRoot: /tmp/lilypond-install Prereq: tetex diff --git a/make/toplevel.make.in b/make/toplevel.make.in index a311af2b92..2c2e051086 100644 --- a/make/toplevel.make.in +++ b/make/toplevel.make.in @@ -15,7 +15,7 @@ SUBDIRS = scripts buildscripts flower lib lily mf midi2ly po debian \ SCRIPTS = configure aclocal.m4 README_FILES = DEDICATION COPYING NEWS TODO CHANGES -README_TXT_FILES = README.txt INSTALL.txt +README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt IN_FILES := $(wildcard *.in) EXTRA_DIST_FILES = dstreamrc mudela-mode.el vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) diff --git a/mutopia/E.Satie/gnossienne-4-autochange.ly b/mutopia/E.Satie/gnossienne-4-autochange.ly index 05a0754f61..1d3d4ee91a 100644 --- a/mutopia/E.Satie/gnossienne-4-autochange.ly +++ b/mutopia/E.Satie/gnossienne-4-autochange.ly @@ -141,7 +141,7 @@ accompany = \notes \relative c{ slurVerticalDirection = 1; verticalDirection = -1; - beamAutoEnd = "1/2"; + beamAutoEnd = #(make-moment 1 2) } } \midi { diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index bc6c08c869..c53e26066f 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -12,7 +12,7 @@ Tested Features: cross staff auto beams and slurs, grace notes, no bars %} -\version "1.3.4"; +\version "1.3.5"; \include "nederlands.ly" @@ -162,7 +162,7 @@ accompany = \notes \relative c{ \accepts "Staff"; slurVerticalDirection = 1; verticalDirection = -1; - beamAutoEnd = "1/2"; + beamAutoEnd = #(make-moment 1 2) } \translator { \type "Engraver_group_engraver"; diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index 74423e6eb4..240a44542b 100644 --- a/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -12,7 +12,7 @@ Tested Features: %} -\version "1.3.4"; +\version "1.3.5"; \include "nederlands.ly" @@ -152,8 +152,8 @@ lower = \context Staff \notes \relative c{ \translator{ \OrchestralScoreContext } \translator{ \VoiceContext - beamAutoEnd_8 = "1/4"; - beamAutoEnd_16 = "1/4"; + beamAutoEnd_8 = #(make-moment 1 4) + beamAutoEnd_16 = #(make-moment 1 4) } } \midi { diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index 1f29fc4f2d..c9e18e1f5d 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -44,7 +44,7 @@ Note: Original key F. \version "1.3.4"; vocalVerse = \notes\relative c''{ - \property Voice.dynamicDirectionection=1 + \property Voice.dynamicDirection=1 \times 2/3 { [ g8( )as] g } c4. g8 | \times 2/3 { [ f8( )g] f } c'4 f,8 r | g4.-> f8 \times 2/3 { [ f( )es] d } | @@ -73,7 +73,7 @@ vocalVerse = \notes\relative c''{ } vocalThrough = \notes\relative c{ - \property Voice.dynamicDirectionection=1 + \property Voice.dynamicDirection=1 g''8. g16 b8. b16 d8. d16 | c4 b r | g4. b8 d8. c16 | @@ -240,7 +240,7 @@ trebleThrough = \notes \relative c'{ } bassIntro = \notes\relative c{ - \property Voice.dynamicDirectionection=1 + \property Voice.dynamicDirection=1 %1 r4 | r4 | @@ -250,7 +250,7 @@ bassIntro = \notes\relative c{ bassVerseOne = \notes\relative c{ % \clef bass; - \property Voice.dynamicDirectionection=1 + \property Voice.dynamicDirection=1 %5 r4 | r4 | @@ -281,7 +281,7 @@ bassVerseOne = \notes\relative c{ } bassEentje = \notes\relative c{ - \property Voice.dynamicDirectionection=1 + \property Voice.dynamicDirection=1 [ ] | c,8 [ ] | [ ] | @@ -293,7 +293,7 @@ bassEentje = \notes\relative c{ } bassThrough = \notes\relative c{ - \property Voice.dynamicDirectionection=1 + \property Voice.dynamicDirection=1 %61 [ b-> d->> ] | [ b-> d->> ] | @@ -351,7 +351,7 @@ vocals = \notes{ \property Voice.noAutoBeaming = "1" \property Staff.automaticMelismata=1 - \property Voice.dynamicDirectionection = \up + \property Voice.dynamicDirection = \up \skip 4 * 12; \vocalVerse \skip 4 * 24; diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index abd64a8be8..fb540fccc8 100644 --- a/mutopia/J.S.Bach/Duette/global-i.ly +++ b/mutopia/J.S.Bach/Duette/global-i.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; $global_i = \notes{ \time 12/8; diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly index 0f5aa1ea74..e83492890a 100644 --- a/mutopia/J.S.Bach/Duette/global-ii.ly +++ b/mutopia/J.S.Bach/Duette/global-ii.ly @@ -1,4 +1,4 @@ -\version "1.3.4"; +\version "1.3.5"; $global_ii = \notes{ \time 4/4; diff --git a/mutopia/J.S.Bach/Duette/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly index 1127323be8..72c59dec06 100644 --- a/mutopia/J.S.Bach/Duette/viola-i.ly +++ b/mutopia/J.S.Bach/Duette/viola-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; \include "global-i.ly" \include "violoncello-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly index b168a6521c..6e4fd42104 100644 --- a/mutopia/J.S.Bach/Duette/viola-ii.ly +++ b/mutopia/J.S.Bach/Duette/viola-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; \include "global-ii.ly" \include "violoncello-ii.ly"; diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly index 9eb6cb5a7f..2f6c10bfb4 100644 --- a/mutopia/J.S.Bach/Duette/viola-part.ly +++ b/mutopia/J.S.Bach/Duette/viola-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 0688ef5b0f..559bedf620 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; $violino_i = \notes\relative c'' { \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly index 8c2584d3ef..4ff51ba2fb 100644 --- a/mutopia/J.S.Bach/Duette/violino-ii.ly +++ b/mutopia/J.S.Bach/Duette/violino-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; $violino_ii = \notes\relative c''{ R1*8 | @@ -101,4 +101,4 @@ $violino_ii_staff = \context Staff = violino < \$violino_ii \$global_ii > -\version "1.3.4"; +\version "1.3.5"; diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index a5b6196346..798567be9b 100644 --- a/mutopia/J.S.Bach/Duette/violino-part.ly +++ b/mutopia/J.S.Bach/Duette/violino-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index f3ed9fd392..54adae15c8 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly index 47c3b66d49..a48730fc5e 100644 --- a/mutopia/J.S.Bach/Duette/violino-violoncello.ly +++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { \include "violino-i.ly"; diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly index 03d3ebbf40..a37c92ff3b 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-i.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; $violoncello_i = \notes\relative c{ \property Voice.beamAutoEnd = "3/8" diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly index e1ffdf05e1..c6c786d631 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-ii.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; $violoncello_ii = \notes\relative c{ r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis| diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly index 9ffcaef121..2d24632ce6 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-part.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "Public Domain"; } -\version "1.3.4"; +\version "1.3.5"; % { diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index fe9c171ea7..cfcfda7bb9 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -209,7 +209,7 @@ global = \notes{ \context PianoStaff < \context Staff = upper < \global - { \upper \bar "|." } + { \upper \bar "|."; } > \context Staff = lower < \global diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly index 112b0b81a3..2136b74bf0 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly @@ -7,6 +7,7 @@ subtitle = "Clavierbuechlein"; composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; +maintainer = "Jan Nieuwenhuizen"; % mutopia headers. mutopiatitle = "Petites Pr&aigueludes"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index 20313c7071..840b9f02cf 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -39,8 +39,8 @@ gigue_cello_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; - beamAutoEnd_16 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + beamAutoEnd_16 = #(make-moment 3 4) } } \midi{ \tempo 4 = 60; } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly index 5359bab409..ee57409f0a 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -37,8 +37,8 @@ gigue_viola_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; - beamAutoEnd_16 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + beamAutoEnd_16 = #(make-moment 3 4) } } \midi{ \tempo 4 = 60; } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index 385673c34f..ccc68f781f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -53,7 +53,7 @@ menuetto_i_cello_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) } } \midi{ \tempo 4 = 110; } @@ -90,7 +90,8 @@ menuetto_ii_cello_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + } } \midi{ \tempo 4 = 130; } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index c795cf65e9..c7bd0c0930 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -52,7 +52,8 @@ menuetto_i_viola_staff = \context Staff < gourlay_maxmeasures = 7.0; \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + } } \midi{ \tempo 4 = 110; } @@ -87,7 +88,8 @@ menuetto_ii_viola_staff = \context Staff < \paper{ \translator{ \VoiceContext - beamAutoEnd_8 = "3/4"; + beamAutoEnd_8 = #(make-moment 3 4) + } } \midi{ \tempo 4 = 130; } diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly index d905d8e050..a672ff8f16 100644 --- a/mutopia/N.W.Gade/score.ly +++ b/mutopia/N.W.Gade/score.ly @@ -56,12 +56,12 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \property Staff.instr = "Cor." \context Voice = corI < \globalNoKey - \stemup \property Voice.dynamicDirectionection = \up + \stemup \property Voice.dynamicDirection = \up \property Voice.articulationScriptVerticalDirection = \up \corI > \context Voice = corII { - \stemdown \property Voice.dynamicDirectionection = \down + \stemdown \property Voice.dynamicDirection = \down \property Voice.articulationScriptVerticalDirection = \down \corII } @@ -71,12 +71,12 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \property Staff.instr = "Trp." \context Voice = trpI < \globalNoKey - \stemup \property Voice.dynamicDirectionection = \up + \stemup \property Voice.dynamicDirection = \up \property Voice.articulationScriptVerticalDirection = \up \trpI > \context Voice = trpII { - \stemdown \property Voice.dynamicDirectionection = \down + \stemdown \property Voice.dynamicDirection = \down \property Voice.articulationScriptVerticalDirection = \down \trpII } @@ -126,8 +126,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + > \paper { % \paper_sixteen; - linewidth = 180.\mm; - textheight = 260.\mm; + linewidth = 18.0\cm; \translator { \OrchestralScoreContext minVerticalAlign = 2.5*\staffheight; diff --git a/mutopia/W.A.Mozart/horn-concerto-3/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3/horn-concerto-3.ly index 8060346f56..a7c04b8daf 100644 --- a/mutopia/W.A.Mozart/horn-concerto-3/horn-concerto-3.ly +++ b/mutopia/W.A.Mozart/horn-concerto-3/horn-concerto-3.ly @@ -47,7 +47,7 @@ aftergrace = \property Grace.graceAlignPosition = \right \paper{ \translator { \StaffContext \consists Mark_engraver; } \translator { \ScoreContext - skipBars = 1; + skipBars = ##t } linewidth = 180. \mm; } diff --git a/ps/lily.ps b/ps/lily.ps index b948ccff70..c88e20c71e 100644 --- a/ps/lily.ps +++ b/ps/lily.ps @@ -4,7 +4,8 @@ % round cappings 1 setlinecap % -% +% scm/lily.scm should allow blank lines, now +% /draw_beam % width slope thick { 2 div /beam_thick exch def diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps index 9a1bc6b629..768713c521 100644 --- a/ps/lilyponddefs.ps +++ b/ps/lilyponddefs.ps @@ -3,7 +3,7 @@ % hmm % /setgray { 1 add } bind def -/stafflinethickness mudelapaperstaffline def +/stafflinethickness mudelapaperstafflinethickness def /staffheight mudelapaperstaffheight def /xoffset 30 def diff --git a/scm/generic-property.scm b/scm/generic-property.scm index ef36f07c67..de341d58ce 100644 --- a/scm/generic-property.scm +++ b/scm/generic-property.scm @@ -91,6 +91,7 @@ (define generic-voice-properties (list generic-stem-properties + generic-breathing-sign-properties generic-tie-properties generic-rest-properties generic-slur-properties diff --git a/scm/lily.scm b/scm/lily.scm index 7024dfe651..34a370175d 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -9,14 +9,13 @@ ;;; library funtions -; :use-module (ice-9 regex)) +(use-modules (ice-9 regex)) ;; do nothing in .scm output (define (comment s) "" ) - (define (xnumbers->string l) (string-append @@ -201,33 +200,27 @@ (define (style-to-cmr s) (assoc s cmr-alist ) ) + -(define (define-font name-mag) - (cons name-mag - (string-append "\\magfont" - (string-encode-integer (hash (car name-mag) 1000000)) - "m" - (string-encode-integer (cdr name-mag))) - - ) - ) (define font-name-alist '()) +(define (font-command name-mag) + (cons name-mag + (string-append "magfont" + (string-encode-integer (hash (car name-mag) 1000000)) + "m" + (string-encode-integer (cdr name-mag))) + + ) + ) (define (define-fonts names) - (set! font-name-alist (map define-font names)) - (apply string-append (map (lambda (x) - (string-append "\\font" (cdr x) "=" - (symbol->string (caar x)) - " scaled " - (number->string (magstep (cdar x))) - "\n")) - font-name-alist - ) - ) - ) + (set! font-name-alist (map font-command names)) + (apply string-append + (map (lambda (x) + (font-load-command (car x) (cdr x))) font-name-alist) + )) - (define (tex-scm action-name) (define (unknown) "%\n\\unknown%\n") @@ -244,7 +237,7 @@ (ly-warn (string-append "Programming error: No such font known " (car font-name-symbol))) "") ; issue no command - (cdr c)) + (string-append "\\" (cdr c))) )) @@ -269,7 +262,19 @@ ;This sets CTM so that you get to the currentpoint ; by executing a 0 0 moveto - + + + + + (define (font-load-command name-mag command) + (string-append + "\\font\\" command "=" + (symbol->string (car name-mag)) + " scaled " + (number->string (magstep (cdr name-mag))) + "\n")) + + (define (embedded-ps s) (string-append "\\embeddedps{" s "}")) @@ -293,15 +298,16 @@ (define (header-end) (string-append "\\special{! " - (ly-gulp-file "lily.ps") - ;; breaks on ppc -;; (regexp-substitute/global #f "\n" (ly-gulp-file "lily.ps") 'pre " %\n" 'post) + ; fixed in 1.3.4 + ;(ly-gulp-file "lily.ps") + + (regexp-substitute/global #f "\n" (ly-gulp-file "lily.ps") 'pre " %\n" 'post) "}" "\\input lilyponddefs \\turnOnPostScript")) (define (header creator generate) (string-append - "%created by: " creator generate "\n")) + "%created by: " creator generate)) (define (invoke-char s i) (string-append @@ -324,8 +330,9 @@ (define (lily-def key val) (string-append "\\def\\" -; (regexp-substitute/global #f "_" (output-tex-string key) 'pre "X" 'post) - (output-tex-string key) + ; fixed in 1.3.4 + (regexp-substitute/global #f "_" (output-tex-string key) 'pre "X" 'post) + ;(output-tex-string key) "{" (output-tex-string val) "}\n")) (define (number->dim x) @@ -335,19 +342,8 @@ (define (placebox x y s) (string-append "\\placebox{" - (number->dim y) "}{" (number->dim x) "}{" s "}")) - - ;;;; - (define (pianobrace y staffht) - (let* ((step 1.0) - (minht (* 2 staffht)) - (maxht (* 7 minht)) - ) - (string-append - (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))) 0) - (char (max 0 (/ (- (min y (- maxht step)) minht) step)))) - ) - ) + (number->dim y) "}{" (number->dim x) "}{" s "}\n")) + (define (bezier-sandwich l thick) @@ -383,6 +379,7 @@ ;; (should merge the 2 lists) (cond ((eq? action-name 'all-definitions) `(begin + (define font-load-command ,font-load-command) (define beam ,beam) (define bezier-sandwich ,bezier-sandwich) (define bracket ,bracket) @@ -400,7 +397,6 @@ (define header ,header) (define invoke-char ,invoke-char) (define invoke-dim1 ,invoke-dim1) - (define pianobrace ,pianobrace) (define placebox ,placebox) (define select-font ,select-font) (define start-line ,start-line) @@ -437,6 +433,7 @@ ) ) + ;;;;;;;;;;;; PS (define (ps-scm action-name) @@ -463,26 +460,34 @@ (6 30) ; really: 29.856 ))) - (define (select-font font-name magnification) - (define font-cmd (assoc font-name font-alist)) - (if (not (equal? font-name current-font)) - (begin - (set! current-font font-name) - (if (eq? font-cmd #f) - (begin - (set! font-cmd (cached-fontname font-count)) - (set! font-alist (acons font-name font-cmd font-alist)) - (set! font-count (+ 1 font-count)) - (string-append "\n/" font-cmd " {/" - font-name " findfont " - (mag-to-size magnification) - " scalefont setfont} bind def \n" - font-cmd " \n")) - (string-append (cdr font-cmd) " "))) - ; font-name == current-font no switch needed - "" - )) - + + (define (select-font font-name-symbol) + (let* + ( + (c (assoc font-name-symbol font-name-alist)) + ) + + (if (eq? c #f) + (begin + (ly-warn (string-append + "Programming error: No such font known " (car font-name-symbol))) + "") ; issue no command + (string-append " " (cdr c) " ")) + + + )) + + (define (font-load-command name-mag command) + (string-append + "/" command + " { /" + (symbol->string (car name-mag)) + " findfont " + (number->string (magstep (cdr name-mag))) + " 1000 div 12 mul scalefont setfont } bind def " + "\n")) + + (define (beam width slope thick) (string-append (numbers->string (list width slope thick)) " draw_beam" )) @@ -572,18 +577,6 @@ (string-append (number->string x) " " (number->string y) " {" s "} placebox ")) - (define (pianobrace y staffht) - (let* ((step 1.0) - (minht (* 2 staffht)) - (maxht (* 7 minht)) - ) - (string-append - (select-font (string-append "feta-braces" (number->string (inexact->exact staffht))) 0) - (char (max 0 (/ (- (min y (- maxht step)) minht) step)))) - ) - ) - - (define (bezier-sandwich l thick) (string-append (apply string-append (map control->string l)) @@ -637,9 +630,9 @@ (define filledbox ,filledbox) (define font-def ,font-def) (define font-switch ,font-switch) - (define pianobrace ,pianobrace) (define header-end ,header-end) (define lily-def ,lily-def) + (define font-load-command ,font-load-command) (define header ,header) (define invoke-char ,invoke-char) (define invoke-dim1 ,invoke-dim1) @@ -667,7 +660,34 @@ ) ) - ; + +(define (gulp-file name) + (let* ((port (open-file name "r")) + (content (let loop ((text "")) + (let ((line (read-line port))) + (if (or (eof-object? line) + (not line)) + text + (loop (string-append text line "\n"))))))) + (close port) + content)) + +(define (scm-gulp-file name) + (set! %load-path + (cons (string-append + (getenv 'LILYPONDPREFIX) "/ps") %load-path)) + (let ((path (%search-load-path name))) + (if path + (gulp-file path) + (gulp-file name)))) + +(define (scm-tex-output) + (eval (tex-scm 'all-definitions))) + +(define (scm-ps-output) + (eval (ps-scm 'all-definitions))) + + ; Russ McManus, ; ; I use the following, which should definitely be provided somewhere @@ -691,12 +711,18 @@ (set! ret-ls (cons (fn (car (car alist)) (cdr (car alist))) ret-ls))))) -;;;; print a SCM expression. Isn't this part of the std lib? - +;; guile-1.3.4 has list->string (define (scmlist->string exp) + (list->string exp)) + +;; obsolete, maybe handy for testing +;; print a SCM expression. Isn't this part of the std lib? +(define (xxscmlist->string exp) (cond + ((null? (car exp)) (begin (display ("urg:") (newline)))) ((pair? (cdr exp)) (string-append (scm->string (car exp)) " " (scmlist->string (cdr exp)))) ((eq? '() (cdr exp)) (string-append (scm->string (car exp)) ")")) + ;; howto check for quote? (else (string-append (scm->string (car exp)) " . " (scm->string (cdr exp)) ")")) )) @@ -706,5 +732,7 @@ ((number? exp) (number->string exp)) ((symbol? exp) (symbol->string exp)) ((string? exp) (string-append "\"" exp "\"")) + ;; probably: #@quote + (else (begin (display "programming error: scm->string: ") (newline) "'")) )) diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index 827d52a582..57d3324966 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -387,6 +387,15 @@ if 1: conversions.append ((1,3,4), conv, '\\cadenza -> \cadenza{On|Off}') +if 1: + def conv (str): + str = re.sub ('beamAuto([^=]+)= *"([0-9]+)/([0-9]+)" *;', + 'beamAuto\\1 = #(make-moment \\2 \\3)', + str) + return str + + conversions.append ((1,3,5), conv, 'beamAuto moment properties') + ############################ diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 57702825d5..b309317ff1 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -925,7 +925,7 @@ def writeLilylog(file,contents): def getTeXFile(contents): texfiles=[] for line in string.split(contents,'\n'): - m = re.search('^paper output to (.+)\.\.\.', line) + m = re.search('paper output to (.+)\.\.\.', line) if m: texfiles.append(m.group(1)) diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py index 59bde3bbd7..e4114a7de8 100644 --- a/scripts/mudela-book.py +++ b/scripts/mudela-book.py @@ -52,6 +52,7 @@ options = [ ('', '', 'force-verbatim', 'make all mudela verbatim'), ('', 'M', 'dependencies', 'write dependencies'), ('', 'n', 'no-lily', 'don\'t run lilypond'), + ('', '', 'no-pictures', "don\'t generate pictures"), ('FILE', 'o', 'outname', 'prefix for filenames'), ('', 'v', 'version', 'print version information' ), ('PREF', '', 'dep-prefix', 'prepend PREF before each -M dependency') @@ -61,6 +62,7 @@ format = '' run_lilypond = 1 use_hash = 1 no_match = 'a\ba' +do_pictures = 1 # format specific strings, ie. regex-es for input, and % strings for output output_dict= { @@ -669,7 +671,7 @@ def compile_all_files (chunks): eps.append (base) elif e == 'tex': tex.append (base + '.ly') - elif e == 'png': + elif e == 'png' and do_pictures: png.append (base) if __main__.use_hash: @@ -863,6 +865,8 @@ for opt in options: initfile = a elif o == '--dep-prefix': dep_prefix = a + elif o == '--no-pictures': + do_pictures = 0 identify() diff --git a/stepmake/CHANGES b/stepmake/CHANGES index a718863184..92b1569541 100644 --- a/stepmake/CHANGES +++ b/stepmake/CHANGES @@ -1,3 +1,8 @@ +pl 81 + - Yodl-free (tm) + - bf: package-zet: too many symlinks + - bf: yodl-targets.make + pl 80 - use mgsmerge iso tupdate diff --git a/stepmake/VERSION b/stepmake/VERSION index 6a4517186c..adb34a0132 100644 --- a/stepmake/VERSION +++ b/stepmake/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=StepMake MAJOR_VERSION=0 MINOR_VERSION=1 -PATCH_LEVEL=80 +PATCH_LEVEL=81 MY_PATCH_LEVEL= # use the above to send patches, always empty for released version: diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index 3ece5fd135..153cc4a48d 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -12,7 +12,6 @@ import getopt import __main__ fullname = "unknown" -changelog_file = '' index_file='' banner_file = '' changelog_file='' @@ -53,16 +52,16 @@ package_name = '' def gulp_file(f): try: - i = open(f) - i.seek (0, 2) - n = i.tell () - i.seek (0,0) + i = open(f) + i.seek (0, 2) + n = i.tell () + i.seek (0,0) except: - sys.stderr.write ("can't open file: %s\n" % f) - return '' + sys.stderr.write ("can't open file: %s\n" % f) + return '' s = i.read (n) if len (s) <= 0: - sys.stderr.write ("gulped empty file: %s\n" % f) + sys.stderr.write ("gulped empty file: %s\n" % f) i.close () return s @@ -70,10 +69,10 @@ def help (): sys.stdout.write (r"""Usage: add-html-footer [OPTION]... HTML-FILE Add a nice footer, add the top of the ChangLog file (up to the ********) Options: --h, --help print this help ---version package version ---name package_name ---footer footer file. +-h, --help print this help +--version package version +--name package_name +--footer footer file """) sys.exit (0) @@ -129,16 +128,17 @@ banner = footstr (index_file) banner_id = '' -if changelog_file: - changes = gulp_file (changelog_file) - m = re.search ('^\*\*', changes) - if m: - changes = changes[:m.start (0)] - def do_file (s): + if changelog_file: + changes = gulp_file (changelog_file) + # urg? + #m = re.search ('^\\\\*\\\\*', changes) + m = re.search (r'\*\*\*', changes) + if m: + changes = changes[:m.start (0)] s = re.sub ('top_of_ChangeLog', '\n'+ changes + '\n\n', s) diff --git a/stepmake/bin/ls-latex.py b/stepmake/bin/ls-latex.py index 2f88134be4..791f27aaa7 100644 --- a/stepmake/bin/ls-latex.py +++ b/stepmake/bin/ls-latex.py @@ -8,127 +8,172 @@ version = '0.1' import sys import os import string - -def gulp_file (fn): - f = open (fn) - return f.read () - import __main__ import glob - import re format_names = {'ps.gz': 'Compressed PostScript', - 'html' : 'HTML' - } + 'html' : 'HTML' + } + +def gulp_file(f): + try: + i = open(f) + i.seek (0, 2) + n = i.tell () + i.seek (0,0) + except: + sys.stderr.write ("can't open file: %s\n" % f) + return '' + s = i.read (n) + if len (s) <= 0: + sys.stderr.write ("gulped empty file: %s\n" % f) + i.close () + return s class Latex_head: - def __init__ (self): - self.author = '' - self.title = '' - self.date = '' - self.format = '' - + def __init__ (self): + self.author = '' + self.title = '' + self.date = '' + self.format = '' + def read_latex_header (s): - header = Latex_head() - m = re.search(r'\\author{([^}]+)}', s) - if m: - header.author = m.group (1) + header = Latex_head() + m = re.search(r'\\author{([^}]+)}', s) + if m: + header.author = m.group (1) - m = re.search (r'\\title{([^}]+)}',s ) - if m: - header.title = m.group (1) + m = re.search (r'\\title{([^}]+)}',s ) + if m: + header.title = m.group (1) - header.formats = ['ps.gz'] - return header + header.formats = ['ps.gz'] + return header def read_bib_header (s): + m = re.search ('% *AUTHOR *= *(.*)\n',s) - m = re.search ('% *AUTHOR *= *(.*)\n',s) + header = Latex_head() - header = Latex_head() + if m: + header.author = m.group (1) - if m: - header.author = m.group (1) + m = re.search ('% *TITLE *= *(.*)\n',s ) + if m: + header.title = m.group (1) - m = re.search ('% *TITLE *= *(.*)\n',s ) - if m: - header.title = m.group (1) - - header.formats = ['html'] - return header + header.formats = ['html'] + return header def read_pod_header (s): - header = Latex_head () + header = Latex_head () - i = re.search( '[^\n \t]', s) - s = s[i:] - i = re.search( '\n\n', s) - s = s[i+2:] - i = re.search( '\n\n', s) - header.title = s[:i] + i = re.search( '[^\n \t]', s) + s = s[i:] + i = re.search( '\n\n', s) + s = s[i+2:] + i = re.search( '\n\n', s) + header.title = s[:i] - return header + header.formats = ['html'] + return header def read_texinfo_header (s): - header = Latex_head () - - m = re.search( '@settitle (.*$)', s) - if m: - header.title = m.group (1) - - header.formats = ['html', 'ps.gz'] - return header - + header = Latex_head () + + m = re.search( '@settitle (.*)\n', s) + if m: + print 'title found! ' + header.title = m.group (1) + m = re.search( '@author (.*)\n', s) + if m: + header.author = m.group (1) + + header.formats = ['html', 'ps.gz'] + return header + +# urg +# should make a 'next_parens ' +yo_article_re = re.compile ('article(\\([^)]*\\))[ \t\n]*(\\([^)]*\\))') +yo_report_re = re.compile ('report(\\([^)]*\\))[\t\n ]*(\\([^)]*\\))') +yo_sect_re = re.compile ('sect(\\([^)]*\\))') +yo_chapter_re = re.compile ('chapter(\\([^)]*\\))') + +def read_yodl_header (s): + header = Latex_head () + report = yo_report_re.search (s) + article = 0 + sect = 0 + chapter = 0 + if report: + header.author = report.group (2) + header.title = yo_report_re.group (1) + else: + article = yo_article_re.search (s) + if article: + header.author = article.group (2) + header.title = article.group (1) + else: + chapter = yo_chapter_re.search (s) + if chapter: + header.title = chapter.group (1) + else: + sect = yo_sect_re.search (s) + if sect: + header.title = sect.group (1) + + header.formats = ['html'] + return header def print_html_head (l,o,h): - pre =o - - - fn = pre + h.basename + pre =o + + fn = pre + h.basename - t = h.filename - if h.title : - t = t + ': '+ h.title + t = h.filename + if h.title : + t = t + ': '+ h.title - l.write ('
  • %s ' % t) + l.write ('
  • %s ' % t) - if h.author: - l.write ('

    by %s

    ' % h.author) + if h.author: + l.write ('

    by %s

    ' % h.author) - for f in h.formats: - l.write ('(%s)' % (fn, f, format_names [f])) - l.write ('
    • \n') + for f in h.formats: + l.write ('(%s)' % (fn, f, format_names [f])) + l.write ('\n') def help (): - sys.stdout.write ("Usage: ls-latex [OPTION]... FILE...\n" - "Generate html index file for FILE...\n\n" - + "Options:\n" - + " -h, --help print this help\n" - ) - sys.exit (0) + sys.stdout.write (r"""Usage: ls-latex [OPTION]... FILE... +Generate html index file for FILE... + +Options: +-h, --help print this help +""") + sys.exit (0) import getopt (options, files) = getopt.getopt(sys.argv[1:], - 'e:h', ['help', 'prefix=', 'title=']) + 'e:h', ['help', 'prefix=', 'title=']) tex = '' output ='' pre = '' title = '' for opt in options: - o = opt[0] - a = opt[1] - if o == '--prefix': - pre = a - elif o == '--title': - title = a - elif o == '-h' or o == '--help': - help () + o = opt[0] + a = opt[1] + if o == '--prefix': + pre = a + elif o == '--title': + title = a + elif o == '-h' or o == '--help': + help () l = sys.stdout @@ -140,28 +185,29 @@ l.write (r"""%s read_header_funcs = { - 'pod' : read_pod_header, - 'tex' : read_latex_header, - 'doc' : read_latex_header, - 'bib': read_bib_header, - 'latex' : read_latex_header, - 'tely' : read_texinfo_header, - 'texi': read_texinfo_header, -} + 'pod' : read_pod_header, + 'tex' : read_latex_header, + 'doc' : read_latex_header, + 'bib': read_bib_header, + 'latex' : read_latex_header, + 'tely' : read_texinfo_header, + 'texi': read_texinfo_header, + 'yo': read_yodl_header, +} for x in files: - m = re.search ('\\.([^.]*)$', x) - if m == None: - continue + m = re.search ('\\.([^.]*)$', x) + if m == None: + continue - s = gulp_file (x) - head = read_header_funcs [m.group(1)] (s) + s = gulp_file (x) + head = read_header_funcs [m.group(1)] (s) - head.filename = x - head.basename = re.sub ("\\.[^.]+", '', x) - - print_html_head (l, pre, head) + head.filename = x + head.basename = re.sub ("\\.[^.]+", '', x) + + print_html_head (l, pre, head) l.write ('') diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py index 927cb0999e..b1fe324985 100644 --- a/stepmake/bin/package-diff.py +++ b/stepmake/bin/package-diff.py @@ -1,5 +1,9 @@ #!@PYTHON@ +# +# TODO: CLEAN THIS UP. +# + import find import sys @@ -134,7 +138,9 @@ usage Patches do not contain automatically generated files or (urg) empty directories, -i.e., you should rerun autoconf, configure """ +i.e., you should rerun autoconf, configure + +""" def makediff (fromdir, todir, patch_name): diff --git a/stepmake/bin/package-zet.sh b/stepmake/bin/package-zet.sh index c7ec22bf94..4f0b79e620 100755 --- a/stepmake/bin/package-zet.sh +++ b/stepmake/bin/package-zet.sh @@ -24,7 +24,7 @@ fi # and create links to here, if necessary # sourcetree=`basename \`pwd\`` -if [ "xsourcetree" != "x$package" ]; then +if [ "x$sourcetree" != "x$package" ]; then (cd ..; rm -f $package 2>&1 > /dev/null) (cd ..; ln -s $sourcetree $package) fi diff --git a/stepmake/make/out/stepmake.lsm b/stepmake/make/out/stepmake.lsm index 85b101eb05..5a594bbcdb 100644 --- a/stepmake/make/out/stepmake.lsm +++ b/stepmake/make/out/stepmake.lsm @@ -1,15 +1,15 @@ Begin3 Title: StepMake -Version: 0.1.80 -Entered-date: 16AUG99 +Version: 0.1.81 +Entered-date: 18NOV99 Description: Keywords: music notation typesetting midi fonts engraving Author: janneke@gnu.org (Jan Nieuwenhuizen) hanwen@cs.ruu.nl (Han-Wen Nienhuys) Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 40k stepmake-0.1.80.tar.gz + 40k stepmake-0.1.81.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 40k stepmake-0.1.80.tar.gz + 40k stepmake-0.1.81.tar.gz Copying-policy: GPL End diff --git a/stepmake/make/out/stepmake.spec b/stepmake/make/out/stepmake.spec index d29fe4024a..bee361b231 100644 --- a/stepmake/make/out/stepmake.spec +++ b/stepmake/make/out/stepmake.spec @@ -1,9 +1,9 @@ Name: stepmake -Version: 0.1.80 +Version: 0.1.81 Release: 1 Copyright: GPL Group: Development -Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.80.tar.gz +Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.81.tar.gz Summary: generic make package Packager: janneke@gnu.org (Jan Nieuwenhuizen) Buildroot: /tmp/stepmake-install diff --git a/stepmake/stepmake/yodl-targets.make b/stepmake/stepmake/yodl-targets.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/yodl-targets.make @@ -0,0 +1 @@ +# empty diff --git a/stepmake/stepmake/yodl-vars.make b/stepmake/stepmake/yodl-vars.make index b97bb19492..52e99080af 100644 --- a/stepmake/stepmake/yodl-vars.make +++ b/stepmake/stepmake/yodl-vars.make @@ -4,3 +4,5 @@ OUTYO_FILES = $(addprefix $(outdir)/,$(YO_FILES)) OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt) OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html) + +ALL_SOURCES += $(YO_FILES) -- 2.39.2