diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/sidecap/README.md (renamed from Master/texmf-dist/doc/latex/sidecap/README) | 10 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/sidecap/sc-test-common.tex | 122 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/sidecap/scraggeddemo.tex | 128 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/sidecap/sidecap.pdf | bin | 156630 -> 325718 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/sidecap/Makefile | 23 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/sidecap/sidecap.dtx | 93 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/sidecap/sidecap.sty | 30 |
7 files changed, 177 insertions, 229 deletions
diff --git a/Master/texmf-dist/doc/latex/sidecap/README b/Master/texmf-dist/doc/latex/sidecap/README.md index 7838eedf0d1..3ff7337544d 100644 --- a/Master/texmf-dist/doc/latex/sidecap/README +++ b/Master/texmf-dist/doc/latex/sidecap/README.md @@ -1,3 +1,4 @@ +LaTeX package that defines figure/table environments with side labeling The sidecap package. @@ -5,11 +6,4 @@ This package defines the new environments SCfigure and SCtable, analogous to figure and table, which make it easy to typeset captions sideways. The package knows the options outercaption, innercaption, leftcaption and rightcaption. -Please send enhancements and corrections to: - - Rolf Niepraschk, Rolf.Niepraschk@ptb.de - Hubert Gaesslein, - - 2003/05/04 - - +2023/01/24 diff --git a/Master/texmf-dist/doc/latex/sidecap/sc-test-common.tex b/Master/texmf-dist/doc/latex/sidecap/sc-test-common.tex deleted file mode 100644 index 22b5dd9ff81..00000000000 --- a/Master/texmf-dist/doc/latex/sidecap/sc-test-common.tex +++ /dev/null @@ -1,122 +0,0 @@ - -% `sc-test-comon.tex', part of the LaTeX package `sidecap' -% 2003-02-21 -% Rolf Niepraschk and Hubert G\"a\ss{}lein -- niepraschk@ptb.de - -\setlength{\emergencystretch}{20pt} -\renewcommand{\textfraction}{0} -\renewcommand{\topfraction}{1} -\renewcommand{\bottomfraction}{1} -\setcounter{bottomnumber}{4} -\setcounter{topnumber}{4} -\setcounter{totalnumber}{8} - -\errorcontextlines100 - -\renewcommand\tablename{Tab.} \renewcommand\figurename{Fig.} - -\setlength{\belowcaptionskip}{\abovecaptionskip} - -\setlength\columnseprule{.4pt} - -\newcommand{\FIG}[2][]{% - \begingroup - \def\xxx{#1}% - \ifx\xxx\empty - \setlength{\unitlength}{\linewidth}% - \addtolength{\unitlength}{-2\fboxrule}% - \setlength{\unitlength}{.1\unitlength}% - \else - \setlength{\unitlength}{#1}% - \fi% - \setlength{\fboxsep}{0pt}% - \ifcase#2\relax - \or% - \fbox{% - \begin{picture}(4,6)% - \put(1,5){\circle{1}}% - \put(3,5){\circle{1}}% - \put(2,3){\circle{1}}% - \put(1,1){\circle{1}}% - \put(3,1){\circle{1}}% - \end{picture}}% - \or% - \fbox{% - \begin{picture}(10,4)% - \put(1,3){\circle{1}}% - \put(9,3){\circle{1}}% - \put(5,2){\circle{1}}% - \put(1,1){\circle{1}}% - \put(9,1){\circle{1}}% - \end{picture}}% - \or% (doesn't make a difference to use [b] or [t] or [c] here !!!) - \begin{minipage}{5\unitlength}% - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text. - \end{minipage}% - \or% (doesn't make a difference to use [b] or [t] or [c] here !!!) - \begin{minipage}{5\unitlength}% - \strut - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text - text text text text text text text text. - \unskip\strut - \end{minipage}% - \fi - \endgroup -} - -\newcommand{\TABi}{% - \begin{tabular}{@{} | c | c c c c c | @{}} \hline - \multicolumn{1}{| c} {1} - & 2 & 3 & 4 & 5 & 6 \\ \cline{2-6} - 2 & 4 & 6 & 8 & 10 & 12 \\ - 3 & 6 & 9 & 12 & 15 & 18 \\ - 4 & 8 & 12 & 16 & 20 & 24 \\ - 5 & 10 & 15 & 20 & 25 & 30 \\ - 6 & 12 & 18 & 24 & 30 & 36 \\ - 7 & 14 & 21 & 28 & 35 & 42 \\ - 8 & 16 & 24 & 32 & 40 & 48 \\ - 9 & 18 & 27 & 36 & 45 & 54 \\ - 10 & 20 & 30 & 40 & 50 & 60 \\ - 11 & 22 & 33 & 44 & 55 & 66 \\ - 12 & 24 & 36 & 48 & 60 & 72 \\ - 13 & 26 & 39 & 52 & 65 & 78 \\ - 14 & 28 & 42 & 56 & 70 & 84 \\ - \hline - \end{tabular}% -} - - -\newcommand{\CAPi}{% - The dazed brown fox quickly gave 12345--67890 jumps! - The dazed brown fox quickly gave 12345--67890 jumps! -} - -\newcommand{\CAPii}{% - The dazed brown fox quickly gave 12345--67890 jumps! - The dazed brown fox quickly gave 12345--67890 jumps! - The dazed brown fox quickly gave 12345--67890 jumps! - The dazed brown fox quickly gave 12345--67890 jumps! -} - -\newcommand{\SHORTCAPi}{% - The dazed brown fox etc.} - -\newcommand*{\MARKER} - {\noindent\strut\vrule\hrulefill~text area - (\ifthenelse{\isodd{\thepage}}{odd}{even} page)~\hrulefill\vrule% - \marginpar{\strut\vrule\hrulefill~margin area~\hrulefill\vrule}} - -\endinput diff --git a/Master/texmf-dist/doc/latex/sidecap/scraggeddemo.tex b/Master/texmf-dist/doc/latex/sidecap/scraggeddemo.tex new file mode 100644 index 00000000000..0b190108d5c --- /dev/null +++ b/Master/texmf-dist/doc/latex/sidecap/scraggeddemo.tex @@ -0,0 +1,128 @@ + +% Rolf Niepraschk, 2002-05-18 + +\listfiles + +\documentclass[12pt,a4paper,twoside]{article} +\usepackage[bf,footnotesize]{caption2} +%\usepackage[leftcaption,ragged]{sidecap} +\usepackage[innercaption,ragged]{sidecap} +%\usepackage[innercaption,raggedright,origragged]{sidecap} + + +\renewcommand\tablename{Tab.} \renewcommand\figurename{Fig.} +\setlength{\belowcaptionskip}{\abovecaptionskip} +\setlength{\parindent}{0pt} + +% --- ???? ----- +\setcounter{topnumber}{4} +\renewcommand{\topfraction}{.8} +\setcounter{bottomnumber}{4} +\renewcommand{\bottomfraction}{.7} +\setcounter{totalnumber}{10} +\renewcommand{\textfraction}{.1} +\renewcommand\floatpagefraction{.7} + +\setlength\emergencystretch{20pt} + +\setlength\unitlength{1cm} +\newcommand{\FIGi}{% + \fbox{% + \begin{picture}(4,6) + \put(1,5){\circle{1}} + \put(3,5){\circle{1}} + \put(2,3){\circle{1}} + \put(1,1){\circle{1}} + \put(3,1){\circle{1}} + \end{picture}} +} + +\newcommand{\TABi}{% + \begin{tabular}{@{} | c | c c c c c | @{}} \hline + \multicolumn{1}{| c} {1} + & 2 & 3 & 4 & 5 & 6 \\ \cline{2-6} + 2 & 4 & 6 & 8 & 10 & 12 \\ + 3 & 6 & 9 & 12 & 15 & 18 \\ + 4 & 8 & 12 & 16 & 20 & 24 \\ + 5 & 10 & 15 & 20 & 25 & 30 \\ + 6 & 12 & 18 & 24 & 30 & 36 \\ + 7 & 14 & 21 & 28 & 35 & 42 \\ + 8 & 16 & 24 & 32 & 40 & 48 \\ + 9 & 18 & 27 & 36 & 45 & 54 \\ + 10 & 20 & 30 & 40 & 50 & 60 \\ + 11 & 22 & 33 & 44 & 55 & 66 \\ + 12 & 24 & 36 & 48 & 60 & 72 \\ + 13 & 26 & 39 & 52 & 65 & 78 \\ + 14 & 28 & 42 & 56 & 70 & 84 \\ + \hline + \end{tabular} +} + +\newcommand{\SHORTCAPi}{% + Schematischer Aufbau usw.} + +\newcommand{\CAPi}{% + Schematischer Aufbau eines Diodenlasers. Ober- und Unterseite des Kristalls + sind metallisch kontaktiert, die Vorder- und R\"uckseite verspiegelt. Die + Dicke der aktiven Zone (pn-\"ubergang) liegt in der Gr\"o{\ss}enordnung von + 5\,$\mu$m.} + +\makeatletter + +\newcommand*\justified{% + % \let\SC@justify\relax % geht nicht + \centering + } + +\makeatother + +\begin{document} + +\section*{The \texttt{SideCap} package (scraggeddemo)} + +\begin{figure}[bhp] + \centering + \FIGi% + \caption[\SHORTCAPi]{\CAPi}\label{fig:A}% +\end{figure} + +\begin{SCfigure}[1.2][bhp] + \FIGi% + \caption[\SHORTCAPi]{\justified\CAPi}\label{fig:B}% +\end{SCfigure} + +\begin{SCfigure}[1.2][bhp] + \FIGi% + \caption[\SHORTCAPi]{\CAPi}\label{fig:C}% +\end{SCfigure} + +\begin{SCfigure}[][bhp] + \FIGi% + \caption[\SHORTCAPi]{\CAPi}\label{fig:D}% +\end{SCfigure} + +\begin{SCtable} + \caption[\SHORTCAPi]{\CAPi}\label{tab:A}% + \FIGi% +\end{SCtable} + +\begin{table} + \centering + \caption[\SHORTCAPi]{\CAPi}\label{tab:B}% + \TABi% +\end{table} + +\begin{SCtable} + \caption[\SHORTCAPi]{\CAPi}\label{tab:C}% + \TABi% +\end{SCtable} + +\end{document} + + + + + + + + diff --git a/Master/texmf-dist/doc/latex/sidecap/sidecap.pdf b/Master/texmf-dist/doc/latex/sidecap/sidecap.pdf Binary files differindex 5482eef650f..d8510924a4a 100644 --- a/Master/texmf-dist/doc/latex/sidecap/sidecap.pdf +++ b/Master/texmf-dist/doc/latex/sidecap/sidecap.pdf diff --git a/Master/texmf-dist/source/latex/sidecap/Makefile b/Master/texmf-dist/source/latex/sidecap/Makefile deleted file mode 100644 index acdb8b2fdfa..00000000000 --- a/Master/texmf-dist/source/latex/sidecap/Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -# Makefile for sidecap examples, 2003-02-21, RN - -LATEX = elatex - -ifneq ($(findstring pdf,$(MAKECMDGOALS)),) - LATEX = pdfelatex - PICS := $(PICS:.eps=.pdf) -endif - -PS = sc-test1.ps sc-test2.ps sc-test3.ps sc-test4.ps sc-test5.ps sc-test6.ps - -all : $(PS) - -pdf : $(PS:.ps=.pdf) - -%.ps : %.dvi - dvips -Pwww $< -o $@ - -%.dvi %.pdf : %.tex sc-test-common.tex - $(LATEX) $< - $(LATEX) $< - diff --git a/Master/texmf-dist/source/latex/sidecap/sidecap.dtx b/Master/texmf-dist/source/latex/sidecap/sidecap.dtx index f42fa75e451..e23dd1d0193 100644 --- a/Master/texmf-dist/source/latex/sidecap/sidecap.dtx +++ b/Master/texmf-dist/source/latex/sidecap/sidecap.dtx @@ -2,9 +2,8 @@ %% File: sidecap.dtx %% % -%<package>\NeedsTeXFormat{LaTeX2e} -%<package>\ProvidesPackage{sidecap} -%<package> [2003/06/06 v1.6f SideCap Package (RN/HjG)] +%<package>\NeedsTeXFormat{LaTeX2e}[2022-06-01] +%<package>\ProvidesPackage{sidecap}[2023/01/24 v1.7a SideCap Package (RN/HjG)] % %<*driver> \documentclass{ltxdoc} @@ -18,49 +17,34 @@ \end{document} %</driver> % -% Copyright 1997--2003 Rolf Niepraschk and Hubert Gaesslein. +% Copyright 1997--2016 Rolf Niepraschk and Hubert Gaesslein. +% Copyright 2016--.. Rolf Niepraschk % This program can be redistributed and/or modified under the terms % of the LaTeX Project Public License Distributed from CTAN % archives in directory macros/latex/base/lppl.txt; either -% version 1 of the License, or any later version. +% version 1.3 of the License, or any later version. % +% This work has the LPPL maintenance status "author-maintained". % \fi % -% \CheckSum{696} +% \CheckSum{683} % % \CharacterTable -% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -% Digits \0\1\2\3\4\5\6\7\8\9 -% Exclamation \! Double quote \" Hash (number) \# -% Dollar \$ Percent \% Ampersand \& -% Acute accent \' Left paren \( Right paren \) -% Asterisk \* Plus \+ Comma \, -% Minus \- Point \. Solidus \/ -% Colon \: Semicolon \; Less than \< -% Equals \= Greater than \> Question mark \? -% Commercial at \@ Left bracket \[ Backslash \\ -% Right bracket \] Circumflex \^ Underscore \_ -% Grave accent \` Left brace \{ Vertical bar \| -% Right brace \} Tilde \~} -% -% \iffalse meta-comment -% =================================================================== -% @LaTeX-package-file{ -% author = {Rolf Niepraschk, Hubert G\"{a}\ss{}lein} -% version = "1.6e", -% date = "04 May 2003", -% filename = "sidecap.sty", -% email = "niepraschk@ptb.de (INTERNET)", -% codetable = "ISO/ASCII", -% keywords = "LaTeX2e, sideways caption, \SCfigure, \SCtable", -% supported = "yes", -% docstring = "LaTeX package which defines new environments -% for easy typesetting sideways captions and -% wide floats". -% } -% =================================================================== -% \fi +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% % % \MakeShortVerb{\|} % \setlength\parindent{0pt} @@ -188,7 +172,7 @@ % (which is initialized to 1.0).\\[.5\baselineskip] % \meta{float} -- & optional; like the floating position parameter of the % original table\slash figure environments. -% Default is |tbp|. +% Default is |tbp|. % \end{tabular} % \end{center} % @@ -249,7 +233,7 @@ \newcommand*{\SC@IDENT}{SC@\number\value{SC@C}} \newcommand*\SC@label[1]{\gdef\SC@LABtext{#1}\ignorespaces} \newcommand*\SC@orig@caption{} \newcommand*\SC@orig@label{} -\newcommand*\sidecaptionsep{} \newcommand*\SC@pageref{} +\newcommand*\sidecaptionsep{} \edef\sidecaptionsep{\the\marginparsep} \newcommand*\sidecaptionrelwidth{1.0} \newcommand*\sidecaptionvpos[2]{% 2002/08/31 @@ -316,7 +300,7 @@ % \begin{macrocode} \if@twoside \newcommand*{\isSC@ODD}[2]{% - \ifthenelse{\isodd{\SC@pageref{\SC@IDENT}}}{#1}{#2}} + \ifthenelse{\isodd{\pageref{\SC@IDENT}}}{#1}{#2}} \else \newcommand*{\isSC@ODD}[2]{#1}% \fi @@ -432,16 +416,18 @@ % More simple code for hyperref compatibilty (\cmd\hypergetpageref).} % \changes{v1.6f (RN/HjG)}{2003/06/06}{Test for presence of package babel % (\cmd\org@pageref).} -% \begin{macrocode} +% \changes{v1.7a (RN)}{2023/01/24}{% +% Special handling with \cmd\SC@pageref is no longer necessary.} +% \begin{macrocode} \AtBeginDocument{% \ifSC@origRagged\else \@ifpackageloaded{ragged2e}{}% {% \IfFileExists{ragged2e.sty}{% - \RequirePackage[NewParameters]{ragged2e}}% + \RequirePackage[NewParameters]{ragged2e}}% {% \PackageWarningNoLine{sidecap}{% - Package `ragged2e' not found -- expect bad formatting}% + Package `ragged2e' not found -- expect bad formatting}% }% } \fi @@ -451,13 +437,6 @@ \let\RaggedRight\raggedright \let\Centering\centering }{} - \@ifpackageloaded{hyperref}% - {\let\SC@pageref=\hypergetpageref}% - {% - \@ifpackageloaded{babel}% - {\let\SC@pageref=\org@pageref}% - {\let\SC@pageref=\pageref}% - } } % \end{macrocode} % @@ -730,11 +709,11 @@ \hrule \@height\z@\@depth\z@ %%% Testen, Doku. (Implementierung) !!! %\show\SC@justify@caption %%% \tracingall\tracingonline=0 - \SC@justify - \let\@arrayparboxrestore\relax % sonst Blocksatz! (\@parboxrestore) - \let\usecaptionmargin\relax % sonst Pseudo-Blocksatz, nicht-alternierend! -% \isSC@ODD {\RaggedRight }{\RaggedLeft } -%%% A B C + \SC@justify + \let\@arrayparboxrestore\relax % sonst Blocksatz! (\@parboxrestore) + \let\usecaptionmargin\relax % sonst Pseudo-Blocksatz, nicht-alternierend! +% \isSC@ODD {\RaggedRight }{\RaggedLeft } +%%% A B C % \isSC@ODD{\typeout{xxxxx ungerade}}{\typeout{xxxxx gerade}}% % \def\@makecaption##1##2{##1: ##2\endgraf}% % \@parboxrestore @@ -762,7 +741,7 @@ \ifx\SC@LABtext\@empty\else \SC@orig@label{\SC@LABtext}\fi% \expandafter\protect \fi -%%% X Y Z +%%% X Y Z \hrule \@height\z@\@depth\z@ \endminipage}% {\minipage[\SC@vpos]{\SC@BOXWD}% diff --git a/Master/texmf-dist/tex/latex/sidecap/sidecap.sty b/Master/texmf-dist/tex/latex/sidecap/sidecap.sty index 880c1aab5e1..3db5a44240a 100644 --- a/Master/texmf-dist/tex/latex/sidecap/sidecap.sty +++ b/Master/texmf-dist/tex/latex/sidecap/sidecap.sty @@ -22,9 +22,8 @@ %% in the same archive or directory.) %% File: sidecap.dtx %% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{sidecap} - [2003/06/06 v1.6f SideCap Package (RN/HjG)] +\NeedsTeXFormat{LaTeX2e}[2022-06-01] +\ProvidesPackage{sidecap}[2023/01/24 v1.7a SideCap Package (RN/HjG)] \RequirePackage{ifthen} @@ -37,7 +36,7 @@ \newcommand*{\SC@IDENT}{SC@\number\value{SC@C}} \newcommand*\SC@label[1]{\gdef\SC@LABtext{#1}\ignorespaces} \newcommand*\SC@orig@caption{} \newcommand*\SC@orig@label{} -\newcommand*\sidecaptionsep{} \newcommand*\SC@pageref{} +\newcommand*\sidecaptionsep{} \edef\sidecaptionsep{\the\marginparsep} \newcommand*\sidecaptionrelwidth{1.0} \newcommand*\sidecaptionvpos[2]{% 2002/08/31 @@ -79,7 +78,7 @@ \SC@SaveCommands % necessary? or even wrong? \if@twoside \newcommand*{\isSC@ODD}[2]{% - \ifthenelse{\isodd{\SC@pageref{\SC@IDENT}}}{#1}{#2}} + \ifthenelse{\isodd{\pageref{\SC@IDENT}}}{#1}{#2}} \else \newcommand*{\isSC@ODD}[2]{#1}% \fi @@ -159,10 +158,10 @@ \@ifpackageloaded{ragged2e}{}% {% \IfFileExists{ragged2e.sty}{% - \RequirePackage[NewParameters]{ragged2e}}% + \RequirePackage[NewParameters]{ragged2e}}% {% \PackageWarningNoLine{sidecap}{% - Package `ragged2e' not found -- expect bad formatting}% + Package `ragged2e' not found -- expect bad formatting}% }% } \fi @@ -172,13 +171,6 @@ \let\RaggedRight\raggedright \let\Centering\centering }{} - \@ifpackageloaded{hyperref}% - {\let\SC@pageref=\hypergetpageref}% - {% - \@ifpackageloaded{babel}% - {\let\SC@pageref=\org@pageref}% - {\let\SC@pageref=\pageref}% - } } \@ifdefinable\SC@figure@vpos{\def\SC@figure@vpos{b}} @@ -294,10 +286,10 @@ \hrule \@height\z@\@depth\z@ %%% Testen, Doku. (Implementierung) !!! %\show\SC@justify@caption %%% \tracingall\tracingonline=0 - \SC@justify - \let\@arrayparboxrestore\relax % sonst Blocksatz! (\@parboxrestore) - \let\usecaptionmargin\relax % sonst Pseudo-Blocksatz, nicht-alternierend! -%%% A B C + \SC@justify + \let\@arrayparboxrestore\relax % sonst Blocksatz! (\@parboxrestore) + \let\usecaptionmargin\relax % sonst Pseudo-Blocksatz, nicht-alternierend! +%%% A B C \iffalse \endgraf \@makecaption{\csname fnum@\SC@captype\endcsname}% @@ -316,7 +308,7 @@ \ifx\SC@LABtext\@empty\else \SC@orig@label{\SC@LABtext}\fi% \expandafter\protect \fi -%%% X Y Z +%%% X Y Z \hrule \@height\z@\@depth\z@ \endminipage}% {\minipage[\SC@vpos]{\SC@BOXWD}% |