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

diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index d65b716..13a6a3b 100644 (file)
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -1845,7 +1845,6 @@ these eight ranges belongs to the character range~217.
 %</ja>
 \begin{description}
 %<*en>
 %</ja>
 \begin{description}
 %<*en>

-

 \item[Range~8${}^{\text{A}}$] The intersection of the upper half of ISO~8859-1
         (Latin-1 Supplement) and JIS~X~0208 (a basic character set for Japanese). This character range
         consists of the following characters:
 \item[Range~8${}^{\text{A}}$] The intersection of the upper half of ISO~8859-1
         (Latin-1 Supplement) and JIS~X~0208 (a basic character set for Japanese). This character range
         consists of the following characters:


@@ -1870,11 +1869,11 @@ these eight ranges belongs to the character range~217.
 \end{multicols}
 
 %<*en>
 \end{multicols}
 
 %<*en>

-\item[Range~1${}^{\text{A}}$] Latin characters that some of them are included in Adobe-Japan1-6.
+\item[Range~1${}^{\text{A}}$] Latin characters that some of them are included in Adobe-Japan1-7.

 This range consists of the following Unicode ranges, \emph{except characters in the range~8 above}:
 %</en>
 %<*ja>
 This range consists of the following Unicode ranges, \emph{except characters in the range~8 above}:
 %</en>
 %<*ja>

-\item[範囲1${}^{\text{A}}$] ラテン文字のうち，Adobe-Japan1-6との共通部分があるもの．
+\item[範囲1${}^{\text{A}}$] ラテン文字のうち，Adobe-Japan1-7との共通部分があるもの．

                              この範囲は以下のUnicodeのブロックのうち
                              \emph{範囲8を除いた}部分で構成されている：
 %</ja>
                              この範囲は以下のUnicodeのブロックのうち
                              \emph{範囲8を除いた}部分で構成されている：
 %</ja>


