Amscd (brucemiller#2449)

* Make the horizontal connectors in the CD be stretchy, and have minimum width; general code cleanup * Special hack so that stretchy horizontal arrows actually stretch (need extra munder/mover) * Update AMS CD test case * Switch to using class=ltx_horizontally_stretchy as the detector of the special case
sthagen · Dec 18, 2024 · 116748f · 116748f
1 parent 3abc3af
commit 116748f
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 43 deletions.
diff --git a/lib/LaTeXML/Package/amscd.sty.ltxml b/lib/LaTeXML/Package/amscd.sty.ltxml
@@ -43,38 +43,34 @@ DefMacro('\cd@ Token', sub {
     my ($gullet, $token) = @_;
     (T_CS('@' . ToString($token))); });
 
+# Horizontal connectors
 DefMacroI(T_CS('@>'), 'Until:> Until:>',
-  '\lx@hidden@align\cd@stack{>}{\rightarrowfill@}{#1}{#2}\lx@hidden@align');
+  '\lx@hidden@align\lx@amscd@stack{>}{\lx@amscd@rightarrow}{#1}{#2}\lx@hidden@align');
 DefMacroI(T_CS('@)'), 'Until:) Until:)',
-  '\lx@hidden@align\cd@stack{)}{\rightarrowfill@}{#1}{#2}\lx@hidden@align');
+  '\lx@hidden@align\lx@amscd@stack{)}{\lx@amscd@rightarrow}{#1}{#2}\lx@hidden@align');
 DefMacroI(T_CS('@<'), 'Until:< Until:<',
-  '\lx@hidden@align\cd@stack{<}{\leftarrowfill@}{#1}{#2}\lx@hidden@align');
+  '\lx@hidden@align\lx@amscd@stack{<}{\lx@amscd@leftarrow}{#1}{#2}\lx@hidden@align');
 DefMacroI(T_CS('@('), 'Until:( Until:(',
-  '\lx@hidden@align\cd@stack{(}{\leftarrowfill@}{#1}{#2}\lx@hidden@align');
+  '\lx@hidden@align\lx@amscd@stack{(}{\lx@amscd@leftarrow}{#1}{#2}\lx@hidden@align');
+DefMacroI(T_CS('@='), undef,
+  '\lx@hidden@align\lx@amscd@equals\lx@hidden@align');
 
+# Vertical connectors
 DefMacroI(T_CS('@A'), 'Until:A Until:A',
-  '\cd@adjacent{A}{\Big\uparrow}{#1}{#2}\lx@hidden@align\lx@hidden@align');
+  '\lx@amscd@adjacent{A}{\Big\uparrow}{#1}{#2}\lx@hidden@align\lx@hidden@align');
 DefMacroI(T_CS('@V'), 'Until:V Until:V',
-  '\cd@adjacent{V}{\Big\downarrow}{#1}{#2}\lx@hidden@align\lx@hidden@align');
+  '\lx@amscd@adjacent{V}{\Big\downarrow}{#1}{#2}\lx@hidden@align\lx@hidden@align');
 
-DefMacroI(T_CS('@='), undef,
-  '\lx@hidden@align\@cd@equals@\lx@hidden@align');
 DefMacroI(T_CS('@|'), undef,
   '\Big\Vert\lx@hidden@align\lx@hidden@align');
 DefMacroI(T_CS('@\vert'), undef,
   '\Big\Vert\lx@hidden@align\lx@hidden@align');
 DefMacroI(T_CS('@.'), undef,
   '\lx@hidden@align\lx@hidden@align');
 
-# Horizontal
-DefMath('\@cd@equals@', "=", role => 'ARROW', stretchy => 'true', reversion => '@=');
-# Vertical
-DefMath('\@cd@bar@',  "|",        role => 'ARROW', font => { size => 'Big' }, reversion => '@|');
-DefMath('\@cd@vert@', "\x{2225}", role => 'ARROW', font => { size => 'Big' }, reversion => '@\vert');
-
 DefRegister('\minaw@' => Dimension('11.111pt'));
 
