From: Han-Wen Nienhuys <hanwen@xs4all.nl> Date: Tue, 15 May 2001 15:53:05 +0000 (+0200) Subject: release: 1.4.1 X-Git-Tag: release/1.4.1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dafefd1a631edf07e3c1873cfcea6285bde1200c;p=lilypond.git release: 1.4.1 ========== * Added \tupletUp, \tupletDown, \tupletBoth. * Bugfix convert-ly: treCorde. * Slur attachment and extremity offsets taken relative to slur direction; so that Slur \override #'attachment-offset = #'((0 . 1) . (0 . 1)) will always make the slur move away from the note head. * Bugfix: slurs on dotted or flagged notes. * Added @reng, @rgrob, and @rint macros for referencing engravers, grobs and interfaces in documentation. * Bugfix for configure. * text2html: use python script, use <pre> instead of <xmp>. * Fixed pa.ly. * Bugfix: lilypond mode: make view messages scroll by. * configure: check for splitting makeinfo; small fixes for non-splitting makeinfo doc. * Added some missing titling (dedication, translator) and fixed ps titling (Thanks David Arnold). * More doco fixes. Added a small legend. * Bugfix: trend of broken slurs with user-overridden stem attachments. * Bugfix redhat.spec: use root attributes on files. * Bugfix: typo in update-lily, re-set download url to /development. * Removed some empty files. * Merged tutorials. Simplified the text. * Small doco fixes. 1.4.0. --- diff --git a/CHANGES b/CHANGES index c9b9282712..a2aff5fc2b 100644 --- a/CHANGES +++ b/CHANGES @@ -7,19 +7,16 @@ * Slur attachment and extremity offsets taken relative to slur direction; so that + Slur \override #'attachment-offset = #'((0 . 1) . (0 . 1)) + will always make the slur move away from the note head. * Bugfix: slurs on dotted or flagged notes. -* Refman fixes. - * Added @reng, @rgrob, and @rint macros for referencing engravers, grobs and interfaces in documentation. -1.4.0.jcn6 -========== - * Bugfix for configure. * text2html: use python script, use <pre> instead of <xmp>. @@ -28,36 +25,36 @@ grobs and interfaces in documentation. * Bugfix: lilypond mode: make view messages scroll by. -1.4.0.jcn5 -========== - * configure: check for splitting makeinfo; small fixes for non-splitting makeinfo doc. * Added some missing titling (dedication, translator) and fixed ps titling (Thanks David Arnold). -1.4.0.jcn4 -========== - * More doco fixes. Added a small legend. -1.4.0.jcn2 -========== - * Bugfix: trend of broken slurs with user-overridden stem attachments. -* Further Timmification of tutorial. - -1.4.0.jcn1 -========== - * Bugfix redhat.spec: use root attributes on files. * Bugfix: typo in update-lily, re-set download url to /development. * Removed some empty files. -* Merged tutorials; still some Timmification to come. +* Merged tutorials. Simplified the text. + +* Small doco fixes. + +1.4.0.uu1 +========= + +* Bugfix: percussion clef + +* Bugfix: multiple scripts. + +* Bugfix: read TeX's afm files. Metrics are still messed up (too small), but no +crash. + +* Bugfix: fixed the problem where dots clash with other notes (Timothy S. +Nelson) -* Small doco fixes. \ No newline at end of file diff --git a/Documentation/hacking.texi b/Documentation/hacking.texi deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Documentation/index.texi b/Documentation/index.texi index 162669fd88..d67c4ef2fd 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -40,7 +40,6 @@ @unnumberedsubsubsec Installation @itemize @bullet -@item @uref{../../index.html,index} What is Lilypond? @item @uref{../topdocs/out-www/README.html, README} General information. @item @uref{../topdocs/out-www/INSTALL.html, INSTALL} How install on Unix. @@ -52,6 +51,7 @@ How to install on Windows. @unnumberedsubsubsec Support @itemize @bullet +@item @uref{../../index.html,index} What is Lilypond? @item @uref{../topdocs/out-www/FAQ.html,mini-FAQ} Mini FAQ -- very frequently asked questions, with answers. @item @uref{http://www.lilypond.org/wiki?LilyPondFaqs,FAQs} Frequently @@ -87,17 +87,21 @@ the mailing lists. @item @uref{../user/out-www/lilypond/Reference-Manual.html,Reference-Manual} -The Reference Manual. -@item @uref{../user/out-www/lilypond-internals/lilypond-internals.html,lilypond-internals} -Full documentation of internals, generated from the sources. If you -want to fine-tune output, you need the information in this document. -@item @uref{../user/out-www/lilypond/lilypond.html,lilypond} - The complete user manual, (in - @uref{../user/out-www/lilypond.ps.gz,PostScript}). +The reference manual. + +@item @uref{../user/out-www/lilypond/lilypond.html,lilypond} The complete +user manual, (in @uref{../user/out-www/lilypond.ps.gz,PostScript}). This +manual contains among others the tutorial, the reference manual. + @c glossary maybe for new users? @item @uref{../user/out-www/glossary.html,glossary} A glossary of musical terms, including translations. (in -@uref{../user/out-www/glossary.ps.gz,Postscript}) +@uref{../user/out-www/glossary.ps.gz,Postscript}) Read this if you're not +familiar with English terms for notation. + +@item @uref{../user/out-www/lilypond-internals/lilypond-internals.html,lilypond-internals} +Full documentation of internals, generated from the sources. If you +want to fine-tune output, you need the information in this document. @end itemize diff --git a/Documentation/misc/CHANGES-1.3 b/Documentation/misc/CHANGES-1.3 index d0b747dbc1..864e359b6d 100644 --- a/Documentation/misc/CHANGES-1.3 +++ b/Documentation/misc/CHANGES-1.3 @@ -1,9 +1,6 @@ 1.4.0 ===== -1.3.154.hwn1 -============ - * RedHat .spec tweaks. * Bugfix: ly2dvi -o directory/ foo now works. @@ -44,7 +41,7 @@ dvips are stored in outdir. * PO updates. * petite-ouverture-a-danser.ly bugfix, twinkle.ly bugfix - +V 1.3.153 ======= diff --git a/Documentation/user/dev.texi b/Documentation/user/dev.texi deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Documentation/user/development.itexi b/Documentation/user/development.itexi deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index 2513a46a09..f043ecf4b5 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -149,7 +149,7 @@ the duration of the long a. is proportionate to that of the main note. @ @lilypond[13pt,eps] -\notes\relative c'' { +\context Voice\notes\relative c'' { \key d \major \time 4/4 @@ -687,8 +687,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { d1 @@ -702,8 +702,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { \property Voice.TextScript \set #'padding = #-10 @@ -716,8 +716,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { f1 g a @@ -730,8 +730,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { g1 a @@ -744,8 +744,8 @@ also to some extent in newer jazz music. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -763,8 +763,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { c1 d @@ -777,8 +777,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -791,8 +791,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -809,8 +809,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -997,7 +997,7 @@ but equal pitch. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { gis1_"g sharp" s as1_"a flat" s s < des_"dim fifth" g,! > s s < cis_"augm fourth" g! > s s @@ -1038,7 +1038,7 @@ octave lower (for example on double bass @w{@ar{}@strong{strings}}). @lilypond[13pt,eps] \property Score.barNonAuto = ##t \property Staff.Clef \override #'full-size-change = ##t -\property Lyrics.LyricText \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large \addlyrics \notes\relative c { % \clef "F3" @@ -1101,7 +1101,7 @@ less than a quarter note. The number of flags determines the @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { g8_"1/8" s8 g16_"1/16" s8 @@ -1147,8 +1147,8 @@ of the base chords. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Lyrics.LyricText \set #'font-style = #'large -\property Voice.TextScript \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { < g1 e c > < a f d > < b g e > @@ -1174,7 +1174,7 @@ that). @lilypond[13pt,eps] \property Score.barNonAuto = ##t \property Staff.Clef \set #'full-size-change = ##t -\property Lyrics.LyricText \set #'font-style = #'large +\property Score.LyricText \set #'font-style = #'large \addlyrics \notes\relative c'' { \clef french @@ -1248,7 +1248,7 @@ section. @ar{}@w{}@strong{functional harmony} \time 4/4 \clef treble \partial 4 < c4 g e > | < c a f > < b g d > < c2 g e > } - \property Lyrics.LyricText \set #'font-style = #'large + \property Score.LyricText \set #'font-style = #'large \addlyrics \context Staff = SB \relative c { \clef bass @@ -1270,7 +1270,7 @@ Consonances: @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { <g1_"unisone" g> s <g1_"third" b> s @@ -1288,7 +1288,7 @@ Dissonances: @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { <g1_"second" a> s <g1_"seventh" f'> s @@ -1667,7 +1667,7 @@ subject. @lilypond[13pt,eps] \property Score.TimeSignature \override #'style = #'C2/2 -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { \time 4/4 \key g \major @@ -1749,7 +1749,7 @@ but sometimes (mostly in pre baroque music) the double length note value @ @lilypond[13pt,eps] -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \property Score.barNonAuto = ##t \notes\relative c'' { \property Voice.NoteHead \override #'style = #'mensural @@ -1760,7 +1760,7 @@ but sometimes (mostly in pre baroque music) the double length note value @end lilypond @lilypond[13pt,eps] -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \property Score.barNonAuto = ##t \notes\relative c'' { r\longa_"longa" r\breve_"breve" @@ -1774,7 +1774,7 @@ half. Another dot adds yet a fourth of the duration. @ @lilypond[13pt,eps] -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { \time 4/4 g4._"pointed" g8 g2 | g4 () g8 g g2 \bar "||" @@ -1789,7 +1789,7 @@ frequently used. @ @lilypond[13pt,eps] -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { \time 4/4 \times 2/3 {g8_"triplets" g g} g4 g8 g g4 \bar "||" @@ -1826,7 +1826,7 @@ the upper note is played first. @lilypond[13pt,eps] < \context Staff = sa { - \property Voice.TextScript \set #'font-style = #'large + \property Score.TextScript \set #'font-style = #'large \notes\relative c'' { c2._"pre-1850" b4\trill | c1 \bar "||" c2._"post-1850" b4\trill | c1 \bar "||" @@ -1847,7 +1847,7 @@ Other frequently used ornaments are the @emph{turn}, the @emph{mordent} and the @lilypond[13pt,eps] < \context Staff = sa { - \property Voice.TextScript \set #'font-style = #'large + \property Score.TextScript \set #'font-style = #'large \notes\relative c'' { a4_"turn" b\turn c2 \bar "||" g4_"mordent" a b\mordent a \bar "||" @@ -1991,7 +1991,7 @@ the same @w{@ar{}@strong{signature}}. @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c' { \key es \major es1_"e flat major" f g as bes c d es @@ -2250,7 +2250,7 @@ note. @w{@ar{}@strong{beam}} @lilypond[13pt,eps] \property Score.noAutoBeaming = ##t \property Score.barNonAuto = ##t -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { g2_"1/2" g' s16 g,4_"1/4" g' s16 @@ -2323,7 +2323,7 @@ the underlaying (normal) pulse and the actual (abnormal) rhythm. @ @lilypond[13pt,eps] -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \time 4/4 \notes\relative c' { \partial 4 @@ -2514,7 +2514,7 @@ a @w{@ar{}@strong{chord}}, usually in the distance of a third @lilypond[13pt,eps] \property Score.barNonAuto = ##t -\property Voice.TextScript \set #'font-style = #'large +\property Score.TextScript \set #'font-style = #'large \notes\relative c' { % e2:32_"a" f:32 [ e8:16 f:16 g:16 a:16 ] s4 [:32 e1_"b" g] % e2:32_"a" f:32 [ e8:16 f:16 g:16 a:16 ] s4 \repeat "tremolo" 16 { e32_"b" g } diff --git a/Documentation/user/moreinfo.itexi b/Documentation/user/moreinfo.itexi deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Documentation/user/mutopia.itely b/Documentation/user/mutopia.itely deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Documentation/user/programs.itexi b/Documentation/user/programs.itexi deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 0126eedb02..b791f4e8fc 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -296,6 +296,7 @@ A reminder accidental can be forced by adding an exclamation mark @code{!} after the pitch. A cautionary accidental, @cindex cautionary accidental +@cindex parenthesized accidental i.e., an accidental within parentheses can be obtained by adding the question mark `@code{?}' after the pitch. diff --git a/Documentation/user/toet.itely b/Documentation/user/toet.itely deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/INSTALL.txt b/INSTALL.txt index 1129221854..81c41a7990 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -37,7 +37,7 @@ INSTALL - compiling and installing GNU LilyPond This document describes how to build LilyPond on Unix platforms. It is also known to run and compile on Windows NT/95/98 as well. More information on this topic can be found at the LilyPond on Windows page -(ftp://ftp.lilypond.org/pub/LilyPond/gnu-windows/). +(http://www.lilypond.org/gnu-windows/). Downloading =========== diff --git a/VERSION b/VERSION index 4cdfcd10c9..e6420ebf80 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 -PATCH_LEVEL=0 -MY_PATCH_LEVEL=jcn7 +PATCH_LEVEL=1 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py index 8feec727d6..bb9c05919b 100755 --- a/buildscripts/mf-to-table.py +++ b/buildscripts/mf-to-table.py @@ -90,7 +90,7 @@ def write_afm_char_metric(file, charmetric): f = 1000; tup = (charmetric['code'], - charmetric['width'] + charmetric['breapth'], + (charmetric['width'] + charmetric['breapth'])*f, charmetric['name'], -charmetric['breapth'] *f, -charmetric['depth']*f, diff --git a/configure b/configure index f582a235e4..67fb475b0d 100755 --- a/configure +++ b/configure @@ -3147,7 +3147,7 @@ else #line 3148 "configure" #include "confdefs.h" #ifdef __cplusplus -extern "C" void exit(int); +extern "C" void exit(int) throw(); #endif main() @@ -3353,12 +3353,13 @@ cat >> confdefs.h <<EOF EOF -for ac_prog in makeinfo + + for ac_prog in makeinfo do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3362: checking for $ac_word" >&5 +echo "configure:3363: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3388,10 +3389,37 @@ test -n "$MAKEINFO" && break done test -n "$MAKEINFO" || MAKEINFO="error" + if test "$MAKEINFO" != "error"; then + echo $ac_n "checking whether makeinfo can split html by @node""... $ac_c" 1>&6 +echo "configure:3395: checking whether makeinfo can split html by @node" >&5 + mkdir -p out + makeinfo --html --output=out/split <<EOF +\input texinfo +\input texinfo @c -*-texinfo-*- +@setfilename split.info +@settitle split.info +@bye +EOF + if test -d out/split; then + SPLITTING_MAKEINFO=yes + echo "$ac_t""yes" 1>&6 + rm -rf out/split + else + echo "$ac_t""no" 1>&6 + + echo "configure: warning: your html documentation will be one large file" 1>&2 + warn_b=yes + + rm -rf out/split + fi + fi + + + # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3395: checking for $ac_word" >&5 +echo "configure:3423: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3625,6 +3653,7 @@ s%@BIBTEX2HTML@%$BIBTEX2HTML%g s%@BIBTEX2HTML_FLAGS@%$BIBTEX2HTML_FLAGS%g s%@LIBOBJS@%$LIBOBJS%g s%@MAKEINFO@%$MAKEINFO%g +s%@SPLITTING_MAKEINFO@%$SPLITTING_MAKEINFO%g s%@PERL@%$PERL%g CEOF diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly new file mode 100644 index 0000000000..0f487101b6 --- /dev/null +++ b/input/regression/script-stacked.ly @@ -0,0 +1,5 @@ + +\header { +texidoc = "Scripts may b4e stacked." +} +\score { \notes { c''->-. } } diff --git a/lily/afm.cc b/lily/afm.cc index 6786afd725..8fac391067 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -22,7 +22,13 @@ Adobe_font_metric::Adobe_font_metric (AFM_Font_info * fi) { AFM_CharMetricInfo * c = fi->cmi + i; - ascii_to_metric_idx_[c->code] = i; + /* + Some TeX afm files contain code = -1. We don't know why, let's + ignore it. + + */ + if (c->code >= 0) + ascii_to_metric_idx_[c->code] = i; name_to_metric_dict_[c->name] = i; } } diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index 06ff6bac74..8bad438909 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -8,7 +8,7 @@ #include <math.h> -#include <libc-extension.hh> +#include <libc-extension.hh> // isinf #include "side-position-interface.hh" #include "axis-group-interface.hh" diff --git a/lily/collision.cc b/lily/collision.cc index 792caf0d3e..5b6b815aa6 100644 --- a/lily/collision.cc +++ b/lily/collision.cc @@ -195,7 +195,10 @@ Collision::automatic_shift (Grob *me) { for (int i=0; i < clash_groups[d].size (); i++) { - offsets[d][i] -= d * 0.5; + if(Rhythmic_head::dot_count (nu_l) > Rhythmic_head::dot_count (nd_l)) + offsets[d][i] += d * 0.5; + else + offsets[d][i] -= d * 0.5; } } while ((flip (&d))!= UP); diff --git a/lily/include/auto-change-music.hh b/lily/include/auto-change-music.hh deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lily/include/request.hh b/lily/include/request.hh index c0090667d6..677be604f9 100644 --- a/lily/include/request.hh +++ b/lily/include/request.hh @@ -41,7 +41,6 @@ class Script_req : public virtual Request public: void set_direction (Direction d); Direction get_direction () const; - VIRTUAL_COPY_CONS (Music); Script_req (); }; diff --git a/lily/molecule.cc b/lily/molecule.cc index 7b440146ac..b414b498ae 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -7,7 +7,7 @@ */ #include <math.h> -#include <libc-extension.hh> +#include <libc-extension.hh> // isinf #include "font-metric.hh" #include "dimensions.hh" diff --git a/lily/music-ctor.cc b/lily/music-ctor.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lily/musical-request.cc b/lily/musical-request.cc index 463d0775e8..e4866b6064 100644 --- a/lily/musical-request.cc +++ b/lily/musical-request.cc @@ -16,7 +16,6 @@ Tremolo_req::Tremolo_req () { } - void Melodic_req::transpose (Pitch delta) { @@ -78,9 +77,6 @@ Note_req::Note_req () } - - - bool Span_req::do_equal_b (Request const*r) const { @@ -106,7 +102,8 @@ Articulation_req::do_equal_b (Request const* r) const { Articulation_req const* a = dynamic_cast<Articulation_req const*> (r); - return a; // && articulation_str_ == a->articulation_str_; + return a && gh_equal_p (get_mus_property ("articulation-type"), + r->get_mus_property ("articulation-type")); } @@ -114,11 +111,3 @@ Articulation_req::do_equal_b (Request const* r) const - - - - - - - - diff --git a/lily/request.cc b/lily/request.cc index 7ad67285b1..844f942a35 100644 --- a/lily/request.cc +++ b/lily/request.cc @@ -9,8 +9,6 @@ #include "request.hh" #include "debug.hh" - - bool Request::equal_b (Request const* r) const { @@ -23,15 +21,12 @@ Request::do_equal_b (Request const*) const return true; } - Request::Request () : Music (SCM_EOL) { set_mus_property ("type", ly_symbol2scm ("request")); } - - Script_req::Script_req () { set_direction (CENTER); @@ -51,7 +46,6 @@ Script_req::get_direction () const return (isdir_b (d)) ? to_dir (d) : CENTER; } - Direction Span_req::get_span_dir () const { @@ -68,3 +62,5 @@ Span_req::set_span_dir (Direction d) + + diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 4b2c44773d..256acd3dc4 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -4,7 +4,6 @@ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl> */ - #include "script.hh" #include "side-position-interface.hh" #include "musical-request.hh" @@ -12,7 +11,8 @@ #include "rhythmic-head.hh" #include "engraver.hh" -class Script_engraver : public Engraver { +class Script_engraver : public Engraver +{ Link_array<Grob> script_p_arr_; Link_array<Articulation_req> script_req_l_arr_; @@ -28,7 +28,6 @@ protected: virtual void acknowledge_grob (Grob_info); }; - void Script_engraver::initialize () { @@ -71,8 +70,7 @@ Script_engraver::process_music () // todo -> use result of articulation-to-scriptdef directly as basic prop list. Grob *p =new Item (get_property ("Script")); art = gh_cdr (art); - p->set_grob_property ("molecule", - gh_car (art)); + p->set_grob_property ("molecule", gh_car (art)); art = gh_cdr (art); bool follow_staff = gh_scm2bool (gh_car (art)); @@ -87,12 +85,10 @@ Script_engraver::process_music () art = gh_cdr (art); SCM priority = gh_car (art); - if (isdir_b (force_dir) && to_dir (force_dir)) p->set_grob_property ("direction", force_dir); else if (to_dir (relative_stem_dir)) p->set_grob_property ("side-relative-direction", relative_stem_dir); - /* diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index edf841a773..cea9d7079d 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -11,7 +11,7 @@ */ #include <math.h> -#include <libc-extension.hh> +#include <libc-extension.hh> // isinf #include "simple-spacer.hh" #include "paper-column.hh" diff --git a/lily/stem-tremolo-engraver.cc b/lily/stem-tremolo-engraver.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ly/fragment.ly b/ly/fragment.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/ly/key.ly b/ly/key.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in new file mode 100644 index 0000000000..6eeba3c36d --- /dev/null +++ b/make/lilypond.redhat.spec.in @@ -0,0 +1,137 @@ +%define info yes + +Name: lilypond +Version: @TOPLEVEL_VERSION@ +Release: 1 +License: GPL +Group: Applications/Publishing +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz +Summary: Create and print music notation +URL: http://www.cs.uu.nl/~hanwen/lilypond +BuildRoot: /tmp/lilypond-install +# add lots of Buildreq: flex, bison, tetex, tetex-devel, tetex-latex, texinfo +# better prereqs: tetex-latex, python, (mpost?) etc. +Prereq: tetex + + +%description +LilyPond lets you create music notation. It produces +beautiful sheet music from a high-level description file. + +%package documentation +Summary: Prebuilt website containing all LilyPond documentation. +Group: Applications/Publishing +# BuildArchitectures: noarch + +%description documentation + +The documentation of LilyPond, both in HTML and PostScript. + +%prep +%setup + +%build + +# DO NOT use % { configure } , it hardcodes all paths, runs libtool, +# so we can't do make prefix=/tmp/ install. + +# In fact, do not take out the spaces between % and { in the above comment, +# because RPM will gladly do a substitution anyway. + +./configure --disable-checking --prefix=%{_prefix} --enable-optimise + +make all + +# make info +make -C Documentation + +# make html +make web-doc top-web + +%install + + +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc + +strip lily/out/lilypond midi2ly/out/midi2ly +make prefix="$RPM_BUILD_ROOT%{_prefix}" install + +%if info=="yes" +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* +%endif + +mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d +install -m 644 lilypond-mode.el lilypond-font-lock.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ +install -m 644 lilypond-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d + +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* + +mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d +cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh +cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh + + +# again, make sure that main package installs even if doco fails +mkdir -p web/out +tar -C web -xzf out/web.tar.gz + + +%post + +touch /tmp/.lilypond-install +rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install + +%if info=="yes" +/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir +%endif + +%preun + +%if info=="yes" +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir +fi +%endif + + +%files +%defattr(-, root, root) +%{_datadir}/emacs/site-lisp/lilypond-* +%{_datadir}/emacs/site-lisp/site-start.d/lilypond-* + +%{_prefix}/bin/abc2ly +%{_prefix}/bin/as2text +%{_prefix}/bin/convert-ly +%{_prefix}/bin/etf2ly +%{_prefix}/bin/lilypond +%{_prefix}/bin/ly2dvi +%{_prefix}/bin/midi2ly +%{_prefix}/bin/lilypond-book +%{_prefix}/bin/mup2ly +%{_prefix}/bin/musedata2ly +%{_prefix}/bin/pmx2ly + +%if info=="yes" +%{_prefix}/info/lilypond.info.gz +%{_prefix}/info/lilypond-internals.info.gz +%endif + +%{_prefix}/man/man1/abc2ly.1.gz +%{_prefix}/man/man1/as2text.1.gz +%{_prefix}/man/man1/convert-ly.1.gz +%{_prefix}/man/man1/etf2ly.1.gz +%{_prefix}/man/man1/lilypond.1.gz +%{_prefix}/man/man1/ly2dvi.1.gz +%{_prefix}/man/man1/midi2ly.1.gz +%{_prefix}/man/man1/lilypond-book.1.gz +%{_prefix}/man/man1/musedata2ly.1.gz +%{_prefix}/man/man1/mup2ly.1.gz +%{_prefix}/man/man1/pmx2ly.1.gz + +%{_prefix}/share/lilypond/ +%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo +%{_prefix}/../etc/profile.d/lilypond.* + +%files documentation +%doc web/ diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in new file mode 100644 index 0000000000..4c3253f95b --- /dev/null +++ b/make/lilypond.suse.spec.in @@ -0,0 +1,300 @@ +# +# spec file for package lilypond (Version 1.3.149) +# based on +# spec file for package lilypond (Version 1.2.17) +# Copyright (c) 2000 SuSE GmbH Nuernberg, Germany. +# +# Please send bug reports to schlemme@mathe.tu-freiberg.de + +%define info yes + +# neededforbuild guile tcsh tetex te_latex te_mpost libpng python gpp libgpp gettext autoconf netpbm libnetpb gs_serv gs_lib gs_fonts guile +# usedforbuild aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib devs diff ext2fs file fileutil find flex gawk gcc gdbm gettext gpm gpp gppshare groff gs_fonts gs_lib gs_serv guile gzip kbd less libc libgpp libnetpb libpng libtool libz lx_suse make mktemp modules ncurses net_tool netcfg netpbm nkita nkitb nssv1 pam patch perl pgp ps python rcs rpm sendmail sh_utils shadow shlibs strace syslogd sysvinit tcsh te_ams te_latex te_mpost tetex texinfo textutil timezone unzip util vim xdevel xf86 xshared guile + + +Distribution: SuSE Linux 7.0 (i386) +Name: lilypond +Version: @TOPLEVEL_VERSION@ +Release: 2 +Copyright: GPL +Group: Applications/Publishing +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz +# music notation software for.. ? +Summary: A program for printing sheet music. +URL: http://www.lilypond.org/ +# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm +# Icon: lilypond-icon.xpm +BuildRoot: /tmp/lilypond-install +# add lots of Buildreq: tetex-kpath, te_mpost, bison +# better prereqs: tetex-latex, python, (mpost?) etc. +Prereq: tetex python + +# use keywords: music notation software +%description +LilyPond is a music typesetter. It produces beautiful +sheet music using a high level description file as input. LilyPond is +part of the GNU Project. + +Authors: +-------- + Han-Wen Nienhuys <hanwen@cs.uu.nl> + Jan Nieuwenhuizen <janneke@gnu.org> + Alexandre Oliva <oliva@dcc.unicamp.br> + Mats Bengtsson <matsb@s3.kth.se> + Eric Bullinger <eric@aut.ee.ethz.ch> + Jan Arne Fagertun <Jan.A.Fagertun@energy.sintef.no> + Anthony Fok <foka@debian.org> + Neil Jerram <nj104@cus.cam.ac.uk> + Donald Ervin Knuth + Werner Lemberg <wl@gnu.org> + David R. Linn <drl@vuse.vanderbilt.edu> + François Pinard <pinard@iro.umontreal.ca> + Jeffrey B. Reed <daboys@bga.com> + Shay Rojanski + Tom Cato Amundsen <tca@gnu.org> + Laura Conrad <lconrad@world.std.com> + James Hammons <jlhamm@pacificnet.net> + Bjoern Jacke <bjoern.jacke@gmx.de> + Michael Krause <m.krause@tu-harburg.de> + David R. Linn <drl@vuse.vanderbilt.edu> + Adrian Mariano + Stephen Peters <portnoy@ai.mit.edu> + Glen Prideaux <glenprideaux@iname.com> + Roy R. Rankin <Roy.Rankin@alcatel.com.au> + Juergen Reuter <reuterj@ira.uka.de> + August S.Sigov <august@infran.ru> + Rune Zedeler <rune@zedeler.dk> + +SuSE series: ap + +%package doc +Summary: Prebuilt website containing all LilyPond documentation. +Group: Applications/Publishing +# BuildArchitectures: noarch + +%description doc + +The documentation of LilyPond, both in HTML and PostScript. + +%define INSTALL install -m755 -s +%define INSTALL_DIR install -d -m755 +%define INSTALL_DATA install -m644 +%prep +%setup + +%build + +# + +# DO NOT use % { configure } , it hardcodes all paths, runs libtool, +# so we can't do make prefix=/tmp/ install. + +# In fact, do not take out the spaces between % and { , because RPM will gladly +# do a substitution anyway. + +CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --enable-optimise --enable-shared + +make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all + +# urg +# %build doc +# line 42: second %build +# ok, now make sure that lilypond package will succeed, +# even if documentation fails to build + +make -C Documentation || true +make web-doc top-web || true + +%install + + + +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc + +## this is an ugly hack +mkdir -p scripts/share/lilypond/tex +cp tex/titledefs.tex scripts/share/lilypond/tex +## end of hack + + +strip lily/out/lilypond midi2ly/out/midi2ly +make prefix="$RPM_BUILD_ROOT%{_prefix}" install + +%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond +(cd $RPM_BUILD_ROOT/usr/share/lilypond \ + && mv mf/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond \ + && rm -fr mf \ + && ln -s ../texmf/fonts/source/public/lilypond mf) +%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond +(cd $RPM_BUILD_ROOT/usr/share/lilypond \ + && mv afm/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond \ + && rm -fr afm \ + && ln -s ../texmf/fonts/afm/lilypond afm) +%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond +(cd $RPM_BUILD_ROOT/usr/share/lilypond \ + && mv tex/* $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond \ + && rm -fr tex \ + && ln -s ../texmf/tex/lilypond tex) +%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps +(cd $RPM_BUILD_ROOT/usr/share/lilypond \ + && mv ps/* $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps \ + && rm -fr ps \ + && ln -s ../texmf/lilypond/ps ps) + + +%if info=="yes" +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true +%endif + + + +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true + + + + +mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d +cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh +cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh + +# urg +#%install doc +#line 63: second %install +# again, make sure that main package installs even if doco fails +mkdir -p web/out +tar -C web -xzf out/web.tar.gz || true + +%ifos cygwin +# urg, this symlink doesn't come through on cygwin +# this is the way symlinks work over there, let's fake one +rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm +echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm +%{fix_suffixes} +%endif + +%{?suse_check} + + +%pre +if [ -d usr/share/lilypond/ps ]; then + mv usr/share/lilypond/ps usr/share/lilypond/ps.old + echo "please, remove /usr/share/lilypond/ps.old manually." +fi + +%post + +touch /tmp/.lilypond-install +rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install +%if info=="yes" +/usr/bin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +%endif +mkdir -p var/adm/SuSEconfig +touch var/adm/SuSEconfig/run-texhash + + +%preun +%if info=="yes" +if [ $1 = 0 ]; then + /usr/bin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +fi +%endif + +%postun +mkdir -p var/adm/SuSEconfig +touch var/adm/SuSEconfig/run-texhash + + + +%files +%defattr(-, root, root) +%doc CHANGES COPYING DEDICATION INSTALL.txt NEWS +%doc README.txt FAQ.txt AUTHORS.txt VERSION ROADMAP +%doc buildscripts/ +%doc scripts/ +# hairy to hook it in (possibly non-existing) emacs +%doc lilypond-mode.el +%doc lilypond-font-lock.el + +%config /etc/profile.d/* + +%ifnos cygwin +%{_prefix}/bin/abc2ly +%{_prefix}/bin/as2text +%{_prefix}/bin/convert-ly +%{_prefix}/bin/etf2ly +%{_prefix}/bin/lilypond +%{_prefix}/bin/ly2dvi +%{_prefix}/bin/midi2ly +%{_prefix}/bin/lilypond-book +%{_prefix}/bin/mup2ly +%{_prefix}/bin/musedata2ly +%{_prefix}/bin/pmx2ly +%else +%{_prefix}/bin +%endif + +%if info=="yes" +%{_prefix}/info/lilypond.info.gz +%{_prefix}/info/lilypond-internals.info.gz +%endif + +%{_prefix}/man/man1/abc2ly.1.gz +%{_prefix}/man/man1/as2text.1.gz +%{_prefix}/man/man1/convert-ly.1.gz +%{_prefix}/man/man1/etf2ly.1.gz +%{_prefix}/man/man1/lilypond.1.gz +%{_prefix}/man/man1/ly2dvi.1.gz +%{_prefix}/man/man1/midi2ly.1.gz +%{_prefix}/man/man1/lilypond-book.1.gz +%{_prefix}/man/man1/musedata2ly.1.gz +%{_prefix}/man/man1/mup2ly.1.gz +%{_prefix}/man/man1/pmx2ly.1.gz + +%{_prefix}/share/lilypond/ +%{_prefix}/share/texmf/ +%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo +# urg? +#%{_prefix}/../etc/profile.d/lilypond.* + +%files doc +# this gets too messy... +%doc mutopia/ +%doc input/ +%doc web/ +# verbatim include of input: list the directory without issuing a %dir + +%changelog -n lilypond +* Sun Apr 22 2001 - schlemme@mathe.tu-freiberg.de +- update: 1.3.149 +* Mon Apr 10 2000 - bk@suse.de +- added suse update config macro +* Thu Mar 16 2000 - kukuk@suse.de +- Use gs_serv, not gs_both (doesn't exist on all platforms) +* Wed Mar 01 2000 - uli@suse.de +- moved man pages to /usr/share +* Tue Dec 21 1999 - ke@suse.de +- add documentation (#271). +* Mon Dec 13 1999 - ke@suse.de +- update: 1.2.17. +- compiler fix (thanks to schwab@suse.de). +- #271. +* Mon Oct 25 1999 - ke@suse.de +- update: 1.2.16. +* Mon Sep 13 1999 - bs@suse.de +- ran old prepare_spec on spec file to switch to new prepare_spec. +* Mon Sep 06 1999 - ro@suse.de +- update to 1.2.6 to make it compile with new guile +- various fixes and one hack to make this compile at all +* Sun Aug 22 1999 - ke@suse.de +- provide /etc/profile.d scripts. +- make lily.ps available (thanks to Ulrich Windl). +* Tue Aug 17 1999 - ke@suse.de +- update: version 1.2.1. +* Thu Nov 05 1998 - ke@suse.de +- use the TDS and provide links from /usr/share/lilypond. +- install examples via %doc. +* Wed Oct 28 1998 - ke@suse.de +- update: version 1.0.17. +* Fri Aug 07 1998 - ke@suse.de +- initial package: version 1.0.0 diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 26caf0622e..2e2b9c9a3d 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.4.0 -Entered-date: 10MAY01 +Version: 1.4.1 +Entered-date: 15MAY01 Description: @BLURB@ 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.4.0.tar.gz + 1000k lilypond-1.4.1.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.4.0.tar.gz + 1000k lilypond-1.4.1.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.redhat.spec b/make/out/lilypond.redhat.spec new file mode 100644 index 0000000000..7a4cec8be8 --- /dev/null +++ b/make/out/lilypond.redhat.spec @@ -0,0 +1,137 @@ +%define info yes + +Name: lilypond +Version: 1.4.1 +Release: 1 +License: GPL +Group: Applications/Publishing +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.1.tar.gz +Summary: Create and print music notation +URL: http://www.cs.uu.nl/~hanwen/lilypond +BuildRoot: /tmp/lilypond-install +# add lots of Buildreq: flex, bison, tetex, tetex-devel, tetex-latex, texinfo +# better prereqs: tetex-latex, python, (mpost?) etc. +Prereq: tetex + + +%description +LilyPond lets you create music notation. It produces +beautiful sheet music from a high-level description file. + +%package documentation +Summary: Prebuilt website containing all LilyPond documentation. +Group: Applications/Publishing +# BuildArchitectures: noarch + +%description documentation + +The documentation of LilyPond, both in HTML and PostScript. + +%prep +%setup + +%build + +# DO NOT use % { configure } , it hardcodes all paths, runs libtool, +# so we can't do make prefix=/tmp/ install. + +# In fact, do not take out the spaces between % and { in the above comment, +# because RPM will gladly do a substitution anyway. + +./configure --disable-checking --prefix=%{_prefix} --enable-optimise + +make all + +# make info +make -C Documentation + +# make html +make web-doc top-web + +%install + + +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc + +strip lily/out/lilypond midi2ly/out/midi2ly +make prefix="$RPM_BUILD_ROOT%{_prefix}" install + +%if info=="yes" +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* +%endif + +mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d +install -m 644 lilypond-mode.el lilypond-font-lock.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ +install -m 644 lilypond-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d + +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* + +mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d +cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh +cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh + + +# again, make sure that main package installs even if doco fails +mkdir -p web/out +tar -C web -xzf out/web.tar.gz + + +%post + +touch /tmp/.lilypond-install +rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install + +%if info=="yes" +/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir +%endif + +%preun + +%if info=="yes" +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir +fi +%endif + + +%files +%defattr(-, root, root) +%{_datadir}/emacs/site-lisp/lilypond-* +%{_datadir}/emacs/site-lisp/site-start.d/lilypond-* + +%{_prefix}/bin/abc2ly +%{_prefix}/bin/as2text +%{_prefix}/bin/convert-ly +%{_prefix}/bin/etf2ly +%{_prefix}/bin/lilypond +%{_prefix}/bin/ly2dvi +%{_prefix}/bin/midi2ly +%{_prefix}/bin/lilypond-book +%{_prefix}/bin/mup2ly +%{_prefix}/bin/musedata2ly +%{_prefix}/bin/pmx2ly + +%if info=="yes" +%{_prefix}/info/lilypond.info.gz +%{_prefix}/info/lilypond-internals.info.gz +%endif + +%{_prefix}/man/man1/abc2ly.1.gz +%{_prefix}/man/man1/as2text.1.gz +%{_prefix}/man/man1/convert-ly.1.gz +%{_prefix}/man/man1/etf2ly.1.gz +%{_prefix}/man/man1/lilypond.1.gz +%{_prefix}/man/man1/ly2dvi.1.gz +%{_prefix}/man/man1/midi2ly.1.gz +%{_prefix}/man/man1/lilypond-book.1.gz +%{_prefix}/man/man1/musedata2ly.1.gz +%{_prefix}/man/man1/mup2ly.1.gz +%{_prefix}/man/man1/pmx2ly.1.gz + +%{_prefix}/share/lilypond/ +%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo +%{_prefix}/../etc/profile.d/lilypond.* + +%files documentation +%doc web/ diff --git a/make/out/lilypond.suse.spec b/make/out/lilypond.suse.spec new file mode 100644 index 0000000000..da4af336be --- /dev/null +++ b/make/out/lilypond.suse.spec @@ -0,0 +1,300 @@ +# +# spec file for package lilypond (Version 1.3.149) +# based on +# spec file for package lilypond (Version 1.2.17) +# Copyright (c) 2000 SuSE GmbH Nuernberg, Germany. +# +# Please send bug reports to schlemme@mathe.tu-freiberg.de + +%define info yes + +# neededforbuild guile tcsh tetex te_latex te_mpost libpng python gpp libgpp gettext autoconf netpbm libnetpb gs_serv gs_lib gs_fonts guile +# usedforbuild aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib devs diff ext2fs file fileutil find flex gawk gcc gdbm gettext gpm gpp gppshare groff gs_fonts gs_lib gs_serv guile gzip kbd less libc libgpp libnetpb libpng libtool libz lx_suse make mktemp modules ncurses net_tool netcfg netpbm nkita nkitb nssv1 pam patch perl pgp ps python rcs rpm sendmail sh_utils shadow shlibs strace syslogd sysvinit tcsh te_ams te_latex te_mpost tetex texinfo textutil timezone unzip util vim xdevel xf86 xshared guile + + +Distribution: SuSE Linux 7.0 (i386) +Name: lilypond +Version: 1.4.1 +Release: 2 +Copyright: GPL +Group: Applications/Publishing +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.1.tar.gz +# music notation software for.. ? +Summary: A program for printing sheet music. +URL: http://www.lilypond.org/ +# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm +# Icon: lilypond-icon.xpm +BuildRoot: /tmp/lilypond-install +# add lots of Buildreq: tetex-kpath, te_mpost, bison +# better prereqs: tetex-latex, python, (mpost?) etc. +Prereq: tetex python + +# use keywords: music notation software +%description +LilyPond is a music typesetter. It produces beautiful +sheet music using a high level description file as input. LilyPond is +part of the GNU Project. + +Authors: +-------- + Han-Wen Nienhuys <hanwen@cs.uu.nl> + Jan Nieuwenhuizen <janneke@gnu.org> + Alexandre Oliva <oliva@dcc.unicamp.br> + Mats Bengtsson <matsb@s3.kth.se> + Eric Bullinger <eric@aut.ee.ethz.ch> + Jan Arne Fagertun <Jan.A.Fagertun@energy.sintef.no> + Anthony Fok <foka@debian.org> + Neil Jerram <nj104@cus.cam.ac.uk> + Donald Ervin Knuth + Werner Lemberg <wl@gnu.org> + David R. Linn <drl@vuse.vanderbilt.edu> + François Pinard <pinard@iro.umontreal.ca> + Jeffrey B. Reed <daboys@bga.com> + Shay Rojanski + Tom Cato Amundsen <tca@gnu.org> + Laura Conrad <lconrad@world.std.com> + James Hammons <jlhamm@pacificnet.net> + Bjoern Jacke <bjoern.jacke@gmx.de> + Michael Krause <m.krause@tu-harburg.de> + David R. Linn <drl@vuse.vanderbilt.edu> + Adrian Mariano + Stephen Peters <portnoy@ai.mit.edu> + Glen Prideaux <glenprideaux@iname.com> + Roy R. Rankin <Roy.Rankin@alcatel.com.au> + Juergen Reuter <reuterj@ira.uka.de> + August S.Sigov <august@infran.ru> + Rune Zedeler <rune@zedeler.dk> + +SuSE series: ap + +%package doc +Summary: Prebuilt website containing all LilyPond documentation. +Group: Applications/Publishing +# BuildArchitectures: noarch + +%description doc + +The documentation of LilyPond, both in HTML and PostScript. + +%define INSTALL install -m755 -s +%define INSTALL_DIR install -d -m755 +%define INSTALL_DATA install -m644 +%prep +%setup + +%build + +# + +# DO NOT use % { configure } , it hardcodes all paths, runs libtool, +# so we can't do make prefix=/tmp/ install. + +# In fact, do not take out the spaces between % and { , because RPM will gladly +# do a substitution anyway. + +CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --enable-optimise --enable-shared + +make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all + +# urg +# %build doc +# line 42: second %build +# ok, now make sure that lilypond package will succeed, +# even if documentation fails to build + +make -C Documentation || true +make web-doc top-web || true + +%install + + + +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc + +## this is an ugly hack +mkdir -p scripts/share/lilypond/tex +cp tex/titledefs.tex scripts/share/lilypond/tex +## end of hack + + +strip lily/out/lilypond midi2ly/out/midi2ly +make prefix="$RPM_BUILD_ROOT%{_prefix}" install + +%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond +(cd $RPM_BUILD_ROOT/usr/share/lilypond \ + && mv mf/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond \ + && rm -fr mf \ + && ln -s ../texmf/fonts/source/public/lilypond mf) +%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond +(cd $RPM_BUILD_ROOT/usr/share/lilypond \ + && mv afm/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond \ + && rm -fr afm \ + && ln -s ../texmf/fonts/afm/lilypond afm) +%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond +(cd $RPM_BUILD_ROOT/usr/share/lilypond \ + && mv tex/* $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond \ + && rm -fr tex \ + && ln -s ../texmf/tex/lilypond tex) +%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps +(cd $RPM_BUILD_ROOT/usr/share/lilypond \ + && mv ps/* $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps \ + && rm -fr ps \ + && ln -s ../texmf/lilypond/ps ps) + + +%if info=="yes" +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true +%endif + + + +gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true + + + + +mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d +cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh +cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh + +# urg +#%install doc +#line 63: second %install +# again, make sure that main package installs even if doco fails +mkdir -p web/out +tar -C web -xzf out/web.tar.gz || true + +%ifos cygwin +# urg, this symlink doesn't come through on cygwin +# this is the way symlinks work over there, let's fake one +rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm +echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm +%{fix_suffixes} +%endif + +%{?suse_check} + + +%pre +if [ -d usr/share/lilypond/ps ]; then + mv usr/share/lilypond/ps usr/share/lilypond/ps.old + echo "please, remove /usr/share/lilypond/ps.old manually." +fi + +%post + +touch /tmp/.lilypond-install +rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install +%if info=="yes" +/usr/bin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +%endif +mkdir -p var/adm/SuSEconfig +touch var/adm/SuSEconfig/run-texhash + + +%preun +%if info=="yes" +if [ $1 = 0 ]; then + /usr/bin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true +fi +%endif + +%postun +mkdir -p var/adm/SuSEconfig +touch var/adm/SuSEconfig/run-texhash + + + +%files +%defattr(-, root, root) +%doc CHANGES COPYING DEDICATION INSTALL.txt NEWS +%doc README.txt FAQ.txt AUTHORS.txt VERSION ROADMAP +%doc buildscripts/ +%doc scripts/ +# hairy to hook it in (possibly non-existing) emacs +%doc lilypond-mode.el +%doc lilypond-font-lock.el + +%config /etc/profile.d/* + +%ifnos cygwin +%{_prefix}/bin/abc2ly +%{_prefix}/bin/as2text +%{_prefix}/bin/convert-ly +%{_prefix}/bin/etf2ly +%{_prefix}/bin/lilypond +%{_prefix}/bin/ly2dvi +%{_prefix}/bin/midi2ly +%{_prefix}/bin/lilypond-book +%{_prefix}/bin/mup2ly +%{_prefix}/bin/musedata2ly +%{_prefix}/bin/pmx2ly +%else +%{_prefix}/bin +%endif + +%if info=="yes" +%{_prefix}/info/lilypond.info.gz +%{_prefix}/info/lilypond-internals.info.gz +%endif + +%{_prefix}/man/man1/abc2ly.1.gz +%{_prefix}/man/man1/as2text.1.gz +%{_prefix}/man/man1/convert-ly.1.gz +%{_prefix}/man/man1/etf2ly.1.gz +%{_prefix}/man/man1/lilypond.1.gz +%{_prefix}/man/man1/ly2dvi.1.gz +%{_prefix}/man/man1/midi2ly.1.gz +%{_prefix}/man/man1/lilypond-book.1.gz +%{_prefix}/man/man1/musedata2ly.1.gz +%{_prefix}/man/man1/mup2ly.1.gz +%{_prefix}/man/man1/pmx2ly.1.gz + +%{_prefix}/share/lilypond/ +%{_prefix}/share/texmf/ +%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo +# urg? +#%{_prefix}/../etc/profile.d/lilypond.* + +%files doc +# this gets too messy... +%doc mutopia/ +%doc input/ +%doc web/ +# verbatim include of input: list the directory without issuing a %dir + +%changelog -n lilypond +* Sun Apr 22 2001 - schlemme@mathe.tu-freiberg.de +- update: 1.3.149 +* Mon Apr 10 2000 - bk@suse.de +- added suse update config macro +* Thu Mar 16 2000 - kukuk@suse.de +- Use gs_serv, not gs_both (doesn't exist on all platforms) +* Wed Mar 01 2000 - uli@suse.de +- moved man pages to /usr/share +* Tue Dec 21 1999 - ke@suse.de +- add documentation (#271). +* Mon Dec 13 1999 - ke@suse.de +- update: 1.2.17. +- compiler fix (thanks to schwab@suse.de). +- #271. +* Mon Oct 25 1999 - ke@suse.de +- update: 1.2.16. +* Mon Sep 13 1999 - bs@suse.de +- ran old prepare_spec on spec file to switch to new prepare_spec. +* Mon Sep 06 1999 - ro@suse.de +- update to 1.2.6 to make it compile with new guile +- various fixes and one hack to make this compile at all +* Sun Aug 22 1999 - ke@suse.de +- provide /etc/profile.d scripts. +- make lily.ps available (thanks to Ulrich Windl). +* Tue Aug 17 1999 - ke@suse.de +- update: version 1.2.1. +* Thu Nov 05 1998 - ke@suse.de +- use the TDS and provide links from /usr/share/lilypond. +- install examples via %doc. +* Wed Oct 28 1998 - ke@suse.de +- update: version 1.0.17. +* Fri Aug 07 1998 - ke@suse.de +- initial package: version 1.0.0 diff --git a/make/out/redhat.spec b/make/out/redhat.spec deleted file mode 100644 index ed8481bb77..0000000000 --- a/make/out/redhat.spec +++ /dev/null @@ -1,137 +0,0 @@ -%define info yes - -Name: lilypond -Version: 1.4.0 -Release: 1 -License: GPL -Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.0.tar.gz -Summary: Create and print music notation -URL: http://www.cs.uu.nl/~hanwen/lilypond -BuildRoot: /tmp/lilypond-install -# add lots of Buildreq: flex, bison, tetex, tetex-devel, tetex-latex, texinfo -# better prereqs: tetex-latex, python, (mpost?) etc. -Prereq: tetex - - -%description -LilyPond lets you create music notation. It produces -beautiful sheet music from a high-level description file. - -%package documentation -Summary: Prebuilt website containing all LilyPond documentation. -Group: Applications/Publishing -# BuildArchitectures: noarch - -%description documentation - -The documentation of LilyPond, both in HTML and PostScript. - -%prep -%setup - -%build - -# DO NOT use % { configure } , it hardcodes all paths, runs libtool, -# so we can't do make prefix=/tmp/ install. - -# In fact, do not take out the spaces between % and { in the above comment, -# because RPM will gladly do a substitution anyway. - -./configure --disable-checking --prefix=%{_prefix} --enable-optimise - -make all - -# make info -make -C Documentation - -# make html -make web-doc top-web - -%install - - -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc - -strip lily/out/lilypond midi2ly/out/midi2ly -make prefix="$RPM_BUILD_ROOT%{_prefix}" install - -%if info=="yes" -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* -%endif - -mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d -install -m 644 lilypond-mode.el lilypond-font-lock.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ -install -m 644 lilypond-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d - -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* - -mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d -cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh -cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh - - -# again, make sure that main package installs even if doco fails -mkdir -p web/out -tar -C web -xzf out/web.tar.gz - - -%post - -touch /tmp/.lilypond-install -rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install - -%if info=="yes" -/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir -%endif - -%preun - -%if info=="yes" -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir -fi -%endif - - -%files - -%{_datadir}/emacs/site-lisp/lilypond-* -%{_datadir}/emacs/site-lisp/site-start.d/lilypond-* - -%{_prefix}/bin/abc2ly -%{_prefix}/bin/as2text -%{_prefix}/bin/convert-ly -%{_prefix}/bin/etf2ly -%{_prefix}/bin/lilypond -%{_prefix}/bin/ly2dvi -%{_prefix}/bin/midi2ly -%{_prefix}/bin/lilypond-book -%{_prefix}/bin/mup2ly -%{_prefix}/bin/musedata2ly -%{_prefix}/bin/pmx2ly - -%if info=="yes" -%{_prefix}/info/lilypond.info.gz -%{_prefix}/info/lilypond-internals.info.gz -%endif - -%{_prefix}/man/man1/abc2ly.1.gz -%{_prefix}/man/man1/as2text.1.gz -%{_prefix}/man/man1/convert-ly.1.gz -%{_prefix}/man/man1/etf2ly.1.gz -%{_prefix}/man/man1/lilypond.1.gz -%{_prefix}/man/man1/ly2dvi.1.gz -%{_prefix}/man/man1/midi2ly.1.gz -%{_prefix}/man/man1/lilypond-book.1.gz -%{_prefix}/man/man1/musedata2ly.1.gz -%{_prefix}/man/man1/mup2ly.1.gz -%{_prefix}/man/man1/pmx2ly.1.gz - -%{_prefix}/share/lilypond/ -%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo -%{_prefix}/../etc/profile.d/lilypond.* - -%files documentation -%doc web/ diff --git a/make/out/suse.spec b/make/out/suse.spec deleted file mode 100644 index a0ece8b2e1..0000000000 --- a/make/out/suse.spec +++ /dev/null @@ -1,300 +0,0 @@ -# -# spec file for package lilypond (Version 1.3.149) -# based on -# spec file for package lilypond (Version 1.2.17) -# Copyright (c) 2000 SuSE GmbH Nuernberg, Germany. -# -# Please send bug reports to schlemme@mathe.tu-freiberg.de - -%define info yes - -# neededforbuild guile tcsh tetex te_latex te_mpost libpng python gpp libgpp gettext autoconf netpbm libnetpb gs_serv gs_lib gs_fonts guile -# usedforbuild aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib devs diff ext2fs file fileutil find flex gawk gcc gdbm gettext gpm gpp gppshare groff gs_fonts gs_lib gs_serv guile gzip kbd less libc libgpp libnetpb libpng libtool libz lx_suse make mktemp modules ncurses net_tool netcfg netpbm nkita nkitb nssv1 pam patch perl pgp ps python rcs rpm sendmail sh_utils shadow shlibs strace syslogd sysvinit tcsh te_ams te_latex te_mpost tetex texinfo textutil timezone unzip util vim xdevel xf86 xshared guile - - -Distribution: SuSE Linux 7.0 (i386) -Name: lilypond -Version: 1.4.0 -Release: 2 -Copyright: GPL -Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.0.tar.gz -# music notation software for.. ? -Summary: A program for printing sheet music. -URL: http://www.lilypond.org/ -# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm -# Icon: lilypond-icon.xpm -BuildRoot: /tmp/lilypond-install -# add lots of Buildreq: tetex-kpath, te_mpost, bison -# better prereqs: tetex-latex, python, (mpost?) etc. -Prereq: tetex python - -# use keywords: music notation software -%description -LilyPond is a music typesetter. It produces beautiful -sheet music using a high level description file as input. LilyPond is -part of the GNU Project. - -Authors: --------- - Han-Wen Nienhuys <hanwen@cs.uu.nl> - Jan Nieuwenhuizen <janneke@gnu.org> - Alexandre Oliva <oliva@dcc.unicamp.br> - Mats Bengtsson <matsb@s3.kth.se> - Eric Bullinger <eric@aut.ee.ethz.ch> - Jan Arne Fagertun <Jan.A.Fagertun@energy.sintef.no> - Anthony Fok <foka@debian.org> - Neil Jerram <nj104@cus.cam.ac.uk> - Donald Ervin Knuth - Werner Lemberg <wl@gnu.org> - David R. Linn <drl@vuse.vanderbilt.edu> - François Pinard <pinard@iro.umontreal.ca> - Jeffrey B. Reed <daboys@bga.com> - Shay Rojanski - Tom Cato Amundsen <tca@gnu.org> - Laura Conrad <lconrad@world.std.com> - James Hammons <jlhamm@pacificnet.net> - Bjoern Jacke <bjoern.jacke@gmx.de> - Michael Krause <m.krause@tu-harburg.de> - David R. Linn <drl@vuse.vanderbilt.edu> - Adrian Mariano - Stephen Peters <portnoy@ai.mit.edu> - Glen Prideaux <glenprideaux@iname.com> - Roy R. Rankin <Roy.Rankin@alcatel.com.au> - Juergen Reuter <reuterj@ira.uka.de> - August S.Sigov <august@infran.ru> - Rune Zedeler <rune@zedeler.dk> - -SuSE series: ap - -%package doc -Summary: Prebuilt website containing all LilyPond documentation. -Group: Applications/Publishing -# BuildArchitectures: noarch - -%description doc - -The documentation of LilyPond, both in HTML and PostScript. - -%define INSTALL install -m755 -s -%define INSTALL_DIR install -d -m755 -%define INSTALL_DATA install -m644 -%prep -%setup - -%build - -# - -# DO NOT use % { configure } , it hardcodes all paths, runs libtool, -# so we can't do make prefix=/tmp/ install. - -# In fact, do not take out the spaces between % and { , because RPM will gladly -# do a substitution anyway. - -CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --enable-optimise --enable-shared - -make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all - -# urg -# %build doc -# line 42: second %build -# ok, now make sure that lilypond package will succeed, -# even if documentation fails to build - -make -C Documentation || true -make web-doc top-web || true - -%install - - - -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc - -## this is an ugly hack -mkdir -p scripts/share/lilypond/tex -cp tex/titledefs.tex scripts/share/lilypond/tex -## end of hack - - -strip lily/out/lilypond midi2ly/out/midi2ly -make prefix="$RPM_BUILD_ROOT%{_prefix}" install - -%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond -(cd $RPM_BUILD_ROOT/usr/share/lilypond \ - && mv mf/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond \ - && rm -fr mf \ - && ln -s ../texmf/fonts/source/public/lilypond mf) -%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond -(cd $RPM_BUILD_ROOT/usr/share/lilypond \ - && mv afm/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond \ - && rm -fr afm \ - && ln -s ../texmf/fonts/afm/lilypond afm) -%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond -(cd $RPM_BUILD_ROOT/usr/share/lilypond \ - && mv tex/* $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond \ - && rm -fr tex \ - && ln -s ../texmf/tex/lilypond tex) -%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps -(cd $RPM_BUILD_ROOT/usr/share/lilypond \ - && mv ps/* $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps \ - && rm -fr ps \ - && ln -s ../texmf/lilypond/ps ps) - - -%if info=="yes" -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true -%endif - - - -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true - - - - -mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d -cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh -cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh - -# urg -#%install doc -#line 63: second %install -# again, make sure that main package installs even if doco fails -mkdir -p web/out -tar -C web -xzf out/web.tar.gz || true - -%ifos cygwin -# urg, this symlink doesn't come through on cygwin -# this is the way symlinks work over there, let's fake one -rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm -echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm -%{fix_suffixes} -%endif - -%{?suse_check} - - -%pre -if [ -d usr/share/lilypond/ps ]; then - mv usr/share/lilypond/ps usr/share/lilypond/ps.old - echo "please, remove /usr/share/lilypond/ps.old manually." -fi - -%post - -touch /tmp/.lilypond-install -rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install -%if info=="yes" -/usr/bin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true -%endif -mkdir -p var/adm/SuSEconfig -touch var/adm/SuSEconfig/run-texhash - - -%preun -%if info=="yes" -if [ $1 = 0 ]; then - /usr/bin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true -fi -%endif - -%postun -mkdir -p var/adm/SuSEconfig -touch var/adm/SuSEconfig/run-texhash - - - -%files -%defattr(-, root, root) -%doc CHANGES COPYING DEDICATION INSTALL.txt NEWS -%doc README.txt FAQ.txt AUTHORS.txt VERSION ROADMAP -%doc buildscripts/ -%doc scripts/ -# hairy to hook it in (possibly non-existing) emacs -%doc lilypond-mode.el -%doc lilypond-font-lock.el - -%config /etc/profile.d/* - -%ifnos cygwin -%{_prefix}/bin/abc2ly -%{_prefix}/bin/as2text -%{_prefix}/bin/convert-ly -%{_prefix}/bin/etf2ly -%{_prefix}/bin/lilypond -%{_prefix}/bin/ly2dvi -%{_prefix}/bin/midi2ly -%{_prefix}/bin/lilypond-book -%{_prefix}/bin/mup2ly -%{_prefix}/bin/musedata2ly -%{_prefix}/bin/pmx2ly -%else -%{_prefix}/bin -%endif - -%if info=="yes" -%{_prefix}/info/lilypond.info.gz -%{_prefix}/info/lilypond-internals.info.gz -%endif - -%{_prefix}/man/man1/abc2ly.1.gz -%{_prefix}/man/man1/as2text.1.gz -%{_prefix}/man/man1/convert-ly.1.gz -%{_prefix}/man/man1/etf2ly.1.gz -%{_prefix}/man/man1/lilypond.1.gz -%{_prefix}/man/man1/ly2dvi.1.gz -%{_prefix}/man/man1/midi2ly.1.gz -%{_prefix}/man/man1/lilypond-book.1.gz -%{_prefix}/man/man1/musedata2ly.1.gz -%{_prefix}/man/man1/mup2ly.1.gz -%{_prefix}/man/man1/pmx2ly.1.gz - -%{_prefix}/share/lilypond/ -%{_prefix}/share/texmf/ -%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo -# urg? -#%{_prefix}/../etc/profile.d/lilypond.* - -%files doc -# this gets too messy... -%doc mutopia/ -%doc input/ -%doc web/ -# verbatim include of input: list the directory without issuing a %dir - -%changelog -n lilypond -* Sun Apr 22 2001 - schlemme@mathe.tu-freiberg.de -- update: 1.3.149 -* Mon Apr 10 2000 - bk@suse.de -- added suse update config macro -* Thu Mar 16 2000 - kukuk@suse.de -- Use gs_serv, not gs_both (doesn't exist on all platforms) -* Wed Mar 01 2000 - uli@suse.de -- moved man pages to /usr/share -* Tue Dec 21 1999 - ke@suse.de -- add documentation (#271). -* Mon Dec 13 1999 - ke@suse.de -- update: 1.2.17. -- compiler fix (thanks to schwab@suse.de). -- #271. -* Mon Oct 25 1999 - ke@suse.de -- update: 1.2.16. -* Mon Sep 13 1999 - bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Mon Sep 06 1999 - ro@suse.de -- update to 1.2.6 to make it compile with new guile -- various fixes and one hack to make this compile at all -* Sun Aug 22 1999 - ke@suse.de -- provide /etc/profile.d scripts. -- make lily.ps available (thanks to Ulrich Windl). -* Tue Aug 17 1999 - ke@suse.de -- update: version 1.2.1. -* Thu Nov 05 1998 - ke@suse.de -- use the TDS and provide links from /usr/share/lilypond. -- install examples via %doc. -* Wed Oct 28 1998 - ke@suse.de -- update: version 1.0.17. -* Fri Aug 07 1998 - ke@suse.de -- initial package: version 1.0.0 diff --git a/make/redhat.spec.in b/make/redhat.spec.in deleted file mode 100644 index 6eeba3c36d..0000000000 --- a/make/redhat.spec.in +++ /dev/null @@ -1,137 +0,0 @@ -%define info yes - -Name: lilypond -Version: @TOPLEVEL_VERSION@ -Release: 1 -License: GPL -Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz -Summary: Create and print music notation -URL: http://www.cs.uu.nl/~hanwen/lilypond -BuildRoot: /tmp/lilypond-install -# add lots of Buildreq: flex, bison, tetex, tetex-devel, tetex-latex, texinfo -# better prereqs: tetex-latex, python, (mpost?) etc. -Prereq: tetex - - -%description -LilyPond lets you create music notation. It produces -beautiful sheet music from a high-level description file. - -%package documentation -Summary: Prebuilt website containing all LilyPond documentation. -Group: Applications/Publishing -# BuildArchitectures: noarch - -%description documentation - -The documentation of LilyPond, both in HTML and PostScript. - -%prep -%setup - -%build - -# DO NOT use % { configure } , it hardcodes all paths, runs libtool, -# so we can't do make prefix=/tmp/ install. - -# In fact, do not take out the spaces between % and { in the above comment, -# because RPM will gladly do a substitution anyway. - -./configure --disable-checking --prefix=%{_prefix} --enable-optimise - -make all - -# make info -make -C Documentation - -# make html -make web-doc top-web - -%install - - -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc - -strip lily/out/lilypond midi2ly/out/midi2ly -make prefix="$RPM_BUILD_ROOT%{_prefix}" install - -%if info=="yes" -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* -%endif - -mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d -install -m 644 lilypond-mode.el lilypond-font-lock.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ -install -m 644 lilypond-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d - -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* - -mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d -cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh -cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh - - -# again, make sure that main package installs even if doco fails -mkdir -p web/out -tar -C web -xzf out/web.tar.gz - - -%post - -touch /tmp/.lilypond-install -rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install - -%if info=="yes" -/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir -%endif - -%preun - -%if info=="yes" -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir -fi -%endif - - -%files -%defattr(-, root, root) -%{_datadir}/emacs/site-lisp/lilypond-* -%{_datadir}/emacs/site-lisp/site-start.d/lilypond-* - -%{_prefix}/bin/abc2ly -%{_prefix}/bin/as2text -%{_prefix}/bin/convert-ly -%{_prefix}/bin/etf2ly -%{_prefix}/bin/lilypond -%{_prefix}/bin/ly2dvi -%{_prefix}/bin/midi2ly -%{_prefix}/bin/lilypond-book -%{_prefix}/bin/mup2ly -%{_prefix}/bin/musedata2ly -%{_prefix}/bin/pmx2ly - -%if info=="yes" -%{_prefix}/info/lilypond.info.gz -%{_prefix}/info/lilypond-internals.info.gz -%endif - -%{_prefix}/man/man1/abc2ly.1.gz -%{_prefix}/man/man1/as2text.1.gz -%{_prefix}/man/man1/convert-ly.1.gz -%{_prefix}/man/man1/etf2ly.1.gz -%{_prefix}/man/man1/lilypond.1.gz -%{_prefix}/man/man1/ly2dvi.1.gz -%{_prefix}/man/man1/midi2ly.1.gz -%{_prefix}/man/man1/lilypond-book.1.gz -%{_prefix}/man/man1/musedata2ly.1.gz -%{_prefix}/man/man1/mup2ly.1.gz -%{_prefix}/man/man1/pmx2ly.1.gz - -%{_prefix}/share/lilypond/ -%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo -%{_prefix}/../etc/profile.d/lilypond.* - -%files documentation -%doc web/ diff --git a/make/suse.spec.in b/make/suse.spec.in deleted file mode 100644 index 4c3253f95b..0000000000 --- a/make/suse.spec.in +++ /dev/null @@ -1,300 +0,0 @@ -# -# spec file for package lilypond (Version 1.3.149) -# based on -# spec file for package lilypond (Version 1.2.17) -# Copyright (c) 2000 SuSE GmbH Nuernberg, Germany. -# -# Please send bug reports to schlemme@mathe.tu-freiberg.de - -%define info yes - -# neededforbuild guile tcsh tetex te_latex te_mpost libpng python gpp libgpp gettext autoconf netpbm libnetpb gs_serv gs_lib gs_fonts guile -# usedforbuild aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib devs diff ext2fs file fileutil find flex gawk gcc gdbm gettext gpm gpp gppshare groff gs_fonts gs_lib gs_serv guile gzip kbd less libc libgpp libnetpb libpng libtool libz lx_suse make mktemp modules ncurses net_tool netcfg netpbm nkita nkitb nssv1 pam patch perl pgp ps python rcs rpm sendmail sh_utils shadow shlibs strace syslogd sysvinit tcsh te_ams te_latex te_mpost tetex texinfo textutil timezone unzip util vim xdevel xf86 xshared guile - - -Distribution: SuSE Linux 7.0 (i386) -Name: lilypond -Version: @TOPLEVEL_VERSION@ -Release: 2 -Copyright: GPL -Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.tar.gz -# music notation software for.. ? -Summary: A program for printing sheet music. -URL: http://www.lilypond.org/ -# rpm: 4.0: broken for -ta builds: rpm doesn't look in tarball for xpm -# Icon: lilypond-icon.xpm -BuildRoot: /tmp/lilypond-install -# add lots of Buildreq: tetex-kpath, te_mpost, bison -# better prereqs: tetex-latex, python, (mpost?) etc. -Prereq: tetex python - -# use keywords: music notation software -%description -LilyPond is a music typesetter. It produces beautiful -sheet music using a high level description file as input. LilyPond is -part of the GNU Project. - -Authors: --------- - Han-Wen Nienhuys <hanwen@cs.uu.nl> - Jan Nieuwenhuizen <janneke@gnu.org> - Alexandre Oliva <oliva@dcc.unicamp.br> - Mats Bengtsson <matsb@s3.kth.se> - Eric Bullinger <eric@aut.ee.ethz.ch> - Jan Arne Fagertun <Jan.A.Fagertun@energy.sintef.no> - Anthony Fok <foka@debian.org> - Neil Jerram <nj104@cus.cam.ac.uk> - Donald Ervin Knuth - Werner Lemberg <wl@gnu.org> - David R. Linn <drl@vuse.vanderbilt.edu> - François Pinard <pinard@iro.umontreal.ca> - Jeffrey B. Reed <daboys@bga.com> - Shay Rojanski - Tom Cato Amundsen <tca@gnu.org> - Laura Conrad <lconrad@world.std.com> - James Hammons <jlhamm@pacificnet.net> - Bjoern Jacke <bjoern.jacke@gmx.de> - Michael Krause <m.krause@tu-harburg.de> - David R. Linn <drl@vuse.vanderbilt.edu> - Adrian Mariano - Stephen Peters <portnoy@ai.mit.edu> - Glen Prideaux <glenprideaux@iname.com> - Roy R. Rankin <Roy.Rankin@alcatel.com.au> - Juergen Reuter <reuterj@ira.uka.de> - August S.Sigov <august@infran.ru> - Rune Zedeler <rune@zedeler.dk> - -SuSE series: ap - -%package doc -Summary: Prebuilt website containing all LilyPond documentation. -Group: Applications/Publishing -# BuildArchitectures: noarch - -%description doc - -The documentation of LilyPond, both in HTML and PostScript. - -%define INSTALL install -m755 -s -%define INSTALL_DIR install -d -m755 -%define INSTALL_DATA install -m644 -%prep -%setup - -%build - -# - -# DO NOT use % { configure } , it hardcodes all paths, runs libtool, -# so we can't do make prefix=/tmp/ install. - -# In fact, do not take out the spaces between % and { , because RPM will gladly -# do a substitution anyway. - -CFLAGS="$RPM_OPT_FLAGS" ./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --enable-optimise --enable-shared - -make LDFLAGS=-s "CFLAGS=$RPM_OPT_FLAGS" all - -# urg -# %build doc -# line 42: second %build -# ok, now make sure that lilypond package will succeed, -# even if documentation fails to build - -make -C Documentation || true -make web-doc top-web || true - -%install - - - -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc - -## this is an ugly hack -mkdir -p scripts/share/lilypond/tex -cp tex/titledefs.tex scripts/share/lilypond/tex -## end of hack - - -strip lily/out/lilypond midi2ly/out/midi2ly -make prefix="$RPM_BUILD_ROOT%{_prefix}" install - -%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond -(cd $RPM_BUILD_ROOT/usr/share/lilypond \ - && mv mf/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/source/public/lilypond \ - && rm -fr mf \ - && ln -s ../texmf/fonts/source/public/lilypond mf) -%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond -(cd $RPM_BUILD_ROOT/usr/share/lilypond \ - && mv afm/* $RPM_BUILD_ROOT/usr/share/texmf/fonts/afm/lilypond \ - && rm -fr afm \ - && ln -s ../texmf/fonts/afm/lilypond afm) -%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond -(cd $RPM_BUILD_ROOT/usr/share/lilypond \ - && mv tex/* $RPM_BUILD_ROOT/usr/share/texmf/tex/lilypond \ - && rm -fr tex \ - && ln -s ../texmf/tex/lilypond tex) -%{INSTALL_DIR} $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps -(cd $RPM_BUILD_ROOT/usr/share/lilypond \ - && mv ps/* $RPM_BUILD_ROOT/usr/share/texmf/lilypond/ps \ - && rm -fr ps \ - && ln -s ../texmf/lilypond/ps ps) - - -%if info=="yes" -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true -%endif - - - -gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true - - - - -mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d -cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh -cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh - -# urg -#%install doc -#line 63: second %install -# again, make sure that main package installs even if doco fails -mkdir -p web/out -tar -C web -xzf out/web.tar.gz || true - -%ifos cygwin -# urg, this symlink doesn't come through on cygwin -# this is the way symlinks work over there, let's fake one -rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm -echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm -%{fix_suffixes} -%endif - -%{?suse_check} - - -%pre -if [ -d usr/share/lilypond/ps ]; then - mv usr/share/lilypond/ps usr/share/lilypond/ps.old - echo "please, remove /usr/share/lilypond/ps.old manually." -fi - -%post - -touch /tmp/.lilypond-install -rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install -%if info=="yes" -/usr/bin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true -%endif -mkdir -p var/adm/SuSEconfig -touch var/adm/SuSEconfig/run-texhash - - -%preun -%if info=="yes" -if [ $1 = 0 ]; then - /usr/bin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true -fi -%endif - -%postun -mkdir -p var/adm/SuSEconfig -touch var/adm/SuSEconfig/run-texhash - - - -%files -%defattr(-, root, root) -%doc CHANGES COPYING DEDICATION INSTALL.txt NEWS -%doc README.txt FAQ.txt AUTHORS.txt VERSION ROADMAP -%doc buildscripts/ -%doc scripts/ -# hairy to hook it in (possibly non-existing) emacs -%doc lilypond-mode.el -%doc lilypond-font-lock.el - -%config /etc/profile.d/* - -%ifnos cygwin -%{_prefix}/bin/abc2ly -%{_prefix}/bin/as2text -%{_prefix}/bin/convert-ly -%{_prefix}/bin/etf2ly -%{_prefix}/bin/lilypond -%{_prefix}/bin/ly2dvi -%{_prefix}/bin/midi2ly -%{_prefix}/bin/lilypond-book -%{_prefix}/bin/mup2ly -%{_prefix}/bin/musedata2ly -%{_prefix}/bin/pmx2ly -%else -%{_prefix}/bin -%endif - -%if info=="yes" -%{_prefix}/info/lilypond.info.gz -%{_prefix}/info/lilypond-internals.info.gz -%endif - -%{_prefix}/man/man1/abc2ly.1.gz -%{_prefix}/man/man1/as2text.1.gz -%{_prefix}/man/man1/convert-ly.1.gz -%{_prefix}/man/man1/etf2ly.1.gz -%{_prefix}/man/man1/lilypond.1.gz -%{_prefix}/man/man1/ly2dvi.1.gz -%{_prefix}/man/man1/midi2ly.1.gz -%{_prefix}/man/man1/lilypond-book.1.gz -%{_prefix}/man/man1/musedata2ly.1.gz -%{_prefix}/man/man1/mup2ly.1.gz -%{_prefix}/man/man1/pmx2ly.1.gz - -%{_prefix}/share/lilypond/ -%{_prefix}/share/texmf/ -%{_prefix}/share/locale/*/LC_MESSAGES/lilypond.mo -# urg? -#%{_prefix}/../etc/profile.d/lilypond.* - -%files doc -# this gets too messy... -%doc mutopia/ -%doc input/ -%doc web/ -# verbatim include of input: list the directory without issuing a %dir - -%changelog -n lilypond -* Sun Apr 22 2001 - schlemme@mathe.tu-freiberg.de -- update: 1.3.149 -* Mon Apr 10 2000 - bk@suse.de -- added suse update config macro -* Thu Mar 16 2000 - kukuk@suse.de -- Use gs_serv, not gs_both (doesn't exist on all platforms) -* Wed Mar 01 2000 - uli@suse.de -- moved man pages to /usr/share -* Tue Dec 21 1999 - ke@suse.de -- add documentation (#271). -* Mon Dec 13 1999 - ke@suse.de -- update: 1.2.17. -- compiler fix (thanks to schwab@suse.de). -- #271. -* Mon Oct 25 1999 - ke@suse.de -- update: 1.2.16. -* Mon Sep 13 1999 - bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Mon Sep 06 1999 - ro@suse.de -- update to 1.2.6 to make it compile with new guile -- various fixes and one hack to make this compile at all -* Sun Aug 22 1999 - ke@suse.de -- provide /etc/profile.d scripts. -- make lily.ps available (thanks to Ulrich Windl). -* Tue Aug 17 1999 - ke@suse.de -- update: version 1.2.1. -* Thu Nov 05 1998 - ke@suse.de -- use the TDS and provide links from /usr/share/lilypond. -- install examples via %doc. -* Wed Oct 28 1998 - ke@suse.de -- update: version 1.0.17. -* Fri Aug 07 1998 - ke@suse.de -- initial package: version 1.0.0 diff --git a/scm/clef.scm b/scm/clef.scm index 1d780f27c6..a6f11bd692 100644 --- a/scm/clef.scm +++ b/scm/clef.scm @@ -12,6 +12,7 @@ ("soprano" . ("clefs-C" -4 0)) ("mezzosoprano" . ("clefs-C" -2 0)) ("alto" . ("clefs-C" 0 0)) + ("C" . ("clefs-C" 0 0)) ("tenor" . ("clefs-C" 2 0)) ("baritone" . ("clefs-C" 4 0)) ("varbaritone" . ("clefs-F" 0 0)) @@ -57,24 +58,26 @@ ) ) -; "an alist mapping GLYPHNAME to the position of the central C for that symbol") + +;; "an alist mapping GLYPHNAME to the position of the central C for that symbol" (define c0-pitch-alist '(("clefs-G" . -4) - ("clefs-C" . 0) - ("clefs-F" . 4) - ("clefs-vaticana_do" . 0) - ("clefs-vaticana_fa" . 4) - ("clefs-medicaea_do" . 0) - ("clefs-medicaea_fa" . 4) - ("clefs-hufnagel_do" . 0) - ("clefs-hufnagel_fa" . 4) - ("clefs-hufnagel_do_fa" . 0) - ("clefs-mensural1_c" . 0) - ("clefs-mensural2_c" . 0) - ("clefs-mensural3_c" . 0) - ("clefs-mensural1_f" . 4) - ("clefs-mensural2_f" . 4) - ("clefs-mensural_g" . -4)) + ("clefs-C" . 0) + ("clefs-F" . 4) + ("clefs-percussion" . 0) + ("clefs-vaticana_do" . 0) + ("clefs-vaticana_fa" . 4) + ("clefs-medicaea_do" . 0) + ("clefs-medicaea_fa" . 4) + ("clefs-hufnagel_do" . 0) + ("clefs-hufnagel_fa" . 4) + ("clefs-hufnagel_do_fa" . 0) + ("clefs-mensural1_c" . 0) + ("clefs-mensural2_c" . 0) + ("clefs-mensural3_c" . 0) + ("clefs-mensural1_f" . 4) + ("clefs-mensural2_f" . 4) + ("clefs-mensural_g" . -4)) ) (define (clef-name-to-properties cl) diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex deleted file mode 100644 index e69de29bb2..0000000000