9 files changed, 38 insertions, 75 deletions
diff --git a/macros/luatex/generic/luatexja/COPYING b/macros/luatex/generic/luatexja/COPYING
index 39c166b6fa..610a7b62b2 100644
--- a/macros/luatex/generic/luatexja/COPYING
+++ b/macros/luatex/generic/luatexja/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2011--2022 The LuaTeX-ja project, All rights reserved.
+Copyright (c) 2011--2023 The LuaTeX-ja project, All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
diff --git a/macros/luatex/generic/luatexja/README b/macros/luatex/generic/luatexja/README
index 378db73395..e4cc9e1dcb 100644
--- a/macros/luatex/generic/luatexja/README
+++ b/macros/luatex/generic/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20231010.0
+The LuaTeX-ja Package 20231230.0
 --------------------------------
 Copyright (c) 2011--2023 The LuaTeX-ja project
 License: modified BSD (see COPYING)
@@ -11,10 +11,9 @@ and specifications are subject to change. Documentations are located at
   doc/luatexja-en.pdf (en), doc/luatexja-ja.pdf (ja).
 
 LuaTeX-ja is developed on
-  <https://osdn.jp/projects/luatex-ja/wiki/FrontPage(en)>.
+  <https://github.com/luatexja/luatexja>.
 If you have questions or recognize bugs/have feature requests,
-we would like you to create a thread in the forum or a ticket
-in the way which OSDN supplies, via links found in the page above.
+we would like you to create an issue.
 
 
 Installation
@@ -42,9 +41,8 @@ Installation
 2. If you must/want to install manually:
 
    a. Download the source archive from CTAN,
-      or tagged as 20231010.0 in the Git repository by
-      <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20231010.0;sf=tgz>
+      or tagged as 20231230.0 in the Git repository by
+      <https://github.com/luatexja/luatexja/archive/refs/tags/$VER.zip>
 
    b. Extract the archive and process following three files by LuaLaTeX
       to generate classes for Japanese typesetting:
@@ -93,4 +91,4 @@ Notes
   This file and ltj-kinsoku.lua are not used anymore.
   (Do not remove ltj-kinsoku.tex.)
 
-Last commit date: Tue Oct 10 18:41:17 2023 +0900
+Last commit date: Sat Dec 30 09:05:58 2023 +0900
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
index 9e8f1ec3db..3e54f31db8 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-en.pdf
diff --git a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
index 6022f034aa..67386dc118 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
+++ b/macros/luatex/generic/luatexja/doc/luatexja-ja.pdf
diff --git a/macros/luatex/generic/luatexja/doc/luatexja.dtx b/macros/luatex/generic/luatexja/doc/luatexja.dtx
index 46aec6b955..2be57d0a6c 100644
--- a/macros/luatex/generic/luatexja/doc/luatexja.dtx
+++ b/macros/luatex/generic/luatexja/doc/luatexja.dtx
@@ -596,21 +596,21 @@ and \emph{Japanese fonts} for fonts used in \textbf{JAchar}.
 %<ja>\paragraph{プロジェクトWiki} プロジェクトWikiは構築中である．
 %<*en>
 \begin{itemize}
