find and correct the real double counting culprit

diff --git a/Makefile b/Makefile
index 8847cde..cc1e679 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -143,8 +143,6 @@ help:
        @echo "                   install-rt install-texmf"
        @echo "                   install-selfservice update-selfservice"
        @echo
-       @echo "                   install-texmf-forced"
-       @echo
        @echo "                   dev dev-docs dev-perl-modules"
        @echo
        @echo "                   masondocs alldocs docs"
@@ -240,12 +238,6 @@ dev-perl-modules: perl-modules
        ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
 install-texmf: 
-       test -e `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty || \
-       install -D -o freeside -m 444 etc/fslongtable.sty \
-          `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
-       texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`
-
-install-texmf-forced:  
        install -D -o freeside -m 444 etc/fslongtable.sty \
           `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
        texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`

diff --git a/conf/invoice_latex b/conf/invoice_latex
index aaec6be..6f3665a 100644 (file)
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -209,7 +209,6 @@
 %\r
 %\r
 %\r
-[@-- $coupon ? '\enlargethispage{-\extracouponspace}' : '' --@]\r
 \addressinset \rule{0.5cm}{0cm} \r
 \makebox{\r
 \begin{minipage}[t]{7.0cm}\r

diff --git a/etc/fslongtable.sty b/etc/fslongtable.sty
index 543169d..fadbed4 100644 (file)
--- a/etc/fslongtable.sty
+++ b/etc/fslongtable.sty
@@ -138,7 +138,6 @@
   \advance\dimen@ \ht\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi
   \advance\dimen@ \dp\ifvoid\LT@firsthead\LT@head\else\LT@firsthead\fi
   \advance\dimen@ \ht\LT@foot
-  \advance\dimen@ \LTextracouponspace
   \dimen@ii\vfuzz
   \vfuzz\maxdimen
     \setbox\tw@\copy\z@
@@ -153,7 +152,7 @@
   \ifdim \dimen@>\z@\vfil\break\fi
       \global\@colroom\@colht
   \ifnum\thepage=1
-    \advance\vsize-\LTextracouponspace
+    \dimen@\pagegoal\advance\dimen@-\LTextracouponspace\pagegoal\dimen@
   \fi
   \ifvoid\LT@foot\else
     \advance\vsize-\ht\LT@foot