summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2019-02-06 11:00:04 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2019-02-06 11:00:04 +0000
commitdecf7a7941406ca1f91ecd8456cefb033d45a5aa (patch)
tree2d2f1d50feb01f89f0612ecf1bc56d99df2dae12 /Build
parentb59508c74f4961c1fa83ac4d2906c98e40bd2650 (diff)
control-symbol (ptex and friends 3 of 5)
git-svn-id: svn://tug.org/texlive/trunk@49957 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/ptexdir/ptex-base.ch5
-rw-r--r--Build/source/texk/web2c/ptexdir/ptex_version.h2
-rw-r--r--Build/source/texk/web2c/ptexdir/tests/control-symbol.tex21
4 files changed, 32 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 7ae83fc9c73..09e340f4153 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,10 @@
+2019-02-03 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * ptex-base.ch: Ignore newline char after Japanese control
+ symbol. https://github.com/texjporg/tex-jp-build/issues/37
+ * tests/control_symbol.tex: More test cases.
+ * ptex_version.h: pTeX version p3.8.2.
+
2019-01-23 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
* ptex-base.ch: Add dump_kanji and undump_kanji.
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index 1020afe8ace..9240bb9a1a6 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -74,8 +74,8 @@
@y
@d pTeX_version=3
@d pTeX_minor_version=8
-@d pTeX_revision==".1"
-@d pTeX_version_string=='-p3.8.1' {current \pTeX\ version}
+@d pTeX_revision==".2"
+@d pTeX_version_string=='-p3.8.2' {current \pTeX\ version}
@#
@d pTeX_banner=='This is pTeX, Version 3.14159265',pTeX_version_string
@d pTeX_banner_k==pTeX_banner
@@ -1741,6 +1741,7 @@ else begin k:=loc; cur_chr:=buffer[k]; incr(k);
start_cs:
if (cat=letter)or(cat=kanji)or(cat=kana) then state:=skip_blanks
else if cat=spacer then state:=skip_blanks
+ else if cat=other_kchar then state:=mid_kanji
else state:=mid_line;
if cat=other_kchar then
begin cur_cs:=id_lookup(loc,k-loc); loc:=k; goto found;
diff --git a/Build/source/texk/web2c/ptexdir/ptex_version.h b/Build/source/texk/web2c/ptexdir/ptex_version.h
index 0cb61179fd4..fd37c05e52e 100644
--- a/Build/source/texk/web2c/ptexdir/ptex_version.h
+++ b/Build/source/texk/web2c/ptexdir/ptex_version.h
@@ -1 +1 @@
-#define PTEX_VERSION "p3.8.1"
+#define PTEX_VERSION "p3.8.2"
diff --git a/Build/source/texk/web2c/ptexdir/tests/control-symbol.tex b/Build/source/texk/web2c/ptexdir/tests/control-symbol.tex
index b9e34054443..a935e97cc74 100644
--- a/Build/source/texk/web2c/ptexdir/tests/control-symbol.tex
+++ b/Build/source/texk/web2c/ptexdir/tests/control-symbol.tex
@@ -74,6 +74,27 @@
\fi
\fi
+\message{■行末の和文コントロールシンボル}
+
+
+\kcatcode`】=18
+
+\def\】{◆}
+\def\@{◆}
+
+1. \】◇,\@◇
+
+2. \】%
+◇, \@%
+◇
+
+3. \】
+◇, \@
+◇
+
+4. \】 ◇, \@ ◇
+
+
\end