@@ -1908,11 +1907,11 @@ This range consists of the following Unicode ranges, \emph{except characters in
 \end{itemize}
 \end{multicols}
 %<*en>
 \end{itemize}
 \end{multicols}
 %<*en>

-\item[Range~3${}^{\text{\kern.1emJ}}$] Punctuations and Miscellaneous symbols. The block list is
+\item[Range~3${}^{\text{\kern.1emJ}}$] Miscellaneous symbols. The block list is

           indicated in \autoref{tab:rng3}.
 %</en>
 %<*ja>
           indicated in \autoref{tab:rng3}.
 %</en>
 %<*ja>

-\item[範囲3${}^{\text{\kern.1emJ}}$] 句読点と記号類．ブロックのリストは\autoref{tab:rng3}%
+\item[範囲3${}^{\text{\kern.1emJ}}$] 記号類．ブロックのリストは\autoref{tab:rng3}%

                              に示してある．
 %</ja>
 \begin{table}[!tb]
                              に示してある．
 %</ja>
 \begin{table}[!tb]


@@ -1922,7 +1921,6 @@ This range consists of the following Unicode ranges, \emph{except characters in
 \catcode`\"=13\def"#1#2#3#4{\texttt{U+#1#2#3#4}}%"
 \centering\footnotesize
 \begin{tabular}{llll}
 \catcode`\"=13\def"#1#2#3#4{\texttt{U+#1#2#3#4}}%"
 \centering\footnotesize
 \begin{tabular}{llll}

-"2000--"206F&General Punctuation&

 "2070--"209F&Superscripts and Subscripts\\
 "20A0--"20CF&Currency Symbols&
 "20D0--"20FF&Comb.\ Diacritical Marks for Symbols\\
 "2070--"209F&Superscripts and Subscripts\\
 "20A0--"20CF&Currency Symbols&
 "20D0--"20FF&Comb.\ Diacritical Marks for Symbols\\


@@ -1943,23 +1941,72 @@ This range consists of the following Unicode ranges, \emph{except characters in
 \end{tabular}
 \end{table}
 %<*en>
 \end{tabular}
 \end{table}
 %<*en>

+\item[Range~9${}^{\text{J}}$] The intersection of the ``General Punctuation'' block
+  (\texttt{U+2000}--\texttt{U+206F})
+  and Adobe-Japan1-7 character collection. This character range
+  consists of the following characters:
+%</en>
+%<*ja>
+\item[範囲9${}^{\text{J}}$] Unicodeの「一般句読点」ブロック(\texttt{U+2000}--\texttt{U+206F})と
+  Adobe-Japan1-7の共通部分．この文字範囲は
+  以下の文字で構成される：
+%</ja>
+\begin{multicols}{2}\small
+\begin{itemize}
+  \def\ch#1#2{\item \ltjjachar"20#1\ (\texttt{U+20#1}, #2)}%"
+  \ch{02}{En space}
+  \ch{10}{Hyphen}
+  \ch{11}{Non-breaking hyphen}
+  \ch{13}{En dash}
+  \ch{14}{Em dash}
+  \ch{15}{Horizontal bar}
+  \ch{16}{Double vertical line}
+  \ch{18}{Left single quotation mark}
+  \ch{19}{Right single quotation mark}
+  \ch{1A}{Single low-9 quotation mark}
+  \ch{1C}{Left double quotation mark}
+  \ch{1D}{Right double quotation mark}
+  \ch{1E}{Double low-9 quotation mark}
+  \ch{20}{Dagger}
+  \ch{21}{Double dagger}
+  \ch{22}{Bullet}
+  \ch{25}{Two dot leader}
+  \ch{26}{Horizontal ellipsis}
+  \ch{30}{Per mille sign}
+  \ch{32}{Prime}
+  \ch{33}{Double prime}
+  \ch{39}{Single left-pointing angle quot.}
+  \ch{3A}{Single right-pointing angle quot.}
+  \ch{3B}{Reference mark}
+  \ch{3C}{Double exclamation mark}
+  \ch{3E}{Overline}
+  \ch{3F}{Undertie}
+  \ch{42}{Asterism}
+  \ch{44}{Fraction slash}
+  \ch{47}{Double question mark}
+  \ch{48}{Question exclamation mark}
+  \ch{49}{Exclamation question mark}
+  \ch{51}{Two asterisks aligned vertically}
+\end{itemize}
+\end{multicols}
+%<*en>

 \item[Range~4${}^{\text{A}}$] Characters usually not in Japanese fonts. This range consists
           of almost all Unicode blocks which are not in other
           predefined ranges. Hence, instead of showing the block list,
 \item[Range~4${}^{\text{A}}$] Characters usually not in Japanese fonts. This range consists
           of almost all Unicode blocks which are not in other
           predefined ranges. Hence, instead of showing the block list,

-          we put the definition of this range itself:
+          we put the definition of this range itself.

 %</en>
 %<*ja>
 \item[範囲4${}^{\text{A}}$] 通常和文フォントには含まれていない文字．
                              この範囲は他の範囲にないほとんど全てのUnicodeブロック
                              で構成されている．したがって，ブロックのリストを示す
 %</en>
 %<*ja>
 \item[範囲4${}^{\text{A}}$] 通常和文フォントには含まれていない文字．
                              この範囲は他の範囲にないほとんど全てのUnicodeブロック
                              で構成されている．したがって，ブロックのリストを示す

-                             代ã\82\8fã\82\8aã\81«ï¼\8cç¯\84å\9b²ã\81®å®\9a義ã\81\9dã\81®ã\82\82ã\81®ã\82\92示ã\81\99ï¼\9a
+                             代ã\82\8fã\82\8aã\81«ï¼\8cç¯\84å\9b²ã\81®å®\9a義ã\81\9dã\81®ã\82\82ã\81®ã\82\92示ã\81\99ï¼\8e

 %</ja>
 \begin{lstlisting}
 \ltjdefcharrange{4}{%
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
   "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
   "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,
 %</ja>
 \begin{lstlisting}
 \ltjdefcharrange{4}{%
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
   "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
   "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,

-  "1F300-"1FFFF
+  "1F300-"1FFFF, ... (characters in "2000-"206F which are not in range 9)

 } % non-Japanese
 \end{lstlisting}
 %<en>\item[Range~5${}^{\text{A}}$] Surrogates and Supplementary Private Use Areas.
 } % non-Japanese
 \end{lstlisting}
 %<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
 \end{tabular}
 \end{table}
 %<*en>
 \end{tabular}
 \end{table}
 %<*en>

-\item[Range~7${}^{\text{\kern.1emJ}}$] Characters used in CJK languages, but not included in  Adobe-Japan1-6.
+\item[Range~7${}^{\text{\kern.1emJ}}$] Characters used in CJK languages, but not included in  Adobe-Japan1-7.

 The block list is indicated in \autoref{tab:rng7}.
 %</en>
 %<*ja>
 The block list is indicated in \autoref{tab:rng7}.
 %</en>
 %<*ja>

-\item[範囲7${}^{\text{\kern.1emJ}}$] CJK言語で用いられる文字のうち，Adobe-Japan1-6に
+\item[範囲7${}^{\text{\kern.1emJ}}$] CJK言語で用いられる文字のうち，Adobe-Japan1-7に

                             含まれていないもの．
                             ブロックのリストは\autoref{tab:rng7}に示す．
 %</ja>
                             含まれていないもの．
                             ブロックのリストは\autoref{tab:rng7}に示す．
 %</ja>

diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty
index 53a8729..6d00089 100644 (file)
--- a/src/ltj-plain.sty
+++ b/src/ltj-plain.sty
@@ -75,12 +75,12 @@
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
 \ltjdefcharrange{3}{%
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
 \ltjdefcharrange{3}{%

-  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
+  "2070-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}

 \ltjdefcharrange{4}{%
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
   "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
   "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,
 \ltjdefcharrange{4}{%
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
   "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
   "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,

-  "1F300-"1FFFF, "200D
+  "1F300-"1FFFF, "2000-"206F

 } % non-Japanese
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF}
 \ltjdefcharrange{6}{%
 } % non-Japanese
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF}
 \ltjdefcharrange{6}{%


@@ -93,7 +93,13 @@
   "A960-"A97F, "AC00-"D7FF
 }
 \ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
   "A960-"A97F, "AC00-"D7FF
 }
 \ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}

-\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
+\ltjdefcharrange{9}{
+  "2002, "2010, "2011, "2013, "2014, "2015, "2016, "2018, "2019,
+  "201A, "201C, "201D, "201E, "2020, "2021, "2022, "2025, "2026,
+  "2030, "2032, "2033, "2039, "203A, "203B, "203C, "203E, "203F,
+  "2042, "2044, "2047, "2048, "2049, "2051
+}
+\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8, +9}}

 
 \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
 \let\ltj@@orig@end=\@@end
 
 \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
 \let\ltj@@orig@end=\@@end

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index 7ea758b..2b90ae9 100644 (file)
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -106,7 +106,7 @@
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
   "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
   "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,
    "500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
   "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
   "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,

