From c931e40e0b37f87c2b7c27aa5a2a0633b371d962 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 3 Nov 2000 13:00:39 +0100 Subject: [PATCH] patch::: 1.3.103.jcn1 1.3.103.jcn1 ============ * Added tex/dynamics.tex and tex/number.tex to ensure feta fonts are fine. * Fulfilled long standing promise: fixed arpeggios in vicinity of collisions (removed a ';' thus re-adding rhythmic-head support :-). * Removed non-ascii characters from contributed Chord name code. * Finished rewrite of auto-beam. * Small bugfix for lilypond-mode. --- CHANGES | 14 +++++++ VERSION | 2 +- debian/rules | 3 +- input/bugs/arpeggio-collision.ly | 43 +++++++++++++++++++++ input/scarlatti-test.ly | 15 ++++---- input/test/ac-extra-voice.ly | 2 +- input/test/auto-beam-4-8.ly | 5 ++- input/test/auto-beam-override.ly | 6 +-- input/test/hara-kiri-switch.ly | 2 +- input/test/jazz-chords.ly | 2 +- input/test/standchen-as5.ly | 2 +- input/test/standchen-as9.ly | 2 +- lily/arpeggio-engraver.cc | 17 +++------ lily/auto-beam-engraver.cc | 11 +----- lily/change-translator.cc | 1 - lily/include/change-translator.hh | 1 - lily/local-key-engraver.cc | 4 ++ lily/pitch-squash-engraver.cc | 1 - lily/staff-bar.cc | 1 - lilypond-mode.el | 2 +- scm/auto-beam.scm | 63 +++++++++++++------------------ scm/chord-names.scm | 21 ++++++++--- scm/element-descriptions.scm | 6 ++- scripts/convert-mudela.py | 14 ++++++- tex/dyn.tex | 50 ++++++++++++++++++++++++ tex/number.tex | 33 ++++++++++++++++ 26 files changed, 232 insertions(+), 91 deletions(-) create mode 100644 input/bugs/arpeggio-collision.ly create mode 100644 tex/dyn.tex create mode 100644 tex/number.tex diff --git a/CHANGES b/CHANGES index 7ef18f0c3b..9260d79a97 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +1.3.103.jcn1 +============ + +* Added tex/dynamics.tex and tex/number.tex to ensure feta fonts are fine. + +* Fulfilled long standing promise: fixed arpeggios in vicinity of collisions +(removed a ';' thus re-adding rhythmic-head support :-). + +* Removed non-ascii characters from contributed Chord name code. + +* Finished rewrite of auto-beam. + +* Small bugfix for lilypond-mode. + 1.3.102.jcn1 ============ diff --git a/VERSION b/VERSION index 4f5c5d4af3..6fa7b1df33 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=103 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/debian/rules b/debian/rules index 2330b5cf67..42631883e4 100755 --- a/debian/rules +++ b/debian/rules @@ -84,7 +84,8 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - cp -av lilypond-mode.el $(r)/usr/share/emacs/site-lisp/ + cp -av lilypond-mode.el lilypond-font-lock.el \ + $(r)/usr/share/emacs/site-lisp/ dh_installdocs DEDICATION NEWS ROADMAP TODO *.txt \ Documentation/pictures/out/*.png \ Documentation/out/*.txt \ diff --git a/input/bugs/arpeggio-collision.ly b/input/bugs/arpeggio-collision.ly new file mode 100644 index 0000000000..996f19a696 --- /dev/null +++ b/input/bugs/arpeggio-collision.ly @@ -0,0 +1,43 @@ + +hairyChord = \context Staff \notes\relative c' < + \context Voice=one { + \property Voice.Stem \push #'direction = #1 + \property Voice.NoteColumn \push #'horizontal-shift = #0 + e4\arpeggio + } + + \context Voice=two { + \property Voice.Stem \push #'direction = #1 + \property Voice.NoteColumn \push #'horizontal-shift = #1 + cis\arpeggio + } + + \context Voice=three { + \property Voice.Stem \push #'direction = #1 + \property Voice.NoteColumn \push #'horizontal-shift = #2 + ais\arpeggio + } + + \context Voice=four { + \property Voice.Stem \push #'direction = #-1 + \property Voice.NoteColumn \push #'horizontal-shift = #-1 + fis\arpeggio + } +> + + +\score{ + \notes \transpose c'' { + \context Voice < fis''-\arpeggio g d a > + \context Voice < fis,-\arpeggio g d a > + \context Voice < fis''-\arpeggio g d a > + \hairyChord + } + \paper { + linewidth = -1.; + \translator{ + \StaffContext + connectArpeggios = ##t + } + } +} diff --git a/input/scarlatti-test.ly b/input/scarlatti-test.ly index 3638bc3da1..2da7ab6024 100644 --- a/input/scarlatti-test.ly +++ b/input/scarlatti-test.ly @@ -4,11 +4,12 @@ %sonata-specific settings \paper { \translator{\VoiceContext - beamAutoBegin=0; - beamAutoEnd_8=#(make-moment 3 8) - beamAutoEnd_16=#(make-moment 3 8) - beamAutoEnd_24=#(make-moment 1 8) - beamAutoEnd_32=#(make-moment 1 8) + %% huh? + %%beamAutoBegin=0; + AutoBeam \push #'(end 1 8 * *) = #(make-moment 3 8) + AutoBeam \push #'(end 1 16 * *) = #(make-moment 3 8) + AutoBeam \push #'(end 1 24 * *) = #(make-moment 1 8) + AutoBeam \push #'(end 1 32 * *) = #(make-moment 1 8) } } @@ -25,8 +26,8 @@ ls={\property Voice.forceHorizontalShift="-0.6"} sls={\property Voice.forceHorizontalShift="-0.22"} rs={\property Voice.forceHorizontalShift="0.6"} srs={\property Voice.forceHorizontalShift="0.22"} -ab={\property Voice.noAutoBeaming="0"} -xb={\property Voice.noAutoBeaming="1"} +ab={\property Voice.noAutoBeaming=##f} +xb={\property Voice.noAutoBeaming=##t} %} diff --git a/input/test/ac-extra-voice.ly b/input/test/ac-extra-voice.ly index bf3467bcaf..fba60bd225 100644 --- a/input/test/ac-extra-voice.ly +++ b/input/test/ac-extra-voice.ly @@ -62,7 +62,7 @@ accompany = \notes \relative c{ slurVerticalDirection = #1 verticalDirection = -1 - beamAutoEnd = #(make-moment 1 2) + AutoBeam \push (end * * * *) = #(make-moment 1 2) } } \midi { diff --git a/input/test/auto-beam-4-8.ly b/input/test/auto-beam-4-8.ly index 5292a25354..d962dbf429 100644 --- a/input/test/auto-beam-4-8.ly +++ b/input/test/auto-beam-4-8.ly @@ -3,7 +3,7 @@ \time 4/8; %{ - the default for 4/8 (see ly/auto-beam-settings.ly) + the default for 4/8 (see scm/auto-beam.scm) ---- -------- | | | |--| x| x| x| x| x| @@ -17,7 +17,8 @@ | | | |--| x| x| x| x| x| %} - \property Voice.beamAutoEnd = #(make-moment 2 4) + %\property Voice.beamAutoEnd = #(make-moment 2 4) + \property Voice.AutoBeam \push #'(end * * * *) = #(make-moment 2 4) c8 c c c16 c } diff --git a/input/test/auto-beam-override.ly b/input/test/auto-beam-override.ly index ba6d5dcc4d..4b79886fb0 100644 --- a/input/test/auto-beam-override.ly +++ b/input/test/auto-beam-override.ly @@ -17,7 +17,7 @@ c8 c c c c16 c c c c c c c % from here on consider ending beam every 1/4 note - \property Voice.beamAutoEnd = #(make-moment 1 4) + \property Voice.AutoBeam \push #'(end * * * *) = #(make-moment 1 4) c8 c c c % manually override autobeam with weird beaming c8 [c c] c @@ -25,14 +25,14 @@ c8 c c4 r8 c c c % no autobeaming - \property Voice.beamAuto = #f + \property Voice.beamAuto = ##f c8 c c c } \paper{ \translator{ \VoiceContext % consider ending beam at every 1/2 note - beamAutoEnd = "1/2"; + AutoBeam \push #'(end * * * *) = #(make-moment 1 2) } } } diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index e1c41c282c..f0219b663c 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -43,7 +43,7 @@ grandstaff = \context GrandStaff = one < \paper{ linewidth=80.0\mm; - \translator { \VoiceContext noAutoBeaming = "1"; } + \translator { \VoiceContext noAutoBeaming = ##t; } \translator { \HaraKiriStaffContext } \translator { \OrchestralScoreContext skipBars = 1; } } diff --git a/input/test/jazz-chords.ly b/input/test/jazz-chords.ly index 3ec8bd437d..90f1c26eea 100644 --- a/input/test/jazz-chords.ly +++ b/input/test/jazz-chords.ly @@ -44,7 +44,7 @@ c:13-.9+^11 % 7(#9,b13) % half diminished chords c:m5-.7 % slashed o = m7b5 -c:9.3-.5- % ø7(pure 9) +c:9.3-.5- % o/7(pure 9) % diminished chords c:m5-.7- % o = diminished seventh chord diff --git a/input/test/standchen-as5.ly b/input/test/standchen-as5.ly index c36178ee77..809b0088ba 100644 --- a/input/test/standchen-as5.ly +++ b/input/test/standchen-as5.ly @@ -27,7 +27,7 @@ \translator { \VoiceContext beamHeight = ##f - beamAutoBegin= #(make-moment 0 1) + AutoBeam \push (begin * * * *) = #(make-moment 0 1) textEmptyDimension = ##t } } diff --git a/input/test/standchen-as9.ly b/input/test/standchen-as9.ly index 9ac7aaacc5..c7d544a713 100644 --- a/input/test/standchen-as9.ly +++ b/input/test/standchen-as9.ly @@ -27,7 +27,7 @@ \translator { \VoiceContext beamHeight = ##f - beamAutoBegin= #(make-moment 0 1) + AutoBeam \push (begin * * * *) = #(make-moment 0 1) textEmptyDimension = ##t } } diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index 5a95deecdc..7455bf2255 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -66,13 +66,11 @@ Arpeggio_engraver::acknowledge_element (Score_element_info info) stems_.push (info.elem_l_); } - else - - /* - We can't catch local key items from Voice context, but let's leave - it here in case someone moves this stuff around. */ - if (Rhythmic_head::has_interface (info.elem_l_) - || Local_key_item::has_interface (info.elem_l_)) + /* + We can't catch local key items (accidentals) from Voice context, + see Local_key_engraver + */ + else if (Rhythmic_head::has_interface (info.elem_l_)) { supports_.push (info.elem_l_); } @@ -87,16 +85,13 @@ Arpeggio_engraver::process_acknowledged () arpeggio_ = new Item (get_property ("Arpeggio")); arpeggio_->set_parent (stems_[0], Y_AXIS); - // Staff_symbol_referencer::set_interface (arpeggio_); - for (int i = 0; i < stems_.size (); i++) { Pointer_group_interface::add_element (arpeggio_, "stems", stems_[i]); - //Side_position::add_support (arpeggio_, stems_[i]); } for (int i = 0; i < supports_.size (); i++) { - ;//Side_position::add_support (arpeggio_, supports_[i]); + Side_position::add_support (arpeggio_, supports_[i]); } announce_element (arpeggio_, arpeggio_req_); } diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index bdf6aefe10..e20498a2d8 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -97,8 +97,7 @@ Auto_beam_engraver::consider_end_and_begin (Moment test_mom) SCM type = gh_list (gh_int2scm (test_mom.num_i ()), gh_int2scm (test_mom.den_i ()), SCM_UNDEFINED); - // fixme - SCM settings = scm_eval2 (ly_symbol2scm ("auto-beam-settings"), SCM_EOL); + SCM settings = get_property ("AutoBeam"); /* Determine end moment for auto beaming (and begin, mostly 0==anywhere) @@ -126,14 +125,6 @@ Auto_beam_engraver::consider_end_and_begin (Moment test_mom) */ - - // - // - // FIXME: arg: why all these guesses in reverse order? - // - // - - /* first guess: begin beam at any position */ diff --git a/lily/change-translator.cc b/lily/change-translator.cc index 8b13789179..e69de29bb2 100644 --- a/lily/change-translator.cc +++ b/lily/change-translator.cc @@ -1 +0,0 @@ - diff --git a/lily/include/change-translator.hh b/lily/include/change-translator.hh index 8b13789179..e69de29bb2 100644 --- a/lily/include/change-translator.hh +++ b/lily/include/change-translator.hh @@ -1 +0,0 @@ - diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 866e1c2d9b..685f6c0f37 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -160,6 +160,10 @@ Local_key_engraver::process_acknowledged () { /* Hmm. Which one has to be on the left? + + On which left, code or paper? + + (Arpeggios are engraved left of accidentals, of course.) */ for (int i=0; i < arpeggios_.size (); i++) Side_position::add_support (arpeggios_[i], key_item_p_); diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc index 0bed2d606e..90a73ea0ec 100644 --- a/lily/pitch-squash-engraver.cc +++ b/lily/pitch-squash-engraver.cc @@ -8,7 +8,6 @@ */ #include "staff-symbol-referencer.hh" #include "note-head.hh" -#include "pitch-squash-engraver.hh" #include "rhythmic-head.hh" #include "engraver.hh" diff --git a/lily/staff-bar.cc b/lily/staff-bar.cc index 8b13789179..e69de29bb2 100644 --- a/lily/staff-bar.cc +++ b/lily/staff-bar.cc @@ -1 +0,0 @@ - diff --git a/lilypond-mode.el b/lilypond-mode.el index 8250db03fe..71c3a68429 100644 --- a/lilypond-mode.el +++ b/lilypond-mode.el @@ -8,7 +8,7 @@ ;;; Inspired on auctex -(load-file "lilypond-font-lock.el") +(load-library "lilypond-font-lock") (require 'easymenu) (require 'compile) diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 280974bc8f..5bf7ad772c 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -1,46 +1,34 @@ ;;; -;;; auto-beam.scm -- Auto-beam settings +;;; auto-beam.scm -- Auto-beam-engraver settings ;;; ;;; source file of the GNU LilyPond music typesetter ;;; ;;; (c) 2000 Jan Nieuwenhuizen ;;; -;;; setup for auto-beam engraver -;;; -;;; specify generic beam end times +;;; specify generic beam begin and end times ;;; format: ;;; -;;; [time-signature]'beamAutoEnd'[duration] +;;; function shortest-duration-in-beam time-signature ;;; ;;; where ;;; -;;; time-signature = 'time'[numerator]'_'denominator; eg: 3_4 -;;; duration = [numerator]'_'denominator; eg: 3_8, _16 +;;; function = begin or end +;;; shortest-duration-in-beam = numerator denominator; eg: 1 16 +;;; time-signature = numerator denominator, eg: 4 4 ;;; +;;; unspecified or wildcard entries for duration or time-signature +;;; are given by * * -;;; in 3/2 time: -;;; end beams each 1/2 note -;;; end beams with 16th notes each 1/4 note -;;; end beams with 32th notes each 1/8 note - +;;; maybe do: '(end shortest-1 16 time-3 4) ? -;;; -;;;UGH UGH. -;;; -;;;Fixme: should use an alist -;;; -;;;autoBeamSettings = (list -;;; (cons (list (make-moment MEASURE) TIME-SIGNATURE) (make-moment INTERVAL) -;;; .. -;;; -;;; ) -;;; -;;; +;;; in 3 2 time: +;;; end beams each 1 2 note +;;; end beams with 16th notes each 1 4 note +;;; end beams with 32th notes each 1 8 note (define auto-beam-settings - (list `( ((end * * 3 2) . ,(make-moment 1 2)) ((end 1 16 3 2) . ,(make-moment 1 4)) @@ -58,9 +46,9 @@ ((end * * 3 8) . ,(make-moment 3 8)) ;; in common time: - ;; end beams each 1/2 note - ;; end beams with 32th notes each 1/8 note - ;; end beams with 1/8 triplets each 1/4 note + ;; end beams each 1 2 note + ;; end beams with 32th notes each 1 8 note + ;; end beams with 1 8 triplets each 1 4 note ((end * * 4 4) . ,(make-moment 1 2)) ((end 1 12 4 4) . ,(make-moment 1 4)) @@ -90,25 +78,26 @@ ((end * * 12 8) . ,(make-moment 3 8)) ((end 1 16 12 8) . ,(make-moment 3 8)) ((end 1 32 12 8) . ,(make-moment 1 8)) - ))) + (meta . ,(element-description "AutoBeam")) + )) ;;; Users may override in most cases, simply by issuing ;;; -;;; ;;; from here on consider ending beam every 1/4 note -;;; \property Voice.beamAutoend1_1 = (make-moment 1 4) +;;; % from here on consider ending beam every 1 4 note +;;; \property Voice.AutoBeam \push #'(end * * * *) = #(make-moment 1 4) ;;; -;;; ;;; no autobeaming -;;; \property Voice.beamAuto = f +;;; % no autobeaming +;;; \property Voice.beamAuto = ##f ;;; -;;;or, more globally, by doing: +;;; or, more globally, by doing: ;;; ;;; \paper{ ;;; \translator{ ;;; \VoiceContext -;;; ;;; consider ending beam at every 1/2 note -;;; beamAutoend1_1 = (make-moment 1 2) +;;; % consider ending beam at every 1 2 note +;;; AutoBeam \push #'(end * * * *) = #(make-moment 1 2) ;;; } ;;; } ;;; -;;; see also input/test/auto-beam-override.ly +;;; see also input test auto-beam-override.ly diff --git a/scm/chord-names.scm b/scm/chord-names.scm index 418882146d..1cac00d032 100644 --- a/scm/chord-names.scm +++ b/scm/chord-names.scm @@ -63,6 +63,9 @@ ;; See input/test/american-chords.ly ;; ;; James Hammons, +;; + +;; DONT use non-ascii characters, even if ``it works'' in Windows (define chord::names-alist-american '()) (set! chord::names-alist-american @@ -106,7 +109,7 @@ ) chord::names-alist-american)) -;; Jazz chords, by Atte André Jensen +;; Jazz chords, by Atte Andr'e Jensen ;; NBs: This uses the american list as a base. ;; Some defs take up more than one line, ;; be carefull when messing with ;'s!! @@ -120,6 +123,8 @@ ;; ;; ;; +;; DONT use non-ascii characters, even if ``it works'' in Windows + (define chord::names-alist-jazz '()) (set! chord::names-alist-jazz (append @@ -214,17 +219,21 @@ ;; diminished chord(s) ; diminished seventh chord = o - ;(((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (((raise . 0.8)"o"))); works, but "o" is a little big - (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (("°"))) + + + ;; DONT use non-ascii characters, even if ``it works'' in Windows + + ;;(((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (((raise . 0.8)"o"))); works, but "o" is a little big + (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ((raise . 0.8) (size . -2) ("o"))) ;; half diminshed chords ; half diminished seventh chord = slashed o - (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (((raise . 0.8)"ø"))); works, but "ø" is a little big + (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (((raise . 0.8)"/o"))) ; half diminished seventh chord with major 9 = slashed o cancelation 9 (((0 . 0) (2 . -1) (4 . -1) (6 . -1) (1 . 0)) . ( - ((raise . 0.8)"ø(") + ((raise . 0.8)"/o(") ((raise . 0.3)(music (named ("accidentals-0")))) - ((raise . 0.8)"9)"))); works, but "ø" is a little big + ((raise . 0.8)"9)"))); ;; Missing jazz chord definitions go here (note new syntax: see american for hints) diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm index ac46e1c525..b9145a22ef 100644 --- a/scm/element-descriptions.scm +++ b/scm/element-descriptions.scm @@ -11,8 +11,10 @@ (staff-position . 0.0) (meta . ,(element-description "Arpeggio" arpeggio-interface side-position-interface font-interface)) )) - - (BarLine . ( + + (AutoBeam . ,auto-beam-settings) + + (BarLine . ( (break-align-symbol . Staff_bar) (glyph . "|") (break-glyph-function . ,default-break-barline) diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index c6d70e2e4c..d20850de47 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -544,12 +544,24 @@ if 1: if re.search ('\\\\textscript "[^"]* *"[^"]*"', str): sys.stderr.write ('\nNot smart enough to convert to new \\textscript markup text') - str = re.sub ('\\textscript +\("[^"]*"\)', '\\textscript #\1', str) + str = re.sub ('\\textscript +("[^"]*")', '\\textscript #\\1', str) return str conversions.append ((1,3,97), conv, 'ChordName -> ChordNames') +if 1: + def conv (str): + str = re.sub ('beamAutoEnd_([0-9]*) *= *(#\\([^)]*\\))', 'AutoBeam \\push #\'(end 1 \\1 * *) = \\2', str) + str = re.sub ('beamAutoBegin_([0-9]*) *= *(#\\([^)]*\))', 'AutoBeam \\push #\'(begin 1 \\1 * *) = \\2', str) + str = re.sub ('beamAutoEnd *= *(#\\([^)]*\\))', 'AutoBeam \\push #\'(end * * * *) = \\1', str) + str = re.sub ('beamAutoBegin *= *(#\\([^)]*\\))', 'AutoBeam \\push #\'(begin * * * *) = \\1', str) + + + return str + + conversions.append ((1,3,102), conv, 'beamAutoEnd -> AutoBeam \\push (end * * * *)') + ############################ diff --git a/tex/dyn.tex b/tex/dyn.tex new file mode 100644 index 0000000000..6db8f0082d --- /dev/null +++ b/tex/dyn.tex @@ -0,0 +1,50 @@ +% dyn.tex + +\font\fetaelevenfont=feta-din11 +\font\fetathirteenfont=feta-din13 +\font\fetasixteenfont=feta-din16 +\font\fetatwentyfont=feta-din20 +\font\fetatwentythreefont=feta-din23 +\font\fetatwentysixfont=feta-din26 + +\def\fetafont{\fetasixteenfont} + +\def\test#1{% + \hbox {% + \vrule height #1pt width 5pt + \hbox { pp p mp mf f ff } + \vrule height #1pt width 5pt + } + +} + +\def\testa#1{% + \hbox{ + \vrule height #1pt width 5pt + \hbox { sf sp sfz rfz } + \vrule height #1pt width 5pt + } + +} + +\parindent0mm +\magnification \magstep 2 +\baselineskip 10mm + +\fetaelevenfont \test{11} +\fetathirteenfont \test{13} +\fetasixteenfont \test{16} +\fetatwentyfont \test{20} +\fetatwentythreefont \test{23} +\fetatwentysixfont \test{26} + + +\let\test\testa +\fetaelevenfont \test{11} +\fetathirteenfont \test{13} +\fetasixteenfont \test{16} +\fetatwentyfont \test{20} +\fetatwentythreefont \test{23} +\fetatwentysixfont \test{26} + +\end diff --git a/tex/number.tex b/tex/number.tex new file mode 100644 index 0000000000..79621b51e5 --- /dev/null +++ b/tex/number.tex @@ -0,0 +1,33 @@ +% number.tex + +\font\fetaelevenfont=feta-nummer11 +\font\fetathirteenfont=feta-nummer13 +\font\fetasixteenfont=feta-nummer16 +\font\fetatwentyfont=feta-nummer20 +\font\fetatwentythreefont=feta-nummer23 +\font\fetatwentysixfont=feta-nummer26 + +\def\fetafont{\fetasixteenfont} + +\def\test#1{% + \hbox {% + \vrule height #1pt width 5pt + \vbox{44} + \vrule height #1pt width 5pt + \hfill + } + +} + +\parindent0mm +\magnification \magstep 2 +\baselineskip 10mm + +\fetaelevenfont \test{11} +\fetathirteenfont \test{13} +\fetasixteenfont \test{16} +\fetatwentyfont \test{20} +\fetatwentythreefont \test{23} +\fetatwentysixfont \test{26} + +\end -- 2.39.5