[Debian-tex-commits] SVN tetex-bin commit + diffs: r2079 - in tetex-bin/trunk/debian: . patches

Frank Küster frank at alioth.debian.org
Thu Dec 14 21:01:29 CET 2006


Author: frank
Date: 2006-12-14 21:01:28 +0100 (Thu, 14 Dec 2006)
New Revision: 2079

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/patches/patch-deb
   tetex-bin/trunk/debian/patches/patch-src
Log:
Do no longer patch dvipdfm to link against libpaper.  Instead, enhance
texconfig to handle more paper sizes for dvipdfm, dvips and pdftex.
This will allow to let a libpaper hook set the default paper size with
texconfig.


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-12-14 15:42:31 UTC (rev 2078)
+++ tetex-bin/trunk/debian/changelog	2006-12-14 20:01:28 UTC (rev 2079)
@@ -1,3 +1,12 @@
+tetex-bin (3.0-28~1) UNRELEASED; urgency=low
+
+  * Do no longer patch dvipdfm to link against libpaper.  Instead, enhance
+    texconfig to handle more paper sizes for dvipdfm, dvips and pdftex.
+    This will allow to let a libpaper hook set the default paper size with
+    texconfig. 
+
+ -- Frank Küster <frank at debian.org>  Thu, 14 Dec 2006 21:01:07 +0100
+
 tetex-bin (3.0-27) unstable; urgency=low
 
   * Apply patch by Julian Gilbey <jdg at debian.org> to prevent mktexlsr from

Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb	2006-12-14 15:42:31 UTC (rev 2078)
+++ tetex-bin/trunk/debian/patches/patch-deb	2006-12-14 20:01:28 UTC (rev 2079)
@@ -5,7 +5,7 @@
  texk/tetex/fmtutil         |   53 +++++++++-
  texk/tetex/fmtutil-sys     |   10 +-
  texk/tetex/fmtutil.man     |   19 +++
- texk/tetex/texconfig       |    7 -
+ texk/tetex/texconfig       |   83 ++++++++++++----
  texk/tetex/texconfig-sys   |    3 
  texk/tetex/texconfig.man   |  224 +++++++++++++++++++++++++++++++++++++++++++--
  texk/tetex/updmap          |   74 +++++++++++++-
@@ -14,12 +14,12 @@
  texk/web2c/cwebdir/cweb.1  |   10 +-
  texk/web2c/fmtutil.in      |    2 
  texk/web2c/man/Makefile.in |    1 
- 16 files changed, 417 insertions(+), 68 deletions(-)
+ 16 files changed, 474 insertions(+), 87 deletions(-)
 
 Index: trunk/configure
 ===================================================================
---- trunk.orig/configure	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/configure	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/configure	2006-12-07 17:39:17.000000000 +0100
++++ trunk/configure	2006-12-14 19:26:40.000000000 +0100
 @@ -4213,12 +4213,13 @@
  
  
@@ -42,8 +42,8 @@
  if test -z "$xdvik_standalone"; then
 Index: trunk/texk/kpathsea/mktexlsr
 ===================================================================
