+\bo Anthony Fok <foka@gpu.srv.ualberta.ca>, debian
package: make/debian/*
- +
\bo Franc,ois Pinard <pinard@iro.umontreal.ca>, Neil
- Jerram <nj104@cus.cam.ac.uk>. Documentation/Vocab*
+ +
\bo Franc,ois Pinard <pinard@iro.umontreal.ca>,
+ Documentation/Vocab*, internationalization stuff
+
+ +\bo Neil Jerram <nj104@cus.cam.ac.uk>.
+ Documentation/Vocab*
Your name could be here! If you want to help, then take a
look at the SMALLISH PROJECTS section of in the file _\bT_\bO_\bD_\bO.
[And of course we sincerely thank J.S.Bach, F.Schubert, T.
Merula and W.A.Mozart for their beautiful music]
+
+
+
+21/Oct/97 LilyPond 0.1.25 1
+
+
+
+
+
+AUTHORS(1) LilyPond documentation AUTHORS(1)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-10/Oct/97 LilyPond 0.1.24 1
+21/Oct/97 LilyPond 0.1.25 2
=item *
-Franc,ois Pinard <pinard@iro.umontreal.ca>, Neil Jerram
-<nj104@cus.cam.ac.uk>. Documentation/Vocab*
+Franc,ois Pinard <pinard@iro.umontreal.ca>, Documentation/Vocab*,
+internationalization stuff
+
+=item *
+
+Neil Jerram <nj104@cus.cam.ac.uk>. Documentation/Vocab*
=back
=item A set of music fonts
-Preferably in Metafont, suited to both screen display and use on
-paper.
+In development, the Feta font.
=item A typesetting engine
+In development, included in LilyPond.
A system with rules on how to set properties of items to be printed
-(up/down directions, breaking, dimensions, etc) LilyPond provides one,
-but it is not (yet) suited to interactive typesetting
+(up/down directions, breaking, dimensions, etc)
+It should be suited to interactive typesetting (so, incremental
+algorithms are needed)
=item A display engine
=item An ASCII language
-In development, LilyPond has a language. (See over there for goals)
+In development, LilyPond has a language.
Having an ASCII format which enables urtext, and easy sharing (via
mail and news forums) encourages cooperation and exchange of music.
=item A printing engine
-Maybe to be merged with the display system.
+In development, included in LilyPond.
=item An input system
(difficult) A system to generate accompaniments, figured bass,
automatic accompaniment, etc.
+=item A performing system
+
+A system which can play credible performances of abstract music
+representations. LilyPond has a bare bones system, but it cannot
+(yet) be described as "credible".
=back
=back
-=head1 TASKS (SHORT TERM)
-
-=over 4
-
-=item *
-
-Think about interfaces for components.
-
-=item *
-
Find sponsors. This project will take a long time, and in its infant
stages, having a hard and small core which does a lot of work, is more
efficient than lots of people doing small subprojects. Finanicial
support would be desirable.
-=back
-
-
=head1 HISTORY
[I. A very thorough overview of engraving practices of various
craftsmen. It includes detailed specs of characters, dimensions etc.
-II. a thorough overview of a (by now antiquated) automated system
-called Ikarus; EDV Means e(lektronischen) D(aten)v(erarbeitung),
-electronic data processing HWN]
+II. a thorough overview of a anonymous (by now antiquated) automated
+system. EDV Means e(lektronischen) D(aten)v(erarbeitung), electronic
+data processing HWN]
Maxwell Weaner and Walter Boelke, Standard Music Notation Practice,
revised edition by Arnold Broido and Daniel Dorff. Music Publisher's
The University of Colorado Music Engraving page.
http://obenamots.cc.colorado.edu/Musicpress/engraving.html
+[Webpages about engraving (designed with finale users in mind) (sic) HWN]
+
Anthony Donato. Preparing Music Manuscript. Englewood Cliffs:
Prentice-Hall, 1963.
Notation editor on Acorn machines. Their developers call it ``best
notation program available''.
-=item Ikarus,
+=item ? [``EDV-Notensatz'']
-URW's music-engraving system described by [Wanske]
+URW's music-engraving system described by [Wanske]. (Although URW
+used ~DM 1.000.000 while developing this, it didn't buy them a cute
+name.)
=item Logic,
=item Berlioz, http://www.?.fr/
-Dominique Montel (a professional music typesetter) is now working together with
-computer scientists on his own software for music publishing, called "Berlioz".
+Dominique Montel (a professional music typesetter) is now working
+together with computer scientists on his own software for music
+publishing, called "Berlioz".
-20/Oct/97 LilyPond 0.1.24 1
+20/Oct/97 LilyPond 0.1.25 1
-20/Oct/97 LilyPond 0.1.24 2
+20/Oct/97 LilyPond 0.1.25 2
-20/Oct/97 LilyPond 0.1.24 3
+20/Oct/97 LilyPond 0.1.25 3
-20/Oct/97 LilyPond 0.1.24 4
+20/Oct/97 LilyPond 0.1.25 4
-20/Oct/97 LilyPond 0.1.24 5
+20/Oct/97 LilyPond 0.1.25 5
-20/Oct/97 LilyPond 0.1.24 6
+20/Oct/97 LilyPond 0.1.25 6
-pl 24.jcn2
- - feta-nummertjes: 0 1 2 4 7
+pl 25
+ - variable stemlength
+ - feta: 32nd, 64th flags
+ - font.ly
+ - dist & tarball made in out/
+ - rewrote release.sh in python
+ - notehead/stem attachment better.
+ - more Stem cleanage
+ - related Beam cleanage
+ - started numeral font (JCN)
+ - bf: whole rest outside staff.
+
+*********
+oct 20
pl 24
- internationalization preps (FP)
- rewrote make-patch in python
* Make general "spanning"-elements and "placer"-elements
- - naming Mozarella, Madeira, Muella, Feta?
+ - naming Mozarella, Madeira, Muella?
+
- bf: abbrevs over whole note
+
- scoping for properties
{ c4
* \header
- write perl script for handling it into databases
- write TeX macros to generate titles
+ - adapt make-website to use \header info.
* Makefile stuff:
- have make dist produce tarball in out/ directory.
TOPLEVEL_MAJOR_VERSION = 0
TOPLEVEL_MINOR_VERSION = 1
-TOPLEVEL_PATCH_LEVEL = 24
-TOPLEVEL_MY_PATCH_LEVEL = .jcn2
+TOPLEVEL_PATCH_LEVEL = 25
+TOPLEVEL_MY_PATCH_LEVEL =
# use the above to send patches, always empty for released version:
return (tup[0], tup[1], tup[2] - 1, '');
+def dirname(v):
+ return 'lilypond-' + version_tuple_to_str(v)
+
+def tarball(v):
+ return dirname(v) + '.tar.gz'
+
+def released_tarball(v):
+ return lilydirs.release_dir + tarball(v)
+
def tuple_to_list(tup):
l=[]
for x in tup:
+++ /dev/null
-#!@PYTHON@
-from lilypython import *
-import getopt
-import pipes
-
-
-mp_version = '2'
-
-class Options:
- def __init__(self):
- self.to_version = lilydirs.version_tuple()
- self.from_version = prev_version(self.to_version)
-
-options = Options()
-
-
-def help():
- sys.stdout.write(
- 'Generate a patch to go to this version.\n'
- ' --from=FROM, -f FROM old is FROM\n'
- ' --to=TO, -t TO to version TO\n'
-
- )
-
-
-def dirname(v):
- return 'lilypond-' + version_tuple_to_str(v)
-
-def tarball(v):
- return lilydirs.release_dir + dirname(v) + '.tar.gz'
-
-def untar(fn):
- sys.stderr.write('untarring ' + fn)
- os.system ('tar xzf ' + fn)
- sys.stderr.write('\n')
- sys.stderr.flush()
-
-
-header = 'Generated by make-patch, old = %s, new = %s\n\
-\n\
-usage \n\
-\n\
- cd lilypond-source-dir; patch -E -p0 < patch-$new\n\
-\n\
-Patches do not contain automatically generated files, \n\
-i.e. you should rerun configure\n\n'
-
-import fnmatch
-import os
-
-_debug = 0
-
-_prune = ['(*)']
-
-
-def my_find(patterns, dir = os.curdir):
- list = []
- names = os.listdir(dir)
- names.sort()
- for name in names:
- if name in (os.curdir, os.pardir):
- continue
- fullname = os.path.join(dir, name)
- for pat in patterns:
- if fnmatch.fnmatch(name, pat):
- list.append(fullname)
- if os.path.isdir(fullname) and not os.path.islink(fullname):
- for p in _prune:
- if fnmatch.fnmatch(name, p):
- if _debug: print "skip", `fullname`
- break
- else:
- if _debug: print "descend into", `fullname`
- found = my_find(patterns, fullname)
- if found:
- list = list + found
- return list
-
-def multiple_find(pats, dirnames):
- from find import find
- l = []
- for d in dirnames:
- l = l + my_find(pats, d)
- return l
-
-pats = ['*.lsm', 'configure', '*.text', 'lilypond.spec']
-def remove_automatic(dirnames):
- files = []
- files = files + multiple_find(pats, dirnames)
-
- for f in files:
- os.remove(f)
-
-def makepatch(fv, tv, patfile_nm):
- import tempfile
- os.chdir ('/tmp')
- untar(tarball(fv))
- untar(tarball(tv))
- remove_automatic([dirname(fv), dirname(tv)])
-
- os.chdir(dirname(tv))
-
- if not patfile_nm:
- patfile_nm = '../patch-%s' % version_tuple_to_str(tv)
-
- f = open(patfile_nm, 'w')
- f.write(header % (version_tuple_to_str(fv), version_tuple_to_str(tv)))
- f.close()
-
- sys.stderr.write('diffing ... ')
- os.system('diff -urN ../%s . >> %s' % (dirname(fv), patfile_nm))
- #os.system('gzip -9f %s' % patfile_nm)
- os.chdir('/tmp')
-
- sys.stderr.write('cleaning ... ')
- os.system('rm -fr %s %s' % (dirname(tv), dirname(fv)))
- sys.stderr.write('\n')
-
-def main():
- sys.stderr.write('This is make-patch version %s\n' % mp_version)
- (cl_options, files) = getopt.getopt(sys.argv[1:],
- 'hf:o:t:', ['output=', 'help=', 'from=', 'to='])
- outfn = ''
- for opt in cl_options:
- o = opt[0]
- a = opt[1]
- if o == '--from' or o == '-f':
- options.from_version = version_str_to_tuple(a)
- elif o == '--to' or o == '-t':
- options.to_version = version_str_to_tuple(a)
- elif o== '--help' or o == '-h':
- help()
- elif o == '--output' or o == '-o':
- outfn = os.path.join(os.getcwd(), a)
- else:
- raise getopt.error
-
- if not outfn:
- pn = 'patch-%s' % version_tuple_to_str(options.to_version)
- outfn = os.path.join(os.getcwd(), pn)
-
- makepatch(options.from_version, options.to_version, outfn)
-
-main()
--- /dev/null
+#!@PYTHON@
+from lilypython import *
+import getopt
+import pipes
+
+
+mp_version = '2'
+
+class Options:
+ def __init__(self):
+ self.to_version = lilydirs.version_tuple()
+ self.from_version = prev_version(self.to_version)
+
+options = Options()
+
+
+def help():
+ sys.stdout.write(
+ 'Generate a patch to go to this version.\n'
+ ' --from=FROM, -f FROM old is FROM\n'
+ ' --to=TO, -t TO to version TO\n'
+
+ )
+
+
+
+def untar(fn):
+ sys.stderr.write('untarring ' + fn)
+ os.system ('tar xzf ' + fn)
+ sys.stderr.write('\n')
+ sys.stderr.flush()
+
+
+header = 'Generated by make-patch, old = %s, new = %s\n\
+\n\
+usage \n\
+\n\
+ cd lilypond-source-dir; patch -E -p0 < %s\n\
+\n\
+Patches do not contain automatically generated files, \n\
+i.e. you should rerun configure\n\n'
+
+import fnmatch
+import os
+
+_debug = 0
+
+_prune = ['(*)']
+
+
+def my_find(patterns, dir = os.curdir):
+ list = []
+ names = os.listdir(dir)
+ names.sort()
+ for name in names:
+ if name in (os.curdir, os.pardir):
+ continue
+ fullname = os.path.join(dir, name)
+ for pat in patterns:
+ if fnmatch.fnmatch(name, pat):
+ list.append(fullname)
+ if os.path.isdir(fullname) and not os.path.islink(fullname):
+ for p in _prune:
+ if fnmatch.fnmatch(name, p):
+ if _debug: print "skip", `fullname`
+ break
+ else:
+ if _debug: print "descend into", `fullname`
+ found = my_find(patterns, fullname)
+ if found:
+ list = list + found
+ return list
+
+def multiple_find(pats, dirnames):
+ from find import find
+ l = []
+ for d in dirnames:
+ l = l + my_find(pats, d)
+ return l
+
+pats = ['*.lsm', 'configure', '*.text', 'lilypond.spec']
+def remove_automatic(dirnames):
+ files = []
+ files = files + multiple_find(pats, dirnames)
+
+ for f in files:
+ os.remove(f)
+
+def makepatch(fv, tv, patfile_nm):
+ import tempfile
+ prev_cwd = os.getcwd();
+ os.chdir ('/tmp')
+ untar(released_tarball(fv))
+ untar(released_tarball(tv))
+ remove_automatic([dirname(fv), dirname(tv)])
+
+ os.chdir(dirname(tv))
+
+ if not patfile_nm:
+ patfile_nm = '../patch-%s' % version_tuple_to_str(tv)
+
+ f = open(patfile_nm, 'w')
+ f.write(header %\
+ (version_tuple_to_str(fv), version_tuple_to_str(tv), \
+ os.path.basename(patfile_nm)))
+ f.close()
+
+ sys.stderr.write('diffing to %s... ' % patfile_nm)
+ os.system('diff -urN ../%s . >> %s' % (dirname(fv), patfile_nm))
+ #os.system('gzip -9f %s' % patfile_nm)
+ os.chdir('/tmp')
+
+ sys.stderr.write('cleaning ... ')
+ os.system('rm -fr %s %s' % (dirname(tv), dirname(fv)))
+ sys.stderr.write('\n')
+ os.chdir(prev_cwd)
+
+def main():
+ sys.stderr.write('This is make-patch version %s\n' % mp_version)
+ (cl_options, files) = getopt.getopt(sys.argv[1:],
+ 'hf:o:t:', ['output=', 'help=', 'from=', 'to='])
+ outfn = ''
+ for opt in cl_options:
+ o = opt[0]
+ a = opt[1]
+ if o == '--from' or o == '-f':
+ options.from_version = version_str_to_tuple(a)
+ elif o == '--to' or o == '-t':
+ options.to_version = version_str_to_tuple(a)
+ elif o== '--help' or o == '-h':
+ help()
+ elif o == '--output' or o == '-o':
+ outfn = os.path.join(os.getcwd(), a)
+ else:
+ raise getopt.error
+
+ if not outfn:
+ pn = 'patch-%s' % version_tuple_to_str(options.to_version)
+ outfn = os.path.join(os.getcwd(), pn)
+
+ makepatch(options.from_version, options.to_version, outfn)
+
+if __name__ == '__main__':
+ main()
+++ /dev/null
-
-from lilypython import *
-
-
-os.system('make dist')
--- /dev/null
+#!@PYTHON@
+
+from lilypython import *
+import makepatch
+
+
+os.chdir(lilydirs.topdir)
+os.system('make dist')
+cur_ver = lilydirs.version_tuple()
+
+os.rename('out/' + tarball(cur_ver), released_tarball(cur_ver))
+os.chdir('../test')
+os.system('rm ../test/*gz')
+os.link(released_tarball(cur_ver), tarball(cur_ver))
+
+
+makepatch.main()
+os.system('gzip -9 patch*')
+os.system('tar cf updeet *gz')
+++ /dev/null
-#!/bin/sh
-
-# script to automate releases
-
-grep -q '^TOP' VERSION
- res=$?
-if test ! -f VERSION || test $res != 0; then
- echo not in topleveldir
- exit 1
-fi
-
-function setversion() {
-eval `sed -n 's/^\([A-Z_]*\) *= *\(.*\)$/\1=\2/p' VERSION`
-
-MJ=$TOPLEVEL_MAJOR_VERSION
-MI=$TOPLEVEL_MINOR_VERSION
-PA=$TOPLEVEL_PATCH_LEVEL
-MP=$TOPLEVEL_MY_PATCH_LEVEL
-NEWVER=$MJ.$MI.$PA$MP
-if [ x$MP = x -o x$MP = xpre ]
-then
- LASTVER=$MJ.$MI.`expr $PA - 1`
-
- if [ -f $releasedir//lilypond-$LASTVER""pre.tar.gz ] ; then
- LASTVER="$LASTVER""pre"
- fi
-else
- LASTVER=$MJ.$MI.$PA
-fi
-
-echo
-echo "Current version ("`pwd`") is $NEWVER, Last version: $LASTVER"
-echo
-}
-
-heredir=`pwd`
-releasedir=`pwd`/../releases
-patchdir=`pwd`/../patches
-MAKE=${MAKE:-"make"}
-TAR=${TAR:-"tar"}
-
-
-$MAKE dist;
-setversion
-LILYVER=$NEWVER
-
-tarball=lilypond-$LILYVER.tar.gz
-patch=patch-$LILYVER.gz
-
-mv $tarball $releasedir/
-
-cd ../test
-python $heredir/bin/make-patch.py
-gzip -f9 patch-$NEWVER
-mv $patch $patchdir//
-
-RPMS=`find ~/rpms/ -name lilypond-$NEWVER'*'rpm`
-rm *.rpm {lilypond,patch}-*.gz
-
-if [ ! -z "$RPMS" ]; then
- ln $RPMS .
-fi
-
-ln $releasedir//$tarball .
-ln $patchdir//$patch .
-
-
-if [ ! -z "$RPMS" ]; then
- RPMS="lilypond-$LILYVER-1.i386.rpm lilypond-$LILYVER-1.src.rpm"
-fi
-$TAR cf updeet $tarball $patch $RPMS
-$TAR tfv updeet
-
+
+ * Unicode support in strings
+
* write a decent Dictionary
- write a String_hash template
- write a Pointer_hash template
% generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 01:50:48 1997
+% on Mon Oct 20 23:14:01 1997
% Do not edit
% input from out/font-en-tja16.log
% name=\symboltables {
"pedalheel" "\\pedalheel" -2.00\pt 2.00\pt -2.00\pt 2.67\pt
"pedaltoe" "\\pedaltoe" -2.00\pt 2.00\pt -0.00\pt 6.00\pt
}
- "floogbars" = \table {
- "3u" "\\eighthflag" -0.20\pt 4.16\pt -12.83\pt 0.20\pt
- "3d" "\\deighthflag" -0.20\pt 4.60\pt -0.20\pt 12.83\pt
- "4u" "\\sixteenthflag" -0.20\pt 4.16\pt -13.00\pt 0.20\pt
- "4d" "\\dsixteenthflag" -0.20\pt 4.60\pt -0.20\pt 12.00\pt
+ "flags" = \table {
+ "u3" "\\eighthflag" -0.20\pt 4.16\pt -12.26\pt 0.20\pt
+ "d3" "\\deighthflag" -0.20\pt 4.60\pt -0.20\pt 11.66\pt
+ "u4" "\\sixteenthflag" -0.20\pt 4.16\pt -14.00\pt 0.20\pt
+ "d4" "\\dsixteenthflag" -0.20\pt 4.60\pt -0.20\pt 12.00\pt
+ "u5" "\\thirtysecondflag" -0.20\pt 4.16\pt -17.00\pt 0.20\pt
+ "d5" "\\dthirtysecondflag" -0.20\pt 4.16\pt -0.20\pt 15.40\pt
+ "u6" "\\sixtyfourthflag" -0.20\pt 4.16\pt -21.00\pt 0.20\pt
+ "d6" "\\dsixtyfourthflag" -0.20\pt 4.16\pt -0.20\pt 17.40\pt
}
% } % $name
% generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 01:50:55 1997
+% on Mon Oct 20 23:14:08 1997
% Do not edit
% input from out/font-en-tja20.log
% name=\symboltables {
"pedalheel" "\\pedalheel" -2.50\pt 2.50\pt -2.50\pt 3.33\pt
"pedaltoe" "\\pedaltoe" -2.50\pt 2.50\pt -0.00\pt 7.50\pt
}
- "floogbars" = \table {
- "3u" "\\eighthflag" -0.25\pt 5.20\pt -16.04\pt 0.25\pt
- "3d" "\\deighthflag" -0.25\pt 5.75\pt -0.25\pt 16.04\pt
- "4u" "\\sixteenthflag" -0.25\pt 5.20\pt -16.25\pt 0.25\pt
- "4d" "\\dsixteenthflag" -0.25\pt 5.75\pt -0.25\pt 15.00\pt
+ "flags" = \table {
+ "u3" "\\eighthflag" -0.25\pt 5.20\pt -15.33\pt 0.25\pt
+ "d3" "\\deighthflag" -0.25\pt 5.75\pt -0.25\pt 14.58\pt
+ "u4" "\\sixteenthflag" -0.25\pt 5.20\pt -17.50\pt 0.25\pt
+ "d4" "\\dsixteenthflag" -0.25\pt 5.75\pt -0.25\pt 15.00\pt
+ "u5" "\\thirtysecondflag" -0.25\pt 5.20\pt -21.25\pt 0.25\pt
+ "d5" "\\dthirtysecondflag" -0.25\pt 5.20\pt -0.25\pt 19.25\pt
+ "u6" "\\sixtyfourthflag" -0.25\pt 5.20\pt -26.25\pt 0.25\pt
+ "d6" "\\dsixtyfourthflag" -0.25\pt 5.20\pt -0.25\pt 21.75\pt
}
% } % $name
}
- "flags" = \table {
- "u3" "\eighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- "u4" "\sixteenthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- "u5" "\\thirtysecondflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- "u6" "\sixtyfourthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- "u7" "\hundredtwentyeighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- "d3" "\deighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- "d4" "\dsixteenthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- "d5" "\dthirtysecondflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- "d6" "\dsixtyfourthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- "d7" "\dhundredtwentyeighthflag" 0.0\pt 4.0\pt 0.0\pt 0.0\pt
- }
-
"beamslopes" = \table {
"slope" "\beamslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt
"horizontal" "\rulesym{%}{%}"
"decrescendosym" "\decrescendosym{%}" 0.0\pt 0.0\pt -3.0\pt 3.0\pt
}
- "flags" = \table {
- "u3" "\eighthflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- "u4" "\sixteenthflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- "u5" "\\thirtysecondflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- "u6" "\sixtyfourthflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- "u7" "\hundredtwentyeighthflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- "d3" "\deighthflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- "d4" "\dsixteenthflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- "d5" "\dthirtysecondflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- "d6" "\dsixtyfourthflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- "d7" "\dhundredtwentyeighthflag" 0.0\pt 5.0\pt 0.0\pt 0.0\pt
- }
-
- "beamslopes" = \table {
+ "beamslopes" = \table {
"slope" "\beamslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt
"horizontal" "\rulesym{%}{%}"
}
[c d e f] [as' ges' f' e']
[cis' dis' c' des'] [cisis' disis' ceses' deses'] |
r1 r2 r4 r8 r16 r32 r64 r128 r128 |
- \multi 2 < { \stemup r1} {\stemdown c''}>
+ \multi 2 < { \stemup r2 r2} {\stemdown c'' c''}>
\multi 2 < { \stemup c1 } {\stemdown r1}>
\stemboth
e8_. g'8-> e16^^ g'16_^
e32 _| g'32^| g''32-\ltoe g''32-\lheel
+ e64 g'64 c4... |
}
\paper{
gourlay_maxmeasures =5.;
gourlay_maxmeasures =5.;
\output "lelie20.tex";
}
-% oeps
-% \midi{ }
}
MAJOR_VERSION = 0
MINOR_VERSION = 1
-PATCH_LEVEL = 24
-# use to send patches, always empty for released version:
-# include separator: ".postfix", "-pl" makes rpm barf
-
+PATCH_LEVEL = 25
MY_PATCH_LEVEL =
void
Beam::set_default_dir()
{
- int up = 0, down = 0;
- int up_count = 0, down_count = 0;
-
+ Drul_array<int> total;
+ total[UP] = total[DOWN] = 0;
+ Drul_array<int> count;
+ count[UP] = count[DOWN] = 0;
+ Direction d = DOWN;
+
for (int i=0; i <stems.size(); i++)
- {
- Stem *sl = stems[i];
- int cur_down = sl->get_center_distance_from_top();
- int cur_up = sl->get_center_distance_from_bottom();
- if (cur_down)
- {
- down += cur_down;
- down_count++;
- }
- if (cur_up)
+ do {
+ Stem *s = stems[i];
+ int current = s->dir_
+ ? (1 + d * s->dir_)/2
+ : s->get_center_distance(Direction(-d));
+
+ if (current)
{
- up += cur_up;
- up_count++;
+ total[d] += current;
+ count[d] ++;
}
- }
- if (!down)
- down_count = 1;
- if (!up)
- up_count = 1;
-
- // the following relation is equal to
- // up / up_count > down / down_count
- dir_ = (up * down_count > down * up_count) ? UP : DOWN;
+
+ } while ((d *= -1) != DOWN);
+
+ do {
+ if (!total[d])
+ count[d] = 1;
+ } while ((d *= -1) != DOWN);
+
+ /* the following relation is equal to
+ up / up_count > down / down_count
+ */
+ dir_ = (total[UP] * count[DOWN] > total[DOWN] * count[UP]) ? UP : DOWN;
for (int i=0; i <stems.size(); i++)
{
void do_print() const;
void set_stemend (Real);
Direction get_default_dir();
- int get_center_distance_from_top();
- int get_center_distance_from_bottom();
+
+ int get_center_distance(Direction);
void set_default_dir();
void set_default_stemlen();
void set_default_extents();
bool invisible_b() const;
/// heads that the stem encompasses (positions)
- int max_head_i() const;
- int min_head_i() const;
+ Interval_t<int> head_positions() const;
protected:
virtual void do_substitute_dependency (Score_elem*,Score_elem*);
virtual void do_pre_processing();
{
if (balltype_i_ != 0 && balltype_i_ != 1)
position_i_ -= 4;
+ else if (balltype_i_ == 0)
+ position_i_ += 2;
Rhythmic_head::do_add_processing ();
if (dots_l_)
Rest::brew_molecule_p () const
{
int staff_size_i_ = 8;
- bool streepjes_b = abs(position_i_) > staff_size_i_ /2 && (balltype_i_ == 0 || balltype_i_ == 1);
+ bool streepjes_b = abs(position_i_) > staff_size_i_ /2 &&
+ (balltype_i_ == 0 || balltype_i_ == 1);
Atom s(paper ()->lookup_l()->rest (balltype_i_, streepjes_b));
Molecule * m = new Molecule ( Atom (s));
beam_gap_i_ = 0;
}
-int
-Stem::min_head_i () const
-{
- int m = 1000;
- for (int i =0; i < head_l_arr_.size (); i++)
- m = m <? head_l_arr_[i]->position_i_;
- return m;
-}
-
-int
-Stem::max_head_i () const
+Interval_t<int>
+Stem::head_positions () const
{
- int m = -1000;
+ Interval_t<int> r;
for (int i =0; i < head_l_arr_.size (); i++)
- m = m >? head_l_arr_[i]->position_i_;
- return m;
-
+ {
+ int p = head_l_arr_[i]->position_i_;
+ r[BIGGER] = r[BIGGER] >? p;
+ r[SMALLER] = r[SMALLER] <? p;
+ }
+ return r;
}
void
Real
Stem::stem_start_f () const
{
- return (dir_ < 0)? yextent_drul_[UP] : yextent_drul_[DOWN];
+ return yextent_drul_[Direction(-dir_)];
}
Real
Stem::stem_end_f () const
{
- return (dir_ < 0)? yextent_drul_[DOWN] : yextent_drul_[UP];
+ return yextent_drul_[dir_];
}
Stem::set_stemend (Real se)
{
// todo: margins
- if (! ((dir_ > 0 && se >= max_head_i ()) ||
- (se <= min_head_i () && dir_ <0)))
+ if (dir_ && dir_ * head_positions()[dir_] >= se*dir_)
warning (_("Weird stem size; check for narrow beams"));
- yextent_drul_[UP] = (dir_ < 0) ? max_head_i () : se;
- yextent_drul_[DOWN] = (dir_ < 0) ? se : min_head_i ();
+
+ yextent_drul_[dir_] = se;
+ yextent_drul_[Direction(-dir_)] = head_positions()[-dir_];
}
int
bool
Stem::invisible_b () const
{
-
return (!head_l_arr_.size () ||
head_l_arr_[0]->balltype_i_ <= 0);
-
-}
-
-// if dir_ is set we return fake values.
-int
-Stem::get_center_distance_from_top ()
-{
- if (dir_)
- return (dir_ > 0) ? 0 : 1;
-
- int staff_center = 0;
- int max = max_head_i () - staff_center;
- return max >? 0;
}
-// if dir_ is set we return fake values.
int
-Stem::get_center_distance_from_bottom ()
+Stem::get_center_distance (Direction d)
{
- if (dir_)
- return (dir_ > 0) ? 1 : 0;
-
int staff_center = 0;
- int min = staff_center - min_head_i ();
- return min >? 0;
+ int distance = d*(head_positions()[d] - staff_center);
+ return distance >? 0;
}
Direction
Stem::get_default_dir ()
{
- if (dir_)
- return dir_;
- return (get_center_distance_from_top () >=
- get_center_distance_from_bottom ()) ?
- (Direction)-1 : (Direction)1;
+ return (get_center_distance (UP) >=
+ get_center_distance (DOWN))
+ ? DOWN
+ : UP;
}
void
Stem::set_default_stemlen ()
{
- if (!dir_)
- set_default_dir ();
-
-
- Real dy = paper ()->interbeam_f ();
Real len = STEMLEN;
+ Real dy = paper ()->interbeam_f ();
+
// ugh, should get nice *rule* for this
if (abbrev_flag_i_ > 1)
len += (abbrev_flag_i_ - 1)* dy / 2;
- set_stemend ((dir_ > 0) ? max_head_i () + len :
- min_head_i () - len);
+
+
+ if (!dir_)
+ set_default_dir ();
+
+ /* If the stem points in the "wrong" direction, it should be
+ shortened, according to [Roush & Gourlay]. Their suggestion to knock off
+ a whole staffspace is a bit drastical though.
+ */
+ else if (dir_ != get_default_dir ())
+ len -= 1.0;
+
+ if (flag_i_ >= 5)
+ len += 2.0;
+ if (flag_i_ >= 6)
+ len += 1.0;
+
+ set_stemend ((dir_ > 0) ? head_positions()[BIGGER] + len :
+ head_positions()[SMALLER] - len);
if (dir_ * stem_end_f () < 0)
{
set_stemend (0);
}
-
-
}
void
if (!stem_length_f ())
set_default_stemlen ();
- set_stemend ((dir_< 0) ?
- max_head_i ()-stem_length_f (): min_head_i () + stem_length_f ());
-
+ /* set_stemend ((dir_< 0) ?
+ head_positions()[BIGGER]-stem_length_f ():
+ head_positions()[SMALLER] + stem_length_f ());
+ */
if (dir_ == UP)
stem_xdir_ = RIGHT;
if (invisible_b ())
Atom a (paper ()->lookup_l ()->beam (slope, w));
a.translate (Offset(- w / 2, stem_end_f () - (w / 2 * slope)));
// ugh
- if (!beams_i)
- a.translate_axis (dy + beamdy - dir_ * dy, Y_AXIS);
- else
- a.translate_axis (2 * beamdy - dir_ * (beamdy - dy), Y_AXIS);
+ if (!beams_i)
+ a.translate_axis (dy + beamdy - dir_ * dy, Y_AXIS);
+ else
+ a.translate_axis (2 * beamdy - dir_ * (beamdy - dy), Y_AXIS);
for (int i = 0; i < abbrev_flag_i_; i++)
{
return beams;
}
+const Real ANGLE = 20* (2.0*M_PI/360.0);
+
Molecule*
Stem::brew_molecule_p () const
{
Molecule *mol_p =new Molecule;
-
- Real bot = yextent_drul_[DOWN];
- Real top = yextent_drul_[UP];
-
- assert (bot!=top);
-
Paper_def *p =paper ();
-
+ Drul_array<Real> stem_y = yextent_drul_;
Real dy = p->internote_f ();
+
+
+ Real head_wid = 0;
+ if (head_l_arr_.size ())
+ head_wid = head_l_arr_[0]->width ().length ();
+ stem_y[Direction(-dir_)] += dir_ * head_wid * tan(ANGLE)/(2*dy);
+
if (!invisible_b ())
{
- Atom ss =p->lookup_l ()->stem (bot*dy,top*dy);
+ Atom ss =p->lookup_l ()->stem (stem_y[DOWN]*dy,
+ stem_y[UP]*dy);
mol_p->add (Atom (ss));
}
if (!beam_l_ &&abs (flag_i_) > 2)
{
Atom fl = p->lookup_l ()->flag (flag_i_, dir_);
- mol_p->add_at_edge (Y_AXIS, dir_, Molecule (Atom (fl)));
+ fl.translate_axis(stem_y[dir_]*dy, Y_AXIS);
+ mol_p->add(fl);
assert (!abbrev_flag_i_);
}
}
/*
-TODO: head_l_arr_/rest_l_arr_ in do_substitute_dependent ()
+ TODO: head_l_arr_/rest_l_arr_ in do_substitute_dependent ()
*/
void
Stem::do_substitute_dependency (Score_elem*o,Score_elem*n)
$(MAKE) localdist
chmod -Rf a+rX $(distdir)
- (cd ./$(depth); $(TAR) cf - $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
+ (cd ./$(depth)/$(outdir); $(TAR) cf - $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
# should be trapped
rm -rf $(distdir)/
moduledist:
-mkdir $(module-distdir)
$(MAKE) localmoduledist
- (cd ./$(depth); $(TAR) cfz $(MODULE_DIST_NAME).tar.gz $(MODULE_DIST_NAME))
+ (cd $(depth)/$(outdir); $(TAR) cfz $(MODULE_DIST_NAME).tar.gz $(MODULE_DIST_NAME))
rm -rf $(module-distdir)/
localmoduledist:
# derived names
lily_bindir = $(depth)/bin
-distdir = $(depth)/$(DIST_NAME)
+distdir = $(depth)/$(outdir)/$(DIST_NAME)
module-distdir = $(depth)/$(MODULE_DIST_NAME)
depdir = $(outdir)
Begin3
Titel: LilyPond
-Versie: 0.1.24
-Inschrijf datum: 20OCT97
+Versie: 0.1.25
+Inschrijf datum: 21OCT97
Beschrijving: LilyPond is de muziek typesetter van het GNU Project.
Het programma genereert muziek in zichtbare of
hoorbare vorm uit uit een muzikale definitie file:
jan@digicash.com (Jan Nieuwenhuizen)
Onderhouden door: hanwen@stack.nl (Han-Wen Nienhuys)
Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
- 395k lilypond-0.1.24.tar.gz
+ 395k lilypond-0.1.25.tar.gz
Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/
- 395k lilypond-0.1.24.tar.gz
+ 395k lilypond-0.1.25.tar.gz
Copi"eer politie: GPL
End
Begin3
Title: LilyPond
-Version: 0.1.24
-Entered-date: 20OCT97
+Version: 0.1.25
+Entered-date: 21OCT97
Description: LilyPond is the GNU Project music typesetter. The program
generates visual or auditive output from a music
definition file: it can typeset formatted sheet music
jan@digicash.com (Jan Nieuwenhuizen)
Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
Primary-site: sunsite.unc.edu /pub/Linux/apps
- 430k lilypond-0.1.24.tar.gz
+ 430k lilypond-0.1.25.tar.gz
Original-site: pcnov095.win.tue.nl /pub/lilypond/
- 430k lilypond-0.1.24.tar.gz
+ 430k lilypond-0.1.25.tar.gz
Copying-policy: GPL
End
Name: lilypond
-Version: 0.1.24
+Version: 0.1.25
Release: 1
Copyright: GPL
Group: Applications/Publishing
-Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.1.24.tar.gz
+Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.1.25.tar.gz
Summary: A preprocessor to make TeX typeset music.
URL: http://www.stack.nl/~hanwen/lilypond
Packager: Han-Wen Nienhuys <hanwen@stack.nl>
- more symbols
* ledgerlines
* stem-notehead attachments.
- * flags
* clefs
* some scripts:
* piano pedals,
- normal(1/5staff) bold
- large(3/4staff) bold
+ - redo flags in a orderly manner; 128th flags
- include important spacing dims in fetalog
- lilyrules.mf for different rules (lines) ?
\font\slurs=xslhd16
\font\specfont=musixspx
\font\egler=opus16
-\font\nummertjes=feta-nummer10
-%\def\thefont{\egler}
+\def\thefont{\egler}
%\def\thefont{\specfont}
-\def\thefont{\nummertjes}
\def\mb#1{{\thefont\char#1}}
\newcount\n
\def\charn{\n=-1
-% \loop\ifnum\n<255\advance\n by1
- \loop\ifnum\n<10\advance\n by1
+ \loop\ifnum\n<255\advance\n by1
\doitem{\number\n}\endgraf\repeat}
% flags
%
-fet_begingroup("floogbars")
+fet_begingroup("flags")
% Flags pointing down overlap with the notehead (in x-direction), so
% the down-flag can be bigger
% godbewaarme, wat een kutsymbolen
-fet_beginchar("8th Flag (up)", "3u", "eighthflag")
-
+fet_beginchar("8th Flag (up)", "u3", "eighthflag")
save flare,
hip_depth, hip_width,
foot_depth, foot_width;
hip_depth# = 8/15 foot_depth#;
hip_width# = upflag_width# - hip_thickness#/2;
- foot_depth# = 15/7 interline#;
+ foot_depth# + flare# = 3 interline#;
foot_width# = .8 hip_width#;
set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2
draw (0, 0) .. (0,-2 interline);
fet_endchar;
-fet_beginchar("8th Flag (down)", "3d", "deighthflag")
+fet_beginchar("8th Flag (down)", "d3", "deighthflag")
save flare,
hip_depth, hip_width,
foot_depth, foot_width;
hip_depth# = 8/15 foot_depth#;
hip_width# = downflag_width# - hip_thickness#/2;
- foot_depth# = 15/7 interline#;
- foot_width# = .8 hip_width#;
+
+ % 2.9 -> don't intersect staffline at foot
+ foot_depth# + flare# = 2.85 interline#;
+ foot_width# = .82 hip_width#;
set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2
+ stemthickness#/2,
fet_endchar;
-fet_beginchar("16th Flag (up)", "4u", "sixteenthflag")
+fet_beginchar("16th Flag (up)", "u4", "sixteenthflag")
save flare, flagspace,
hip_depth, hip_width,
foot_depth, foot_width;
flagspace# = .85 interline#;
hip_depth# = 8/15 foot_depth#;
- flagspace# + flare# + foot_depth# = 3.25 interline#;
+ flagspace# + flare# + foot_depth# = 3.5 interline#;
hip_width# = upflag_width# - hip_thickness#/2;
foot_width# = .8 hip_width#;
set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2
+ stemthickness#/2,
- 3.25 interline#, stemthickness#/2)
+ 3.5 interline#, stemthickness#/2)
define_pixels(flagspace);
define_pixels(flare,
draw_flag((stemthickness/2, 0),flare,
1.2 hip_depth, .97 hip_width, hip_thickness,
- foot_depth, .9 foot_width, foot_thickness, 0.37);
+ foot_depth, .9 foot_width, foot_thickness, 0.5);
draw_flag((stemthickness/2, -flagspace),flare,
hip_depth, hip_width, hip_thickness,
foot_depth, foot_width, foot_thickness, 0);
fet_endchar;
-fet_beginchar("16th Flag (up)", "4d", "dsixteenthflag")
+fet_beginchar("16th Flag (down)", "d4", "dsixteenthflag")
save flare, flagspace,
hip_depth, hip_width,
foot_depth, foot_width;
draw_flag((stemthickness/2, 0),flare,
hip_depth, .97 hip_width, hip_thickness,
- 1.2 foot_depth, .95 foot_width, foot_thickness, 0.0);
+ 1.2 foot_depth, .95 foot_width, foot_thickness, 0.0);
draw_flag((stemthickness/2, -flagspace),flare,
hip_depth, hip_width, hip_thickness,
y_mirror_char;
fet_endchar;
-fet_endgroup("floogbars");
+fet_beginchar("32nd Flag (up)", "u5", "thirtysecondflag")
+ save flare, flagspace,
+ hip_depth, hip_width,
+ foot_depth, foot_width;
+
+ flare# = 0.85 interline#;
+ flagspace# = .87 interline#;
+ hip_depth# = 8/15 foot_depth#;
+
+ 2 flagspace# + flare# + foot_depth# = 4.25 interline#;
+
+ hip_width# = upflag_width# - hip_thickness#/2;
+ foot_width# = .8 hip_width#;
+
+ set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2
+ + stemthickness#/2,
+ 4.25 interline#, stemthickness#/2)
+
+ define_pixels(flagspace);
+ define_pixels(flare,
+ hip_depth, hip_width, hip_thickness,
+ foot_depth, foot_width, foot_thickness);
+
+ draw_flag((stemthickness/2, 0),flare,
+ 1.25 hip_depth, .95 hip_width, hip_thickness,
+ .85 foot_depth, 1.1 foot_width, foot_thickness, 0.0);
+ draw_flag((stemthickness/2, -flagspace),flare,
+ 1.2 hip_depth, .97 hip_width, hip_thickness,
+ foot_depth, .9 foot_width, foot_thickness, 0.37);
+ draw_flag((stemthickness/2, -2 flagspace),flare,
+ 1.1 hip_depth, hip_width, hip_thickness,
+ foot_depth, 1.15 foot_width, foot_thickness, 0);
+
+ pickup pencircle scaled stemthickness;
+ draw (0, 0) .. (0,-3 interline);
+
+fet_endchar;
+
+
+
+fet_beginchar("32nd Flag (up)", "d5", "dthirtysecondflag")
+ save flare, flagspace,
+ hip_depth, hip_width,
+ foot_depth, foot_width;
+
+ flare# = 0.85 interline#;
+ flagspace# = .85 interline#;
+ hip_depth# = .57 foot_depth#;
+ foot_width# = 1.0 hip_width#;
+
+ 2 flagspace# + flare# + foot_depth# = 3.85 interline#;
+ hip_width# = upflag_width# - hip_thickness#/2;
+
+
+ set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2
+ + stemthickness#/2,
+ 3.85 interline#, stemthickness#/2)
+
+ define_pixels(flagspace);
+ define_pixels(flare,
+ hip_depth, hip_width, hip_thickness,
+ foot_depth, foot_width, foot_thickness);
+
+ draw_flag((stemthickness/2, 0),flare,
+ 1.3 hip_depth, .93 hip_width, hip_thickness,
+ foot_depth, .9 foot_width, foot_thickness, 0.0);
+ draw_flag((stemthickness/2, -flagspace),flare,
+ 1.15 hip_depth, .97 hip_width, hip_thickness,
+ foot_depth, .95 foot_width, foot_thickness, 0.0);
+ draw_flag((stemthickness/2, -2 flagspace),flare,
+ 1.0 hip_depth, hip_width, .95 hip_thickness,
+ foot_depth, foot_width, .93 foot_thickness, 0);
+
+ pickup pencircle scaled stemthickness;
+ draw (0, 0) .. (0,-3 interline);
+ y_mirror_char;
+fet_endchar;
+
+fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag")
+ save flare, flagspace,
+ hip_depth, hip_width,
+ foot_depth, foot_width;
+
+ flare# = 0.85 interline#;
+ flagspace# = .9 interline#;
+ hip_depth# = 8/15 foot_depth#;
+
+ 3 flagspace# + flare# + foot_depth# = 5.25 interline#;
+
+ hip_width# = upflag_width# - hip_thickness#/2;
+ foot_width# = .8 hip_width#;
+
+ set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2
+ + stemthickness#/2,
+ 5.25 interline#, stemthickness#/2)
+
+ define_pixels(flagspace);
+ define_pixels(flare,
+ hip_depth, hip_width, hip_thickness,
+ foot_depth, foot_width, foot_thickness);
+
+ draw_flag((stemthickness/2, 0),flare,
+ 1.25 hip_depth, .95 hip_width, hip_thickness,
+ .85 foot_depth, 1.1 foot_width, foot_thickness, 0.0);
+ draw_flag((stemthickness/2, -flagspace),flare,
+ 1.2 hip_depth, .97 hip_width, hip_thickness,
+ foot_depth, .9 foot_width, foot_thickness, 0.37);
+ draw_flag((stemthickness/2, -2flagspace),flare,
+ 1.2 hip_depth, .97 hip_width, hip_thickness,
+ foot_depth, .9 foot_width, foot_thickness, 0.37);
+ draw_flag((stemthickness/2, -3 flagspace),flare,
+ 1.1 hip_depth, hip_width, hip_thickness,
+ foot_depth, 1.15 foot_width, foot_thickness, 0);
+
+ pickup pencircle scaled stemthickness;
+ draw (0, 0) .. (0,-5 interline);
+
+fet_endchar;
+
+
+fet_beginchar("64th Flag (down)", "d6", "dsixtyfourthflag")
+ save flare, flagspace,
+ hip_depth, hip_width,
+ foot_depth, foot_width;
+ save lastcut;
+ flare# = 0.85 interline#;
+ flagspace# = .9 interline#;
+ hip_depth# = .57 foot_depth#;
+ foot_width# = 1.0 hip_width#;
+
+ lastcut = .7;
+
+ 3 flagspace# + flare# + hip_depth# +
+ (foot_depth# - hip_depth#) * (1-lastcut) = 4.35 interline#;
+ hip_width# = upflag_width# - hip_thickness#/2;
+
+
+ set_char_box(stemthickness# /2, hip_width# + hip_thickness#/2
+ + stemthickness#/2,
+ 4.35 interline#, stemthickness#/2)
+
+ define_pixels(flagspace);
+ define_pixels(flare,
+ hip_depth, hip_width, hip_thickness,
+ foot_depth, foot_width, foot_thickness);
+
+ draw_flag((stemthickness/2, 0),flare,
+ 1.33 hip_depth, .92 hip_width, hip_thickness,
+ 1.15 foot_depth, .9 foot_width, foot_thickness, 0.0);
+ draw_flag((stemthickness/2, -flagspace),flare,
+ 1.15 hip_depth, .97 hip_width, hip_thickness,
+ 1.14 foot_depth, .92 foot_width, foot_thickness, 0.0);
+ draw_flag((stemthickness/2, -2 flagspace),flare,
+ 1.15 hip_depth, .97 hip_width, hip_thickness,
+ 1.12 foot_depth, .95 foot_width, foot_thickness, 0.0);
+ draw_flag((stemthickness/2, -3flagspace),flare,
+ 1.0 hip_depth, hip_width, .95 hip_thickness,
+ foot_depth, foot_width, .93 foot_thickness, lastcut);
+
+ pickup pencircle scaled stemthickness;
+ draw (0, 0) .. (0,-5 interline);
+ y_mirror_char;
+fet_endchar;
+
+
+fet_endgroup("flags");
begingroup
-med#:=1/33designsize;
thick#:=1/16designsize;
-define_blacker_pixels(med,thick);
-pen med_pen;
-med_pen:= pencircle scaled med;
+define_blacker_pixels(thick);
rthin:=1/8*interline;
% rthick:=2rthin;
enddef;
fet_beginchar( "whole rest", "0", "wholerest");
-set_char_box(0, block_rest_x#, -interline# + block_rest_y#, interline# );
+ set_char_box(0, block_rest_x#,
+ block_rest_y#, 0);
block_rest;
- currentpicture := currentpicture shifted (0,interline - block_rest_y);
+ currentpicture := currentpicture shifted (0,- block_rest_y);
fet_endchar;
fet_beginchar("half rest", "1", "halfrest");
%
fet_beginchar( "whole rest (outside staff)", "0o", "outsidewholerest");
set_char_box(block_rest_y#, block_rest_x# + block_rest_y#,
- -interline# + block_rest_y#, interline#);
+ block_rest_y#, ledgerlinethickness#/2);
block_rest;
- currentpicture := currentpicture shifted (0,interline - block_rest_y);
+ currentpicture := currentpicture shifted (0, - block_rest_y);
pickup pencircle scaled ledgerlinethickness;
- draw (-block_rest_y, interline)
- .. (block_rest_x + block_rest_y, interline);
+
+ y5 = y6 = 0;
+ lft x5 = - b;
+ rt x6 = w;
+ draw z5 .. z6;
fet_endchar;
fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest");
set_char_box(block_rest_y#, block_rest_x#+ block_rest_y#,
- 0, block_rest_y#);
+ ledgerlinethickness#/2, block_rest_y#);
block_rest;
pickup pencircle scaled ledgerlinethickness;
- draw (-block_rest_y,0) .. (block_rest_x + block_rest_y,0);
+ y5 = y6 = 0;
+ lft x5 = - b;
+ rt x6 = w;
+ draw z5 .. z6;
fet_endchar;
fet_beginchar("Quarter rest","2","quartrest");
input feta-schrift;
input feta-banier;
else:
- input feta-bolletjes;
- input feta-banier;
+% input feta-bolletjes; input feta-banier;
+ input feta-eindelijk;
fi
+++ /dev/null
-% feta-nummer.mf
-% part of LilyPond's pretty-but-neat music font
-
-fet_begingroup("nummer")
-
-height#:=designsize;
-%thick#:=height#/4;
-thick#:=height#/3.9;
-thin#:=thick#/4;
-hair#:=thin#/2;
-kuulleke#:=hair#;
-%kuulleke#:=0;
-
-define_pixels(height,thick,thin,hair);
-foot_top#:=2thin#;
-foot_width#:=2thick#+thin#;
-define_pixels(foot_top,foot_width);
-define_pixels(kuulleke);
-
-def draw_foot(expr xpos) =
- begingroup;
- clearxy;
- penpos1(thick,0);
- z1=(xpos,foot_top);
- penpos2(foot_width,0);
- z2=(x1,0);
- penpos3(hair,-90);
- z3r=z2r;
- penpos4(hair,90);
- z4l=z2l;
- z5=(x1,hair/2);
- fill z1..{right}z1r{down}..{right}z3l..z3r{left}..z5..{left}z4l..z4r{right}..{up}z1l{right}..z1..cycle;
- endgroup;
-enddef;
-
-fet_beginchar("Numeral 0", "0", "zero")
- set_char_box(0, 3thick#, 0, height#);
- penpos1(thin,90);
- z1r=(w/2,h);
- penpos2(thick,0);
- z2r=(w,h/2);
- penpos3(thin,-90);
- z3r=(w/2,0);
- penpos4(thick,180);
- z4r=(0,h/2);
- fill z1r..z2r..z3r..z4r..cycle;
- unfill z1l..tension1.2..z2l..tension1.2..z3l..tension1.2..z4l..tension1.2..cycle;
-fet_endchar;
-
-fet_beginchar("Numeral 1", "1", "one")
- set_char_box(0, 5/2thick#+thin#, 0, height#);
- save alpha; alpha=0;
- penpos1(thick,alpha);
- z1=(thick+thick/2,height);
- penpos2(hair,alpha+45);
- z2=z1l+(1/4sqrt(2)*hair)*dir(alpha-45);
- penpos3(hair,alpha-45);
- z3=z1r+(1/4sqrt(2)*hair)*dir(alpha-135);
- z4=z1+kuulleke*dir(alpha-90);
-
- penpos5(thick,0);
- z5=(x1,foot_top);
-
- z6=(0,h/2);
- save beta; beta=angle(z1l-z6);
- penpos7(thin,beta-90);
- z7l=z6;
- penpos8(thin/cosd(beta),-90);
- z8l=z1l;
- penpos9(hair,beta-90);
- z9r=z8r+(hair/cosd(beta))*(0,-1);
- save gamma; gamma=angle(length(z1r-z1),+2kuulleke);
- fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l..z3r{down}..{down}z5r{left}..z5..{left}z5l{up}..{up}z2l..cycle;
- fill z7l{dir(beta)}..{dir(beta)}z1l..z2r..z9r{up}..z9l{dir(180+beta)}..{dir(180+beta)}z7r..cycle;
- penlabels(7,8,9);
-
- draw_foot(x1);
-fet_endchar;
-
-fet_beginchar("Numeral 2", "2", "two")
- set_char_box(0, 2thick#+3thin#, 0, height#);
- clearxy;
- save alpha; alpha=-50;
- save beta; beta=75;
- penpos1(thin,90+beta);
- z1=(0,0)+(1/2sqrt(2)*thin)*dir(45);
- penpos3(hair,90+beta);
- z3=(w,thick)+(1/2sqrt(2)*hair)*dir(-135);
- penpos2(3/4thick,90+alpha);
- x2-x1=x3-x2; y2=thick/2;
- penlabels(1,2,3);
-
- fill z1r{dir(beta)}..{dir(alpha)}z2r..{dir(beta)}z3r..z3l{dir(180+beta)}..{dir(180+alpha)}z2l..{dir(180+beta)}z1l..cycle;
-
- penpos4(thin,90);
- z4r=(w/2-thin-hair,2/5h);
- penpos5(thick-hair,0);
- z5r=(w-thin,(y4+y6)/2);
- penpos6(thin,90);
- z6r=(w/2-thin-hair,h);
- penlabels(4,5,6);
-% fill z1l{dir(beta)}..{dir(5)}z4l..{up}z5r..{left}z6r..z6l{right}..z5l{down}..z4r{dir(180+5)}..{dir(180+beta)}z1r..cycle;
- penpos7(thick,90);
- z7l=(thick/2,y5-hair);
- penpos8(thick,0);
- z8=z7;
- penlabels(7,8);
- fill z1l{dir(beta)}..{dir(20)}z4l..{up}z5r..{left}z6r..z8l{down}..z7l{right}..{up}z8r..tension0.75..z6l{right}..z5l{down}..z4r{dir(180+20)}..{dir(180+beta)}z1r..cycle;
-fet_endchar;
-
-fet_beginchar("Numeral 4", "4", "four")
- set_char_box(0, 5/2thick#+3thin#, 0, height#);
- save alpha; alpha=0;
- penpos1(3/2thick,alpha);
- z1r=(w-3thin,height);
- penpos2(hair,alpha+45);
- z2=z1l+(1/4sqrt(2)*hair)*dir(alpha-45);
- penpos3(hair,alpha-45);
- z3=z1r+(1/4sqrt(2)*hair)*dir(alpha-135);
- z4=z1+kuulleke*dir(alpha-90);
-
- z5=(thin,1/4height+thin);
- save beta; beta=angle(z3r-z5);
- penpos6(thin,-90);
- z6l=z5;
- penpos7(thin,-90);
- y7=y6; x7=w-1/2thin;
- penpos8(thin,-alpha);
- z8r=z5;
- save gamma; gamma=angle(length(z1r-z1),+2kuulleke);
- fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l..z3r{dir(180+beta)}..{dir(180+beta)}z8r{right}..{right}z7l..z7r{left}..{left}z6r..z8l{dir(beta)}..{up}z2l..cycle;
- penlabels(1,2,3,4,5,6,7);
-
- clearxy;
-
- save alpha; alpha=beta;
- penpos1(thick/cosd(alpha),alpha);
- % ugh, must be just > foot_width/2!
- z1r=(w-3thin,height-(thin+hair)/cosd(alpha));
- penpos2(hair,alpha+45);
- z2=z1l+(1/4sqrt(2)*hair)*dir(alpha-45);
- penpos3(hair,alpha-45);
- z3=z1r+(1/4sqrt(2)*hair)*dir(alpha-135);
- z4=z1+kuulleke*dir(alpha-90);
-
- % ugh
- % the angle alpha may just let the hair penposes 3 and 4
- % stick-out to the right of the vertical...
-% penpos5(thick,0);
-% z5=(x1,foot_top);
- penpos5(whatever,0);
- x5r-x5l=x3r-x2l; x5r=x3r; y5=foot_top;
-
- save gamma; gamma=angle(length(z1r-z1),+2kuulleke);
- fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l..z3r{down}..{down}z5r{left}..z5..{left}z5l{up}..{up}z2l..cycle;
- penlabels(1,2,3,4,5);
-
- draw_foot(x5);
-fet_endchar;
-
-fet_beginchar("Numeral 7", "7", "seven")
-% set_char_box(0, 5/2thick#+thin#, 0, height#);
- set_char_box(0, 5/2thick#+2thin#, 0, height#);
- save alpha; alpha=-180;
- penpos1(3/2thick,alpha);
- z1r=(thin,0);
- penpos2(hair,alpha+45);
- z2=z1l+(1/4sqrt(2)*hair)*dir(alpha-45);
- penpos3(hair,alpha-45);
- z3=z1r+(1/4sqrt(2)*hair)*dir(alpha-135);
- z4=z1+kuulleke*dir(alpha-90);
-
- save beta; beta=50;
- penpos5(thin,90+beta);
- z5=(w,h)+(1/2sqrt(2)*thin)*dir(-135);
-
- save gamma; gamma=angle(length(z1r-z1),+2kuulleke);
- save delta; delta=12;
- fill z2r{dir(alpha-gamma)}..z4..{dir(alpha+gamma)}z3l..z3r{dir(beta+delta)}..{dir(beta)}z5r..z5l{dir(180+beta)}..{dir(delta-90)}z2l..cycle;
- penlabels(1,2,3,4,5);
-
- clearxy;
- save alpha; alpha=-50;
- penpos1(2thin,90);
-% z1=(3/2thin,h-thick/2-thin);
- z1=(3/2thin,h-(thick+thin)/2);
- penpos3(thin,90+beta);
- z3=(w,h)+(1/2sqrt(2)*thin)*dir(-135);
- penpos2(3/4thick,90+alpha);
- x2-x1=x3-x2; y2=h-thick/2;
-
- penpos4(thin,0);
- z4l=(0,h-thin/2);
- penpos5(thin,0);
- z5l=(0,h/2+thin/2);
-
- penpos6(4thin,90);
- z6r=(thin,y1r+thin/2);
-
- fill z1r{dir(beta)}..{dir(alpha)}z2r..{dir(beta)}z3r..z3l{dir(180+beta)}..{dir(180+alpha)}z2l..{dir(180+beta)}z1l..z6l{down}..{down}z5r..z5l{up}..{up}z4l..z4r{down}..{down}z6r..{right}cycle;
- penlabels(1,2,3,4,5,6);
-
-
-fet_endchar;
-
-
-fet_endgroup("nummer")
+++ /dev/null
-% feta-nummer10.mf
-% part of LilyPond's pretty-but-neat music font
-
-input autometric;
-fet_beginfont("feta-nummer", 10);
-
-mode_setup;
-
-input feta-nummer;
-
-fet_endfont("feta-nummer");
-
-end.
-
--- /dev/null
+% feta-orator.mf
+% part of LilyPond's pretty-but-neat music font
+
+fet_begingroup("orator")
+
+height#:=designsize;
+thick#:=height#/4;
+thin#:=thick#/4;
+hair#:=thin#/2;
+kuulleke#:=thin#;
+
+define_pixels(height,thick,thin,hair);
+foot_top#:=2thin#;
+foot_width#:=2thick#+thin#;
+define_pixels(foot_top,foot_width);
+define_pixels(kuulleke);
+
+def draw_foot(expr xpos) =
+ begingroup;
+ clearxy;
+ penpos1(thick,0);
+ z1=(xpos,foot_top);
+ penpos2(foot_width,0);
+ z2=(x1,0);
+ penpos3(hair,-90);
+ z3r=z2r;
+ penpos4(hair,90);
+ z4l=z2l;
+ z5=(x1,hair/2);
+ fill z1..{right}z1r{down}..{right}z3l..z3r{left}..z5..{left}z4l..z4r{right}..{up}z1l{right}..z1..cycle;
+ endgroup;
+enddef;
+
+fet_beginchar("Numeral 0", "0", "zero")
+ set_char_box(0, 3thick#, 0, height#);
+ penpos1(thin,90);
+ z1r=(w/2,h);
+ penpos2(thick,0);
+ z2r=(w,h/2);
+ penpos3(thin,-90);
+ z3r=(w/2,0);
+ penpos4(thick,180);
+ z4r=(0,h/2);
+ fill z1r..z2r..z3r..z4r..cycle;
+ unfill z1l..tension1.2..z2l..tension1.2..z3l..tension1.2..z4l..tension1.2..cycle;
+fet_endchar;
+
+fet_beginchar("Numeral 1", "1", "one")
+ set_char_box(0, 5/2thick#+thin#, 0, height#);
+ penpos1(thick,0);
+ z1=(thick+thick/2,height);
+ penpos2(hair,45);
+ z2=z1l+(1/4sqrt(2)*hair)*(1,-1);
+ penpos3(hair,-45);
+ z3=z1r+(1/4sqrt(2)*hair)*(-1,-1);
+ x4=x1; y4=y1-kuulleke;
+
+ penpos5(thick,0);
+ z5=(x1,foot_top);
+
+ z6=(0,h/2);
+ save alpha; alpha=angle(z1l-z6);
+ penpos7(thin,alpha-90);
+ z7l=z6;
+ penpos8(thin/cosd(alpha),-90);
+ z8l=z1l;
+ penpos9(hair,alpha-90);
+ z9r=z8r+(hair/cosd(alpha))*(0,-1);
+ fill z2r{(1,-1)}..z4..{(1,1)}z3l..z3r{down}..{down}z5r{left}..z5..{left}z5l{up}..{up}z2l..cycle;
+% fill z7l{dir(alpha)}..{dir(alpha)}z2l{down}..z9r{up}..z9l{dir(180+alpha)}..{dir(180+alpha)}z7r..cycle;
+ fill z7l{dir(alpha)}..{dir(alpha)}z1l..z2r..z9r{up}..z9l{dir(180+alpha)}..{dir(180+alpha)}z7r..cycle;
+ penlabels(7,8,9);
+
+ draw_foot(x1);
+fet_endchar;
+
+fet_beginchar("Numeral 4", "4", "four")
+ set_char_box(0, 5/2thick#+3thin#, 0, height#);
+ penpos1(3/2thick,0);
+ z1r=(w-3thin,height);
+ z2=(thin,1/4height+thin);
+ penpos3(hair,45);
+ z3=z1l+(1/4sqrt(2)*hair)*(1,-1);
+ penpos4(hair,-45);
+ z4=z1r+(1/4sqrt(2)*hair)*(-1,-1);
+ x5=x1; y5=y1-kuulleke;
+ save alpha; alpha=angle(z4r-z2);
+ penpos6(thin,-90);
+ z6l=z2;
+ penpos7(thin,-90);
+ y7=y6; x7=w-1/2thin;
+ penpos8(thin,-alpha);
+ z8r=z2;
+ fill z3r{(1,-1)}..z5..{(1,1)}z4l..z4r{dir(180+alpha)}..{dir(180+alpha)}z8r{right}..{right}z7l..z7r{left}..{left}z6r..z8l{dir(alpha)}..{up}z3l..cycle;
+ penlabels(1,2,3,4,5,6,7);
+
+ clearxy;
+ penpos1(thick/cosd(alpha),alpha);
+ % ugh, must be just > foot_width/2!
+ z1r=(w-3thin,height-(thin+hair)/cosd(alpha));
+ penpos2(hair,alpha+45);
+ z2=z1l+(1/4sqrt(2)*hair)*dir(alpha-45);
+ penpos3(hair,alpha-45);
+ z3=z1r+(1/4sqrt(2)*hair)*dir(alpha-135);
+ z4=z1+kuulleke*dir(alpha-90);
+
+ % ugh
+ % the angle alpha may just let the hair penposes 3 and 4
+ % stick-out to the right of the vertical...
+% penpos5(thick,0);
+% z5=(x1,foot_top);
+ penpos5(whatever,0);
+ x5r-x5l=x3r-x2l; x5r=x3r; y5=foot_top;
+
+ fill z2r{dir(alpha-45)}..z4..{dir(alpha+45)}z3l..z3r{down}..{down}z5r{left}..z5..{left}z5l{up}..{up}z2l..cycle;
+ penlabels(1,2,3,4,5);
+
+ draw_foot(x5);
+fet_endchar;
+
+fet_endgroup("orator")
--- /dev/null
+% feta-orator20.mf
+% part of LilyPond's pretty-but-neat music font
+
+input autometric;
+fet_beginfont("feta-orator", 10);
+
+mode_setup;
+
+input feta-orator;
+
+fet_endfont("feta-orator");
+
+end.
+
% generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 01:50:48 1997
+% on Mon Oct 20 23:14:01 1997
% Do not edit
% input from out/font-en-tja16.log
% name
\fetdef\pedalheel{36}
\fetdef\pedaltoe{37}
-% floogbars
+% flags
\fetdef\eighthflag{38}
\fetdef\deighthflag{39}
\fetdef\sixteenthflag{40}
\fetdef\dsixteenthflag{41}
+\fetdef\thirtysecondflag{42}
+\fetdef\dthirtysecondflag{43}
+\fetdef\sixtyfourthflag{44}
+\fetdef\dsixtyfourthflag{45}
% generated automatically by mf-to-table.py version 0.4
-% on Mon Oct 20 01:50:55 1997
+% on Mon Oct 20 23:14:08 1997
% Do not edit
% input from out/font-en-tja20.log
% name
\fetdef\pedalheel{36}
\fetdef\pedaltoe{37}
-% floogbars
+% flags
\fetdef\eighthflag{38}
\fetdef\deighthflag{39}
\fetdef\sixteenthflag{40}
\fetdef\dsixteenthflag{41}
+\fetdef\thirtysecondflag{42}
+\fetdef\dthirtysecondflag{43}
+\fetdef\sixtyfourthflag{44}
+\fetdef\dsixtyfourthflag{45}
projects / lilypond.git / commitdiff