Bug#323624: fig2sty: festure request: pdflatex + better layout

[nokos]

Package: fig2sty
Version: 1:0.1-6
Severity: minor
Tags: patch

fig2sty does not work with pdflatex, and the background does not have
the same geometry as in xfig.

patch: better pt2fig<->fig2pt, background in eps and pdf, and reasonable
default for baselineskip

-- System Information:
Debian Release: testing/unstable
  APT prefers hoary-security
  APT policy: (500, 'hoary-security'), (500, 'hoary'), (500, 'unstable'), (500, 
'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12.1
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages fig2sty depends on:
ii  perl                          5.8.7-4    Larry Wall's Practical Extraction 

fig2sty recommends no packages.

-- no debconf information
-- 
nokos <[EMAIL PROTECTED]>

--- fig2sty.old 2005-07-26 16:53:15.000000000 +0200
+++ fig2sty     2005-08-13 18:44:36.000000000 +0200
@@ -218,7 +218,7 @@
 use Getopt::Long;
 
 my $debug = 0;
-my $defbaselineskip = 12;
+my $defbaselineskip = "any";
 my $deffontsize     = 12;
 my $defreference    = 'grid';
 my $defoffset       = 0;
@@ -244,7 +244,7 @@
 die "Unknown extension $extension" 
   if ($jobname && ($extension !~ /^fig$/));
 my $texname    = "$jobname.sty";
-my $background = "${jobname}back.ps";
+my $background = "${jobname}back";
 
 if ($debug) {
   print STDERR "jobname    : $jobname\n";
@@ -294,8 +294,6 @@
 my %vinfo = ();    # vertical info
 my @hinfo = ();    # horizontal info ([indentation, linewidth] ...)
 my $baselineskip;
-my $figscale;      # FIG version dependent scaling factor
-$figscale = ($fig->{'version'} > '3.1')?0.95:1.0;
 
 # Write style header
 print TEX <<"EOTEX";
@@ -333,6 +331,7 @@
 %   \\parbox\{$hinfo->[0]pt\}\\bgroup
   \\hsize=$hinfo->[0]pt
   \\setlength\{\\textwidth\}\{$hinfo->[0]pt\}
+  \\setlength\{\\columnwidth\}\{$hinfo->[0]pt\}
 EOTEX
 
   } else {                             # complex frame -> parshape
@@ -367,7 +366,7 @@
 
 # Placement of frames
 print TEX "\{\\setbox1=\\vbox\{\\noindent",
-          "\\includegraphics\[scale=$figscale\]\{$background\}\}\n",
+          "\\includegraphics\{$background\}\}\n",
           "\\dimendef\\w=0 \\w=\\wd1\n",
           "\\dimendef\\h=0 \\h=\\ht1\n",
           "\\splittopskip=0pt\n",
@@ -399,10 +398,12 @@
   my $tmpfile;
   $tmpfile = "/tmp/fig2sty$$.tmp";
   $fig->writefile(">$tmpfile");
-  `$fig2dev -Leps -p dummy $tmpfile > $background`;
+  `$fig2dev -Leps -p dummy $tmpfile > $background.eps`;
+  `$fig2dev -Lpdf -p dummy $tmpfile > $background.pdf`;
   unlink $tmpfile;
 } else {
-  $fig->writefile("|$fig2dev -Leps -p dummy > $background");
+  $fig->writefile("|$fig2dev -Leps -p dummy > $background.eps");
+  $fig->writefile("|$fig2dev -Lpdf -p dummy > $background.pdf");
   die "fig2dev failed" if $?;
 };
 
@@ -627,10 +628,18 @@
 # Conversion pt <-> fig
 sub pt2fig {
   my $pts = shift;
-  return $pts * $fig->{'resolution'} / 72.27;
+  if ($fig->{'version'} > '3.1') {
+    return $pts * $fig->{'resolution'} / 76;
+  } else {
+    return $pts * $fig->{'resolution'} / 72.27;
+  }
 }
 
 sub fig2pt {
   my $figs = shift;
-  return $figs * 72.27 / $fig->{'resolution'};
+  if ($fig->{'version'} > '3.1') {
+    return $figs * 76 / $fig->{'resolution'};
+  } else {
+    return $figs * 72.27 / $fig->{'resolution'};
+  }
 }