---- trunk.orig/texk/kpathsea/mktexlsr	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/kpathsea/mktexlsr	2006-12-06 23:34:13.000000000 +0100
+--- trunk.orig/texk/kpathsea/mktexlsr	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/kpathsea/mktexlsr	2006-12-14 19:26:40.000000000 +0100
 @@ -73,6 +73,7 @@
  '
    set x `kpsewhich --show-path=ls-R | tr : '
@@ -102,8 +102,8 @@
  exit 0
 Index: trunk/texk/make/paths.mk
 ===================================================================
---- trunk.orig/texk/make/paths.mk	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/make/paths.mk	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/make/paths.mk	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/make/paths.mk	2006-12-14 19:26:40.000000000 +0100
 @@ -47,7 +47,7 @@
  texmf = @texmfmain@
  
@@ -115,8 +115,8 @@
  texinputdir = $(texmf)/tex
 Index: trunk/texk/tetex/Makefile.in
 ===================================================================
---- trunk.orig/texk/tetex/Makefile.in	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/Makefile.in	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/tetex/Makefile.in	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/tetex/Makefile.in	2006-12-14 19:26:40.000000000 +0100
 @@ -35,7 +35,7 @@
  
  # Auxiliary files.
@@ -147,10 +147,34 @@
  	$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
 Index: trunk/texk/tetex/texconfig
 ===================================================================
---- trunk.orig/texk/tetex/texconfig	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/texconfig	2006-12-06 23:30:28.000000000 +0100
-@@ -883,8 +883,8 @@
+--- trunk.orig/texk/tetex/texconfig	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/tetex/texconfig	2006-12-14 19:47:16.000000000 +0100
+@@ -646,18 +646,20 @@
  
+     # texconfig dvipdfm
+     dvipdfm)
++      # add below new sizes if the dvipdfm sources have been patched
+       help="Usage: $progname dvipdfm paper PAPER
+ 
+ Valid PAPER settings:
+-  letter legal ledger tabloid a4 a3"
++  letter legal ledger tabloid a6 a5 a4 a3 a2 a1 a0 b6 b5 b4 b3 b5var"
++# larger than a3 missing in dvipdfm patch
+       case $2 in
+         # texconfig dvipdfm paper
+         paper-list)
+-          for p in letter legal ledger tabloid a4 a3; do echo $p; done
++          for p in letter legal ledger tabloid a6 a5 a4 a3 a2 a1 a0 b6 b5 b4 b3 b5var; do echo $p; done
+           ;;
+         paper)
+           case $3 in
+-            letter|legal|ledger|tabloid|a4|a3)
++            letter|legal|ledger|tabloid|a6|a5|a4|a3|a2|a1|a0|b6|b5|b4|b3|b5var)
+               fmgrConfigReplace config '^p' "p $3";;
+             "") echo "$help" >&2; rc=1;;
+             *)
+@@ -883,8 +885,8 @@
+ 
      faq)
        setupTexmfmain
 -      if test -f $MT_TEXMFMAIN/doc/tetex/teTeX-FAQ; then
@@ -160,7 +184,7 @@
        else
          echo "$progname: faq not found (usually in \$TEXMFMAIN/doc/tetex/teTeX-FAQ)" >&2
          rc=1
-@@ -923,6 +923,7 @@
+@@ -923,6 +925,7 @@
                if test -n "$tfc"; then
                  if test -w "$tfc"; then
                    configReplace "$tfc" '^VARTEXFONTS' "VARTEXFONTS  = $tcBatchFontVardir"
@@ -168,7 +192,7 @@
                  else
                    echo "$progname: setting up vardir failed. Reason: no permission to write file \`$tfc'" >&2
                    rc=1
-@@ -1067,7 +1068,7 @@
+@@ -1067,7 +1070,7 @@
                  fi
                  ;;
              esac
@@ -177,10 +201,108 @@
              if cmp "$tcBatchHFEdit" "$tcBatchHFOrig" >/dev/null 2>&1; then
                echo "$progname: configuration unchanged." >&2
              else
+@@ -1162,7 +1165,7 @@
+       help="Usage: $progname paper PAPER
+ 
+ Valid PAPER settings:
+-  letter a4"
++  letter legal ledger tabloid a6 a5 a4 a3 a2 a1 a0 b6 b5 b4 b3"
+ 
+       p=$2; pXdvi=$2; pDvips=$2
+       case $2 in
+@@ -1198,7 +1201,7 @@
+       help="Usage: $progname pdftex paper PAPER
+ 
+ Valid PAPER settings:
+-  a4 letter"
++  letter legal ledger tabloid a6 a5 a4 a3 a2 a1 a0 b6 b5 b4 b3"
+       case $2 in
+ 
+         mode)
+@@ -1229,29 +1232,65 @@
+           case $3 in
+             letter)
+               w="8.5 true in"; h="11 true in"
+-              setupTmpDir
+-              fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w"
+-              wChanged=$fmgrConfigReplaceChanged
+-              fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
+-              if $wChanged || $fmgrConfigReplaceChanged; then
+-                fmtutil --all
+-              fi
++              ;;
++            legal)
++              w="8.5 true in"; h="14 true in"
++              ;;
++            ledger)
++              w="11 true in"; h="17 true in"
++              ;;
++            tabloid)
++              w="17 true in"; h="11 true in"
++              ;;
++            a6)
++              w="105 true mm"; h="148 true mm"
++              ;;
++            a5)
++              w="148 true mm"; h="210 true mm"
+               ;;
+             a4)
+               w="210 true mm"; h="297 true mm"
+-              fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w"
+-              wChanged=$fmgrConfigReplaceChanged
+-              fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
+-              if $wChanged || $fmgrConfigReplaceChanged; then
+-                fmtutil --all
+-              fi
++              ;;
++            a3)
++              w="297 true mm"; h="420 true mm"
++              ;;
++            a2)
++              w="420 true mm"; h="594 true mm"
++              ;;
++            a1)
++              w="594 true mm"; h="841 true mm"
++              ;;
++            a0)
++              w="841 true mm"; h="1189 true mm"
++              ;;
++            b6)
++              w="125 true mm"; h="176 true mm"
++              ;;
++            b5)
++              w="176 true mm"; h="250 true mm"
++              ;;
++            b4)
++              w="250 true mm"; h="353 true mm"
++              ;;
++            b3)
++              w="353 true mm"; h="500 true mm"
+               ;;
+             "") echo "$help" >&2; rc=1;;
+             *)
+              echo "$progname: unknown PAPER \`$3' given as argument for \`$progname pdftex paper'" >&2
+              echo "$progname: try \`$progname pdftex paper' for help" >&2
+              rc=1 ;;
+-          esac ;;
++          esac 
++	  if [ $rc != 1 ]; then
++            setupTmpDir
++            fmgrConfigReplace pdftexconfig.tex pdfpagewidth '\pdfpagewidth='"$w"
++            wChanged=$fmgrConfigReplaceChanged
++            fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
++            if $wChanged || $fmgrConfigReplaceChanged; then
++              fmtutil --all
++            fi
++	  fi
++	  ;;
+         "")
+           echo "$help" >&2; rc=1;;
+         *)
 Index: trunk/texk/tetex/fmtutil
 ===================================================================
---- trunk.orig/texk/tetex/fmtutil	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/fmtutil	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/tetex/fmtutil	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/tetex/fmtutil	2006-12-14 19:26:40.000000000 +0100
 @@ -25,7 +25,13 @@
  #  --cnffile file             set configfile for fmtutil
  #  --fmtdir directory         set destination directory for format files
@@ -272,8 +394,8 @@
  
 Index: trunk/texk/tetex/fmtutil-sys
 ===================================================================
---- trunk.orig/texk/tetex/fmtutil-sys	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/fmtutil-sys	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/tetex/fmtutil-sys	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/tetex/fmtutil-sys	2006-12-14 19:26:40.000000000 +0100
 @@ -23,6 +23,12 @@
  
  TEXMFVAR="$v"
@@ -291,8 +413,8 @@
 +esac
 Index: trunk/texk/tetex/fmtutil.man
 ===================================================================
---- trunk.orig/texk/tetex/fmtutil.man	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/fmtutil.man	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/tetex/fmtutil.man	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/tetex/fmtutil.man	2006-12-14 19:26:40.000000000 +0100
 @@ -1,4 +1,4 @@
 -.TH "fmtutil" "8" "February 2005" "teTeX" "teTeX" 
 +.TH "fmtutil" "1" "February 2005" "teTeX" "teTeX"
@@ -332,8 +454,8 @@
  .PP 
 Index: trunk/texk/web2c/fmtutil.in
 ===================================================================
---- trunk.orig/texk/web2c/fmtutil.in	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/web2c/fmtutil.in	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/web2c/fmtutil.in	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/web2c/fmtutil.in	2006-12-14 19:26:40.000000000 +0100
 @@ -55,7 +55,7 @@
  
  # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -345,8 +467,8 @@
  # if you want babel support in pdfamstex:
 Index: trunk/texk/web2c/cwebdir/cweb.1
 ===================================================================
---- trunk.orig/texk/web2c/cwebdir/cweb.1	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/web2c/cwebdir/cweb.1	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/web2c/cwebdir/cweb.1	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/web2c/cwebdir/cweb.1	2006-12-14 19:26:40.000000000 +0100
 @@ -100,19 +100,19 @@
  .
  .SH FILES
@@ -374,8 +496,8 @@
  .SH "SEE ALSO"
 Index: trunk/texk/tetex/updmap.man
 ===================================================================
---- trunk.orig/texk/tetex/updmap.man	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/updmap.man	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/tetex/updmap.man	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/tetex/updmap.man	2006-12-14 19:26:40.000000000 +0100
 @@ -32,11 +32,20 @@
  line, \fBupdmap\fP will write generated map files to a directory of
  your choosing (via one of the \fB--*outputdir\fP options), or automatically
@@ -451,8 +573,8 @@
  .PP
 Index: trunk/texk/tetex/updmap
 ===================================================================
---- trunk.orig/texk/tetex/updmap	2006-12-06 23:30:28.000000000 +0100
-+++ trunk/texk/tetex/updmap	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/tetex/updmap	2006-12-14 19:26:40.000000000 +0100
++++ trunk/texk/tetex/updmap	2006-12-14 19:26:40.000000000 +0100
 @@ -15,6 +15,8 @@
  #   --nohash                   do not run texhash
  #   --nomkmap                  do not recreate map files
@@ -608,8 +730,8 @@
        enable)
 Index: trunk/texk/tetex/updmap-sys
 ===================================================================
---- trunk.orig/texk/tetex/updmap-sys	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/updmap-sys	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/tetex/updmap-sys	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/tetex/updmap-sys	2006-12-14 19:26:40.000000000 +0100
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -621,8 +743,8 @@
  exec updmap ${1+"$@"}
 Index: trunk/texk/tetex/texconfig-sys
 ===================================================================
---- trunk.orig/texk/tetex/texconfig-sys	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/texconfig-sys	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/tetex/texconfig-sys	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/tetex/texconfig-sys	2006-12-14 19:26:40.000000000 +0100
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -634,8 +756,8 @@
  exec texconfig ${1+"$@"}
 Index: trunk/texk/web2c/man/Makefile.in
 ===================================================================
---- trunk.orig/texk/web2c/man/Makefile.in	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/web2c/man/Makefile.in	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/web2c/man/Makefile.in	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/web2c/man/Makefile.in	2006-12-14 19:26:40.000000000 +0100
 @@ -38,7 +38,6 @@
  	dvicopy.1	\
  	dvitomp.1	\
@@ -646,8 +768,8 @@
  	gftopk.1	\
 Index: trunk/texk/tetex/texconfig.man
 ===================================================================
---- trunk.orig/texk/tetex/texconfig.man	2006-12-06 23:30:24.000000000 +0100
-+++ trunk/texk/tetex/texconfig.man	2006-12-06 23:30:28.000000000 +0100
+--- trunk.orig/texk/tetex/texconfig.man	2006-12-07 17:39:17.000000000 +0100
++++ trunk/texk/tetex/texconfig.man	2006-12-14 19:26:40.000000000 +0100
 @@ -6,22 +6,230 @@
  .SH SYNOPSIS
  .B texconfig

Modified: tetex-bin/trunk/debian/patches/patch-src
===================================================================
--- tetex-bin/trunk/debian/patches/patch-src	2006-12-14 15:42:31 UTC (rev 2078)
+++ tetex-bin/trunk/debian/patches/patch-src	2006-12-14 20:01:28 UTC (rev 2079)
@@ -1,46 +1,12 @@
- texk/dvipdfm/Makefile.in |    7 +++++--
- texk/dvipdfm/dvipdfm.1   |    3 ++-
- texk/dvipdfm/dvipdfm.c   |   38 ++++++++++++++++++++++++++++++--------
- 3 files changed, 37 insertions(+), 11 deletions(-)
+ texk/dvipdfm/dvipdfm.1 |    3 ++-
+ texk/dvipdfm/dvipdfm.c |   33 +++++++++++++++++++++++++--------
+ 2 files changed, 27 insertions(+), 9 deletions(-)
 
-Index: tetex-bin-3.0/texk/dvipdfm/Makefile.in
+Index: trunk/texk/dvipdfm/dvipdfm.c
 ===================================================================
---- tetex-bin-3.0.orig/texk/dvipdfm/Makefile.in	2006-03-02 14:46:40.000000000 +0100
-+++ tetex-bin-3.0/texk/dvipdfm/Makefile.in	2006-03-02 16:10:18.000000000 +0100
-@@ -12,7 +12,10 @@
- LIBPNGDEP = @LIBPNGDEP@
- LDLIBPNG = @LDLIBPNG@
- 
--LD_ALL_LIBS = $(LDLIBPNG) $(LDZLIB)
-+#PAPERLIBDEP = "-L /usr/lib"
-+LDLIBPAPER = "-lpaper"
-+
-+LD_ALL_LIBS = $(LDLIBPNG) $(LDZLIB) $(LDLIBPAPER)
- ALL_LIBS_DEP = $(ZLIBDEP) $(LIBPNGDEP)
- 
- program = dvipdfm
-@@ -29,7 +32,7 @@
- 	pngimage.o
- 
- $(program): $(objects) $(kpathsea) $(ALL_LIBS_DEP)
--	$(kpathsea_link) $(objects) $(LD_ALL_LIBS) $(LOADLIBES)
-+	$(kpathsea_link) $(objects) $(LD_ALL_LIBS) $(LOADLIBES) -lpaper
- 
- ebb: $(eobjects) $(kpathsea) $(ALL_LIBS_DEP)
- 	$(kpathsea_link) $(eobjects) $(LD_ALL_LIBS) $(LOADLIBES)
-Index: tetex-bin-3.0/texk/dvipdfm/dvipdfm.c
-===================================================================
---- tetex-bin-3.0.orig/texk/dvipdfm/dvipdfm.c	2006-03-02 14:46:40.000000000 +0100
-+++ tetex-bin-3.0/texk/dvipdfm/dvipdfm.c	2006-03-02 16:10:18.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <limits.h>
- #include <ctype.h>
-+#include <paper.h>
- #include "config.h"
- #include "system.h"
- #include "mem.h"
-@@ -62,23 +63,35 @@
+--- trunk.orig/texk/dvipdfm/dvipdfm.c	2006-12-14 19:54:48.000000000 +0100
++++ trunk/texk/dvipdfm/dvipdfm.c	2006-12-14 20:56:15.000000000 +0100
+@@ -62,23 +62,40 @@
    {"legal" , { 612.0, 1008.0}},
    {"ledger" , { 1224.0, 792.0}},
    {"tabloid" , { 792.0, 1224.0}},
@@ -49,11 +15,16 @@
    {"a4" , { 595.27, 841.82}},
 -  {"a3" , { 841.82, 1190.16}}};
 +  {"a3" , { 841.82, 1190.16}},
++  {"a2" , { 1190.16, 1683.76}},
++  {"a1" , { 1682.76, 2383.91}},
++  {"a0" , { 2383.91, 3370.36}},
 +  {"b6" , { 364.25, 515.91}},
 +  {"b5" , { 515.91, 728.50}},
 +  {"b4" , { 728.50, 1031.81}},
 +  {"b3" , { 1031.81, 1457.00}},
 +  {"b5var" , { 515.91, 651.97}}};
++/* The unit used is 0.35278 mm, whatever that is */
++/* If you add sizes, also add them in texconfig (look for "dvipdfm sources") */
  
 -static rect get_paper_size (char *string)
 +static rect get_paper_size (char *string, int error_flag)
@@ -79,7 +50,7 @@
  char *dvi_filename = NULL, *pdf_filename = NULL;
  static void set_default_pdf_filename(void)
  {
-@@ -113,7 +126,8 @@
+@@ -113,7 +130,8 @@
     fprintf (stdout, "-l \t\tLandscape mode\n");
     fprintf (stdout, "-m number\tSet additional magnification\n");
     fprintf (stdout, "-p papersize\tSet papersize (letter, legal,\n");
@@ -89,7 +60,7 @@
     fprintf (stdout, "-r resolution\tSet resolution (in DPI) for raster fonts [600]\n");
     fprintf (stdout, "-s pages\tSelect page ranges (-)\n");
     fprintf (stdout, "-t      \tEmbed thumbnail images\n");
-@@ -367,7 +381,7 @@
+@@ -367,7 +385,7 @@
  	  struct rect paper_size;
  	  if (argc < 2)
  	    ERROR ("Missing paper size");
@@ -98,7 +69,7 @@
  	  paper_width = paper_size.width;
  	  paper_height = paper_size.height;
  	  pop_arg();
-@@ -507,8 +521,7 @@
+@@ -507,8 +525,7 @@
    psimage_close();
  }
  
@@ -108,29 +79,19 @@
  {
    char *full_config_name, *start, *end;
    char *argv[2], *option;
-@@ -578,8 +591,17 @@
-   argv+=1;
+@@ -579,7 +596,7 @@
    argc-=1;
  
-+  {
-+    rect paper_size = get_paper_size (systempapername (), 0);
-+    if (paper_size.width != 0) {
-+      paper_width = paper_size.width;
-+      paper_height = paper_size.height;
-+    }
-+  }
    /* Process config file, if any */
 -  read_config_file();
-+  /* yes, in Debian there are two: config and an additional fontmaps file */
 +  read_config_file("config");
-+  read_config_file("fontmaps");
  
    do_args (argc, argv);
  
-Index: tetex-bin-3.0/texk/dvipdfm/dvipdfm.1
+Index: trunk/texk/dvipdfm/dvipdfm.1
 ===================================================================
---- tetex-bin-3.0.orig/texk/dvipdfm/dvipdfm.1	2006-03-02 14:46:40.000000000 +0100
-+++ tetex-bin-3.0/texk/dvipdfm/dvipdfm.1	2006-03-02 16:10:18.000000000 +0100
+--- trunk.orig/texk/dvipdfm/dvipdfm.1	2006-12-14 19:54:48.000000000 +0100
++++ trunk/texk/dvipdfm/dvipdfm.1	2006-12-14 19:58:04.000000000 +0100
 @@ -139,7 +139,8 @@
  .TP 5
  .B \-\^p " paper"




More information about the Debian-tex-commits mailing list