lltjcore.sty: tentative fix for \@outputtombow (with multicol v1.8n)

[luatex-ja/luatexja.git] / src / patches / lltjcore.sty

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index 63ba233..2b301d8 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -4,7 +4,7 @@
 % 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjcore}[2015/01/01 Patch to LaTeX2e Kernel for LuaTeX-ja]
+\ProvidesPackage{lltjcore}[2016/04/01 Patch to LaTeX2e Kernel for LuaTeX-ja]
 
 \def\cleardoublepage{\clearpage\if@twoside
   \ifodd\c@page
@@ -79,6 +79,7 @@
 \def\@outputtombow{%
   \iftombow
   \vbox to\z@{\kern-13mm\relax
+    \boxmaxdepth\maxdimen
     \moveleft3mm\vbox to\@@paperheight{%
       \hbox to\@@paperwidth{\hskip3mm\relax
          \copy\@TL\hfill\copy\@TC\hfill\copy\@TR\hskip3mm}%
@@ -193,7 +194,11 @@
   \unless\ifnum\ltjgetparameter{direction}=3 \@makefnmark
   \else\hbox to\z@{\hskip-.25\zw\raise.9\zh\@makefnmark\hss}\fi
   \ifhmode\spacefactor\@x@sf\fi\relax}
-\def\@setref#1#2#3{%
+\begingroup
+\@ifpackageloaded{hyperref}
+  {\def\ltj@setrefprefix{real}}
+  {\def\ltj@setrefprefix{}}
+\expandafter\gdef\csname \ltj@setrefprefix @setref\endcsname#1#2#3{%
   \ifx#1\relax
     \protect\G@refundefinedtrue
     \nfss@text{\reset@font\bfseries ??}%
@@ -202,6 +207,7 @@
   \else
     \expandafter#2#1\relax% change \null to \relax
   \fi}
+\endgroup
 \if@compatibility\else
 \def\verb{\relax\ifmmode\hbox\else\leavevmode\fi
   \bgroup