Better \kern in svg (#2533)

* When in svg: Create new svg:g for \kern when already have siblings; But, make \hbox close to the appropriate svg:g; And make auto opened svg:g able to auto close

* Add an xy test case

* Fix xytest requires xy.sty to run

Author: brucemiller

MANIFEST

@@ -1399,6 +1399,9 @@ t/graphics/picture.xml
 t/graphics/xcolors.pdf
 t/graphics/xcolors.tex
 t/graphics/xcolors.xml
+t/graphics/xytest.pdf
+t/graphics/xytest.tex
+t/graphics/xytest.xml
 t/grouping/mathgroup.pdf
 t/grouping/mathgroup.tex
 t/grouping/mathgroup.xml

lib/LaTeXML/Engine/TeX_Box.pool.ltxml

@@ -270,8 +270,7 @@ DefConstructor('\hbox BoxSpecification HBoxContents', sub {
     no warnings 'recursion';
     my ($document, $spec, $contents, %props) = @_;
     my $model   = $document->getModel;
-    my $context = $document->getElement;
-    my $current = $context;
+    my $current = $document->getElement;
 
     # What is the CORRECT (& general) way to ask whether we're in "vertical mode"??
     #  my $vmode = $tag eq 'ltx:inline-block'; # ie, explicitly \vbox !?!?!?!
@@ -281,13 +280,10 @@ DefConstructor('\hbox BoxSpecification HBoxContents', sub {
     my $newtag = ($issvg ? 'svg:g' : ($vmode ? ($inline ? 'ltx:inline-block' : 'ltx:p') : 'ltx:text'));
     my $node   = $document->openElement($newtag, _noautoclose => 1, width => $props{width});
     $document->absorb($contents);
-    if (!$issvg) {
+    if (!$issvg) {              # If not directly svg, but nested within closeable (???)
       while (!$document->getElement()->hasAttribute('_beginscope') && $document->maybeCloseElement('svg:g')) { }
       $document->maybeCloseElement('svg:svg'); }
-    if ($issvg) {    # ODDLY, svg:g isnt necessarily balanced in tikz?
-      $document->maybeCloseElement('svg:g'); }
-    else {
-      $document->maybeCloseNode($node); }
+    $document->maybeCloseNode($node);
   },
   mode  => 'text', bounded => 1,
   sizer => '#2',

lib/LaTeXML/Engine/TeX_Kern.pool.ltxml

@@ -27,17 +27,18 @@ use LaTeXML::Package;
 # \lastkern         iq is 0.0 pt or the last kern on the current list.
 
 # \kern is heavily used by xy.
-# Completely HACK version for the moment
 # Note that \kern should add vertical spacing in vertical modes!
 DefConstructor('\kern Dimension', sub {
     my ($document, $length, %props) = @_;
     my $parent = $document->getNode;
     if ($document->getNodeQName($parent) eq 'svg:g') {
       if (my $x = $length->pxValue) {
-        # HACK HACK HACK
-        my $transform = $parent->getAttribute('transform');
-        $parent->setAttribute(transform => ($transform ? $transform . ' ' : '') . "translate($x,0)");
-    } }
+        my $shift = "translate($x,0)";
+        if($parent->childNodes){ # If already have positioned children, new svg:g
+          $document->openElement('svg:g', _autoclose=>1, transform => $shift); }
+        else {
+          my $prev = $parent->getAttribute('transform');
+          $parent->setAttribute(transform => ($prev ? "$prev $shift" : $shift)); } } }
     elsif (inSVG()) {
       Warn('unexpected', 'kern', $_[0], "Lost kern in SVG " . ToString($length)); }
     elsif ($props{isMath}) {

lib/LaTeXML/Package/pgfsys-latexml.def.ltxml

@@ -340,7 +340,7 @@ DefConstructor('\lxSVG@drawpath@clipped{}{}',
     . '<svg:path id="pgfpath#obj" d="#1" />'
     . '</svg:clipPath>'
     . '<svg:use xlink:href="##pgfpath#obj" style="#2" />'
-    . '<svg:g clip-path="url(##pgfcp#obj)">',
+    . '<svg:g clip-path="url(##pgfcp#obj)" _autoclose="1">',
   reversion  => '', sizer => 0,
   properties => { obj => sub { SVGNextObject(); } });
 
@@ -363,7 +363,7 @@ DefConstructor('\lxSVG@discardpath@clipped{}',
   '<svg:clipPath id="pgfcp#obj">'
     . '<svg:path d="#1" />'
     . '</svg:clipPath>'
-    . '<svg:g clip-path="url(##pgfcp#obj)">',
+    . '<svg:g clip-path="url(##pgfcp#obj)" _autoclose="1">',
   reversion  => '', sizer => 0,
   properties => { obj => sub { SVGNextObject(); } });
 
@@ -387,8 +387,8 @@ DefConstructor('\lxSVG@begingroup@ RequiredKeyVals', sub {
     # Special case check: if we are in a latexml context, move up to parent svg:g
     if ($doc->getNodeQName($this) =~ /^ltx:/
       && (my $g = $doc->findnode("ancestor::svg:g[position()=1]", $this))) {
-      $doc->openElement('svg:svg', _autoopened => 1); }
-    $doc->openElement('svg:g', $kv->getHash); },
+      $doc->openElement('svg:svg', _autoopened => 1, _autoclose => 1); }
+    $doc->openElement('svg:g', $kv->getHash, _autoclose => 1); },
   reversion => '', sizer => 0);
 
 #=====================================================================
@@ -534,7 +534,7 @@ DefConstructor('\lxSVG@setpatternuncolored@{}{}{}{}',
     . '<svg:use xlink:href="##pgfsym#1"/>'
     . '</svg:g>'
     . '</svg:pattern></svg:defs>'
-    . '<svg:g fill="url(##pgfupat#obj)">',
+    . '<svg:g fill="url(##pgfupat#obj)" _autoclose="1">',
   properties => {
     obj   => sub { SVGNextObject(); },
     color => sub { Color('rgb', $_[2], $_[3], $_[4]); } },

t/65_graphics.t

@@ -6,4 +6,5 @@ use LaTeXML::Util::Test;
 
 latexml_tests("t/graphics",
 	      requires=>{colors=>'dvipsnam.def',
-			 xcolors=>'dvipsnam.def'});
+			 xcolors=>'dvipsnam.def',
+                         xytest=>'xy.sty'});

t/graphics/xytest.pdf

@@ -0,0 +1,14 @@
+\documentclass{article}
+\usepackage{xcolor}
+\usepackage[arrow,curve,matrix]{xy}
+\begin{document}
+
+\xy (3,0)*{A} ; (20,6)*+{B}*\cir{} **\dir{-} \endxy
+
+\xymatrix{
+  U \ar@/_/[ddr]_y \ar[dr] \ar@/^/[drr]^x\\
+  & X \times_Z Y \ar[d]^q \ar[r]_p
+  & X \ar[d]_f \\
+  & Y \ar[r]^g & Z }
+
+\end{document}