diff options
author | Karl Berry <karl@freefriends.org> | 2010-11-04 17:58:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-11-04 17:58:55 +0000 |
commit | 33a26ef713aca0197f77396c1ef1743567d38410 (patch) | |
tree | 1fb1c9217283e5dab20d42f7779f5c31f0ecc499 /Master/texmf-dist/tex/generic/musixtex | |
parent | 5e4feaa39348e9095e158de011945a9508f46f85 (diff) |
musixtex T-114 (3nov10)
git-svn-id: svn://tug.org/texlive/trunk@20310 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/musixtex')
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/curly.tex | 44 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/tuplet.tex | 147 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/musixtex/underbracket.sty | 190 |
3 files changed, 0 insertions, 381 deletions
diff --git a/Master/texmf-dist/tex/generic/musixtex/curly.tex b/Master/texmf-dist/tex/generic/musixtex/curly.tex deleted file mode 100644 index dfe75653818..00000000000 --- a/Master/texmf-dist/tex/generic/musixtex/curly.tex +++ /dev/null @@ -1,44 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% This is curly.tex, MusiXTex code for multiple left curly brackets % -% % -% submitted by Mthimkhulu Molekwa <MMolekwa@rrs.co.za> % -% to the mutex list on 19 May 1999 % -% % -% % -% usage: % -% \curlybrackets{<instrument1lower><instrument1upper> % -% <instrument2lower><instrument2upper> % -% ... % -% <instrument_n_lower><instrument_n_upper> % -% } % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ifx\undefined\curlybrackets \else \endinput\fi -\makeatletter - -\let\origin@lwrit@staffs\writ@staffs -\def\writ@staffs{% - \origin@lwrit@staffs - \ifx\br@cks\empty\else\expandafter\@bracks\br@cks\ende\fi} - -\let\br@cks\empty -\def\curlybrackets#1{\def\br@cks{#1}} - -\def\@bracks#1#2#3\ende{% - \ifnum #1<#2 %=========================== inserted by D.S.(?) - \noinstrum@nt=#1\s@l@ctinstr\b@zi\altitude - \noinstrum@nt=#2\s@l@ctinstr\b@zii\altitude - \advance\b@zii-\b@zi - \C@Inter - \advance\b@zii\nblines\internote - \advance\b@zii\nblines\internote - \advance\b@zii-2\internote - \n@v\b@zii \sp@pt\tw@ \advance\n@v\@cxxviii - \divide\b@zii\tw@ - \advance\b@zi\b@zii - \raise\b@zi\rlap{\mxsps\char\n@v\kern\instrum@in@group}% - \fi %==================================== inserted by D.S.(?) - \ifx\empty#3\else\@bracks#3\ende\fi} - -\makeatother -%%%%%%%%%%%%%%%%%%%%%%%%%% End of curly.tex %%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/musixtex/tuplet.tex b/Master/texmf-dist/tex/generic/musixtex/tuplet.tex deleted file mode 100644 index 0dcb7aca469..00000000000 --- a/Master/texmf-dist/tex/generic/musixtex/tuplet.tex +++ /dev/null @@ -1,147 +0,0 @@ -% -% tuplet.tex - conventional tuplet brackets for MusiXTeX. -% Col. G. L. Sicherman. Last revised 2003-05-17. -% -% MusiXTeX is free software, licensed under the GNU General Public -% License. This file is also free software. You may use it and -% modify it as you please so long as you leave this message intact. -% -% To use this file with MusiXTeX, refer to it in your source code -% after MusiXTeX: -% -% \input musixtex -% \input tuplet -% -% This file uses macros defined in musixtex.tex. -% -% Standard MusiXTeX uses \uptrio and \downtrio to print tuplet brackets. -% This file defines \uptuplet and \downtuplet, with the same arguments: -% -% #1 : starting pitch -% #2 : width of bracket, in (\noteskip)s -% #3 : slope of bracket, in multiples of 1-1/8 degrees -% -% The user defines the text to appear in the opening as \tuplettxt. -% This is to avoid conflicting with the \txt in standard MusiXTeX. -% -% Examples: -% -% Draw a triplet bracket over the notes, starting at pitch "p", -% 1.25\noteskip wide, with a slope up of 3-3/8 degrees: -% -% \uptuplet p{1.25}3 -% -% Draw a sextuplet bracket over the notes, starting at pitch "a", -% 2.5\noteskip wide, with a slope down of 4-1/2 degrees: -% -% \def\tuplettxt{\smallppff 6\/\/} -% \downtuplet{a}{2.5}{-4} -% -% Send comments, complaints, and bouquets to the Colonel at -% <colonel@monmouth.com>. -% -\makeatletter % Names of internal macros contain atpersats. - -% Standard MusiXTeX prints a small "3" (or other number) within -% the bracket. Here we print the "3" in an opening in the bracket, -% so we need not use a small font. -% -% The double italic correction compensates for centering the number -% on the bracket line. - -\def\tuplettxt{\smallppff3\/\/} - -%%% The rest is adapted from standard MusixTeX. - -\newdimen\y@vii % x of right end of left part of bracket. -\newdimen\y@viii % x of left end of right part of bracket. -\newdimen\y@ix -\newbox\tuptxtb@x - -% v@rline #1=height[dimen] #2=length[dimen] #3=slope (1\eqiv 1.125degree) -% (comments and ideas from Ian Collier) (from -20 upto 20 ) -% This macro is used by some of the others which follow, -% using it directly it must be set in zero box - -\def\v@rline#1#2#3{\n@v#3\y@i#2% - \setbox\tuptxtb@x\hbox{\hskip1pt\tuplettxt\hskip1pt}% - \y@vii=\h@lf\y@i\advance\y@vii-\h@lf\wd\tuptxtb@x% - \n@ii-\tw@nty \min@n@v\n@ii - \max@n@v\tw@nty \n@iii\n@v - \ifnum\n@v<\z@ \n@v-\n@v \advance\n@v\tw@nty \fi % offset to lower linechars - \advance\n@v\@xxix - \setbox\ch@box\hbox{\mxsps\char\n@v}% - \ifdim\y@vii<\wd\ch@box \y@vii\wd\ch@box\fi% At least one whole segment! - \y@viii=\y@i\advance\y@viii-\y@vii% - \y@iv\wd\ch@box \y@ii\qu@rt\p@ \y@ii\n@iii\y@ii \y@iii\z@ - \raise#1\internote\hbox{\mxsps\char\n@iv -% -% Build bracket with slanted line segments of width 10pt. -% Left part of bracket: -% - \loop\ifdim\y@iv<\y@vii\raise\y@iii\copy\ch@box - \advance\y@iv\wd\ch@box \advance\y@iii\y@ii \repeat -% -% last element -% -% \finalheight=2.5\completewidth -% \finalheight=\n@iii\finalheight -% \divide\finalheight by 100 -% \advance\overlapwidth by -\completewidth -% \stepheight=-2.5\overlapwidth -% \stepheight=\n@iii\stepheight -% \divide\stepheight by 100 -% \advance\curheight by \stepheight -% \kern -\overlapwidth \raise\curheight \box\ch@box -% - \y@ix=\y@vii\advance\y@ix-\y@iv\hbox to\y@ix{\hss}% - \y@ix\y@vii\advance\y@ix-\wd\ch@box% - \y@iii\n@iii\y@ix\y@iii2\h@lf\y@iii\divide\y@iii\@c\raise\y@iii\copy\ch@box% -% -% Text: -% - \y@v2\h@lf\y@i \y@v\n@iii\y@v \divide\y@v\@c% - \y@ix=-\y@vii \advance\y@ix\h@lf\y@i \advance\y@ix-\h@lf\wd\tuptxtb@x% - \hbox to\y@ix{\hss}% - \y@iii\h@lf\y@v \raise\y@iii\vbox to\z@{% - \vss{\copy\tuptxtb@x}\vss} - \y@ix=\y@viii \advance\y@ix-\h@lf\y@i \advance\y@ix-\h@lf\wd\tuptxtb@x - \hbox to\y@ix{\hss}% To start of right part. No-op unless bracket is short. -% -% Right part of bracket: -% - \y@iii2\h@lf\y@viii \y@iii\n@iii\y@iii \divide\y@iii\@c% - \y@iv=\y@viii \advance\y@iv\wd\ch@box% - \loop\ifdim\y@iv<\y@i\raise\y@iii\copy\ch@box% - \advance\y@iv\wd\ch@box \advance\y@iii\y@ii \repeat -% -% Finish off the right part: -% - \y@iii\y@i\advance\y@iii-\wd\ch@box\y@iii2\h@lf\y@iii\y@iii\n@iii\y@iii% - \y@ix=\y@i\advance\y@ix-\y@iv\hbox to\y@ix{\hss}% - \divide\y@iii\@c% - \raise\y@iii\copy\ch@box% -% - \raise\y@v\hbox{\mxsps\char\n@iv}}} -% -% y@i =complete length -% y@ii =height of linechar -% y@iii =current height -% y@iv =current width -% y@v =height of ending line -% y@vii =width of left segment of bracket -% y@viii=y@vii + width of opening -% y@ix =adjustment register -% -% n@iii=slope -% n@iv =(number of char for hooks) -% n@v =slope (number of linechar) - -\def\X@bkt#1#2#3{\y@v#2\noteskip \advance\y@v\wn@width - \inhgetn@i#1\relax \rlap{\kernm\p@ne\qn@width\v@rline\n@i\y@v{#3}}} - -\def\uptuplet{\n@iv22\X@bkt} -\def\downtuplet{\n@iv21\X@bkt} - -\makeatother -\endinput diff --git a/Master/texmf-dist/tex/generic/musixtex/underbracket.sty b/Master/texmf-dist/tex/generic/musixtex/underbracket.sty deleted file mode 100644 index 994aee60ba1..00000000000 --- a/Master/texmf-dist/tex/generic/musixtex/underbracket.sty +++ /dev/null @@ -1,190 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% LaTeX package underbracket -% -% draws brackets to underline text -% (especially, but not exclusively, syllables of song text) -% -% v1.2 by Bernd Jantzen -% For e-mail contact please use "ctan" before the "@"-sign -% and "bernd-jantzen.de" after it to form my address -% (not given in full clear text here to prevent spam). -% -% This package draws brackets to underline text (especially, -% but not exclusively, syllables of song text). -% It may be combined with musixtex/musixlyr, within the argument of -% the \setlyrics command or outside the music score. -% It provides several macros to define brackets which may e.g. start -% and end centered below syllables. -% Three length variables are provided to allow a fine adjustment -% of the bracket parameters. -% -% This material is subject to the LaTeX Project Public License. -% See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html -% for the details of that license. -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Commands: -% -% \underbracket{TEXT} -% draws a bracket underlining TEXT -% the bracket starts below the left end of TEXT -% and stops below the right end of TEXT -% -% \Underbracket{TEXT} -% like \underbracket, but reserves no vertical space below the text -% -% \cunderbracket{LEFT}{TEXT}{RIGHT} -% draws a bracket underlining LEFTTEXTRIGHT -% the bracket starts centered below LEFT and stops centered below RIGHT -% -% \cUnderbracket{LEFT}{TEXT}{RIGHT} -% like cunderbracket, but reserves no vertical space below the text -% -% -% The commands \[c]underbracket do well in normal text which is aligned -% according to the baseline. The vertical space reserved below the text -% guarantees the distance to the next line. -% The commands \[c]Underbracket do well within the \setlyrics command of -% musixlyr where the text is vertically centered between the staves. Vertical -% space reserved below the text would shift the whole text upwards here. -% -% -% Adjustable length parameters: -% (change e.g. with \setlength{\underbracketheight}{4pt}) -% -% \underbracketwidth (default 0.3pt): -% linewidth of the bracket -% -% \underbracketheight (default 3pt): -% height of the bracket (length of the vertical lines) -% -% \underbracketsep (default 2pt): -% vertical distance between the lowest part of the text -% and the upper end of the bracket; -% also minimal vertical distance below the bracket -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\ProvidesPackage{underbracket}[2004/03/24 v1.2 LaTeX package underbracket] -\NeedsTeXFormat{LaTeX2e} - -% declare length variables -\newlength{\underbracketwidth} -\newlength{\underbracketheight} -\newlength{\underbracketsep} -\newlength{\underbracketlength} -\newlength{\underbracketdist} - -% need calc pages for adding lengts -\RequirePackage{calc} - -% \underbracket{TEXT} -% draws a bracket underlining TEXT -% the bracket starts below the left end of TEXT -% and stops below the right end of TEXT -% -\newcommand{\underbracket}[1]{% - \settodepth{\underbracketdist}{#1}% - \addtolength{\underbracketdist}{\underbracketsep+\underbracketheight}% - \mbox{% - \rule[-\underbracketdist-\underbracketsep]{0pt}{\underbracketsep}% - \makebox[0pt][l]{% - \rule[-\underbracketdist]{\underbracketwidth}{\underbracketheight}}% - \settowidth{\underbracketlength}{#1}% - \makebox[0pt][l]{% - \rule[-\underbracketdist]{\underbracketlength}{\underbracketwidth}}% - \mbox{#1}% - \makebox[0pt][r]{% - \rule[-\underbracketdist]{\underbracketwidth}{\underbracketheight}}% - }% -} - -% \Underbracket{TEXT} -% like \underbracket, but reserves no vertical space below the text -% -\newcommand{\Underbracket}[1]{% - \settodepth{\underbracketdist}{#1}% - \addtolength{\underbracketdist}{\underbracketsep+\underbracketheight}% - \mbox{% - \raisebox{0pt}[0pt][0pt]{\makebox[0pt][l]{% - \rule[-\underbracketdist]{\underbracketwidth}{\underbracketheight}}}% - \settowidth{\underbracketlength}{#1}% - \raisebox{0pt}[0pt][0pt]{\makebox[0pt][l]{% - \rule[-\underbracketdist]{\underbracketlength}{\underbracketwidth}}}% - \mbox{#1}% - \raisebox{0pt}[0pt][0pt]{\makebox[0pt][r]{% - \rule[-\underbracketdist]{\underbracketwidth}{\underbracketheight}}}% - }% -} - -% \cunderbracket{LEFT}{TEXT}{RIGHT} -% draws a bracket underlining LEFTTEXTRIGHT -% the bracket starts centered below LEFT and stops centered below RIGHT -% -\newcommand{\cunderbracket}[3]{% - \settodepth{\underbracketdist}{#1#2#3}% - \addtolength{\underbracketdist}{\underbracketsep+\underbracketheight}% - \mbox{% - \rule[-\underbracketdist-\underbracketsep]{0pt}{\underbracketsep}% - \settowidth{\underbracketlength}{#1}% - \makebox[0pt][l]{% - \hspace*{0.5\underbracketlength}% - \makebox[0pt]{% - \rule[-\underbracketdist]{\underbracketwidth}{\underbracketheight}}% - \rule[-\underbracketdist]{0.5\underbracketlength}{\underbracketwidth}}% - \mbox{#1}% - \settowidth{\underbracketlength}{#2}% - \makebox[0pt][l]{% - \rule[-\underbracketdist]{\underbracketlength}{\underbracketwidth}}% - \mbox{#2}% - \settowidth{\underbracketlength}{#3}% - \makebox[0pt][l]{% - \rule[-\underbracketdist]{0.5\underbracketlength}{\underbracketwidth}% - \makebox[0pt]{% - \rule[-\underbracketdist]{\underbracketwidth}{\underbracketheight}}}% - \mbox{#3}% - }% -} - -% \cUnderbracket{LEFT}{TEXT}{RIGHT} -% like cunderbracket, but reserves no vertical space below the text -% -\newcommand{\cUnderbracket}[3]{% - \settodepth{\underbracketdist}{#1#2#3}% - \addtolength{\underbracketdist}{\underbracketsep+\underbracketheight}% - \mbox{% - \settowidth{\underbracketlength}{#1}% - \raisebox{0pt}[0pt][0pt]{\makebox[0pt][l]{% - \hspace*{0.5\underbracketlength}% - \makebox[0pt]{% - \rule[-\underbracketdist]{\underbracketwidth}{\underbracketheight}}% - \rule[-\underbracketdist]{0.5\underbracketlength}{\underbracketwidth}}}% - \mbox{#1}% - \settowidth{\underbracketlength}{#2}% - \raisebox{0pt}[0pt][0pt]{\makebox[0pt][l]{% - \rule[-\underbracketdist]{\underbracketlength}{\underbracketwidth}}}% - \mbox{#2}% - \settowidth{\underbracketlength}{#3}% - \raisebox{0pt}[0pt][0pt]{\makebox[0pt][l]{% - \rule[-\underbracketdist]{0.5\underbracketlength}{\underbracketwidth}% - \makebox[0pt]{% - \rule[-\underbracketdist]{\underbracketwidth}{\underbracketheight}}}}% - \mbox{#3}% - }% -} - -% adjustable length parameters -% -% linewidth of the bracket -\setlength{\underbracketwidth}{0.3pt} -% -% height of the bracket (length of the vertical lines) -\setlength{\underbracketheight}{3pt} -% -% vertical distance between the lowest part of the text -% and the upper end of the bracket; -% also minimal vertical distance below the bracket -\setlength{\underbracketsep}{2pt} - |