From ee6a85310a0fdc38772b2e2e1eeea98fc6a58f65 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 6 Nov 1998 13:34:50 +0100 Subject: [PATCH] release: 1.1.3 --- Documentation/man/ly2dvi.yo | 152 ++++- Documentation/man/ly2dvi32.yo | 263 -------- Documentation/man/out/ly2dvi32.1 | 259 -------- NEWS | 23 +- README.txt | 2 +- TODO | 9 +- VERSION | 4 +- aclocal.m4 | 6 +- configure | 185 +++++- init/lily.scm | 3 - init/lily.scm.orig | 432 ------------- lily/head-engraver.cc | 79 --- lily/include/head-engraver.hh | 33 - lily/include/musical-request.hh | 3 - lily/lookup.cc | 1 + lily/musical-request.cc | 14 +- lily/plet-engraver.cc | 10 +- make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mf/out/feta11.afm | 126 ++-- mf/out/feta13.afm | 126 ++-- mf/out/feta16.afm | 126 ++-- mf/out/feta19.afm | 126 ++-- mf/out/feta20.afm | 126 ++-- mf/out/feta23.afm | 126 ++-- mf/out/feta26.afm | 126 ++-- scripts/ly2dvi-old.sh | 1005 ------------------------------ scripts/ly2dvi.py | 26 +- stepmake/aclocal.m4 | 6 +- tex/lilyponddefs.ps | 0 31 files changed, 800 insertions(+), 2617 deletions(-) delete mode 100644 Documentation/man/ly2dvi32.yo delete mode 100644 Documentation/man/out/ly2dvi32.1 delete mode 100644 init/lily.scm.orig delete mode 100644 lily/head-engraver.cc delete mode 100644 lily/include/head-engraver.hh delete mode 100644 scripts/ly2dvi-old.sh delete mode 100644 tex/lilyponddefs.ps diff --git a/Documentation/man/ly2dvi.yo b/Documentation/man/ly2dvi.yo index 45734f10e8..d970a8052b 100644 --- a/Documentation/man/ly2dvi.yo +++ b/Documentation/man/ly2dvi.yo @@ -1,27 +1,30 @@ -mailto(janneke@gnu.org) +mailto(daboys@bga.com) manpage(LilyPond) (1) (1998) (The LilyPond package) - (Ly2dvi) + (Ly2dvi32) -metalC(Automatically generated by yodl(1) from ly2dvi.yo.) +metalC(Automatically generated by yodl(1) from ly2dvi32.yo.) -manpagename(Ly2dvi)(convert mudela to DVI) +manpagename(Ly2dvi32)(Python utility to convert mudela to DVI) manpagedescription() -ly2dvi is a shell script which creates input file for LaTeX, -based on information from the output files from lilypond. +ly2dvi is a Python script which creates input file for LaTeX, +based on information from the output files from LilyPond. The script handles multiple files. If a mudela file name is -specified lilypond is run to make an output (TeX) file. +specified LilyPond is run to make an output (TeX) file. One or more LaTeX files are created, based on information found in the output (TeX) files, and latex is finally run to create one or more DVI files. +The majority of this utility came from a bourne script written by Jan +Arne Fagertun name file(ly2dvi). + manpagesynopsis() - ly2dvi [options] inputfile[.ly] [....] + ly2dvi32 [options] inputfile[.ly] [....] manpageoptions() @@ -48,6 +51,8 @@ dit(-N,--nonumber) Switch off page numbering. dit(-O,--orientation=) Set orientation landscape - obsolete, use bf(-L) instead. +dit(-P,--postscript) + In addition to the DVI file, also Generate a postsript file. dit(-W,--Width=) Set paper width (points). Used together with heigth and LaTeX name of papersize in case of papersize unknown to ly2dvi. @@ -92,6 +97,8 @@ dit(papersize="";) manpagesection(Environment) description( +dit(LILYPONDPREFIX) + Sets the root directory of the LilyPond installation dit(LILYINCLUDE) Additional directories for input files. dit(TMP) @@ -109,41 +116,111 @@ dit(title) The title of the music. Centered on top of the first page. dit(subtitle) Subtitle, centered below the title. +dit(poet) + Name of the poet, leftflushed below the below subtitle. dit(composer) Name of the composer, rightflushed below the subtitle. +dit(metre) + Meter string, leftflushed below the below poet. +dit(opus) + Name of the opus, rightflushed below the below composer. dit(arranger) - Name of the arranger, rightflushed below the composer. + Name of the arranger, rightflushed below the opus. dit(instrument) - Name of the instrument, leftflushed at same level as the composer. + Name of the instrument, centered below the arranger +dit(piece) + Name of the piece, leftflushed below the instrument ) -file(/usr/local/share/lilyrc /etc/lilyrc $HOME/.lilyrc ./.lilyrc) -are files to set up default running conditions/variables, Bourne shell -syntax. All files are parsed, in the shown sequence. The variables are -overridden by variables in the mudela file, and by command line options. -In the current version the following are allowed: +file($LILYPONDPREFIX/share/.lilyrc $HOME/.lilyrc ./.lilyrc) are files +to set up default running conditions. On Windows OS initialization +files are named file(_lilyrc). The file syntax is as follows: + +verb(VARIABLE-NAME=VALUE) + +Where bf(VARIABLE-NAME) is the name of the variable documented below +and bf(VALUE) is either a string, a 1, or a 0. All files are parsed, +in the shown sequence. In the current version the following are +allowed: description( -dit(LANGUAGE=) - Specify LaTeX language. -dit(LATEXHF=) - Specify additional LaTeX headers file -dit(LILYINCLUDE=) - Additional directories for input files. -dit(ORIENTATION=) - Set orientation - portrait is the default. -dit(OUTPUTDIR=) - Set output directory. -dit(PAPERSIZE=) - Specify name of papersize. -dit(PHEIGTH=) - Specify paperheight (points - an inch is 72.27, a cm is 28.453 points). -dit(TMP=) - Temporary directory name. -dit(PWIDTH=) - Specify paperwidth (points - an inch is 72.27, a cm is 28.453 points). +dit(DEBUG=value) +This turns off (default) or on the debug capabilities. Possible +values are 0 (off) and 1 (on). +dit(DEPENDENCIES=value) +This turns off (default) or on the ability to generate a Makefile +dependency list. Possible values are 0 (off) and 1 (on). +dit(KEEPLILYPOND=value) +This turns off (default) or on the ability to keep the log file +associated with the LilyPond job. Possible values are 0 (off) and 1 +(on). +dit(KEEPLY2DVI=value) +This turns off (default) or on the ability to keep the temporary files +that are generated by the ly2dvi job. Possible values are 0 (off) and +1 (on) +dit(LANGUAGE=value) +Specify LaTeX language. Possible value is a valid LaTeX language. +dit(LATEXHF=value) +Specify additional LaTeX headers file. Possible value is a file +specification. +dit(LILYINCLUDE=value) +Additional directories for input files. Possible value is a delimited +directory path list. +dit(LILYPONDPREFIX=value) +This defines the LilyPond root directory. Possible value is a valid +directory specification to the LilyPond distribution location. +dit(NONUMBER=value) +This turns off (default) or on the page numbering capability. +Possible values are 0 (page numbering enabled) and 1 (page numbering +disabled). +dit(ORIENTATION=value) +This sets the image orientation. Possible values are +portrait (default) and landscape. +dit(OUTPUTDIR=value) +This defines the directory where the resultant files will be +generated. Possible value is a valid directory specification. +Default is the current working directory. +dit(PAPERSIZE=value) +This defines the papersize the image will be sized to fit. Possible +values are a0, a1, a2, a3, a4 (default), a5, a6, a7, a8, a9, a10, b0, +b1, b2, b3, b4, b5, archA, archB, archC, archD, archE, flsa, flse, +halfletter, ledger, legal, letter, or note. +dit(PHEIGHT=value) +Specify paperheight (points - an inch is 72.27, a cm is 28.453 points). +dit(POSTSCRIPT=value) +This turns off (default) or on the capability of additionally +generating a postscript file. Possible values are 0 (off) and 1 (on). +dit(PWIDTH=value) +Specify paperwidth (points - an inch is 72.27, a cm is 28.453 points). +dit(SEPARATE=value) +This turns off (default) or on the capability of generating multiple +dvi and postscript files from multiple source files. The default is +to generate a concatenation of the source files. Possible values are +0 (single file) and 1 (separate files). +dit(TMP=value) +This defines the emporary directory. Actually this is not used at the +present. Possible value is a valid directory specification that is +writable to the user. ) +manpagesection(Initialization Sequence) +The initialization process reads inputs for several sources. Below is +a list of priorities for lowest to hightest proirity. + +itemize( +it() Program's defaults +it() Values found in LilyPond output file +it() Environment variables +it() $LILYPONDPREFIX/share/lilypond/.lilyrc +it() $HOME/.lilyrc +it() ./.lilyrc +it() command line options +) + +Note that this differs slightly from the original bourne shell +version. + + manpagesection(See Also) lilypond(1), tex(1), latex(1) @@ -174,6 +251,13 @@ archE, b0, b1, b2, b3, b4, b5, flsa, flse, halfletter, ledger, legal, letter, note manpageauthor() +Python Version author: +nemail(Jeffrey B. Reed)(daboys@bga.com), +lurl(http://www.realtime.net/~daboys/lilypond/) + +Original bourne shell version author: +nemail(Jan Arne Fagertun)(Jan.A.Fagertun@energy.sintef.no), +lurl(http://www.termo.unit.no/mtf/people/janaf/) + -nemail(Jan Arne Fagertun)(Jan.A.Fagertun@energy.sintef.no), lurl(http://www.termo.unit.no/mtf/people/janaf/) diff --git a/Documentation/man/ly2dvi32.yo b/Documentation/man/ly2dvi32.yo deleted file mode 100644 index d970a8052b..0000000000 --- a/Documentation/man/ly2dvi32.yo +++ /dev/null @@ -1,263 +0,0 @@ -mailto(daboys@bga.com) -manpage(LilyPond) - (1) - (1998) - (The LilyPond package) - (Ly2dvi32) - -metalC(Automatically generated by yodl(1) from ly2dvi32.yo.) - -manpagename(Ly2dvi32)(Python utility to convert mudela to DVI) - -manpagedescription() -ly2dvi is a Python script which creates input file for LaTeX, -based on information from the output files from LilyPond. -The script handles multiple files. If a mudela file name is -specified LilyPond is run to make an output (TeX) file. - -One or more LaTeX files are created, based on information found -in the output (TeX) files, and latex is finally run to create -one or more DVI files. - -The majority of this utility came from a bourne script written by Jan -Arne Fagertun name file(ly2dvi). - -manpagesynopsis() - - ly2dvi32 [options] inputfile[.ly] [....] - -manpageoptions() - -description( -dit(-D,--debug) - Set debug mode. There are two levels - in level one some debug - info is written, in level two the command bf(set -x) is run, which - echoes every command in the ly2dvi script. -dit(-F,--headers=) - Name of additional LaTeX headers file. This is included in the - tex file at the end of the headers, last line before code(\begin{document}) -dit(-H,--Heigth=) - Set paper heigth (points). Used together with width and LaTeX name of - papersize in case of papersize unknown to ly2dvi. -dit(-F,--headers=) - Name of additional LaTeX headers file. This is included in the - tex file at the end of the headers, last line before code(\begin{document}) -dit(-K,--keeplilypond) - Keep LilyPond output after the run. -dit(-L,--landscape) - Set landscape orientation - portrait is the default. - (bf(-L) produces code(\usepackage[landscape]{article})) -dit(-N,--nonumber) - Switch off page numbering. -dit(-O,--orientation=) - Set orientation landscape - obsolete, use bf(-L) instead. -dit(-P,--postscript) - In addition to the DVI file, also Generate a postsript file. -dit(-W,--Width=) - Set paper width (points). Used together with heigth and LaTeX name of - papersize in case of papersize unknown to ly2dvi. -dit(-d,--dependencies) - Tell lilypond to make dependencies file. -dit(-h,--help) - Print help. -dit(-k,--keeply2dvi) - Keep the LaTeX file after the run. -dit(-l,--language=) - Specify LaTeX language. - (bf(-l norsk) produces code(\usepackage[norsk]{babel})). -dit(-o,--output=) - Set output directory. -dit(-p,--papersize=) - Specify papersize. - (bf(-p a4) produces code(\usepackage[a4paper]{article})) -dit(-s,--separate) - Normally all output files are included into one LaTeX file. - With this switch all files are run separately, to produce one - DVI file for each. -) - -manpagesection(Features) - -ly2dvi responds to several parameters specified in the mudela -file. They are overridden by corresponding command line options. - -description( -dit(language="";) - Specify LaTeX language -dit(latexheaders="";) - Specify additional LaTeX headers file -dit(orientation="";) - Set orientation. -dit(paperlinewidth="";) - Specify the width (pt, mm or cm) of the printed lines. -dit(papersize="";) - Specify name of papersize. -) - -manpagesection(Environment) - -description( -dit(LILYPONDPREFIX) - Sets the root directory of the LilyPond installation -dit(LILYINCLUDE) - Additional directories for input files. -dit(TMP) - Temporary directory name. Default is /tmp -) - -manpagesection(Files) - -file(titledefs.tex) is inspected for definitions used to extract -additional text definitions from the mudela file. In the current -version the following are defined: - -description( -dit(title) - The title of the music. Centered on top of the first page. -dit(subtitle) - Subtitle, centered below the title. -dit(poet) - Name of the poet, leftflushed below the below subtitle. -dit(composer) - Name of the composer, rightflushed below the subtitle. -dit(metre) - Meter string, leftflushed below the below poet. -dit(opus) - Name of the opus, rightflushed below the below composer. -dit(arranger) - Name of the arranger, rightflushed below the opus. -dit(instrument) - Name of the instrument, centered below the arranger -dit(piece) - Name of the piece, leftflushed below the instrument -) - -file($LILYPONDPREFIX/share/.lilyrc $HOME/.lilyrc ./.lilyrc) are files -to set up default running conditions. On Windows OS initialization -files are named file(_lilyrc). The file syntax is as follows: - -verb(VARIABLE-NAME=VALUE) - -Where bf(VARIABLE-NAME) is the name of the variable documented below -and bf(VALUE) is either a string, a 1, or a 0. All files are parsed, -in the shown sequence. In the current version the following are -allowed: - -description( -dit(DEBUG=value) -This turns off (default) or on the debug capabilities. Possible -values are 0 (off) and 1 (on). -dit(DEPENDENCIES=value) -This turns off (default) or on the ability to generate a Makefile -dependency list. Possible values are 0 (off) and 1 (on). -dit(KEEPLILYPOND=value) -This turns off (default) or on the ability to keep the log file -associated with the LilyPond job. Possible values are 0 (off) and 1 -(on). -dit(KEEPLY2DVI=value) -This turns off (default) or on the ability to keep the temporary files -that are generated by the ly2dvi job. Possible values are 0 (off) and -1 (on) -dit(LANGUAGE=value) -Specify LaTeX language. Possible value is a valid LaTeX language. -dit(LATEXHF=value) -Specify additional LaTeX headers file. Possible value is a file -specification. -dit(LILYINCLUDE=value) -Additional directories for input files. Possible value is a delimited -directory path list. -dit(LILYPONDPREFIX=value) -This defines the LilyPond root directory. Possible value is a valid -directory specification to the LilyPond distribution location. -dit(NONUMBER=value) -This turns off (default) or on the page numbering capability. -Possible values are 0 (page numbering enabled) and 1 (page numbering -disabled). -dit(ORIENTATION=value) -This sets the image orientation. Possible values are -portrait (default) and landscape. -dit(OUTPUTDIR=value) -This defines the directory where the resultant files will be -generated. Possible value is a valid directory specification. -Default is the current working directory. -dit(PAPERSIZE=value) -This defines the papersize the image will be sized to fit. Possible -values are a0, a1, a2, a3, a4 (default), a5, a6, a7, a8, a9, a10, b0, -b1, b2, b3, b4, b5, archA, archB, archC, archD, archE, flsa, flse, -halfletter, ledger, legal, letter, or note. -dit(PHEIGHT=value) -Specify paperheight (points - an inch is 72.27, a cm is 28.453 points). -dit(POSTSCRIPT=value) -This turns off (default) or on the capability of additionally -generating a postscript file. Possible values are 0 (off) and 1 (on). -dit(PWIDTH=value) -Specify paperwidth (points - an inch is 72.27, a cm is 28.453 points). -dit(SEPARATE=value) -This turns off (default) or on the capability of generating multiple -dvi and postscript files from multiple source files. The default is -to generate a concatenation of the source files. Possible values are -0 (single file) and 1 (separate files). -dit(TMP=value) -This defines the emporary directory. Actually this is not used at the -present. Possible value is a valid directory specification that is -writable to the user. -) - -manpagesection(Initialization Sequence) -The initialization process reads inputs for several sources. Below is -a list of priorities for lowest to hightest proirity. - -itemize( -it() Program's defaults -it() Values found in LilyPond output file -it() Environment variables -it() $LILYPONDPREFIX/share/lilypond/.lilyrc -it() $HOME/.lilyrc -it() ./.lilyrc -it() command line options -) - -Note that this differs slightly from the original bourne shell -version. - - -manpagesection(See Also) - -lilypond(1), tex(1), latex(1) - -manpagesection(Bugs) - -If you have found a bug, you should send a bugreport. - -itemize( -it()Send a copy of the input which causes the error. -it()Send a description of the platform you use. -it()Send a description of the LilyPond and ly2dvi version you use. -it()Send a description of the bug itself. -it()Send it to email(bug-gnu-music@gnu.org) (you don't have to subscribe - to this mailinglist). -) - -manpagesection(Remarks) - -Many papersizes are now supported. Information on other sizes -(LaTeX names, horizontal and vertical sizes) should be mailed to -the author or to the mailing list. - -Supported papersizes are: - -a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, archA, archB, archC, archD, -archE, b0, b1, b2, b3, b4, b5, flsa, flse, halfletter, ledger, legal, -letter, note - -manpageauthor() -Python Version author: -nemail(Jeffrey B. Reed)(daboys@bga.com), -lurl(http://www.realtime.net/~daboys/lilypond/) - -Original bourne shell version author: -nemail(Jan Arne Fagertun)(Jan.A.Fagertun@energy.sintef.no), -lurl(http://www.termo.unit.no/mtf/people/janaf/) - - - diff --git a/Documentation/man/out/ly2dvi32.1 b/Documentation/man/out/ly2dvi32.1 deleted file mode 100644 index f2f8b0a818..0000000000 --- a/Documentation/man/out/ly2dvi32.1 +++ /dev/null @@ -1,259 +0,0 @@ -.TH "LilyPond" "1" "1998" "The LilyPond package" "Ly2dvi32" -.PP -.PP -.SH "NAME" -Ly2dvi32 \- Python utility to convert mudela to DVI -.PP -.SH "DESCRIPTION" -ly2dvi is a Python script which creates input file for LaTeX, -based on information from the output files from LilyPond\&. -The script handles multiple files\&. If a mudela file name is -specified LilyPond is run to make an output (TeX) file\&. -.PP -One or more LaTeX files are created, based on information found -in the output (TeX) files, and latex is finally run to create -one or more DVI files\&. -.PP -The majority of this utility came from a bourne script written by Jan -Arne Fagertun name \fBly2dvi\fP\&. -.PP -.SH "SYNOPSIS" -.PP -ly2dvi32 [options] inputfile[\&.ly] [\&.\&.\&.\&.] -.PP -.SH "OPTIONS" -.PP -.IP "-D,--debug" -Set debug mode\&. There are two levels - in level one some debug -info is written, in level two the command \fBset -x\fP is run, which -echoes every command in the ly2dvi script\&. -.IP "-F,--headers=" -Name of additional LaTeX headers file\&. This is included in the -tex file at the end of the headers, last line before \f(CW\ebegin{document}\fP -.IP "-H,--Heigth=" -Set paper heigth (points)\&. Used together with width and LaTeX name of -papersize in case of papersize unknown to ly2dvi\&. -.IP "-F,--headers=" -Name of additional LaTeX headers file\&. This is included in the -tex file at the end of the headers, last line before \f(CW\ebegin{document}\fP -.IP "-K,--keeplilypond" -Keep LilyPond output after the run\&. -.IP "-L,--landscape" -Set landscape orientation - portrait is the default\&. -(\fB-L\fP produces \f(CW\eusepackage[landscape]{article}\fP) -.IP "-N,--nonumber" -Switch off page numbering\&. -.IP "-O,--orientation=" -Set orientation landscape - obsolete, use \fB-L\fP instead\&. -.IP "-P,--postscript" -In addition to the DVI file, also Generate a postsript file\&. -.IP "-W,--Width=" -Set paper width (points)\&. Used together with heigth and LaTeX name of -papersize in case of papersize unknown to ly2dvi\&. -.IP "-d,--dependencies" -Tell lilypond to make dependencies file\&. -.IP "-h,--help" -Print help\&. -.IP "-k,--keeply2dvi" -Keep the LaTeX file after the run\&. -.IP "-l,--language=" -Specify LaTeX language\&. -(\fB-l norsk\fP produces \f(CW\eusepackage[norsk]{babel}\fP)\&. -.IP "-o,--output=" -Set output directory\&. -.IP "-p,--papersize=" -Specify papersize\&. -(\fB-p a4\fP produces \f(CW\eusepackage[a4paper]{article}\fP) -.IP "-s,--separate" -Normally all output files are included into one LaTeX file\&. -With this switch all files are run separately, to produce one -DVI file for each\&. -.PP -.SH "Features" -.PP -ly2dvi responds to several parameters specified in the mudela -file\&. They are overridden by corresponding command line options\&. -.PP -.IP "language="";" -Specify LaTeX language -.IP "latexheaders="";" -Specify additional LaTeX headers file -.IP "orientation="";" -Set orientation\&. -.IP "paperlinewidth="";" -Specify the width (pt, mm or cm) of the printed lines\&. -.IP "papersize="";" -Specify name of papersize\&. -.PP -.SH "Environment" -.PP -.IP "LILYPONDPREFIX" -Sets the root directory of the LilyPond installation -.IP "LILYINCLUDE" -Additional directories for input files\&. -.IP "TMP" -Temporary directory name\&. Default is /tmp -.PP -.SH "Files" -.PP -\fBtitledefs\&.tex\fP is inspected for definitions used to extract -additional text definitions from the mudela file\&. In the current -version the following are defined: -.PP -.IP "title" -The title of the music\&. Centered on top of the first page\&. -.IP "subtitle" -Subtitle, centered below the title\&. -.IP "poet" -Name of the poet, leftflushed below the below subtitle\&. -.IP "composer" -Name of the composer, rightflushed below the subtitle\&. -.IP "metre" -Meter string, leftflushed below the below poet\&. -.IP "opus" -Name of the opus, rightflushed below the below composer\&. -.IP "arranger" -Name of the arranger, rightflushed below the opus\&. -.IP "instrument" -Name of the instrument, centered below the arranger -.IP "piece" -Name of the piece, leftflushed below the instrument -.PP -\fB$LILYPONDPREFIX/share/\&.lilyrc $HOME/\&.lilyrc \&./\&.lilyrc\fP are files -to set up default running conditions\&. On Windows OS initialization -files are named \fB_lilyrc\fP\&. The file syntax is as follows: -.PP - -.DS - -VARIABLE-NAME=VALUE -.DE - - -.PP -Where \fBVARIABLE-NAME\fP is the name of the variable documented below -and \fBVALUE\fP is either a string, a 1, or a 0\&. All files are parsed, -in the shown sequence\&. In the current version the following are -allowed: -.PP -.IP "DEBUG=value" -This turns off (default) or on the debug capabilities\&. Possible -values are 0 (off) and 1 (on)\&. -.IP "DEPENDENCIES=value" -This turns off (default) or on the ability to generate a Makefile -dependency list\&. Possible values are 0 (off) and 1 (on)\&. -.IP "KEEPLILYPOND=value" -This turns off (default) or on the ability to keep the log file -associated with the LilyPond job\&. Possible values are 0 (off) and 1 -(on)\&. -.IP "KEEPLY2DVI=value" -This turns off (default) or on the ability to keep the temporary files -that are generated by the ly2dvi job\&. Possible values are 0 (off) and -1 (on) -.IP "LANGUAGE=value" -Specify LaTeX language\&. Possible value is a valid LaTeX language\&. -.IP "LATEXHF=value" -Specify additional LaTeX headers file\&. Possible value is a file -specification\&. -.IP "LILYINCLUDE=value" -Additional directories for input files\&. Possible value is a delimited -directory path list\&. -.IP "LILYPONDPREFIX=value" -This defines the LilyPond root directory\&. Possible value is a valid -directory specification to the LilyPond distribution location\&. -.IP "NONUMBER=value" -This turns off (default) or on the page numbering capability\&. -Possible values are 0 (page numbering enabled) and 1 (page numbering -disabled)\&. -.IP "ORIENTATION=value" -This sets the image orientation\&. Possible values are -portrait (default) and landscape\&. -.IP "OUTPUTDIR=value" -This defines the directory where the resultant files will be -generated\&. Possible value is a valid directory specification\&. -Default is the current working directory\&. -.IP "PAPERSIZE=value" -This defines the papersize the image will be sized to fit\&. Possible -values are a0, a1, a2, a3, a4 (default), a5, a6, a7, a8, a9, a10, b0, -b1, b2, b3, b4, b5, archA, archB, archC, archD, archE, flsa, flse, -halfletter, ledger, legal, letter, or note\&. -.IP "PHEIGHT=value" -Specify paperheight (points - an inch is 72\&.27, a cm is 28\&.453 points)\&. -.IP "POSTSCRIPT=value" -This turns off (default) or on the capability of additionally -generating a postscript file\&. Possible values are 0 (off) and 1 (on)\&. -.IP "PWIDTH=value" -Specify paperwidth (points - an inch is 72\&.27, a cm is 28\&.453 points)\&. -.IP "SEPARATE=value" -This turns off (default) or on the capability of generating multiple -dvi and postscript files from multiple source files\&. The default is -to generate a concatenation of the source files\&. Possible values are -0 (single file) and 1 (separate files)\&. -.IP "TMP=value" -This defines the emporary directory\&. Actually this is not used at the -present\&. Possible value is a valid directory specification that is -writable to the user\&. -.PP -.SH "Initialization Sequence" -The initialization process reads inputs for several sources\&. Below is -a list of priorities for lowest to hightest proirity\&. -.PP -.IP o -Program\'s defaults -.IP o -Values found in LilyPond output file -.IP o -Environment variables -.IP o -$LILYPONDPREFIX/share/lilypond/\&.lilyrc -.IP o -$HOME/\&.lilyrc -.IP o -\&./\&.lilyrc -.IP o -command line options -.PP -Note that this differs slightly from the original bourne shell -version\&. -.PP -.SH "See Also" -.PP -lilypond(1), tex(1), latex(1) -.PP -.SH "Bugs" -.PP -If you have found a bug, you should send a bugreport\&. -.PP -.IP o -Send a copy of the input which causes the error\&. -.IP o -Send a description of the platform you use\&. -.IP o -Send a description of the LilyPond and ly2dvi version you use\&. -.IP o -Send a description of the bug itself\&. -.IP o -Send it to bug-gnu-music@gnu\&.org (you don\'t have to subscribe -to this mailinglist)\&. -.PP -.SH "Remarks" -.PP -Many papersizes are now supported\&. Information on other sizes -(LaTeX names, horizontal and vertical sizes) should be mailed to -the author or to the mailing list\&. -.PP -Supported papersizes are: -.PP -a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, archA, archB, archC, archD, -archE, b0, b1, b2, b3, b4, b5, flsa, flse, halfletter, ledger, legal, -letter, note -.PP -.SH "AUTHOR" -Python Version author: -Jeffrey B\&. Reed , -http://www\&.realtime\&.net/~daboys/lilypond/ -.PP -Original bourne shell version author: -Jan Arne Fagertun , -http://www\&.termo\&.unit\&.no/mtf/people/janaf/ -.PP diff --git a/NEWS b/NEWS index b15d3c5308..d5d19e5b7b 100644 --- a/NEWS +++ b/NEWS @@ -1,18 +1,13 @@ ---- ../lilypond-1.1.2/NEWS Thu Nov 5 20:51:37 1998 -++ b/NEWS Fri Nov 6 00:10:46 1998 -@@ -1,6 +1,11 @@ -pl 2.hwn1 - - scm cleanups, chop-decimal - - scarlatti clef. +pl 2.jcn2 +pl 2.uu1 + - ly2dvi.py -I fix + - obsoleted ly2dvi.sh + - removed Note_head_engraver - pl 1.mb1 - - Support for cautionary accidentals. , i.e. accidentals -- within parantheses. Syntax: 'cis?'. Try input/test/accid.fly - within parentheses. Syntax: 'cis?'. Try input/test/accid.fly - Note that the font has changed. - - bf: No unnecessary warnings about time signatures - - Added optional second argument of \key. Set to \major or \minor pl 2.jcn2 +pl 2.hwn1 + - scm cleanups, chop-decimal + - scarlatti clef. pl 2.jcn1 - commented-out Level-2 PostScript in lily.ps (J. Buehler) @@ -25,6 +20,8 @@ pl 2.jcn1 pl 1.jcn4 - more little website fixes +******** + pl 2 pl 1.mb1 diff --git a/README.txt b/README.txt index f2f69ed235..9a521b0afb 100644 --- a/README.txt +++ b/README.txt @@ -53,7 +53,7 @@ do appreciate criticism, comments, bugreports, patches, etc. Please send your e-mail to one of the MAILING LISTS and not to us personally. See Documentation/links.yo for more info. -6: DOZE +6: WINDOWS 32 If you have received this file as part of a DOS/Win- dow32 distribution (lilypond-*.zip), then it is advisable to diff --git a/TODO b/TODO index b6ac7d37bc..ffd01a2797 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,5 @@ Features you cannot find in the doco as working, should be mentioned here. - This is an assorted collection of stuff that will be done, might be done, or is an idea that I want to think about @@ -11,8 +10,16 @@ grep for TODO and ugh/ugr/urg BUGS: * --safe: disallow backslashes, disallow \include. + * fix fontsize switching + + * fix rounding stuff in number->string + + * msgfmt -o check? + * \breathmark TeX macro + * configure error if GUILE 1.3 not found + * catch GUILE errors? * add new glyphs to font.ly diff --git a/VERSION b/VERSION index 41a2aa4d95..8ff529cc6a 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=2 -MY_PATCH_LEVEL=hwn1 +PATCH_LEVEL=3 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 1671ff15ef..2cfcf89d02 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -162,7 +162,11 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ LIBS="-lguile $LIBS" AC_DEFINE(HAVE_LIBGUILE), \ AC_CHECK_LIB(readline, readline) \ AC_CHECK_LIB(dl, dlopen) \ - AC_CHECK_LIB(guile, scm_boot_guile)) + AC_CHECK_LIB(socket, socket)\ + AC_CHECK_LIB(termcap,tgetent)\ + AC_CHECK_LIB(m, fabs)\ + AC_CHECK_LIB(guile, scm_boot_guile)\ + ) ]) AC_DEFUN(AC_STEPMAKE_INIT, [ diff --git a/configure b/configure index 942a6f482c..1fab397eb0 100755 --- a/configure +++ b/configure @@ -2631,8 +2631,158 @@ else echo "$ac_t""no" 1>&6 fi \ + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +echo "configure:2636: checking for socket in -lsocket" >&5 +ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 +echo "configure:2686: checking for tgetent in -ltermcap" >&5 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6 +echo "configure:2736: checking for fabs in -lm" >&5 +ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo m | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ echo $ac_n "checking for scm_boot_guile in -lguile""... $ac_c" 1>&6 -echo "configure:2636: checking for scm_boot_guile in -lguile" >&5 +echo "configure:2786: checking for scm_boot_guile in -lguile" >&5 ac_lib_var=`echo guile'_'scm_boot_guile | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2640,7 +2790,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lguile $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2680,14 +2830,15 @@ EOF else echo "$ac_t""no" 1>&6 fi - +\ + fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2691: checking for 8-bit clean memcmp" >&5 +echo "configure:2842: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2695,7 +2846,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2726,12 +2877,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2730: checking for vprintf" >&5 +echo "configure:2881: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -2781,12 +2932,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2785: checking for _doprnt" >&5 +echo "configure:2936: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -2839,12 +2990,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2843: checking for $ac_func" >&5 +echo "configure:2994: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2909,7 +3060,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2913: checking for $ac_word" >&5 +echo "configure:3064: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/init/lily.scm b/init/lily.scm index b66038f600..9c38a76bfa 100644 --- a/init/lily.scm +++ b/init/lily.scm @@ -9,9 +9,6 @@ ; - ready ps code (draw_bracket) vs tex/ps macros/calls (pianobrace), ; all preparations from ps,tex to scm -;;; graphical lisp element -(define (add-column p) (display "adding column (in guile): ") (display p) (newline)) - ;;; library funtions (define (numbers->string l) diff --git a/init/lily.scm.orig b/init/lily.scm.orig deleted file mode 100644 index fa5ca909e4..0000000000 --- a/init/lily.scm.orig +++ /dev/null @@ -1,432 +0,0 @@ -; lily.scm -- implement Scheme output routines for TeX and PostScript -; -; source file of the GNU LilyPond music typesetter -; -; (c) 1998 Jan Nieuwenhuizen - -; TODO -; - naming -; - ready ps code (draw_bracket) vs tex/ps macros/calls (pianobrace), -; all preparations from ps,tex to scm - -;;; graphical lisp element -(define (add-column p) (display "adding column (in guile): ") (display p) (newline)) - -;;; library funtions -(define - (numbers->string l) - (apply string-append - (map (lambda (n) (string-append (number->string n) " ")) l))) - -(define (number->octal-string x) - (let* ((n (inexact->exact x)) - (n64 (quotient n 64)) - (n8 (quotient (- n (* n64 64)) 8))) - (string-append - (number->string n64) - (number->string n8) - (number->string (remainder (- n (+ (* n64 64) (* n8 8))) 8))))) - -(define (inexact->string x radix) - (let ((n (inexact->exact x))) - (number->string n radix))) - -(define - (number->dim-tex x) - (string-append - (number->string x) "pt ")) - -(define - (control->string c) - (string-append - (string-append (number->string (car c)) " ") - (string-append (number->string (cadr c)) " "))) - -(define - (embedded-ps-tex s) - (string-append "\\embeddedps{" s "}")) - -(define - (invoke-char-ps s i) - (string-append - "(\\" (inexact->string i 8) ") " s " " )) - -(define - (invoke-char-tex s i) - (string-append - "\n\\" s "{" (inexact->string i 10) "}" )) - -(define - (invoke-dim1-ps s d) - (string-append - (number->string d) " " s )) - -(define - (invoke-dim1-tex s d) - (string-append - "\n\\" s "{" (number->dim-tex d) "}")) - -(define - (invoke-output o s) - (eval-string (string-append s "-" o))) - -;;; output definitions - -(define - (beam o width slope thick) - ((invoke-output o "beam") width slope thick)) - -(define - (beam-ps width slope thick) - (string-append - (numbers->string (list width slope thick)) " draw_beam " )) - -(define - (beam-tex width slope thick) - (embedded-ps-tex (beam-ps width slope thick))) - -(define - (bracket o h) - ((invoke-output o "bracket") h)) - -(define - (bracket-ps h) - (invoke-dim1-ps "draw_bracket" h)) - -(define - (bracket-tex h) - (embedded-ps-tex (bracket-ps h))) - -(define - (char o n) - ((invoke-output o "invoke-char") "show" n)) - -(define - (dashed-slur o thick dash l) - ((invoke-output o "dashed-slur") thick dash l)) - -(define - (dashed-slur-ps thick dash l) - (string-append - (apply string-append (map control->string l)) - (number->string thick) - " [ " - (if (> 1 dash) (number->string (- (* thick dash) thick)) "0") " " - (number->string (* 2 thick)) - " ] 0 draw_dashed_slur")) - -(define - (dashed-slur-tex thick dash l) - (embedded-ps-tex (dashed-slur-ps thick dash l))) - -(define - (doublebar o h) - ((invoke-output o "invoke-dim1") "doublebar" h)) - -(define - (empty o) - ((invoke-output o "empty"))) - -(define - (empty-ps) - "\n empty\n") - -(define - (empty-tex) - "%\n\\empty%\n") - -(define - (emptybar o h) (empty o)) - -(define - (end-output o) - ((invoke-output o "end-output"))) - -(define - (end-output-ps) - "\nshowpage\n") - -(define - (end-output-tex) - "\n\\EndLilyPondOutput") - -(define - (experimental-on o) - ((invoke-output o "experimental-on"))) - -(define - (experimental-on-ps) "") - -(define - (experimental-on-tex) "\\turnOnExperimentalFeatures") - -(define - (fatdoublebar o h) - ((invoke-output o "invoke-dim1") "fatdoublebar" h)) - -(define - (finishbar o h) - ((invoke-output o "invoke-dim1") "finishbar" h)) - -(define - (font i) - (string-append - "font" - (make-string 1 (integer->char (+ (char->integer #\A) i))) - )) - -(define - (font-def o i s) - ((invoke-output o "font-def") i s)) -; (empty o)) - -(define - (font-def-ps i s) - (string-append - "\n/" (font i) " {/" - (substring s 0 (- (string-length s) 3)) - " findfont 12 scalefont setfont} bind def\n")) - -(define - (font-def-tex i s) - (string-append - "\\font" (font-switch-tex i) "=" s "\n")) - -(define - (font-switch o i) - ((invoke-output o "font-switch") i)) - -(define - (font-switch-ps i) - (string-append (font i) " ")) - -(define - (font-switch-tex i) - (string-append - "\\" (font i) "\n")) - -(define - (generalmeter o num den) - ((invoke-output o "generalmeter") num den)) - -(define - (generalmeter-ps num den) - (string-append (number->string (inexact->exact num)) " " (number->string (inexact->exact den)) " generalmeter ")) - -(define - (generalmeter-tex num den) - (string-append - "\\generalmeter{" (number->string (inexact->exact num)) "}{" (number->string (inexact->exact den)) "}")) - -(define - (header o creator generate) - ((invoke-output o "header") creator generate)) - -(define - (header-ps creator generate) - (string-append - "%!PS-Adobe-3.0\n" - "%%Creator: " creator generate "\n")) - -(define - (header-tex creator generate) - (string-append - "%created by: " creator generate "\n")) - -(define - (header-end o) - ((invoke-output o "header-end"))) - -(define - (header-end-ps) "") - -(define - (header-end-tex) "\\turnOnPostScript") - -(define - (lily-def o key val) - ((invoke-output o "lily-def") key val)) - -(define - (lily-def-ps key val) - (string-append - "/" key " {" val "} bind def\n")) - -(define - (lily-def-tex key val) - (string-append - "\\def\\" key "{" val "}\n")) - -(define - (maatstreep o h) - ((invoke-output o "invoke-dim1") "maatstreep" h)) - -(define - (pianobrace o i) - ((invoke-output o "invoke-char") "pianobrace" i)) - -(define - (placebox o x y b) - ((invoke-output o "placebox") x y (b o))) - -(define - (placebox-ps x y s) - (string-append - (number->string x) " " (number->string y) " {" s "} placebox ")) - -(define - (placebox-tex x y s) - (string-append - "\\placebox{" - (number->dim-tex y) "}{" (number->dim-tex x) "}{" s "}")) - -(define - (repeatbar o h) - ((invoke-output o "invoke-dim1") "repeatbar" h)) - -(define - (repeatbarstartrepeat o h) - ((invoke-output o "invoke-dim1") "repeatbarstartrepeat" h)) - -(define - (rulesym o x y) - ((invoke-output o "rulesym") x y)) - -(define - (rulesym-ps x y) - (string-append - (number->string x) " " - (number->string y) " " - "rulesym")) - -(define - (rulesym-tex x y) - (string-append - "\\rulesym{" (number->dim-tex x) "}{" (number->dim-tex y) "}")) - -(define - (setbold o s) - ((invoke-output o "text") "bold" s)) - -(define - (setdynamic o s) (empty o)) - -(define - (setfinger o s) - ((invoke-output o "text") "finger" s)) - -(define - (sethuge o s) - ((invoke-output o "text") "huge" s)) - -(define - (setitalic o s) - ((invoke-output o "text") "italic" s)) - -(define - (setlarge o s) - ((invoke-output o "text") "large" s)) - -(define - (setLarge o s) - ((invoke-output o "text") "Large" s)) - -(define - (setnumber o s) - ((invoke-output o "text") "number" s)) - -(define - (settext o s) - ((invoke-output o "text") "text" s)) - -(define - (settypewriter o s) - ((invoke-output o "text") "typewriter" s)) - -(define - (slur o l) - ((invoke-output o "slur") l)) - -(define - (slur-ps l) - (string-append - (apply string-append (map control->string l)) - " draw_slur")) - -(define - (slur-tex l) - (embedded-ps-tex (slur-ps l))) - -(define - (stem o kern width height depth) - ((invoke-output o "stem") kern width height depth)) - -(define - (stem-ps kern width height depth) - (string-append (numbers->string (list kern width height depth)) - "draw_stem" )) - -(define - (stem-tex kern width height depth) - (string-append - "\\kern" (number->dim-tex kern) - "\\vrule width " (number->dim-tex width) - "depth " (number->dim-tex depth) - "height " (number->dim-tex height) " ")) - -(define - (start-line o) - ((invoke-output o "start-line"))) - -(define - (start-line-ps) - (string-append - (urg-fix-font-ps) - "\nstart_line {\n")) - -(define - (start-line-tex) - (string-append - (urg-fix-font-tex) - "\\hbox{%\n")) - -(define - (startrepeat o h) - ((invoke-output o "invoke-dim1") "startrepeat" h)) - -(define - (stop-line o) - ((invoke-output o "stop-line"))) - -(define - (stop-line-ps) - "}\nstop_line\n") - -(define - (stop-line-tex) - "}\\interscoreline") - -(define - (stoprepeat o h) - ((invoke-output o "invoke-dim1") "stoprepeat" h)) - -(define - (text-ps f s) - (string-append "(" s ") set" f " ")) - -(define - (text-tex f s) - (string-append "\\set" f "{" s "}")) - -(define - (urg-fix-font-ps) - "/fontA { /feta20 findfont 12 scalefont setfont} bind def fontA\n") - -(define - (urg-fix-font-tex) - "\\font\\fontA=feta20.afm\\fontA\n") - -(define - (urg-font-switch-ps i) - "\n/feta20 findfont 12 scalefont setfont \n") - diff --git a/lily/head-engraver.cc b/lily/head-engraver.cc deleted file mode 100644 index 4b0a3b06fd..0000000000 --- a/lily/head-engraver.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* - head-grav.cc -- part of GNU LilyPond - - (c) 1997--1998 Han-Wen Nienhuys -*/ - -#include "note-head.hh" -#include "head-engraver.hh" -#include "paper-def.hh" -#include "musical-request.hh" -#include "dots.hh" - -Note_head_engraver::Note_head_engraver() -{ - dot_p_=0; - note_p_ = 0; - note_req_l_ =0; -} - -bool -Note_head_engraver::do_try_request (Request *req_l) -{ - if (note_req_l_) - return false; - - if (Note_req * nr = dynamic_cast (req_l)) - { - note_req_l_= nr; - return true; - } - return false; -} - -void -Note_head_engraver::do_process_requests() -{ - if (!note_req_l_ || note_p_) - return; - - note_p_ = new Note_head; - note_p_->balltype_i_ = note_req_l_->duration_.durlog_i_; - note_p_->dots_i_ = note_req_l_->duration_.dots_i_; - if (note_p_->dots_i_) - { - dot_p_ = new Dots; - note_p_->dots_l_ = dot_p_; - announce_element (Score_element_info (dot_p_,0)); - } - - note_p_->position_i_ = dynamic_cast (note_req_l_)->pitch_.steps (); - - - Score_element_info itinf (note_p_,note_req_l_); - announce_element (itinf); -} - -void -Note_head_engraver::do_pre_move_processing() -{ - if (note_p_) - { - typeset_element (note_p_); - note_p_ = 0; - } - if (dot_p_) - { - typeset_element (dot_p_); - dot_p_ =0; - } -} -void -Note_head_engraver::do_post_move_processing() -{ - note_req_l_ = 0; -} - - -IMPLEMENT_IS_TYPE_B1(Note_head_engraver,Engraver); -ADD_THIS_TRANSLATOR(Note_head_engraver); diff --git a/lily/include/head-engraver.hh b/lily/include/head-engraver.hh deleted file mode 100644 index 0890183714..0000000000 --- a/lily/include/head-engraver.hh +++ /dev/null @@ -1,33 +0,0 @@ -/* - head-engraver.hh -- part of GNU LilyPond - - (c) 1997--1998 Han-Wen Nienhuys -*/ - - -#ifndef HEADGRAV_HH -#define HEADGRAV_HH -#include "engraver.hh" - -/** - make balls and rests - */ -class Note_head_engraver : public Engraver { - Note_head* note_p_; - Dots * dot_p_; - Rhythmic_req * note_req_l_; - -public: - TRANSLATOR_CLONE(Note_head_engraver); - Note_head_engraver(); - DECLARE_MY_RUNTIME_TYPEINFO; -protected: - virtual bool do_try_request (Request *req_l) ; - virtual void do_process_requests(); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); - -}; - - -#endif // HEADGRAV_HH diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index 3f79b0b45b..1891986303 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -38,7 +38,6 @@ public: bool do_equal_b (Request*) const; void compress (Moment); virtual Moment duration() const; - Rhythmic_req(); static int compare (Rhythmic_req const&,Rhythmic_req const&); REQUESTMETHODS(Rhythmic_req); }; @@ -146,8 +145,6 @@ public: class Beam_req : public Musical_span_req { public: REQUESTMETHODS(Beam_req); - - Beam_req(); }; /** diff --git a/lily/lookup.cc b/lily/lookup.cc index 5fe4ba7802..acb4a7e84b 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -22,6 +22,7 @@ #include "main.hh" #include "lily-guile.hh" + Lookup::Lookup () { paper_l_ = 0; diff --git a/lily/musical-request.cc b/lily/musical-request.cc index 4538a1d3b2..e02877ad31 100644 --- a/lily/musical-request.cc +++ b/lily/musical-request.cc @@ -131,12 +131,7 @@ Rhythmic_req::do_equal_b (Request*r) const { Rhythmic_req* rh = dynamic_cast (r); - return rh&& !compare (*this, *rh); -} - - -Rhythmic_req::Rhythmic_req () -{ + return rh && !compare (*this, *rh); } @@ -231,9 +226,6 @@ Multi_measure_rest_req::do_print () const IMPLEMENT_IS_TYPE_B1 (Beam_req,Span_req); -Beam_req::Beam_req () -{ -} void Beam_req::do_print () const @@ -273,10 +265,10 @@ Plet_req::do_print () const bool -Span_req:: do_equal_b (Request*r) const +Span_req::do_equal_b (Request*r) const { Span_req * s = dynamic_cast (r); - return s&& spantype == s->spantype; + return s && spantype == s->spantype; } Span_req::Span_req () diff --git a/lily/plet-engraver.cc b/lily/plet-engraver.cc index 172a491200..0693b5017d 100644 --- a/lily/plet-engraver.cc +++ b/lily/plet-engraver.cc @@ -46,15 +46,11 @@ Plet_engraver::acknowledge_element (Score_element_info i) bool Plet_engraver::do_try_request (Request* req_l) { - Musical_req* mus_l = dynamic_cast (req_l); - if (!mus_l) - return false; - /* UGH! This is incorrect! Beam_req might not reach the Plet_engraver if ordering is wrong! */ - Beam_req* b = dynamic_cast (mus_l); + Beam_req* b = dynamic_cast (req_l); if (b) { if (b->spantype) @@ -65,7 +61,7 @@ Plet_engraver::do_try_request (Request* req_l) return false; } - Plet_req* p = dynamic_cast (mus_l); + Plet_req* p = dynamic_cast (req_l); if (!p) return false; @@ -73,7 +69,7 @@ Plet_engraver::do_try_request (Request* req_l) return false; Direction d = (!plet_spanner_p_) ? LEFT : RIGHT; - if (span_reqs_drul_[d] && !span_reqs_drul_[d]->equal_b (mus_l)) + if (span_reqs_drul_[d] && !span_reqs_drul_[d]->equal_b (req_l)) return false; span_reqs_drul_[d] = p; diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index de547727a1..383facbced 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.2 -Inschrijf datum: 03NOV98 +Versie: 1.1.3 +Inschrijf datum: 06NOV98 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.1.2.tar.gz + 770k lilypond-1.1.3.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.2.tar.gz + 770k lilypond-1.1.3.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 55d5911d45..a049c7311e 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.2 -Entered-date: 03NOV98 +Version: 1.1.3 +Entered-date: 06NOV98 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 770k lilypond-1.1.2.tar.gz + 770k lilypond-1.1.3.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.2.tar.gz + 770k lilypond-1.1.3.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index dfbd3516c9..cb1688b4c2 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.2 +Version: 1.1.3 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.2.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.3.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mf/out/feta11.afm b/mf/out/feta11.afm index c95d407d33..c8f43f0c49 100644 --- a/mf/out/feta11.afm +++ b/mf/out/feta11.afm @@ -18,67 +18,69 @@ C 13; N accidentals-0; B 0.00 -4125.00 1833.33 4125.00 ; C 14; N accidentals--1; B -330.03 -1375.00 2200.01 5500.00 ; C 15; N accidentals--2; B -330.03 -1375.00 3987.49 5500.00 ; C 16; N accidentals-2; B 0.00 -1375.00 2750.00 1375.00 ; -C 17; N dots-dot; B 0.00 -618.74 1237.49 618.74 ; -C 18; N dots-repeatcolon; B 0.00 -1375.00 1237.49 1375.00 ; -C 19; N balls--1; B 0.00 -1512.51 5500.00 1512.51 ; -C 20; N balls--1l; B -1375.00 -275.02 6875.00 275.02 ; -C 21; N balls--2; B 0.00 -1512.51 5500.00 1512.51 ; -C 22; N balls--2l; B -1375.00 -275.02 6875.00 275.02 ; -C 23; N balls-0; B 0.00 -1512.51 5445.07 1512.51 ; -C 24; N balls-0l; B -1361.27 -275.02 6806.34 275.02 ; -C 25; N balls-1; B 0.00 -1512.51 3788.07 1512.51 ; -C 26; N balls-1l; B -947.02 -275.02 4735.09 275.02 ; -C 27; N balls-2; B 0.00 -1512.51 3632.84 1512.51 ; -C 28; N balls-2l; B -908.22 -275.02 4541.06 275.02 ; -C 29; N scripts-ufermata; B -3643.77 -206.27 3643.77 3987.55 ; -C 30; N scripts-dfermata; B -3643.77 -3987.55 3643.77 206.27 ; -C 31; N scripts-thumb; B -1100.00 -1375.00 1100.00 1375.00 ; -C 32; N scripts-sforzato; B -2474.99 -1375.00 2474.99 1375.00 ; -C 33; N scripts-staccato; B -412.54 -412.54 412.54 412.54 ; -C 34; N scripts-ustaccatissimo; B -550.05 -200.00 550.05 2750.06 ; -C 35; N scripts-dstaccatissimo; B -550.05 -2750.06 550.05 200.00 ; -C 36; N scripts-tenuto; B -1650.02 -192.52 1650.02 192.52 ; -C 37; N scripts-umarcato; B -1375.00 0.00 1375.00 3025.02 ; -C 38; N scripts-dmarcato; B -1375.00 -3025.02 1375.00 0.00 ; -C 39; N scripts-open; B -1100.00 -1375.00 1100.00 1375.00 ; -C 40; N scripts-stopped; B -1512.51 -1512.51 1512.51 1512.51 ; -C 41; N scripts-upbow; B -1787.50 0.00 1787.50 5720.05 ; -C 42; N scripts-downbow; B -2062.50 0.00 2062.50 3666.66 ; -C 43; N scripts-reverseturn; B -3007.81 -1455.89 3007.81 1455.89 ; -C 44; N scripts-turn; B -3007.81 -1455.89 3007.81 1455.89 ; -C 45; N scripts-trill; B -2750.00 0.00 2750.00 6187.50 ; -C 46; N scripts-upedalheel; B -1375.00 -1375.00 1375.00 1833.33 ; -C 47; N scripts-dpedalheel; B -1375.00 -1833.33 1375.00 1375.00 ; -C 48; N scripts-upedaltoe; B -1375.00 0.00 1375.00 4125.00 ; -C 49; N scripts-dpedaltoe; B -1375.00 -4125.00 1375.00 0.00 ; -C 50; N scripts-flageolet; B -1466.67 -1466.67 1466.67 1466.67 ; -C 51; N scripts-trilelement; B -1833.33 -1375.00 718.64 1375.00 ; -C 52; N scripts-prall; B -3109.31 -1375.00 3109.31 1375.00 ; -C 53; N scripts-mordent; B -3109.31 -1375.00 3109.31 1375.00 ; -C 54; N scripts-prallprall; B -4385.30 -1375.00 4385.30 1375.00 ; -C 55; N scripts-prallmordent; B -4385.30 -1375.00 4385.30 1375.00 ; -C 56; N scripts-upprall; B -4385.30 -1375.00 4385.30 1375.00 ; -C 57; N scripts-downprall; B -4385.30 -1375.00 4385.30 1375.00 ; -C 58; N flags-u3; B -137.51 -8428.77 3393.31 137.51 ; -C 59; N flags-u4; B -137.51 -9803.77 3393.31 137.51 ; -C 60; N flags-u5; B -137.51 -11866.27 3393.31 137.51 ; -C 61; N flags-u6; B -137.51 -14616.27 3393.31 137.51 ; -C 62; N flags-d3; B -137.51 -137.51 3755.11 8016.30 ; -C 63; N flags-d4; B -137.51 -137.51 3755.11 8428.77 ; -C 64; N flags-d5; B -137.51 -137.51 3755.11 10766.30 ; -C 65; N flags-d6; B -137.51 -137.51 3755.11 12141.30 ; -C 66; N clefs-alto; B -2750.00 -5500.00 10236.10 5500.00 ; -C 67; N clefs-alto_change; B -2200.01 -4400.02 8188.93 4400.02 ; -C 68; N clefs-bass; B -1375.00 -6875.00 9900.02 2750.00 ; -C 69; N clefs-bass_change; B -1100.02 -5500.03 7920.04 2200.01 ; -C 70; N clefs-violin; B -2396.44 -8250.00 10277.13 13750.00 ; -C 71; N clefs-violin_change; B -2082.15 -6600.04 8056.75 11000.06 ; -C 72; N timesig-C4/4; B -4950.01 -2750.00 4674.99 2750.00 ; -C 73; N timesig-C2/2; B -4950.01 -3849.99 4674.99 3849.99 ; -C 74; N timesig-old4/4; B -4812.50 -2062.50 4812.50 2062.50 ; -C 75; N timesig-old2/2; B -4812.50 -2750.00 4812.50 2750.00 ; -C 76; N timesig-old3/2; B -4812.50 -2062.50 4812.50 2062.50 ; -C 77; N timesig-old6/4; B -4812.50 -3437.50 4812.50 3437.50 ; -C 78; N timesig-old9/4; B -4812.50 -3437.50 4812.50 3437.50 ; +C 17; N accidentals-); B 0.00 -2750.00 1650.02 2750.00 ; +C 18; N accidentals-(; B -1650.02 -2750.00 0.00 2750.00 ; +C 19; N dots-dot; B 0.00 -618.74 1237.49 618.74 ; +C 20; N dots-repeatcolon; B 0.00 -1375.00 1237.49 1375.00 ; +C 21; N balls--1; B 0.00 -1512.51 5500.00 1512.51 ; +C 22; N balls--1l; B -1375.00 -275.02 6875.00 275.02 ; +C 23; N balls--2; B 0.00 -1512.51 5500.00 1512.51 ; +C 24; N balls--2l; B -1375.00 -275.02 6875.00 275.02 ; +C 25; N balls-0; B 0.00 -1512.51 5445.07 1512.51 ; +C 26; N balls-0l; B -1361.27 -275.02 6806.34 275.02 ; +C 27; N balls-1; B 0.00 -1512.51 3788.07 1512.51 ; +C 28; N balls-1l; B -947.02 -275.02 4735.09 275.02 ; +C 29; N balls-2; B 0.00 -1512.51 3632.84 1512.51 ; +C 30; N balls-2l; B -908.22 -275.02 4541.06 275.02 ; +C 31; N scripts-ufermata; B -3643.77 -206.27 3643.77 3987.55 ; +C 32; N scripts-dfermata; B -3643.77 -3987.55 3643.77 206.27 ; +C 33; N scripts-thumb; B -1100.00 -1375.00 1100.00 1375.00 ; +C 34; N scripts-sforzato; B -2474.99 -1375.00 2474.99 1375.00 ; +C 35; N scripts-staccato; B -412.54 -412.54 412.54 412.54 ; +C 36; N scripts-ustaccatissimo; B -550.05 -200.00 550.05 2750.06 ; +C 37; N scripts-dstaccatissimo; B -550.05 -2750.06 550.05 200.00 ; +C 38; N scripts-tenuto; B -1650.02 -192.52 1650.02 192.52 ; +C 39; N scripts-umarcato; B -1375.00 0.00 1375.00 3025.02 ; +C 40; N scripts-dmarcato; B -1375.00 -3025.02 1375.00 0.00 ; +C 41; N scripts-open; B -1100.00 -1375.00 1100.00 1375.00 ; +C 42; N scripts-stopped; B -1512.51 -1512.51 1512.51 1512.51 ; +C 43; N scripts-upbow; B -1787.50 0.00 1787.50 5720.05 ; +C 44; N scripts-downbow; B -2062.50 0.00 2062.50 3666.66 ; +C 45; N scripts-reverseturn; B -3007.81 -1455.89 3007.81 1455.89 ; +C 46; N scripts-turn; B -3007.81 -1455.89 3007.81 1455.89 ; +C 47; N scripts-trill; B -2750.00 0.00 2750.00 6187.50 ; +C 48; N scripts-upedalheel; B -1375.00 -1375.00 1375.00 1833.33 ; +C 49; N scripts-dpedalheel; B -1375.00 -1833.33 1375.00 1375.00 ; +C 50; N scripts-upedaltoe; B -1375.00 0.00 1375.00 4125.00 ; +C 51; N scripts-dpedaltoe; B -1375.00 -4125.00 1375.00 0.00 ; +C 52; N scripts-flageolet; B -1466.67 -1466.67 1466.67 1466.67 ; +C 53; N scripts-trilelement; B -1833.33 -1375.00 718.64 1375.00 ; +C 54; N scripts-prall; B -3109.31 -1375.00 3109.31 1375.00 ; +C 55; N scripts-mordent; B -3109.31 -1375.00 3109.31 1375.00 ; +C 56; N scripts-prallprall; B -4385.30 -1375.00 4385.30 1375.00 ; +C 57; N scripts-prallmordent; B -4385.30 -1375.00 4385.30 1375.00 ; +C 58; N scripts-upprall; B -4385.30 -1375.00 4385.30 1375.00 ; +C 59; N scripts-downprall; B -4385.30 -1375.00 4385.30 1375.00 ; +C 60; N flags-u3; B -137.51 -8428.77 3393.31 137.51 ; +C 61; N flags-u4; B -137.51 -9803.77 3393.31 137.51 ; +C 62; N flags-u5; B -137.51 -11866.27 3393.31 137.51 ; +C 63; N flags-u6; B -137.51 -14616.27 3393.31 137.51 ; +C 64; N flags-d3; B -137.51 -137.51 3755.11 8016.30 ; +C 65; N flags-d4; B -137.51 -137.51 3755.11 8428.77 ; +C 66; N flags-d5; B -137.51 -137.51 3755.11 10766.30 ; +C 67; N flags-d6; B -137.51 -137.51 3755.11 12141.30 ; +C 68; N clefs-alto; B -2750.00 -5500.00 10236.10 5500.00 ; +C 69; N clefs-alto_change; B -2200.01 -4400.02 8188.93 4400.02 ; +C 70; N clefs-bass; B -1375.00 -6875.00 9900.02 2750.00 ; +C 71; N clefs-bass_change; B -1100.02 -5500.03 7920.04 2200.01 ; +C 72; N clefs-treble; B -2396.44 -8250.00 10277.13 13750.00 ; +C 73; N clefs-treble_change; B -2082.15 -6600.04 8056.75 11000.06 ; +C 74; N timesig-C4/4; B -4950.01 -2750.00 4674.99 2750.00 ; +C 75; N timesig-C2/2; B -4950.01 -3849.99 4674.99 3849.99 ; +C 76; N timesig-old4/4; B -4812.50 -2062.50 4812.50 2062.50 ; +C 77; N timesig-old2/2; B -4812.50 -2750.00 4812.50 2750.00 ; +C 78; N timesig-old3/2; B -4812.50 -2062.50 4812.50 2062.50 ; +C 79; N timesig-old6/4; B -4812.50 -3437.50 4812.50 3437.50 ; +C 80; N timesig-old9/4; B -4812.50 -3437.50 4812.50 3437.50 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta13.afm b/mf/out/feta13.afm index 328de318be..06e421e670 100644 --- a/mf/out/feta13.afm +++ b/mf/out/feta13.afm @@ -18,67 +18,69 @@ C 13; N accidentals-0; B 0.00 -4875.00 2166.67 4875.00 ; C 14; N accidentals--1; B -390.03 -1625.00 2600.00 6500.00 ; C 15; N accidentals--2; B -390.03 -1625.00 4712.50 6500.00 ; C 16; N accidentals-2; B 0.00 -1625.00 3250.00 1625.00 ; -C 17; N dots-dot; B 0.00 -731.25 1462.50 731.25 ; -C 18; N dots-repeatcolon; B 0.00 -1625.00 1462.50 1625.00 ; -C 19; N balls--1; B 0.00 -1787.52 6500.00 1787.52 ; -C 20; N balls--1l; B -1625.00 -325.03 8125.00 325.03 ; -C 21; N balls--2; B 0.00 -1787.52 6500.00 1787.52 ; -C 22; N balls--2l; B -1625.00 -325.03 8125.00 325.03 ; -C 23; N balls-0; B 0.00 -1787.52 6435.09 1787.52 ; -C 24; N balls-0l; B -1608.78 -325.03 8043.87 325.03 ; -C 25; N balls-1; B 0.00 -1787.52 4476.79 1787.52 ; -C 26; N balls-1l; B -1119.20 -325.03 5596.00 325.03 ; -C 27; N balls-2; B 0.00 -1787.52 4293.33 1787.52 ; -C 28; N balls-2l; B -1073.33 -325.03 5366.67 325.03 ; -C 29; N scripts-ufermata; B -4306.27 -243.77 4306.27 4712.55 ; -C 30; N scripts-dfermata; B -4306.27 -4712.55 4306.27 243.77 ; -C 31; N scripts-thumb; B -1300.00 -1625.00 1300.00 1625.00 ; -C 32; N scripts-sforzato; B -2924.99 -1625.00 2924.99 1625.00 ; -C 33; N scripts-staccato; B -487.55 -487.55 487.55 487.55 ; -C 34; N scripts-ustaccatissimo; B -650.05 -200.00 650.05 3250.06 ; -C 35; N scripts-dstaccatissimo; B -650.05 -3250.06 650.05 200.00 ; -C 36; N scripts-tenuto; B -1950.03 -227.52 1950.03 227.52 ; -C 37; N scripts-umarcato; B -1625.00 0.00 1625.00 3575.03 ; -C 38; N scripts-dmarcato; B -1625.00 -3575.03 1625.00 0.00 ; -C 39; N scripts-open; B -1300.00 -1625.00 1300.00 1625.00 ; -C 40; N scripts-stopped; B -1787.52 -1787.52 1787.52 1787.52 ; -C 41; N scripts-upbow; B -2112.50 0.00 2112.50 6760.04 ; -C 42; N scripts-downbow; B -2437.50 0.00 2437.50 4333.31 ; -C 43; N scripts-reverseturn; B -3554.69 -1720.60 3554.69 1720.60 ; -C 44; N scripts-turn; B -3554.69 -1720.60 3554.69 1720.60 ; -C 45; N scripts-trill; B -3250.00 0.00 3250.00 7312.50 ; -C 46; N scripts-upedalheel; B -1625.00 -1625.00 1625.00 2166.67 ; -C 47; N scripts-dpedalheel; B -1625.00 -2166.67 1625.00 1625.00 ; -C 48; N scripts-upedaltoe; B -1625.00 0.00 1625.00 4875.00 ; -C 49; N scripts-dpedaltoe; B -1625.00 -4875.00 1625.00 0.00 ; -C 50; N scripts-flageolet; B -1733.34 -1733.34 1733.34 1733.34 ; -C 51; N scripts-trilelement; B -2166.67 -1625.00 849.30 1625.00 ; -C 52; N scripts-prall; B -3674.65 -1625.00 3674.65 1625.00 ; -C 53; N scripts-mordent; B -3674.65 -1625.00 3674.65 1625.00 ; -C 54; N scripts-prallprall; B -5182.63 -1625.00 5182.63 1625.00 ; -C 55; N scripts-prallmordent; B -5182.63 -1625.00 5182.63 1625.00 ; -C 56; N scripts-upprall; B -5182.63 -1625.00 5182.63 1625.00 ; -C 57; N scripts-downprall; B -5182.63 -1625.00 5182.63 1625.00 ; -C 58; N flags-u3; B -162.52 -9961.27 4010.27 162.52 ; -C 59; N flags-u4; B -162.52 -11586.27 4010.27 162.52 ; -C 60; N flags-u5; B -162.52 -14023.77 4010.27 162.52 ; -C 61; N flags-u6; B -162.52 -17273.77 4010.27 162.52 ; -C 62; N flags-d3; B -162.52 -162.52 4437.84 9473.80 ; -C 63; N flags-d4; B -162.52 -162.52 4437.84 9961.27 ; -C 64; N flags-d5; B -162.52 -162.52 4437.84 12723.80 ; -C 65; N flags-d6; B -162.52 -162.52 4437.84 14348.80 ; -C 66; N clefs-alto; B -3250.00 -6500.00 12097.24 6500.00 ; -C 67; N clefs-alto_change; B -2600.00 -5200.01 9677.81 5200.01 ; -C 68; N clefs-bass; B -1625.00 -8125.00 11700.03 3250.00 ; -C 69; N clefs-bass_change; B -1300.02 -6500.02 9360.02 2600.00 ; -C 70; N clefs-violin; B -2832.14 -9750.00 12145.70 16250.00 ; -C 71; N clefs-violin_change; B -2460.72 -7800.02 9521.58 13000.03 ; -C 72; N timesig-C4/4; B -5850.00 -3250.00 5525.00 3250.00 ; -C 73; N timesig-C2/2; B -5850.00 -4549.99 5525.00 4549.99 ; -C 74; N timesig-old4/4; B -5687.50 -2437.50 5687.50 2437.50 ; -C 75; N timesig-old2/2; B -5687.50 -3250.00 5687.50 3250.00 ; -C 76; N timesig-old3/2; B -5687.50 -2437.50 5687.50 2437.50 ; -C 77; N timesig-old6/4; B -5687.50 -4062.50 5687.50 4062.50 ; -C 78; N timesig-old9/4; B -5687.50 -4062.50 5687.50 4062.50 ; +C 17; N accidentals-); B 0.00 -3250.00 1950.03 3250.00 ; +C 18; N accidentals-(; B -1950.03 -3250.00 0.00 3250.00 ; +C 19; N dots-dot; B 0.00 -731.25 1462.50 731.25 ; +C 20; N dots-repeatcolon; B 0.00 -1625.00 1462.50 1625.00 ; +C 21; N balls--1; B 0.00 -1787.52 6500.00 1787.52 ; +C 22; N balls--1l; B -1625.00 -325.03 8125.00 325.03 ; +C 23; N balls--2; B 0.00 -1787.52 6500.00 1787.52 ; +C 24; N balls--2l; B -1625.00 -325.03 8125.00 325.03 ; +C 25; N balls-0; B 0.00 -1787.52 6435.09 1787.52 ; +C 26; N balls-0l; B -1608.78 -325.03 8043.87 325.03 ; +C 27; N balls-1; B 0.00 -1787.52 4476.79 1787.52 ; +C 28; N balls-1l; B -1119.20 -325.03 5596.00 325.03 ; +C 29; N balls-2; B 0.00 -1787.52 4293.33 1787.52 ; +C 30; N balls-2l; B -1073.33 -325.03 5366.67 325.03 ; +C 31; N scripts-ufermata; B -4306.27 -243.77 4306.27 4712.55 ; +C 32; N scripts-dfermata; B -4306.27 -4712.55 4306.27 243.77 ; +C 33; N scripts-thumb; B -1300.00 -1625.00 1300.00 1625.00 ; +C 34; N scripts-sforzato; B -2924.99 -1625.00 2924.99 1625.00 ; +C 35; N scripts-staccato; B -487.55 -487.55 487.55 487.55 ; +C 36; N scripts-ustaccatissimo; B -650.05 -200.00 650.05 3250.06 ; +C 37; N scripts-dstaccatissimo; B -650.05 -3250.06 650.05 200.00 ; +C 38; N scripts-tenuto; B -1950.03 -227.52 1950.03 227.52 ; +C 39; N scripts-umarcato; B -1625.00 0.00 1625.00 3575.03 ; +C 40; N scripts-dmarcato; B -1625.00 -3575.03 1625.00 0.00 ; +C 41; N scripts-open; B -1300.00 -1625.00 1300.00 1625.00 ; +C 42; N scripts-stopped; B -1787.52 -1787.52 1787.52 1787.52 ; +C 43; N scripts-upbow; B -2112.50 0.00 2112.50 6760.04 ; +C 44; N scripts-downbow; B -2437.50 0.00 2437.50 4333.31 ; +C 45; N scripts-reverseturn; B -3554.69 -1720.60 3554.69 1720.60 ; +C 46; N scripts-turn; B -3554.69 -1720.60 3554.69 1720.60 ; +C 47; N scripts-trill; B -3250.00 0.00 3250.00 7312.50 ; +C 48; N scripts-upedalheel; B -1625.00 -1625.00 1625.00 2166.67 ; +C 49; N scripts-dpedalheel; B -1625.00 -2166.67 1625.00 1625.00 ; +C 50; N scripts-upedaltoe; B -1625.00 0.00 1625.00 4875.00 ; +C 51; N scripts-dpedaltoe; B -1625.00 -4875.00 1625.00 0.00 ; +C 52; N scripts-flageolet; B -1733.34 -1733.34 1733.34 1733.34 ; +C 53; N scripts-trilelement; B -2166.67 -1625.00 849.30 1625.00 ; +C 54; N scripts-prall; B -3674.65 -1625.00 3674.65 1625.00 ; +C 55; N scripts-mordent; B -3674.65 -1625.00 3674.65 1625.00 ; +C 56; N scripts-prallprall; B -5182.63 -1625.00 5182.63 1625.00 ; +C 57; N scripts-prallmordent; B -5182.63 -1625.00 5182.63 1625.00 ; +C 58; N scripts-upprall; B -5182.63 -1625.00 5182.63 1625.00 ; +C 59; N scripts-downprall; B -5182.63 -1625.00 5182.63 1625.00 ; +C 60; N flags-u3; B -162.52 -9961.27 4010.27 162.52 ; +C 61; N flags-u4; B -162.52 -11586.27 4010.27 162.52 ; +C 62; N flags-u5; B -162.52 -14023.77 4010.27 162.52 ; +C 63; N flags-u6; B -162.52 -17273.77 4010.27 162.52 ; +C 64; N flags-d3; B -162.52 -162.52 4437.84 9473.80 ; +C 65; N flags-d4; B -162.52 -162.52 4437.84 9961.27 ; +C 66; N flags-d5; B -162.52 -162.52 4437.84 12723.80 ; +C 67; N flags-d6; B -162.52 -162.52 4437.84 14348.80 ; +C 68; N clefs-alto; B -3250.00 -6500.00 12097.24 6500.00 ; +C 69; N clefs-alto_change; B -2600.00 -5200.01 9677.81 5200.01 ; +C 70; N clefs-bass; B -1625.00 -8125.00 11700.03 3250.00 ; +C 71; N clefs-bass_change; B -1300.02 -6500.02 9360.02 2600.00 ; +C 72; N clefs-treble; B -2832.14 -9750.00 12145.70 16250.00 ; +C 73; N clefs-treble_change; B -2460.72 -7800.02 9521.58 13000.03 ; +C 74; N timesig-C4/4; B -5850.00 -3250.00 5525.00 3250.00 ; +C 75; N timesig-C2/2; B -5850.00 -4549.99 5525.00 4549.99 ; +C 76; N timesig-old4/4; B -5687.50 -2437.50 5687.50 2437.50 ; +C 77; N timesig-old2/2; B -5687.50 -3250.00 5687.50 3250.00 ; +C 78; N timesig-old3/2; B -5687.50 -2437.50 5687.50 2437.50 ; +C 79; N timesig-old6/4; B -5687.50 -4062.50 5687.50 4062.50 ; +C 80; N timesig-old9/4; B -5687.50 -4062.50 5687.50 4062.50 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta16.afm b/mf/out/feta16.afm index 3bf340009e..9500983b7e 100644 --- a/mf/out/feta16.afm +++ b/mf/out/feta16.afm @@ -18,67 +18,69 @@ C 13; N accidentals-0; B 0.00 -6000.00 2666.67 6000.00 ; C 14; N accidentals--1; B -480.03 -2000.00 3200.01 8000.00 ; C 15; N accidentals--2; B -480.03 -2000.00 5799.99 8000.00 ; C 16; N accidentals-2; B 0.00 -2000.00 4000.00 2000.00 ; -C 17; N dots-dot; B 0.00 -900.00 1799.99 900.00 ; -C 18; N dots-repeatcolon; B 0.00 -2000.00 1799.99 2000.00 ; -C 19; N balls--1; B 0.00 -2200.01 8000.00 2200.01 ; -C 20; N balls--1l; B -2000.00 -400.02 10000.00 400.02 ; -C 21; N balls--2; B 0.00 -2200.01 8000.00 2200.01 ; -C 22; N balls--2l; B -2000.00 -400.02 10000.00 400.02 ; -C 23; N balls-0; B 0.00 -2200.01 7920.04 2200.01 ; -C 24; N balls-0l; B -1980.01 -400.02 9900.05 400.02 ; -C 25; N balls-1; B 0.00 -2200.01 5509.86 2200.01 ; -C 26; N balls-1l; B -1377.47 -400.02 6887.33 400.02 ; -C 27; N balls-2; B 0.00 -2200.01 5284.09 2200.01 ; -C 28; N balls-2l; B -1321.03 -400.02 6605.12 400.02 ; -C 29; N scripts-ufermata; B -5300.02 -300.02 5300.02 5800.05 ; -C 30; N scripts-dfermata; B -5300.02 -5800.05 5300.02 300.02 ; -C 31; N scripts-thumb; B -1600.00 -2000.00 1600.00 2000.00 ; -C 32; N scripts-sforzato; B -3599.98 -2000.00 3599.98 2000.00 ; -C 33; N scripts-staccato; B -600.04 -600.04 600.04 600.04 ; -C 34; N scripts-ustaccatissimo; B -800.05 -200.00 800.05 4000.06 ; -C 35; N scripts-dstaccatissimo; B -800.05 -4000.06 800.05 200.00 ; -C 36; N scripts-tenuto; B -2400.02 -280.01 2400.02 280.01 ; -C 37; N scripts-umarcato; B -2000.00 0.00 2000.00 4400.02 ; -C 38; N scripts-dmarcato; B -2000.00 -4400.02 2000.00 0.00 ; -C 39; N scripts-open; B -1600.00 -2000.00 1600.00 2000.00 ; -C 40; N scripts-stopped; B -2200.01 -2200.01 2200.01 2200.01 ; -C 41; N scripts-upbow; B -2600.00 0.00 2600.00 8320.05 ; -C 42; N scripts-downbow; B -3000.00 0.00 3000.00 5333.31 ; -C 43; N scripts-reverseturn; B -4375.00 -2117.65 4375.00 2117.65 ; -C 44; N scripts-turn; B -4375.00 -2117.65 4375.00 2117.65 ; -C 45; N scripts-trill; B -4000.00 0.00 4000.00 9000.00 ; -C 46; N scripts-upedalheel; B -2000.00 -2000.00 2000.00 2666.67 ; -C 47; N scripts-dpedalheel; B -2000.00 -2666.67 2000.00 2000.00 ; -C 48; N scripts-upedaltoe; B -2000.00 0.00 2000.00 6000.00 ; -C 49; N scripts-dpedaltoe; B -2000.00 -6000.00 2000.00 0.00 ; -C 50; N scripts-flageolet; B -2133.33 -2133.33 2133.33 2133.33 ; -C 51; N scripts-trilelement; B -2666.67 -2000.00 1045.30 2000.00 ; -C 52; N scripts-prall; B -4522.66 -2000.00 4522.66 2000.00 ; -C 53; N scripts-mordent; B -4522.66 -2000.00 4522.66 2000.00 ; -C 54; N scripts-prallprall; B -6378.65 -2000.00 6378.65 2000.00 ; -C 55; N scripts-prallmordent; B -6378.65 -2000.00 6378.65 2000.00 ; -C 56; N scripts-upprall; B -6378.65 -2000.00 6378.65 2000.00 ; -C 57; N scripts-downprall; B -6378.65 -2000.00 6378.65 2000.00 ; -C 58; N flags-u3; B -200.01 -12260.03 4935.68 200.01 ; -C 59; N flags-u4; B -200.01 -14260.03 4935.68 200.01 ; -C 60; N flags-u5; B -200.01 -17260.03 4935.68 200.01 ; -C 61; N flags-u6; B -200.01 -21260.03 4935.68 200.01 ; -C 62; N flags-d3; B -200.01 -200.01 5461.91 11660.05 ; -C 63; N flags-d4; B -200.01 -200.01 5461.91 12260.03 ; -C 64; N flags-d5; B -200.01 -200.01 5461.91 15660.05 ; -C 65; N flags-d6; B -200.01 -200.01 5461.91 17660.05 ; -C 66; N clefs-alto; B -4000.00 -8000.00 14888.90 8000.00 ; -C 67; N clefs-alto_change; B -3200.01 -6400.02 11911.18 6400.02 ; -C 68; N clefs-bass; B -2000.00 -10000.00 14400.02 4000.00 ; -C 69; N clefs-bass_change; B -1600.04 -8000.03 11520.03 3200.01 ; -C 70; N clefs-violin; B -3485.72 -12000.00 14948.55 20000.00 ; -C 71; N clefs-violin_change; B -3028.58 -9600.04 11718.89 16000.06 ; -C 72; N timesig-C4/4; B -7200.01 -4000.00 6799.99 4000.00 ; -C 73; N timesig-C2/2; B -7200.01 -5599.98 6799.99 5599.98 ; -C 74; N timesig-old4/4; B -7000.00 -3000.00 7000.00 3000.00 ; -C 75; N timesig-old2/2; B -7000.00 -4000.00 7000.00 4000.00 ; -C 76; N timesig-old3/2; B -7000.00 -3000.00 7000.00 3000.00 ; -C 77; N timesig-old6/4; B -7000.00 -5000.00 7000.00 5000.00 ; -C 78; N timesig-old9/4; B -7000.00 -5000.00 7000.00 5000.00 ; +C 17; N accidentals-); B 0.00 -4000.00 2400.02 4000.00 ; +C 18; N accidentals-(; B -2400.02 -4000.00 0.00 4000.00 ; +C 19; N dots-dot; B 0.00 -900.00 1799.99 900.00 ; +C 20; N dots-repeatcolon; B 0.00 -2000.00 1799.99 2000.00 ; +C 21; N balls--1; B 0.00 -2200.01 8000.00 2200.01 ; +C 22; N balls--1l; B -2000.00 -400.02 10000.00 400.02 ; +C 23; N balls--2; B 0.00 -2200.01 8000.00 2200.01 ; +C 24; N balls--2l; B -2000.00 -400.02 10000.00 400.02 ; +C 25; N balls-0; B 0.00 -2200.01 7920.04 2200.01 ; +C 26; N balls-0l; B -1980.01 -400.02 9900.05 400.02 ; +C 27; N balls-1; B 0.00 -2200.01 5509.86 2200.01 ; +C 28; N balls-1l; B -1377.47 -400.02 6887.33 400.02 ; +C 29; N balls-2; B 0.00 -2200.01 5284.09 2200.01 ; +C 30; N balls-2l; B -1321.03 -400.02 6605.12 400.02 ; +C 31; N scripts-ufermata; B -5300.02 -300.02 5300.02 5800.05 ; +C 32; N scripts-dfermata; B -5300.02 -5800.05 5300.02 300.02 ; +C 33; N scripts-thumb; B -1600.00 -2000.00 1600.00 2000.00 ; +C 34; N scripts-sforzato; B -3599.98 -2000.00 3599.98 2000.00 ; +C 35; N scripts-staccato; B -600.04 -600.04 600.04 600.04 ; +C 36; N scripts-ustaccatissimo; B -800.05 -200.00 800.05 4000.06 ; +C 37; N scripts-dstaccatissimo; B -800.05 -4000.06 800.05 200.00 ; +C 38; N scripts-tenuto; B -2400.02 -280.01 2400.02 280.01 ; +C 39; N scripts-umarcato; B -2000.00 0.00 2000.00 4400.02 ; +C 40; N scripts-dmarcato; B -2000.00 -4400.02 2000.00 0.00 ; +C 41; N scripts-open; B -1600.00 -2000.00 1600.00 2000.00 ; +C 42; N scripts-stopped; B -2200.01 -2200.01 2200.01 2200.01 ; +C 43; N scripts-upbow; B -2600.00 0.00 2600.00 8320.05 ; +C 44; N scripts-downbow; B -3000.00 0.00 3000.00 5333.31 ; +C 45; N scripts-reverseturn; B -4375.00 -2117.65 4375.00 2117.65 ; +C 46; N scripts-turn; B -4375.00 -2117.65 4375.00 2117.65 ; +C 47; N scripts-trill; B -4000.00 0.00 4000.00 9000.00 ; +C 48; N scripts-upedalheel; B -2000.00 -2000.00 2000.00 2666.67 ; +C 49; N scripts-dpedalheel; B -2000.00 -2666.67 2000.00 2000.00 ; +C 50; N scripts-upedaltoe; B -2000.00 0.00 2000.00 6000.00 ; +C 51; N scripts-dpedaltoe; B -2000.00 -6000.00 2000.00 0.00 ; +C 52; N scripts-flageolet; B -2133.33 -2133.33 2133.33 2133.33 ; +C 53; N scripts-trilelement; B -2666.67 -2000.00 1045.30 2000.00 ; +C 54; N scripts-prall; B -4522.66 -2000.00 4522.66 2000.00 ; +C 55; N scripts-mordent; B -4522.66 -2000.00 4522.66 2000.00 ; +C 56; N scripts-prallprall; B -6378.65 -2000.00 6378.65 2000.00 ; +C 57; N scripts-prallmordent; B -6378.65 -2000.00 6378.65 2000.00 ; +C 58; N scripts-upprall; B -6378.65 -2000.00 6378.65 2000.00 ; +C 59; N scripts-downprall; B -6378.65 -2000.00 6378.65 2000.00 ; +C 60; N flags-u3; B -200.01 -12260.03 4935.68 200.01 ; +C 61; N flags-u4; B -200.01 -14260.03 4935.68 200.01 ; +C 62; N flags-u5; B -200.01 -17260.03 4935.68 200.01 ; +C 63; N flags-u6; B -200.01 -21260.03 4935.68 200.01 ; +C 64; N flags-d3; B -200.01 -200.01 5461.91 11660.05 ; +C 65; N flags-d4; B -200.01 -200.01 5461.91 12260.03 ; +C 66; N flags-d5; B -200.01 -200.01 5461.91 15660.05 ; +C 67; N flags-d6; B -200.01 -200.01 5461.91 17660.05 ; +C 68; N clefs-alto; B -4000.00 -8000.00 14888.90 8000.00 ; +C 69; N clefs-alto_change; B -3200.01 -6400.02 11911.18 6400.02 ; +C 70; N clefs-bass; B -2000.00 -10000.00 14400.02 4000.00 ; +C 71; N clefs-bass_change; B -1600.04 -8000.03 11520.03 3200.01 ; +C 72; N clefs-treble; B -3485.72 -12000.00 14948.55 20000.00 ; +C 73; N clefs-treble_change; B -3028.58 -9600.04 11718.89 16000.06 ; +C 74; N timesig-C4/4; B -7200.01 -4000.00 6799.99 4000.00 ; +C 75; N timesig-C2/2; B -7200.01 -5599.98 6799.99 5599.98 ; +C 76; N timesig-old4/4; B -7000.00 -3000.00 7000.00 3000.00 ; +C 77; N timesig-old2/2; B -7000.00 -4000.00 7000.00 4000.00 ; +C 78; N timesig-old3/2; B -7000.00 -3000.00 7000.00 3000.00 ; +C 79; N timesig-old6/4; B -7000.00 -5000.00 7000.00 5000.00 ; +C 80; N timesig-old9/4; B -7000.00 -5000.00 7000.00 5000.00 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta19.afm b/mf/out/feta19.afm index c3eb6c4ba8..685b53af82 100644 --- a/mf/out/feta19.afm +++ b/mf/out/feta19.afm @@ -18,67 +18,69 @@ C 13; N accidentals-0; B 0.00 -7125.00 3166.67 7125.00 ; C 14; N accidentals--1; B -570.04 -2375.00 3800.02 9500.00 ; C 15; N accidentals--2; B -570.04 -2375.00 6887.48 9500.00 ; C 16; N accidentals-2; B 0.00 -2375.00 4750.00 2375.00 ; -C 17; N dots-dot; B 0.00 -1068.74 2137.48 1068.74 ; -C 18; N dots-repeatcolon; B 0.00 -2375.00 2137.48 2375.00 ; -C 19; N balls--1; B 0.00 -2612.52 9500.00 2612.52 ; -C 20; N balls--1l; B -2375.00 -475.04 11875.00 475.04 ; -C 21; N balls--2; B 0.00 -2612.52 9500.00 2612.52 ; -C 22; N balls--2l; B -2375.00 -475.04 11875.00 475.04 ; -C 23; N balls-0; B 0.00 -2612.52 9405.09 2612.52 ; -C 24; N balls-0l; B -2351.27 -475.04 11756.36 475.04 ; -C 25; N balls-1; B 0.00 -2612.52 6543.00 2612.52 ; -C 26; N balls-1l; B -1635.76 -475.04 8178.76 475.04 ; -C 27; N balls-2; B 0.00 -2612.52 6274.89 2612.52 ; -C 28; N balls-2l; B -1568.73 -475.04 7843.61 475.04 ; -C 29; N scripts-ufermata; B -6293.78 -356.28 6293.78 6887.57 ; -C 30; N scripts-dfermata; B -6293.78 -6887.57 6293.78 356.28 ; -C 31; N scripts-thumb; B -1900.01 -2375.00 1900.01 2375.00 ; -C 32; N scripts-sforzato; B -4274.98 -2375.00 4274.98 2375.00 ; -C 33; N scripts-staccato; B -712.55 -712.55 712.55 712.55 ; -C 34; N scripts-ustaccatissimo; B -950.07 -200.00 950.07 4750.09 ; -C 35; N scripts-dstaccatissimo; B -950.07 -4750.09 950.07 200.00 ; -C 36; N scripts-tenuto; B -2850.04 -332.53 2850.04 332.53 ; -C 37; N scripts-umarcato; B -2375.00 0.00 2375.00 5225.04 ; -C 38; N scripts-dmarcato; B -2375.00 -5225.04 2375.00 0.00 ; -C 39; N scripts-open; B -1900.01 -2375.00 1900.01 2375.00 ; -C 40; N scripts-stopped; B -2612.52 -2612.52 2612.52 2612.52 ; -C 41; N scripts-upbow; B -3087.51 0.00 3087.51 9880.07 ; -C 42; N scripts-downbow; B -3562.50 0.00 3562.50 6333.31 ; -C 43; N scripts-reverseturn; B -5195.31 -2514.71 5195.31 2514.71 ; -C 44; N scripts-turn; B -5195.31 -2514.71 5195.31 2514.71 ; -C 45; N scripts-trill; B -4750.00 0.00 4750.00 10687.50 ; -C 46; N scripts-upedalheel; B -2375.00 -2375.00 2375.00 3166.67 ; -C 47; N scripts-dpedalheel; B -2375.00 -3166.67 2375.00 2375.00 ; -C 48; N scripts-upedaltoe; B -2375.00 0.00 2375.00 7125.00 ; -C 49; N scripts-dpedaltoe; B -2375.00 -7125.00 2375.00 0.00 ; -C 50; N scripts-flageolet; B -2533.34 -2533.34 2533.34 2533.34 ; -C 51; N scripts-trilelement; B -3166.67 -2375.00 1241.30 2375.00 ; -C 52; N scripts-prall; B -5370.65 -2375.00 5370.65 2375.00 ; -C 53; N scripts-mordent; B -5370.65 -2375.00 5370.65 2375.00 ; -C 54; N scripts-prallprall; B -7574.63 -2375.00 7574.63 2375.00 ; -C 55; N scripts-prallmordent; B -7574.63 -2375.00 7574.63 2375.00 ; -C 56; N scripts-upprall; B -7574.63 -2375.00 7574.63 2375.00 ; -C 57; N scripts-downprall; B -7574.63 -2375.00 7574.63 2375.00 ; -C 58; N flags-u3; B -237.52 -14558.78 5861.15 237.52 ; -C 59; N flags-u4; B -237.52 -16933.78 5861.15 237.52 ; -C 60; N flags-u5; B -237.52 -20496.28 5861.15 237.52 ; -C 61; N flags-u6; B -237.52 -25246.28 5861.15 237.52 ; -C 62; N flags-d3; B -237.52 -237.52 6486.07 13846.31 ; -C 63; N flags-d4; B -237.52 -237.52 6486.07 14558.78 ; -C 64; N flags-d5; B -237.52 -237.52 6486.07 18596.31 ; -C 65; N flags-d6; B -237.52 -237.52 6486.07 20971.31 ; -C 66; N clefs-alto; B -4750.00 -9500.00 17680.59 9500.00 ; -C 67; N clefs-alto_change; B -3800.02 -7600.04 14144.50 7600.04 ; -C 68; N clefs-bass; B -2375.00 -11875.00 17100.04 4750.00 ; -C 69; N clefs-bass_change; B -1900.04 -9500.05 13680.05 3800.02 ; -C 70; N clefs-violin; B -4139.30 -14250.00 17751.40 23750.00 ; -C 71; N clefs-violin_change; B -3596.45 -11400.05 13916.18 19000.09 ; -C 72; N timesig-C4/4; B -8550.02 -4750.00 8074.98 4750.00 ; -C 73; N timesig-C2/2; B -8550.02 -6649.98 8074.98 6649.98 ; -C 74; N timesig-old4/4; B -8312.50 -3562.50 8312.50 3562.50 ; -C 75; N timesig-old2/2; B -8312.50 -4750.00 8312.50 4750.00 ; -C 76; N timesig-old3/2; B -8312.50 -3562.50 8312.50 3562.50 ; -C 77; N timesig-old6/4; B -8312.50 -5937.50 8312.50 5937.50 ; -C 78; N timesig-old9/4; B -8312.50 -5937.50 8312.50 5937.50 ; +C 17; N accidentals-); B 0.00 -4750.00 2850.04 4750.00 ; +C 18; N accidentals-(; B -2850.04 -4750.00 0.00 4750.00 ; +C 19; N dots-dot; B 0.00 -1068.74 2137.48 1068.74 ; +C 20; N dots-repeatcolon; B 0.00 -2375.00 2137.48 2375.00 ; +C 21; N balls--1; B 0.00 -2612.52 9500.00 2612.52 ; +C 22; N balls--1l; B -2375.00 -475.04 11875.00 475.04 ; +C 23; N balls--2; B 0.00 -2612.52 9500.00 2612.52 ; +C 24; N balls--2l; B -2375.00 -475.04 11875.00 475.04 ; +C 25; N balls-0; B 0.00 -2612.52 9405.09 2612.52 ; +C 26; N balls-0l; B -2351.27 -475.04 11756.36 475.04 ; +C 27; N balls-1; B 0.00 -2612.52 6543.00 2612.52 ; +C 28; N balls-1l; B -1635.76 -475.04 8178.76 475.04 ; +C 29; N balls-2; B 0.00 -2612.52 6274.89 2612.52 ; +C 30; N balls-2l; B -1568.73 -475.04 7843.61 475.04 ; +C 31; N scripts-ufermata; B -6293.78 -356.28 6293.78 6887.57 ; +C 32; N scripts-dfermata; B -6293.78 -6887.57 6293.78 356.28 ; +C 33; N scripts-thumb; B -1900.01 -2375.00 1900.01 2375.00 ; +C 34; N scripts-sforzato; B -4274.98 -2375.00 4274.98 2375.00 ; +C 35; N scripts-staccato; B -712.55 -712.55 712.55 712.55 ; +C 36; N scripts-ustaccatissimo; B -950.07 -200.00 950.07 4750.09 ; +C 37; N scripts-dstaccatissimo; B -950.07 -4750.09 950.07 200.00 ; +C 38; N scripts-tenuto; B -2850.04 -332.53 2850.04 332.53 ; +C 39; N scripts-umarcato; B -2375.00 0.00 2375.00 5225.04 ; +C 40; N scripts-dmarcato; B -2375.00 -5225.04 2375.00 0.00 ; +C 41; N scripts-open; B -1900.01 -2375.00 1900.01 2375.00 ; +C 42; N scripts-stopped; B -2612.52 -2612.52 2612.52 2612.52 ; +C 43; N scripts-upbow; B -3087.51 0.00 3087.51 9880.07 ; +C 44; N scripts-downbow; B -3562.50 0.00 3562.50 6333.31 ; +C 45; N scripts-reverseturn; B -5195.31 -2514.71 5195.31 2514.71 ; +C 46; N scripts-turn; B -5195.31 -2514.71 5195.31 2514.71 ; +C 47; N scripts-trill; B -4750.00 0.00 4750.00 10687.50 ; +C 48; N scripts-upedalheel; B -2375.00 -2375.00 2375.00 3166.67 ; +C 49; N scripts-dpedalheel; B -2375.00 -3166.67 2375.00 2375.00 ; +C 50; N scripts-upedaltoe; B -2375.00 0.00 2375.00 7125.00 ; +C 51; N scripts-dpedaltoe; B -2375.00 -7125.00 2375.00 0.00 ; +C 52; N scripts-flageolet; B -2533.34 -2533.34 2533.34 2533.34 ; +C 53; N scripts-trilelement; B -3166.67 -2375.00 1241.30 2375.00 ; +C 54; N scripts-prall; B -5370.65 -2375.00 5370.65 2375.00 ; +C 55; N scripts-mordent; B -5370.65 -2375.00 5370.65 2375.00 ; +C 56; N scripts-prallprall; B -7574.63 -2375.00 7574.63 2375.00 ; +C 57; N scripts-prallmordent; B -7574.63 -2375.00 7574.63 2375.00 ; +C 58; N scripts-upprall; B -7574.63 -2375.00 7574.63 2375.00 ; +C 59; N scripts-downprall; B -7574.63 -2375.00 7574.63 2375.00 ; +C 60; N flags-u3; B -237.52 -14558.78 5861.15 237.52 ; +C 61; N flags-u4; B -237.52 -16933.78 5861.15 237.52 ; +C 62; N flags-u5; B -237.52 -20496.28 5861.15 237.52 ; +C 63; N flags-u6; B -237.52 -25246.28 5861.15 237.52 ; +C 64; N flags-d3; B -237.52 -237.52 6486.07 13846.31 ; +C 65; N flags-d4; B -237.52 -237.52 6486.07 14558.78 ; +C 66; N flags-d5; B -237.52 -237.52 6486.07 18596.31 ; +C 67; N flags-d6; B -237.52 -237.52 6486.07 20971.31 ; +C 68; N clefs-alto; B -4750.00 -9500.00 17680.59 9500.00 ; +C 69; N clefs-alto_change; B -3800.02 -7600.04 14144.50 7600.04 ; +C 70; N clefs-bass; B -2375.00 -11875.00 17100.04 4750.00 ; +C 71; N clefs-bass_change; B -1900.04 -9500.05 13680.05 3800.02 ; +C 72; N clefs-treble; B -4139.30 -14250.00 17751.40 23750.00 ; +C 73; N clefs-treble_change; B -3596.45 -11400.05 13916.18 19000.09 ; +C 74; N timesig-C4/4; B -8550.02 -4750.00 8074.98 4750.00 ; +C 75; N timesig-C2/2; B -8550.02 -6649.98 8074.98 6649.98 ; +C 76; N timesig-old4/4; B -8312.50 -3562.50 8312.50 3562.50 ; +C 77; N timesig-old2/2; B -8312.50 -4750.00 8312.50 4750.00 ; +C 78; N timesig-old3/2; B -8312.50 -3562.50 8312.50 3562.50 ; +C 79; N timesig-old6/4; B -8312.50 -5937.50 8312.50 5937.50 ; +C 80; N timesig-old9/4; B -8312.50 -5937.50 8312.50 5937.50 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta20.afm b/mf/out/feta20.afm index ce54077bb9..b5e723f832 100644 --- a/mf/out/feta20.afm +++ b/mf/out/feta20.afm @@ -18,67 +18,69 @@ C 13; N accidentals-0; B 0.00 -7500.00 3333.33 7500.00 ; C 14; N accidentals--1; B -600.04 -2500.00 4000.02 10000.00 ; C 15; N accidentals--2; B -600.04 -2500.00 7249.98 10000.00 ; C 16; N accidentals-2; B 0.00 -2500.00 5000.00 2500.00 ; -C 17; N dots-dot; B 0.00 -1125.00 2249.98 1125.00 ; -C 18; N dots-repeatcolon; B 0.00 -2500.00 2249.98 2500.00 ; -C 19; N balls--1; B 0.00 -2750.02 10000.00 2750.02 ; -C 20; N balls--1l; B -2500.00 -500.03 12500.00 500.03 ; -C 21; N balls--2; B 0.00 -2750.02 10000.00 2750.02 ; -C 22; N balls--2l; B -2500.00 -500.03 12500.00 500.03 ; -C 23; N balls-0; B 0.00 -2750.02 9900.09 2750.02 ; -C 24; N balls-0l; B -2475.02 -500.03 12375.10 500.03 ; -C 25; N balls-1; B 0.00 -2750.02 6887.33 2750.02 ; -C 26; N balls-1l; B -1721.83 -500.03 8609.16 500.03 ; -C 27; N balls-2; B 0.00 -2750.02 6605.15 2750.02 ; -C 28; N balls-2l; B -1651.29 -500.03 8256.44 500.03 ; -C 29; N scripts-ufermata; B -6625.03 -375.03 6625.03 7250.06 ; -C 30; N scripts-dfermata; B -6625.03 -7250.06 6625.03 375.03 ; -C 31; N scripts-thumb; B -2000.00 -2500.00 2000.00 2500.00 ; -C 32; N scripts-sforzato; B -4499.97 -2500.00 4499.97 2500.00 ; -C 33; N scripts-staccato; B -750.05 -750.05 750.05 750.05 ; -C 34; N scripts-ustaccatissimo; B -1000.06 -200.00 1000.06 5000.08 ; -C 35; N scripts-dstaccatissimo; B -1000.06 -5000.08 1000.06 200.00 ; -C 36; N scripts-tenuto; B -3000.03 -350.02 3000.03 350.02 ; -C 37; N scripts-umarcato; B -2500.00 0.00 2500.00 5500.03 ; -C 38; N scripts-dmarcato; B -2500.00 -5500.03 2500.00 0.00 ; -C 39; N scripts-open; B -2000.00 -2500.00 2000.00 2500.00 ; -C 40; N scripts-stopped; B -2750.02 -2750.02 2750.02 2750.02 ; -C 41; N scripts-upbow; B -3250.02 0.00 3250.02 10400.07 ; -C 42; N scripts-downbow; B -3750.00 0.00 3750.00 6666.64 ; -C 43; N scripts-reverseturn; B -5468.75 -2647.06 5468.75 2647.06 ; -C 44; N scripts-turn; B -5468.75 -2647.06 5468.75 2647.06 ; -C 45; N scripts-trill; B -5000.00 0.00 5000.00 11250.00 ; -C 46; N scripts-upedalheel; B -2500.00 -2500.00 2500.00 3333.33 ; -C 47; N scripts-dpedalheel; B -2500.00 -3333.33 2500.00 2500.00 ; -C 48; N scripts-upedaltoe; B -2500.00 0.00 2500.00 7500.00 ; -C 49; N scripts-dpedaltoe; B -2500.00 -7500.00 2500.00 0.00 ; -C 50; N scripts-flageolet; B -2666.67 -2666.67 2666.67 2666.67 ; -C 51; N scripts-trilelement; B -3333.33 -2500.00 1306.64 2500.00 ; -C 52; N scripts-prall; B -5653.30 -2500.00 5653.30 2500.00 ; -C 53; N scripts-mordent; B -5653.30 -2500.00 5653.30 2500.00 ; -C 54; N scripts-prallprall; B -7973.28 -2500.00 7973.28 2500.00 ; -C 55; N scripts-prallmordent; B -7973.28 -2500.00 7973.28 2500.00 ; -C 56; N scripts-upprall; B -7973.28 -2500.00 7973.28 2500.00 ; -C 57; N scripts-downprall; B -7973.28 -2500.00 7973.28 2500.00 ; -C 58; N flags-u3; B -250.02 -15325.03 6169.62 250.02 ; -C 59; N flags-u4; B -250.02 -17825.03 6169.62 250.02 ; -C 60; N flags-u5; B -250.02 -21575.03 6169.62 250.02 ; -C 61; N flags-u6; B -250.02 -26575.03 6169.62 250.02 ; -C 62; N flags-d3; B -250.02 -250.02 6827.44 14575.06 ; -C 63; N flags-d4; B -250.02 -250.02 6827.44 15325.03 ; -C 64; N flags-d5; B -250.02 -250.02 6827.44 19575.06 ; -C 65; N flags-d6; B -250.02 -250.02 6827.44 22075.06 ; -C 66; N clefs-alto; B -5000.00 -10000.00 18611.10 10000.00 ; -C 67; N clefs-alto_change; B -4000.02 -8000.03 14888.92 8000.03 ; -C 68; N clefs-bass; B -2500.00 -12500.00 18000.03 5000.00 ; -C 69; N clefs-bass_change; B -2000.05 -10000.05 14400.04 4000.02 ; -C 70; N clefs-violin; B -4357.15 -15000.00 18685.68 25000.00 ; -C 71; N clefs-violin_change; B -3785.74 -12000.05 14648.60 20000.08 ; -C 72; N timesig-C4/4; B -9000.02 -5000.00 8499.98 5000.00 ; -C 73; N timesig-C2/2; B -9000.02 -6999.97 8499.98 6999.97 ; -C 74; N timesig-old4/4; B -8750.00 -3750.00 8750.00 3750.00 ; -C 75; N timesig-old2/2; B -8750.00 -5000.00 8750.00 5000.00 ; -C 76; N timesig-old3/2; B -8750.00 -3750.00 8750.00 3750.00 ; -C 77; N timesig-old6/4; B -8750.00 -6250.00 8750.00 6250.00 ; -C 78; N timesig-old9/4; B -8750.00 -6250.00 8750.00 6250.00 ; +C 17; N accidentals-); B 0.00 -5000.00 3000.03 5000.00 ; +C 18; N accidentals-(; B -3000.03 -5000.00 0.00 5000.00 ; +C 19; N dots-dot; B 0.00 -1125.00 2249.98 1125.00 ; +C 20; N dots-repeatcolon; B 0.00 -2500.00 2249.98 2500.00 ; +C 21; N balls--1; B 0.00 -2750.02 10000.00 2750.02 ; +C 22; N balls--1l; B -2500.00 -500.03 12500.00 500.03 ; +C 23; N balls--2; B 0.00 -2750.02 10000.00 2750.02 ; +C 24; N balls--2l; B -2500.00 -500.03 12500.00 500.03 ; +C 25; N balls-0; B 0.00 -2750.02 9900.09 2750.02 ; +C 26; N balls-0l; B -2475.02 -500.03 12375.10 500.03 ; +C 27; N balls-1; B 0.00 -2750.02 6887.33 2750.02 ; +C 28; N balls-1l; B -1721.83 -500.03 8609.16 500.03 ; +C 29; N balls-2; B 0.00 -2750.02 6605.15 2750.02 ; +C 30; N balls-2l; B -1651.29 -500.03 8256.44 500.03 ; +C 31; N scripts-ufermata; B -6625.03 -375.03 6625.03 7250.06 ; +C 32; N scripts-dfermata; B -6625.03 -7250.06 6625.03 375.03 ; +C 33; N scripts-thumb; B -2000.00 -2500.00 2000.00 2500.00 ; +C 34; N scripts-sforzato; B -4499.97 -2500.00 4499.97 2500.00 ; +C 35; N scripts-staccato; B -750.05 -750.05 750.05 750.05 ; +C 36; N scripts-ustaccatissimo; B -1000.06 -200.00 1000.06 5000.08 ; +C 37; N scripts-dstaccatissimo; B -1000.06 -5000.08 1000.06 200.00 ; +C 38; N scripts-tenuto; B -3000.03 -350.02 3000.03 350.02 ; +C 39; N scripts-umarcato; B -2500.00 0.00 2500.00 5500.03 ; +C 40; N scripts-dmarcato; B -2500.00 -5500.03 2500.00 0.00 ; +C 41; N scripts-open; B -2000.00 -2500.00 2000.00 2500.00 ; +C 42; N scripts-stopped; B -2750.02 -2750.02 2750.02 2750.02 ; +C 43; N scripts-upbow; B -3250.02 0.00 3250.02 10400.07 ; +C 44; N scripts-downbow; B -3750.00 0.00 3750.00 6666.64 ; +C 45; N scripts-reverseturn; B -5468.75 -2647.06 5468.75 2647.06 ; +C 46; N scripts-turn; B -5468.75 -2647.06 5468.75 2647.06 ; +C 47; N scripts-trill; B -5000.00 0.00 5000.00 11250.00 ; +C 48; N scripts-upedalheel; B -2500.00 -2500.00 2500.00 3333.33 ; +C 49; N scripts-dpedalheel; B -2500.00 -3333.33 2500.00 2500.00 ; +C 50; N scripts-upedaltoe; B -2500.00 0.00 2500.00 7500.00 ; +C 51; N scripts-dpedaltoe; B -2500.00 -7500.00 2500.00 0.00 ; +C 52; N scripts-flageolet; B -2666.67 -2666.67 2666.67 2666.67 ; +C 53; N scripts-trilelement; B -3333.33 -2500.00 1306.64 2500.00 ; +C 54; N scripts-prall; B -5653.30 -2500.00 5653.30 2500.00 ; +C 55; N scripts-mordent; B -5653.30 -2500.00 5653.30 2500.00 ; +C 56; N scripts-prallprall; B -7973.28 -2500.00 7973.28 2500.00 ; +C 57; N scripts-prallmordent; B -7973.28 -2500.00 7973.28 2500.00 ; +C 58; N scripts-upprall; B -7973.28 -2500.00 7973.28 2500.00 ; +C 59; N scripts-downprall; B -7973.28 -2500.00 7973.28 2500.00 ; +C 60; N flags-u3; B -250.02 -15325.03 6169.62 250.02 ; +C 61; N flags-u4; B -250.02 -17825.03 6169.62 250.02 ; +C 62; N flags-u5; B -250.02 -21575.03 6169.62 250.02 ; +C 63; N flags-u6; B -250.02 -26575.03 6169.62 250.02 ; +C 64; N flags-d3; B -250.02 -250.02 6827.44 14575.06 ; +C 65; N flags-d4; B -250.02 -250.02 6827.44 15325.03 ; +C 66; N flags-d5; B -250.02 -250.02 6827.44 19575.06 ; +C 67; N flags-d6; B -250.02 -250.02 6827.44 22075.06 ; +C 68; N clefs-alto; B -5000.00 -10000.00 18611.10 10000.00 ; +C 69; N clefs-alto_change; B -4000.02 -8000.03 14888.92 8000.03 ; +C 70; N clefs-bass; B -2500.00 -12500.00 18000.03 5000.00 ; +C 71; N clefs-bass_change; B -2000.05 -10000.05 14400.04 4000.02 ; +C 72; N clefs-treble; B -4357.15 -15000.00 18685.68 25000.00 ; +C 73; N clefs-treble_change; B -3785.74 -12000.05 14648.60 20000.08 ; +C 74; N timesig-C4/4; B -9000.02 -5000.00 8499.98 5000.00 ; +C 75; N timesig-C2/2; B -9000.02 -6999.97 8499.98 6999.97 ; +C 76; N timesig-old4/4; B -8750.00 -3750.00 8750.00 3750.00 ; +C 77; N timesig-old2/2; B -8750.00 -5000.00 8750.00 5000.00 ; +C 78; N timesig-old3/2; B -8750.00 -3750.00 8750.00 3750.00 ; +C 79; N timesig-old6/4; B -8750.00 -6250.00 8750.00 6250.00 ; +C 80; N timesig-old9/4; B -8750.00 -6250.00 8750.00 6250.00 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta23.afm b/mf/out/feta23.afm index ea84da9de9..45d22d74d8 100644 --- a/mf/out/feta23.afm +++ b/mf/out/feta23.afm @@ -18,67 +18,69 @@ C 13; N accidentals-0; B 0.00 -8437.50 3750.00 8437.50 ; C 14; N accidentals--1; B -675.03 -2812.50 4500.02 11250.00 ; C 15; N accidentals--2; B -675.03 -2812.50 8156.23 11250.00 ; C 16; N accidentals-2; B 0.00 -2812.50 5625.00 2812.50 ; -C 17; N dots-dot; B 0.00 -1265.63 2531.23 1265.63 ; -C 18; N dots-repeatcolon; B 0.00 -2812.50 2531.23 2812.50 ; -C 19; N balls--1; B 0.00 -3093.77 11250.00 3093.77 ; -C 20; N balls--1l; B -2812.50 -562.53 14062.50 562.53 ; -C 21; N balls--2; B 0.00 -3093.77 11250.00 3093.77 ; -C 22; N balls--2l; B -2812.50 -562.53 14062.50 562.53 ; -C 23; N balls-0; B 0.00 -3093.77 11137.57 3093.77 ; -C 24; N balls-0l; B -2784.40 -562.53 13921.97 562.53 ; -C 25; N balls-1; B 0.00 -3093.77 7748.26 3093.77 ; -C 26; N balls-1l; B -1937.07 -562.53 9685.33 562.53 ; -C 27; N balls-2; B 0.00 -3093.77 7430.80 3093.77 ; -C 28; N balls-2l; B -1857.70 -562.53 9288.50 562.53 ; -C 29; N scripts-ufermata; B -7453.16 -421.90 7453.16 8156.31 ; -C 30; N scripts-dfermata; B -7453.16 -8156.31 7453.16 421.90 ; -C 31; N scripts-thumb; B -2250.00 -2812.50 2250.00 2812.50 ; -C 32; N scripts-sforzato; B -5062.47 -2812.50 5062.47 2812.50 ; -C 33; N scripts-staccato; B -843.80 -843.80 843.80 843.80 ; -C 34; N scripts-ustaccatissimo; B -1125.06 -200.00 1125.06 5625.08 ; -C 35; N scripts-dstaccatissimo; B -1125.06 -5625.08 1125.06 200.00 ; -C 36; N scripts-tenuto; B -3375.03 -393.77 3375.03 393.77 ; -C 37; N scripts-umarcato; B -2812.50 0.00 2812.50 6187.53 ; -C 38; N scripts-dmarcato; B -2812.50 -6187.53 2812.50 0.00 ; -C 39; N scripts-open; B -2250.00 -2812.50 2250.00 2812.50 ; -C 40; N scripts-stopped; B -3093.77 -3093.77 3093.77 3093.77 ; -C 41; N scripts-upbow; B -3656.27 0.00 3656.27 11700.07 ; -C 42; N scripts-downbow; B -4218.75 0.00 4218.75 7499.97 ; -C 43; N scripts-reverseturn; B -6152.34 -2977.94 6152.34 2977.94 ; -C 44; N scripts-turn; B -6152.34 -2977.94 6152.34 2977.94 ; -C 45; N scripts-trill; B -5625.00 0.00 5625.00 12656.25 ; -C 46; N scripts-upedalheel; B -2812.50 -2812.50 2812.50 3750.00 ; -C 47; N scripts-dpedalheel; B -2812.50 -3750.00 2812.50 2812.50 ; -C 48; N scripts-upedaltoe; B -2812.50 0.00 2812.50 8437.50 ; -C 49; N scripts-dpedaltoe; B -2812.50 -8437.50 2812.50 0.00 ; -C 50; N scripts-flageolet; B -3000.00 -3000.00 3000.00 3000.00 ; -C 51; N scripts-trilelement; B -3750.00 -2812.50 1469.97 2812.50 ; -C 52; N scripts-prall; B -6359.99 -2812.50 6359.99 2812.50 ; -C 53; N scripts-mordent; B -6359.99 -2812.50 6359.99 2812.50 ; -C 54; N scripts-prallprall; B -8969.97 -2812.50 8969.97 2812.50 ; -C 55; N scripts-prallmordent; B -8969.97 -2812.50 8969.97 2812.50 ; -C 56; N scripts-upprall; B -8969.97 -2812.50 8969.97 2812.50 ; -C 57; N scripts-downprall; B -8969.97 -2812.50 8969.97 2812.50 ; -C 58; N flags-u3; B -281.27 -17240.65 6940.84 281.27 ; -C 59; N flags-u4; B -281.27 -20053.15 6940.84 281.27 ; -C 60; N flags-u5; B -281.27 -24271.90 6940.84 281.27 ; -C 61; N flags-u6; B -281.27 -29896.90 6940.84 281.27 ; -C 62; N flags-d3; B -281.27 -281.27 7680.88 16396.93 ; -C 63; N flags-d4; B -281.27 -281.27 7680.88 17240.65 ; -C 64; N flags-d5; B -281.27 -281.27 7680.88 22021.93 ; -C 65; N flags-d6; B -281.27 -281.27 7680.88 24834.43 ; -C 66; N clefs-alto; B -5625.00 -11250.00 20937.50 11250.00 ; -C 67; N clefs-alto_change; B -4500.02 -9000.03 16750.08 9000.03 ; -C 68; N clefs-bass; B -2812.50 -14062.50 20250.03 5625.00 ; -C 69; N clefs-bass_change; B -2250.05 -11250.05 16200.04 4500.02 ; -C 70; N clefs-violin; B -4901.80 -16875.00 21021.40 28125.00 ; -C 71; N clefs-violin_change; B -4258.94 -13500.05 16479.68 22500.08 ; -C 72; N timesig-C4/4; B -10125.02 -5625.00 9562.48 5625.00 ; -C 73; N timesig-C2/2; B -10125.02 -7874.97 9562.48 7874.97 ; -C 74; N timesig-old4/4; B -9843.75 -4218.75 9843.75 4218.75 ; -C 75; N timesig-old2/2; B -9843.75 -5625.00 9843.75 5625.00 ; -C 76; N timesig-old3/2; B -9843.75 -4218.75 9843.75 4218.75 ; -C 77; N timesig-old6/4; B -9843.75 -7031.25 9843.75 7031.25 ; -C 78; N timesig-old9/4; B -9843.75 -7031.25 9843.75 7031.25 ; +C 17; N accidentals-); B 0.00 -5625.00 3375.03 5625.00 ; +C 18; N accidentals-(; B -3375.03 -5625.00 0.00 5625.00 ; +C 19; N dots-dot; B 0.00 -1265.63 2531.23 1265.63 ; +C 20; N dots-repeatcolon; B 0.00 -2812.50 2531.23 2812.50 ; +C 21; N balls--1; B 0.00 -3093.77 11250.00 3093.77 ; +C 22; N balls--1l; B -2812.50 -562.53 14062.50 562.53 ; +C 23; N balls--2; B 0.00 -3093.77 11250.00 3093.77 ; +C 24; N balls--2l; B -2812.50 -562.53 14062.50 562.53 ; +C 25; N balls-0; B 0.00 -3093.77 11137.57 3093.77 ; +C 26; N balls-0l; B -2784.40 -562.53 13921.97 562.53 ; +C 27; N balls-1; B 0.00 -3093.77 7748.26 3093.77 ; +C 28; N balls-1l; B -1937.07 -562.53 9685.33 562.53 ; +C 29; N balls-2; B 0.00 -3093.77 7430.80 3093.77 ; +C 30; N balls-2l; B -1857.70 -562.53 9288.50 562.53 ; +C 31; N scripts-ufermata; B -7453.16 -421.90 7453.16 8156.31 ; +C 32; N scripts-dfermata; B -7453.16 -8156.31 7453.16 421.90 ; +C 33; N scripts-thumb; B -2250.00 -2812.50 2250.00 2812.50 ; +C 34; N scripts-sforzato; B -5062.47 -2812.50 5062.47 2812.50 ; +C 35; N scripts-staccato; B -843.80 -843.80 843.80 843.80 ; +C 36; N scripts-ustaccatissimo; B -1125.06 -200.00 1125.06 5625.08 ; +C 37; N scripts-dstaccatissimo; B -1125.06 -5625.08 1125.06 200.00 ; +C 38; N scripts-tenuto; B -3375.03 -393.77 3375.03 393.77 ; +C 39; N scripts-umarcato; B -2812.50 0.00 2812.50 6187.53 ; +C 40; N scripts-dmarcato; B -2812.50 -6187.53 2812.50 0.00 ; +C 41; N scripts-open; B -2250.00 -2812.50 2250.00 2812.50 ; +C 42; N scripts-stopped; B -3093.77 -3093.77 3093.77 3093.77 ; +C 43; N scripts-upbow; B -3656.27 0.00 3656.27 11700.07 ; +C 44; N scripts-downbow; B -4218.75 0.00 4218.75 7499.97 ; +C 45; N scripts-reverseturn; B -6152.34 -2977.94 6152.34 2977.94 ; +C 46; N scripts-turn; B -6152.34 -2977.94 6152.34 2977.94 ; +C 47; N scripts-trill; B -5625.00 0.00 5625.00 12656.25 ; +C 48; N scripts-upedalheel; B -2812.50 -2812.50 2812.50 3750.00 ; +C 49; N scripts-dpedalheel; B -2812.50 -3750.00 2812.50 2812.50 ; +C 50; N scripts-upedaltoe; B -2812.50 0.00 2812.50 8437.50 ; +C 51; N scripts-dpedaltoe; B -2812.50 -8437.50 2812.50 0.00 ; +C 52; N scripts-flageolet; B -3000.00 -3000.00 3000.00 3000.00 ; +C 53; N scripts-trilelement; B -3750.00 -2812.50 1469.97 2812.50 ; +C 54; N scripts-prall; B -6359.99 -2812.50 6359.99 2812.50 ; +C 55; N scripts-mordent; B -6359.99 -2812.50 6359.99 2812.50 ; +C 56; N scripts-prallprall; B -8969.97 -2812.50 8969.97 2812.50 ; +C 57; N scripts-prallmordent; B -8969.97 -2812.50 8969.97 2812.50 ; +C 58; N scripts-upprall; B -8969.97 -2812.50 8969.97 2812.50 ; +C 59; N scripts-downprall; B -8969.97 -2812.50 8969.97 2812.50 ; +C 60; N flags-u3; B -281.27 -17240.65 6940.84 281.27 ; +C 61; N flags-u4; B -281.27 -20053.15 6940.84 281.27 ; +C 62; N flags-u5; B -281.27 -24271.90 6940.84 281.27 ; +C 63; N flags-u6; B -281.27 -29896.90 6940.84 281.27 ; +C 64; N flags-d3; B -281.27 -281.27 7680.88 16396.93 ; +C 65; N flags-d4; B -281.27 -281.27 7680.88 17240.65 ; +C 66; N flags-d5; B -281.27 -281.27 7680.88 22021.93 ; +C 67; N flags-d6; B -281.27 -281.27 7680.88 24834.43 ; +C 68; N clefs-alto; B -5625.00 -11250.00 20937.50 11250.00 ; +C 69; N clefs-alto_change; B -4500.02 -9000.03 16750.08 9000.03 ; +C 70; N clefs-bass; B -2812.50 -14062.50 20250.03 5625.00 ; +C 71; N clefs-bass_change; B -2250.05 -11250.05 16200.04 4500.02 ; +C 72; N clefs-treble; B -4901.80 -16875.00 21021.40 28125.00 ; +C 73; N clefs-treble_change; B -4258.94 -13500.05 16479.68 22500.08 ; +C 74; N timesig-C4/4; B -10125.02 -5625.00 9562.48 5625.00 ; +C 75; N timesig-C2/2; B -10125.02 -7874.97 9562.48 7874.97 ; +C 76; N timesig-old4/4; B -9843.75 -4218.75 9843.75 4218.75 ; +C 77; N timesig-old2/2; B -9843.75 -5625.00 9843.75 5625.00 ; +C 78; N timesig-old3/2; B -9843.75 -4218.75 9843.75 4218.75 ; +C 79; N timesig-old6/4; B -9843.75 -7031.25 9843.75 7031.25 ; +C 80; N timesig-old9/4; B -9843.75 -7031.25 9843.75 7031.25 ; EndCharMetrics EndFontMetrics diff --git a/mf/out/feta26.afm b/mf/out/feta26.afm index 9e80ffba1f..9aec06ddc0 100644 --- a/mf/out/feta26.afm +++ b/mf/out/feta26.afm @@ -18,67 +18,69 @@ C 13; N accidentals-0; B 0.00 -9750.00 4333.33 9750.00 ; C 14; N accidentals--1; B -780.04 -3250.00 5200.03 13000.00 ; C 15; N accidentals--2; B -780.04 -3250.00 9424.99 13000.00 ; C 16; N accidentals-2; B 0.00 -3250.00 6500.00 3250.00 ; -C 17; N dots-dot; B 0.00 -1462.50 2924.99 1462.50 ; -C 18; N dots-repeatcolon; B 0.00 -3250.00 2924.99 3250.00 ; -C 19; N balls--1; B 0.00 -3575.03 13000.00 3575.03 ; -C 20; N balls--1l; B -3250.00 -650.04 16250.00 650.04 ; -C 21; N balls--2; B 0.00 -3575.03 13000.00 3575.03 ; -C 22; N balls--2l; B -3250.00 -650.04 16250.00 650.04 ; -C 23; N balls-0; B 0.00 -3575.03 12870.12 3575.03 ; -C 24; N balls-0l; B -3217.53 -650.04 16087.65 650.04 ; -C 25; N balls-1; B 0.00 -3575.03 8953.54 3575.03 ; -C 26; N balls-1l; B -2238.39 -650.04 11191.93 650.04 ; -C 27; N balls-2; B 0.00 -3575.03 8586.67 3575.03 ; -C 28; N balls-2l; B -2146.67 -650.04 10733.34 650.04 ; -C 29; N scripts-ufermata; B -8612.53 -487.53 8612.53 9425.08 ; -C 30; N scripts-dfermata; B -8612.53 -9425.08 8612.53 487.53 ; -C 31; N scripts-thumb; B -2600.00 -3250.00 2600.00 3250.00 ; -C 32; N scripts-sforzato; B -5849.96 -3250.00 5849.96 3250.00 ; -C 33; N scripts-staccato; B -975.07 -975.07 975.07 975.07 ; -C 34; N scripts-ustaccatissimo; B -1300.08 -200.00 1300.08 6500.10 ; -C 35; N scripts-dstaccatissimo; B -1300.08 -6500.10 1300.08 200.00 ; -C 36; N scripts-tenuto; B -3900.04 -455.03 3900.04 455.03 ; -C 37; N scripts-umarcato; B -3250.00 0.00 3250.00 7150.04 ; -C 38; N scripts-dmarcato; B -3250.00 -7150.04 3250.00 0.00 ; -C 39; N scripts-open; B -2600.00 -3250.00 2600.00 3250.00 ; -C 40; N scripts-stopped; B -3575.03 -3575.03 3575.03 3575.03 ; -C 41; N scripts-upbow; B -4225.02 0.00 4225.02 13520.10 ; -C 42; N scripts-downbow; B -4875.00 0.00 4875.00 8666.64 ; -C 43; N scripts-reverseturn; B -7109.38 -3441.18 7109.38 3441.18 ; -C 44; N scripts-turn; B -7109.38 -3441.18 7109.38 3441.18 ; -C 45; N scripts-trill; B -6500.00 0.00 6500.00 14625.00 ; -C 46; N scripts-upedalheel; B -3250.00 -3250.00 3250.00 4333.33 ; -C 47; N scripts-dpedalheel; B -3250.00 -4333.33 3250.00 3250.00 ; -C 48; N scripts-upedaltoe; B -3250.00 0.00 3250.00 9750.00 ; -C 49; N scripts-dpedaltoe; B -3250.00 -9750.00 3250.00 0.00 ; -C 50; N scripts-flageolet; B -3466.67 -3466.67 3466.67 3466.67 ; -C 51; N scripts-trilelement; B -4333.33 -3250.00 1698.62 3250.00 ; -C 52; N scripts-prall; B -7349.30 -3250.00 7349.30 3250.00 ; -C 53; N scripts-mordent; B -7349.30 -3250.00 7349.30 3250.00 ; -C 54; N scripts-prallprall; B -10365.28 -3250.00 10365.28 3250.00 ; -C 55; N scripts-prallmordent; B -10365.28 -3250.00 10365.28 3250.00 ; -C 56; N scripts-upprall; B -10365.28 -3250.00 10365.28 3250.00 ; -C 57; N scripts-downprall; B -10365.28 -3250.00 10365.28 3250.00 ; -C 58; N flags-u3; B -325.03 -19922.53 8020.51 325.03 ; -C 59; N flags-u4; B -325.03 -23172.53 8020.51 325.03 ; -C 60; N flags-u5; B -325.03 -28047.53 8020.51 325.03 ; -C 61; N flags-u6; B -325.03 -34547.53 8020.51 325.03 ; -C 62; N flags-d3; B -325.03 -325.03 8875.67 18947.57 ; -C 63; N flags-d4; B -325.03 -325.03 8875.67 19922.53 ; -C 64; N flags-d5; B -325.03 -325.03 8875.67 25447.57 ; -C 65; N flags-d6; B -325.03 -325.03 8875.67 28697.57 ; -C 66; N clefs-alto; B -6500.00 -13000.00 24194.44 13000.00 ; -C 67; N clefs-alto_change; B -5200.03 -10400.05 19355.70 10400.05 ; -C 68; N clefs-bass; B -3250.00 -16250.00 23400.04 6500.00 ; -C 69; N clefs-bass_change; B -2600.07 -13000.08 18720.08 5200.03 ; -C 70; N clefs-violin; B -5664.29 -19500.00 24291.40 32500.00 ; -C 71; N clefs-violin_change; B -4921.46 -15600.08 19043.21 26000.14 ; -C 72; N timesig-C4/4; B -11700.03 -6500.00 11049.99 6500.00 ; -C 73; N timesig-C2/2; B -11700.03 -9099.96 11049.99 9099.96 ; -C 74; N timesig-old4/4; B -11375.00 -4875.00 11375.00 4875.00 ; -C 75; N timesig-old2/2; B -11375.00 -6500.00 11375.00 6500.00 ; -C 76; N timesig-old3/2; B -11375.00 -4875.00 11375.00 4875.00 ; -C 77; N timesig-old6/4; B -11375.00 -8125.00 11375.00 8125.00 ; -C 78; N timesig-old9/4; B -11375.00 -8125.00 11375.00 8125.00 ; +C 17; N accidentals-); B 0.00 -6500.00 3900.04 6500.00 ; +C 18; N accidentals-(; B -3900.04 -6500.00 0.00 6500.00 ; +C 19; N dots-dot; B 0.00 -1462.50 2924.99 1462.50 ; +C 20; N dots-repeatcolon; B 0.00 -3250.00 2924.99 3250.00 ; +C 21; N balls--1; B 0.00 -3575.03 13000.00 3575.03 ; +C 22; N balls--1l; B -3250.00 -650.04 16250.00 650.04 ; +C 23; N balls--2; B 0.00 -3575.03 13000.00 3575.03 ; +C 24; N balls--2l; B -3250.00 -650.04 16250.00 650.04 ; +C 25; N balls-0; B 0.00 -3575.03 12870.12 3575.03 ; +C 26; N balls-0l; B -3217.53 -650.04 16087.65 650.04 ; +C 27; N balls-1; B 0.00 -3575.03 8953.54 3575.03 ; +C 28; N balls-1l; B -2238.39 -650.04 11191.93 650.04 ; +C 29; N balls-2; B 0.00 -3575.03 8586.67 3575.03 ; +C 30; N balls-2l; B -2146.67 -650.04 10733.34 650.04 ; +C 31; N scripts-ufermata; B -8612.53 -487.53 8612.53 9425.08 ; +C 32; N scripts-dfermata; B -8612.53 -9425.08 8612.53 487.53 ; +C 33; N scripts-thumb; B -2600.00 -3250.00 2600.00 3250.00 ; +C 34; N scripts-sforzato; B -5849.96 -3250.00 5849.96 3250.00 ; +C 35; N scripts-staccato; B -975.07 -975.07 975.07 975.07 ; +C 36; N scripts-ustaccatissimo; B -1300.08 -200.00 1300.08 6500.10 ; +C 37; N scripts-dstaccatissimo; B -1300.08 -6500.10 1300.08 200.00 ; +C 38; N scripts-tenuto; B -3900.04 -455.03 3900.04 455.03 ; +C 39; N scripts-umarcato; B -3250.00 0.00 3250.00 7150.04 ; +C 40; N scripts-dmarcato; B -3250.00 -7150.04 3250.00 0.00 ; +C 41; N scripts-open; B -2600.00 -3250.00 2600.00 3250.00 ; +C 42; N scripts-stopped; B -3575.03 -3575.03 3575.03 3575.03 ; +C 43; N scripts-upbow; B -4225.02 0.00 4225.02 13520.10 ; +C 44; N scripts-downbow; B -4875.00 0.00 4875.00 8666.64 ; +C 45; N scripts-reverseturn; B -7109.38 -3441.18 7109.38 3441.18 ; +C 46; N scripts-turn; B -7109.38 -3441.18 7109.38 3441.18 ; +C 47; N scripts-trill; B -6500.00 0.00 6500.00 14625.00 ; +C 48; N scripts-upedalheel; B -3250.00 -3250.00 3250.00 4333.33 ; +C 49; N scripts-dpedalheel; B -3250.00 -4333.33 3250.00 3250.00 ; +C 50; N scripts-upedaltoe; B -3250.00 0.00 3250.00 9750.00 ; +C 51; N scripts-dpedaltoe; B -3250.00 -9750.00 3250.00 0.00 ; +C 52; N scripts-flageolet; B -3466.67 -3466.67 3466.67 3466.67 ; +C 53; N scripts-trilelement; B -4333.33 -3250.00 1698.62 3250.00 ; +C 54; N scripts-prall; B -7349.30 -3250.00 7349.30 3250.00 ; +C 55; N scripts-mordent; B -7349.30 -3250.00 7349.30 3250.00 ; +C 56; N scripts-prallprall; B -10365.28 -3250.00 10365.28 3250.00 ; +C 57; N scripts-prallmordent; B -10365.28 -3250.00 10365.28 3250.00 ; +C 58; N scripts-upprall; B -10365.28 -3250.00 10365.28 3250.00 ; +C 59; N scripts-downprall; B -10365.28 -3250.00 10365.28 3250.00 ; +C 60; N flags-u3; B -325.03 -19922.53 8020.51 325.03 ; +C 61; N flags-u4; B -325.03 -23172.53 8020.51 325.03 ; +C 62; N flags-u5; B -325.03 -28047.53 8020.51 325.03 ; +C 63; N flags-u6; B -325.03 -34547.53 8020.51 325.03 ; +C 64; N flags-d3; B -325.03 -325.03 8875.67 18947.57 ; +C 65; N flags-d4; B -325.03 -325.03 8875.67 19922.53 ; +C 66; N flags-d5; B -325.03 -325.03 8875.67 25447.57 ; +C 67; N flags-d6; B -325.03 -325.03 8875.67 28697.57 ; +C 68; N clefs-alto; B -6500.00 -13000.00 24194.44 13000.00 ; +C 69; N clefs-alto_change; B -5200.03 -10400.05 19355.70 10400.05 ; +C 70; N clefs-bass; B -3250.00 -16250.00 23400.04 6500.00 ; +C 71; N clefs-bass_change; B -2600.07 -13000.08 18720.08 5200.03 ; +C 72; N clefs-treble; B -5664.29 -19500.00 24291.40 32500.00 ; +C 73; N clefs-treble_change; B -4921.46 -15600.08 19043.21 26000.14 ; +C 74; N timesig-C4/4; B -11700.03 -6500.00 11049.99 6500.00 ; +C 75; N timesig-C2/2; B -11700.03 -9099.96 11049.99 9099.96 ; +C 76; N timesig-old4/4; B -11375.00 -4875.00 11375.00 4875.00 ; +C 77; N timesig-old2/2; B -11375.00 -6500.00 11375.00 6500.00 ; +C 78; N timesig-old3/2; B -11375.00 -4875.00 11375.00 4875.00 ; +C 79; N timesig-old6/4; B -11375.00 -8125.00 11375.00 8125.00 ; +C 80; N timesig-old9/4; B -11375.00 -8125.00 11375.00 8125.00 ; EndCharMetrics EndFontMetrics diff --git a/scripts/ly2dvi-old.sh b/scripts/ly2dvi-old.sh deleted file mode 100644 index b2e0330aaa..0000000000 --- a/scripts/ly2dvi-old.sh +++ /dev/null @@ -1,1005 +0,0 @@ -#!/bin/sh -# -# Script to make a LaTeX file for Lilypond -# -# Written by Jan Arne Fagertun -# Sat Nov 22 22:26:43 CET 1997 -# -# $Id: ly2dvi.sh,v 1.16 1998/05/08 21:18:34 janaf Exp $ -# -# Original LaTeX file made by Mats Bengtsson, 17/8 1997 -# - -VERSION="0.12.jcn1" -NAME=ly2dvi.sh -IDENTIFICATION="$NAME $VERSION" -NOW=`date` -echo "$IDENTIFICATION" 1>&2 - -# TODO: -# prevent orphaned "Lily is here" strings - -# NEWS - -# 0.12.jcn1 -# - mudelaDefs really fixed (sorry, PC) - -# 0.12 -# - -S/--sourcedir switch - -# -#0.11.jcn3 -# - mudelaDefs fixes, (thanks PC) -#0.11.jcn2 -# - pass -I, --include to Lily -# - bf: split $LILYINCLUDE and try all dirs -# - bf: geometry left/top -# -#0.11.pc -# - fix backslash gobbling, reduce number of separate processes used -# - require readable rc files, allow rc file in /usr/local/share/lilypond/lilyrc -# - use latex path, not tex path -# - Don't override if kpsepath returns non-NULL -# - Don't clobber x.tex if it wasn't created by ly2dvi -# -# -#0.11.jcn1 -# - find .fly files too -# -#0.11.hwn1 -# - height vs heigth -# - robustification: give \nonstopmode as LaTeX arg; no hanging if no TeX file. -# - robustification: notice failed cp. - -#0.11 -# - more papersizes (thanks Han-Wen) - don't expect LaTeX to accept all... -# - -W,--Width= : set paper width (points) -# - -H,--Height= : set paper height (points) -# - -H and -W is used only when an unknown papersize is to be specified, -# and has to be combined with a papersize option known to LaTeX -#NB! - -F,--headers= : name of additional LaTeX headers input file. -#NB! Changed from -H to -F -# - -d,--dependencies : passed to lilypond - - -#0.10.jcn1 -# - HEIGHT -> HEIGHT -# - vertical margins (for a4), same on both sides -# - textheight from lilypond output file (mudelapapertextheight) -# - piece titling -# - mudelapiece, mudelaopus -# -#0.10 -# - -K,--keeplilypond : Keep lilypond output files (default delete) -# - -k,--keeply2dvi : Keep ly2dvi output files (default delete) -# - -L,--landscape : Set landscape orientation -# - -N,--nonumber : Turn off page numbering (\pagestyle{empty}) -# - Could not reinsert "\usepackage[T1]{fontenc}" because -# "los-toros" won't work with it -# - Ekstra LaTeX headers from input file -#0.9.hwn1 -# - option to remove output of lily -# 0.9 -# - Trap Lilypond abort -# - Replaced "\usepackage[T1]{fontenc}" with -# \usepackage[latin1]{inputenc} (takk, Mats) -# - Removed "()" around "\LilyIdString" (Janne didn't want it) -# 0.8 - Trap Lilypond segmentation fault -# - Function for cleanup -# - Trap line -# - More human-readable variables -# - Some logics concerning rc-files -# 0.7 -# - Improved Lilypond error checking -# - Output orientation (landscape...). Overrides mudela file -# variable orientation="landscape"; -# - Paper width and height put into variables (only A4!) -# - Adjusted top margin to default..... -# -#TODO -# - Include more papersizes. -# - Manual page....... -# 0.6.jaf2 -# - LILYINCLUDE update -# -# 0.6.hwn1 -# - handle LILYINCLUDE -# - --output -# -# 0.6 -# - Source rc-files, if present. Files are: -# /usr/local/share/lilyrc /etc/lilyrc $HOME/.lilyrc ./.lilyrc -# - tee output from Lilypond -# - Handles margins for A4 paper (equal on both sides) -# - new option -s (--separate) for one LaTeX run per file, -# else all files are run together -# -# 0.5 -# - More useful ("two-level") debug. -# - The Q&D hack to find file names and not handling \include -# is replaced by grabbing output file names from Lilypond. -# = Detects multiple output files - adds them when running -# LaTeX. -# - Works with multiple input files - no matter if they are -# (a mix of) input to or output from Lilypond. -# -#TODO -# - Still no margins handling. -# - We have to discuss how to handle multiple output files -# from Lilypond - 'ly2dvi standchen' gives a rather odd -# result.... - -# 0.4.1 -# - Always exit after printing help info -# 0.4 -# - Changes to ensure for more strict grep'ing of parameters -# Thanks to from G.B.Stott@bolton.ac.uk -# - More efficient use of sed -e 's///' -e 's///' -# Thanks to Johan Vromans and GBS -# - Ask tex for location of titledefs.tex (Thanks to JV) -# - Accept only exact match of "\def\mudelacomposer{" -# (or whatever mudela* defined in titledefs.tex) -# - Even more efficient use of sed (Thanks to JV) -# - Default file name for single output file implemented. -# - Moved help into function - finally included from 0.1.jcn1 -# -#TODO -# - Still doesn't handle \include -# - The Q&D for finding output file name from the sequence of -# \paper \output \midi \output really needs to be looked at. -# I have improved it a lot, but it's only capable of finding -# one (the last) file name. -# Well, I have to rewrite this entirely to handle \include, -# then I can fix it. -# - Still no margins handling. -# -#WARNING -# - Some lines of output from lilypond do NOT start -# at first character position, therefore I have removed "^" -# in sed'ing and grep'ing. - -# 0.3.hwn1 -# - add "Creator: " line to output -# -# 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 - -# -# Clean up -# -cleanup() { - if [ "$KEEP_LY2DVI_OUTPUT" != "Y" ] - then - [ -n "$LatF" -a -f "$LatF" ] && rm -f $LatF - [ -n "$LOGFILE" -a -f "$LOGFILE" ] && rm -f $LOGFILE - [ -n "$FN" ] && rm -f $FN.* - for F in *$$* $TMP/*$$* - do - rm -f $F - done - fi - if [ "$KEEP_LILY_OUTPUT" != "Y" ] - then - for F in $LILY_OUTPUT_FILES - do - [ -f $F ] && rm -f $F - done - fi -} - -# -# print usage -# -help() { - cat << EOF -Generate dvi file from mudela or lilypond output -Usage: $0 [OPTION]... [FILE]... - -Options: - -D,--debug increase verbosity - -F,--headers= name of additional LaTeX headers file - -H,--Height= set paper height (points) (see manual page) - -I,--include=DIR add DIR to search path of LilyPond - -K,--keeplilypond keep lilypond output files - -L,--landscape set landscape orientation - -N,--nonumber switch off page numbering - -O,--orientation= set orientation (obsolete - use -L instead) - -W,--Width= set paper width (points) (see manual page) - -d,--dependencies tell lilypond make a dependencies file - -h,--help this help text - -k,--keeply2dvi keep ly2dvi output files - -l,--language= give LaTeX language (babel) - -o,--output= set output directory - -p,--papersize= give LaTeX papersize (eg. a4) - -s,--separate run all files separately through LaTeX - -S,--sourcedir set sourcedir - - files may be (a mix of) input to or output from lilypond(1) -EOF -} - - -# -# SVr4 echo swallows backslashes, and there's no way to turn it off. -# Therefore use Echo whenever backslashes may be important. -# printf is in the posix.2 standard -- which means it's in -# all modern shells. -# -Echo() { - printf "%s\n" "$@" -} - -# -setPaperZize() { -case "$PAPERSIZE" in - a0*) - PWIDTH=2389 - PHEIGHT=3381 - PAPERSIZE=a0paper - ;; - a1|a1p*) - PWIDTH=1690 - PHEIGHT=2389 - PAPERSIZE=a1paper - ;; - a2*) - PWIDTH=1194 - PHEIGHT=1690 - PAPERSIZE=a2paper - ;; - a3*) - PWIDTH=845 - PHEIGHT=1194 - PAPERSIZE=a3paper - ;; - a4*) - PWIDTH=597 - PHEIGHT=845 - PAPERSIZE=a4paper - ;; - a5*) - PWIDTH=423 - PHEIGHT=597 - PAPERSIZE=a5paper - ;; - a6*) - PWIDTH=298 - PHEIGHT=423 - PAPERSIZE=a6paper - ;; - a7*) - PWIDTH=211 - PHEIGHT=298 - PAPERSIZE=a7paper - ;; - a8*) - PWIDTH=305 - PHEIGHT=211 - PAPERSIZE=a8paper - ;; - a9*) - PWIDTH=105 - PHEIGHT=305 - PAPERSIZE=a9paper - ;; - a10*) - PWIDTH=74 - PHEIGHT=105 - PAPERSIZE=a10paper - ;; - b0*) - PWIDTH=2847 - PHEIGHT=4023 - PAPERSIZE=b0paper - ;; - b1*) - PWIDTH=2012 - PHEIGHT=2847 - PAPERSIZE=b1paper - ;; - b2*) - PWIDTH=1423 - PHEIGHT=2012 - PAPERSIZE=b2paper - ;; - b3*) - PWIDTH=1006 - PHEIGHT=1423 - PAPERSIZE=b3paper - ;; - b4*) - PWIDTH=712 - PHEIGHT=1006 - PAPERSIZE=b4paper - ;; - b5*) - PWIDTH=503 - PHEIGHT=712 - PAPERSIZE=b5paper - ;; - archA) - PWIDTH=650 - PHEIGHT=867 - ;; - archB) - PWIDTH=867 - PHEIGHT=1301 - ;; - archC) - PWIDTH=1301 - PHEIGHT=1734 - ;; - archD) - PWIDTH=1734 - PHEIGHT=2602 - ;; - archE) - PWIDTH=2602 - PHEIGHT=3469 - ;; - flsa|flse) - PWIDTH=614 - PHEIGHT=940 - ;; - halfletter) - PWIDTH=397 - PHEIGHT=614 - ;; - ledger) - PWIDTH=1229 - PHEIGHT=795 - ;; - legal) - PWIDTH=614 - PHEIGHT=1012 - ;; - letter) - PWIDTH=614 - PHEIGHT=795 - ;; - note) - PWIDTH=542 - PHEIGHT=723 - ;; - *) - echo "" - echo $0": unknown papersize -- "$PAPERSIZE - echo "" - ;; -esac -} - -doRcFiles() -{ -# -# RC-files ? -# -for D in /usr/local/share/ /usr/local/share/lilypond/ /etc/ $HOME/. ./. -do - RCfile=$D"lilyrc" - [ -r $RCfile ] && . $RCfile -done -fORI=$ORIENTATION -fLNG=$LANGUAGE -fPSZ=$PAPERSIZE -fLHF=$LATEXHF -unset ORIENTATION LANGUAGE PAPERSIZE LATEXHF -} - - - -# -# Trap function (cleanup) -# - - - -trap cleanup 0 9 15 - - - -# -# Various defaults -# -[ -z "$TMP" ] && TMP=/tmp -if [ ! -d $TMP ] -then - $debug_echo $IDENTIFICATION": temporary directory "$TMP" not found, set to /tmp" - TMP=/tmp -fi -LOGFILE=$TMP/lilylog.$$ # Logfile for lilypond -PAPERSIZE=a4 # Default papersize name -PWIDTH=597 # Default paperwidth -PHEIGHT=845 # Default paperheight -PNUM="%" # Page numbering on -LILYOPTS="" # Options to lilypond -SOURCEDIR="" -LILYPOND_EXECUTABLE=lilypond -doRcFiles - - - -# Keywords defined in titledefs.tex -# -TF="`kpsewhich -n latex tex titledefs.tex`" -MU_DEF="" -if [ -r "${TF:=/usr/local/share/texmf/tex/lilypond/titledefs.tex}" ] -then - MU_DEF=`sed -n -e 's/.*newcommand\*{.\(mudela[^}]*\)}.*$/\1/p' "$TF"` -fi - -: "${MU_DEF:=mudelatitle mudelasubtitle mudelacomposer \ - mudelameter mudelaopus mudelaarranger mudelapiece \ - mudelapoet mudelainstrument \ - }" - -# -# debugging -# -debug_echo=: -# -# All files in one LaTeX run -# -SEPFILE=N -# -# Find command line options and switches -# -# "x:" x takes argument -# -switches="DF:H:I:KLNO:W:dhkl:o:p:S:s\?" -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 ) - [ $debug_echo = echo ] && set -x - debug_echo=echo - ;; - F ) - LATEXHF=$OPTARG - ;; - H ) - PHEIGHT=$OPTARG - ;; - I ) - LILYOPTS="$LILYOPTS -I $OPTARG" - LILYINCLUDE="$LILYINCLUDE:$OPTARG" - ;; - K ) - KEEP_LILY_OUTPUT=Y - ;; - L ) - ORIENTATION=landscape - ;; - O ) - ORIENTATION=$OPTARG - ;; - N ) - PNUM="\pagestyle{empty}" - ;; - W ) - PWIDTH=$OPTARG - ;; - d ) - LILYOPTS=$LILYOPTS" -d" - ;; - h ) - help; - exit 0 - ;; - k ) - KEEP_LY2DVI_OUTPUT=Y - ;; - l ) - LANGUAGE=$OPTARG - ;; - o ) - OUTPUTDIR=$OPTARG - ;; - p ) - PAPERSIZE=$OPTARG - ;; - s ) - SEPFILE=Y - ;; - S ) - SOURCEDIR=$OPTARG - ;; - \? ) - help; - exit -1 - ;; - # a long option! - -) - $debug_echo "long option: \`$OPTARG'" - case "$OPTARG" in - He*|-He*) - PHEIGHT"`expr \"$OPTARG\" ':' '[^=]*=\(.*\)'`"= - ;; - W*|-W*) - PWIDTH="`expr \"$OPTARG\" ':' '[^=]*=\(.*\)'`" - ;; - dep*|-dep*) - LILYOPTS="$LILYOPTS -d" - ;; - d*|-d*) - [ $debug_echo = echo ] && set -x - debug_echo=echo - ;; - hea*|-hea*) - LATEXHF="`expr \"$OPTARG\" ':' '[^=]*=\(.*\)'`" - ;; - h*|-h*) - help; - exit 0 - ;; - i*|-i*) - dir="`expr \"$OPTARG\" ':' '[^=]*=\(.*\)'`" - LILYOPTS="$LILYOPTS --include=$dir" - LILYINCLUDE="$LILYINCLUDE:$dir" - ;; - keepli*|-keepli*) - KEEP_LILY_OUTPUT=Y - ;; - k*|-k*) - KEEP_LY2DVI_OUTPUT=Y - ;; - land*|-land*) - ORIENTATION=landscape - ;; - lang*|-lang*) - LANGUAGE="`expr \"$OPTARG\" ':' '[^=]*=\(.*\)'`" - ;; - n*|-n*) - PNUM="\pagestyle{empty}" - ;; - or*|-or*) - ORIENTATION="`expr \"$OPTARG\" ':' '[^=]*=\(.*\)'`" - ;; - ou*|-ou*) - OUTPUTDIR="`expr \"$OPTARG\" ':' '[^=]*=\(.*\)'`" - ;; - p*|-p*) - PAPERSIZE="`expr \"$OPTARG\" ':' '[^=]*=\(.*\)'`" - ;; - separa*|-sep*) - SEPFILE=Y - ;; - sourcedir*|-sourcedir*) - SOURCEDIR=$OPTARG - ;; - *|-*) - echo "$0: illegal option -- \"$OPTARG\"" - help; - exit -1 - ;; - esac - esac -done -shift `expr $OPTIND - 1` - -if [ "$SOURCEDIR" != "" ]; then -# apparently MakeTeXTFM can't handle relative dirs - SOURCEDIR=`cd $SOURCEDIR; pwd` - LILYINCLUDE="$SOURCEDIR/init:$SOURCEDIR/mf/out:$LILYINCLUDE" - TEXINPUTS="$SOURCEDIR/tex:$TEXINPUTS:" - MFINPUTS="$SOURCEDIR/mf:$MFINPUTS:" - LILYPOND_EXECUTABLE="$SOURCEDIR/lily/out/lilypond" - export MFINPUTS LILYPOND_EXECUTABLE TEXINPUTS SOURCEDIR -fi - -# -# Input file name -# -if [ "$1" = "" ] -then - help - $debug_echo "$IDENTIFICATION: No input file name given" - exit 1 -fi -# regexp_quote -- quote a string as a regular expression for egrep or sed -regexp_quote(){ - Echo "$@" | sed 's/\([]\[\.*?+^$]\)/\\\1/g' -} -# -# -mudelaDefs(){ -# Include \def\mudela-definitions -# The aim here is to pick up the definition for the -# current file, then any other file. -# -mudelatmp=$TMP/mudelaDefs$$ -# Use `cat' to prevent filenames being prepended -# -cat "$File" $OF | fgrep "$MU_DEF" > $mudelatmp -for L in $MU_DEF -do - # This converts \def\mudelatitle{fred} - # to \mudelatitle{fred} or to - # \def\mudelatitle{fred} - # and stops after the first one found. - sed -n '/\\def\\'"$L"'{\([^}]*\)}.*$/{ - s//'"`regexp_quote \"$1\"`"'\\'"$L"'{\1}%/p - q - }' $mudelatmp >> $LatF -done -rm -f $mudelatmp -} -# -# -startFile(){ -# -# LaTeX file name -# -BN=`basename "$File" .tex` -FN="$BN.$$" -if [ "$KEEP_LY2DVI_OUTPUT" != "Y" ] -then - LatF="$TMP/$FN.tex" -else - LatF="$FN.tex" -fi -# -# Find: -# paper size (PAPERSIZE, overridden by command line option -p) -# paper orientation (ORIENTATION, overridden by option -o) -# language (LANGUAGE, overridden by option -l) -# textwidth -# -eval `sed -n \\ - -e 's/\\\\def\\\\mudelalanguage{\([^}]*\).*$/fLNG=\1;/p' \\ - -e 's/\\\\def\\\\mudelalatexheaders{\([^}]*\).*$/fLHF=\1;/p' \\ - -e 's/\\\\def\\\\mudelaorientation{\([^}]*\).*$/fORI=\1;/p' \\ - -e 's/\\\\def\\\\mudelapaperlinewidth{\([^}]*\).*$/TWN=\1;/p' \\ - -e 's/\\\\def\\\\mudelapapertextheight{\([^}]*\).*$/THN=\1;/p' \\ - -e 's/\\\\def\\\\mudelapapersize{\([^}]*\).*$/fPSZ=\1;/p' \\ - "$File"` -# -if [ -z "$LATEXHF" ] -then - LATEXHF="$fLHF" -fi -LLHF="%" -if [ -n "$LATEXHF" ] -then - [ -f "$LATEXHF" ] && LLHF="\input{$LATEXHF}" -fi -# -if [ -z "$PAPERSIZE" ] -then - PAPERSIZE="$fPSZ" -fi -if [ -n "$PAPERSIZE" ] -then - setPaperZize - PAPEROPT="$PAPERSIZE" -fi -# -if [ -z "$ORIENTATION" ] -then - ORIENTATION="$fORI" -fi -if [ -n "$ORIENTATION" ] -then - if [ -z "$PAPEROPT" ] - then - PAPEROPT="$ORIENTATION" - else - PAPEROPT="$PAPEROPT,$ORIENTATION" - fi -fi -# -if [ -n "$PAPEROPT" ] -then - PAPER="[$PAPEROPT]" -fi -# -if [ -z "$LANGUAGE" ] -then - LANGUAGE="$fLNG" -fi -if [ -n "$LANGUAGE" ] -then - LLNG="\usepackage[$LANGUAGE]{babel}" -else - LLNG="%" -fi - -# -# Find textwidth -# -if [ -n "$TWN" ] -then - TW="$TWN" - case "$TW" in - *mm) - ;; - *cm) - ;; - *pt) - ;; - *) - TW="${TW}pt" - ;; - esac - $debug_echo "Text width = $TW" -fi -TWp=`Echo $TW | sed -e 's/\..*$//'` -PWp="$PWIDTH" -# -# Find textheight -# -if [ -n "$THN" ] -then - TH=$THN - case $TH in - *mm) - ;; - *cm) - ;; - *pt) - ;; - *) - TH="${TH}pt" - ;; - esac - $debug_echo "Text height = $TH" -fi -THp="`echo $TH | sed -e 's/\..*$//'`" -PHp="$PHEIGHT" -if [ "$ORIENTATION" = "landscape" ] -then - PWp="$PHEIGHT" - PHp="$PWIDTH" -fi -HMARG="`expr '(' $PWp - $TWp ')' / 2`"pt -$debug_echo "Text left = $HMARG" -VMARG="`expr '(' $PHp - $THp ')' / 2`"pt -$debug_echo "Text top = $VMARG" -# -# Geometry: /var/lib/texmf/latex/geometry/geometry.dvi -# -# -# Write LaTeX file -# -cat << EOF > $LatF -% Creator: $IDENTIFICATION -% Automatically generated from $IF, $NOW - -\documentclass$PAPER{article} - -$LLNG -\usepackage{geometry} -\usepackage[latin1]{inputenc} -%\usepackage[T1]{fontenc} -$PNUM -%\addtolength{\oddsidemargin}{-1cm} -%\addtolength{\topmargin}{-1cm} -%\setlength{\textwidth}{$TW} -%\setlength{\textheight}{$TH} -\geometry{width=$TW, left=$HMARG, height=$TH, top=$VMARG} -\input lilyponddefs -\input titledefs -$LLHF -\begin{document} -EOF -mudelaDefs -cat << EOF >> $LatF -\cmrtwenty% ugh -\makelilytitle -EOF -} -nextFile(){ -cat << EOF >> $LatF -\def\theopus{}% -\def\thepiece{}% -\def\mudelaopus{}% -\def\mudelapiece{}% -EOF -mudelaDefs "\\def" -cat << EOF >> $LatF -\def\theopus{\mudelaopus}% ugh -\def\thepiece{\mudelapiece}% -\makelilypiecetitle -EOF -} -# -# Conclusion -# -endFile(){ -cat << EOF >> $LatF -\vfill\hfill{\LilyIdString} -\end{document} -EOF -# -# Run LaTeX -# -latex '\nonstopmode \input '$LatF || exit 5 -# -# Rename dvi file -# -if [ -f $FN.dvi ] -then - RESULT="$BN.dvi" - [ -n "$OUTPUTDIR" ] && RESULT="$OUTPUTDIR/$RESULT" - - cp "$FN.dvi" "$RESULT" || exit 5 -fi -# -# Output some info -# -cat << EOF - -$IDENTIFICATION: dvi file name is $RESULT - -EOF -} - -# ugh. GF is side-effect. -findInput() { -# should check for LILYINCLUDE - OIFS="$IFS" - IFS=':' - x=`echo $LILYINCLUDE | sed "s!:! !g"` - IFS="$OIFS" - for lypath in . $x - do - if [ -f "$lypath/$1" ] - then - GF="$lypath/$1" - return - fi - - if [ -f "$lypath/$1.ly" ] - then - GF="$lypath/$1.ly" - return - fi - if [ -f "$lypath/$1.fly" ] - then - GF="$lypath/$1.fly" - return - fi - done - $debug_echo "$IDENTIFICATION: Input file \"$GF\" not found" - echo "$NAME: Input file \"$GF\" not found" 1>&2 - exit 2 -} -# -# Loop through all files -# - -LILY_OUTPUT_FILES= - -for GF -do - findInput $GF - - # - # Check whether the file is input to or output from lilypond - # - L1=`head -1 $GF` - OP=`echo $L1 | grep "^% Creator: GNU LilyPond"` - if [ -n "$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/.*{//' -e 's/}*.$//'` - # - # Check if source file exists - # - if [ ! -f $IF ] - then - $debug_echo $IDENTIFICATION": Mudela file not found." - TW=15.5cm - TH=25.0cm - fi - else - $debug_echo $IDENTIFICATION": Mudela file name not found." - TW=15.5cm - TH=25.0cm - fi - else - # - # I have to assume this is the lilypond input file - # Find output file name, if defined - # - IF=$GF - # - # Run lilypond - # Grab output file names - # - $debug_echo "lilypond "$LILYOPTS $IF - - $LILYPOND_EXECUTABLE $LILYOPTS $IF 2>&1 | tee $LOGFILE - OF="`sed -n -e 's/TeX output to \([^\.]*\.tex\)\.\.\.$/\1/p' $LOGFILE`" - $debug_echo "==> $OF" - LILY_OUTPUT_FILES="$LILY_OUTPUT_FILES $OF" - STATUS=`egrep -i "error|segmentation|abort" $LOGFILE` - echo $STATUS - if [ ! -z "$STATUS" ] - then - exit 10 - fi - fi - # - # "Spin through" all the files - # - for File in $OF - do - $debug_echo "--- "$File - # - # Check if output file is generated - # - if [ ! -f "$File" ] - then - $debug_echo "$IDENTIFICATION: hmm, I could not find the output file $File" - exit 4 - fi - # - # Is this the first file? - # - if [ -z "$FFile" ] - then - FFile="$File" - startFile - else - nextFile - fi - cat << EOF >> $LatF -\input{$File} -EOF - if [ $SEPFILE = Y ] - then - FFile="" - endFile - fi - done -done -if [ $SEPFILE = N ] -then - endFile -fi -# -# OK - finished -# diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index bdf89706bf..02b6f9a5e5 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -876,8 +876,7 @@ class Properties: def getLilyopts(): inc = '' if len(Props.get('include')) > 0: -# inc = '-I ' + string.join(Props.get('include'),os.pathsep) - inc = '-I ' + string.join(Props.get('include'), ' -I ') + inc = string.join (map (lambda x: '-I "%s"' % x, Props.get('include'))) else: if Props.get('dependencies'): @@ -1018,13 +1017,24 @@ def main(): infile.close() if type == 'source': cmd = 'lilypond %s %s 2>&1' % (getLilyopts(), file) - fd = os.popen( cmd , 'r' ) + sys.stderr.write ('executing: %s\n'% cmd) + + fd = os.popen(cmd , 'r') log = '' - line=fd.readline() - while line: - log = log + line - sys.stderr.write( line ) - line=fd.readline() + + s = fd.readline() + while len(s) > 0: + sys.stderr.write (s) + sys.stderr.flush () + log = log + s + s = fd.readline () + if 0: + s = fd.read (1) + while len(s) > 0: + sys.stderr.write (s) + sys.stderr.flush () + s = fd.read (1) + log = log + s stat = fd.close() if stat: sys.exit('ExitBadLily', cmd ) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 8041121141..102e364f99 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -160,7 +160,11 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [ LIBS="-lguile $LIBS" AC_DEFINE(HAVE_LIBGUILE), \ AC_CHECK_LIB(readline, readline) \ AC_CHECK_LIB(dl, dlopen) \ - AC_CHECK_LIB(guile, scm_boot_guile)) + AC_CHECK_LIB(socket, socket)\ + AC_CHECK_LIB(termcap,tgetent)\ + AC_CHECK_LIB(m, fabs)\ + AC_CHECK_LIB(guile, scm_boot_guile)\ + ) ]) AC_DEFUN(AC_STEPMAKE_INIT, [ diff --git a/tex/lilyponddefs.ps b/tex/lilyponddefs.ps deleted file mode 100644 index e69de29bb2..0000000000 -- 2.39.5