-\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28en%29} (English)
-\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage} (Japanese)
-\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28zh%29} (Chinese)
+\item \url{https://github.com/luatexja/luatexja/wiki/Home(en)} (English)
+\item \url{https://github.com/luatexja/luatexja/wiki} (Japanese)
+\item \url{https://github.com/luatexja/luatexja/wiki/Home(zh)} (Chinese)
 \end{itemize}
 %</en>
 %<*ja>
 \begin{itemize}
-\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage}（日本語）
-\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28en%29}（英語）
-\item \url{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28zh%29}（中国語）
+\item \url{https://github.com/luatexja/luatexja/wiki}（日本語）
+\item \url{https://github.com/luatexja/luatexja/wiki/Home(en)}（英語）
+\item \url{https://github.com/luatexja/luatexja/wiki/Home(zh)}（中国語）
 \end{itemize}
 %</ja>
 
-%<en>This project is hosted by OSDN.
-%<ja>本プロジェクトはOSDNのサービスを用いて運営されている．
+%<en>This project is hosted by GitHub.
+%<ja>本プロジェクトはGitHubのサービスを用いて運営されている．
 
 %<en>\paragraph{Members}\
 %<ja>\clearpage\paragraph{開発メンバー}\
@@ -675,11 +675,10 @@ CTAN (in the \texttt{macros/luatex/generic/luatexja} directory), and
 the following distributions:
   \begin{itemize}
   \item \href{https://www.tug.org/texlive/}{\TeX~Live} (in \texttt{texmf-dist/tex/luatex/luatexja})
-  \item \href{http://w32tex.org/}{W32\TeX}\ (in \texttt{luatexja.tar.xz})
   \item MiK\TeX\ (in \texttt{luatexja.tar.xz})
   \end{itemize}
 Harano Aji fonts are also available in these distributions
-(\texttt{haranoaji} in \TeX~Live and MiK\TeX, and \texttt{luatexja.tar.xz} in W32\TeX).
+(\texttt{haranoaji} in \TeX~Live and MiK\TeX).
 %</en>
 %<*ja>
 現在，\LuaTeX-jaはCTAN (\texttt{macros/luatex/generic/luatexja})に収録されている他，
@@ -687,10 +686,9 @@ Harano Aji fonts are also available in these distributions
   \begin{itemize}
   \item MiK\TeX\ (\texttt{luatexja.tar.lzma})
   \item \TeX~Live (\texttt{texmf-dist/tex/luatex/luatexja})
-  \item W32\TeX\ (\texttt{luatexja.tar.xz})
   \end{itemize}
 これらのディストリビューションは原ノ味フォントも収録している
-（\TeX~Live, MiK\TeX では\texttt{haranoaji}，W32\TeX では\texttt{luatexja.tar.xz}）.
+（\TeX~Live, MiK\TeX では\texttt{haranoaji}）.
 %</ja>
 
 %<*en>
@@ -724,11 +722,11 @@ by specifying \texttt{Renderer=Harfbuzz}~etc.\ (\Pkg{fontspec}) or~{mode=harf} (
 \begin{itemize}
 \item Clone the Git repository by
 \begin{lstlisting}
-$ git clone git://git.osdn.jp/gitroot/luatex-ja/luatexja.git
+$ git clone https://github.com/luatexja/luatexja.git
 \end{lstlisting}
-\item Download the \texttt{tar.gz} archive of HEAD in the \texttt{master} branch from
+\item Download the \texttt{zip} archive of HEAD in the \texttt{master} branch from
 \begin{flushleft}
-\url{http://git.osdn.jp/view?p=luatex-ja/luatexja.git;a=snapshot;h=HEAD;sf=tgz}.
+\url{https://github.com/luatexja/luatexja/archive/refs/heads/master.zip}.
 \end{flushleft}
 \end{itemize}
 
@@ -742,11 +740,11 @@ the forefront of development is not the \texttt{master} branch.
 \begin{itemize}
 \item Gitリポジトリを次のコマンドでクローンする：
 \begin{lstlisting}
-$ git clone git://git.osdn.jp/gitroot/luatex-ja/luatexja.git
+$ git clone https://github.com/luatexja/luatexja.git
 \end{lstlisting}
-\item \texttt{master} ブランチのスナップショット（\texttt{tar.gz} 形式）をダウンロードする：
+\item \texttt{master} ブランチのスナップショット（\texttt{zip} 形式）をダウンロードする：
 \begin{flushleft}
-\url{http://git.osdn.jp/view?p=luatex-ja/luatexja.git;a=snapshot;h=HEAD;sf=tgz}.
+\url{https://github.com/luatexja/luatexja/archive/refs/heads/master.zip}.
 \end{flushleft}
 \end{itemize}
 \texttt{master} ブランチ（従って，CTAN内のアーカイブも）はたまにしか更新されないことに注意．
@@ -830,43 +828,6 @@ For changes from \pTeX, see Subsection~\ref{ssec:chgptex}.
   また，和文フォントを読み込むために多量のメモリを消費することにも注意が必要である．
 %</ja>
 
-\item%
-%<*en>
-\textbf{(Outdated) note for MiK\TeX\ users}\quad
-\LuaTeX-ja requires that several CMap files%
-\footnote{\texttt{UniJIS2004-UTF32-\{H,V\}} and \texttt{Adobe-Japan1-UCS2}.}
-must be found from \LuaTeX.
-Strictly speaking, those CMaps are needed
-only in the first run of \LuaTeX-ja after installing or updating.
-But it seems that MiK\TeX\ does not satisfy this condition,
-so you will encounter an error like the following:
-%</en>
-%<*ja>
-\LuaTeX-jaが動作するためには，\emph{導入・更新後の初回起動時に}
-\texttt{UniJIS2004-UTF32-\{H,V\}}, \texttt{Adobe-Japan1-UCS2}という3つのCMapが
-\LuaTeX によって見つけられることが必要である．
-しかし古いバージョンのMiK\TeX ではそのようになっていないので，次のエラーが発生するだろう：
-%</ja>
-\begin{lstlisting}
-! LuaTeX error ...iles (x86)/MiKTeX 2.9/tex/luatex/luatexja/ltj-rmlgbm.lua
-bad argument #1 to 'open' (string expected, got nil)
-\end{lstlisting}
-
-%<*en>
-If so, please execute a batch file which is written on
-\href{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28en%29}{ the Project Wiki (English)}.
-This batch file creates a temporary directory, copy CMaps in it,
-run a test file which loads \LuaTeX-ja in this directory,
-and finally delete the temporary directory.
-%</en>
-%<*ja>
-そのような場合には，
-\href{https://osdn.jp/projects/luatex-ja/wiki/FrontPage%28en%29}{%
-  プロジェクトWiki英語版トップページ}中に書かれているバッチファイルを
-実行して欲しい．このバッチファイルは，作業用ディレクトリにCMap達を
-コピーし，その中で\LuaTeX-jaの初回起動を行い，作業用ディレクトリを消す作業をしている．
-%</ja>
-
 \item
 %<*en>
 Note that when \LuaTeX-ja is loaded in plain \LuaTeX,
@@ -4016,9 +3977,6 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont
 
  In this situation, \LuaTeX-ja performs all replacements which is defined in~\texttt{vert}
  feature for \emph{some} scripts for \emph{some} languages.
- \item Furthermore, a glyph is automatically rotated 90~degrees,
-  if it is not replaced by \texttt{vert} feature for \emph{any} script
-  for \emph{any} language, and if it is marked as `r''~or~``Tr'' in UAX~\#50.
  \item \cs{tfont} uses a vertical JFM instead of a horizontal JFM.
 \LuaTeX-ja ships following vertical JFMs:
 \begin{description}
@@ -4079,8 +4037,7 @@ A font defined by~\cs{tfont} differs the following points from that by~\cs{jfont
   このscript,~languageの組み合わせを指定することはできないので，
   \Pkg{luaotfload}そのままでは\texttt{vert}を適用させることはできない．
  }．
- \item さらに，「いかなるscript,~languageでも\texttt{vert}により置換されない」グリフ
-  のうち，UAX~\#50で``r''もしくは``Tr''と指定されているものは90度自動回転させる．
+ \item さらに，置換前と置換後のグリフがどちらも「UAX~\#50で``r''もしくは``Tr''と指定されている」ものは90度自動回転させる．
  \item \ref{ssec:math}節で述べる，数式中の和文フォントには縦組用和文フォントは指定できない．
  \item \meta{JFM name}には縦組用JFMを指定する．
 以下の縦組用JFMが\LuaTeX-jaには同梱されている．%おり，違いを\autoref{tab-difjfm-tate}に示した．
@@ -11918,7 +11875,7 @@ ISO 32000-1:2008, \textit{Document management -- Portable document format -- Par
       1.7}, 2008. \newblock
 \url{http://www.iso.org/iso/iso\_catalogue/catalogue_tc/catalogue\_detail.htm?csnumber=51502}
 \bibitem{tc18ltja} 北川弘典．「\LuaTeX-jaの近況」，\TeX Conf~2018．
-  \url{https://osdn.net/projects/luatex-ja/wiki/Documentation/attach/tc18ltja.pdf}
+  \url{https://raw.githubusercontent.com/h-kitagawa/presentations/main/tc18ltja.pdf}
 \bibitem{bxghost} Takuto ASAKURA. \newblock The \textsf{BXghost} Package. \url{https://github.com/wtsnjp/BXghost}
 \end{thebibliography}
 
diff --git a/macros/luatex/generic/luatexja/src/ltj-base.sty b/macros/luatex/generic/luatexja/src/ltj-base.sty
index ba88ec9450..5b3c77e0ca 100644
--- a/macros/luatex/generic/luatexja/src/ltj-base.sty
+++ b/macros/luatex/generic/luatexja/src/ltj-base.sty
@@ -123,7 +123,7 @@
 %!   (command_name が "assign_int" であるトークン).
 %! (注意: まだ文字表記(`A)に対応していません.)
 \def\ltj@grab@num{
-  \directlua{tex.sprint('{' .. token.scan_int() .. '}')}
+  \directlua{tex.sprint(luatexbase.catcodetables['latex-package'], '{' .. token.scan_int() .. '}')}
 }
 
 %%------------------ Safe passing
diff --git a/macros/luatex/generic/luatexja/src/ltj-setwidth.lua b/macros/luatex/generic/luatexja/src/ltj-setwidth.lua
index 38dec61d2e..5878595f28 100644
--- a/macros/luatex/generic/luatexja/src/ltj-setwidth.lua
+++ b/macros/luatex/generic/luatexja/src/ltj-setwidth.lua
@@ -64,6 +64,7 @@ local attr_icflag = luatexbase.attributes['ltj@icflag']
 local attr_vert_ori = luatexbase.attributes['ltj@vert@ori']
 
 local ltjf_font_extra_info = ltjf.font_extra_info
+local ltjs_orig_char_table = ltjs.orig_char_table
 
 local PACKED       = luatexja.icflag_table.PACKED
 local PROCESSED    = luatexja.icflag_table.PROCESSED
@@ -191,8 +192,15 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
       local feir = ltjf_font_extra_info[pf]
       if met.rotation and met.vert_activated then
           local f = font_getfont(pf)
-          local r, l = met.rotation[pc], f.properties and f.properties.language
-          if ((r==true) or (type(r)=="table" and not r[l])) and (get_attr(p, attr_vert_ori) or 0)<=0 then
+          local pco = ltjs_orig_char_table[p] or pc
+          local r = met.rotation[pco]
+          local l = f.properties and f.properties.language
+          r = (r==true) or (type(r)=="table" and not r[l])
+          if r then
+            r = met.rotation[pc]
+            r = (r==true) or (type(r)=="table" and not r[l])
+          end
+          if r and (get_attr(p, attr_vert_ori) or 0)<=0 then
             return capsule_glyph_tate_rot(p, met, char_data, head, dir,
               0.5*(get_ascender(pf)-get_descender(pf)))
           end
diff --git a/macros/luatex/generic/luatexja/src/luatexja-core.sty b/macros/luatex/generic/luatexja/src/luatexja-core.sty
index 12a7a09eae..a5801ed386 100644
--- a/macros/luatex/generic/luatexja/src/luatexja-core.sty
+++ b/macros/luatex/generic/luatexja/src/luatexja-core.sty
@@ -546,7 +546,7 @@
   \ltj@reset@globaldefs
   \begingroup\ltj@curjfnt\m@ne\ltj@curtfnt\m@ne\relax
   #1\directlua{luatexja.__temp = -(\the\ltj@curjfnt)*(\the\ltj@curtfnt)}\endgroup
-  \ltj@tempcntc=\directlua{tex.sprint(luatexja.__temp)}\relax
+  \ltj@tempcntc=\directlua{tex.sprint(-2,luatexja.__temp)}\relax
   \ifnum\ltj@tempcntc=\m@ne
     \@PackageError{luatexja-core}%
     {\string#1 is not a control sequence that represents \MessageBreak
diff --git a/macros/luatex/generic/luatexja/src/luatexja.sty b/macros/luatex/generic/luatexja/src/luatexja.sty
index c22e29d9d9..442e73cf9e 100644
--- a/macros/luatex/generic/luatexja/src/luatexja.sty
+++ b/macros/luatex/generic/luatexja/src/luatexja.sty
@@ -27,7 +27,7 @@
 \newif\ifltj@disablejfam
 
 %%%% VERSION
-\def\LuaTeXjaversion{20231010.0}
+\def\LuaTeXjaversion{20231230.0}
 
 %% Check if LaTeX is used.
 \begingroup\expandafter\expandafter\expandafter\endgroup