Skip to content

Fold 2 calls to kpsewhich; avoid regexp in tightest loop #2514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brucemiller merged 1 commit into from
Feb 10, 2025
Merged

Fold 2 calls to kpsewhich; avoid regexp in tightest loop #2514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions lib/LaTeXML/Util/Pathname.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,12 +423,13 @@ sub pathname_kpsewhich {
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
$kpse_toolchain = "--miktex-admin" if ($ENV{"LATEXML_KPSEWHICH_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 $kpse_toolchain`; chomp($texpaths);
# Get 2 bits of data from kpsewhich (with 1 call!)
# texmf: ALL the directories used for any purposes, including docs, fonts, etc
# texpaths: the directories which contain the TeX related files we're interested in
#. (but they're typically below where the ls-R indexes are!)
my ($texmf,$texpaths) = split("\n",
`"$kpsewhich" --expand-var \'\\\$TEXMF\' --show-path tex $kpse_toolchain`);
my @filters = (); # Really shouldn't end up empty.
foreach my $path (split(/$KPATHSEP/, $texpaths)) {
$path =~ s/^!!//; $path =~ s|//+$|/|;
Expand All @@ -448,9 +449,9 @@ sub build_kpse_cache {
open($LSR, '<', "$dir/ls-R") or die "Cannot read $dir/ls-R: $!";
while (<$LSR>) {
chop;
next if !$_ || /^%/;
if (/^(.*?):$/) { # Move to a new subdirectory
$subdir = $1;
next if !$_ || (substr($_, 0, 1) eq '%');
if(substr($_, -1) eq ':'){
$subdir = substr($_, 0, -1);
$subdir =~ s|^\./||; # remove prefix
my $d = $dir . '/' . $subdir; # Hopefully OS safe, for comparison?
$skip = !$filterre || $d !~ /$filterre/;
Expand Down
Loading