summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2022-02-13 14:23:47 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2022-02-13 14:23:47 +0000
commitc792c4fcd935edbc5fb78b4f5d1df84aee0ea1ba (patch)
tree7e1db9909dd253847182f3d7215fed929c73f8e3 /Build/source/texk
parent7bbc9db598fce8e99ed1ac2b37e2eb4669f54afb (diff)
ptexdir, uptexdir: sync with upstream
git-svn-id: svn://tug.org/texlive/trunk@62001 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/ptexdir/pbibtex.ch32
-rw-r--r--Build/source/texk/web2c/ptexdir/ptex-base.ch8
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/uptexdir/upbibtex.ch4
5 files changed, 47 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index d854aa2b4f0..52c58cfd539 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,10 @@
+2022-02-13 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * ptex-base.ch: \write18 in '^^' format. (Thanks Yukimasa Morimi)
+ * pbibtex.ch: Do not break at white_space after Japanese
+ characters. Version j0.34.
+ https://github.com/texjporg/pbibtex-manual/issues/1
+
2022-02-05 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* ptex-base.ch: Fix for \write18 with quotation.
diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.ch b/Build/source/texk/web2c/ptexdir/pbibtex.ch
index 7911b7f0064..d1bcc9a554d 100644
--- a/Build/source/texk/web2c/ptexdir/pbibtex.ch
+++ b/Build/source/texk/web2c/ptexdir/pbibtex.ch
@@ -19,13 +19,20 @@
% 10/30/92 last update for JBibTeX 0.31 for bug fix by Shouichi Matsui
% 11/02/94 Version 0.32 for use with web2c 6.1, by Takafumi Sakurai
%
+% 2002 Version 0.33 add kanji option by ASCII Corporation
+%
% 2009 pTeXenc, pbibtex N. Tsuchimura
+% 2010 Version 0.99d of BibTeX for TeX Live
+%
+% 2022-02-08 Version 0.34 by H. Yamashita
+% Do not break at white space after Japanese, to preserve spacing
+% within BIB entry spacing to BBL for subsequent pTeX line-end operations
@x [0] only print chnages
\def\title{\BibTeX\ }
@y
\let\maybe=\iffalse
-\def\title{J\BibTeX\ 0.33 Changes for C Version \BibTeX\ }
+\def\title{J\BibTeX\ 0.34 Changes for C Version \BibTeX\ }
@z
@x
@@ -35,7 +42,7 @@
@y
\def\titlepage{F}
\centerline{\:\titlefont The {\:\ttitlefont J\BibTeX} preprocessor}
- \vskip 15pt \centerline{(Version 0.33 based on C Version \BibTeX 0.99d---\today)} \vfill}
+ \vskip 15pt \centerline{(Version 0.99d-j0.34---\today)} \vfill}
@z
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -46,7 +53,7 @@
@d banner=='This is BibTeX, Version 0.99d' {printed when the program starts}
@y
@d my_name=='pbibtex'
-@d banner=='This is pBibTeX, Version 0.99d-j0.33'
+@d banner=='This is pBibTeX, Version 0.99d-j0.34'
{printed when the program starts}
@z
@@ -233,6 +240,25 @@ init_kanji;
parse_arguments;
@z
+% pBibTeX: do not break at |white_space| after Japanese characters
+@x "Break that line"
+while ((lex_class[out_buf[out_buf_ptr]] <> white_space) and
+ (out_buf_ptr >= min_print_line)) do
+ decr(out_buf_ptr);
+@y
+while (((lex_class[out_buf[out_buf_ptr]] <> white_space) or
+ (out_buf[out_buf_ptr-1] > 127)) and (out_buf_ptr >= min_print_line)) do
+ decr(out_buf_ptr);
+@z
+@x "Break that unbreakably long line"
+ if (lex_class[out_buf[out_buf_ptr]] <> white_space) then
+ incr(out_buf_ptr)
+@y
+ if (lex_class[out_buf[out_buf_ptr]] <> white_space) or
+ (out_buf[out_buf_ptr-1] > 127) then
+ incr(out_buf_ptr)
+@z
+
@x Changes for JBibTeX by Shouichi Matsui [332]
@!b_write : hash_loc; {\.{write\$}}
@!b_default : hash_loc; {either \.{skip\$} or \.{default.type}}
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index 6a85178de99..6474d56cf30 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -2868,7 +2868,7 @@ if #<>0 then
@d append_to_name(#)==begin c:=#; if not (c="""") then append_to_name_char(c); end
-@d append_to_name_str_pool(#)==begin
+@d append_to_name_escape(#)==begin
if (#)>=@"100 then begin
c:=(#)-@"100;
append_to_name_char(c);
@@ -2879,10 +2879,12 @@ if #<>0 then
append_to_name_char("^");
append_to_name_hex(c div 16);
append_to_name_hex(c mod 16);
- end else if not (c="""") then
+ end else
append_to_name_char(c);
end
end
+
+@d append_to_name_str_pool(#)==if not ((#)="""") then append_to_name_escape(#)
@z
@x l.10389
@@ -6743,7 +6745,7 @@ end
name_of_file := xmalloc(cur_length*4+1);
k := 0;
for d:=0 to cur_length-1 do
- append_to_name_char(str_pool[str_start[str_ptr]+d]); {do not remove quote}
+ append_to_name_escape(str_pool[str_start[str_ptr]+d]); {do not remove quote}
name_of_file[k+1] := 0;
runsystem_ret := runsystem(conststringcast(name_of_file+1));
@z
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 242537d6007..40ed817d46b 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2022-02-13 Hironobu Yamashita <h.y.acetaminophen@gmail.com>
+
+ * upbibtex.ch: Adapt to pbibtex.ch (version number).
+
2022-02-05 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* uptex.defines: Add isterminalUTF8.
diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch
index 4e069441db9..d40bcc85dd2 100644
--- a/Build/source/texk/web2c/uptexdir/upbibtex.ch
+++ b/Build/source/texk/web2c/uptexdir/upbibtex.ch
@@ -1,9 +1,9 @@
@x
@d my_name=='pbibtex'
-@d banner=='This is pBibTeX, Version 0.99d-j0.33'
+@d banner=='This is pBibTeX, Version 0.99d-j0.34'
@y
@d my_name=='upbibtex'
-@d banner=='This is upBibTeX, Version 0.99d-j0.33-u1.28'
+@d banner=='This is upBibTeX, Version 0.99d-j0.34-u1.28'
@z
@x