From abe92e217f0a3aab91fa2db330eea89680c2ebad Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 3 Dec 1997 11:08:04 +0100 Subject: [PATCH] release: 0.1.34 --- AUTHORS.text | 6 +- Documentation/AUTHORS.pod | 4 +- Documentation/faq.pod | 8 +- Documentation/index.pod | 19 +- Documentation/literature.pod | 1 + Documentation/mudela-course.doc | 2 +- INSTALL.text | 26 +- NEWS | 14 +- TODO | 4 +- VERSION | 4 +- bin/ly2dvi.sh | 474 ++++++++++++++++++++++++++++++++ bin/lytodvi.sh | 216 --------------- debian/Makefile | 2 +- debian/README.debian | 2 +- debian/TODO | 2 + debian/changelog | 34 ++- debian/control | 2 +- debian/copyright | 4 +- debian/examples | 2 - debian/postinst | 10 +- debian/postinst.old.sh | 2 +- debian/postrm | 2 +- debian/preinst | 2 +- debian/rules | 13 +- init/feta16.ly | 2 +- init/feta20.ly | 2 +- input/scsii-menuetto.ly | 6 +- lily/VERSION | 2 +- lily/lookup.cc | 36 ++- lily/tex-slur.cc | 6 +- make/lelievijver.lsm | 8 +- make/lilypond.lsm | 8 +- make/lilypond.spec | 4 +- tex/feta16.tex | 2 +- tex/feta20.tex | 2 +- tex/fetdefs.tex | 41 ++- tex/titledefs.tex | 37 +-- 37 files changed, 697 insertions(+), 314 deletions(-) create mode 100644 bin/ly2dvi.sh delete mode 100644 bin/lytodvi.sh create mode 100644 debian/TODO delete mode 100644 debian/examples diff --git a/AUTHORS.text b/AUTHORS.text index 343973c19d..b71a96a7df 100644 --- a/AUTHORS.text +++ b/AUTHORS.text @@ -39,8 +39,8 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS http://?.unicamp.br/ testing - +o Anthony Fok , - debian package: make/debian/* + +o Anthony Fok , + debian package: debian/* +o Franc,ois Pinard , Documentation/Vocab*, internationalization stuff @@ -61,6 +61,6 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS -24/Nov/97 LilyPond 0.1.33 1 +25/Nov/97 LilyPond 0.1.34 1 diff --git a/Documentation/AUTHORS.pod b/Documentation/AUTHORS.pod index 926f5af685..c6fedeb9b0 100644 --- a/Documentation/AUTHORS.pod +++ b/Documentation/AUTHORS.pod @@ -49,9 +49,9 @@ mf/ital-*.mf (these were taken from the CM fonts) testing -=item * Anthony Fok , +=item * Anthony Fok , -debian package: make/debian/* +debian package: debian/* =item * Franc,ois Pinard , diff --git a/Documentation/faq.pod b/Documentation/faq.pod index b121c5c05b..e9eb1d4a73 100644 --- a/Documentation/faq.pod +++ b/Documentation/faq.pod @@ -126,8 +126,8 @@ specify a()a()a -Q: how do I place lyrics under _each_ of the staves in a score, as in -choral mus$ I can work out how to put lyrics for each line all under +Q: How do I place lyrics under I of the staves in a score, as in +choral music. I can work out how to put lyrics for each line all under the top line, or at the bottom but not between! A: You change the order lyrics and staves. You have to name all @@ -137,9 +137,9 @@ staff/lyricline \score { < \melodic \type Staff = "treble" \trebleMelody - \lyric \type Lyrics = "tlyrics" \trebtext + \lyric \type Lyrics = "tlyrics" \trebtext \type Staff = "bass" \melodic \bassMelody - \lyric \type Lyrics = "blyrics" \basstext + \lyric \type Lyrics = "blyrics" \basstext > \paper { } } diff --git a/Documentation/index.pod b/Documentation/index.pod index 710f29cc5b..3f862dc841 100644 --- a/Documentation/index.pod +++ b/Documentation/index.pod @@ -4,10 +4,10 @@ The Homepage of LilyPond -- the GNU Project music typesetter =head1 DESCRIPTION -LilyPond is the GNU Project music typesetter. The program generates -visual or auditive output from a music definition file: it can typeset -formatted sheet music to a TeX file and play (mechanical) performances -to a MIDI file. +LilyPond is the GNU Project music typesetter. It generates visual or +auditive output from a music definition file: it can typeset formatted +sheet music to a TeX file and play (mechanical) performances to a MIDI +file. This is not a Fanmail/Hype page. These pages were entirely created from the LilyPond package-sources. @@ -16,6 +16,17 @@ Note: These pages are created from the latest B of LilyPond. You can look at the bottom if you want to know which version this was. +=head2 Mirrors + +=over 4 + +=item http://sca.uwaterloo.ca/~praetzel/lilypond/ + +Eric Praetzel was kind enough to provide a mirror of both the website +and the ftp site. + +=back + =head2 Examples @@ -384,13 +391,6 @@ AAAAUUUUTTTTHHHHOOOORRRRSSSS - - - - - - - -20/Oct/97 LilyPond 0.1.33 6 +2/Dec/97 LilyPond 0.1.34 6 diff --git a/NEWS b/NEWS index 28855746fe..691d48f46a 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,15 @@ -pl 33.jcn1 + +pl 34 - bf: mf: numbers and alto clef + - bf: scsi-menuet + - PS crescendos + - ly2dvi diffs (JAF) + - debian diffs (AF) + - w32 doco fix (JCN) + + +******** +nov 24 pl 33 - added abbrev.ly to font.ly; rm'd abbrev.ly @@ -9,7 +19,7 @@ pl 33 - lytodvi script (JAF) - output Paper_def settings to TeX file. (eg: linewidth) -********* +******** nov 19 pl 32 - change type checks (ughugh) to derivation checks (ugh) diff --git a/TODO b/TODO index f15bfb654c..0566fb41f0 100644 --- a/TODO +++ b/TODO @@ -7,7 +7,7 @@ Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr 0.2: - * add a screenshot to the website. + * add a screenshot to the website. :) * fix stdin input @@ -25,6 +25,8 @@ grep for TODO and ugh/ugr * bf: abbrevs over whole note + * bf: wtk1-fug2 ending + STUFF * give Items/Spanners access to unbroken originals diff --git a/VERSION b/VERSION index 01c31fc5cf..3f97ee8ecd 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 -TOPLEVEL_PATCH_LEVEL = 33 -TOPLEVEL_MY_PATCH_LEVEL = jcn2 +TOPLEVEL_PATCH_LEVEL = 34 +TOPLEVEL_MY_PATCH_LEVEL = # use the above to send patches, always empty for released version: # please don't move these comments up; the patch should fail if diff --git a/bin/ly2dvi.sh b/bin/ly2dvi.sh new file mode 100644 index 0000000000..89556cd6a7 --- /dev/null +++ b/bin/ly2dvi.sh @@ -0,0 +1,474 @@ +#!/bin/sh +# +# Script to make a LaTeX file for Lilypond +# +# Written by Jan Arne Fagertun +# Sat Nov 22 22:26:43 CET 1997 +# +# Original LaTeX file made by Mats Bengtsson, 17/8 1997 +# + +VERSION="0.3" + +echo "lytodvi.sh $VERSION" 1>&2 + +# NEWS +# 0.3 +# - multiple input files to make score from several files +# (extra files assumed to be Lilypond output) +# - cp dvi-file instead of mv, to allow for xdvi reload +# - check for illegal long options +# - put in pt in text width, if not given +# - put in \nonstopmode in LaTeX file +# - restored LaTeX exit value check + +# 0.2.1 +# - temporarily omit LaTeX exit value check +# - remove ALL temporary files + +# 0.2 +# - fix for solaris - included from 0.1.jcn1 +# - long option hack - included from 0.1.jcn1 - modified +# - moved help into function - NOT included from 0.1.jcn1 yet +# - various improvements - included from 0.1.jcn1 +# - find mudela definitions from titledefs.tex +# - find papersize from lilypond output file (mudelapapersize), +# overridden by option '-p size' or '--papersize=size' +# - option -l lang or --language=lang overrides +# lilypond output file definition (mudelalanguage) +# - textwidth from lilypond output file (mudelapaperlinewidth) + +# 0.1.jcn1 +# - fix for solaris +# - long option hack +# - moved help into function + +# +# Exit value, when needed +# +EXIT=0 + +# +# Keywords defined in titledefs.tex +# Isn't there a way to ask LaTeX for the location of titledefs.tex? +# +TF=/usr/lib/texmf/tex/lilypond/titledefs.tex +MU_DEF="" +if [ -f $TF ] +then + MU_DEF=`egrep "^.newcommand...mudela" $TF | \\ + sed -e s/^.newcommand...//g | sed -e "s/\\}.*$//"` +fi + +if [ "$MU_DEF" = "" ] +then + MU_DEF="mudelatitle mudelasubtitle mudelacomposer \ + mudelaarranger mudelainstrument" +fi + +# +# debugging +# +# debug_echo=echo +debug_echo=true + +# +# Find command line options and switches +# +# "x:" x takes argument +# +switches="Dhkl:p:\?" +options="" +# +# ugh, "\-" is a hack to support long options +# while getopts \-:$options$switches O +# must be in double quotes for bash-2.0 +while getopts "\-:$options$switches" O +do + $debug_echo "O: \`$O'" + $debug_echo "arg: \`$OPTARG'" + case $O in + D ) + set -x + ;; + h ) + HELP=Y + ;; + k ) + KEEP=Y + ;; + l ) + LNG=$OPTARG + ;; + p ) + PSZ=$OPTARG + ;; + \? ) + HELP=Y + ;; + # a long option! + -) + $debug_echo "long option: \`$OPTARG'" + case "$OPTARG" in + h*|-h*) + HELP=Y + ;; + k*|-k*) + KEEP=Y + ;; + l*|-l*) + LNG=`echo $OPTARG | sed -e s/"^.*="//` + ;; + p*|-p*) + PSZ=`echo $OPTARG | sed -e s/"^.*="//` + ;; + D*|-D*) + set -x; + ;; + *|-*) + echo $0": illegal option -- "$OPTARG; + EXIT=-1; + HELP=Y + ;; + esac + esac +done +shift `expr $OPTIND - 1` +# +# Input file name +# +if [ "$HELP" != "Y" ] +then + if [ "$1" = "" ] + then + cat << EOF + +$0 - no input file name given +EOF + EXIT=1 + HELP=Y + fi +fi +GF=$1 +# +# Check if input file exists... +# +if [ "$HELP" != "Y" ] +then + if [ ! -f $GF ] + then + GF=$1.ly + if [ ! -f $GF ] + then + cat << EOF + +$0 - input file $GF not found +EOF + EXIT=2 + HELP=Y + fi + fi +fi + +# +# print usage +# +#help() { +if [ "$HELP" = "Y" ] +then + cat << EOF +Generate dvi file from mudela or lilypond output +Usage: $0 [options] file + +Options: + -D, --debug set debug mode + -h, --help this help text + -k, --keep keep LaTeX file + -l, --language= give LaTeX language (babel) + -p, --papersize= give LaTeX papersize (eg. a4paper) + + file may be input to or output from lilypond(1) +EOF + exit $EXIT +fi +#} + +# +# More files? +# +shift 1 + +# +# Check whether input file is the input to or output from lilypond +# +L1=`head -1 $GF` +OP=`echo $L1 | grep "^% Creator: GNU LilyPond"` +if [ "$OP" != "" ] +then + # + # OK - it's the output from lilypond. + # Get lilypond source file name + # + OF=$GF + IFL=`grep mudelafilename $OF` + if [ "$IFL" != "" ] + then + IF=`echo $IFL | sed -e s/^.*{// | sed -e s/"}*.$"//` + # + # Check if source file exists + # + if [ ! -f $IF ] + then + cat << EOF + +$0 - mudela file not found. + +EOF + TW=15.5cm + fi + else + cat << EOF + +$0 - mudela file name not found. + +EOF + TW=15.5cm + fi +else + # + # I have to assume this is the lilypond input file + # Find output file name, if defined + # + IF=$GF + OFS=`egrep "paper|midi|output" $IF` + OF1=`echo $OFS | sed -e s/".midi.*$"// | sed -e s/"^.*paper"//` + if [ "$OF1" = "" ] + then + OF1=`echo $OFS | sed -e s/"^.*paper"// | sed -e s/".midi.*$"//` + fi + if [ "$OF1" = "" ] + then + OF=lelie.tex + else + OF2=`echo $OF1 | grep output` + if [ "$OF2" = "" ] + then + OF=lelie.tex + else + OF=`echo $OF2 | sed -e "s/\\";.*$//" | sed -e "s/^.*\\"//"` + fi + if [ "$OF2" = "" ] + then + OF=lelie.tex + fi + fi + # + # Remove the output file, to avoid being misled by an old one + # +# if [ -f $OF ] +# then +# rm $OF +# fi + # + # Run lilypond - exit if unsuccessfull + # + lilypond $IF || exit 3 + # + # Check if output file is generated + # + if [ ! -f $OF ] + then + cat << EOF + +$0 - hmm, I could not find the output file $OF + +EOF + exit 4 + fi +fi +# +# Find textwidth +# +if [ "$IF" != "" ] +then + if [ -f $IF ] + then + TWL=`grep linewidth $IF` + TWS=`echo $TWL | grep -v "^%"` + if [ "$TWS" != "" ] + then + TW=`echo $TWS | sed -e s/^.*=// | sed -e s/";.*$"// | \\ + sed -e s/.mm/mm/ | sed -e s/.cm/cm/ | sed -e s/.p/p/` + case $TW in + *mm) + ;; + *cm) + ;; + *pt) + ;; + *) + TW=$TW"pt" + ;; + esac + else + TW=15.5cm + fi + fi +fi +# +# LaTeX file name +# +if [ "$KEEP" != "Y" ] +then + if [ "$TMP" = "" ] + then + TMP=/tmp + fi + if [ ! -d $TMP ] + then + cat << EOF + +$0 - temporary directory $TMP not found, set to /tmp + +EOF + TMP=/tmp + fi +# + BN=`basename $OF .tex` + FN=$BN.$$ + LF=$TMP/$FN.tex +else + BN=`basename $OF .tex` + FN=$BN.$$ + LF=$FN.tex +fi +# +# Find if a paper size is defined +# +if [ "$PSZ" = "" ] +then + PSZ=`egrep ".def.mudelapapersize" $OF | \\ + sed -e s/.def.mudelapapersize// | \\ + sed -e s/^{// | sed -e s/}.*$//` +fi + +if [ "$PSZ" != "" ] +then + PAPER="["$PSZ"]" +fi + +# +# Find if a language is defined +# +if [ "$LNG" = "" ] +then + LNG=`egrep ".def.mudelalanguage" $OF | \\ + sed -e s/.def.mudelalanguage// | \\ + sed -e s/^{// | sed -e s/}.*$//` +fi +if [ "$LNG" != "" ] +then + LLNG="\usepackage["$LNG"]{babel}" +else + LLNG="%" +fi + +# +# Find if a textwidth is defined +# +TWN=`egrep ".def.mudelapaperlinewidth" $OF | \\ + sed -e s/.def.mudelapaperlinewidth// | \\ + sed -e s/^{// | sed -e s/}.*$//` +if [ "$TWN" != "" ] +then + TW=$TWN + case $TW in + *mm) + ;; + *cm) + ;; + *pt) + ;; + *) + TW=$TW"pt" + ;; + esac + $debug_echo "Text width = "$TW +fi + +# +# Write LaTeX file +# +cat << EOF > $LF +\documentclass$PAPER{article} +\nonstopmode +$LLNG +\usepackage[T1]{fontenc} +\addtolength{\oddsidemargin}{-1cm} +\addtolength{\topmargin}{-1cm} +\setlength{\textwidth}{$TW} +\input lilyponddefs +\input titledefs +\begin{document} +EOF +# +# Include \def\mudela-definitions +# +for L in $MU_DEF +do + LL=`grep ".def."$L $OF` + if [ "$LL" != "" ] + then + LLL=`echo $LL | sed -e s/^.def.$L// | \\ + sed -e s/^{// | sed -e s/}.*$//` + if [ "$LLL" != "" ] + then + echo '\'$L'{'$LLL'}%' >> $LF + fi + fi +done +# +cat << EOF >> $LF +\makelilytitle +\input{$OF} +EOF +for EX in $*; do echo "\input{"$EX"}%" >> $LF; done +cat << EOF >> $LF +\vfill\hfill{(\LilyIdString)} +\end{document} +EOF +# +# Run LaTeX +# +latex $LF || exit 5 +#latex $LF +cat << EOF + + +Take care - LaTeX exit value check temporarily omitted! + + +EOF +# +# Rename dvi file +# +if [ -f $FN.dvi ] +then + cp $FN.dvi $BN.dvi +fi +# +# Clean up +# +if [ "$KEEP" != "Y" ] +then + rm $LF $FN.* +fi +# +# Output some info +# +cat << EOF + +$0 - dvi file name is $BN.dvi + +EOF +# OK - finished diff --git a/bin/lytodvi.sh b/bin/lytodvi.sh deleted file mode 100644 index e303f5c3b9..0000000000 --- a/bin/lytodvi.sh +++ /dev/null @@ -1,216 +0,0 @@ -#!/bin/sh -# -# Written by Jan Arne Fagertun -# Sat Nov 22 22:26:43 CET 1997 -# -# Script to make a latex file for Lilypond -# -# Find options given -# - -# should use header info or locale --HWN -LANGUAGE="english" -VERSION="0.0" - - -echo "lytodvi.sh $VERSION" 1>&2 -while getopts Dhk O -do - case $O in - D ) set -x;DEBUG="-v";; - h ) HELP=Y;; - k ) KEEP=Y;; - \? ) HELP=Y;; - esac -done -shift `expr $OPTIND - 1` - -# -# Input file name -# -if [ "$HELP" != "Y" ] -then - if [ "$1" = "" ] - then - echo $0" - no input file name given" 1>&2 - HELP=Y - fi -fi -# -# Check if input file exists... -# -if [ "$HELP" != "Y" ] -then - if [ ! -f $1 ] - then - echo $0" - input file not found " 1>&2 - HELP=Y - fi -fi -# -# Help info -# -if [ "$HELP" = "Y" ] -then - echo - echo "usage : "$0" [-D -h -k] file" -cat << EOF - -D = set debug mode - -h = this help text - -k = keep latex file - file may be input to or output from lilypond -EOF - echo - exit 1 -fi -# -# Check whether input file is the input to or output from lilypond -# -L1=`head -1 $1` -OP=`echo $L1 | grep "^% Creator: GNU LilyPond"` -if [ "$OP" != "" ] -then - # - # OK - it's the output from lilypond. - # Get lilypond source file name - # - OF=$1 - IFL=`grep mudelafilename $OF` - if [ "$IFL" != "" ] - then - IF=`echo $IFL | sed -e s/^.*{// | sed -e s/"}*.$"//` - # - # Check if source file exists - # - if [ ! -f $IF ] - then - echo $0" - mudela file not found." - TW=15.5cm - fi - else - echo $0" - mudela file name not found." - TW=15.5cm - fi -else - # - # I have to assume this is the lilypond input file - # Find output file name, if defined - # - IF=$1 - OFS=`egrep "paper|midi|output" $IF` - OF1=`echo $OFS | sed -e s/".midi.*$"// | sed -e s/"^.*paper"//` - if [ "$OF1" = "" ] - then - OF1=`echo $OFS | sed -e s/"^.*paper"// | sed -e s/".midi.*$"//` - fi - if [ "$OF1" = "" ] - then - OF=lelie.tex - else - OF2=`echo $OF1 | grep output` - if [ "$OF2" = "" ] - then - OF=lelie.tex - else - OF=`echo $OF2 | sed -e s/'";.*'$// | sed -e s/^'.*"'//` - fi - if [ "$OF2" = "" ] - then - OF=lelie.tex - fi - fi - # - # Run lilypond - exit if unsuccessfull - # - lilypond $IF || exit 3 -fi -# -# Find textwidth -# -if [ "$IF" != "" ] -then - if [ -f $IF ] - then - TWL=`grep linewidth $IF` - if [ "$TWL" != "" ] - then - TW=`echo $TWL | sed -e s/^.*=// | sed -e s/";.*$"// | \\ - sed -e s/.mm/mm/ | sed -e s/.cm/cm/ | sed -e s/.p/p/` - else - TW=15.5cm - fi - fi -fi -# -# More parameters from input file -# -# Well - seems like some more info is needed: -# Arranger (I use mudelacopyright now) -# Instrument (I use mudelaremarks now) -# -# Latex file -# -if [ "$KEEP" != "Y" ] -then - if [ "$TMP" = "" ] - then - TMP=/tmp - fi - if [ ! -d $TMP ] - then - echo $0" - temporary directory "$TMP" not found, set to /tmp" - TMP=/tmp - fi -# - LF=$TMP/$OF.tex -else - LF=$OF.tex -fi -# -# Should copy a "header file" instead.... -# -cat << EOF > $LF -\documentclass[a4paper]{article} -\usepackage[$LANGUAGE]{babel} -\usepackage[T1]{fontenc} -\addtolength{\oddsidemargin}{-1cm} -\addtolength{\topmargin}{-1cm} -EOF - -# why two <> $LF -cat << EOF >> $LF -\input lilyponddefs -\input titledefs -\begin{document} -EOF - -# -# Include \def\mudela-definitions - strip off \def\mudela. -# Hmm - why not just change titledefs? -# -for L in mudelatitle mudelasubtitle mudelacomposer mudelaarranger mudelainstrument -do - LL=`grep $L $OF` - if [ "$LL" != "" ] - then - echo $LL | sed -e s/d.*mudela//g >> $LF - fi -done -# -echo "\makelilytitle" >> $LF -echo "\input{"$OF"}" >> $LF -echo "\vfill\hfill{(\LilyIdString)}" >> $LF -echo "\end{document}" >> $LF - -# -# Run latex -# -latex $LF -# -# Clean up -# -if [ "$KEEP" != "Y" ] -then - rm $LF -fi diff --git a/debian/Makefile b/debian/Makefile index 06cd03fc6d..9c9e7d683f 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -15,5 +15,5 @@ include ./$(depth)/make/Rules.make # -EXTRA_DISTFILES = README.debian changelog control copyright examples\ +EXTRA_DISTFILES = README.debian TODO changelog control copyright\ info.ex menu.ex postinst postinst.old.sh postrm preinst rules watch diff --git a/debian/README.debian b/debian/README.debian index 88675bbb16..ba5d98e908 100644 --- a/debian/README.debian +++ b/debian/README.debian @@ -19,4 +19,4 @@ LilyPond is still in active development, and many things may still change. When it is stablized in the future, these new fonts will probably be added into the standard special.map file. -Anthony Fok , Thu, 23 Oct 1997 16:59:32 -0600 +Anthony Fok , Thu, 23 Oct 1997 16:59:32 -0600 diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000000..db936a667d --- /dev/null +++ b/debian/TODO @@ -0,0 +1,2 @@ +* Move lytodvi.sh to a proper place. It is currently placed in + /usr/doc/lilypond. (1997-11-25) diff --git a/debian/changelog b/debian/changelog index 44850b33a4..7db27bbaae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +lilypond (0.1.33-1) unstable; urgency=low + + * New upstream release + * Changed my maintainer e-mail address to . :) + + -- Anthony Fok Tue, 25 Nov 1997 00:22:57 -0700 + +lilypond (0.1.32-2) unstable; urgency=low + + * Commented out run_texhash() in postinst by mistake. Fixed. + + -- Anthony Fok Sun, 23 Nov 1997 03:04:29 -0700 + +lilypond (0.1.32-1) unstable; urgency=low + + * New upstream release + * Applied a small fix to postinst. The font-entries-search-and-replace + add_fonts() subroutine was slightly buggy. + * Unpatched ./configure. It turned out that I spelt "--enable-optimise" + as "--enable-optimize" in debian/rules by mistake. Oops! :) Thanks + to the upstream author for pointing this out! :) + * The upstream authors has included the ./debian/* files in the pristine + source archive! They also fixed some minor errors in README.debian + and copyright. Thanks a lot! :) + * Removed the line "dh_clean" from "binary-arch:" and switched the order + of dh_clean in "clean:" in debian/rules. dh_clean was deleting + the zero-byte file ./make/out/Site.make, causing the build to fail. + + -- Anthony Fok Sun, 23 Nov 1997 01:39:31 -0700 + lilypond (0.1.29-1) unstable; urgency=low * New upstream release @@ -11,7 +41,7 @@ lilypond (0.1.29-1) unstable; urgency=low "stray" automatically generated TFM and PK font files were placed in the wrong directories because they were not listed in /usr/lib/texmf/fontname/special.map. - * Did some minor clean-up in debian/rules. + * Did some minor clean-up in debian/rules and switched to debhelper. * Updated Standards-Version to 2.3.0.1 -- Anthony Fok Tue, 11 Nov 1997 02:31:33 -0700 @@ -113,5 +143,5 @@ lilypond (0.1.0-1) unstable; urgency=low Local variables: mode: debian-changelog -add-log-mailing-address: "foka@gpu.srv.ualberta.ca" +add-log-mailing-address: "foka@debian.org" End: diff --git a/debian/control b/debian/control index 500d23d7c4..13de513c09 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: lilypond Section: contrib/tex Priority: optional -Maintainer: Anthony Fok +Maintainer: Anthony Fok Standards-Version: 2.3.0.1 Package: lilypond diff --git a/debian/copyright b/debian/copyright index 17f22e9aca..22c954c0d1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,8 @@ -This package was debianized by Anthony Fok foka@gpu.srv.ualberta.ca on +This package was debianized by Anthony Fok foka@debian.org on Wed, 6 Aug 1997 04:30:28 -0600 It was downloaded from - ftp://pcnov095.win.tue.nl/pub/lilypond/development/lilypond-0.1.29.tar.gz + ftp://pcnov095.win.tue.nl/pub/lilypond/development/lilypond-0.1.33.tar.gz It is also available from: ftp://alpha.gnu.org/gnu/ diff --git a/debian/examples b/debian/examples deleted file mode 100644 index 3be67ec77c..0000000000 --- a/debian/examples +++ /dev/null @@ -1,2 +0,0 @@ -input/*.ly -input/*.tex diff --git a/debian/postinst b/debian/postinst index 0b734060e6..e2bcee306c 100644 --- a/debian/postinst +++ b/debian/postinst @@ -2,9 +2,9 @@ # # postinst script for the Debian GNU/Linux lilypond package # -# by Anthony Fok +# by Anthony Fok # Initial release: Sun, 26 Oct 1997 03:23:00 -0700 -# Last modified: Mon, 10 Nov 1997 22:26:10 -0700 +# Last modified: Sun, 23 Nov 1997 03:04:16 -0700 use strict; use File::Copy; @@ -30,7 +30,6 @@ $pkg_name = "GNU LilyPond"; $font_supplier = "public"; $font_typeface = "lilypond"; -# @fonts = qw( dyn10 font-en-tja vette-beam ); @fonts = qw( feta ); $std_TEXMF = "/usr/lib/texmf"; # Debian's standard $TEXMF @@ -154,7 +153,10 @@ sub add_fonts ($$$$@) { if (length($font) < 8) { $font .= "\t"; } $entries .= "$font\t$supplier\t\t$typeface\n"; } - if ($_[0] !~ /$entries/m) { + + $_[0] =~ /((^\w+\s+$supplier\s+$typeface\n)+)/m; + + if ($1 ne $entries) { ($_[0] =~ s/(^\w+\s+$supplier\s+$typeface\n)+/$entries/m) or ($_[0] =~ s/(?=^beam\s+public\s+music\n)/$entries/m) or die " Can't add font entries to $specialmap: $!"; diff --git a/debian/postinst.old.sh b/debian/postinst.old.sh index 8eb5d7cdf3..55188f11a9 100644 --- a/debian/postinst.old.sh +++ b/debian/postinst.old.sh @@ -1,7 +1,7 @@ #!/bin/bash -e # # postinst script for the Debian GNU/Linux lilypond package -# by Anthony Fok +# by Anthony Fok # This is free software; see the GNU General Public Licence # version 2 or later for copying conditions. There is NO warranty. # Last modified: Wed, 6 Aug 1997 13:42:45 -0600 diff --git a/debian/postrm b/debian/postrm index 5873710c84..86d5a93535 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,7 +1,7 @@ #!/bin/bash -e # # postrm script for the Debian GNU/Linux lilypond package -# by Anthony Fok +# by Anthony Fok # This is free software; see the GNU General Public Licence # version 2 or later for copying conditions. There is NO warranty. # Last modified: Mon, 10 Nov 1997 22:44:37 -0700 diff --git a/debian/preinst b/debian/preinst index eba9114d56..71a9d645e6 100644 --- a/debian/preinst +++ b/debian/preinst @@ -1,7 +1,7 @@ #!/bin/bash -e # # preinst script for the Debian GNU/Linux lilypond package -# by Anthony Fok +# by Anthony Fok # This is free software; see the GNU General Public Licence # version 2 or later for copying conditions. There is NO warranty. # Last modified: Tue, 11 Nov 1997 01:25:15 -0700 diff --git a/debian/rules b/debian/rules index 8befb88705..843600e388 100644 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ # This is free software; see the GNU General Public Licence # version 2 or later for copying conditions. There is NO warranty. # -# Currently maintained by Anthony Fok +# Currently maintained by Anthony Fok # for Debian GNU/Linux. package=lilypond @@ -13,7 +13,7 @@ package=lilypond SHELL=/bin/bash # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 +#export DH_VERBOSE=1 build: build-stamp build-stamp: @@ -28,8 +28,10 @@ clean: dh_testdir dh_testroot rm -f build-stamp - dh_clean -$(MAKE) distclean + # Don't put dh_clean before "make distclean"! dh_clean is + # "too smart" and it deletes too many files! + dh_clean rm -f {,*/}out/{*,.build} flower/config.{log,status} # Build architecture-independent files here. @@ -39,14 +41,13 @@ binary-indep: build binary-arch: build dh_testdir dh_testroot - dh_clean dh_installdirs usr/lib/texmf/doc $(MAKE) prefix=`pwd`/debian/tmp/usr install ln -fs ../../../doc/lilypond debian/tmp/usr/lib/texmf/doc/lilypond dh_installdocs BUGS TODO NEWS DEDICATION ANNOUNCE README \ Documentation/out/*.text Documentation/*.doc \ - Documentation/lelie_logo.xpm - dh_installexamples + Documentation/lelie_logo.xpm bin/lytodvi.sh + dh_installexamples input/*.ly input/*.tex # dh_installmenu # dh_installcron # dh_installmanpages diff --git a/init/feta16.ly b/init/feta16.ly index 9087e6f5da..100d902c7f 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Wed Dec 3 01:03:55 1997 +% on Wed Dec 3 11:10:44 1997 % Do not edit % input from out/feta16.log % name=\symboltables { diff --git a/init/feta20.ly b/init/feta20.ly index 08f7628853..368f46df86 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Wed Dec 3 01:04:18 1997 +% on Wed Dec 3 11:10:47 1997 % Do not edit % input from out/feta20.log % name=\symboltables { diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly index 2d079ac51a..60c57179ee 100644 --- a/input/scsii-menuetto.ly +++ b/input/scsii-menuetto.ly @@ -1,10 +1,12 @@ \header{ filename = "scsii-menuetto.ly"; -title = "Solo Cello Suites, Suite II part V, Menuetto I"; +title = "Cello Suite II"; +subtitle = "Part V"; +instrument = "Menuetto I"; % duh description = "Cello suite transcribed for Viola"; source = "?"; opus = "BWV 1008 no. 5"; -composers = "Johann Sebastian Bach (1685-1750)"; +composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "JCN"; copyright = "public domain"; } diff --git a/lily/VERSION b/lily/VERSION index 9a92fbc003..5f9cd128f2 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 33 +PATCH_LEVEL = 34 MY_PATCH_LEVEL = diff --git a/lily/lookup.cc b/lily/lookup.cc index cc26384fec..5c304c2cb2 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -19,6 +19,7 @@ #include "tex.hh" #include "scalar.hh" #include "paper-def.hh" +#include "main.hh" Lookup::Lookup() { @@ -158,15 +159,32 @@ Lookup::streepje (int type) const Atom Lookup::hairpin (Real &wid, bool decresc) const { - int idx = int (rint (wid / 6 PT)); - if (!idx) idx ++; - wid = idx*6 PT; - String idxstr = (decresc)? "decrescendosym" : "crescendosym"; - Atom ret=(*symtables_p_)("param")->lookup (idxstr); - - Array a; - a.push (idx); - ret.tex_ = substitute_args (ret.tex_, a); + bool embedded_b = experimental_features_global_b; + String embed; + Atom ret; + if (embedded_b) + { + Real height = 2 PT; + embed = "\\embeddedps{\n" ; + embed += String (wid) + " " + + String (height) + + " draw_" + String(decresc ? "de" : "") + "cresc}\n"; + ret.tex_ = embed; + } + else + { + int idx = int (rint (wid / 6 PT)); + if (!idx) idx ++; + wid = idx*6 PT; + String idxstr = (decresc)? "decrescendosym" : "crescendosym"; + ret=(*symtables_p_)("param")->lookup (idxstr); + + Array a; + a.push (idx); + ret.tex_ = substitute_args (ret.tex_, a); + + } + ret.dim_.x() = Interval (0,wid); return ret; } diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc index 05ff03a089..cee16dbeb8 100644 --- a/lily/tex-slur.cc +++ b/lily/tex-slur.cc @@ -149,7 +149,11 @@ Lookup::slur (int dy , Real &dx, Direction dir) const // duh // let's try the embedded stuff - bool embedded_b = experimental_features_global_b; + + /* bool embedded_b = experimental_features_global_b; + // embedded stuff still sucks for slurs + */ + bool embedded_b = false; String embed; if (embedded_b) { diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 708299730e..0ec4bb236e 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.33 -Inschrijf datum: 24NOV97 +Versie: 0.1.34 +Inschrijf datum: 03DEC97 Beschrijving: LilyPond is de muziek typesetter van het GNU Project. Het programma genereert muziek in zichtbare of hoorbare vorm uit uit een muzikale definitie file: @@ -16,8 +16,8 @@ Auteur: hanwen@stack.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Onderhouden door: hanwen@stack.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 395k lilypond-0.1.33.tar.gz + 395k lilypond-0.1.34.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.33.tar.gz + 395k lilypond-0.1.34.tar.gz Copi"eer politie: GPL End diff --git a/make/lilypond.lsm b/make/lilypond.lsm index b15c4fe07d..3c14c25a17 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.33 -Entered-date: 24NOV97 +Version: 0.1.34 +Entered-date: 03DEC97 Description: LilyPond is the GNU Project music typesetter. The program generates visual or auditive output from a music definition file: it can typeset formatted sheet music @@ -14,8 +14,8 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 440k lilypond-0.1.33.tar.gz + 440k lilypond-0.1.34.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 440k lilypond-0.1.33.tar.gz + 440k lilypond-0.1.34.tar.gz Copying-policy: GPL End diff --git a/make/lilypond.spec b/make/lilypond.spec index ce6665146a..8e3d32b7d8 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.1.33 +Version: 0.1.34 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.33.tar.gz +Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.34.tar.gz Summary: A program for typesetting music. URL: http://www.stack.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/tex/feta16.tex b/tex/feta16.tex index d92e58bc63..bef96e539f 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Wed Dec 3 01:03:55 1997 +% on Wed Dec 3 11:10:44 1997 % Do not edit % input from out/feta16.log % name diff --git a/tex/feta20.tex b/tex/feta20.tex index 4b079aaa1c..75c430f60a 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Wed Dec 3 01:04:18 1997 +% on Wed Dec 3 11:10:47 1997 % Do not edit % input from out/feta20.log % name diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index 3c6a616b02..95dc812ee3 100644 --- a/tex/fetdefs.tex +++ b/tex/fetdefs.tex @@ -58,8 +58,44 @@ \immediate\write\embedfile{\embedcount=\the\embedcount} \immediate\closeout\embedfile } + + + \def\turnOnExperimentalFeatures{ +% +% WARNING: don't leave blank lines in the PS-code; they are +% transformed into \par +% + + +\special{ps: +/draw_decresc + { + /ht exch def + /wd exch def +% + 0 ht moveto + wd ht neg rlineto + wd neg ht neg rlineto + stroke + } + def + /draw_cresc + { + /ht exch def + /wd exch def +% + 0 0 moveto + wd ht rmoveto + wd neg ht neg rlineto + wd ht neg rlineto + stroke + } + def +} + + % draw a slur in embedded postscript \special{ps: /xbow 1 3 div def @@ -124,6 +160,9 @@ \def\embeddedtex#1{#1} \def\embeddedps#1{ + % + % This sets CTM so that you get to the currentpoint + % by executing a 0 0 moveto \special{ps: @beginspecial @setspecial #1 @endspecial} } \def\embeddedmf#1{ @@ -149,7 +188,7 @@ % dat heb je handig gedaan, lieverd! \nometafont -\nopostscript +%\nopostscript %\notex \def\EndLilyPondOutput{ diff --git a/tex/titledefs.tex b/tex/titledefs.tex index d31eda5566..9cd871e4d9 100644 --- a/tex/titledefs.tex +++ b/tex/titledefs.tex @@ -2,6 +2,8 @@ % ideally, we should create a LaTeX/TeX class % for setting music in different sizes. % +% Version 0.1 +% \input lilyponddefs \def\EndLilyPondOutput{\endinput} % @@ -11,21 +13,24 @@ \def\thearranger{} \def\theinstrument{} % -\def\title#1{\def\thetitle{#1\\}} -\def\subtitle#1{\def\thesubtitle{#1}} -\def\composer#1{\def\thecomposer{#1}} -\def\composers#1{\def\thecomposer{#1}} -\def\arranger#1{\def\thearranger{#1}} -\def\arrangers#1{\def\thearranger{#1}} -\def\instrument#1{\def\theinstrument{#1}} +\newcommand*{\title}[1]{\def\thetitle{#1\\}} +\newcommand*{\subtitle}[1]{\def\thesubtitle{#1\\}} +\newcommand*{\composer}[1]{\def\thecomposer{#1\\}} +\newcommand*{\arranger}[1]{\def\thearranger{#1}} +\newcommand*{\instrument}[1]{\def\theinstrument{#1}} +% +\newcommand*{\mudelatitle}[1]{\def\thetitle{#1\\}} +\newcommand*{\mudelasubtitle}[1]{\def\thesubtitle{#1\\}} +\newcommand*{\mudelacomposer}[1]{\def\thecomposer{#1\\}} +\newcommand*{\mudelaarranger}[1]{\def\thearranger{#1}} +\newcommand*{\mudelainstrument}[1]{\def\theinstrument{#1}} % -\def\makelilytitle{ - \begin{center} - {\huge\bfseries\thetitle}{\large\bfseries\thesubtitle} - \end{center} - {\flushleft\theinstrument\hfill\scshape\thecomposer\\} - {\hfill\thearranger} - } - - +\def\makelilytitle +{ + {\center\bfseries\huge\center\thetitle} + \par + {\center\bfseries\large\thesubtitle} + %\bigskip + {\flushleft\theinstrument\hfill\scshape\thecomposer}{\hfill\thearranger} +} \endinput -- 2.39.5