diff options
| author | Mark Wells <mark@freeside.biz> | 2012-09-27 23:55:47 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2012-09-27 23:55:47 -0700 |
| commit | 6656228b824a35b8f23b428b952c26bf16377bc9 (patch) | |
| tree | 65e91ff6f7df074e4b1c77ba1df556c0f0106ed3 | |
| parent | 27d155eb475ed1c22ee565aa0e743468a1f6d36c (diff) | |
fix caption/longtable conflict with modern LaTeX installs, #13908
| -rw-r--r-- | FS/FS/Upgrade.pm | 9 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | conf/invoice_latex | 2 | ||||
| -rw-r--r-- | etc/longtable.sty (renamed from etc/fslongtable.sty) | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm index aabc4e72f..400bacc71 100644 --- a/FS/FS/Upgrade.pm +++ b/FS/FS/Upgrade.pm @@ -64,6 +64,15 @@ sub upgrade_config { upgrade_overlimit_groups($conf); map { upgrade_overlimit_groups($conf,$_->agentnum) } qsearch('agent', {}); + # change 'fslongtable' to 'longtable' + foreach my $name (qw(invoice_latex)) { + my $value = join("\n",$conf->config($name)); + if (length($value)) { + $value =~ s/fslongtable/longtable/g; + $conf->set($name, $value); + } + } + } sub upgrade_overlimit_groups { @@ -245,9 +245,9 @@ dev-perl-modules: perl-modules ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS install-texmf: - install -D -o freeside -m 444 etc/fslongtable.sty \ - `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty - texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL` + install -D -o freeside -m 444 etc/longtable.sty \ + ~freeside/texmf/tex/longtable.sty + texhash ~freeside install-init: #[ -e ${INIT_FILE} ] || install -o root -g ${INSTALLGROUP} -m 711 init.d/freeside-init ${INIT_FILE} diff --git a/conf/invoice_latex b/conf/invoice_latex index 772c2eb95..d56a7fbdc 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -19,7 +19,7 @@ \documentclass[letterpaper]{article}
-\usepackage{fancyhdr,lastpage,ifthen,array,fslongtable,afterpage,caption,multirow,bigstrut}
+\usepackage{fancyhdr,lastpage,ifthen,array,longtable,afterpage,caption,multirow,bigstrut}
\usepackage{graphicx} % required for logo graphic
\usepackage[utf8]{inputenc} % multilanguage support
\usepackage[T1]{fontenc}
diff --git a/etc/fslongtable.sty b/etc/longtable.sty index e322b55f1..66e2bf9d0 100644 --- a/etc/fslongtable.sty +++ b/etc/longtable.sty @@ -1,5 +1,5 @@ %% -%% This is file `fslongtable.sty', +%% This is file `longtable.sty', %% %% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 %% The LaTeX3 Project and any individual authors listed elsewhere |