-DefConstructor('\cd@stack Undigested {} ScriptStyle ScriptStyle', sub {
+DefConstructor('\lx@amscd@stack Undigested {} ScriptStyle ScriptStyle', sub {
     my ($document, $reversion, $op, $over, $under, %props) = @_;
     my $scriptpos = $props{scriptpos};
     if (!IsEmpty($under)) {
@@ -101,22 +97,38 @@ DefConstructor('\cd@stack Undigested {} ScriptStyle ScriptStyle', sub {
   properties => { scriptpos => sub { "mid" . $_[0]->getScriptLevel; } },
   reversion  => '@#1{#3}#1{#4}#1');
 
-# Temporary...
-# Later deal with vertically centering the side things, parser issues...
-
-DefConstructor('\cd@adjacent Undigested {} ScriptStyle ScriptStyle', sub {
+DefConstructor('\lx@amscd@adjacent Undigested {} ScriptStyle ScriptStyle', sub {
     my ($document, $reversion, $op, $left, $right, %props) = @_;
+    # Make the left & right parts width=0, so they don't affect centering
     $document->openElement('ltx:XMWrap', role => 'ARROW');    # Role?
-    $document->insertElement('ltx:XMArg', $left) unless IsEmpty($left);
+    $document->insertElement('ltx:XMArg', $left, width => Dimension(0)) unless IsEmpty($left);
     $document->insertElement('ltx:XMArg', $op);
-    $document->insertElement('ltx:XMArg', $right) unless IsEmpty($right);
+    $document->insertElement('ltx:XMArg', $right, width => Dimension(0)) unless IsEmpty($right);
     $document->closeElement('ltx:XMWrap'); },
   reversion => '@#1{#3}#1{#4}#1');
 
-# This isn't really having the desired effect when transformed to MathML and
-# displayed in Firefox.... have I got it right; has Firefox???
-DefMath('\leftarrowfill@',  "\x{2190}", role => 'ARROW', stretchy => 'true');
-DefMath('\rightarrowfill@', "\x{2192}", role => 'ARROW', stretchy => 'true');
+# These, in case used...
+DefMacro('\leftarrowfill@ {}',      '\lx@amscd@leftarrow');
+DefMacro('\rightarrowfill@ {}',     '\lx@amscd@rightarrow');
+DefMacro('\leftrightarrowfill@ {}', '\lx@amscd@leftrightarrow');
+
+# These are stretchy, widenned version; should be \minCDarrowsidth or \minaw@ wide
+DefPrimitive('\lx@amscd@leftarrow', sub {
+    Box("\x{2190}", undef, undef, '\leftarrow',
+      role => 'ARROW', stretchy => 'true', meaning => 'leftarrow',
+      class=>'ltx_horizontally_stretchy',  width => Dimension('30pt')); });
+DefPrimitive('\lx@amscd@rightarrow', sub {
+    Box("\x{2192}", undef, undef, '\rightarrow',
+      role => 'ARROW', stretchy => 'true', meaning => 'rightarrow',
+      class=>'ltx_horizontally_stretchy',  width => Dimension('30pt')); });
+DefPrimitive('\lx@amscd@leftrightarrow', sub {
+    Box("\x{2194}", undef, undef, '\leftrightarrow',
+      role => 'ARROW', stretchy => 'true', meaning => 'leftrightarrow',
+      class=>'ltx_horizontally_stretchy',  width => Dimension('30pt')); });
+DefPrimitive('\lx@amscd@equals', sub {
+    Box("=", undef, undef, T_OTHER('='),
+      role => 'ARROW', stretchy => 'true', meaning => 'equals',
+      class=>'ltx_horizontally_stretchy',  width => Dimension('30pt')); });
 
 DefRegister('\minCDarrowwidth' => Dimension('2.5pc'));
 

diff --git a/lib/LaTeXML/Post/MathML.pm b/lib/LaTeXML/Post/MathML.pm
@@ -535,7 +535,15 @@ sub pmml_maybe_resize {
   my $depth  = $node->getAttribute('depth')   || ($parent && $parent->getAttribute('depth'));
   my $xoff   = $node->getAttribute('xoffset') || ($parent && $parent->getAttribute('xoffset'));
   my $yoff   = $node->getAttribute('yoffset') || ($parent && $parent->getAttribute('yoffset'));
-  if ($width || $height || $depth || $xoff || $yoff) {
+  my $role   = $node->getAttribute('role')    || ($parent && $parent->getAttribute('role'));
+  my $class  = $node->getAttribute('class')    || ($parent && $parent->getAttribute('class'));
+
+  # First, special case hack for stretchy arrows, with specified width
+  # Stretchiness (currently) only has effect within munder/mover!!!!!
+  if ($width && (($role || '') eq 'ARROW')
+     && (($class||'') =~ /\bltx_horizontally_stretchy\b/)) {    # SPECIAL CASE HACK
+    $result = ['m:mover', {}, $result, ['m:mspace', { width => $width }]]; }
+  elsif ($width || $height || $depth || $xoff || $yoff) {
     if    ($$result[0] eq 'm:mpadded') { }
     elsif ($$result[0] eq 'm:mrow') {
       $$result[0] = 'm:mpadded'; }

diff --git a/t/ams/cd.pdf b/t/ams/cd.pdf
diff --git a/t/ams/cd.tex b/t/ams/cd.tex
@@ -16,9 +16,9 @@
 \end{equation}
 \begin{equation}
 \begin{CD}
-\cov(\mathcal{L}) @>>> \non(\mathcal{K}) @>>> \cf(\mathcal{K}) @>>> \cf(\mathcal{L})\\
-@VVV @AAA @AAA @VVV\\
-\add(\mathcal{L}) @>>> \add(\mathcal{K}) @>>> \cov(\mathcal{K}) @>>> \non(\mathcal{L})
+\cov(\mathcal{L}) @>i>j> \non(\mathcal{K}) @)i)) \cf(\mathcal{K}) @>>j> \cf(\mathcal{L})\\
+@VVV @| @\vert @AAA\\
+\add(\mathcal{L}) @<<< \add(\mathcal{K}) @((( \cov(\mathcal{K}) @<<< \non(\mathcal{L})
 \end{CD}
 \end{equation}
 \end{document}
diff --git a/t/ams/cd.xml b/t/ams/cd.xml
@@ -12,7 +12,7 @@
         <tag>(1)</tag>
         <tag role="refnum">1</tag>
       </tags>
-      <Math mode="display" tex="\begin{CD}S^{{\mathcal{W}}_{\Lambda}}\otimes T@&gt;{j}&gt;{}&gt;T\\&#10;@V{}V{}V@V{}V{\operatorname{End}P}V\\&#10;(S\otimes T)/I@=(Z\otimes T)/J\end{CD}" text="commutative-diagram@(Array[[S ^ (W _ Lambda) tensor-product T, rightarrowfill@ ^ j, T], [downarrow, , absent downarrow End@(P), , ], [(S tensor-product T) / I, @cd@equals@, (Z tensor-product T) / J]])" xml:id="S0.E1.m1">
+      <Math mode="display" tex="\begin{CD}S^{{\mathcal{W}}_{\Lambda}}\otimes T@&gt;{j}&gt;{}&gt;T\\&#10;@V{}V{}V@V{}V{\operatorname{End}P}V\\&#10;(S\otimes T)/I=(Z\otimes T)/J\end{CD}" text="commutative-diagram@(Array[[S ^ (W _ Lambda) tensor-product T, rightarrow ^ j, T], [downarrow, , absent downarrow End@(P), , ], [(S tensor-product T) / I, =, (Z tensor-product T) / J]])" xml:id="S0.E1.m1">
         <XMath>
           <XMDual>
             <XMApp>
@@ -39,7 +39,7 @@
                 <XMCell align="center">
                   <XMApp>
                     <XMTok role="SUPERSCRIPTOP" scriptpos="mid5"/>
-                    <XMTok name="rightarrowfill@" role="ARROW" stretchy="true">→</XMTok>
+                    <XMTok class="ltx_horizontally_stretchy" meaning="rightarrow" role="ARROW" stretchy="true" width="30.0pt">→</XMTok>
                     <XMTok font="italic" fontsize="70%" role="UNKNOWN">j</XMTok>
                   </XMApp>
                 </XMCell>
@@ -56,7 +56,7 @@
                   <XMApp role="ARROW">
                     <XMTok fontsize="160%" name="downarrow" role="ARROW">↓</XMTok>
                     <XMTok meaning="absent"/>
-                    <XMApp>
+                    <XMApp width="0.0pt">
                       <XMTok fontsize="70%" role="OPFUNCTION" scriptpos="post">End</XMTok>
                       <XMTok font="italic" fontsize="70%" role="UNKNOWN">P</XMTok>
                     </XMApp>
@@ -85,7 +85,7 @@
                   </XMApp>
                 </XMCell>
                 <XMCell align="center">
-                  <XMTok name="@cd@equals@" role="ARROW" stretchy="true">=</XMTok>
+                  <XMTok class="ltx_horizontally_stretchy" meaning="equals" role="ARROW" stretchy="true" width="30.0pt">=</XMTok>
                 </XMCell>
                 <XMCell align="center">
                   <XMApp>
@@ -116,7 +116,7 @@
         <tag>(2)</tag>
         <tag role="refnum">2</tag>
       </tags>
-      <Math mode="display" tex="\begin{CD}\operatorname{cov}(\mathcal{L})@&gt;{}&gt;{}&gt;\operatorname{non}(\mathcal{K%&#10;})@&gt;{}&gt;{}&gt;\operatorname{cf}(\mathcal{K})@&gt;{}&gt;{}&gt;\operatorname{cf}(\mathcal{L})%&#10;\\&#10;@V{}V{}V@A{}A{}A@A{}A{}A@V{}V{}V\\&#10;\operatorname{add}(\mathcal{L})@&gt;{}&gt;{}&gt;\operatorname{add}(\mathcal{K})@&gt;{}&gt;{}&gt;%&#10;\operatorname{cov}(\mathcal{K})@&gt;{}&gt;{}&gt;\operatorname{non}(\mathcal{L})\end{CD}" text="commutative-diagram@(Array[[cov@(L), rightarrowfill@, non@(K), rightarrowfill@, cf@(K), rightarrowfill@, cf@(L)], [downarrow, , uparrow, , uparrow, , downarrow, , ], [add@(L), rightarrowfill@, add@(K), rightarrowfill@, cov@(K), rightarrowfill@, non@(L)]])" xml:id="S0.E2.m1">
+      <Math mode="display" tex="\begin{CD}\operatorname{cov}(\mathcal{L})@&gt;{i}&gt;{j}&gt;\operatorname{non}(\mathcal%&#10;{K})@){i}){})\operatorname{cf}(\mathcal{K})@&gt;{}&gt;{j}&gt;\operatorname{cf}(\mathcal%&#10;{L})\\&#10;@V{}V{}V\Big{\|}\Big{\|}@A{}A{}A\\&#10;\operatorname{add}(\mathcal{L})@&lt;{}&lt;{}&lt;\operatorname{add}(\mathcal{K})@({}({}(%&#10;\operatorname{cov}(\mathcal{K})@&lt;{}&lt;{}&lt;\operatorname{non}(\mathcal{L})\end{CD}" text="commutative-diagram@(Array[[cov@(L), (rightarrow ^ i) _ j, non@(K), rightarrow ^ i, cf@(K), rightarrow _ j, cf@(L)], [downarrow, , ||, , ||, , uparrow, , ], [add@(L), leftarrow, add@(K), leftarrow, cov@(K), leftarrow, non@(L)]])" xml:id="S0.E2.m1">
         <XMath>
           <XMDual>
             <XMApp>
@@ -142,7 +142,15 @@
                   </XMDual>
                 </XMCell>
                 <XMCell align="center">
-                  <XMTok name="rightarrowfill@" role="ARROW" stretchy="true">→</XMTok>
+                  <XMApp role="ARROW">
+                    <XMTok role="SUBSCRIPTOP" scriptpos="mid5"/>
+                    <XMApp>
+                      <XMTok role="SUPERSCRIPTOP" scriptpos="mid5"/>
+                      <XMTok class="ltx_horizontally_stretchy" meaning="rightarrow" role="ARROW" stretchy="true" width="30.0pt">→</XMTok>
+                      <XMTok font="italic" fontsize="70%" role="UNKNOWN">i</XMTok>
+                    </XMApp>
+                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">j</XMTok>
+                  </XMApp>
                 </XMCell>
                 <XMCell align="center">
                   <XMDual>
@@ -161,7 +169,11 @@
                   </XMDual>
                 </XMCell>
                 <XMCell align="center">
-                  <XMTok name="rightarrowfill@" role="ARROW" stretchy="true">→</XMTok>
+                  <XMApp>
+                    <XMTok role="SUPERSCRIPTOP" scriptpos="mid5"/>
+                    <XMTok class="ltx_horizontally_stretchy" meaning="rightarrow" role="ARROW" stretchy="true" width="30.0pt">→</XMTok>
+                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">i</XMTok>
+                  </XMApp>
                 </XMCell>
                 <XMCell align="center">
                   <XMDual>
@@ -180,7 +192,11 @@
                   </XMDual>
                 </XMCell>
                 <XMCell align="center">
-                  <XMTok name="rightarrowfill@" role="ARROW" stretchy="true">→</XMTok>
+                  <XMApp role="ARROW">
+                    <XMTok role="SUBSCRIPTOP" scriptpos="mid5"/>
+                    <XMTok class="ltx_horizontally_stretchy" meaning="rightarrow" role="ARROW" stretchy="true" width="30.0pt">→</XMTok>
+                    <XMTok font="italic" fontsize="70%" role="UNKNOWN">j</XMTok>
+                  </XMApp>
                 </XMCell>
                 <XMCell align="center">
                   <XMDual>
@@ -205,15 +221,15 @@
                 </XMCell>
                 <XMCell/>
                 <XMCell align="center">
-                  <XMTok fontsize="160%" name="uparrow" role="ARROW">↑</XMTok>
+                  <XMTok fontsize="160%" name="||" role="VERTBAR">∥</XMTok>
                 </XMCell>
                 <XMCell/>
                 <XMCell align="center">
-                  <XMTok fontsize="160%" name="uparrow" role="ARROW">↑</XMTok>
+                  <XMTok fontsize="160%" name="||" role="VERTBAR">∥</XMTok>
                 </XMCell>
                 <XMCell/>
                 <XMCell align="center">
-                  <XMTok fontsize="160%" name="downarrow" role="ARROW">↓</XMTok>
+                  <XMTok fontsize="160%" name="uparrow" role="ARROW">↑</XMTok>
                 </XMCell>
                 <XMCell/>
                 <XMCell/>
@@ -236,7 +252,7 @@
                   </XMDual>
                 </XMCell>
                 <XMCell align="center">
-                  <XMTok name="rightarrowfill@" role="ARROW" stretchy="true">→</XMTok>
+                  <XMTok class="ltx_horizontally_stretchy" meaning="leftarrow" role="ARROW" stretchy="true" width="30.0pt">←</XMTok>
                 </XMCell>
                 <XMCell align="center">
                   <XMDual>
@@ -255,7 +271,7 @@
                   </XMDual>
                 </XMCell>
                 <XMCell align="center">
-                  <XMTok name="rightarrowfill@" role="ARROW" stretchy="true">→</XMTok>
+                  <XMTok class="ltx_horizontally_stretchy" meaning="leftarrow" role="ARROW" stretchy="true" width="30.0pt">←</XMTok>
                 </XMCell>
                 <XMCell align="center">
                   <XMDual>
@@ -274,7 +290,7 @@
                   </XMDual>
                 </XMCell>
                 <XMCell align="center">
-                  <XMTok name="rightarrowfill@" role="ARROW" stretchy="true">→</XMTok>
+                  <XMTok class="ltx_horizontally_stretchy" meaning="leftarrow" role="ARROW" stretchy="true" width="30.0pt">←</XMTok>
                 </XMCell>
                 <XMCell align="center">
                   <XMDual>