texlive[57543] Master/texmf-dist: chinese-jfm (28jan21)
commits+karl at tug.org
commits+karl at tug.org
Thu Jan 28 23:08:35 CET 2021
Revision: 57543
http://tug.org/svn/texlive?view=revision&revision=57543
Author: karl
Date: 2021-01-28 23:08:35 +0100 (Thu, 28 Jan 2021)
Log Message:
-----------
chinese-jfm (28jan21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/chinese-jfm/LICENSE
trunk/Master/texmf-dist/doc/luatex/chinese-jfm/README.md
trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-ja_JP.lua
trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_CN.lua
trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_TW.lua
Added Paths:
-----------
trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.pdf
trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.tex
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/luatex/chinese-jfm/doc.pdf
trunk/Master/texmf-dist/doc/luatex/chinese-jfm/doc.tex
Modified: trunk/Master/texmf-dist/doc/luatex/chinese-jfm/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/chinese-jfm/LICENSE 2021-01-28 00:53:01 UTC (rev 57542)
+++ trunk/Master/texmf-dist/doc/luatex/chinese-jfm/LICENSE 2021-01-28 22:08:35 UTC (rev 57543)
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2020 ListLee
+Copyright (c) 2020 -- 2021 ListLee
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Modified: trunk/Master/texmf-dist/doc/luatex/chinese-jfm/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/chinese-jfm/README.md 2021-01-28 00:53:01 UTC (rev 57542)
+++ trunk/Master/texmf-dist/doc/luatex/chinese-jfm/README.md 2021-01-28 22:08:35 UTC (rev 57543)
@@ -1,10 +1,10 @@
-# Chinese JFM files
+# Chinese JFM
## Introduction
Chinese JFM is a series of luatexja-jfm files for better Chinese typesetting, providing *quanjiao*, *banjiao*, and *kaiming* three styles and other fancy features. It can be used for both horizontal and vertical writing mode in Simplified/Traditional Chinese or Japanese fonts.
-For detailed useages, please read the [documentation](doc.pdf) (in Chinese).
+For detailed useages, please read the [documentation](chinese-jfm.pdf) (in Chinese).
## Update info
@@ -16,5 +16,11 @@
Update documentation.
+* v1.1.0
+
+ - Add glue between middle punctuations and the begin or the end of `hbox`/`parbox`.
+
+ - Add `fzpr` feature for zh_CN.
+
---
-Copyright (C) 2020 ListLee.
+Copyright (c) 2020 -- 2021 ListLee.
Added: trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.pdf 2021-01-28 00:53:01 UTC (rev 57542)
+++ trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.pdf 2021-01-28 22:08:35 UTC (rev 57543)
Property changes on: trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.tex 2021-01-28 22:08:35 UTC (rev 57543)
@@ -0,0 +1,96 @@
+% The documentation of chinese-jfm
+% v1.1.0
+% Copyright (c) 2020 -- 2021 ListLee.
+
+\documentclass[a4paper , zihao=-4 , fontset=adobe , punct=zh_CN/kaiming]{ctexart}
+\usepackage{luatexja-adjust}
+% \usepackage{lua-visual-debug}
+\protect\def\+{\insertxkanjiskip}
+
+\usepackage[textwidth=34em , centering]{geometry}
+
+\usepackage{hyperref}
+\hypersetup{colorlinks=true}
+
+\title{\textbf{\textsf{Chinese JFM}}\thanks{\url{https://github.com/tanukihee/ChineseJFM}}}
+\author{ListLee}
+\date{\zhtoday \qquad v1.1.0}
+
+\begin{document}
+\maketitle
+
+\section{概述}
+\textsf{Chinese JFM}是为中文排版编写的luatexja-jfm文件，提供全角、半角、开明三种风格，适用于简繁中文及日文字体的横直排。
+
+虽然\textsf{luatexja}自带了一套全角、半角、开明的JFM文件，但在调整上缺少灵活性，同时也没有使用\+\verb|priority|特性。\textsf{Chinese JFM}文件中同时增加了\+\verb|priority|的设置，配合\textsf{luatexja-adjust}包，可以进行有优先顺序的标点挤压。\label{sec:pr}
+
+\section{使用方法}
+\textsf{luatexja}在20200919版本后更新了JFM features特性，基本语法为
+\begin{verbatim}
+ jfm = <JFM name>[/{<JFM features>}]
+\end{verbatim}
+
+\textsf{Chinese JFM}提供了\textsf{zh\_CN}、\textsf{zh\_TW}与\textsf{ja\_JP}三个文件，分别适用于简中字体（标点偏靠）、繁中字体（标点中置）与日文字体（冒号、分号中置，其他偏靠）；在3个JFM文件中，均提供了\+\verb|quanjiao|、\verb|banjiao|与\+\verb|kaiming|三个基本特性。
+
+在使用\CTeX{}宏集或文档类时，只需要使用
+\begin{verbatim}
+ \documentclass[punct = zh_CN/quanjiao]{ctexart}
+\end{verbatim}
+或
+\begin{verbatim}
+ \usepackage[punct = zh_CN/kaiming]{ctex}
+\end{verbatim}
+即可。
+
+在使用\textsf{luatexja}或\textsf{ltj}文档类时，需要在调用\textsf{luatexja-fontspec}宏包后，以\begin{verbatim}
+ YokoFeatures = {JFM = {<JFM name>}}
+\end{verbatim}
+或
+\begin{verbatim}
+ TateFeatures = {JFM = {<JFM name>}}
+\end{verbatim}
+的形式调用。
+
+横排时，使用
+\begin{verbatim}
+ YokoFeatures = {JFM = {zh_CN/quanjiao}}
+\end{verbatim}
+直排时，使用
+\begin{verbatim}
+ TateFeatures = {JFM = {zh_CN/{quanjiao , vert}}}
+\end{verbatim}
+{\color{red}注意：在直排时，\emph{必须}同时使用\+\verb|vert|特性。}
+
+\section{特性一览}
+除上文介绍的\+\verb|quanjiao|、\verb|banjiao|、\verb|kaiming|与\+\verb|vert|特性外，\textsf{Chinese JFM}还提供了以下特性。
+
+\begin{description}
+ \item[\texttt{fzpr}] “\textit{Fangzheng} parenthesis”，“方正括号”特性。部分方正字体会将除引号外的括号做在中间位置。开启本特性，可以将括号调整至“正常”位置。仅\textsf{zh\_CN}拥有。
+ \item[\texttt{hwcl}] “half-width colon”，“半宽冒号”特性。适用于简中直排时，冒号分号只占半宽的字体（如华文宋体等）。仅\textsf{zh\_CN}拥有。
+ \item[\texttt{prop}] “proportional”，“比例宽度”特性。适用于比例宽度的日文字体，比之于\textsf{lua\-texja}自带的\textsf{jfm-prop.lua}与\textsf{jfm-propv.lua}，\verb|prop|特性将此两者整合的同时，也提供了对标点间距的调整功能。仅\textsf{ja\_JP}拥有。
+\end{description}
+
+\section{挤压顺序}
+如第\ref{sec:pr}节所述，\textsf{Chinese JFM}中配有\+\verb|priority|的设置，配合\textsf{luatexja-adjust}包，可以进行有优先顺序的标点挤压。\textsf{Chinese JFM}沿袭传统铅字排版与现代DTP软件（如InDesign等）的习惯，认为标点只占半宽，全宽标点是半宽标点加上半宽铅空的结果。所谓的“标点挤压”更应说成是“标点间距调整”，调整顺序如下。
+\begin{itemize}
+ \item 最先给句号、问号、叹号插空；
+ \item 其次给顿号、逗号、冒号、分号插空；
+ \item 最后调整引号、括号前后与间隔号两边的空格；
+ \item 如果进行上述调整后，仍无法达到行长要求，最后才会进行字间字距调整。
+\end{itemize}
+
+根据标点位置，可以将标点分为偏靠标点、中置标点与全宽标点。对于偏靠标点，插空指在半宽标点后插入一个半宽铅空，对于中置标点，插空指在半宽标点前后各插入一个1/4宽铅空。全宽标点无空白可调整的，不作调整。
+
+\nocite{*}
+\begin{thebibliography}{9}
+\bibitem{LuaTeX-ja} Lua\TeX-jaプロジェクトチーム．\textit{Lua\TeX-ja パッケージ} ［EB/OL］．version 20210103.0，（2021-01-03）\\\mbox{}
+\hfill\url{https://ctan.org/pkg/luatexja}
+
+\bibitem{CTeX} CTEX.ORG．\textit{\CTeX{} 宏集手册} ［EB/OL］．version 2.5.5，（2020-10-19）\\\mbox{}
+\hfill\url{https://ctan.org/pkg/ctex}
+
+\bibitem{孔雀计划} 刘庆（Eric Q L）．\textit{孔雀计划：中文字体排印的思路} ［EB/OL］．\\\mbox{}
+\hfill\url{https://thetype.com/kongque/}
+\end{thebibliography}
+
+\end{document}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/luatex/chinese-jfm/chinese-jfm.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/luatex/chinese-jfm/doc.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/luatex/chinese-jfm/doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/chinese-jfm/doc.tex 2021-01-28 00:53:01 UTC (rev 57542)
+++ trunk/Master/texmf-dist/doc/luatex/chinese-jfm/doc.tex 2021-01-28 22:08:35 UTC (rev 57543)
@@ -1,85 +0,0 @@
-\documentclass[a4paper, fontset=adobe , punct=zh_CN/kaiming]{ctexart}
-\usepackage{luatexja-adjust}
-
-\def\+{\insertxkanjiskip}
-
-\usepackage[textwidth=36em , centering]{geometry}
-
-\usepackage{hyperref}
-\hypersetup{colorlinks=true}
-
-\title{\textbf{\textsf{ChineseJFM}文件}\hbox{}\thanks{\url{https://github.com/tanukihee/ChineseJFM}}}
-\author{ListLee}
-\date{\zhtoday \qquad v1.0.1}
-
-\begin{document}
-\maketitle
-
-\section{概述}
-\textsf{ChineseJFM}文件是为中文排版编写的luatexja-jfm文件，提供全角、半角、开明三种风格，适用于简繁中文及日文字体的横直排。
-
-虽然\textsf{luatexja}自带了一套全角、半角、开明的JFM文件，但在调整上缺少灵活性，同时也没有使用\+\verb|priority|特性。\textsf{ChineseJFM}文件中同时增加了\+\verb|priority|的设置，配合\textsf{luatexja-adjust}包，可以进行有优先顺序的标点挤压。\label{sec:pr}
-
-\section{使用方法}
-\textsf{luatexja}在20200919版本后更新了JFM features特性，基本语法为
-\begin{verbatim}
- jfm = <JFM name>[/{<JFM features>}]
-\end{verbatim}
-
-\textsf{ChineseJFM}提供了\textsf{zh\_CN}、\textsf{zh\_TW}与\textsf{ja\_JP}三个文件，分别适用于简中字体（标点偏靠）、繁中字体（标点中置）与日文字体（冒号、分号中置，其他偏靠）；在3个JFM文件下，提供了\+\verb|quanjiao|、\verb|banjiao|与\+\verb|kaiming|三个基本特性。
-
-在使用\CTeX{}宏集或文档类时，只需要使用
-\begin{verbatim}
- \documentclass[punct = zh_CN/quanjiao]{ctexart}
-\end{verbatim}
-或
-\begin{verbatim}
- \usepackage[punct = zh_CN/kaiming]{ctex}
-\end{verbatim}
-即可。
-
-在使用\textsf{luatexja}或\textsf{ltj}文档类时，需要在调用\textsf{luatexja-fontspec}宏包后，以\begin{verbatim}
- YokoFeatures = {JFM = {<JFM name>}}
-\end{verbatim}
-或
-\begin{verbatim}
- TateFeatures = {JFM = {<JFM name>}}
-\end{verbatim}
-的形式调用。
-
-横排时，使用
-\begin{verbatim}
- YokoFeatures = {JFM = {zh_CN/quanjiao}}
-\end{verbatim}
-直排时，使用
-\begin{verbatim}
- TateFeatures = {JFM = {zh_CN/{quanjiao , vert}}}
-\end{verbatim}
-{\color{red}注意：在直排时，\emph{必须}同时使用\+\verb|vert|特性。}
-
-\section{特性一览}
-除上文介绍的\+\verb|quanjiao|、\verb|banjiao|、\verb|kaiming|与\+\verb|vert|特性外，\textsf{ChineseJFM}还提供了以下特性。
-
-\begin{description}
- \item[\texttt{hwcl}] “half-width colon”，“半宽冒号”特性，适用于简中直排时，冒号分号只占半宽的字体（如华文宋体等），仅\textsf{zh\_CN}拥有。
- \item[\texttt{prop}] “proportional”，“比例宽度”特性，使用于比例宽度的日文字体，比之于\textsf{luatexja}自带的\textsf{jfm-prop.lua}与\textsf{jfm-propv.lua}，\verb|prop|特性将此两者整合的同时，也提供了对标点间距的调整功能，仅\textsf{ja\_JP}拥有。
-\end{description}
-
-\section{挤压顺序}
-如第\ref{sec:pr}节所述，\textsf{ChineseJFM}文件中配有\+\verb|priority|的设置，配合\textsf{luatexja-adjust}包，可以进行有优先顺序的标点挤压。\textsf{ChineseJFM}沿袭传统铅字排版与现代DTP软件（如InDesign等）的习惯，认为标点只占半宽，全宽标点是半宽标点加上半宽铅空的结果。所谓的“标点挤压”更应说成是“标点间距调整”，调整顺序如下。
-\begin{itemize}
- \item 最先给句号、问号、叹号插空；
- \item 其次给顿号、逗号、冒号、分号插空；
- \item 最后调整引号、括号前后与间隔号两边的空格；
- \item 如果进行上述调整后，仍无法达到行长要求，最后才会进行字间字距调整。
-\end{itemize}
-
-根据标点位置，可以将标点分为偏靠标点、中置标点与全宽标点。对于偏靠标点，插空指在半宽标点后插入一个半宽铅空，对于中置标点，插空指在半宽标点前后各插入一个1/4宽铅空。全宽标点无空白可调整的，不作调整。
-
-\nocite{*}
-\begin{thebibliography}{9}
-\bibitem{孔雀计划} 刘庆（Eric Q L）．\textit{孔雀计划：中文字体排印的思路} ［EB/OL］．\\
-\raggedleft{\url{https://thetype.com/kongque/}}
-\end{thebibliography}
-
-\end{document}
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-ja_JP.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-ja_JP.lua 2021-01-28 00:53:01 UTC (rev 57542)
+++ trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-ja_JP.lua 2021-01-28 22:08:35 UTC (rev 57543)
@@ -1,7 +1,8 @@
-- Chinese JFM for Japanese fonts (ja_JP)
--- v1.0.1
+-- v1.1.0
+-- Copyright (c) 2020 -- 2021 ListLee.
-local is_vt, is_qj, is_bj, is_km, is_prop
+local is_vt, is_qj, is_bj, is_km, is_pr
if luatexja.jfont.jfm_feature then
is_vt = luatexja.jfont.jfm_feature.vert
@@ -8,7 +9,7 @@
is_qj = luatexja.jfont.jfm_feature.quanjiao
is_bj = luatexja.jfont.jfm_feature.banjiao
is_km = luatexja.jfont.jfm_feature.kaiming
- is_prop = luatexja.jfont.jfm_feature.prop
+ is_pr = luatexja.jfont.jfm_feature.prop
end
if
@@ -42,7 +43,7 @@
align = 'middle',
left = 0,
down = 0,
- width = is_prop and 'prop' or 1,
+ width = is_pr and 'prop' or 1,
height = is_vt and 0.5 or 0.88,
depth = is_vt and 0.5 or 0.12,
italic = 0,
@@ -160,7 +161,8 @@
[3] = aki(0.5, -1),
[4] = aki(0.25),
[41] = aki(0.25),
- [5] = aki(0.25)
+ [5] = aki(0.25),
+ [6] = aki(0.25)
}
},
[3] = {
@@ -182,7 +184,8 @@
[3] = aki(0.5, -1),
[4] = aki(0.25, -1),
[41] = aki(0.25, -1),
- [5] = aki(0.25, -1)
+ [5] = aki(0.25, -1),
+ [6] = aki(0.25, -1)
}
},
[4] = {
@@ -292,6 +295,10 @@
},
[6] = {
-- box end
- chars = {'boxbdd', 'parbdd', 'glue'}
+ chars = {'boxbdd', 'parbdd', 'glue'},
+ glue = {
+ [22] = aki(0.25),
+ [3] = aki(0.25, -1)
+ }
}
}
Modified: trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_CN.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_CN.lua 2021-01-28 00:53:01 UTC (rev 57542)
+++ trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_CN.lua 2021-01-28 22:08:35 UTC (rev 57543)
@@ -1,7 +1,8 @@
-- Chinese JFM for Simplified Chinese fonts (zh_CN)
--- v1.0.1
+-- v1.1.0
+-- Copyright (c) 2020 -- 2021 ListLee.
-local is_vt, is_qj, is_bj, is_km, is_hwcl
+local is_vt, is_qj, is_bj, is_km, is_hc, is_fz
if luatexja.jfont.jfm_feature then
is_vt = luatexja.jfont.jfm_feature.vert
@@ -8,10 +9,11 @@
is_qj = luatexja.jfont.jfm_feature.quanjiao
is_bj = luatexja.jfont.jfm_feature.banjiao
is_km = luatexja.jfont.jfm_feature.kaiming
- is_hwcl = luatexja.jfont.jfm_feature.hwcl
+ is_hc = luatexja.jfont.jfm_feature.hwcl
+ is_fz = luatexja.jfont.jfm_feature.fzpr
end
-if is_hwcl then
+if is_hc then
if not is_vt then
tex.error('JFM feature "hwcl" can only be used in vertical mode')
end
@@ -54,6 +56,7 @@
italic = 0,
glue = {
[1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
[3] = aki(0.25, -1)
},
round_threshold = 0.01
@@ -61,8 +64,6 @@
[1] = {
-- 开括号
chars = {
- '‘',
- '“',
'〈',
'《',
'「',
@@ -77,6 +78,22 @@
'｛',
'｟'
},
+ align = is_fz and 'middle' or 'right',
+ left = 0,
+ down = 0,
+ width = 0.5,
+ height = is_vt and 0.5 or 0.88,
+ depth = is_vt and 0.5 or 0.12,
+ italic = 0,
+ glue = {
+ [3] = aki(0.25, -1)
+ }
+ },
+ [10] = {
+ chars = {
+ '‘',
+ '“'
+ },
align = 'right',
left = 0,
down = 0,
@@ -91,8 +108,6 @@
[2] = {
-- 闭括号
chars = {
- '’',
- '”',
'〉',
'》',
'」',
@@ -108,6 +123,28 @@
'｝',
'｠'
},
+ align = is_fz and 'middle' or 'left',
+ left = 0,
+ down = 0,
+ width = 0.5,
+ height = is_vt and 0.5 or 0.88,
+ depth = is_vt and 0.5 or 0.12,
+ italic = 0,
+ glue = {
+ [0] = aki(0.5, -1),
+ [1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
+ [3] = aki(0.25, -1),
+ [5] = aki(0.5, -1),
+ [51] = aki(0.5, -1),
+ [52] = aki(0.5, -1)
+ }
+ },
+ [20] = {
+ chars = {
+ '’',
+ '”'
+ },
align = 'left',
left = 0,
down = 0,
@@ -118,7 +155,8 @@
glue = {
[0] = aki(0.5, -1),
[1] = aki(0.5, -1),
- [3] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
+ [3] = aki(0.25, -1),
[5] = aki(0.5, -1),
[51] = aki(0.5, -1),
[52] = aki(0.5, -1)
@@ -137,6 +175,7 @@
glue = {
[0] = aki(0.5),
[1] = aki(0.5),
+ [10] = aki(0.5),
[3] = aki(0.5),
[5] = aki(0.5),
[51] = aki(0.5),
@@ -149,17 +188,18 @@
align = 'left',
left = 0,
down = 0,
- width = is_vt and (is_hwcl and 0.5 or 1) or 0.5,
+ width = is_vt and (is_hc and 0.5 or 1) or 0.5,
height = is_vt and 0.5 or 0.88,
depth = is_vt and 0.5 or 0.12,
italic = 0,
glue = {
- [0] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5),
- [1] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5),
- [3] = is_vt and (is_hwcl and aki(0.5) or aki(0.25, 1)) or aki(0.5),
- [5] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5),
- [51] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5),
- [52] = is_vt and (is_hwcl and aki(0.5) or {}) or aki(0.5)
+ [0] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [1] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [10] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [3] = is_vt and (is_hc and aki(0.5) or aki(0.25, 1)) or aki(0.5),
+ [5] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [51] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5),
+ [52] = is_vt and (is_hc and aki(0.5) or {}) or aki(0.5)
}
},
[3] = {
@@ -174,8 +214,10 @@
italic = 0,
glue = {
[0] = aki(0.25, -1),
- [1] = aki(0.5, -1),
+ [1] = aki(0.25, -1),
+ [10] = aki(0.25, -1),
[2] = aki(0.25, -1),
+ [20] = aki(0.25, -1),
[21] = aki(0.25, -1),
[22] = aki(0.25, -1),
[3] = aki(0.5, -1),
@@ -182,7 +224,8 @@
[4] = aki(0.25, -1),
[41] = aki(0.25, -1),
[42] = aki(0.25, -1),
- [5] = aki(0.25, -1)
+ [5] = aki(0.25, -1),
+ [6] = aki(0.25, -1)
}
},
[4] = {
@@ -198,6 +241,7 @@
glue = {
[0] = aki(0.5, 1, true),
[1] = aki(0.5, 1, true),
+ [10] = aki(0.5, 1, true),
[3] = aki(0.5, 1, true),
[5] = aki(0.5, 1, true),
[51] = aki(0.5, 1, true),
@@ -217,6 +261,7 @@
glue = {
[0] = is_vt and {} or aki(0.5, 1, true),
[1] = is_vt and {} or aki(0.5, 1, true),
+ [10] = is_vt and {} or aki(0.5, 1, true),
[3] = is_vt and aki(0.25, -1) or aki(0.5, 1, true),
[5] = is_vt and {} or aki(0.5, 1, true),
[51] = is_vt and {} or aki(0.5, 1, true),
@@ -256,6 +301,7 @@
italic = 0,
glue = {
[1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
[3] = aki(0.25, -1)
},
kern = {
@@ -276,6 +322,7 @@
italic = 0,
glue = {
[1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
[3] = aki(0.25, -1)
},
kern = {
@@ -296,6 +343,7 @@
italic = 0,
glue = {
[1] = aki(0.5, -1),
+ [10] = aki(0.5, -1),
[3] = aki(0.25, -1)
},
kern = {
@@ -306,6 +354,9 @@
},
[6] = {
-- box end
- chars = {'boxbdd', 'parbdd', 'glue'}
+ chars = {'boxbdd', 'parbdd', 'glue'},
+ glue = {
+ [3] = aki(0.25, -1)
+ }
}
}
Modified: trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_TW.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_TW.lua 2021-01-28 00:53:01 UTC (rev 57542)
+++ trunk/Master/texmf-dist/tex/luatex/chinese-jfm/jfm-zh_TW.lua 2021-01-28 22:08:35 UTC (rev 57543)
@@ -1,5 +1,6 @@
-- Chinese JFM for Traditional Chinese fonts (zh_TW)
--- v1.0.1
+-- v1.1.0
+-- Copyright (c) 2020 -- 2021 ListLee.
local is_vt, is_qj, is_bj, is_km
@@ -149,7 +150,8 @@
[41] = aki(0.25),
[5] = aki(0.25),
[51] = aki(0.25),
- [52] = aki(0.25)
+ [52] = aki(0.25),
+ [6] = aki(0.25)
}
},
[22] = {
@@ -176,7 +178,8 @@
[41] = is_vt and {} or aki(0.25),
[5] = is_vt and {} or aki(0.25),
[51] = is_vt and {} or aki(0.25),
- [52] = is_vt and {} or aki(0.25)
+ [52] = is_vt and {} or aki(0.25),
+ [6] = is_vt and {} or aki(0.25)
}
},
[3] = {
@@ -202,7 +205,8 @@
[41] = aki(0.25, -1),
[5] = aki(0.25, -1),
[51] = aki(0.25, -1),
- [52] = aki(0.25, -1)
+ [52] = aki(0.25, -1),
+ [6] = aki(0.25, -1)
}
},
[4] = {
@@ -230,7 +234,8 @@
[41] = aki(0.25, 1, true),
[5] = aki(0.25, 1, true),
[51] = aki(0.25, 1, true),
- [52] = aki(0.25, 1, true)
+ [52] = aki(0.25, 1, true),
+ [6] = aki(0.25, 1, true)
}
},
[41] = {
@@ -328,6 +333,12 @@
},
[6] = {
-- box end
- chars = {'boxbdd', 'parbdd', 'glue'}
+ chars = {'boxbdd', 'parbdd', 'glue'},
+ glue = {
+ [21] = aki(0.25),
+ [22] = is_vt and {} or aki(0.25),
+ [3] = aki(0.25, -1),
+ [4] = aki(0.25, 1, true)
+ }
}
}
More information about the tex-live-commits
mailing list.