[WiP] Frontmatter refactor

lib/LaTeXML/Core/KeyVals.pm

@@ -390,7 +390,7 @@ sub setKeysExpansion {
           T_CS('\def'), T_CS('\XKV@tfam'),   T_BEGIN, T_END,
           T_CS('\def'), T_CS('\XKV@header'), T_BEGIN, T_END,
           T_CS('\def'), T_CS('\XKV@tkey'),   T_BEGIN, T_END) if $setInternals;
-  } } }
+      } } }
 
   # and assign the skipmissing macro with the other keys
   push(@tokens, T_CS('\def'), $rmmacro, T_BEGIN, @rmtokens, T_END) if $rmmacro;
@@ -466,9 +466,31 @@ sub revertKeyVal {
   push(@tokens, Explode($key));
   # write the default (if applicable)
   if (!$useDefault && $value) {
-    push(@tokens, T_OTHER('='), ($keytype ? $keytype->revert($value) : Revert($value))); }
+    push(@tokens, T_OTHER('='),
+      $self->rebrace(Tokens($keytype ? $keytype->revert($value) : Revert($value)))); }
   return @tokens; }
 
+# when reverting a KeyVals value, we may need to wrap in {}
+# eg. if a "," appears outside of any bracing
+# Other cases?
+sub rebrace {
+  my ($self, $tokens) = @_;
+  my $level       = 0;
+  my @tokens      = $tokens->unlist;
+  my $needs_brace = (@tokens ? 0 : 1);
+  foreach my $t (@tokens) {
+    my $cc = $$t[1];    # INLINE
+    $level++ if $cc == CC_BEGIN;
+    if ($cc == CC_END) {
+      $level--;
+      # Note that '{ }} {' is still unbalanced
+      # even though the left and right braces match in count.
+      last if $level < 0; }
+    elsif (($level <= 0) && ($cc == CC_OTHER) && ($$t[0] eq ',')) {    # Outer comma?
+      $needs_brace = 1;
+      last; } }
+  return ($needs_brace ? Tokens(T_BEGIN, $tokens, T_END) : $tokens); }
+
 # TODO: ????
 sub unlist {
   my ($self) = @_;

lib/LaTeXML/Engine/AmSTeX.pool.ltxml

@@ -130,15 +130,12 @@ DefConstructor('\enddocument', "</ltx:document>",
 #======================================================================
 # Front Matter
 
-DefMacro('\topmatter',             '');
-DefMacro('\endtopmatter',          '');
-DefMacro('\title Until:\endtitle', '\@add@frontmatter{ltx:title}{#1}');
-DefConstructor('\@personname{}', "<ltx:personname>#1</ltx:personname>",
-  mode => 'restricted_horizontal');
-DefMacro('\author Until:\endauthor', '\@add@frontmatter{ltx:creator}[role=author]{\@personname{#1}}');
-DefConstructor('\@institute{}', "<ltx:contact role='institute'>#1</ltx:contact>", bounded => 1);
-DefMacro('\thanks Until:\endthanks',     '\@add@to@frontmatter{ltx:creator}{\@institute{#1}}');
-DefMacro('\abstract Until:\endabstract', '\@add@frontmatter{ltx:abstract}{#1}');
+DefMacro('\topmatter',                   '');
+DefMacro('\endtopmatter',                '');
+DefMacro('\title Until:\endtitle',       '\lx@add@title{#1}');
+DefMacro('\author Until:\endauthor',     '\lx@add@author{#1}');
+DefMacro('\thanks Until:\endthanks',     '\lx@add@affiliation{#1}');
+DefMacro('\abstract Until:\endabstract', '\lx@add@abstract{#1}');
 
 #======================================================================
 # Document structure
@@ -239,7 +236,7 @@ DefMacro("\\format Until:\\\\", '');
 
 DefConstructor('\text {}',
   "<ltx:text _noautoclose='1'>#1</ltx:text>",
-  mode => 'restricted_horizontal',
+  mode            => 'restricted_horizontal',
   enterHorizontal => 1);
 
 DefConstructor('\overset Until:\to {}',
@@ -268,18 +265,18 @@ DefConstructor('\frac InFractionStyle InFractionStyle',
   properties => { mathstyle => sub { LookupValue('font')->getMathstyle; } });
 
 DefConstructor('\Cal{}', '#1', bounded => 1, requireMath => 1,
-  font => { family => 'caligraphic', series => 'medium', shape => 'upright' },
+  font            => { family => 'caligraphic', series => 'medium', shape => 'upright' },
   enterHorizontal => 1);
 
 # \bold in amsfonts
 DefConstructor('\roman{}', '#1', bounded => 1, requireMath => 1,
-  font => { family => 'serif', series => 'medium', shape => 'upright' },
+  font            => { family => 'serif', series => 'medium', shape => 'upright' },
   enterHorizontal => 1);
 DefConstructor('\italic{}', '#1', bounded => 1, requireMath => 1,
-  font => { shape => 'italic', series => 'medium', shape => 'upright' },
+  font            => { shape => 'italic', series => 'medium', shape => 'upright' },
   enterHorizontal => 1);
 DefConstructor('\slanted{}', '#1', bounded => 1, requireMath => 1,
-  font => { shape => 'slanted', series => 'medium', shape => 'upright' },
+  font            => { shape => 'slanted', series => 'medium', shape => 'upright' },
   enterHorizontal => 1);
 DefConstructor('\boldkey{}', '#1', bounded => 1, requireMath => 1,
   font => { series => 'bold', family => 'typewriter', series => 'medium', shape => 'upright' },
@@ -354,8 +351,8 @@ DefMacro('\minCDarrowwidth Dimension',  '');
 DefMacro('\pretend Until:\haswidth {}', '#1');
 
 DefMacro('\snug', '');
-DefConstructor('\topsmash{}', "#1",   enterHorizontal => 1);
-DefConstructor('\botsmash{}', "#1",   enterHorizontal => 1);
+DefConstructor('\topsmash{}', "#1", enterHorizontal => 1);
+DefConstructor('\botsmash{}', "#1", enterHorizontal => 1);
 
 DefConstructor('\spreadmatrixlines Dimension', '');
 

lib/LaTeXML/Engine/Base_Deprecated.pool.ltxml

@@ -152,6 +152,16 @@ DefMacro('\@@POSTSUPERSCRIPT',
 DefMacro('\@ASSERT@MEANING',
   '\lx@DEPRECATE{\@ASSERT@MEANING}{\lx@assert@meaning}\lx@assert@meaning');
 
+DefMacro('\@personname',
+  '\lx@DEPRECATE{\@personname}{{\lx@personname}\lx@personname');
+DefMacro('\@add@frontmatter',
+  '\lx@DEPRECATE{\@add@frontmatter}{\lx@add@frontmatter}\lx@add@frontmatter');
+DefMacro('\@add@to@frontmatter {}[]{}',
+  '\lx@DEPRECATE{\@add@to@frontmatter}{\lx@annotate@frontmatter}'
+    . '\lx@annotate@frontmatter{#1}{preformatted}[#2]{#3}');
+DefMacro('\@ADDCLASS',
+  '\lx@DEPRECATE{\@ADDCLASS}{{\lx@add@cssclass}\lx@add@cssclass');
+
 #======================================================================
 # Older deprecations
 # (but there was no warning mechanism then)