[texlive-bin] 03/03: fix check_box bug in ptex (upstream svn 41295)
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-bin.
commit 88e8603a847c497c3965d05be65c7e4940106ce8
Author: Norbert Preining <preining@debian.org>
Date: Mon Jun 13 11:28:26 2016 +0900
fix check_box bug in ptex (upstream svn 41295)
---
debian/changelog | 7 ++-
debian/patches/series | 1 +
debian/patches/upstream-svn41295-fix-ptex-checkbox | 65 ++++++++++++++++++++++
3 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ac89ab4..dbf61c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
texlive-bin (2016.20160513.41080-3~1) UNRELEASED; urgency=medium
* UNRELEASED
- * fix pdftex segfault on pdfmatch invocations
+ * fix pdftex segfault on pdfmatch invocations (upstream svn 41418)
* rename SOURCE_DATE_EPOCH_TEX_PRIMITIVES to FORCE_SOURCE_DATE
- as requested by reproducible-build.
+ as requested by reproducible-build. (upstream svn 41417)
+ * fix check_box bug in ptex (upstream svn 41295)
- -- Norbert Preining <preining@debian.org> Sat, 11 Jun 2016 20:33:43 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 13 Jun 2016 11:27:06 +0900
texlive-bin (2016.20160513.41080-2) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 9b9df2e..52f075d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,6 @@ fix-format-gcc-errors
fix-mktexlsr-bashims
upupstream-xdvi-desktop-file
SDE-support-for-luatex
+upstream-svn41295-fix-ptex-checkbox
upstream-svn41417-rename-sdetp
upstream-svn41418-pdftex-match-fix
diff --git a/debian/patches/upstream-svn41295-fix-ptex-checkbox b/debian/patches/upstream-svn41295-fix-ptex-checkbox
new file mode 100644
index 0000000..6f43857
--- /dev/null
+++ b/debian/patches/upstream-svn41295-fix-ptex-checkbox
@@ -0,0 +1,65 @@
+ptex fix for bug in check_box
+---
+ texk/web2c/ptexdir/ChangeLog | 5 +++++
+ texk/web2c/ptexdir/ptex-base.ch | 21 ++++++++++++++++++++-
+ texk/web2c/ptexdir/ptex_version.h | 2 +-
+ 3 files changed, 26 insertions(+), 2 deletions(-)
+
+--- texlive-bin.orig/texk/web2c/ptexdir/ChangeLog
++++ texlive-bin/texk/web2c/ptexdir/ChangeLog
+@@ -1,3 +1,8 @@
++2016-06-06 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
++
++ * ptex-base.ch: Fix a bug in check_box().
++ ptex_version.h: pTeX version p3.7.1.
++
+ 2016-03-04 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
+
+ * ptex-base.ch: Add new primitives \textbaselineshiftfactor (=1000),
+--- texlive-bin.orig/texk/web2c/ptexdir/ptex-base.ch
++++ texlive-bin/texk/web2c/ptexdir/ptex-base.ch
+@@ -54,12 +54,14 @@
+ % (2015-09-10) AK pTeX p3.7 Bug fix by Hironori Kitagawa in flushing choice node.
+ % (2016-03-04) AK Hironori Kitagawa added new primitives to improve typesetting
+ % with non-vanishing \ybaselineshift.
++% (2016-06-06) AK Hironori Kitagawa fixed a bug in check_box(box_p:pointer).
++% pTeX p3.7.1.
+ %
+ @x [1.2] l.200 - pTeX:
+ @d banner==TeX_banner
+ @d banner_k==TeX_banner_k
+ @y
+-@d pTeX_version_string=='-p3.7' {current p\TeX\ version}
++@d pTeX_version_string=='-p3.7.1' {current p\TeX\ version}
+ @#
+ @d pTeX_banner=='This is pTeX, Version 3.14159265',pTeX_version_string
+ @d pTeX_banner_k==pTeX_banner
+@@ -6502,6 +6504,23 @@
+ last_char:=p; flag:=true;
+ end
+ else do_nothing; {\.{\\beginR} etc.}
++ kern_node:
++ if subtype(p)=acc_kern then
++ begin p:=link(p);
++ if is_char_node(p) then
++ if font_dir[font(p)]<>dir_default then p:=link(p);
++ p:=link(link(p));
++ if find_first_char then
++ begin find_first_char:=false; first_char:=p;
++ end;
++ last_char:=p; flag:=true;
++ if font_dir[font(p)]<>dir_default then p:=link(p);
++ end
++ else
++ begin flag:=true;
++ if find_first_char then find_first_char:=false
++ else last_char:=null;
++ end;
+ othercases begin flag:=true;
+ if find_first_char then find_first_char:=false
+ else last_char:=null;
+--- texlive-bin.orig/texk/web2c/ptexdir/ptex_version.h
++++ texlive-bin/texk/web2c/ptexdir/ptex_version.h
+@@ -1 +1 @@
+-#define PTEX_VERSION "p3.7"
++#define PTEX_VERSION "p3.7.1"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-bin.git
Reply to: