lilypond-0.1.33

diff --git a/Documentation/AUTHORS.pod b/Documentation/AUTHORS.pod
index 5aa77001d36d29c5d0144e085b64914f92ac941b..926f5af6852b6100c43cf4eea9221b036c6cdc61 100644 (file)
--- a/Documentation/AUTHORS.pod
+++ b/Documentation/AUTHORS.pod
@@ -32,31 +32,34 @@ Mats Bengtsson <matsb@s3.kth.se>, parts of clef-reg.cc, clef-item.cc
 swedish notenames, testing, general comments, duration
 logs/longa/brevis etc
 
-=item *
+=item * Jan Arne Fagertun <Jan.A.Fagertun@energy.sintef.no>,
+
+TeX titling and lytodvi.sh
 
-Werner Lemberg <xlwy01@uxp1.hrz.uni-dortmund.de>, misc bugfixes, some
+=item * Werner Lemberg <xlwy01@uxp1.hrz.uni-dortmund.de>,
+
+misc bugfixes, some
 Beam and Stem code. 
 
-=item *
+=item * Donald Ervin Knuth, http://www.cs.stanford.edu/~?
 
-Donald Ervin Knuth, mf/ital-*.mf (these were taken from the CM fonts)
+mf/ital-*.mf (these were taken from the CM fonts)
 
-=item *
+=item * Alexandre Oliva <oliva@dcc.unicamp.br>, http://?.unicamp.br/
 
-Alexandre Oliva <oliva@dcc.unicamp.br>, testing
+testing
 
-=item *
+=item * Anthony Fok <foka@gpu.srv.ualberta.ca>, 
 
