*** texexpand.pin	Tue Jun 21 11:29:02 2005
--- texexpand.pin.orig	Tue Jun 21 11:28:23 2005
***************
*** 401,406 ****
--- 401,408 ----
      &process_do_include(split(/$envkey/,$ENV{'TEXE_DO_INCLUDE'}));
  }
  
+ $FROMNATIVE = "@FROMNATIVE@";
+ 
  # Parse arguments
  use Getopt::Long;
  my %opt = ();
***************
*** 671,677 ****
      # Keep track of input/include level
      $includelevel++;
  
!     open(IN,"<$infile") || die "$prompt Cannot open $infile\n";
      print STDERR "$prompt %--- Processing $infile" if ($debug > 1);
  
      # if we don't include this file marker LaTeX2HTML won't split
--- 673,681 ----
      # Keep track of input/include level
      $includelevel++;
  
!     #open(IN,"<$infile") || die "$prompt Cannot open $infile\n";
!     # shige 09/25 2004
!     open(IN,"${FROMNATIVE} $infile |") || die "$prompt Cannot open $infile\n";
      print STDERR "$prompt %--- Processing $infile" if ($debug > 1);
  
      # if we don't include this file marker LaTeX2HTML won't split
***************
*** 879,885 ****
  	#looses $comments on successful input/include, document header,
  	#or usepackage/RequirePackage
  
! 	if (/\\(input|include|Dinput|Dinclude)\W/) { # modified by S.Takehiro 2002/07/01
  	    ($before,$after) = ($`,$&.$');
  	    if ($before =~ /$ignore_cmd_rx/o) {
  		print OUT $line;
--- 883,889 ----
  	#looses $comments on successful input/include, document header,
  	#or usepackage/RequirePackage
  
! 	if (/\\(input|include)\W/) { 
  	    ($before,$after) = ($`,$&.$');
  	    if ($before =~ /$ignore_cmd_rx/o) {
  		print OUT $line;
***************
*** 1031,1045 ****
      local($filename) = "";
  
      # $class serves as temporary storage
!     #    modified by S.Takehiro 2002/07/01
!     if (/(\\input|\\include|\\Dinput|\\Dinclude)\s*$arg_rx/o) {  
  	($before,$after,$class,$filename) = ($`, $', $&, $2);
- 	$class =~ s/\\D/\\/;        # modified by S.Takehiro 2002/07/01
  	$filename =~ s/\s//g;
      }
!     elsif (/(\\input|\\include|\\Dinput|\\Dinclude)\s+(\S+)(?=\s|$)/o) {
  	($before,$after,$class,$filename) = ($`, $', $&, $2);
- 	$class =~ s/\\D/\\/;        # modified by S.Takehiro 2002/07/01
  	$filename =~ s/\s//g;
      }
      else {
--- 1035,1046 ----
      local($filename) = "";
  
      # $class serves as temporary storage
!     if (/(\\input|\\include)\s*$arg_rx/o) {
  	($before,$after,$class,$filename) = ($`, $', $&, $2);
  	$filename =~ s/\s//g;
      }
!     elsif (/(\\input|\\include)\s+(\S+)(?=\s|$)/o) {
  	($before,$after,$class,$filename) = ($`, $', $&, $2);
  	$filename =~ s/\s//g;
      }
      else {