diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-24 20:45:16 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-24 20:45:16 +0000 |
commit | 685138596f5a193370ef43a3a67a087216794740 (patch) | |
tree | 15bf0e7450e1252a58567f1456018edf430c6d34 /Master/texmf-dist/source/latex | |
parent | 80c93c8f00f58020c56174ee314ad783b1bd44af (diff) |
sidecap (24jan23)
git-svn-id: svn://tug.org/texlive/trunk@65618 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/sidecap/Makefile | 23 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/sidecap/sidecap.dtx | 93 |
2 files changed, 36 insertions, 80 deletions
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}% |