]> git.donarmstrong.com Git - lilypond.git/commitdiff
release: 0.1.33 release/0.1.33
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Mon, 24 Nov 1997 00:58:06 +0000 (01:58 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Mon, 24 Nov 1997 00:58:06 +0000 (01:58 +0100)
33 files changed:
AUTHORS.text
Documentation/AUTHORS.pod
Documentation/CodingStyle.pod
Documentation/faq.pod
Documentation/links.pod
INSTALL.text
NEWS
README
TODO
VERSION
bin/lytodvi.sh [new file with mode: 0644]
flower/stringtest.cc [deleted file]
init/feta16.ly
init/feta20.ly
input/abbrev.ly [deleted file]
input/font.ly
input/kortjakje.ly
input/twinkle.ly
lily/VERSION
lily/beam.cc
lily/include/main.hh
lily/include/paper-def.hh
lily/main.cc
lily/p-score.cc
lily/paper-def.cc
lily/scores.cc
lily/stem.cc
make/lelievijver.lsm
make/lilypond.lsm
make/lilypond.spec
tex/feta16.tex
tex/feta20.tex
tex/titledefs.tex

index 0e156d133abdea853b7aca9c0d962d406e9ce655..343973c19d5d24fbb3fcdf2f2ee652066d52ebd3 100644 (file)
@@ -26,21 +26,26 @@ C\bC\bC\bCO\bO\bO\bON\bN\bN\bNT\bT\bT\bTR\bR\bR\bRI\bI\bI\bIB\bB\bB\bBU\bU\bU\bUT\bT\bT\bTO\bO\bO\bOR\bR\bR\bRS\bS
            reg.cc, clef-item.cc swedish notenames, testing,
            general comments, duration logs/longa/brevis etc
 
-       +\b  Werner Lemberg <xlwy01@uxp1.hrz.uni-dortmund.de>, misc
-           bugfixes, some Beam and Stem code.
+       +\bJan Arne Fagertun <Jan.A.Fagertun@energy.sintef.no>,
+           TeX titling and lytodvi.sh
 
-       +\b  Donald Ervin Knuth, mf/ital-*.mf (these were taken
-           from the CM fonts)
+       +\bWerner Lemberg <xlwy01@uxp1.hrz.uni-dortmund.de>,
+           misc bugfixes, some Beam and Stem code.
 
-       +\bo   Alexandre Oliva <oliva@dcc.unicamp.br>, testing
+       +\bo Donald Ervin Knuth, http://www.cs.stanford.edu/~?
+           mf/ital-*.mf (these were taken from the CM fonts)
 
-       +\bo   Anthony Fok <foka@gpu.srv.ualberta.ca>, debian
-           package: make/debian/*
+       +\bo Alexandre Oliva <oliva@dcc.unicamp.br>,
+           http://?.unicamp.br/
+           testing
 
-       +\bo   Franc,ois Pinard <pinard@iro.umontreal.ca>,
+       +\bo Anthony Fok <foka@gpu.srv.ualberta.ca>,
+           debian package: make/debian/*
+
+       +\bo Franc,ois Pinard <pinard@iro.umontreal.ca>,
            Documentation/Vocab*, internationalization stuff
 
-       +\bo   Neil Jerram <nj104@cus.cam.ac.uk>.
+       +\bo  Neil Jerram <nj104@cus.cam.ac.uk>.
            Documentation/Vocab*
 
        Your name could be here! If you want to help, then take a
@@ -56,11 +61,6 @@ C\bC\bC\bCO\bO\bO\bON\bN\bN\bNT\bT\bT\bTR\bR\bR\bRI\bI\bI\bIB\bB\bB\bBU\bU\bU\bUT\bT\bT\bTO\bO\bO\bOR\bR\bR\bRS\bS
 
 
 
-
-
-
-
-
-27/Oct/97                LilyPond 0.1.32                        1
+24/Nov/97                LilyPond 0.1.33                        1
 
 
index 5aa77001d36d29c5d0144e085b64914f92ac941b..926f5af6852b6100c43cf4eea9221b036c6cdc61 100644 (file)
@@ -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
 
index 07dad8dfa3890c17e3a0bf06dfe81895d2689846..0f57d3e1b31bd48a60b019cf6bd519bad4a50105 100644 (file)
@@ -35,6 +35,11 @@ this is to rewrite the program.
 
 -- Geoffrey James, "The Tao of Programming"
 
+
+=head2 LANGUAGES
+
+C++, /bin/sh and python are preferred.  Perl is not.
+
 =head2 FILES
 
 Definitions of classes that are only accessed via pointers
index 45a3cceb2e9ea5084961db136a417ebba76d0c93..b121c5c05b91366333831967172cd240d72e67e8 100644 (file)
@@ -126,6 +126,27 @@ 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
+the top line, or at the bottom but not between!
+        
+A: You change the order lyrics and staves.  You have to name all
+staves (lyric and melodic), otherwise they will end up in the same
+staff/lyricline
+
+       
+       \score {
+               < \melodic \type Staff = "treble" \trebleMelody
+                 \lyric   \type Lyrics = "tlyrics" \trebtext
+                 \type Staff = "bass" \melodic \bassMelody        
+                 \lyric   \type Lyrics = "blyrics" \basstext    
+               >
+               \paper {  }
+       }
+
+
+
+
 Q: I want to insert some TeX commands
 
 A: You shouldn't: it's against LilyPond philosophy to have typesetting
index 5cccbf7c26a8e9bd9803b9ad5d4decc25da2298a..7a77721c8f3342d7c573ec787a10ee0a4322f199 100644 (file)
@@ -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
 
index beefad90596cb234c43327b302514d7068a4aaf3..d4c3cb6682470704b5987f928e64e0279860ee12 100644 (file)
@@ -61,7 +61,7 @@ R\bR\bR\bRU\bU\bU\bUN\bN\bN\bNN\bN\bN\bNI\bI\bI\bIN\bN\bN\bNG\bG\bG\bG
 
 
 
-20/Oct/97                LilyPond 0.1.32                        1
+20/Oct/97                LilyPond 0.1.33                        1
 
 
 
@@ -127,7 +127,7 @@ C\bC\bC\bCO\bO\bO\bON\bN\bN\bNF\bF\bF\bFI\bI\bI\bIG\bG\bG\bGU\bU\bU\bUR\bR\bR\bRI\bI\bI\bIN\bN\bN\bNG\bG\bG\bG a\b
 
 
 
-20/Oct/97                LilyPond 0.1.32                        2
+20/Oct/97                LilyPond 0.1.33                        2
 
 
 
@@ -193,7 +193,7 @@ INSTALL(1)            LilyPond documentation           INSTALL(1)
 
 
 
-20/Oct/97                LilyPond 0.1.32                        3
+20/Oct/97                LilyPond 0.1.33                        3
 
 
 
@@ -259,7 +259,7 @@ I\bI\bI\bIN\bN\bN\bNS\bS\bS\bST\bT\bT\bTA\bA\bA\bAL\bL\bL\bLL\bL\bL\bLI\bI\bI\bIN\bN\bN\bNG\bG\bG\bG
 
 
 
-20/Oct/97                LilyPond 0.1.32                        4
+20/Oct/97                LilyPond 0.1.33                        4
 
 
 
@@ -325,7 +325,7 @@ R\bR\bR\bRE\bE\bE\bED\bD\bD\bDH\bH\bH\bHA\bA\bA\bAT\bT\bT\bT L\bL\bL\bLI\bI\bI\bIN\bN\bN\bNU\bU\bU\bUX\bX\bX\bX
 
 
 
-20/Oct/97                LilyPond 0.1.32                        5
+20/Oct/97                LilyPond 0.1.33                        5
 
 
 
@@ -391,6 +391,6 @@ A\bA\bA\bAU\bU\bU\bUT\bT\bT\bTH\bH\bH\bHO\bO\bO\bOR\bR\bR\bRS\bS\bS\bS
 
 
 
-20/Oct/97                LilyPond 0.1.32                        6
+20/Oct/97                LilyPond 0.1.33                        6
 
 
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/TODO b/TODO
index b38448220b9a332b20937e0db6ad5160eae9665a..f15bfb654c85a9ee8f1b79b456e567f85cf55b90 100644 (file)
--- a/TODO
+++ b/TODO
@@ -69,7 +69,7 @@ PROJECTS
        * Unicode support?
        - 16 bit Strings
        - -u switch
-               - detect of 16/8 bit files
+       - detect of 16/8 bit files
        - examples to go with it.
 
        * Spring_spacer:
@@ -79,9 +79,11 @@ PROJECTS
        - used fixed point fp
 
        * \header
-       - write perl script for handling it into databases
+       - write perl/python script for handling it into databases
        - write TeX macros to generate titles
        - adapt make-website to use \header info.
+       - output header info to MIDI too.
+
 
        * Makefile stuff:
        - Use Automake
diff --git a/VERSION b/VERSION
index 959fb4e60b5446dbe92636a54519a91f91348289..c95b78ccbf7c8f92fb4bd46194416c30bbccf298 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
-TOPLEVEL_PATCH_LEVEL = 32
+TOPLEVEL_PATCH_LEVEL = 33
 TOPLEVEL_MY_PATCH_LEVEL = 
 
 # use the above to send patches, always empty for released version:
diff --git a/bin/lytodvi.sh b/bin/lytodvi.sh
new file mode 100644 (file)
index 0000000..e303f5c
--- /dev/null
@@ -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/flower/stringtest.cc b/flower/stringtest.cc
deleted file mode 100644 (file)
index a5bc0c6..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifdef STRING_TEST
-/*
-  stupid test program to verify stringlib
-  stringtest.cc
-  */
-#include <iostream.h>
-#include "string.hh"
-#include "varray.hh"
-#include "string-convert.hh"
-
-void
-ctors()
-{
-  cout << "constructors"<<endl;
-
-  String str ("hai");
-  String def;
-  String fromi (10);
-  String fromc ('c');
-  String fromf (1.32e-2, "%g");
-
-  cout << str << endl;
-  cout << def << endl;
-  cout << fromi<< endl;
-  cout << fromc<< endl;       
-  cout << fromf<< endl;
-}
-
-void
-cmp()
-{
-  Array<String> a;
-  a.push ("abcd");
-  a.push ("zxy");
-  a.push ("abc");
-  a.push ("");
-  a.sort (String::compare_i);
-  cout << "compares: "<<endl;
-  for (int i=0; i < a.size(); i++)
-       cout << a[i] << endl;
-}
-
-
-void
-searching()
-{
-  String hay = "foobarbazblub";
-
-  char c =   'b';
-  String cstr =c;
-  String set = "bar";
-  cout << "hay = \"" << hay << "\" len="<< hay.length_i()<<endl;
-  cout << "index_i ('"<< c<<"') " << c << "= " << hay.index_i (c) <<endl;
-  cout << "last_index_i ('"<< c<<"') " << c << "= " << hay.index_last_i (c) <<endl;    
-//    cout << "last index of cstr " << c << ": " << hay.index_last_i (cstr) <<endl;    
-//    cout << "index_last_i (\""<<set<<"\"): " << hay.index_last_i (set) <<endl;
-  cout << "index_i (\""<<set<<"\"): " << hay.index_i (set) <<endl;    
-  cout << "index_any (\"" << set << "\"): " << cstr << ": " << hay.index_any_i (cstr) <<endl;
-
-  
-  
-}
-
-
-void
-kutenpeer()
-{
-  String str ("hai");
-  for (int i=-1; i < str.length_i()+2; i++) 
-    {
-       cout<<" left_str (" << i<<"): " << str.left_str (i) << endl;
-       cout<<" right_str ("<<i<<"): " << str.right_str (i) << endl;
-    }
-  str = "blonde haren";
-  cout << str<<endl;
-  cout << "mid (2,6)="<<str.mid_str (2,3)<<endl;
-  cout << "nomid (2,6)="<<str.nomid_str (2,3)<<endl;
-}
-
-int 
-main()
-{
-  ctors();
-  cmp();
-  searching();
-  kutenpeer();
-  String str ("hai");
-  cout <<  str << endl;
-  cout << "left" << endl;
-  str += " daar";
-  cout << str << endl;
-
-  str = String ("Hallo") + " daaR" + '!';
-  cout << str << endl;
-
-  cout << "up: " << str.upper_str() << " down: " << str.lower_str ()<<endl;
-  
-  if (str == String ("") )
-      cout << str << " is empty" << endl;
-  else
-       cout << str << " is not empty"<<endl;
-
-  
-  String fn = "";
-  if (fn == "")
-      cout << fn << " is empty" << endl;
-  else
-       assert (false);
-  
-  fn = "";
-  fn += "";
-  delete fn.copy_byte_p();
-  delete str.copy_byte_p();
-
-  cout << String_convert::bin2hex_str (String ((char)0xff) ) << endl;
-}
-
-#endif STRING_TEST
-
index b599375c0bcde6f36dfdef2bb7ece70e721dc0aa..b7a80d998684e0018351e17d154e01051e6d0057 100644 (file)
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Nov 19 11:44:45 1997
+% on Mon Nov 24 00:16:56 1997
 % Do not edit
 % input from out/feta16.log
 % name=\symboltables {
index 5ae1e0742d41e9d9162cc690a1fec9f94a428305..8cc5c5b7cd98e958969bb6080e2bd7e3de78952e 100644 (file)
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Nov 19 11:44:54 1997
+% on Mon Nov 24 00:16:57 1997
 % Do not edit
 % input from out/feta20.log
 % name=\symboltables {
diff --git a/input/abbrev.ly b/input/abbrev.ly
deleted file mode 100644 (file)
index 2b2de80..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-\header{
-enteredby =     "jcn";
-copyright =     "PD";
-TestedFeatures =        "simple abbreviations";
-}
-
-\version "0.1.7";
-
-\score{
-       \melodic{ 
-               \octave c'';
-               \meter 4/4;
-               % default abbreviations
-               c4 c4: c4:32 c4: c4 c2.
-               'a1
-               'a1:32
-               'c4:8 c': 'c4:16 c':
-%              [ 'c8:16 'c 'c 'c ] [ a a a a ]
-%              [ 'c 'f 'b e ] 
-%              [ 'c16:32 'c 'c 'c ] [ a16:32 a a a ]
-%%             % there's still some hairy beam bugfixing todo
-%%             [ c'8:16 g d 'a ]
-%%             [ c'16:32 g d 'a ]
-%%             [ 'c8:32 'f 'b e ]
-               [:32 c16 e]
-               [:32 c16 e]
-               [:16 c8 e]
-               [:16 e4 g]
-               [:16 e2 g]
-               [:16 e1 g]
-       }
-       \paper{ 
-           gourlay_maxmeasures =5.;
-       }
-% oeps
-       \midi{ }
-}
-
index 4a5c7a399818bbf80d278f118716146d5dd317d3..09aa2f1e217467d4e54b45d3e0d1f97185d81e9e 100644 (file)
@@ -1,4 +1,6 @@
 \header{
+title= "The Feta font";
+subtitle = "proofsheet"; 
 enteredby =     "jcn";
 copyright =     "PD";
 TestedFeatures =        "This file tests the Feta music-font"
@@ -36,6 +38,27 @@ TestedFeatures =      "This file tests the Feta music-font"
                e32 _| g'32^| g''32-\ltoe g''32-\lheel
                e64 g'64 c4... |
 
+               \octave c'';
+               \meter 4/4;
+%{             % default abbreviations
+               c4 c4: c4:32 c4: c4 c2.
+               'a1
+               'a1:32
+               'c4:8 c': 'c4:16 c':
+%              [ 'c8:16 'c 'c 'c ] [ a a a a ]
+%              [ 'c 'f 'b e ] 
+%              [ 'c16:32 'c 'c 'c ] [ a16:32 a a a ]
+%%             % there's still some hairy beam bugfixing todo
+%%             [ c'8:16 g d 'a ]
+%%             [ c'16:32 g d 'a ]
+%%             [ 'c8:32 'f 'b e ]
+               [:32 c16 e]
+               [:32 c16 e]
+               [:16 c8 e]
+               [:16 e4 g]
+               [:16 e2 g]
+               [:16 e1 g]
+%}
                \meter 1/2; a2 |
                \meter 3/2; a1. |
                \meter 2/4; a2 |
index 86713c4995271160a710c49e8017cd2c6644c3fe..8b49f135753ce9705024050fc7336ff5a8048d2e 100644 (file)
@@ -59,7 +59,7 @@ begeleiding = \melodic{
 }
 
 \score{
-       \melodic \type Grandstaff =  <
+       \melodic \type Grandstaff <
                \melodie
                \begeleiding 
        >
index 6d5c243fd1cf6e4ddb3ce1e532d91698c6402f18..51d8114f05e0b67d8ba4dd286c1af01296eeea4a 100644 (file)
@@ -10,10 +10,11 @@ composers =  "Traditional";
 enteredby =     "HWN & JCN";
 copyright =     "public domain";
 }
-%{
-Tested Features: lyrics
 
+%{
+Tested Features: lyrics, interleaving lyrics and staffs
 %}
+
 \version "0.1.7";
 
 melody = \melodic{
@@ -122,19 +123,17 @@ textiii = \lyric{
 
 \score{
        < 
-               \type Grandstaff <
-                       < \global 
+               \lyric \type Lyrics = top < 
+                       \global \tekst >
+
+               \type Staff=treb < \global 
                          \melody >
-                       < \global 
+               \lyric \type Lyrics  = "Middle" <  \global
+                       \texte >
+               \type Staff=bass        < \global 
                        \accompany >
-               >
-               
                % ugh
-               \lyric \type Lyrics < 
-                       \global \tekst >
-               \lyric \type Lyrics <  \global
-                       \texte >
-               \lyric \type Lyrics < \global
+               \lyric \type Lyrics  = bottomlyrics < \global
                        \texti \textii \textiii >
                
        >
index 83291dceb34c44440a8327b50a723a391b845c0e..9a92fbc003c89b7b2c867ffec2afab6f464157c4 100644 (file)
@@ -1,4 +1,4 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 1
-PATCH_LEVEL = 32
+PATCH_LEVEL = 33
 MY_PATCH_LEVEL =
index a7cfd829cad95cd3f88a5041abf62363678aba6d..268499b1b0fa21b7898800b37846c42bc14a3796 100644 (file)
@@ -239,6 +239,9 @@ Beam::solve_slope()
 void
 Beam::set_stemlens()
 {
+  /* 
+     should check for visibility of stem..
+   */
   Real x0 = stems[0]->hpos_f();
   for (int j=0; j <stems.size(); j++)
     {
index 7ff4721bbabec31a36d23a44b74fa376ad9cb249..94ab8c55118e947336d5e3b9188b5d2e0587e0f8 100644 (file)
@@ -12,6 +12,7 @@
 void debug_init();
 void set_debug (bool);
 void do_scores();
+void clear_scores();
 void add_score (Score* s);
 void set_default_output (String s);
 String find_file (String);
index d87a5e637dd58e320aaae02fd4b672adbd5f469d..826918fa2f7efca4426faa24440dead24fb68e4b 100644 (file)
@@ -83,6 +83,7 @@ public:
   Real geometric_spacing(Moment) const;
   Real arithmetic_constant(Moment minimal_mom) const;
   Real arithmetic_spacing( Moment mom,Real constant) const;
+  String TeX_output_settings_str () const;
 };
 
 #endif // Paper_def_HH
index 73e4dc087659ac2e8c095d9efe9f4be639f1a34b..b059da16078fccbf1d101ca4632614b930821d79 100644 (file)
@@ -127,9 +127,15 @@ do_one_file (String init_str, String file_str)
     My_lily_parser parser (source_l_g);
     parser.set_version_check (version_ignore_b);
     parser.parse_file (init_str, file_str);
-    exit_status_i_ |= parser.error_level_i_;
+
+    if (parser.error_level_i_)
+      {
+       exit_status_i_  = 1;
+      }
+    else
+      do_scores();
+    clear_scores ();
   }
-  do_scores();
   source_l_g = 0;
 }
 
index c2af728860e56bc0d5abc541efe2b063232c94f4..39ada58c3b21402c6ea95d8a30a9f00315aeb09b 100644 (file)
@@ -206,8 +206,9 @@ Paper_score::tex_output ()
     {
       tex_out << header_l_->TeX_string();
     }
+  tex_out << paper_l_->TeX_output_settings_str ();
+  
 
-  tex_out << "\n "<<  paper_l_->lookup_l ()->texsetting << "%(Tex id)\n";
   if (experimental_features_global_b)
     tex_out << "\\turnOnExperimentalFeatures%\n";
   super_elem_l_->output_all ();
index 3056dc6a2110b821c8f3d4ba1a9731e15d0ef8e0..0f9ee0f4d0fdd9bd52cbc50f3d6d9dde9f303188 100644 (file)
@@ -161,3 +161,14 @@ Paper_def::lookup_l()
 }
 
 IMPLEMENT_IS_TYPE_B1(Paper_def, Music_output_def);
+
+String
+Paper_def::TeX_output_settings_str () const
+{
+  
+  String s("\n ");
+  s +=  lookup_p_->texsetting + "%(Tex id)\n";
+  for (Assoc_iter<String,Real> i (*real_vars_p_); i.ok(); i++)
+    s += String ("\\def\\mudelapaper") + i.key () + "{" + i.val () + "}\n";
+  return s;
+}
index a13e1195bebfc22e9112de595965b5e26825a0e0..edb4bbec801b5668cfbfe79f6d9748cefbd4030b 100644 (file)
@@ -37,9 +37,15 @@ do_scores()
        {
          is_p->process();
        }
-      delete is_p;
-      is_p =0;
+    }
+}
 
+void
+clear_scores ()
+{
+  for (int i=0; i < global_score_array.size(); i++)
+    {
+      delete global_score_array[i];
     }
   global_score_array.clear();
 }
index 814eb6af83f0126b1584bb2f4d3661ac14d324a1..32a7b1ede378492e63232c32bb828d7dfd750533 100644 (file)
@@ -348,7 +348,7 @@ Real
 Stem::note_delta_f () const
 {
   Real r=0;
-  if (head_l_arr_.size())
+  if (head_l_arr_.size() && stem_xdir_ != CENTER)
     {
       Interval head_wid(0,  head_l_arr_[0]->width ().length ());
       Real rule_thick(paper ()->rule_thickness ());
index 0299de5e37285a67cfe4e836a19efa12f9a5a4e3..708299730e8ae7295c99253232d61aadd5769a51 100644 (file)
@@ -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
index 544298520504a0d98949060d21881b31bffb73b0..b15c4fe07daa940c2c3a0f15599b7831dd863308 100644 (file)
@@ -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
index 071343255001e77a66f356a0783bb7fa14976e66..ce6665146a63a2c4d01a5e30a8d3b23d382fce02 100644 (file)
@@ -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
index a575ac9a45bd11e49ca24b9f04403199cc811316..05127640c1a5464df8a7be6cce4f496bc8815bff 100644 (file)
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Nov 19 11:44:45 1997
+% on Mon Nov 24 00:16:56 1997
 % Do not edit
 % input from out/feta16.log
 % name
index d5b64756dfffa070ea5edeba175104d2552ae9f5..f6da6f4cfa6f3b9210c92575de4200757d0d5889 100644 (file)
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Wed Nov 19 11:44:54 1997
+% on Mon Nov 24 00:16:57 1997
 % Do not edit
 % input from out/feta20.log
 % name
index 37ed8eb9ba7611f642658e3b9ea9c3762548d312..d31eda5566f3e45e19829b1ffad874894b2821e8 100644 (file)
 \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
-  }