replace uses of URI::file with pathname_to_url

Author: xworld21

lib/LaTeXML/Common/Model/DTD.pm

@@ -16,7 +16,6 @@ use LaTeXML::Util::Pathname;
 use LaTeXML::Global;
 use LaTeXML::Common::Error;
 use LaTeXML::Common::XML;
-use URI::file;
 
 #**********************************************************************
 # NOTE: Arglist is DTD specific.
@@ -118,7 +117,7 @@ sub readDTD {
       paths               => $STATE->lookupValue('SEARCHPATHS'),
       installation_subdir => 'resources/DTD');
     if ($dtdfile) {
-      $dtd = XML::LibXML::Dtd->new($$self{public_id}, URI::file->new($dtdfile));
+      $dtd = XML::LibXML::Dtd->new($$self{public_id}, pathname_to_file_url($dtdfile));
       $how = " from $dtdfile ";
       Error('misdefined', $$self{system_id}, undef,
         "Parsing of DTD \"$$self{public_id}\" \"$$self{system_id}\" failed")

lib/LaTeXML/Post.pm

@@ -664,7 +664,6 @@ use DB_File;
 use Unicode::Normalize;
 use LaTeXML::Post;    # to import error handling...
 use LaTeXML::Common::Error;
-use URI::file;
 use base qw(LaTeXML::Common::Object);
 our $NSURI = "http://dlmf.nist.gov/LaTeXML";
 our $XPATH = LaTeXML::Common::XML::XPath->new(ltx => $NSURI);
@@ -857,7 +856,8 @@ sub setDocument_internal {
   else {
     Fatal('unexpected', $root, undef, "Dont know how to use '$root' as document element"); }
   # set URI to destination
-  $$self{document}->setURI(URI::file->new($self->getDestination));
+  my $url = pathname_to_file_url($self->getDestination);
+  $$self{document}->setURI($url) if defined $url;
   return $self; }
 
 our @MonthNames = (qw( January February March April May June

lib/LaTeXML/Post/Manifest/Epub.pm

@@ -13,7 +13,7 @@ package LaTeXML::Post::Manifest::Epub;
 use strict;
 use warnings;
 use File::Find qw(find);
-use URI::file;
+use LaTeXML::Util::Pathname;
 
 our $uuid_tiny_installed;
 
@@ -27,7 +27,7 @@ BEGIN {
 use base qw(LaTeXML::Post::Manifest);
 use LaTeXML::Util::Pathname;
 use File::Spec::Functions qw(catdir);
-use POSIX qw(strftime);
+use POSIX                 qw(strftime);
 use LaTeXML::Post;    # for error handling!
 our $container_content = <<'EOL';
 <?xml version="1.0"?>
@@ -171,7 +171,7 @@ sub process {
       # Add to manifest
       my $manifest = $$self{opf_manifest};
       my $item     = $manifest->addNewChild(undef, 'item');
-      my $item_url = URI::file->new($relative_destination);
+      my $item_url = pathname_to_url($relative_destination);
       my $item_id  = url_id($item_url);
       $item->setAttribute('id',         $item_id);
       $item->setAttribute('href',       $item_url);
@@ -215,7 +215,7 @@ sub finalize {
       $file_type = 'application/octet-stream'; }
 
     my $file_item = $manifest->addNewChild(undef, 'item');
-    my $file_url  = URI::file->new($file);
+    my $file_url  = pathname_to_url($file);
     $file_item->setAttribute('id',         url_id($file_url));
     $file_item->setAttribute('href',       $file_url);
     $file_item->setAttribute('media-type', $file_type); }