From c282c4699b5c50d0d050bb1d7f5187a47eebc94e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 May 2014 22:06:34 +0000 Subject: luatexja (4may14) git-svn-id: svn://tug.org/texlive/trunk@33863 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 8 +- .../texmf-dist/doc/luatex/luatexja/jfm-ujisc33.lua | 135 ++++ .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 340132 -> 362167 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 706092 -> 727474 bytes .../doc/luatex/luatexja/luatexja-ruby.pdf | Bin 0 -> 324385 bytes .../doc/luatex/luatexja/luatexja-ruby.tex | 806 +++++++++++++++++++++ Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 291 ++++++-- .../source/luatex/luatexja/ltjsclasses.dtx | 21 +- .../luatex/luatexja/addons/luatexja-fontspec.sty | 178 ++++- .../tex/luatex/luatexja/addons/luatexja-ruby.sty | 207 ++++++ Master/texmf-dist/tex/luatex/luatexja/ltj-base.lua | 8 +- .../texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua | 7 +- Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua | 774 ++++++++++++++++++++ .../texmf-dist/tex/luatex/luatexja/ltjsarticle.cls | 5 +- Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls | 5 +- .../texmf-dist/tex/luatex/luatexja/ltjskiyou.cls | 5 +- Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls | 5 +- .../tex/luatex/luatexja/luatexja-core.sty | 4 +- .../tex/luatex/luatexja/patches/lltjdefs.sty | 2 +- .../tex/luatex/luatexja/patches/lltjfont.sty | 9 +- 20 files changed, 2342 insertions(+), 128 deletions(-) create mode 100644 Master/texmf-dist/doc/luatex/luatexja/jfm-ujisc33.lua create mode 100644 Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf create mode 100644 Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.tex create mode 100644 Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ruby.sty create mode 100644 Master/texmf-dist/tex/luatex/luatexja/ltj-ruby.lua diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index 8cd4cbe045a..3668aeb2158 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20140324.0 +The LuaTeX-ja Package 20140504.0 -------------------------------- Copyright (c) 2011--2014 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -33,9 +33,9 @@ Installation 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20140324.0 in the Git repository by + or tagged as 20140504.0 in the Git repository by + ;a=snapshot;h=refs/tags/20140504.0;sf=tgz> b1. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -80,4 +80,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Mar 24 09:20:06 2014 +0900 +Last commit date: Sun May 4 06:31:45 2014 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/jfm-ujisc33.lua b/Master/texmf-dist/doc/luatex/luatexja/jfm-ujisc33.lua new file mode 100644 index 00000000000..7879f58c3b7 --- /dev/null +++ b/Master/texmf-dist/doc/luatex/luatexja/jfm-ujisc33.lua @@ -0,0 +1,135 @@ +luatexja.jfont.define_jfm { + dir = 'yoko', + zw = 1.0, zh = 1.0, + + [0] = { + align = 'left', left = 0.0, down = 0.0, + width = 1.0*0.67, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [1] = { 0.5*0.67 , 0.0, 0.5 }, + [3] = { 0.25*0.67, 0.0, 0.25 } + } + }, + + [1] = { -- 開き括弧類 + chars = { + '‘', '“', '〈', '《', '「', '『', '【', '〔', '〖', + '〘', '〝', '(', '[', '{', '⦅' + }, + align = 'right', left = 0.0, down = 0.0, + width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [3] = { 0.25*0.67, 0.0, 0.25 } + } + }, + + [2] = { -- 閉じ括弧類 + chars = { + '’', '”', '、', '〉', '》', '」', '』', '】', '〕', + '〗', '〙', '〟', ')', ',', ']', '}', '⦆' + }, + align = 'left', left = 0.0, down = 0.0, + width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [0] = { 0.5*0.67 , 0.0, 0.5 }, + [1] = { 0.5*0.67 , 0.0, 0.5 }, + [3] = { 0.25*0.67, 0.0, 0.25 }, + [5] = { 0.5*0.67 , 0.0, 0.5 }, + [6] = { 0.5*0.67 , 0.0, 0.5 }, + [7] = { 0.5*0.67 , 0.0, 0.5 } + } + }, + + [3] = { -- 中点類 + chars = {'・', ':', ';'}, + align = 'middle', left = 0.0, down = 0.0, + width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [0] = { 0.25*0.67, 0.0, 0.25 }, + [1] = { 0.25*0.67, 0.0, 0.25 }, + [2] = { 0.25*0.67, 0.0, 0.25 }, + [3] = { 0.5*0.67 , 0.0, 0.5 }, + [4] = { 0.25*0.67, 0.0, 0.25 }, + [5] = { 0.25*0.67, 0.0, 0.25 }, + [6] = { 0.25*0.67, 0.0, 0.25 }, + [7] = { 0.25*0.67, 0.0, 0.25 } + } + }, + + [4] = { -- 句点類 + chars = {'。', '.'}, + align = 'left', left = 0.0, down = 0.0, + width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [0] = { 0.5*0.67 , 0.0, 0.0 }, + [1] = { 0.5*0.67 , 0.0, 0.0 }, + [3] = { 0.75*0.67, 0.0, 0.25 }, + [5] = { 0.5*0.67 , 0.0, 0.0 }, + [6] = { 0.5*0.67 , 0.0, 0.0 }, + [7] = { 0.5*0.67 , 0.0, 0.0 } + } + }, + + [5] = { -- ダッシュ + chars = { '―', '‥', '…' }, + align = 'left', left = 0.0, down = 0.0, + width = 1.0*0.67, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [1] = { 0.5*0.67 , 0.0, 0.5 }, + [3] = { 0.25*0.67, 0.0, 0.25 } + }, + kern = { + [5] = 0.0 + } + }, + + [6] = { -- 感嘆符・疑問符 + chars = { '?', '!' }, + align = 'left', left = 0.0, down = 0.0, + width = 1.0, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [0] = { 0.5*0.67 , 0.0, 0.5 }, + [1] = { 0.5*0.67 , 0.0, 0.5 }, + [3] = { 0.25*0.67, 0.0, 0.25 }, + [7] = { 0.5*0.67 , 0.0, 0.5 }, + }, + kern = { + [5] = 0.0 + } + }, + + [7] = { -- 半角カナ + chars = { + '。', '「', '」', '、', '・', 'ヲ', 'ァ', 'ィ', 'ゥ', + 'ェ', 'ォ', 'ャ', 'ュ', 'ョ', 'ッ', 'ー', 'ア', 'イ', + 'ウ', 'エ', 'オ', 'カ', 'キ', 'ク', 'ケ', 'コ', 'サ', + 'シ', 'ス', 'セ', 'ソ', 'タ', 'チ', 'ツ', 'テ', 'ト', + 'ナ', 'ニ', 'ヌ', 'ネ', 'ノ', 'ハ', 'ヒ', 'フ', 'ヘ', + 'ホ', 'マ', 'ミ', 'ム', 'メ', 'モ', 'ヤ', 'ユ', 'ヨ', + 'ラ', 'リ', 'ル', 'レ', 'ロ', 'ワ', 'ン', '゙', '゚', + "AJ1-516", "AJ1-517", "AJ1-518", "AJ1-519", "AJ1-520", "AJ1-521", "AJ1-522", + "AJ1-523", "AJ1-524", "AJ1-525", "AJ1-526", "AJ1-527", "AJ1-528", "AJ1-529", + "AJ1-530", "AJ1-531", "AJ1-532", "AJ1-533", "AJ1-534", "AJ1-535", "AJ1-536", + "AJ1-537", "AJ1-538", "AJ1-539", "AJ1-540", "AJ1-541", "AJ1-542", "AJ1-543", + "AJ1-544", "AJ1-545", "AJ1-546", "AJ1-547", "AJ1-548", "AJ1-549", "AJ1-550", + "AJ1-551", "AJ1-552", "AJ1-553", "AJ1-554", "AJ1-555", "AJ1-556", "AJ1-557", + "AJ1-558", "AJ1-559", "AJ1-560", "AJ1-561", "AJ1-562", "AJ1-563", "AJ1-564", + "AJ1-565", "AJ1-566", "AJ1-567", "AJ1-568", "AJ1-569", "AJ1-570", "AJ1-571", + "AJ1-572", "AJ1-573", "AJ1-574", "AJ1-575", "AJ1-576", "AJ1-577", "AJ1-578", + "AJ1-579", "AJ1-580", "AJ1-581", "AJ1-582", "AJ1-583", "AJ1-584", "AJ1-585", + "AJ1-586", "AJ1-587", "AJ1-588", "AJ1-589", "AJ1-590", "AJ1-591", "AJ1-592", + "AJ1-593", "AJ1-594", "AJ1-595", "AJ1-596", "AJ1-597", "AJ1-598", + }, + align = 'left', left = 0.0, down = 0.0, + width = 0.5*0.67, height = 0.88, depth = 0.12, italic=0.0, + glue = { + [1] = { 0.5*0.67 , 0.0, 0.5 }, + [3] = { 0.25*0.67, 0.0, 0.25 } + } + }, + + [99] = { -- box末尾 + chars = {'boxbdd', 'parbdd'}, + }, + +} \ No newline at end of file diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index 3f87190f0ae..4c398d686a5 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index 938ebdff1c6..187b498f942 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf new file mode 100644 index 00000000000..aee015b9256 Binary files /dev/null and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.tex b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.tex new file mode 100644 index 00000000000..86167b031c4 --- /dev/null +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.tex @@ -0,0 +1,806 @@ +%#! luajitlatex +%%% a test of ruby. +\documentclass[a4paper,10pt]{ltjsarticle} +\usepackage{luatexja-otf,amsmath} +\usepackage[match]{luatexja-fontspec} +\usepackage[kozuka-pr6n]{luatexja-preset}\normalsize +\def\emph#1{\textbf{\textgt{#1}}} +\def\headfont{\normalfont\bfseries\gtfamily} +\setmonojfont{KozGoPr6N-Regular.otf} + +\usepackage[textwidth=45\zw, lines=45, footskip=6mm]{geometry} +\advance\leftmargini-1\zw\advance\leftmarginii-1\zw + + +\usepackage{luatexja-ruby,showexpl,booktabs} +\lstset{ + preset=\normalsize, basicstyle=\small\ttfamily, basewidth=0.5em, + explpreset={numberstyle=\tiny, numbers=left, numbersep=1em, columns=fixed}, +} +\makeatletter\let\SX@Info=\relax\makeatother +\fboxsep=0mm + +\usepackage{hyperref,bookmark,xcolor} +\hypersetup{% + unicode, + colorlinks, + allbordercolors=1 1 1, + allcolors=blue, + pdftitle={luatexja-ruby.sty} +} + +\def\Node#1#2{\,\vcenter{\hbox{\fboxsep=1pt\fbox{\vbox{\small\halign{\hfil##\hfil\cr + #1\mathstrut\cr\noalign{\hrule height.4pt}\strut#2\cr}}}}\,}} +\def\LuaTeX{Lua\TeX} + +% 三分ルビ用 +\DeclareFontShape{JY3}{mc}{mc}{n}{<-> [0.92487] + KozMinPr6N-Regular:extend=0.67;jfm=ujisc33}{} + +\title{\texttt{luatexja-ruby.sty}} +\begin{document} +\catcode`\<=13 +\def<#1>{{\normalfont\rm\itshape$\langle$#1\/$\rangle$}} +%\fontsize{13.19873}{15}\selectfont% + +\maketitle + +\begin{abstract} +\texttt{luatexja-ruby.sty} は,\LuaTeX-jaの機能を利用してルビの組版処理を行う追加パッケージである. +\LuaTeX, \LuaTeX-jaの内部処理に割り込むことにより,熟語ルビ中の行分割や, +行頭形・行中形・行末形の自動検出,また進入許容量の自動設定などを可能とした. +\end{abstract} + +\tableofcontents + +\newpage +\section{\ltjruby{利|用|方|法}{り|よう|ほう|ほう}} +パッケージ読み込みは,\verb+\usepackage{luatexja-ruby}+ で良く, +必要ならば自動的に\LuaTeX-ja本体を読み込む. +plain \LuaTeX でのロードはまだサポートしておらず, +\LaTeXe のみサポートしている. + +\subsection{\ltjruby{用|語}{よう|ご}} +「進入(intrusion)」「突出(protrusion)」という用語は, +\href{http://zrbabbler.sp.land.to/pxrubrica.html}{\texttt{pxrubrica}\ パッケージ}% +での用法に準ずる. + +\begin{quotation} +進入あり:と\ltjruby{暁}{あかつき}の + +進入なし:{\setkeys[ltj]{ruby}{mode=0}と\ltjruby{暁}{あかつき}の} + +突出あり:{\setkeys[ltj]{ruby}{stretch={1}{2}{1}}\ltjruby{聴衆}{ちようしゆう}} + +突出なし:{\setkeys[ltj]{ruby}{stretch={0}{2}{0}}\ltjruby{聴衆}{ちようしゆう}} +\end{quotation} + +\subsection{\ruby{命|令}{めい|れい}} +\paragraph{\tt\textbackslash ltjruby} +ルビ出力用命令の本体.\verb+\ruby+ という別名を定義している. +\begin{quote} +\tt \textbackslash ltjruby[