From 69be4c5d4688db9750b83147822b0cacfc66583b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 24 Nov 1997 01:58:06 +0100 Subject: [PATCH] release: 0.1.33 --- AUTHORS.text | 30 ++--- Documentation/AUTHORS.pod | 29 +++-- Documentation/CodingStyle.pod | 5 + Documentation/faq.pod | 21 ++++ Documentation/links.pod | 2 +- INSTALL.text | 12 +- NEWS | 10 ++ README | 2 +- TODO | 6 +- VERSION | 2 +- bin/lytodvi.sh | 216 ++++++++++++++++++++++++++++++++++ flower/stringtest.cc | 119 ------------------- init/feta16.ly | 2 +- init/feta20.ly | 2 +- input/abbrev.ly | 38 ------ input/font.ly | 23 ++++ input/kortjakje.ly | 2 +- input/twinkle.ly | 23 ++-- lily/VERSION | 2 +- lily/beam.cc | 3 + lily/include/main.hh | 1 + lily/include/paper-def.hh | 1 + lily/main.cc | 10 +- lily/p-score.cc | 3 +- lily/paper-def.cc | 11 ++ lily/scores.cc | 10 +- lily/stem.cc | 2 +- make/lelievijver.lsm | 8 +- make/lilypond.lsm | 8 +- make/lilypond.spec | 6 +- tex/feta16.tex | 2 +- tex/feta20.tex | 2 +- tex/titledefs.tex | 44 +------ 33 files changed, 386 insertions(+), 271 deletions(-) create mode 100644 bin/lytodvi.sh delete mode 100644 flower/stringtest.cc delete mode 100644 input/abbrev.ly diff --git a/AUTHORS.text b/AUTHORS.text index 0e156d133a..343973c19d 100644 --- a/AUTHORS.text +++ b/AUTHORS.text @@ -26,21 +26,26 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS reg.cc, clef-item.cc swedish notenames, testing, general comments, duration logs/longa/brevis etc - +o Werner Lemberg , misc - bugfixes, some Beam and Stem code. + +o Jan Arne Fagertun , + TeX titling and lytodvi.sh - +o Donald Ervin Knuth, mf/ital-*.mf (these were taken - from the CM fonts) + +o Werner Lemberg , + misc bugfixes, some Beam and Stem code. - +o Alexandre Oliva , testing + +o Donald Ervin Knuth, http://www.cs.stanford.edu/~? + mf/ital-*.mf (these were taken from the CM fonts) - +o Anthony Fok , debian - package: make/debian/* + +o Alexandre Oliva , + http://?.unicamp.br/ + testing - +o Franc,ois Pinard , + +o Anthony Fok , + debian package: make/debian/* + + +o Franc,ois Pinard , Documentation/Vocab*, internationalization stuff - +o Neil Jerram . + +o Neil Jerram . Documentation/Vocab* Your name could be here! If you want to help, then take a @@ -56,11 +61,6 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS - - - - - -27/Oct/97 LilyPond 0.1.32 1 +24/Nov/97 LilyPond 0.1.33 1 diff --git a/Documentation/AUTHORS.pod b/Documentation/AUTHORS.pod index 5aa77001d3..926f5af685 100644 --- a/Documentation/AUTHORS.pod +++ b/Documentation/AUTHORS.pod @@ -32,31 +32,34 @@ Mats Bengtsson , parts of clef-reg.cc, clef-item.cc swedish notenames, testing, general comments, duration logs/longa/brevis etc -=item * +=item * Jan Arne Fagertun , + +TeX titling and lytodvi.sh -Werner Lemberg , misc bugfixes, some +=item * Werner Lemberg , + +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 , http://?.unicamp.br/ -Alexandre Oliva , testing +testing -=item * +=item * Anthony Fok , -Anthony Fok , debian package: make/debian/* +debian package: make/debian/* -=item * +=item * Franc,ois Pinard , -Franc,ois Pinard , Documentation/Vocab*, -internationalization stuff +Documentation/Vocab*, internationalization stuff -=item * +=item * Neil Jerram . -Neil Jerram . Documentation/Vocab* +Documentation/Vocab* =back diff --git a/Documentation/CodingStyle.pod b/Documentation/CodingStyle.pod index 07dad8dfa3..0f57d3e1b3 100644 --- a/Documentation/CodingStyle.pod +++ b/Documentation/CodingStyle.pod @@ -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 diff --git a/Documentation/faq.pod b/Documentation/faq.pod index 45a3cceb2e..b121c5c05b 100644 --- a/Documentation/faq.pod +++ b/Documentation/faq.pod @@ -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 diff --git a/Documentation/links.pod b/Documentation/links.pod index 5cccbf7c26..7a77721c8f 100644 --- 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/INSTALL.text b/INSTALL.text index beefad9059..d4c3cb6682 100644 --- a/INSTALL.text +++ b/INSTALL.text @@ -61,7 +61,7 @@ RRRRUUUUNNNNNNNNIIIINNNNGGGG -20/Oct/97 LilyPond 0.1.32 1 +20/Oct/97 LilyPond 0.1.33 1 @@ -127,7 +127,7 @@ CCCCOOOONNNNFFFFIIIIGGGGUUUURRRRIIIINNNNGGGG a -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 @@ IIIINNNNSSSSTTTTAAAALLLLLLLLIIIINNNNGGGG -20/Oct/97 LilyPond 0.1.32 4 +20/Oct/97 LilyPond 0.1.33 4 @@ -325,7 +325,7 @@ RRRREEEEDDDDHHHHAAAATTTT LLLLIIIINNNNUUUUXXXX -20/Oct/97 LilyPond 0.1.32 5 +20/Oct/97 LilyPond 0.1.33 5 @@ -391,6 +391,6 @@ AAAAUUUUTTTTHHHHOOOORRRRSSSS -20/Oct/97 LilyPond 0.1.32 6 +20/Oct/97 LilyPond 0.1.33 6 diff --git a/NEWS b/NEWS index 035407973c..11344c4360 100644 --- 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 fc5a277cb2..076c334b6a 100644 --- 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 b38448220b..f15bfb654c 100644 --- 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 959fb4e60b..c95b78ccbf 100644 --- 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 index 0000000000..e303f5c3b9 --- /dev/null +++ b/bin/lytodvi.sh @@ -0,0 +1,216 @@ +#!/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/flower/stringtest.cc b/flower/stringtest.cc deleted file mode 100644 index a5bc0c6036..0000000000 --- a/flower/stringtest.cc +++ /dev/null @@ -1,119 +0,0 @@ -#ifdef STRING_TEST -/* - stupid test program to verify stringlib - stringtest.cc - */ -#include -#include "string.hh" -#include "varray.hh" -#include "string-convert.hh" - -void -ctors() -{ - cout << "constructors"< a; - a.push ("abcd"); - a.push ("zxy"); - a.push ("abc"); - a.push (""); - a.sort (String::compare_i); - cout << "compares: "< diff --git a/input/twinkle.ly b/input/twinkle.ly index 6d5c243fd1..51d8114f05 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -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 > > diff --git a/lily/VERSION b/lily/VERSION index 83291dceb3..9a92fbc003 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 32 +PATCH_LEVEL = 33 MY_PATCH_LEVEL = diff --git a/lily/beam.cc b/lily/beam.cc index a7cfd829ca..268499b1b0 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -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 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 (); diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 3056dc6a21..0f9ee0f4d0 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -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 i (*real_vars_p_); i.ok(); i++) + s += String ("\\def\\mudelapaper") + i.key () + "{" + i.val () + "}\n"; + return s; +} diff --git a/lily/scores.cc b/lily/scores.cc index a13e1195be..edb4bbec80 100644 --- a/lily/scores.cc +++ b/lily/scores.cc @@ -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(); } diff --git a/lily/stem.cc b/lily/stem.cc index 814eb6af83..32a7b1ede3 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -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 ()); diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 0299de5e37..708299730e 100644 --- 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 5442985205..b15c4fe07d 100644 --- 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 0713432550..ce6665146a 100644 --- 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 @@ -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/feta16.tex b/tex/feta16.tex index a575ac9a45..05127640c1 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 Nov 19 11:44:45 1997 +% on Mon Nov 24 00:16:56 1997 % Do not edit % input from out/feta16.log % name diff --git a/tex/feta20.tex b/tex/feta20.tex index d5b64756df..f6da6f4cfa 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 Nov 19 11:44:54 1997 +% on Mon Nov 24 00:16:57 1997 % Do not edit % input from out/feta20.log % name diff --git a/tex/titledefs.tex b/tex/titledefs.tex index 37ed8eb9ba..d31eda5566 100644 --- 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 - } -- 2.39.5