From 9b788c5e85ae2f9579689d12a4445808bdf4bd68 Mon Sep 17 00:00:00 2001
From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Thu, 10 Dec 2015 21:19:39 +0900
Subject: [PATCH] \newluatexattribute -> \newattribute (luaotfload v2.6 uses
 ltluatex instead of luatexbase)

---
 src/addons/luatexja-ruby.sty |  2 +-
 src/luatexja-core.sty        | 36 +++++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/addons/luatexja-ruby.sty b/src/addons/luatexja-ruby.sty
index b40ec97..f3ad648 100644
--- a/src/addons/luatexja-ruby.sty
+++ b/src/addons/luatexja-ruby.sty
@@ -8,7 +8,7 @@
 \RequirePackage{luatexja}
 
 %%------------------
-\newluatexattribute\ltj@rubyattr
+\newattribute\ltj@rubyattr
 \ltj@rubyattr=0
 \RequireLuaTeXjaSubmodule{ruby}
 
diff --git a/src/luatexja-core.sty b/src/luatexja-core.sty
index dc51b7a..e042890 100644
--- a/src/luatexja-core.sty
+++ b/src/luatexja-core.sty
@@ -73,6 +73,7 @@
 \newif\ifltj@everyhook@avail\ltj@everyhook@availfalse
 %! 外部パッケージは普通の \endlinechar で読まないと危険.
 \ifltj@in@latex                 %<*LaTeX>
+  \RequirePackage{luatexbase}
   \RequirePackage{luaotfload} [2013/12/31] % v2.3
   \RequirePackage{ltxcmds}    [2011/11/09] % v1.22
   \RequirePackage{pdftexcmds} [2011/11/29] % v0.20
@@ -80,6 +81,7 @@
   \RequirePackage{atbegshi}
   \IfFileExists{everyhook.sty}{\RequirePackage{everyhook}\ltj@everyhook@availtrue}{}
 \else                           %<*!LaTeX>
+  \input luatexbase.sty
   \input luaotfload.sty
   \input ltxcmds.sty
   \input pdftexcmds.sty
@@ -132,21 +134,21 @@
 \def\ltj@defdimen{0}
 
 %%%%%%%% Attributes for Japanese typesetting.
-\newluatexattribute\ltj@icflag    % attribute for italic correction
-\newluatexattribute\ltj@curjfnt   % index for ``current horizontal Japanese font''
-\newluatexattribute\ltj@curtfnt   % index for ``current vertical Japanese font''
-\newluatexattribute\ltj@origchar  %
-\newluatexattribute\ltj@charclass %
-\newluatexattribute\ltj@charcode %
-\newluatexattribute\ltj@autospc   % attribute for autospacing
-\newluatexattribute\ltj@autoxspc  % attribute for autoxspacing
-\newluatexattribute\ltj@yablshift % attribute for yalbaselineshift
-\newluatexattribute\ltj@ykblshift % attribute for yjabaselineshift
-\newluatexattribute\ltj@tablshift % attribute for talbaselineshift
-\newluatexattribute\ltj@tkblshift % attribute for tjabaselineshift
-\newluatexattribute\jfam          % index for current jfam
-
-\newluatexattribute\ltj@dir
+\newattribute\ltj@icflag    % attribute for italic correction
+\newattribute\ltj@curjfnt   % index for ``current horizontal Japanese font''
+\newattribute\ltj@curtfnt   % index for ``current vertical Japanese font''
+\newattribute\ltj@origchar  %
+\newattribute\ltj@charclass %
+\newattribute\ltj@charcode %
+\newattribute\ltj@autospc   % attribute for autospacing
+\newattribute\ltj@autoxspc  % attribute for autoxspacing
+\newattribute\ltj@yablshift % attribute for yalbaselineshift
+\newattribute\ltj@ykblshift % attribute for yjabaselineshift
+\newattribute\ltj@tablshift % attribute for talbaselineshift
+\newattribute\ltj@tkblshift % attribute for tjabaselineshift
+\newattribute\jfam          % index for current jfam
+
+\newattribute\ltj@dir
 \newlanguage\ltj@@japanese
 \ltj@dir\z@
 \ltj@icflag\z@
@@ -159,7 +161,7 @@
 \newcount\ltj@tempcnta
 \ltj@tempcnta\z@
 \loop\ifnum\ltj@tempcnta<7
-  \expandafter\newluatexattribute%
+  \expandafter\newattribute%
     \csname ltj@kcat\the\ltj@tempcnta\endcsname
   \csname ltj@kcat\the\ltj@tempcnta\endcsname=0
   \advance\ltj@tempcnta\@ne
@@ -765,7 +767,7 @@
   \input ltj-plain.sty %
 \fi\fi                          %</LaTeX|plain>
 
-\newluatexcatcodetable\ltj@temp@cctb
+\newcatcodetable\ltj@temp@cctb
 \def\ltj@overwrite@catcodetable#1{%
   \setluatexcatcodetable\ltj@temp@cctb{\luatexcatcodetable#1}%
   \setluatexcatcodetable#1{\luatexcatcodetable\ltj@temp@cctb\catcode"FFFFF=14}%"
-- 
2.11.0