-Anthony Fok <foka@gpu.srv.ualberta.ca>, debian package: make/debian/*
+debian package: make/debian/*
 
-=item *
+=item * Franc,ois Pinard <pinard@iro.umontreal.ca>, 
 
-Franc,ois Pinard <pinard@iro.umontreal.ca>, Documentation/Vocab*,
-internationalization stuff
+Documentation/Vocab*, internationalization stuff
 
-=item * 
+=item *  Neil Jerram <nj104@cus.cam.ac.uk>. 
 
-Neil Jerram <nj104@cus.cam.ac.uk>. Documentation/Vocab*
+Documentation/Vocab*
 
 =back
 

diff --git a/Documentation/links.pod b/Documentation/links.pod
index 5cccbf7c26a8e9bd9803b9ad5d4decc25da2298a..7a77721c8f3342d7c573ec787a10ee0a4322f199 100644 (file)
--- a/Documentation/links.pod
+++ b/Documentation/links.pod
@@ -37,7 +37,7 @@ We will upload major releases to the following sites:
 
 =over 4
 
-=item ftp://sunsite.unc.edu/pub/Linux/apps
+=item ftp://sunsite.unc.edu/pub/Linux/apps/sound/convert
 
 The GNU/Linux FTP site
 

diff --git a/NEWS b/NEWS
index 035407973c59b3229379aa1eb966c19cbcd05ac1..11344c4360e0c04ea3ff712f50e98d9283922e4f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+pl 33
+       - added abbrev.ly to font.ly; rm'd abbrev.ly
+       - don't process scores on parse errors.
+       - bf: kortjakje.ly
+       - bf: invisible stems in beams (abbrev.ly)
+       - lytodvi script (JAF)
+       - output Paper_def settings to TeX file. (eg: linewidth)
+
+*********
+nov 19
 pl 32
        - change type checks (ughugh) to derivation checks (ugh)
        - this fixes clef bug.

diff --git a/README b/README
index fc5a277cb26e34f0e57169c51005e0a6633ba02d..076c334b6a672d02b79c3343997c702386b74212 100644 (file)
--- a/README
+++ b/README
@@ -60,7 +60,7 @@ If you have received this file as part of a DOS/Window32 distribution
 package, since it might contain more documentation
 
        ftp://pcnov095.win.tue.nl/pub/lilypond/ (Europe)
-       ftp://alpha.gnu.ai.mit.edu/gnu/lilypond/ (US)
+       ftp://alpha.gnu.org/gnu/lilypond/ (US)
 
 The website also contains the complete documentation
 

diff --git a/bin/lytodvi.sh b/bin/lytodvi.sh
new file mode 100644 (file)
index 0000000..e303f5c
--- /dev/null
+++ b/bin/lytodvi.sh
@@ -0,0 +1,216 @@
+#!/bin/sh
+#
+# Written by Jan Arne Fagertun <Jan.A.Fagertun@energy.sintef.no>
+#  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 <<EOF constructs? --HWN
+echo "\setlength{\textwidth}{"$TW"}"                           >> $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/make/lelievijver.lsm b/make/lelievijver.lsm
index 0299de5e37285a67cfe4e836a19efa12f9a5a4e3..708299730e8ae7295c99253232d61aadd5769a51 100644 (file)
--- a/make/lelievijver.lsm
+++ b/make/lelievijver.lsm
@@ -1,7 +1,7 @@
 Begin3
 Titel: LilyPond
-Versie: 0.1.32
-Inschrijf datum: 19NOV97
+Versie: 0.1.33
+Inschrijf datum: 24NOV97
 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.32.tar.gz 
+       395k lilypond-0.1.33.tar.gz 
 Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/
-       395k lilypond-0.1.32.tar.gz 
+       395k lilypond-0.1.33.tar.gz 
 Copi"eer politie: GPL
 End

diff --git a/make/lilypond.lsm b/make/lilypond.lsm
index 544298520504a0d98949060d21881b31bffb73b0..b15c4fe07daa940c2c3a0f15599b7831dd863308 100644 (file)
--- a/make/lilypond.lsm
+++ b/make/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
-Version: 0.1.32
-Entered-date: 19NOV97
+Version: 0.1.33
+Entered-date: 24NOV97
 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.32.tar.gz 
+       440k lilypond-0.1.33.tar.gz 
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
-       440k lilypond-0.1.32.tar.gz 
+       440k lilypond-0.1.33.tar.gz 
 Copying-policy: GPL
 End

diff --git a/make/lilypond.spec b/make/lilypond.spec
index 071343255001e77a66f356a0783bb7fa14976e66..ce6665146a63a2c4d01a5e30a8d3b23d382fce02 100644 (file)
--- a/make/lilypond.spec
+++ b/make/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 0.1.32
+Version: 0.1.33
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.32.tar.gz
+Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.33.tar.gz
 Summary: A program for typesetting music.
 URL: http://www.stack.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@stack.nl>
@@ -33,7 +33,7 @@ make -C Documentation gifs
 make prefix="$RPM_BUILD_ROOT/usr" install
 %files
 %doc Documentation/out/AUTHORS.text Documentation/out/CodingStyle.text Documentation/out/INSTALL.text Documentation/out/MANIFESTO.text Documentation/out/convert-mudela.text Documentation/out/faq.text Documentation/out/gnu-music.text Documentation/out/index.text Documentation/out/internals.text Documentation/out/language.text Documentation/out/lilypond.text Documentation/out/links.text Documentation/out/literature.text Documentation/out/mi2mu.text Documentation/out/mudela-book.text Documentation/out/mutopia.text Documentation/out/other-packages.text BUGS TODO NEWS DEDICATION ANNOUNCE README
-%doc input/abbrev.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/font.ly input/font20.ly input/gallina.ly input/gallina.tex input/gourlay.ly input/header.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/rhythm.ly input/scales.ly input/scripts.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/sleur.ly input/slurs.ly input/standchen-16.ly input/standchen-16.tex input/standchen-20.ly input/standchen-20.tex input/standchen.ly input/toccata-fuga-E.ly input/twinkle-pop.ly input/twinkle.ly input/wtk1-fugue1.ly input/wtk1-fugue2.ly input/wtk1-prelude1.ly Documentation/mudela-course.doc Documentation/mudela-man.doc 
+%doc input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/font.ly input/font20.ly input/gallina.ly input/gallina.tex input/gourlay.ly input/header.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/rhythm.ly input/scales.ly input/scripts.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/sleur.ly input/slurs.ly input/standchen-16.ly input/standchen-16.tex input/standchen-20.ly input/standchen-20.tex input/standchen.ly input/toccata-fuga-E.ly input/twinkle-pop.ly input/twinkle.ly input/wtk1-fugue1.ly input/wtk1-fugue2.ly input/wtk1-prelude1.ly Documentation/mudela-course.doc Documentation/mudela-man.doc 
 %doc Documentation/out/lelie_logo.gif
 /usr/bin/convert-mudela
 /usr/bin/mudela-book

diff --git a/tex/titledefs.tex b/tex/titledefs.tex
index 37ed8eb9ba7611f642658e3b9ea9c3762548d312..d31eda5566f3e45e19829b1ffad874894b2821e8 100644 (file)
--- a/tex/titledefs.tex
+++ b/tex/titledefs.tex
@@ -14,54 +14,18 @@
 \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}}
 %
 \def\makelilytitle{
   \begin{center}
     {\huge\bfseries\thetitle}{\large\bfseries\thesubtitle}
   \end{center}
-  {\hfill\scshape\thecomposer}{\flushleft\theinstrument}{\hfill\thearranger}
-  %\bigskip
+  {\flushleft\theinstrument\hfill\scshape\thecomposer\\}
+  {\hfill\thearranger}
   }
 
 
-
-
 \endinput
-
-%
-% ideally, we should create a LaTeX/TeX class
-% for setting music in different sizes.
-%
-\input lilyponddefs
-\def\EndLilyPondOutput{\endinput}
-\def\thetitle{}
-\def\thecomposer{}
-\def\thearranger{}
-\def\theinstrument{}
-\def\theLineOne{}
-\def\theLineTwo{}
-\def\theLineThree{}
-\def\lineOne#1{\def\theLineOne{#1}}
-\def\lineTwo#1{\def\theLineTwo{#1}}
-\def\lineThree#1{\def\theLineThree{#1}}
-\def\title#1{\def\thetitle{#1}}
-\def\composer#1{\def\thecomposer{#1}}
-\def\arranger#1{\def\thearranger{#1}}
-\def\instrument#1{\def\theinstrument{#1}}
-
-\def\makelilytitle{
-  \begin{center}
-    {\Large\bfseries\thetitle}\\
-    \vskip12pt
-    {\scshape\theLineOne}
-    {\hfill\scshape\thecomposer}
-    \vskip4pt
-    {\bfseries\theLineTwo}
-    {\bfseries\thearranger}
-  \end{center}
-  \bfseries\theLineThree
-  \bfseries\theinstrument
-  \bigskip
-  }