removed \ifydir etc. from source code (we must update doc/ and test/)

diff --git a/src/addons/luatexja-ajmacros.sty b/src/addons/luatexja-ajmacros.sty
index 3944b96..89e0953 100644 (file)
--- a/src/addons/luatexja-ajmacros.sty
+++ b/src/addons/luatexja-ajmacros.sty
@@ -87,7 +87,7 @@
 \gdef\shift@CID#1#2{{\@tempcnta#1\advance\@tempcnta#2\CID{\@tempcnta}}}
 \gdef\ajTsumesuji{\@ifstar{\@@ajTsumesuji}{\@ajTsumesuji}}
 \global\let\ajTumesuji\ajTsumesuji
-\gdef\@ajTsumesuji#1#2{{\@tempcnta\ifydir\ifcase#1\or780\or247\or9758\or9738\fi
+\gdef\@ajTsumesuji#1#2{{\@tempcnta\unless\ifnum\ltjgetparameter{direction}=3 \ifcase#1\or780\or247\or9758\or9738\fi
        \else\ifcase#1\or8736\or8966\or13274\or13254\fi\fi
        \aj@expand\aj@Tsumesuji#2\@nil}}
 \gdef\@@ajTsumesuji#1{\@ajTsumesuji{\aj@expand\aj@count@toks#14321\@nil}{#1}}
@@ -226,15 +226,15 @@
 %
 \gdef\ajTsumekakko#1{\aj@expand\@ajTsumekakko#1\@nil}
 \global\let\ajTumekakko\ajTsumekakko
