lwarp (23jan18)

git-svn-id: svn://tug.org/texlive/trunk@46416 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 55 insertions, 54 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
index 8bf5db0c1e0..c0bad5e4b7f 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-theorem.sty
@@ -81,98 +81,99 @@
     \AtBeginEnvironment{#1}{\edef\LWR@thisthmstyle{\csuse{LWR@thmstyle#1}}}% new
     }%
   \fi}
-\gdef\th@plain{%\normalfont\itshape
+\gdef\th@plain{%
   \def\@begintheorem##1##2{%
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-        \item[\hskip\labelsep
+        \item[
             \InlineClass{theoremheader}{##1\ ##2}
-        ]}%
+        ]
+    }%
 \def\@opargbegintheorem##1##2##3{%
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-   \item[\hskip\labelsep
+   \item[
         \InlineClass{theoremheader}{##1\ ##2\ (##3)}
-    ]}
+    ]
+    }
 }
 
-\gdef\th@break{%\normalfont\slshape
+\gdef\th@break{%
   \def\@begintheorem##1##2{%
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-    \item[\hskip \labelsep
+    \item[
         \InlineClass{theoremheader}{##1\ ##2}\newline%
-    ]}%
+    ]
+    }%
 \def\@opargbegintheorem##1##2##3{%
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-  \item[\hskip \labelsep
+  \item[
         \InlineClass{theoremheader}{##1\ ##2\ (##3)}\newline
-    ]}
+    ]
+    }
 }
 
-\gdef\th@marginbreak{%\normalfont\slshape
+\gdef\th@marginbreak{%
   \def\@begintheorem##1##2{
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-    \item[\hskip\labelsep %
+    \item[
         \InlineClass{theoremheader}{##2 \qquad ##1}\newline
-    ]}%
+    ]
+    }%
 \def\@opargbegintheorem##1##2##3{%
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-    \item[\hskip\labelsep %
+    \item[
         \InlineClass{theoremheader}{##2 \qquad ##1\ %
         (##3)}\newline
-    ]}
+    ]
+    }
 }
 
-\gdef\th@changebreak{%\normalfont\slshape
+\gdef\th@changebreak{%
   \def\@begintheorem##1##2{
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-    \item[\hskip\labelsep
+    \item[
         \InlineClass{theoremheader}{##2\ ##1}\newline
-    ]}%
+    ]
+    }%
 \def\@opargbegintheorem##1##2##3{%
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-    \item[\hskip\labelsep
+    \item[
         \InlineClass{theoremheader}{ ##2\ ##1\ %
         (##3)}\newline
-    ]}
+    ]
+    }
 }
 
-\gdef\th@change{%\normalfont\slshape
+\gdef\th@change{%
   \def\@begintheorem##1##2{
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-    \item[\hskip\labelsep
+    \item[
         \InlineClass{theoremheader}{##2\ ##1}
-    ]}%
+    ]
+    }%
 \def\@opargbegintheorem##1##2##3{%
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-    \item[\hskip\labelsep
+    \item[
         \InlineClass{theoremheader}{##2\ ##1\ (##3)}
-    ]}
+    ]
+    }
 }
 
-\gdef\th@margin{%\normalfont\slshape
+\gdef\th@margin{%
   \def\@begintheorem##1##2{
-\LWR@forcenewpage% new
-    \BlockClass{theorembody\LWR@thisthmstyle}% new
-    \item[\hskip\labelsep
+    \item[
         \InlineClass{theoremheader}{##2 \qquad ##1}
-    ]}%
+    ]
+    }%
 \def\@opargbegintheorem##1##2##3{%
+    \item[
+            \InlineClass{theoremheader}{##2 \qquad ##1\ (##3)}
+    ]
+    }
+}
+\gdef\@thm#1#2{\refstepcounter{#1}%
 \LWR@forcenewpage% new
     \BlockClass{theorembody\LWR@thisthmstyle}% new
-    \item[\hskip\labelsep
-            \InlineClass{theoremheader}{##2 \qquad ##1\ (##3)}
-    ]}
+   \trivlist
+   \@topsep \theorempreskipamount               % used by first \item
+   \@topsepadd \theorempostskipamount           % used by \@endparenv
+   \@ifnextchar [%
+   {\@ythm{#1}{#2}}%
+   {\@begintheorem{#2}{\csname the#1\endcsname}\ignorespaces}}
+
+\gdef\@endtheorem{%
+\endtrivlist
+\endBlockClass
 }
-\gdef\@endtheorem{\endBlockClass\endtrivlist}
 \endinput
 %%
 %% End of file `lwarp-theorem.sty'.