texlive[65097] Master/texmf-dist: picinpar (24nov22)

Thu Nov 24 21:39:43 CET 2022

Revision: 65097
          http://tug.org/svn/texlive?view=revision&revision=65097
Author:   karl
Date:     2022-11-24 21:39:43 +0100 (Thu, 24 Nov 2022)
Log Message:
-----------
picinpar (24nov22)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-de.pdf
    trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-de.tex
    trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-en.pdf
    trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-en.tex
    trunk/Master/texmf-dist/tex/latex/picinpar/picinpar.sty

Modified: trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-de.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-de.tex
===================================================================

--- trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-de.tex	2022-11-24 20:39:29 UTC (rev 65096)
+++ trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-de.tex	2022-11-24 20:39:43 UTC (rev 65097)
@@ -69,7 +69,36 @@
 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|}
 \hline

Modified: trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-en.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-en.tex	2022-11-24 20:39:29 UTC (rev 65096)
+++ trunk/Master/texmf-dist/doc/latex/picinpar/picinpar-en.tex	2022-11-24 20:39:43 UTC (rev 65097)
@@ -84,6 +84,12 @@
   notice \TeX's overfull \cmd{\vbox}
 
   Reported by Stephan Seidl, \mail{seidl at 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 at bundesbank.de}
+
 \end{labeling}
 
 \end{document}

Modified: trunk/Master/texmf-dist/tex/latex/picinpar/picinpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/picinpar/picinpar.sty	2022-11-24 20:39:29 UTC (rev 65096)
+++ trunk/Master/texmf-dist/tex/latex/picinpar/picinpar.sty	2022-11-24 20:39:43 UTC (rev 65097)
@@ -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 @@
 %      Reported by Stephan Seidl, seidl at 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 at bundesbank.de
 %
 %                       Here we go
 %
@@ -108,7 +112,7 @@
 % #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 @@
 \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 @@
 
 \long\def\figwindow[#1,#2,#3,#4] {%
      \advance\c at 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 at 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}}

