[arch-commits] Commit in texlive-bin/trunk (2 files)

[Rémy Oudompheng]

    Date: Wednesday, July 18, 2012 @ 02:07:56
  Author: remy
Revision: 163719

upgpkg: texlive-bin 2012.0-2

Sort backup array, add patch to fix Luatex bug
with radicals.

Added:
  texlive-bin/trunk/luatex-r4449-radical-rule-thickness.patch
Modified:
  texlive-bin/trunk/PKGBUILD

-------------------------------------------+
 PKGBUILD                                  |   22 +++++++++++++---------
 luatex-r4449-radical-rule-thickness.patch |   23 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-18 03:05:26 UTC (rev 163718)
+++ PKGBUILD	2012-07-18 06:07:56 UTC (rev 163719)
@@ -4,7 +4,7 @@
 
 pkgname=texlive-bin
 pkgver=2012.0
-pkgrel=1
+pkgrel=2
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -22,19 +22,19 @@
         'poppler-0.20.patch'
         'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz'
         'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz'
+        'luatex-r4449-radical-rule-thickness.patch'
 )
 backup=(etc/texmf/web2c/texmf.cnf \
-  etc/texmf/chktex/chktexrc \
-	etc/texmf/web2c/mktex.cnf \
-	etc/texmf/web2c/updmap.cfg \
-	etc/texmf/web2c/fmtutil.cnf \
+    etc/texmf/chktex/chktexrc \
+	etc/texmf/dvipdfm/config/config \
+	etc/texmf/dvipdfmx/dvipdfmx.cfg \
+	etc/texmf/dvips/config/config.ps \
 	etc/texmf/tex/generic/config/language.dat \
 	etc/texmf/tex/generic/config/language.def \
 	etc/texmf/tex/generic/config/pdftexconfig.tex \
 	etc/texmf/ttf2pk/ttf2pk.cfg \
-	etc/texmf/dvips/config/config.ps \
-	etc/texmf/dvipdfmx/dvipdfmx.cfg \
-	etc/texmf/dvipdfm/config/config \
+	etc/texmf/web2c/fmtutil.cnf \
+	etc/texmf/web2c/mktex.cnf \
 	etc/texmf/xdvi/XDvi)
 
 md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
@@ -42,7 +42,8 @@
          '393a4bf67adc7ca5df2b386759d1a637'
          'e3a664d5a7f0923f35060fe9d25d2573'
          'ac2c3c3aa765581f8504e21a5edbfb9f'
-         'f315a860158cfc952c82a6d759961024')
+         'f315a860158cfc952c82a6d759961024'
+         '5190f3295eb9a604c5f17f5bd607299b')
 
 build() {
    if [ "${CARCH}" = "x86_64" ]; then
@@ -55,6 +56,9 @@
    patch -Np0 -i fix-fontforge-encoding.patch
    # fix build with poppler >= 0.20
    patch -Np0 -i poppler-0.20.patch
+   # fix radical rule thickness regression in Luatex
+   # http://tex.stackexchange.com/q/61952/729
+   patch -Np0 -i luatex-r4449-radical-rule-thickness.patch
    # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251)
    sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c
    #############################################################

Added: luatex-r4449-radical-rule-thickness.patch
===================================================================
--- luatex-r4449-radical-rule-thickness.patch	                        (rev 0)
+++ luatex-r4449-radical-rule-thickness.patch	2012-07-18 06:07:56 UTC (rev 163719)
@@ -0,0 +1,23 @@
+Index: source/texk/web2c/luatexdir/tex/mlist.w
+===================================================================
+--- source/texk/web2c/luatexdir/tex/mlist.w	(revision 4448)
++++ source/texk/web2c/luatexdir/tex/mlist.w	(revision 4449)
+@@ -1798,7 +1798,17 @@
+         theta = fraction_rule(cur_style);
+         y = var_delimiter(left_delimiter(q), cur_size,
+                           height(x) + depth(x) + clr + theta, NULL, cur_style);
+-        theta = height(y);
++	/* If |y| is a composite then set |theta| to the height of its top
++           character, else set it to the height of |y|. */
++        if (list_ptr(y) != null
++            && type(list_ptr(y)) == hlist_node
++            && list_ptr(list_ptr(y)) != null
++            && type(list_ptr(list_ptr(y))) == glyph_node) {     /* and it should be */
++            theta = char_height(font(list_ptr(list_ptr(y))),
++                           character(list_ptr(list_ptr(y))));
++        } else {
++            theta = height(y);
++        }
+     } else {
+         y = var_delimiter(left_delimiter(q), cur_size,
+                           height(x) + depth(x) + clr + theta, NULL, cur_style);