Code cleanup suggested by D.Ginev

brucemiller · Sep 18, 2024 · 2a0bd12 · 2a0bd12
1 parent 6317280
commit 2a0bd12
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/lib/LaTeXML/Core/Definition/FontDef.pm b/lib/LaTeXML/Core/Definition/FontDef.pm
@@ -38,7 +38,6 @@ sub isFontDef {
 
 sub invoke {
   my ($self, $stomach) = @_;
-  my $current = $STATE->lookupValue('font');
   if (my $fontinfo = $STATE->lookupValue($$self{fontID})) {
     # Temporary hack for \the\font; remember the last font def executed
     $STATE->assignValue(current_FontDef => $$self{cs},                                     'local');

diff --git a/lib/LaTeXML/Engine/TeX_Debugging.pool.ltxml b/lib/LaTeXML/Engine/TeX_Debugging.pool.ltxml
@@ -102,7 +102,7 @@ DefMacro('\meaning Token', sub {
       $type =~ s/^LaTeXML:://;
       # Pre-step: We can't extract the bodies of definitions which are defined via Perl subroutines.
       # So do the next best thing -- represent them as their tokens.
-      if ($type =~ /(fontdef)$/i) {
+      if ($type =~ /fontdef$/i) {
         if (my $fontinfo = $definition->isFontDef) {
           $meaning = 'select font ' . ($$fontinfo{name} || 'fontname');
           $meaning .= ' at ' . $$fontinfo{at} if $$fontinfo{at};

diff --git a/lib/LaTeXML/Engine/TeX_Fonts.pool.ltxml b/lib/LaTeXML/Engine/TeX_Fonts.pool.ltxml
@@ -31,16 +31,15 @@ use LaTeXML::Package;
 # defined by \font, OR \textfont, \scriptfont,\scriptscriptfont, or even \font itself
 # Actually returns the fontinfo (hash) associated with the font.
 DefParameterType('FontDef', sub {
-    my ($gullet)  = @_;
-    my $readtoken = $gullet->readToken;
-    my $token     = $readtoken;
+    my ($gullet) = @_;
+    my $token = $gullet->readToken;
     # Or use LookupRegister???
-    if ($token->toString =~ /^\\(text|script|scriptscript)font$/) {
+    if ($token && ($token->toString =~ /^\\(text|script|scriptscript)font$/)) {
       my $type = $1;
       if (my $fam = $gullet->readNumber) {
         $token = LookupValue($type . 'font_' . $fam->valueOf); } }
     # Need the cs that selected the current font! (which we don't have!)
-    if ($token->toString eq '\font') {    # Current font ??? Return last pure TeX font used (HACK)
+    if ($token && ($token->toString eq '\font')) { # Current font ??? Return last pure TeX font used (HACK)
       $token = LookupValue('current_FontDef') || T_CS('\tenrm'); }
     if (my $defn = $token && $STATE->lookupDefinition($token)) {
       return $defn->isFontDef; }