-\gdef\@ajTsumekakko#1#2{\ifx\@nil#2\mbox{\ifydir\rlap{\CID{10233}}\shift@CID{#1}{9872}%
+\gdef\@ajTsumekakko#1#2{\ifx\@nil#2\mbox{\unless\ifnum\ltjgetparameter{direction}=3 \rlap{\CID{10233}}\shift@CID{#1}{9872}%
        \else\CID{13268}\shift@CID{#1}{10185}\CID{13269}\fi}%
        \expandafter\@gobble
-       \else\shift@CID{#1}{\ifydir10152\else10174\fi}%
+       \else\shift@CID{#1}{\unless\ifnum\ltjgetparameter{direction}=3 10152\else10174\fi}%
        \expandafter\aj@Tsumekakko
        \fi#2}
-\gdef\aj@Tsumekakko#1#2{\ifx\@nil#2\shift@CID{#1}{\ifydir10162\else10196\fi}%
+\gdef\aj@Tsumekakko#1#2{\ifx\@nil#2\shift@CID{#1}{\unless\ifnum\ltjgetparameter{direction}=3 10162\else10196\fi}%
        \expandafter\@gobble
-       \else\shift@CID{#1}{\ifydir247\else10185\fi}%
+       \else\shift@CID{#1}{\unless\ifnum\ltjgetparameter{direction}=3 247\else10185\fi}%
        \expandafter\aj@Tsumekakko
        \fi#2}
 \gdef\ajNenrei#1{\ifcase#1\relax\expandafter\ajTsumekakko\or\expandafter\aj@NenreiTu
@@ -242,14 +242,14 @@
        \or\expandafter\aj@Nenrei@Sai
        \fi}
 \gdef\aj@NenreiTu#1{\aj@expand\@aj@NenreiTu#1\@nil}
-\gdef\@aj@NenreiTu#1#2{\shift@CID{#1}{\ifydir10152\else10174\fi}%
-       \ifx\@nil#2\CID{\ifydir10172\else10206\fi}\expandafter\@gobble
+\gdef\@aj@NenreiTu#1#2{\shift@CID{#1}{\unless\ifnum\ltjgetparameter{direction}=3 10152\else10174\fi}%
+       \ifx\@nil#2\CID{\unless\ifnum\ltjgetparameter{direction}=3 10172\else10206\fi}\expandafter\@gobble
        \else\expandafter\aj@Tsumekakko
        \fi#2}
 \gdef\aj@NenreiSai#1{\aj@expand\@aj@NenreiSai#1\@nil}
-\gdef\@aj@NenreiSai#1{\shift@CID{#1}{\ifydir10152\else10174\fi}\@aj@NenreiSai@}
-\gdef\@aj@NenreiSai@#1{\ifx\@nil#1\CID{\ifydir10173\else10207\fi}%
-       \else\shift@CID{#1}{\ifydir247\else10185\fi}%
+\gdef\@aj@NenreiSai#1{\shift@CID{#1}{\unless\ifnum\ltjgetparameter{direction}=3 10152\else10174\fi}\@aj@NenreiSai@}
+\gdef\@aj@NenreiSai@#1{\ifx\@nil#1\CID{\unless\ifnum\ltjgetparameter{direction}=3 10173\else10207\fi}%
+       \else\shift@CID{#1}{\unless\ifnum\ltjgetparameter{direction}=3 247\else10185\fi}%
        \expandafter\@aj@NenreiSai@\fi}
 \gdef\aj@Nenrei@Tu#1{\ifnum#1<10 \shift@CID{#1}{10174}\CID{10206}%
        \else\expandafter\@aj@Nenrei@Tu\number#1%
@@ -327,7 +327,7 @@
 %
 \def\@aj半角def#1{\ifx\@nil#1\else
        \expandafter\xdef\csname aj半角@#1\endcsname{\noexpand\CID
-               {\noexpand\ifydir\number\@tempcnta\noexpand\else\number\@tempcntb\noexpand\fi}}%
+               {\noexpand\unless\noexpand\ifnum\noexpand\ltjgetparameter\noexpand{direction\noexpand}=3 \number\@tempcnta\noexpand\else\number\@tempcntb\noexpand\fi}}%
        \advance\@tempcnta\@ne\advance\@tempcntb\@ne
        \expandafter\@aj半角def\fi}
 \@tempcnta326
@@ -347,7 +347,7 @@
        \@ajligdef{#1}{\number\@tempcnta}\advance\@tempcnta\@ne
        \expandafter\@ajligaturedef\fi}
 \def\@aj@ligdef#1#2#3{\expandafter\xdef\csname ajLig\@ajmojifam#1\endcsname
-       {\noexpand\CID{\noexpand\ifydir#2\noexpand\else#3\noexpand\fi}}}
+       {\noexpand\CID{\noexpand\unless\noexpand\ifnum\noexpand\ltjgetparameter\noexpand{direction\noexpand}=3 #2\noexpand\else#3\noexpand\fi}}}
 \def\@aj@ligaturedef#1{\ifx\@nil#1\else
        \@aj@ligdef{#1}{\number\@tempcnta}{\number\@tempcntb}%
        \advance\@tempcnta\@ne\advance\@tempcntb\@ne
@@ -506,10 +506,10 @@
 \def\@ajkanadef#1#2#3#4#5#6#7{\expandafter\gdef\csname ajLig#1\endcsname
        {\if@kana\def\reserved@a{ruby}%
                \ifx\k@family\reserved@a
-                       \ifydir\CID{#6}\else\CID{#7}\fi
-               \else\ifydir\CID{#4}\else\CID{#5}\fi
+                       \unless\ifnum\ltjgetparameter{direction}=3 \CID{#6}\else\CID{#7}\fi
+               \else\unless\ifnum\ltjgetparameter{direction}=3 \CID{#4}\else\CID{#5}\fi
                \fi
-       \else\ifydir\CID{#2}\else\CID{#3}\fi
+       \else\unless\ifnum\ltjgetparameter{direction}=3 \CID{#2}\else\CID{#3}\fi
        \fi}}
 \newcount\@tempcntc
 \newcount\@tempcntd
@@ -793,7 +793,7 @@
 %
 \gdef\ajLeader{\@ifnextchar[{\aj@Leader}{\aj@Leader[\z@ plus1fill]}}
 \gdef\aj@Leader[#1]#2{{\@tempcnta#2\multiply\@tempcnta\tw@
-       \advance\@tempcnta1221\ifhmode\ifydir4\else5\fi\else\ifydir5\else4\fi\fi
+       \advance\@tempcnta1221\ifhmode\unless\ifnum\ltjgetparameter{direction}=3 4\else5\fi\else\unless\ifnum\ltjgetparameter{direction}=3 5\else4\fi\fi
        \leaders\hbox{\CID{\@tempcnta}}\ifhmode\hskip\else\vskip\fi#1}}
 %
 %
@@ -827,9 +827,9 @@
 * * * *
 \def\@removetop#1{\toks#1\expandafter\expandafter\expandafter{\expandafter\@gobble\the\toks#1}}
 \@removetop0\@removetop1\@removetop2\@removetop3
-\xdef\ajQuote#1#2{\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1 \the\toks0
+\xdef\ajQuote#1#2{\noexpand\CID{\noexpand\unless\noexpand\ifnum\noexpand\ltjgetparameter\noexpand{direction\noexpand}=3 \noexpand\ifcase#1 \the\toks0
        \noexpand\fi\noexpand\else\noexpand\ifcase#1 \the\toks2
-       \noexpand\fi\noexpand\fi}#2\inhibitglue\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1 \the\toks1
+       \noexpand\fi\noexpand\fi}#2\inhibitglue\noexpand\CID{\noexpand\unless\noexpand\ifnum\noexpand\ltjgetparameter\noexpand{direction\noexpand}=3 \noexpand\ifcase#1 \the\toks1
        \noexpand\fi\noexpand\else\noexpand\ifcase#1 \the\toks3
        \noexpand\fi\noexpand\fi}}
 }

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index 8a6edfd..d497005 100644 (file)
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -73,7 +73,7 @@ local function adjust_badness(hd)
    end
 end
 
-local get_dir_count
+local get_dir_count, get_adjust_dir_count
 do
    local function get_dir_count_inner(h)
       if h then
@@ -99,18 +99,34 @@ do
       end
       return page_direction
    end
+   local abs = math.abs
+   function get_adjust_dir_count()
+      for i=tex_nest.ptr, 1, -1 do
+         local v = tex_nest[i]
+        local h, m = v.head.next, v.mode
+        if abs(m)== ltjs.vmode and h then
+           local t = get_dir_count_inner(h)
+           if t~=0 then return t end
+        end
+      end
+      return page_direction
+   end
    luatexja.direction.get_dir_count = get_dir_count
+   luatexja.direction.get_adjust_dir_count = get_adjust_dir_count
 end
 
 
 -- \tate, \yoko
-local reset_dir_conditional
 do
    local node_next = node.next
    local node_set_attr = node.set_attribute
    local function set_list_direction(v, name)
       local lv, w = tex_nest.ptr, tex.lists.page_head
-      if not v then v,name  = get_dir_count(), nil end
+      if not v then 
+         v,name  = get_dir_count(), nil 
+      elseif v=='adj' then
+         v,name = get_adjust_dir_count(), nil
+      end
       if tex.currentgrouptype==6 then
         ltjb.package_error(
                  'luatexja',
@@ -123,6 +139,7 @@ do
            if (not w.next) and 
               w.id==id_whatsit and w.subtype==sid_user and w.user_id==DIR then
               node_set_attr(w, attr_dir, v)
+               if lv==0 then page_direction = v end
            elseif lv==0 and not page_direction then
               page_direction = v -- for first call of \yoko (in luatexja-core.sty)
            else
@@ -141,7 +158,7 @@ do
            Dnode.write(w)
            if lv==0 then page_direction = v end
         end
-        reset_dir_conditional(); tex_set_attr('global', attr_icflag, 0)
+         tex_set_attr('global', attr_icflag, 0)
       end
       tex_set_attr('global', attr_dir, 0)
    end
@@ -425,8 +442,11 @@ do
       if b then
         local box_dir = get_box_dir(to_direct(b), dir_yoko)
         if box_dir%dir_node_auto ~= list_dir%dir_node_auto then
-           luatexja.ext_show_node_list(tex.nest[tex.nest.ptr].head, 'LIST> ', print)
-           luatexja.ext_show_node_list(b, 'BOX> ', print)
+            print('NEST', tex_nest.ptr, tex_getcount('ltj@tempcnta'))
+           luatexja.ext_show_node_list(
+               (tex_nest.ptr==0) and tex.lists.page_head or tex_nest[tex_nest.ptr].head,
+               'LIST' .. tostring(list_dir) .. '> ', print)
+           luatexja.ext_show_node_list(b, 'BOX' .. tostring(box_dir) .. '> ', print)
            ltjb.package_error(
               'luatexja',
               "Incompatible direction list can't be unboxed",
@@ -762,39 +782,24 @@ do
 end
 
 do
-   -- \ifydir, \iftdir, \ifddir
-   local cs_true, cs_false = '\\iftrue', '\\iffalse'
-   --local function dir_conditional(v)
-   --   local d = get_dir_count()
-   --   tex.sprint(cat_lp, (d==v) and cs_true or cs_false )
-   --end
-   reset_dir_conditional = function()
-      local d = get_dir_count()
-      tex.sprint(cat_lp, '\\global\\ddir' .. tostring(d==dir_dtou))
-      tex.sprint(cat_lp, '\\global\\tdir' .. tostring(d==dir_tate))
-      tex.sprint(cat_lp, '\\global\\ydir' .. tostring(d==dir_yoko))
-   end
-   -- \ifybox, \iftbox, \ifdbox
    local getbox = tex.getbox
-   local function box_dir_conditional(n, mode)
+   local function get_register_dir(n)
       local s = getbox(n)
-      local res = false
       if s then
          s = to_direct(s)
          local b_dir = get_box_dir(s, dir_yoko)
          if b_dir<dir_node_auto then
-           res = (b_dir==mode)
+           return b_dir
          else
            local b_dir = get_box_dir(
               node_next(node_next(node_next(getlist(s)))), dir_yoko)
-           res = (b_dir==mode)
+           return b_dir
          end
+      else
+         return 0
       end
-      tex.sprint(cat_lp, res and cs_true or cs_false)
    end
-   luatexja.direction.reset_dir_conditional = reset_dir_conditional
-   --luatexja.direction.dir_conditional = dir_conditional
-   luatexja.direction.box_dir_conditional = box_dir_conditional
+   luatexja.direction.get_register_dir = get_register_dir
 end
 
 -- 縦書き用字形への変換テーブル
@@ -869,7 +874,7 @@ end
 local id_adjust = node.id('adjust')
 function luatexja.direction.check_adjust_direction()
    start_time_measure('box_primitive_hook')
-   local list_dir = tex_getcount('ltj@adjdir@count')
+   local list_dir = get_adjust_dir_count()
    local a = tex_nest[tex_nest.ptr].tail
    local ad = to_direct(a)
    if a and getid(ad)==id_adjust then
@@ -883,7 +888,6 @@ function luatexja.direction.check_adjust_direction()
       end
    end
    stop_time_measure('box_primitive_hook')
-   reset_dir_conditional()
 end
 
 -- vsplit

diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls
index d294f98..e16ac3d 100644 (file)
--- a/src/ltjarticle.cls
+++ b/src/ltjarticle.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjarticle}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -327,7 +327,7 @@
   \newcommand{\maketitle}{\par
   \begingroup
     \renewcommand{\thefootnote}{\fnsymbol{footnote}}%
-    \def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
+    \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
       \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
      \long\def\@makefntext##1{\parindent 1em\noindent
        \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
@@ -496,7 +496,7 @@
    \advance\@enumdepth\@ne
    \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
    \list{\csname label\@enumctr\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -510,7 +510,7 @@
    \fi}{\endlist}
 \newcommand{\labelitemi}{\textbullet}
 \newcommand{\labelitemii}{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
      {\textcircled{~}}
   \else
      {\normalfont\bfseries\textendash}
@@ -524,7 +524,7 @@
    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
    \expandafter
    \list{\csname \@itemitem\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -537,7 +537,7 @@
    \fi}{\endlist}
 \newenvironment{description}
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
-   \iftdir
+   \ifnum\ltjgetparameter{direction}=3
      \leftmargin\leftskip \advance\leftmargin3\Cwd
      \rightmargin\rightskip
      \labelsep=1\zw \itemsep\z@
@@ -591,11 +591,11 @@
 \setlength\belowcaptionskip{0\p@}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \iftdir\sbox\@tempboxa{#1\hskip1\zw#2}%
+  \ifnum\ltjgetparameter{direction}=3 \sbox\@tempboxa{#1\hskip1\zw#2}%
     \else\sbox\@tempboxa{#1: #2}%
   \fi
   \ifdim \wd\@tempboxa >\hsize
-    \iftdir #1\hskip1\zw#2\relax\par
+    \ifnum\ltjgetparameter{direction}=3  #1\hskip1\zw#2\relax\par
       \else #1: #2\relax\par\fi
   \else
     \global \@minipagefalse
@@ -762,7 +762,7 @@
 \def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
     \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月

diff --git a/src/ltjbk10.clo b/src/ltjbk10.clo
index 7c3fe5d..025c878 100644 (file)
--- a/src/ltjbk10.clo
+++ b/src/ltjbk10.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk10.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%

diff --git a/src/ltjbk11.clo b/src/ltjbk11.clo
index 6c5793b..8c67bfc 100644 (file)
--- a/src/ltjbk11.clo
+++ b/src/ltjbk11.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk11.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%

diff --git a/src/ltjbk12.clo b/src/ltjbk12.clo
index cb3c174..e674a96 100644 (file)
--- a/src/ltjbk12.clo
+++ b/src/ltjbk12.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjbk12.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%

diff --git a/src/ltjbook.cls b/src/ltjbook.cls
index c1eb9b0..0ec87db 100644 (file)
--- a/src/ltjbook.cls
+++ b/src/ltjbook.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjbook}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -353,7 +353,7 @@
   \newcommand{\maketitle}{\par
   \begingroup
     \renewcommand{\thefootnote}{\fnsymbol{footnote}}%
-    \def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
+    \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
       \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
      \long\def\@makefntext##1{\parindent 1em\noindent
        \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
@@ -571,7 +571,7 @@
    \advance\@enumdepth\@ne
    \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
    \list{\csname label\@enumctr\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -585,7 +585,7 @@
    \fi}{\endlist}
 \newcommand{\labelitemi}{\textbullet}
 \newcommand{\labelitemii}{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
      {\textcircled{~}}
   \else
      {\normalfont\bfseries\textendash}
@@ -599,7 +599,7 @@
    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
    \expandafter
    \list{\csname \@itemitem\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -612,7 +612,7 @@
    \fi}{\endlist}
 \newenvironment{description}
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
-   \iftdir
+   \ifnum\ltjgetparameter{direction}=3
      \leftmargin\leftskip \advance\leftmargin3\Cwd
      \rightmargin\rightskip
      \labelsep=1\zw \itemsep\z@
@@ -668,11 +668,11 @@
 \setlength\belowcaptionskip{0\p@}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \iftdir\sbox\@tempboxa{#1\hskip1\zw#2}%
+  \ifnum\ltjgetparameter{direction}=3 \sbox\@tempboxa{#1\hskip1\zw#2}%
     \else\sbox\@tempboxa{#1: #2}%
   \fi
   \ifdim \wd\@tempboxa >\hsize
-    \iftdir #1\hskip1\zw#2\relax\par
+    \ifnum\ltjgetparameter{direction}=3  #1\hskip1\zw#2\relax\par
       \else #1: #2\relax\par\fi
   \else
     \global \@minipagefalse
@@ -851,7 +851,7 @@
 \def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
     \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月

diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx
index a9bdf63..05cfe8c 100644 (file)
--- a/src/ltjclasses.dtx
+++ b/src/ltjclasses.dtx
@@ -78,6 +78,8 @@
 % \changes{v1.6-ltj}{2011/09/27}{jclasses.dtx v1.6 をベースにLua\LaTeX-ja用に修正。}
 % \changes{v1.6-ltj-2}{2013/06/06}{luatexja.cfgに対応．}
 % \changes{v1.6-ltj-3}{2014/06/08}{縦組みクラスの時のgeometry.styに対応．}
+% \changes{v1.6-ltj-4}{2014/06/30}{組方向の変更箇所を現行の\LuaTeX-jaの仕様に合うように修正．}
+% \changes{v1.6-ltj-5}{2014/07/02}{\cs{ifydir}, \cs{iftdir}を使わないように修正．}
 % \fi
 %
 % \iffalse
@@ -107,7 +109,7 @@
 %<11pt&bk>\ProvidesFile{ltjtbk11.clo}
 %<12pt&bk>\ProvidesFile{ltjtbk12.clo}
 %</tate>
-  [2014/06/08 v1.6-ltj-3
+  [2014/07/02 v1.6-ltj-5
 %<article|report|book> Standard LuaLaTeX-ja class]
 %<10pt|11pt|12pt>  Standard LuaLaTeX-ja file (size option)]
 %<*driver>
@@ -396,10 +398,12 @@
 % \changes{v1.0g}{1997/01/25}{Insert \cs{hbox}, to switch tate-mode.}
 % \changes{v1.1d}{1997/02/05}{開始ページがおかしくなるのを修正}
 % \changes{v1.1f}{1997/07/08}{縦組時にベースラインがおかしくなるのを修正}
+%
+% \changes{v1.6-ltj-4}{2014/06/30}{本文の組方向を \cs{AtBeginDocument} で
+%   変更することができなくなったことに対応}
 %    \begin{macrocode}
 \DeclareOption{tate}{%
-  \AtBeginDocument{\tate\message{《縦組モード》}%
-                   \adjustbaseline}%
+  \tate\AtBeginDocument{\message{《縦組モード》}\adjustbaseline}%
 }
 %    \end{macrocode}
 %
@@ -2141,7 +2145,7 @@
   \newcommand{\maketitle}{\par
   \begingroup
     \renewcommand{\thefootnote}{\fnsymbol{footnote}}%
-    \def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
+    \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
       \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
 %<*tate>
     \long\def\@makefntext##1{\parindent 1\zw\noindent
@@ -3058,7 +3062,7 @@
    \advance\@enumdepth\@ne
    \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
    \list{\csname label\@enumctr\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3 
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -3086,7 +3090,7 @@
 %    \begin{macrocode}
 \newcommand{\labelitemi}{\textbullet}
 \newcommand{\labelitemii}{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3 
      {\textcircled{~}}
   \else
      {\normalfont\bfseries\textendash}
@@ -3111,7 +3115,7 @@
    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
    \expandafter
    \list{\csname \@itemitem\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3 
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -3136,7 +3140,7 @@
 %    \begin{macrocode}
 \newenvironment{description}
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
-   \iftdir
+   \ifnum\ltjgetparameter{direction}=3 
      \leftmargin\leftskip \advance\leftmargin3\Cwd
      \rightmargin\rightskip
      \labelsep=1\zw \itemsep\z@
@@ -3373,11 +3377,11 @@
 %    \begin{macrocode}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \iftdir\sbox\@tempboxa{#1\hskip1\zw#2}%
+  \ifnum\ltjgetparameter{direction}=3 \sbox\@tempboxa{#1\hskip1\zw#2}%
     \else\sbox\@tempboxa{#1: #2}%
   \fi
   \ifdim \wd\@tempboxa >\hsize
-    \iftdir #1\hskip1\zw#2\relax\par
+    \ifnum\ltjgetparameter{direction}=3  #1\hskip1\zw#2\relax\par
       \else #1: #2\relax\par\fi
   \else
     \global \@minipagefalse
@@ -4084,7 +4088,7 @@
 % 縦組の場合は、漢数字で出力します。
 %    \begin{macrocode}
 \def\today{{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
     \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月

diff --git a/src/ltjreport.cls b/src/ltjreport.cls
index d5c67e6..3691442 100644 (file)
--- a/src/ltjreport.cls
+++ b/src/ltjreport.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjreport}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \newcounter{@paper}
@@ -341,7 +341,7 @@
   \newcommand{\maketitle}{\par
   \begingroup
     \renewcommand{\thefootnote}{\fnsymbol{footnote}}%
-    \def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
+    \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
       \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
      \long\def\@makefntext##1{\parindent 1em\noindent
        \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
@@ -568,7 +568,7 @@
    \advance\@enumdepth\@ne
    \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
    \list{\csname label\@enumctr\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -582,7 +582,7 @@
    \fi}{\endlist}
 \newcommand{\labelitemi}{\textbullet}
 \newcommand{\labelitemii}{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
      {\textcircled{~}}
   \else
      {\normalfont\bfseries\textendash}
@@ -596,7 +596,7 @@
    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
    \expandafter
    \list{\csname \@itemitem\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -609,7 +609,7 @@
    \fi}{\endlist}
 \newenvironment{description}
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
-   \iftdir
+   \ifnum\ltjgetparameter{direction}=3
      \leftmargin\leftskip \advance\leftmargin3\Cwd
      \rightmargin\rightskip
      \labelsep=1\zw \itemsep\z@
@@ -665,11 +665,11 @@
 \setlength\belowcaptionskip{0\p@}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \iftdir\sbox\@tempboxa{#1\hskip1\zw#2}%
+  \ifnum\ltjgetparameter{direction}=3 \sbox\@tempboxa{#1\hskip1\zw#2}%
     \else\sbox\@tempboxa{#1: #2}%
   \fi
   \ifdim \wd\@tempboxa >\hsize
-    \iftdir #1\hskip1\zw#2\relax\par
+    \ifnum\ltjgetparameter{direction}=3  #1\hskip1\zw#2\relax\par
       \else #1: #2\relax\par\fi
   \else
     \global \@minipagefalse
@@ -848,7 +848,7 @@
 \def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
     \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月

diff --git a/src/ltjsarticle.cls b/src/ltjsarticle.cls
index 3d31a05..bf37b64 100644 (file)
--- a/src/ltjsarticle.cls
+++ b/src/ltjsarticle.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsarticle}
-  [2014/05/14 ]
+  [2014/07/02 ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -1302,7 +1302,7 @@
 \let\footnotemarks@ve=\footnotemark
 \def\footnotemark{\inhibitglue\footnotemarks@ve}
 \renewcommand\@makefnmark{\hbox{}\hbox{%
-  \ifydir \@textsuperscript{\normalfont\@thefnmark}%
+  \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
   \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
 \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
 \renewcommand{\footnoterule}{%

diff --git a/src/ltjsbook.cls b/src/ltjsbook.cls
index 4e3e12b..ad5f518 100644 (file)
--- a/src/ltjsbook.cls
+++ b/src/ltjsbook.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjsbook}
-  [2014/05/14 ]
+  [2014/07/02 ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -1385,7 +1385,7 @@
 \let\footnotemarks@ve=\footnotemark
 \def\footnotemark{\inhibitglue\footnotemarks@ve}
 \renewcommand\@makefnmark{\hbox{}\hbox{%
-  \ifydir \@textsuperscript{\normalfont\@thefnmark}%
+  \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
   \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
 \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
 \renewcommand{\footnoterule}{%

diff --git a/src/ltjsclasses.dtx b/src/ltjsclasses.dtx
index 6bff584..64c7d03 100644 (file)
--- a/src/ltjsclasses.dtx
+++ b/src/ltjsclasses.dtx
@@ -50,7 +50,7 @@
 %<*driver>
 \ProvidesFile{ltjsclasses.dtx}
 %</driver>
-  [2014/05/14 ]
+  [2014/07/02 ]
 %<*driver>
 \documentclass{ltjsarticle}
 \usepackage{doc}
@@ -4601,9 +4601,11 @@
 %
 % [2013-05-14] plcore.ltx に倣った形に書き直しました（Thanks: 北川さん）。
 %
+% [2014-07-02 LTJ] |\ifydir| を使わない形に書換えました．
+%
 %    \begin{macrocode}
 \renewcommand\@makefnmark{\hbox{}\hbox{%
-  \ifydir \@textsuperscript{\normalfont\@thefnmark}%
+  \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
   \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
 %    \end{macrocode}
 % \end{macro}

diff --git a/src/ltjsize10.clo b/src/ltjsize10.clo
index b325a5c..3b4e07a 100644 (file)
--- a/src/ltjsize10.clo
+++ b/src/ltjsize10.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize10.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{15}%

diff --git a/src/ltjsize11.clo b/src/ltjsize11.clo
index c06c0ec..5cbbc07 100644 (file)
--- a/src/ltjsize11.clo
+++ b/src/ltjsize11.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize11.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{15.5}%

diff --git a/src/ltjsize12.clo b/src/ltjsize12.clo
index 75a726c..ce49379 100644 (file)
--- a/src/ltjsize12.clo
+++ b/src/ltjsize12.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjsize12.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{16.5}%

diff --git a/src/ltjskiyou.cls b/src/ltjskiyou.cls
index 1311dec..87671ea 100644 (file)
--- a/src/ltjskiyou.cls
+++ b/src/ltjskiyou.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjskiyou}
-  [2014/05/14 ]
+  [2014/07/02 ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -1289,7 +1289,7 @@
 \let\footnotemarks@ve=\footnotemark
 \def\footnotemark{\inhibitglue\footnotemarks@ve}
 \renewcommand\@makefnmark{\hbox{}\hbox{%
-  \ifydir \@textsuperscript{\normalfont\@thefnmark}%
+  \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
   \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
 \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
 \renewcommand{\footnoterule}{%

diff --git a/src/ltjspf.cls b/src/ltjspf.cls
index fab8f0c..aed11b6 100644 (file)
--- a/src/ltjspf.cls
+++ b/src/ltjspf.cls
@@ -38,7 +38,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjspf}
-  [2014/05/14 ]
+  [2014/07/02 ]
 \RequirePackage{luatexja}
 \newif\if@restonecol
 \newif\if@titlepage
@@ -1185,7 +1185,7 @@
 \let\footnotemarks@ve=\footnotemark
 \def\footnotemark{\inhibitglue\footnotemarks@ve}
 \renewcommand\@makefnmark{\hbox{}\hbox{%
-  \ifydir \@textsuperscript{\normalfont\@thefnmark}%
+  \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}%
   \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
 \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi}
 \renewcommand{\footnoterule}{%

diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls
index c49cc84..a84b61d 100644 (file)
--- a/src/ltjtarticle.cls
+++ b/src/ltjtarticle.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtarticle}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \RequirePackage{filehook}
@@ -340,7 +340,7 @@
   \newcommand{\maketitle}{\par
   \begingroup
     \renewcommand{\thefootnote}{\fnsymbol{footnote}}%
-    \def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
+    \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
       \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
     \long\def\@makefntext##1{\parindent 1\zw\noindent
        \hbox to 2\zw{\hss\@makefnmark}##1}%
@@ -509,7 +509,7 @@
    \advance\@enumdepth\@ne
    \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
    \list{\csname label\@enumctr\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -523,7 +523,7 @@
    \fi}{\endlist}
 \newcommand{\labelitemi}{\textbullet}
 \newcommand{\labelitemii}{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
      {\textcircled{~}}
   \else
      {\normalfont\bfseries\textendash}
@@ -537,7 +537,7 @@
    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
    \expandafter
    \list{\csname \@itemitem\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -550,7 +550,7 @@
    \fi}{\endlist}
 \newenvironment{description}
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
-   \iftdir
+   \ifnum\ltjgetparameter{direction}=3
      \leftmargin\leftskip \advance\leftmargin3\Cwd
      \rightmargin\rightskip
      \labelsep=1\zw \itemsep\z@
@@ -604,11 +604,11 @@
 \setlength\belowcaptionskip{0\p@}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \iftdir\sbox\@tempboxa{#1\hskip1\zw#2}%
+  \ifnum\ltjgetparameter{direction}=3 \sbox\@tempboxa{#1\hskip1\zw#2}%
     \else\sbox\@tempboxa{#1: #2}%
   \fi
   \ifdim \wd\@tempboxa >\hsize
-    \iftdir #1\hskip1\zw#2\relax\par
+    \ifnum\ltjgetparameter{direction}=3  #1\hskip1\zw#2\relax\par
       \else #1: #2\relax\par\fi
   \else
     \global \@minipagefalse
@@ -775,7 +775,7 @@
 \def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
     \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月

diff --git a/src/ltjtbk10.clo b/src/ltjtbk10.clo
index e137577..38d9ae5 100644 (file)
--- a/src/ltjtbk10.clo
+++ b/src/ltjtbk10.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk10.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%

diff --git a/src/ltjtbk11.clo b/src/ltjtbk11.clo
index a8727c4..600dd9a 100644 (file)
--- a/src/ltjtbk11.clo
+++ b/src/ltjtbk11.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk11.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%

diff --git a/src/ltjtbk12.clo b/src/ltjtbk12.clo
index 4dccc86..dcf8c2d 100644 (file)
--- a/src/ltjtbk12.clo
+++ b/src/ltjtbk12.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtbk12.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%

diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls
index 868b507..f04c4f7 100644 (file)
--- a/src/ltjtbook.cls
+++ b/src/ltjtbook.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtbook}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \RequirePackage{filehook}
@@ -366,7 +366,7 @@
   \newcommand{\maketitle}{\par
   \begingroup
     \renewcommand{\thefootnote}{\fnsymbol{footnote}}%
-    \def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
+    \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
       \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
     \long\def\@makefntext##1{\parindent 1\zw\noindent
        \hbox to 2\zw{\hss\@makefnmark}##1}%
@@ -584,7 +584,7 @@
    \advance\@enumdepth\@ne
    \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
    \list{\csname label\@enumctr\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -598,7 +598,7 @@
    \fi}{\endlist}
 \newcommand{\labelitemi}{\textbullet}
 \newcommand{\labelitemii}{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
      {\textcircled{~}}
   \else
      {\normalfont\bfseries\textendash}
@@ -612,7 +612,7 @@
    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
    \expandafter
    \list{\csname \@itemitem\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -625,7 +625,7 @@
    \fi}{\endlist}
 \newenvironment{description}
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
-   \iftdir
+   \ifnum\ltjgetparameter{direction}=3
      \leftmargin\leftskip \advance\leftmargin3\Cwd
      \rightmargin\rightskip
      \labelsep=1\zw \itemsep\z@
@@ -681,11 +681,11 @@
 \setlength\belowcaptionskip{0\p@}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \iftdir\sbox\@tempboxa{#1\hskip1\zw#2}%
+  \ifnum\ltjgetparameter{direction}=3 \sbox\@tempboxa{#1\hskip1\zw#2}%
     \else\sbox\@tempboxa{#1: #2}%
   \fi
   \ifdim \wd\@tempboxa >\hsize
-    \iftdir #1\hskip1\zw#2\relax\par
+    \ifnum\ltjgetparameter{direction}=3  #1\hskip1\zw#2\relax\par
       \else #1: #2\relax\par\fi
   \else
     \global \@minipagefalse
@@ -864,7 +864,7 @@
 \def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
     \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月

diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls
index 0dd68ef..1119669 100644 (file)
--- a/src/ltjtreport.cls
+++ b/src/ltjtreport.cls
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{ltjtreport}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
  Standard LuaLaTeX-ja class]
 \RequirePackage{luatexja}
 \RequirePackage{filehook}
@@ -354,7 +354,7 @@
   \newcommand{\maketitle}{\par
   \begingroup
     \renewcommand{\thefootnote}{\fnsymbol{footnote}}%
-    \def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
+    \def\@makefnmark{\hbox{\unless\ifnum\ltjgetparameter{direction}=3 $\m@th^{\@thefnmark}$
       \else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
     \long\def\@makefntext##1{\parindent 1\zw\noindent
        \hbox to 2\zw{\hss\@makefnmark}##1}%
@@ -581,7 +581,7 @@
    \advance\@enumdepth\@ne
    \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
    \list{\csname label\@enumctr\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -595,7 +595,7 @@
    \fi}{\endlist}
 \newcommand{\labelitemi}{\textbullet}
 \newcommand{\labelitemii}{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
      {\textcircled{~}}
   \else
      {\normalfont\bfseries\textendash}
@@ -609,7 +609,7 @@
    \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
    \expandafter
    \list{\csname \@itemitem\endcsname}{%
-      \iftdir
+      \ifnum\ltjgetparameter{direction}=3
          \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
            \else\topsep\z@\fi
          \parskip\z@ \itemsep\z@ \parsep\z@
@@ -622,7 +622,7 @@
    \fi}{\endlist}
 \newenvironment{description}
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
-   \iftdir
+   \ifnum\ltjgetparameter{direction}=3
      \leftmargin\leftskip \advance\leftmargin3\Cwd
      \rightmargin\rightskip
      \labelsep=1\zw \itemsep\z@
@@ -678,11 +678,11 @@
 \setlength\belowcaptionskip{0\p@}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip
-  \iftdir\sbox\@tempboxa{#1\hskip1\zw#2}%
+  \ifnum\ltjgetparameter{direction}=3 \sbox\@tempboxa{#1\hskip1\zw#2}%
     \else\sbox\@tempboxa{#1: #2}%
   \fi
   \ifdim \wd\@tempboxa >\hsize
-    \iftdir #1\hskip1\zw#2\relax\par
+    \ifnum\ltjgetparameter{direction}=3  #1\hskip1\zw#2\relax\par
       \else #1: #2\relax\par\fi
   \else
     \global \@minipagefalse
@@ -861,7 +861,7 @@
 \def\和暦{\西暦false}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
 \def\today{{%
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3
     \if西暦
       \kansuji\number\year 年
       \kansuji\number\month 月

diff --git a/src/ltjtsize10.clo b/src/ltjtsize10.clo
index 1cb14b9..b07672f 100644 (file)
--- a/src/ltjtsize10.clo
+++ b/src/ltjtsize10.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize10.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xpt{17}%

diff --git a/src/ltjtsize11.clo b/src/ltjtsize11.clo
index f399b3a..c60c661 100644 (file)
--- a/src/ltjtsize11.clo
+++ b/src/ltjtsize11.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize11.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xipt{17}%

diff --git a/src/ltjtsize12.clo b/src/ltjtsize12.clo
index b6ca467..bbfe22e 100644 (file)
--- a/src/ltjtsize12.clo
+++ b/src/ltjtsize12.clo
@@ -39,7 +39,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{ltjtsize12.clo}
-  [2014/06/30 v1.6-ltj-4
+  [2014/07/02 v1.6-ltj-5
   Standard LuaLaTeX-ja file (size option)]
 \renewcommand{\normalsize}{%
     \@setfontsize\normalsize\@xiipt{18}%

diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index 0c81f46..d673f83 100644 (file)
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -142,8 +142,6 @@
 \newluatexattribute\ltj@tkblshift % attribute for tjabaselineshift
 \newluatexattribute\jfam          % index for current jfam
 
-\newcount\ltj@dir@count           % counter for indicating direction
-\newcount\ltj@adjdir@count        % counter for indicating direction (for vadjust)
 \newluatexattribute\ltj@dir
 
 \ltj@dir=0
@@ -434,6 +432,7 @@
 \ltj@@decl@array@param{kcatcode}
 \ltj@@decl@array@param{jacharrange}
 \ltj@@decl@array@param{chartorange}
+\ltj@@decl@array@param{boxdir}
 \def\ltjgetparameter#1{%
   \directlua{luatexja.base.start_time_measure('get_par')}%
   \ifcsname ltj@@array@param/#1\endcsname
@@ -531,10 +530,7 @@
    \directlua{luatexja.jfont.clear_alt_font(\the\ltj@tempcntc)}}\ignorespaces}
 
 
-%%%%%%%% \yoko, \tate, \ifydir, \iftdir
-\newif\ifydir
-\newif\iftdir
-\newif\ifddir
+%%%%%%%% \yoko, \tate,\dtou
 \protected\def\tate{%
   \directlua{luatexja.direction.set_list_direction(3, 'tate')}%
 }
@@ -544,13 +540,12 @@
 \protected\def\dtou{%
   \directlua{luatexja.direction.set_list_direction(1, 'dtou')}%
 }
-\yoko
+\define@key[ltj]{japaram}{direction}{%% always local
+  \directlua{luatexja.direction.set_list_direction(1, 'ltjsetparameter')}%
+}
 
-%\def\ifydir{\directlua{luatexja.direction.dir_conditional(4)}}
-%\def\iftdir{\directlua{luatexja.direction.dir_conditional(3)}}
-%\def\ifddir{\directlua{luatexja.direction.dir_conditional(1)}}
+\yoko
 
-\newcount\ltj@adjdir@count@backup
 %%%% insert
 %\let\orig@insert=\insert
 %\protected\def\insert{\begingroup\afterassignment\ltj@@insert@A\ltj@tempcnta}
@@ -559,7 +554,7 @@
 \let\ltj@@orig@vadjust=\vadjust
 \protected\def\vadjust{%
   \ltj@@orig@vadjust\bgroup
-  \ifcase\ltj@adjdir@count\or\dtou\or\or\tate\or\yoko\fi
+  \directlua{luatexja.direction.set_list_direction('adj')}%
   \aftergroup\ltj@@vadjust@check@dir\let\next}
 \protected\def\ltj@@vadjust@check@dir{%
   \directlua{luatexja.direction.check_adjust_direction()}%
@@ -576,7 +571,6 @@
 }
 \protected\def\ltj@@reset@badness{%
   \directlua{%
-    luatexja.direction.reset_dir_conditional()
     if luatexja.global_temp then
       tex.hbadness= tex.hbadness or luatexja.hbadness_temp
       tex.vbadness= tex.vbadness or luatexja.vbadness_temp
@@ -643,11 +637,6 @@
   \directlua{luatexja.direction.set_box_dim('depth')}%
   \ltj@restore@globaldefs\endgroup}
 
-%%%%%%%% \ifybox, \iftbox, \ifdbox
-\def\ltj@@box@cond#1#2\fi{\fi\csname if#1\endcsname}
-\def\ifybox#1{\directlua{luatexja.direction.box_dir_conditional(\the\numexpr #1\relax, 4)}}
-\def\iftbox#1{\directlua{luatexja.direction.box_dir_conditional(\the\numexpr #1\relax, 3)}}
-\def\ifdbox#1{\directlua{luatexja.direction.box_dir_conditional(\the\numexpr #1\relax, 1)}}
 
 %%------------------ Load module for the format
 

diff --git a/src/luatexja.lua b/src/luatexja.lua
index cd1595d..68b2dd2 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -243,7 +243,9 @@ do
         elseif f == math.two_add then r = 'both'
         end
         return r
-      end
+      end,
+      direction = ltjd.get_dir_count,
+      adjustdir = ltjd.get_adjust_dir_count,
    }
 
    local unary_pars = luatexja.unary_pars
@@ -291,6 +293,16 @@ do
         return ltjs.get_stack_table(stack_table_index.XSP
                                          + ltjb.in_unicode(c, true), 3, t)
       end,
+      boxdir = function(c, t)
+        if type(c)~='number' or c<0 or c>65535 then
+            ltjb.package_error('luatexja',
+                               'Bad register code (' .. tostring(c) .. ')',
+                               'A register must be between 0 and 65535.\n'..
+                                  'I changed this one to zero.')
+            c=0
+         end
+         return ltjd.get_register_dir(c)
+      end,
    }
    local binary_pars = luatexja.binary_pars
 

diff --git a/src/patches/lltjcore.sty b/src/patches/lltjcore.sty
index 2d8afbd..c4acde8 100644 (file)
--- a/src/patches/lltjcore.sty
+++ b/src/patches/lltjcore.sty
@@ -89,7 +89,7 @@
 \newdimen\@@topmargin
 \def\@outputpage{%
 \begingroup % the \endgroup is put in by \aftergroup
-  \iftdir
+  \ifnum\ltjgetparameter{direction}=3 
     \dimen\z@\textwidth \textwidth\textheight \textheight\dimen\z@
   \fi
   \let \protect \noexpand
@@ -106,11 +106,11 @@
      \fi
      \if@twoside
        \ifodd\count\z@ \let\@thehead\@oddhead \let\@thefoot\@oddfoot
-          \iftdir\let\@themargin\evensidemargin
+          \ifnum\ltjgetparameter{direction}=3 \let\@themargin\evensidemargin
           \else\let\@themargin\oddsidemargin\fi
        \else \let\@thehead\@evenhead
           \let\@thefoot\@evenfoot
-           \iftdir\let\@themargin\oddsidemargin
+           \ifnum\ltjgetparameter{direction}=3 \let\@themargin\oddsidemargin
            \else\let\@themargin\evensidemargin\fi
      \fi\fi
      \@@topmargin\topmargin

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 934b2f5..6ca6eb2 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -31,7 +31,7 @@
 \newbox\tstrutbox
 \newbox\zstrutbox
 \def\strut{\relax
-  \ifydir
+  \unless\ifnum\ltjgetparameter{direction}=3 
     \ifmmode\copy\strutbox\else\unhcopy\strutbox\fi
   \else
     \ifmmode\copy\tstrutbox\else\unhcopy\tstrutbox\fi
@@ -360,17 +360,15 @@
     \cvs\normalbaselineskip
     \chs\cwd
     \cHT\cht \advance\cHT\cdp
-    %\iftdir
-      \setbox0\hbox{\tate\ltj@tkblshift=0あ}%
-      \setbox\adjust@box\hbox{\tate\ltj@tablshift=0M}%
-      \adjust@dimen\ht\adjust@box
-      \advance\adjust@dimen\dp\adjust@box
-      \advance\adjust@dimen-\ht0
-      \divide\adjust@dimen\tw@
-      \advance\adjust@dimen0.5\dp0
-      \advance\adjust@dimen-\dp\adjust@box
-      \ltj@tablshift=\adjust@dimen
-    %\fi
+    \setbox0\hbox{\tate\ltj@tkblshift=0あ}%
+    \setbox\adjust@box\hbox{\tate\ltj@tablshift=0M}%
+    \adjust@dimen\ht\adjust@box
+    \advance\adjust@dimen\dp\adjust@box
+    \advance\adjust@dimen-\ht0
+    \divide\adjust@dimen\tw@
+    \advance\adjust@dimen0.5\dp0
+    \advance\adjust@dimen-\dp\adjust@box
+    \ltj@tablshift=\adjust@dimen
   }
 \DeclareRobustCommand\romanencoding[1]{%
     \expandafter\ifx\csname T@#1\endcsname\relax
@@ -543,7 +541,6 @@
 \@onlypreamble\kanjiprocess@table
 \DeclareTextCommandDefault{\textunderscore}{%
   \leavevmode\kern.06em
-  %\iftdir\raise-\tbaselineshift\fi
   \vbox{\hrule\@width.3em}}
 
 %%%%%% LuaTeX-ja specific