*** ./ORIG/musicnft.tex	Fri Mar  1 00:00:00 1991
--- ./musicnft.tex	Fri Apr 26 13:02:52 1991
***************
*** 1 ****
--- 1,5 ----
+ % Font definitions for the special music fonts.
+ % By Daniel Taupin.
+ % Slightly modified by Karl Berry, karl@cs.umb.edu.
+ % 
  \def\fonthdg{c}  %  prefix to cmxxx fonts. change to "a" for amxxx fonts
***************
*** 10,11 ****
--- 14,19 ----
  %
+ % Don't show our register allocations in the log:
+ \let\@plainwlog = \wlog
+ \def\wlog#1{}%
+ %
  \font\musictwenty=musicn20
***************
*** 224 ****
--- 232,233 ----
  %
+ \let\wlog = \@plainwlog
*** ./ORIG/musictex.tex	Thu Feb 14 00:00:00 1991
--- ./musictex.tex	Fri Aug  9 06:43:39 1991
***************
*** 1 ****
--- 1,6 ----
+ % Main MusicTeX macros.
+ % By Daniel Taupin.
+ % Slightly modified by Karl Berry, karl@cs.umb.edu.
+ % 
+ %
  \catcode`\^=7%
***************
*** 6,14 ****
  \catcode`\@=11
! 
! %  PARAMETERS DIFFERENT THAN IN PLAIN
  
- \normallineskiplimit=1pt
- \parindent 10pt
  % EXTRA FONTS NEEDED
! 
  \font\eightrm=\fonthdg mr8
