lwarp (30oct17)

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

1 files changed, 19 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
index a30e33a9074..86e466408e4 100644
--- a/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
+++ b/Master/texmf-dist/tex/latex/lwarp/lwarp-keyfloat.sty
@@ -26,24 +26,20 @@
 
 \NewEnviron{KFLT@boxinner}
 {%
-\LWR@traceinfo{kflt@boxinner}%
+\LWR@traceinfo{KFLT@boxinner}%
 \LWR@stoppars%
 \KFLT@frame{\BODY}%
 \LWR@startpars%
-\LWR@traceinfo{ended kflt@boxinner}%
+\LWR@traceinfo{KFLT@boxinner: done}%
 }
 
 \DeclareDocumentEnvironment{KFLT@marginfloat}{O{-1.2ex} m}
-{% start
-\LWR@maybeincthisfloat%
-\LWR@forcenewpage
-\LWR@stoppars%
-\LWR@htmltag{div class="marginblock" id="autofloat-\arabic{LWR@thisfloat}"}
-\LWR@startpars%
+{%
+\LWR@BlockClassWP{float:right; width:2in; margin:10pt}{}{marginblock}%
 \captionsetup{type=#2}%
 }
-{
-\LWR@htmldivclassend{div}
+{%
+\endLWR@BlockClassWP%
 }
 
 \DeclareDocumentEnvironment{marginfigure}{o}
@@ -56,10 +52,20 @@
 
 \DeclareDocumentEnvironment{keywrap}{m +m}
 {%
-\begin{BlockClass}{marginblock}
-\setlength{\linewidth}{#1}
+\LWR@ensuredoingapar%
+\setlength{\LWR@templengthone}{#1}%
+\uselengthunit{PT}%
+\begin{LWR@BlockClassWP}{%
+    float:right; width:\rndprintlength{\LWR@templengthone}; %
+    margin:10pt%
+}%
+{%
+    width:\rndprintlength{\LWR@templengthone}%
+}%
+{marginblock}%
+\setlength{\linewidth}{.95\LWR@templengthone}%
 #2%
-\end{BlockClass}
+\end{LWR@BlockClassWP}%
 }
 {%
 }