standardize around pathname_kpsewhich; setup appveyor flags

Author: dginev

.appveyor.yml

@@ -16,7 +16,7 @@ install:
   - cmd: refreshenv
   # autoinstall latex packages (0=no, 1=autoinstall, 2=ask)
   # this adds this to the registry!
-  - if "%setup%"=="miktex" initexmf --set-config-value "[MPM]AutoInstall=1" 
+  - if "%setup%"=="miktex" initexmf --admin --enable-installer --verbose --set-config-value "[MPM]AutoInstall=1" 
   - cmd: refreshenv
   - if not exist "C:\strawberry" choco install strawberryperl -y
   - set PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%

Makefile.PL

@@ -28,7 +28,8 @@ use FindBin;
 
 our $OLD_LIBXML = grep { /OLD_LIBXML/ } @ARGV;
 our $NOMKTEXLSR = grep { /NOMKTEXLSR/ } @ARGV;
-our $TEXMF;
+our $KPSE_TOOLCHAIN = "";
+our ($KPSEV, $TEXMF);
 my ($texmfspec) = grep { /^TEXMF/ } @ARGV;
 if ($texmfspec && $texmfspec =~ /^TEXMF\s*=(.*)$/) {
   $TEXMF = $1;
@@ -120,6 +121,7 @@ sub record_revision {
   ##  $$MORE_MACROS{REVISION} = '$(shell svnversion $(REVISION_BASE))';
   ## This command is appropriate for git (I think)
   if ((-d '.git') && (system("git --version") == 0)) {    # If a git checkout & can run git?
+    print STDERR "\n";                                    # space out messages
     $$MORE_MACROS{REVISION} = '$(shell git log --max-count=1 --abbrev-commit --pretty="%h")'; }
   # Extract the previously recorded revision from the revision file (awkward)
   $$MORE_MACROS{OLD_REVISION}
@@ -151,7 +153,7 @@ RecordRevision
 #======================================================================
 # We'll compile the RecDescent grammar during make; don't need to install grammar.
 sub compile_MathGrammar {
-  push(@EXCLUSIONS, 'blib/lib/LaTeXML/MathGrammar');
+  push(@EXCLUSIONS, 'README.pod', 'blib/lib/LaTeXML/MathGrammar');
   $MORE_MAKERULES .= <<'MakeGrammar';
 
 # Precompile the (Recursive Descent) MathGrammar
@@ -199,8 +201,10 @@ MakeGrammar
 #    embedded spaces.
 sub install_TeXStyles {
   if (!$TEXMF) {
-    if (system("kpsewhich --expand-var='\$TEXMFLOCAL'") == 0) {    # can run kpsewhich?
-      $TEXMF = `kpsewhich --expand-var='\$TEXMFLOCAL'`;
+    if ($ENV{"APPVEYOR"}) {    # assume miktex admin on windows CI
+      $KPSE_TOOLCHAIN = "--miktex-admin"; }
+    if (system("kpsewhich --version $KPSE_TOOLCHAIN") == 0) {    # can run kpsewhich?
+      $TEXMF = `kpsewhich --expand-var='\$TEXMFLOCAL' $KPSE_TOOLCHAIN`;
       # Strip the quotes (they appear in windows, when spaces in pathnames(?))
       # These quotes inhibit pasting pathnames togheter,
       # but we DO need to wrap quotes around all completed paths!!

lib/LaTeXML/Package.pm

@@ -543,7 +543,7 @@ sub ComposeURL {
 #======================================================================
 
 my $parameter_options = {    # [CONSTANT]
-  nargs        => 1, reversion   => 1, optional => 1, novalue => 1,
+  nargs => 1, reversion => 1, optional => 1, novalue => 1,
   beforeDigest => 1, afterDigest => 1,
   semiverbatim => 1, undigested  => 1 };
 
@@ -1589,7 +1589,7 @@ sub DefEnvironmentI {
       afterConstruct => flatten($options{afterConstruct}, sub { $STATE->popFrame; }),
       nargs          => $options{nargs},
       captureBody    => 1,
-      properties     => $options{properties} || {},
+      properties => $options{properties} || {},
       (defined $options{reversion} ? (reversion => $options{reversion}) : ()),
       (defined $sizer ? (sizer => $sizer) : ()),
       ), $options{scope});
@@ -1653,7 +1653,7 @@ sub DefEnvironmentI {
 
 # Specify the properties of a Node tag.
 my $tag_options = {    # [CONSTANT]
-  autoOpen          => 1, autoClose          => 1, afterOpen => 1, afterClose => 1,
+  autoOpen => 1, autoClose => 1, afterOpen => 1, afterClose => 1,
   'afterOpen:early' => 1, 'afterClose:early' => 1,
   'afterOpen:late'  => 1, 'afterClose:late'  => 1 };
 my $tag_prepend_options = {    # [CONSTANT]
@@ -1716,8 +1716,8 @@ sub RegisterDocumentNamespace {
 # should we assume a raw type can be processed if being read from within a raw type????
 # yeah, that sounds about right...
 my %definition_name = (    # [CONSTANT]
-  sty   => 'package',              cls   => 'class', clo => 'class options',
-  'cnf' => 'configuration',        'cfg' => 'configuration',
+  sty => 'package', cls => 'class', clo => 'class options',
+  'cnf' => 'configuration', 'cfg' => 'configuration',
   'ldf' => 'language definitions', 'def' => 'definitions', 'dfu' => 'definitions');
 
 sub pathname_is_raw {
@@ -1787,7 +1787,6 @@ sub FindFile_aux {
   # The main point, though, is to we make only ONE (more) call.
   return if grep { pathname_is_nasty($_) } @$paths;    # SECURITY! No nasty paths in cmdline
         # Do we need to sanitize these environment variables?
-  my $kpsewhich = which($ENV{LATEXML_KPSEWHICH} || 'kpsewhich');
   local $ENV{TEXINPUTS} = join($Config::Config{'path_sep'},
     @$paths, $ENV{TEXINPUTS} || $Config::Config{'path_sep'});
   my @candidates = (((!$options{noltxml} && !$nopaths) ? ("$file.ltxml") : ()),

lib/LaTeXML/Util/Pathname.pm

@@ -351,8 +351,9 @@ sub candidate_pathnames {
   return @paths; }
 
 #======================================================================
-our $kpsewhich = which($ENV{LATEXML_KPSEWHICH} || 'kpsewhich');
-our $kpse_cache = undef;
+our $kpsewhich      = which($ENV{LATEXML_KPSEWHICH} || 'kpsewhich');
+our $kpse_cache     = undef;
+our $kpse_toolchain = "";
 
 sub pathname_kpsewhich {
   my (@candidates) = @_;
@@ -364,7 +365,7 @@ sub pathname_kpsewhich {
   # If we've failed to read the cache, try directly calling kpsewhich
   # For multiple calls, this is slower in general. But MiKTeX, eg., doesn't use texmf ls-R files!
   my $files = join(' ', @candidates);
-  if ($kpsewhich && (my $result = `"$kpsewhich" $files`)) {
+  if ($kpsewhich && (my $result = `"$kpsewhich" $files $kpse_toolchain`)) {
     if ($result =~ /^\s*(.+?)\s*\n/s) {
       return $1; } }
   return; }
@@ -373,10 +374,13 @@ sub build_kpse_cache {
   $kpse_cache = {};    # At least we've tried.
   return unless $kpsewhich;
   # This finds ALL the directories looked for for any purposes, including docs, fonts, etc
-  my $texmf = `"$kpsewhich" --expand-var \'\\\$TEXMF\'`; chomp($texmf);
+  if ($ENV{"APPVEYOR"}) {
+    $kpse_toolchain = "--miktex-admin";
+  }
+  my $texmf = `"$kpsewhich" --expand-var \'\\\$TEXMF\' $kpse_toolchain`; chomp($texmf);
   # These are directories which contain the tex related files we're interested in.
   # (but they're typically below where the ls-R indexes are!)
-  my $texpaths = `"$kpsewhich" --show-path tex`; chomp($texpaths);
+  my $texpaths = `"$kpsewhich" --show-path tex $kpse_toolchain`; chomp($texpaths);
   my @filters = ();
   foreach my $path (split(/$KPATHSEP/, $texpaths)) {
     $path =~ s/^!!//; $path =~ s|//+$|/|;

lib/LaTeXML/Util/Test.pm

@@ -19,7 +19,6 @@ use base qw(Exporter);
 our @EXPORT = (qw(&latexml_ok &latexml_tests),
   qw(&process_domstring &process_xmlfile &is_strings),
   @Test::More::EXPORT);
-my $kpsewhich = which($ENV{LATEXML_KPSEWHICH} || 'kpsewhich');    # [CONFIGURATION]
 # Note that this is a singlet; the same Builder is shared.
 
 # Test the conversion of all *.tex files in the given directory (typically t/something)
@@ -81,7 +80,7 @@ sub check_requirements {
   foreach my $reqmts (@reqmts) {
     next unless defined $reqmts;
     foreach my $reqmt (!$reqmts ? () : (ref $reqmts ? @$reqmts : $reqmts)) {
-      if (($kpsewhich && (`"$kpsewhich" $reqmt`)) || (pathname_find($reqmt))) { }
+      if (pathname_kpsewhich($reqmt) || pathname_find($reqmt)) { }
       else {
         my $message = "Missing requirement $reqmt for $test";
         diag("Skip: $message");