--- 11,22 ----
  \catcode`\@=11
! %
! % Don't show our register allocations in the log:
! \let\@plainwlog = \wlog
! \def\wlog#1{}%
! %
! % Show progress reports online?
! \newif\ifverbose
  
  % EXTRA FONTS NEEDED
! %
  \font\eightrm=\fonthdg mr8
***************
*** 109,111 ****
  \tenpoint
- \tolerance=10000\relax
  %  procedures speciales D. taupin
--- 117,118 ----
***************
*** 129,131 ****
  %
- \hsize 16cm \vsize 24cm
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--- 136,137 ----
***************
*** 579,584 ****
  \def\newbar{\thinvrule\global\advance\barno by 1\relax
!   \message{mesure \the\barno}}%
! \def\w@barno{{\y@i=\altplancher\advance\y@i by \systemheight
! \advance\y@i by \internote\raise\y@i\llap{\it \number\barno\kern -6pt}}}%
! \def\wbarno{\w@barno}%
  %
--- 585,602 ----
  \def\newbar{\thinvrule\global\advance\barno by 1\relax
!   \ifverbose
!     \message{mesure \the\barno}
!   \fi
! }%
! % The original defined \w@barno, and then defined \wbarno to be the same
! % thing.  Don't know why.  In any case, we don't always want the bar
! % numbers printed. --karl
! \newif\ifprintbarnumbers
! \def\wbarno{\ifprintbarnumbers
!   {\y@i=\altplancher
!    \advance\y@i by \systemheight
!    \advance\y@i by \internote
!    \raise\y@i
!    \llap{\it \number\barno\kern -6pt}%
!   }%
! \fi}%
  %
***************
*** 602,604 ****
  \def\barre{\t@barre}\def\updatecontext{\t@updatecon}\def\zbarre{\zt@barre}%
! \message{MESURE \the\barno: elemskip=\the\elemskip}}%
  %
--- 620,625 ----
  \def\barre{\t@barre}\def\updatecontext{\t@updatecon}\def\zbarre{\zt@barre}%
! \ifverbose
! \message{MESURE \the\barno: elemskip=\the\elemskip}%
! \fi
! }%
  %
***************
*** 610,612 ****
   \global\advance\linesinpage by -1\relax % car \alaligne aura aussi augmente
!  \message{ ligne: \the\linesinpage }%
   \else\alapage
--- 631,635 ----
   \global\advance\linesinpage by -1\relax % car \alaligne aura aussi augmente
!  \ifverbose
!    \message{ ligne: \the\linesinpage }%
!  \fi
   \else\alapage
***************
*** 620,622 ****
   \global\advance\linesinpage by -1\relax % car \alaligne aura aussi augmente
!  \message{ ligne: \the\linesinpage }%
   \else\zalapage
--- 643,647 ----
   \global\advance\linesinpage by -1\relax % car \alaligne aura aussi augmente
!  \ifverbose
!    \message{ ligne: \the\linesinpage }%
!  \fi
   \else\zalapage
***************
*** 629,631 ****
   \ifnum\linesinpage<\maxlinesinpage\l@updatecon
!  \message{ ligne: \the\linesinpage }%
   \else\p@updatecon
--- 654,658 ----
   \ifnum\linesinpage<\maxlinesinpage\l@updatecon
!  \ifverbose
!    \message{ ligne: \the\linesinpage }%
!  \fi
   \else\p@updatecon
***************
*** 1178,1190 ****
  %
! \def\getn@iletter#1{\n@i=\expandafter`\t@ruc\relax
! \ifnum\n@i >96\relax \advance\n@i by -101\relax % ramener au E (position
! % zero en clef de sol, ut@ref=0)
! \else\advance\n@i by -83\relax % ramener au S= E + 14
! \fi
! \advance\n@i by \ut@ref\relax
! \advance\n@i by \ut@ref\relax
! \advance\n@i by \transpose\relax
! \edef\s@uite{\s@tok #1{}\af@tok}\edef\ss@uite{\noexpand\n@fon{\s@uite}}}%
! %\check
  %
  \def\pt@raise{\ifodd\n@i\relax\pt@up=-0.1\Interligne\else\pt@up
--- 1205,1283 ----
  %
! % Token list to expand at the beginning of each staff in every measure.
! % 
! \newtoks\everystaff
! \everystaff = {\clefsetup}%
! %
! %
! % We want to use \a..\g to specify notes.  We do this by defining them
! % to expand into the characters 1...7, corresponding to C-a...C-g.  \let
! % doesn't work here, because a control sequence \let = to a character
! % token doesn't expand, and we use \expandafter` below.
! % 
! % We have to make the characters be letters, since \xgetn@i checks for the
! % category code, and does something different with nonletters (so it can
! % deal with accidentals).
! %
! \catcode`\^^A = 11 \def\a{^^A}%
! \catcode`\^^B = 11 \def\b{^^B}%
! \catcode`\^^C = 11 \def\c{^^C}%
! \catcode`\^^D = 11 \def\d{^^D}%
! \catcode`\^^E = 11 \def\e{^^E}%
! \catcode`\^^F = 11 \def\f{^^F}%
! \catcode`\^^G = 11 \def\g{^^G}%
! %
! % 
! % Change the letter-to-note transformation table.
! % 
! \def\clefsetup{%
!   \ifcase\ut@ref
!     % Treble clef (0).
!     % 
!     % Capital letters are ledger lines below the staff.
!     \delcode`A = -4 \delcode`B = -3 \delcode`C = -2 \delcode`D = -1
!     \delcode`E = 0 \delcode`F = -6 \delcode`G = -5
!     %
!     % Lowercase letters are on the staff.
!     \delcode`a = 3 \delcode`b = 4 \delcode`c = 5 \delcode`d = 6
!     \delcode`e = 7 \delcode`f = 1 \delcode`g = 2
!     %
!     % \a ... \g (control characters) are ledger lines above the staff.
!     \delcode`^^A = 10 \delcode`^^B = 11 \delcode`^^C = 12 \delcode`^^D = 13
!     \delcode`^^E = 14 \delcode`^^F = 8 \delcode`^^G = 9
!   \or % alto clef (1)
!   \or % alto clef (2)
!   \or % alto clef (3)
!   \or % alto clef (4)
!   \or % alto clef (5)
!   \or
!     % Bass clef (6).
!     % 
!     % Capital letters are ledger lines above the staff.
!     \delcode`A = 8 \delcode`B = 9 \delcode`C = 10 \delcode`D = 11
!     \delcode`E = 12 \delcode`F = 13 \delcode`G = 14
!     %
!     % Lowercase letters are on the staff.
!     \delcode`a = 1 \delcode`b = 2 \delcode`c = 3 \delcode`d = 4
!     \delcode`e = 5 \delcode`f = 6 \delcode`g = 7
!     %
!     % \a ... \g (control characters) are ledger lines above the staff.
!     \delcode`^^A = -6 \delcode`^^B = -5 \delcode`^^C = -4 \delcode`^^D = -3
!     \delcode`^^E = -2 \delcode`^^F = -1 \delcode`^^G = 0
!   \fi
! }%
! %
! % This is the routine from musictex.tex that changes note letters to
! % numbers. 
! % 
! \def\getn@iletter#1{%
!   % Figure out what number the note in \n@i corresponds to in the various
!   % clefs.  This information is stored in the \delcode table, when we
!   % begin to typeset in each staff.
!   % 
!   \n@i = \the\delcode\expandafter`\t@ruc
!   \advance\n@i by \transpose
!   \edef\s@uite{\s@tok #1{}\af@tok}\edef\ss@uite{\noexpand\n@fon{\s@uite}}%
! }%
  %
+ % 
  \def\pt@raise{\ifodd\n@i\relax\pt@up=-0.1\Interligne\else\pt@up
***************
*** 1400,1402 ****
  % croches, doubles croches, triples croches, quadruple croches queue en
! % haut et en bas
  %
--- 1493,1496 ----
  % croches, doubles croches, triples croches, quadruple croches queue en
! % haut et en bas.
! % I got the \plap@symss from \zhl.  -- karl
  %
***************
*** 1403,1416 ****
  \def\clp#1{\pt{#1}\cl{#1}}\def\cup#1{\pt{#1}\cu{#1}}%
  \def\cu{\mcu1}\def\ccu{\mcu2}\def\cccu{\mcu3}\def\ccccu{\mcu4}%
! \def\cl{\mcl1}\def\ccl{\mcl2}\def\cccl{\mcl3}\def\ccccl{\mcl4}%
  %
! \def\mcu#1#2{\getn@i{#2}\global\n@raise=\qu@raise
! \def\n@sym{\q@u}\edef\n@fon{\noexpand\mcu #1}%
! \ifnum\n@i<100\relax
!   \h@lines{\qn@width}\global\stem@skip=\qd@skip
! \def\s@tem{\d@cr#1}\pl@symss\fi}%
! \def\mcl#1#2{\getn@i{#2}\global\n@raise=\qu@raise
! \def\n@sym{\q@u}\edef\n@fon{\noexpand\mcl #1}%
! \ifnum\n@i<100\relax
!   \h@lines{\qn@width}\def\s@tem{\p@cr#1}\pl@symss\fi}%
  %
--- 1497,1538 ----
  \def\clp#1{\pt{#1}\cl{#1}}\def\cup#1{\pt{#1}\cu{#1}}%
+ %
+ % Stems up, first spacing notes, then non-spacing.
  \def\cu{\mcu1}\def\ccu{\mcu2}\def\cccu{\mcu3}\def\ccccu{\mcu4}%
! \def\zcu#1{\@generalmcu 1\plap@symss}%
! \def\zcu{\@generalmcu 1\plap@symss}%
! \def\zccu{\@generalmcu 2\plap@symss}%
! \def\zcccu{\@generalmcu 3\plap@symss}%
! \def\zccccu{\@generalmcu 4\plap@symss}%
! %
! % This is used by the spacing \c..u macros and perhaps in other places
! % as well.
! \def\mcu#1#2{\@generalmcu{#1}\pl@symss{#2}}%
! %
! \def\@generalmcu#1#2#3{%
!   \getn@i{#3}%
!   \global\n@raise=\qu@raise
!   \def\n@sym{\q@u}%
!   \edef\n@fon{\noexpand\mcu #1}%
!   \ifnum\n@i<100
!     \h@lines{\qn@width}\global\stem@skip=\qd@skip
!     \def\s@tem{\d@cr#1}#2%
!   \fi}%
  %
! % Stems down.  Everything is analogous.
! \def\cl{\mcl1}\def\ccl{\mcl2}\def\cccl{\mcl3}\def\ccccl{\mcl4}%
! \def\zcl{\@generalmcl 1\plap@symss}%
! \def\zccl{\@generalmcl 2\plap@symss}%
! \def\zcccl{\@generalmcl 3\plap@symss}%
! \def\zccccl{\@generalmcl 4\plap@symss}%
! %
! \def\mcl#1#2{\@generalmcl{#1}\pl@symss{#2}}%
! %
! \def\@generalmcl#1#2#3{%
!   \getn@i{#3}%			Get the note values.
!   \global\n@raise=\qu@raise %	Vertical size for this note??
!   \def\n@sym{\q@u}%		The symbol to print.
!   \edef\n@fon{\noexpand\mcl #1}%
!   \ifnum \n@i < 100
!     \h@lines{\qn@width}\def\s@tem{\p@cr#1}#2%
!   \fi}%
  %
***************
*** 1787,1788 ****
--- 1909,1913 ----
  % ********************
+ % I don't know why \zql et al. can't be defined this way, but it doesn't
+ % work: the stems always go up.  -- karl
+ % 
  \def\zwh#1{{\noteskip=\z@\wh{#1}}}%
***************
*** 2015 ****
--- 2140,2143 ----
  %\check
+ \let\wlog = \@plainwlog
+ %
+ %\catcode`@ = 12