summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-11-24 20:39:43 +0000
committerKarl Berry <karl@freefriends.org>2022-11-24 20:39:43 +0000
commitb020be45a1707a13bbd46e48edc392e60d96dcb8 (patch)
treed9df42f55b465184defd8d64fa472583dca60491 /Master/texmf-dist
parent357637f662b6d1e080a92685dc01102ba935157b (diff)
picinpar (24nov22)
git-svn-id: svn://tug.org/texlive/trunk@65097 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/picinpar/picinpar-de.pdfbin175571 -> 175871 bytes
-rw-r--r--Master/texmf-dist/doc/latex/picinpar/picinpar-de.tex29
-rw-r--r--Master/texmf-dist/doc/latex/picinpar/picinpar-en.pdfbin213414 -> 214587 bytes
-rw-r--r--Master/texmf-dist/doc/latex/picinpar/picinpar-en.tex6
-rw-r--r--Master/texmf-dist/tex/latex/picinpar/picinpar.sty22
5 files changed, 50 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/latex/picinpar/picinpar-de.pdf b/Master/texmf-dist/doc/latex/picinpar/picinpar-de.pdf
index 2157fc206ee..0d5f9fc88f9 100644
--- a/Master/texmf-dist/doc/latex/picinpar/picinpar-de.pdf
+++ b/Master/texmf-dist/doc/latex/picinpar/picinpar-de.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/picinpar/picinpar-de.tex b/Master/texmf-dist/doc/latex/picinpar/picinpar-de.tex
index 6494ea6b67d..8fad9fa6e89 100644
--- a/Master/texmf-dist/doc/latex/picinpar/picinpar-de.tex
+++ b/Master/texmf-dist/doc/latex/picinpar/picinpar-de.tex
@@ -69,6 +69,35 @@ bekannt sein d"urfte, ist in einer \verb?minipage?--Umgebung gesetzt
worden. Die Eingabe im Text sieht hierbei wie oben aus.
\end{figwindow}
+
+
+\begin{verbatim}
+\begin{figwindow}[2,r,{
+\unitlength1cm
+\begin{picture}(3,1.4)
+\put(0.7,0.7){\circle*{0.2}} \put(0.7,0.7){\circle{1.2}}
+\put(0.7,0.7){\vector(0,1){0.6}} \put(2.5,0.7){\circle*{0.5}}
+\end{picture}
+},]
+Manchmal braucht man aber auch ...
+... sieht hierbei wie oben aus:
+\end{figwindow}
+\end{verbatim}
+
+\begin{figwindow}[2,r,{
+\unitlength1cm
+\begin{picture}(3,1.4)
+\put(0.7,0.7){\circle*{0.2}} \put(0.7,0.7){\circle{1.2}}
+\put(0.7,0.7){\vector(0,1){0.6}} \put(2.5,0.7){\circle*{0.5}}
+\end{picture}
+},]
+Manchmal braucht man aber auch gar keine Unterschrift. Dann lässt man sie am einfachsten weg und sie wird nicht gedruckt.
+Das funktioniert f"ur \verb+\figwindow+ und \verb+\tabwindow+.
+Das lässt sich jedoch nur in einem Absatz, der auch genügend druckbare Zeichen, die am besten in einen Schachtelsatz, diese grammatische Möglichkeit in der deutschen Sprache, die die verbale Ausdrucksform der meisten Menschen in Mitteleuropa, also dem geographischen Gebiet, das zwischen Nordsee und Alpen sowie Rhein und Oder liegt, ist, gepackt werden, demonstrieren, enthält.
+Die Eingabe im Text sieht hierbei wie oben aus.
+\end{figwindow}
+
+
\begin{verbatim}
\begin{tabwindow}[1,r,{
\begin{tabular}[t]{|r|l|r@{:}l|}
diff --git a/Master/texmf-dist/doc/latex/picinpar/picinpar-en.pdf b/Master/texmf-dist/doc/latex/picinpar/picinpar-en.pdf
index f35c4a8ccff..fc33fece495 100644
--- a/Master/texmf-dist/doc/latex/picinpar/picinpar-en.pdf
+++ b/Master/texmf-dist/doc/latex/picinpar/picinpar-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/picinpar/picinpar-en.tex b/Master/texmf-dist/doc/latex/picinpar/picinpar-en.tex
index 7dedd49391c..6d8ea61eba4 100644
--- a/Master/texmf-dist/doc/latex/picinpar/picinpar-en.tex
+++ b/Master/texmf-dist/doc/latex/picinpar/picinpar-en.tex
@@ -84,6 +84,12 @@ generating captions within the windows.
notice \TeX's overfull \cmd{\vbox}
Reported by Stephan Seidl, \mail{seidl@rcs.urz.tu-dresden.de}
+
+\item[1.3]
+ An option to insert the picture/table without a caption (Argument \verb+#4+ in \verb+\figwindow[.., #4]+ or \verb+\tabwindow[.., #4]+ is empty, see \href{https://tex.stackexchange.com/questions/656810/using-if-with-an-empty-argument}{Discusson at stackexchange}
+
+ Reported by Stefan Blochwitz, \mail{stefan.blochwitz@bundesbank.de}
+
\end{labeling}
\end{document}
diff --git a/Master/texmf-dist/tex/latex/picinpar/picinpar.sty b/Master/texmf-dist/tex/latex/picinpar/picinpar.sty
index 47e1688420b..3314d0aedfe 100644
--- a/Master/texmf-dist/tex/latex/picinpar/picinpar.sty
+++ b/Master/texmf-dist/tex/latex/picinpar/picinpar.sty
@@ -1,6 +1,6 @@
\typeout{%
-Pictures in Paragraphs. Version 1.2a, July 13, 1993}
-% This is picinpar.sty version 1.2a as of july 13, 1993
+Pictures in Paragraphs. Version 1.3, November 22, 2022}
+% This is picinpar.sty version 1.3 as of November 22, 2022
% Macros for making windows with LaTeX
%
% By Friedhelm Sowa, Heinrich-Heine-University D\"usseldorf,
@@ -51,7 +51,11 @@ Pictures in Paragraphs. Version 1.2a, July 13, 1993}
% Reported by Stephan Seidl, seidl@rcs.urz.tu-dresden.de
%
+% 1.3 An option to insert the picture/table without a caption (Argument #4 in \figwindow[.., #4] or \tabwindow[.., #4] is empty.
+% see https://tex.stackexchange.com/questions/656810/using-if-with-an-empty-argument
%
+%
+% Changed by Stefan Blochwitz, stefan.blochwitz@bundesbank.de
%
% Here we go
%
@@ -108,7 +112,7 @@ Pictures in Paragraphs. Version 1.2a, July 13, 1993}
% #2 is l, r or c what means left, right or centered
% default is, that the picture is printed at the left side
% #3 is the material for setting a graphic box
-% #4 is the explanation for the graphic
+% #4 is the explanation for the graphic (if empty, then no caption)
\vskip\parskip\everypar{}
\global\cumpar=0pt
\global\cumpartcl=0
@@ -122,6 +126,7 @@ Pictures in Paragraphs. Version 1.2a, July 13, 1993}
\pictoc={#3}
\setbox\windowbox=\vbox{\hbox{#3}}
\setbox\wbox=\vbox{\hbox{\noindent#4}}
+%\setbox\wbox=\vbox{\hbox{\noindent#4}}
\picwd=\wd\windowbox
\hpic=\picwd
\vpic=\ht\windowbox\advance\vpic\dp\windowbox
@@ -522,13 +527,16 @@ to\rtside{\box\bslice\hfil}}
\long\def\figwindow[#1,#2,#3,#4] {%
\advance\c@figure -1
- \begin{window}[#1,#2,{#3},{\def\@captype{figure}%
- \wincaption#4\par}] }
+ \begin{window}[#1,#2,{#3},\if\relax\detokenize{#4}\relax {} \else {\def\@captype{figure}%
+ \wincaption#4\par}\fi]
+ }
+
\long\def\tabwindow[#1,#2,#3,#4] {%
\advance\c@table -1
- \begin{window}[#1,#2,{#3},{\def\@captype{table}%
- \wincaption#4\par}] }
+ \begin{window}[#1,#2,{#3},\if\relax\detokenize{#4}\relax {} \else {\def\@captype{table}%
+ \wincaption#4\par}\fi]
+ }
\def\endfigwindow{\end{window}}
\def\endtabwindow{\end{window}}