diff options
author | Karl Berry <karl@freefriends.org> | 2017-09-04 21:45:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-09-04 21:45:53 +0000 |
commit | ab63f41137a210173bf797f28970ca2591a6cf15 (patch) | |
tree | 6666213ffee7637577d6347201f334b992f6896c /Master/texmf-dist/source | |
parent | 458a507406076f4746ce1440eca59f981949e0ab (diff) |
luatexja (4sep17)
git-svn-id: svn://tug.org/texlive/trunk@45216 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
4 files changed, 85 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltj-kinsoku_make.tex b/Master/texmf-dist/source/luatex/luatexja/ltj-kinsoku_make.tex index 35fb0322bc2..5d25ff0f11f 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltj-kinsoku_make.tex +++ b/Master/texmf-dist/source/luatex/luatexja/ltj-kinsoku_make.tex @@ -59,8 +59,8 @@ \ltjsetparameter{prebreakpenalty={`",10000}} \ltjsetparameter{postbreakpenalty={`\#,500}} \ltjsetparameter{postbreakpenalty={`\$,500}} -\ltjsetparameter{postbreakpenalty={`\%,500}} -\ltjsetparameter{postbreakpenalty={`\&,500}} +\ltjsetparameter{prebreakpenalty={`\%,500}} +\ltjsetparameter{prebreakpenalty={`\&,500}} \ltjsetparameter{postbreakpenalty={`\`,10000}} \ltjsetparameter{prebreakpenalty={`',10000}} \ltjsetparameter{prebreakpenalty={`),10000}} @@ -124,8 +124,8 @@ \ltjsetparameter{prebreakpenalty={`=,200}} \ltjsetparameter{postbreakpenalty={`#,200}} \ltjsetparameter{postbreakpenalty={`$,200}} -\ltjsetparameter{postbreakpenalty={`%,200}} -\ltjsetparameter{postbreakpenalty={`&,200}} +\ltjsetparameter{prebreakpenalty={`%,200}} +\ltjsetparameter{prebreakpenalty={`&,200}} \ltjsetparameter{prebreakpenalty={`ぁ,150}} \ltjsetparameter{prebreakpenalty={`ぃ,150}} \ltjsetparameter{prebreakpenalty={`ぅ,150}} @@ -180,6 +180,7 @@ \ltjsetparameter{postbreakpenalty={`¡,10000}} \ltjsetparameter{postbreakpenalty={`¿,10000}} \ltjsetparameter{prebreakpenalty={`ː,10000}} +\ltjsetparameter{prebreakpenalty={`·,10000}} \ltjsetparameter{prebreakpenalty={`ª,10000}} \ltjsetparameter{prebreakpenalty={`º,10000}} \ltjsetparameter{prebreakpenalty={`¹,10000}} @@ -432,8 +433,8 @@ % % inhibitxspcode JIS X 0212 % -%\ltjsetparameter{jaxspmode={`¡,postonly}} -%\ltjsetparameter{jaxspmode={`¿,postonly}} +%\ltjsetparameter{jaxspmode={`¡,preonly}} +%\ltjsetparameter{jaxspmode={`¿,preonly}} %\ltjsetparameter{jaxspmode={`º,postonly}} %\ltjsetparameter{jaxspmode={`ª,postonly}} \ltjsetparameter{jaxspmode={`™,postonly}} diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index 962223e004a..b1e7fcff62a 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -110,6 +110,9 @@ % \changes{v1.7e}{2017/03/05}{トンボに表示するジョブ情報の書式を変更} % \changes{v1.7e}{2017/03/05}{\cs{frontmatter}と\cs{mainmatter}を % 奇数ページに送るように変更} +% \changes{v1.7e-ltj-15}{2017/08/31}{本ドキュメントのタイプセットで,小塚フォントが存在するときには +% それを用いるように変更(PDFサイズ削減のため).} +% \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更} % \fi % % \iffalse @@ -139,14 +142,22 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} %</tate> - [2017/03/06 v1.7e-ltj-14 + [2017/08/31 v1.7f-ltj-15 %<article|report|book> Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> ] \documentclass{ltjltxdoc} \GetFileInfo{ltjclasses.dtx} -\usepackage[ipaex,nfssonly]{luatexja-preset} +\begingroup + \suppressfontnotfounderror=1 + \global\font\testfont=file:KozMinPr6N-Regular.otf +\endgroup +\ifx\testfont\nullfont + \usepackage[ipaex,nfssonly]{luatexja-preset} +\else + \usepackage[kozuka-pr6n,nfssonly]{luatexja-preset} +\fi \usepackage[unicode]{hyperref} \title{Lua\LaTeX-ja用\texttt{jclasses}互換クラス} \author{Lua\TeX-jaプロジェクト} @@ -694,9 +705,11 @@ % \begin{macro}{\Cvs} % \begin{macro}{\Chs} % 基準となる長さの設定をします。これらのパラメータは\file{lltjfont.sty}で定義 -% されています。 +% されています。基準とする文字を「全角空白」(EUCコード\texttt{0xA1A1})から +% 「漢」(JISコード\texttt{0x3441})へ変更しました。 +% \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更} % \begin{macrocode} -\setbox0\hbox{\char"3000}% 全角スペース +\setbox0\hbox{漢} \setlength\Cht{\ht0} \setlength\Cdp{\dp0} \setlength\Cwd{\wd0} diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index 3a5c897f875..3eede3c2a29 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx @@ -57,13 +57,21 @@ %<*driver> \ProvidesFile{ltjsclasses.dtx} %</driver> - [2017/03/06 ltjsclasses ] + [2017/09/04 ltjsclasses ] %<*driver> \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} \documentclass{ltjsarticle} \usepackage{hypdoc} \hypersetup{unicode=true} -\usepackage[ipaex,nfssonly]{luatexja-preset} +\begingroup + \suppressfontnotfounderror=1 + \global\font\testfont=file:KozMinPr6N-Regular.otf +\endgroup +\ifx\testfont\nullfont + \usepackage[ipaex,nfssonly]{luatexja-preset} +\else + \usepackage[kozuka-pr6n,nfssonly]{luatexja-preset} +\fi \ltjsetparameter{alxspmode={`\*,allow}} \ltjsetparameter{alxspmode={`\\,allow}} %%%%\usepackage{unicode-math} @@ -1055,6 +1063,7 @@ % \texttt{jsclasses}で行われていた |\textmc|, |\textgt| の再定義は不要のように思われます。 % % \texttt{jsclasses.dtx}中で行われていた |\reDeclareMathAlphabet| の再定義は削除。 +% また,Yue ZHANGさん作の\texttt{fixjfm}パッケージ対応のコードもLua\TeX-jaでは削除しています. % % \begin{macrocode} \AtBeginDocument{% diff --git a/Master/texmf-dist/source/luatex/luatexja/tool/function_uax50.lua b/Master/texmf-dist/source/luatex/luatexja/tool/function_uax50.lua new file mode 100644 index 00000000000..90d16f8ccc6 --- /dev/null +++ b/Master/texmf-dist/source/luatex/luatexja/tool/function_uax50.lua @@ -0,0 +1,50 @@ +kpse.set_program_name('luatex') +dofile(kpse.find_file('lualibs.lua')) + +local function toX(a) return string.format('0x%X',a) end + +local uax_revision = '10.0.0' +print(' -- UAX#50 for Unicode ' .. uax_revision) +local fh = io.open('VerticalOrientation-' .. uax_revision .. '.txt') +local t = {} + +for c in fh:lines() do + if c:match('(%x+)%.%.(%x+)%s+;%sT-[rR]') then + local b, e = c:match('(%x+)%.%.(%x+)%s+;') + b, e = tonumber(b,16), tonumber(e,16) + for i=b,e do t[i]=true end + elseif c:match('(%x+)%s+;%sT-[rR]') then + local b = c:match('(%x+)%s+;') + t[tonumber(b,16)]=true + end +end + +fh:close() +local t2={} +local b, v = 0, t[0] +for i=0,0x10ffff do + if t[i]~=v then + table.insert(t2,b); b, v=i, t[i] + end +end +table.insert(t2,b) + +print(' -- t[0] = ' .. tostring(t[0])) +print(table.serialize(t2,' local t')) + +--[[ +for i,v in ipairs(t2) do + print(i, toX(v[1]) .. ' ≦x< ' .. toX(v[2]), v[3]) +end +]] + +print([[ local function rotate_in_uax50(i) + local lo, hi = 1, #t + while lo < hi do + local mi = math.ceil((lo+hi)/2) + if t[mi]<=i then lo=mi else hi=mi-1 end + end + return lo%2==1 + end +]]) + |