summary refs log tree commit diff
path: root/gnu/packages/patches/dblatex-remove-multirow.patch
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-07-09 16:20:38 +0200
committerRicardo Wurmus <rekado@elephly.net>2017-07-09 17:07:39 +0200
commitb81dd94a790636fea9ac59ad1c63d78420fad54a (patch)
tree1e79bda04e53aec091d373d6c7debf450e34705a /gnu/packages/patches/dblatex-remove-multirow.patch
parentf45a5520383e227c9e3f5c106595e623f742b43f (diff)
downloadguix-b81dd94a790636fea9ac59ad1c63d78420fad54a.tar.gz
gnu: dblatex: Use texlive-union.
* gnu/packages/patches/dblatex-remove-multirow.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/docbook.scm (dblatex)[source]: Use patch.
[inputs]: Replace "texlive" with a texlive-union.
Diffstat (limited to 'gnu/packages/patches/dblatex-remove-multirow.patch')
-rw-r--r--gnu/packages/patches/dblatex-remove-multirow.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/gnu/packages/patches/dblatex-remove-multirow.patch b/gnu/packages/patches/dblatex-remove-multirow.patch
new file mode 100644
index 0000000000..62d1c64e08
--- /dev/null
+++ b/gnu/packages/patches/dblatex-remove-multirow.patch
@@ -0,0 +1,30 @@
+This patch is needed to fix dblatex with newer versions of TeX Live.
+It was taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=840189
+
+--- a/latex/style/dbk_table.sty	Sun Oct 02 23:21:03 2016 +0200
++++ b/latex/style/dbk_table.sty	Mon Oct 10 21:31:00 2016 +0200
+@@ -9,7 +9,6 @@
+ \usepackage{longtable}
+ \usepackage{lscape}
+ \usepackage{colortbl}
+-\usepackage{multirow}
+ \usepackage{calc}
+ \usepackage{hhline}
+
+@@ -21,16 +20,6 @@
+   \expandafter[\expandafter3\expandafter]\expandafter{%
+   \multicolumn{#1}{#2}{#3}}
+
+-% Make \@xmultirow long
+-\expandafter\long\expandafter\def%
+-\expandafter\@xmultirow%
+-\expandafter#\expandafter1%
+-\expandafter[\expandafter#\expandafter2\expandafter]%
+-\expandafter#\expandafter3%
+-\expandafter[\expandafter#\expandafter4\expandafter]%
+-\expandafter#\expandafter5%
+-\expandafter{\@xmultirow{#1}[#2]{#3}[#4]{#5}}
+-
+ % For the newtbl code
+ \newdimen\newtblstarfactor%
+ \newdimen\newtblsparewidth%