-  "1F300-"1FFFF, "200D
+  "1F300-"1FFFF, "2000-"206F

 } % non-Japanese
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF}
 \ltjdefcharrange{6}{%
 } % non-Japanese
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF}
 \ltjdefcharrange{6}{%


@@ -119,7 +119,13 @@
   "A960-"A97F, "AC00-"D7FF
 }
 \ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
   "A960-"A97F, "AC00-"D7FF
 }
 \ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}

-\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
+\ltjdefcharrange{9}{
+  "2002, "2010, "2011, "2013, "2014, "2015, "2016, "2018, "2019,
+  "201A, "201C, "201D, "201E, "2020, "2021, "2022, "2025, "2026,
+  "2030, "2032, "2033, "2039, "203A, "203B, "203C, "203E, "203F,
+  "2042, "2044, "2047, "2048, "2049, "2051
+}
+\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8, +9}}

 
 \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
 \protected\def\<{\ifvmode\leavevmode\fi\inhibitglue}
 
 \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
 \protected\def\<{\ifvmode\leavevmode\fi\inhibitglue}


@@ -148,8 +154,7 @@ MIDDLE
   % Greek and Coptic, Cyrillic, Greek Extended
 
 \ltjdefcharrange{3}{%
   % Greek and Coptic, Cyrillic, Greek Extended
 
 \ltjdefcharrange{3}{%

-  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
-  %   66  "2000-"206F num = 140/112 name = General Punctuation
+  "2070-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}

   %   67  "2070-"209F num = 68/48 name = Superscripts and Subscripts
   %   68  "20A0-"20CF num = 5/48 name = Currency Symbols
   %   69  "20D0-"20FF num = 2/48 name = Combining Diacritical Marks for Symbols
   %   67  "2070-"209F num = 68/48 name = Superscripts and Subscripts
   %   68  "20A0-"20CF num = 5/48 name = Currency Symbols
   %   69  "20D0-"20FF num = 2/48 name = Combining Diacritical Marks for Symbols