From 9c24297a1ff4e9878d7506b820075ef022d53592 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 26 Apr 2010 00:22:17 +0000 Subject: multibox 2e + doc + own package (22apr10) git-svn-id: svn://tug.org/texlive/trunk@17998 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/multibox/multibox.pdf | Bin 0 -> 212380 bytes Master/texmf-dist/doc/latex/multibox/multibox.tex | 51 +++++++++++++++++ Master/texmf-dist/tex/latex/misc209/multibox.sty | 63 --------------------- Master/texmf-dist/tex/latex/multibox/multibox.sty | 63 +++++++++++++++++++++ Master/tlpkg/bin/tlpkg-ctan-check | 2 +- Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc | 2 +- .../tlpsrc/collection-latexrecommended.tlpsrc | 1 + Master/tlpkg/tlpsrc/multibox.tlpsrc | 0 8 files changed, 117 insertions(+), 65 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/multibox/multibox.pdf create mode 100644 Master/texmf-dist/doc/latex/multibox/multibox.tex delete mode 100644 Master/texmf-dist/tex/latex/misc209/multibox.sty create mode 100644 Master/texmf-dist/tex/latex/multibox/multibox.sty create mode 100644 Master/tlpkg/tlpsrc/multibox.tlpsrc diff --git a/Master/texmf-dist/doc/latex/multibox/multibox.pdf b/Master/texmf-dist/doc/latex/multibox/multibox.pdf new file mode 100644 index 00000000000..867a40ca326 Binary files /dev/null and b/Master/texmf-dist/doc/latex/multibox/multibox.pdf differ diff --git a/Master/texmf-dist/doc/latex/multibox/multibox.tex b/Master/texmf-dist/doc/latex/multibox/multibox.tex new file mode 100644 index 00000000000..5747cdbc967 --- /dev/null +++ b/Master/texmf-dist/doc/latex/multibox/multibox.tex @@ -0,0 +1,51 @@ +\documentclass[pagesize=auto, parskip=half, fontsize=12pt, DIV=11]{scrartcl} + +\usepackage{fixltx2e} +\usepackage{etex} +\usepackage{lmodern} +\usepackage[T1]{fontenc} +\usepackage{textcomp} +\usepackage{booktabs} +\usepackage{microtype} + +\newcommand*{\pkg}[1]{\textsf{#1}} +\newcommand*{\cs}[1]{\texttt{\textbackslash#1}} +\makeatletter +\newcommand*{\cmd}[1]{\cs{\expandafter\@gobble\string#1}} +\makeatother +\newcommand*{\env}[1]{\texttt{#1}} +\newcommand*{\meta}[1]{\textlangle\textsl{#1}\textrangle} +\newcommand*{\marg}[1]{\texttt{\{}\meta{#1}\texttt{\}}} +\newcommand*{\narg}[1]{\texttt{\{$#1$\}}} +\newcommand*{\oarg}[1]{\texttt{[}\meta{#1}\texttt{]}} +\newcommand*{\pargs}[2]{\texttt{($#1$,\,$#2$)}} +\newcommand*{\coord}[2]{$(#1,\:#2)$} +\newcommand*{\txt}[1]{Text\textsubscript{$#1$}} + +\addtokomafont{title}{\rmfamily} + +\title{\pkg{MULTIBOX.STY}} +\subtitle{A style option to provide multiple boxes in pictures} +\author{Brian HAMILTON KELLY\thanks{Royal Military College of Science, Shrivenham, SWINDON, SN6 8LA, United Kingdom}} +\date{13 October 1988} + + +\begin{document} + +\maketitle + +This style file option provides two new commands for use in the \env{picture} +environment: +% +\begin{itemize} +\item \cmd{\multimake}\pargs{x}{y}\pargs{dx}{dy}\narg{n}\pargs{w}{h}\oarg{pos}\marg{\txt{1}}\marg{\txt{2}}\ldots\marg{\txt{n}} +\item \cmd{\multiframe}\pargs{x}{y}\pargs{dx}{dy}\narg{n}\pargs{w}{h}\oarg{pos}\marg{\txt{1}}\marg{\txt{2}}\ldots\marg{\txt{n}} +\end{itemize} +% +These commands set the $n$ texts \meta{\txt{1}}\ldots\meta{\txt{n}} inside a \cmd{\makebox} or +\cmd{\framebox} respectively. The first box has its lower-left corner at \coord{x}{y}, +and successive boxes are located at \coord{x+dx}{y+dy}, \ldots, \coord{x+(n-1)\,dx}{y+(n-1)\,dy}. +Each box has width and height determined by \coord{w}{h}, and the optional +box placement parameter \meta{pos} is applied to all the generated texts. + +\end{document} diff --git a/Master/texmf-dist/tex/latex/misc209/multibox.sty b/Master/texmf-dist/tex/latex/misc209/multibox.sty deleted file mode 100644 index afe5530d15e..00000000000 --- a/Master/texmf-dist/tex/latex/misc209/multibox.sty +++ /dev/null @@ -1,63 +0,0 @@ -% MULTIBOX.STY - a style option to provide multiple boxes in pictures -% ============ -% Author: Brian HAMILTON KELLY, Royal Military College of Science, -% Shrivenham, SWINDON, SN6 8LA, United Kingdom -% Date: 13 October 1988 -% -% This style file option provides two new commands for use in the picture -% environment: -% -% \multimake(x,y)(dx,dy){n}(w,h)[]{Text_1}{Text_2}...{Text_n} -% \multiframe(x,y)(dx,dy){n}(w,h)[]{Text_1}{Text_2}...{Text_n} -% -% These commands set the n texts Text_1..Text_n inside a \makebox or -% \framebox respectively. The first box has its lower-left corner at (x,y), -% and successive boxes are located at (x+dx,y+dy),..,(x+(n-1)dx,y+(n-1)dy). -% Each box has width and height determined by (w,h), and the optional -% box placement parameter is applied to all the generated texts -% - -\newtoks\multi@rg - -\def\multiframe{\let\@putitem=\@iframepicbox \multib@x} -\def\multimake{\let\@putitem=\@imakepicbox \multib@x} - -\def\multib@x(#1,#2)(#3,#4)#5(#6,#7){\@xdim=#1\unitlength \@ydim=#2\unitlength - \def\@dxdim{#3} \def\@dydim{#4} - \@multicnt=#5 \def\@Xsize{#6} \def\@Ysize{#7} - \@ifnextchar [{\imultib@x}{\imultib@x[]} - } - -% The liberal use of % at the ends of lines is to prevent the ingestion of -% superfluous spaces which would otherwise upset the horizontal positioning -% of the boxes. - -\def\imultib@x[#1]{\@killglue\relax - \def\p@sarg{#1}% - \d@multi - } - -% We need the expanded definition of \i@putitem because \@imakepicbox DOESN'T -% expand its #3 argument (the optional text placement bit). However, it can -% only recognize the letters b, t, l and r in this position, so \p@sarg is no -% use. Therefore we expand the arguments, producing an appropriate call. - -\def\d@multi{% - \ifnum\@multicnt > 0 - \def\next@rg##1{% - \multi@rg={{##1}}% Assign the next argument of original text to \multi@rg - \edef\@iputitem{% - \noexpand\@putitem(\@Xsize,\@Ysize)[\p@sarg]{\the\multi@rg}% - }% - \raise\@ydim\hbox to \z@{\kern \@xdim \@iputitem\hss}% - \advance\@xdim by \@dxdim\unitlength \advance\@ydim by \@dydim\unitlength - \advance\@multicnt by \m@ne - \d@multi}% End of (re-)definition of \next@rg - \else - \let\next@rg=\ignorespaces - \fi % Now execute \next@rg; - \next@rg % This will read the text, set it and then call \d@multi recursively - } - - - diff --git a/Master/texmf-dist/tex/latex/multibox/multibox.sty b/Master/texmf-dist/tex/latex/multibox/multibox.sty new file mode 100644 index 00000000000..afe5530d15e --- /dev/null +++ b/Master/texmf-dist/tex/latex/multibox/multibox.sty @@ -0,0 +1,63 @@ +% MULTIBOX.STY - a style option to provide multiple boxes in pictures +% ============ +% Author: Brian HAMILTON KELLY, Royal Military College of Science, +% Shrivenham, SWINDON, SN6 8LA, United Kingdom +% Date: 13 October 1988 +% +% This style file option provides two new commands for use in the picture +% environment: +% +% \multimake(x,y)(dx,dy){n}(w,h)[]{Text_1}{Text_2}...{Text_n} +% \multiframe(x,y)(dx,dy){n}(w,h)[]{Text_1}{Text_2}...{Text_n} +% +% These commands set the n texts Text_1..Text_n inside a \makebox or +% \framebox respectively. The first box has its lower-left corner at (x,y), +% and successive boxes are located at (x+dx,y+dy),..,(x+(n-1)dx,y+(n-1)dy). +% Each box has width and height determined by (w,h), and the optional +% box placement parameter is applied to all the generated texts +% + +\newtoks\multi@rg + +\def\multiframe{\let\@putitem=\@iframepicbox \multib@x} +\def\multimake{\let\@putitem=\@imakepicbox \multib@x} + +\def\multib@x(#1,#2)(#3,#4)#5(#6,#7){\@xdim=#1\unitlength \@ydim=#2\unitlength + \def\@dxdim{#3} \def\@dydim{#4} + \@multicnt=#5 \def\@Xsize{#6} \def\@Ysize{#7} + \@ifnextchar [{\imultib@x}{\imultib@x[]} + } + +% The liberal use of % at the ends of lines is to prevent the ingestion of +% superfluous spaces which would otherwise upset the horizontal positioning +% of the boxes. + +\def\imultib@x[#1]{\@killglue\relax + \def\p@sarg{#1}% + \d@multi + } + +% We need the expanded definition of \i@putitem because \@imakepicbox DOESN'T +% expand its #3 argument (the optional text placement bit). However, it can +% only recognize the letters b, t, l and r in this position, so \p@sarg is no +% use. Therefore we expand the arguments, producing an appropriate call. + +\def\d@multi{% + \ifnum\@multicnt > 0 + \def\next@rg##1{% + \multi@rg={{##1}}% Assign the next argument of original text to \multi@rg + \edef\@iputitem{% + \noexpand\@putitem(\@Xsize,\@Ysize)[\p@sarg]{\the\multi@rg}% + }% + \raise\@ydim\hbox to \z@{\kern \@xdim \@iputitem\hss}% + \advance\@xdim by \@dxdim\unitlength \advance\@ydim by \@dydim\unitlength + \advance\@multicnt by \m@ne + \d@multi}% End of (re-)definition of \next@rg + \else + \let\next@rg=\ignorespaces + \fi % Now execute \next@rg; + \next@rg % This will read the text, set it and then call \d@multi recursively + } + + + diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 5637afb72bc..2fac39798c9 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -205,7 +205,7 @@ my @TLP_working = qw( moderncv modref modroman mongolian-babel montex morefloats moresize moreverb movie15 mp3d mparhack mpman-ru ms msc msg mslapa mtgreek multibib multicap multirow - multido multiobjective munich muthesis mwcls mxd mxedruli + multibox multido multiobjective munich muthesis mwcls mxd mxedruli nag namespc natbib nath nature ncclatex ncctools needspace newfile newlfm newverbs nextpage nfssext-cfr niceframe nicetext nih nkarta noitcrul diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc index 6f81621021d..851cb77a5a2 100644 --- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc @@ -387,6 +387,7 @@ depend msg depend mslapa depend mtgreek depend multenum +depend multibox depend multibbl depend multicap depend multirow @@ -510,7 +511,6 @@ depend romannum depend rotfloat depend rotpages depend rtkinenc -depend sansmath depend sauerj depend savefnmark depend savesym diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc index 4773336b871..4be8561d4d1 100644 --- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc @@ -35,6 +35,7 @@ depend powerdot depend psfrag depend rcs depend rotating +depend sansmath depend seminar depend setspace depend subfig diff --git a/Master/tlpkg/tlpsrc/multibox.tlpsrc b/Master/tlpkg/tlpsrc/multibox.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d -- cgit v1.2.3