1 files changed, 11 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
index 4eb11999622..ef8270c1804 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-wrapfig.sty
@@ -19,13 +19,9 @@
 
 
 \LWR@ProvidesPackageDrop{wrapfig}
-
-\newlength{\LWR@wrapwidth}
-
 \newcommand*{\LWR@wrapposition}{}
 
 \newcommand*{\LWR@subwrapfigure}[2]{%
-\LWR@maybeincthisfloat%
 \renewcommand*{\LWR@wrapposition}{}%
 \ifthenelse{%
     \equal{#1}{r}\OR\equal{#1}{R}\OR%
@@ -33,16 +29,16 @@
 }%
 {\renewcommand*{\LWR@wrapposition}{float:right}}%
 {\renewcommand*{\LWR@wrapposition}{float:left}}%
-\setlength{\LWR@wrapwidth}{#2}%
-\addtolength{\LWR@wrapwidth}{4em}%
+\setlength{\LWR@templengthone}{#2}%
 \uselengthunit{PT}%
-\LWR@forcenewpage
-\LWR@stoppars%
-\LWR@htmltag{div class="marginblock" id="autofloat-\arabic{LWR@thisfloat}"
-style="width:\rndprintlength{\LWR@wrapwidth} ; %
-\LWR@wrapposition"%
+\LWR@BlockClassWP{%
+    width:\rndprintlength{\LWR@templengthone}; \LWR@wrapposition; %
+    margin:10pt%
+}%
+{%
+    width:\rndprintlength{\LWR@templengthone}; \LWR@wrapposition%
 }%
-\LWR@startpars
+{marginblock}%
 }
 
 \NewDocumentEnvironment{wrapfigure}{o m o m}
@@ -51,7 +47,7 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
 \captionsetup{type=figure}%
 }
 {%
-\LWR@htmldivclassend{div}
+\endLWR@BlockClassWP%
 }
 
 \NewDocumentEnvironment{wraptable}{o m o m}
@@ -60,7 +56,7 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
 \captionsetup{type=table}%
 }
 {%
-\LWR@htmldivclassend{div}
+\endLWR@BlockClassWP%
 }
 
 \NewDocumentEnvironment{wrapfloat}{m o m o m}
@@ -69,7 +65,7 @@ style="width:\rndprintlength{\LWR@wrapwidth} ; %
 \captionsetup{type=#1}%
 }
 {%
-\LWR@htmldivclassend{div}
+\endLWR@BlockClassWP%
 }
 
 \newlength{\wrapoverhang}