• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: コミット

ソースコードの管理場所


コミットメタ情報

リビジョンcf04e1483562d79223a11230e7280dcd21f4eef1 (tree)
日時2019-08-27 20:09:36
作者Hironori Kitagawa <h_kitagawa2001@yaho...>
コミッターHironori Kitagawa

ログメッセージ

New character range 9 (intersection of U+2000-U+206F and AJ1-7)

変更サマリ

差分

--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -1845,7 +1845,6 @@ these eight ranges belongs to the character range~217.
18451845 %</ja>
18461846 \begin{description}
18471847 %<*en>
1848-
18491848 \item[Range~8${}^{\text{A}}$] The intersection of the upper half of ISO~8859-1
18501849 (Latin-1 Supplement) and JIS~X~0208 (a basic character set for Japanese). This character range
18511850 consists of the following characters:
@@ -1870,11 +1869,11 @@ these eight ranges belongs to the character range~217.
18701869 \end{multicols}
18711870
18721871 %<*en>
1873-\item[Range~1${}^{\text{A}}$] Latin characters that some of them are included in Adobe-Japan1-6.
1872+\item[Range~1${}^{\text{A}}$] Latin characters that some of them are included in Adobe-Japan1-7.
18741873 This range consists of the following Unicode ranges, \emph{except characters in the range~8 above}:
18751874 %</en>
18761875 %<*ja>
1877-\item[範囲1${}^{\text{A}}$] ラテン文字のうち,Adobe-Japan1-6との共通部分があるもの.
1876+\item[範囲1${}^{\text{A}}$] ラテン文字のうち,Adobe-Japan1-7との共通部分があるもの.
18781877 この範囲は以下のUnicodeのブロックのうち
18791878 \emph{範囲8を除いた}部分で構成されている:
18801879 %</ja>
@@ -1908,11 +1907,11 @@ This range consists of the following Unicode ranges, \emph{except characters in
19081907 \end{itemize}
19091908 \end{multicols}
19101909 %<*en>
1911-\item[Range~3${}^{\text{\kern.1emJ}}$] Punctuations and Miscellaneous symbols. The block list is
1910+\item[Range~3${}^{\text{\kern.1emJ}}$] Miscellaneous symbols. The block list is
19121911 indicated in \autoref{tab:rng3}.
19131912 %</en>
19141913 %<*ja>
1915-\item[範囲3${}^{\text{\kern.1emJ}}$] 句読点と記号類.ブロックのリストは\autoref{tab:rng3}%
1914+\item[範囲3${}^{\text{\kern.1emJ}}$] 記号類.ブロックのリストは\autoref{tab:rng3}%
19161915 に示してある.
19171916 %</ja>
19181917 \begin{table}[!tb]
@@ -1922,7 +1921,6 @@ This range consists of the following Unicode ranges, \emph{except characters in
19221921 \catcode`\"=13\def"#1#2#3#4{\texttt{U+#1#2#3#4}}%"
19231922 \centering\footnotesize
19241923 \begin{tabular}{llll}
1925-"2000--"206F&General Punctuation&
19261924 "2070--"209F&Superscripts and Subscripts\\
19271925 "20A0--"20CF&Currency Symbols&
19281926 "20D0--"20FF&Comb.\ Diacritical Marks for Symbols\\
@@ -1943,23 +1941,72 @@ This range consists of the following Unicode ranges, \emph{except characters in
19431941 \end{tabular}
19441942 \end{table}
19451943 %<*en>
1944+\item[Range~9${}^{\text{J}}$] The intersection of the ``General Punctuation'' block
1945+ (\texttt{U+2000}--\texttt{U+206F})
1946+ and Adobe-Japan1-7 character collection. This character range
1947+ consists of the following characters:
1948+%</en>
1949+%<*ja>
1950+\item[範囲9${}^{\text{J}}$] Unicodeの「一般句読点」ブロック(\texttt{U+2000}--\texttt{U+206F})と
1951+ Adobe-Japan1-7の共通部分.この文字範囲は
1952+ 以下の文字で構成される:
1953+%</ja>
1954+\begin{multicols}{2}\small
1955+\begin{itemize}
1956+ \def\ch#1#2{\item \ltjjachar"20#1\ (\texttt{U+20#1}, #2)}%"
1957+ \ch{02}{En space}
1958+ \ch{10}{Hyphen}
1959+ \ch{11}{Non-breaking hyphen}
1960+ \ch{13}{En dash}
1961+ \ch{14}{Em dash}
1962+ \ch{15}{Horizontal bar}
1963+ \ch{16}{Double vertical line}
1964+ \ch{18}{Left single quotation mark}
1965+ \ch{19}{Right single quotation mark}
1966+ \ch{1A}{Single low-9 quotation mark}
1967+ \ch{1C}{Left double quotation mark}
1968+ \ch{1D}{Right double quotation mark}
1969+ \ch{1E}{Double low-9 quotation mark}
1970+ \ch{20}{Dagger}
1971+ \ch{21}{Double dagger}
1972+ \ch{22}{Bullet}
1973+ \ch{25}{Two dot leader}
1974+ \ch{26}{Horizontal ellipsis}
1975+ \ch{30}{Per mille sign}
1976+ \ch{32}{Prime}
1977+ \ch{33}{Double prime}
1978+ \ch{39}{Single left-pointing angle quot.}
1979+ \ch{3A}{Single right-pointing angle quot.}
1980+ \ch{3B}{Reference mark}
1981+ \ch{3C}{Double exclamation mark}
1982+ \ch{3E}{Overline}
1983+ \ch{3F}{Undertie}
1984+ \ch{42}{Asterism}
1985+ \ch{44}{Fraction slash}
1986+ \ch{47}{Double question mark}
1987+ \ch{48}{Question exclamation mark}
1988+ \ch{49}{Exclamation question mark}
1989+ \ch{51}{Two asterisks aligned vertically}
1990+\end{itemize}
1991+\end{multicols}
1992+%<*en>
19461993 \item[Range~4${}^{\text{A}}$] Characters usually not in Japanese fonts. This range consists
19471994 of almost all Unicode blocks which are not in other
19481995 predefined ranges. Hence, instead of showing the block list,
1949- we put the definition of this range itself:
1996+ we put the definition of this range itself.
19501997 %</en>
19511998 %<*ja>
19521999 \item[範囲4${}^{\text{A}}$] 通常和文フォントには含まれていない文字.
19532000 この範囲は他の範囲にないほとんど全てのUnicodeブロック
19542001 で構成されている.したがって,ブロックのリストを示す
1955- 代わりに,範囲の定義そのものを示す:
2002+ 代わりに,範囲の定義そのものを示す.
19562003 %</ja>
19572004 \begin{lstlisting}
19582005 \ltjdefcharrange{4}{%
19592006 "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
19602007 "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
19612008 "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,
1962- "1F300-"1FFFF
2009+ "1F300-"1FFFF, ... (characters in "2000-"206F which are not in range 9)
19632010 } % non-Japanese
19642011 \end{lstlisting}
19652012 %<en>\item[Range~5${}^{\text{A}}$] Surrogates and Supplementary Private Use Areas.
@@ -1999,11 +2046,11 @@ This range consists of the following Unicode ranges, \emph{except characters in
19992046 \end{tabular}
20002047 \end{table}
20012048 %<*en>
2002-\item[Range~7${}^{\text{\kern.1emJ}}$] Characters used in CJK languages, but not included in Adobe-Japan1-6.
2049+\item[Range~7${}^{\text{\kern.1emJ}}$] Characters used in CJK languages, but not included in Adobe-Japan1-7.
20032050 The block list is indicated in \autoref{tab:rng7}.
20042051 %</en>
20052052 %<*ja>
2006-\item[範囲7${}^{\text{\kern.1emJ}}$] CJK言語で用いられる文字のうち,Adobe-Japan1-6に
2053+\item[範囲7${}^{\text{\kern.1emJ}}$] CJK言語で用いられる文字のうち,Adobe-Japan1-7に
20072054 含まれていないもの.
20082055 ブロックのリストは\autoref{tab:rng7}に示す.
20092056 %</ja>
--- a/src/ltj-plain.sty
+++ b/src/ltj-plain.sty
@@ -75,12 +75,12 @@
7575 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
7676 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
7777 \ltjdefcharrange{3}{%
78- "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
78+ "2070-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
7979 \ltjdefcharrange{4}{%
8080 "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
8181 "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
8282 "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,
83- "1F300-"1FFFF, "200D
83+ "1F300-"1FFFF, "2000-"206F
8484 } % non-Japanese
8585 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF}
8686 \ltjdefcharrange{6}{%
@@ -93,7 +93,13 @@
9393 "A960-"A97F, "AC00-"D7FF
9494 }
9595 \ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
96-\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
96+\ltjdefcharrange{9}{
97+ "2002, "2010, "2011, "2013, "2014, "2015, "2016, "2018, "2019,
98+ "201A, "201C, "201D, "201E, "2020, "2021, "2022, "2025, "2026,
99+ "2030, "2032, "2033, "2039, "203A, "203B, "203C, "203E, "203F,
100+ "2042, "2044, "2047, "2048, "2049, "2051
101+}
102+\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8, +9}}
97103
98104 \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
99105 \let\ltj@@orig@end=\@@end
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -106,7 +106,7 @@
106106 "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
107107 "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
108108 "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,
109- "1F300-"1FFFF, "200D
109+ "1F300-"1FFFF, "2000-"206F
110110 } % non-Japanese
111111 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF}
112112 \ltjdefcharrange{6}{%
@@ -119,7 +119,13 @@
119119 "A960-"A97F, "AC00-"D7FF
120120 }
121121 \ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
122-\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
122+\ltjdefcharrange{9}{
123+ "2002, "2010, "2011, "2013, "2014, "2015, "2016, "2018, "2019,
124+ "201A, "201C, "201D, "201E, "2020, "2021, "2022, "2025, "2026,
125+ "2030, "2032, "2033, "2039, "203A, "203B, "203C, "203E, "203F,
126+ "2042, "2044, "2047, "2048, "2049, "2051
127+}
128+\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8, +9}}
123129
124130 \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
125131 \protected\def\<{\ifvmode\leavevmode\fi\inhibitglue}
@@ -148,8 +154,7 @@ MIDDLE
148154 % Greek and Coptic, Cyrillic, Greek Extended
149155
150156 \ltjdefcharrange{3}{%
151- "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
152- % 66 "2000-"206F num = 140/112 name = General Punctuation
157+ "2070-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
153158 % 67 "2070-"209F num = 68/48 name = Superscripts and Subscripts
154159 % 68 "20A0-"20CF num = 5/48 name = Currency Symbols
155160 % 69 "20D0-"20FF num = 2/48 name = Combining Diacritical Marks for Symbols
旧リポジトリブラウザで表示