Block consistency

lib/LaTeXML/Common/Model.pm

@@ -79,6 +79,7 @@ sub loadSchema {
     $self->loadCompiledSchema($compiled); }
   else {
     $$self{schema}->loadSchema; }
+  $self->loadInternalExtensions;
   $self->describeModel if $LaTeXML::Common::Model::DEBUG;
   $$self{schema_loaded} = 1;
   return $$self{schema}; }
@@ -88,6 +89,30 @@ sub addSchemaDeclaration {
   $$self{schema}->addSchemaDeclaration($document, $tag);
   return; }
 
+sub loadInternalExtensions {
+  my ($self) = @_;
+  if (!exists $$self{tagprop}{'ltx:_CaptureBlock_'}) {
+    # Synthesize ltx:_CaptureBlock_ to act like the union of ltx:block, ltx:para,
+    $self->synthesizeElement('ltx:_CaptureBlock_',
+      qw(ltx:block ltx:logical-block ltx:sectional-block Caption)); }
+  return; }
+
+# Clone the tagprop's (allowed content & attributes) of @other to $tag
+sub synthesizeElement {
+  my ($self, $tag, @others) = @_;
+  $$self{tagprop}{$tag} = {} unless $$self{tagprop}{$tag};
+  my $capture = $$self{tagprop}{$tag};
+  foreach my $other (@others) {
+    if (my $content = $$self{schemaclass}{$other}) {
+      foreach my $child (keys %$content) {
+        $$capture{model}{$child} = $$content{$child}; } }
+    elsif (my $entry = $$self{tagprop}{$other}) {
+      foreach my $child (keys %{ $$entry{model} }) {
+        $$capture{model}{$child} = $$entry{model}{$child}; }
+      foreach my $attr (keys %{ $$entry{attributes} }) {
+        $$capture{attributes}{$attr} = $$entry{attributes}{$attr}; } } }
+  return; }
+
 #=====================================================================
 # Make provision to precompile the schema.
 sub compileSchema {
@@ -378,7 +403,8 @@ sub canContain {
   return 0 if !$tag || ($tag eq '#PCDATA') || ($tag eq '#Comment');
   return 1 if $tag =~ /(.*?:)?_Capture_$/;                          # with or without namespace prefix
   return 1 if $tag eq '_WildCard_';
-  return 1 if $childtag =~ /(.*?:)?_Capture_$/;
+  return 1 if $childtag =~ /(.*?:)?_Capture_$/;                     # anything can contain these
+  return 1 if $childtag =~ /(.*?:)?_CaptureBlock_$/;
   return 1 if $childtag eq '_WildCard_';
   return 1 if $childtag eq '#Comment';
   return 1 if $childtag eq '#ProcessingInstruction';

lib/LaTeXML/Core/Document.pm

@@ -1957,7 +1957,7 @@ sub replaceNode {
 # initially since $node->setNodeName was broken in XML::LibXML 1.58
 # but this can provide for more options & correctness?
 sub renameNode {
-  my ($self, $node, $newname) = @_;
+  my ($self, $node, $newname, $reinsert) = @_;
   my $model = $$self{model};
   my ($ns, $tag) = $model->decodeQName($newname);
   my $parent = $node->parentNode;
@@ -1972,8 +1972,20 @@ sub renameNode {
     $id = $value if $key eq 'xml:id';    # Save to register after removal of old node.
     $new->setAttribute($key, $value); }
   # AND move all content from $node to $newnode
-  foreach my $child ($node->childNodes) {
-    $new->appendChild($child); }
+  if (!$reinsert) {
+    foreach my $child ($node->childNodes) {
+      $new->appendChild($child); } }
+  else {
+    my $savenode = $$self{node};
+    $$self{node} = $new;
+    foreach my $child ($node->childNodes) {
+      if ($child->nodeType == XML_TEXT_NODE) {
+        openText_internal($self, $child->data);
+        closeText_internal($self); }
+      else {
+        my $point = find_insertion_point($self, getNodeQName($self, $child));
+        $point->appendChild($child); } }
+    $$self{node} = $savenode; }
   ## THEN call afterOpen... ?
   # It would normally be called before children added,
   # but how can we know if we're duplicated auto-added stuff?

lib/LaTeXML/Package/LaTeX.pool.ltxml

@@ -283,10 +283,21 @@ EOTeX
 # C.1.6 The \\ Command
 #======================================================================
 # In math, \\ is just a formatting hint, unless within an array, cases, .. environment.
-DefConstructor("\\\\ OptionalMatch:* [Glue]",
-  "?#isMath(<ltx:XMHint name='newline'/>)(<ltx:break/>)",
+DefConstructor('\lx@newline OptionalMatch:* [Glue]', sub {
+    my ($document, $star, $skip, %props) = @_;
+    if ($STATE->lookupValue('IN_MATH')) {
+      $document->insertElement('ltx:XMHint', undef, name => 'newline'); }
+    else {
+      my $context = $document->getElement;
+      if    ($context->getAttribute('_vertical_mode_')) { }
+      elsif (($document->getNodeQName($context) eq 'ltx:p')
+        && $context->parentNode->getAttribute('_vertical_mode_')) {
+        $document->maybeCloseElement('ltx:p'); }
+      elsif ($document->canContain($context, 'ltx:break')) {
+        $document->insertElement('ltx:break'); } } },
   reversion  => Tokens(T_CS("\\\\"), T_CR),
   properties => { isBreak => 1 });
+Let('\\\\', '\lx@newline');
 
 DefConstructor('\newline',
   "?#isMath(<ltx:XMHint name='newline'/>)(<ltx:break/>)",
@@ -1340,27 +1351,19 @@ DefMacroI('\@evenfoot', undef, Tokens());
 #**********************************************************************
 
 DefEnvironment('{center}', sub {
-    $_[0]->maybeCloseElement('ltx:p');                        # this starts a new vertical block
-    aligningEnvironment('center', 'ltx_centering', @_); },    # aligning will take care of \\\\ "rows"
-  beforeDigest => sub {
-    Let('\par', '\inner@par');
-    Let('\\\\', '\inner@par'); });
+    $_[0]->maybeCloseElement('ltx:p');                         # this starts a new vertical block
+    aligningEnvironment('center', 'ltx_centering', @_); });    # aligning will take care of \\\\ "rows"
+
 # HOWEVER, define a plain \center to act like \centering (?)
 DefMacroI('\center',    undef, '\centering');
 DefMacroI('\endcenter', undef, '');
 
 DefEnvironment('{flushleft}', sub {
     $_[0]->maybeCloseElement('ltx:p');    # this starts a new vertical block
-    aligningEnvironment('left', 'ltx_align_left', @_); },
-  beforeDigest => sub {
-    Let('\par', '\inner@par');
-    Let('\\\\', '\inner@par'); });
+    aligningEnvironment('left', 'ltx_align_left', @_); });
 DefEnvironment('{flushright}', sub {
     $_[0]->maybeCloseElement('ltx:p');    # this starts a new vertical block
-    aligningEnvironment('right', 'ltx_align_right', @_); },
-  beforeDigest => sub {
-    Let('\par', '\inner@par');
-    Let('\\\\', '\inner@par'); });
+    aligningEnvironment('right', 'ltx_align_right', @_); });
 
 # These add an operation to be carried out on the current node & following siblings, when the current group ends.
 # These operators will add alignment (class) attributes to each "line" in the current block.
@@ -3451,7 +3454,7 @@ sub SubfigureAndID {
   # A little verbose, but much easier to do than XSLT 1.0 would allow.
   my $contents_count = 0;    # count with author breaks excluded
   my @contents       = grep { my $name = $document->getNodeQName($_);
-    my $ok = ($name =~ /^ltx:(?:graphics|float|figure|table|tabular|break|inline-para|inline-block|listing)$/);
+    my $ok = ($name =~ /^ltx:(?:graphics|float|figure|table|tabular|break|inline-logical-block|inline-block|listing)$/);
     $contents_count += 1 if $ok and $name ne 'ltx:break';
     $ok; } element_nodes($node);
   if ($contents_count > 1) {
@@ -3618,9 +3621,9 @@ DefConditional('\if@reversemargin');
 Let('\reversemarginpar', '\@reversemargintrue');
 Let('\normalmarginpar',  '\@reversemarginfalse');
 DefConstructor('\marginpar[]{}',
-"?#1(<ltx:note role='margin' class='ltx_marginpar_left'><ltx:inline-para>#1</ltx:inline-para></ltx:note>"
-    . "?#2(<ltx:note role='margin' class='ltx_marginpar_right'><ltx:inline-para>#2</ltx:inline-para></ltx:note>))"
-    . "(<ltx:note role='margin' class='ltx_marginpar'><ltx:inline-para>#2</ltx:inline-para></ltx:note>)");
+"?#1(<ltx:note role='margin' class='ltx_marginpar_left'><ltx:inline-logical-block>#1</ltx:inline-logical-block></ltx:note>"
+    . "?#2(<ltx:note role='margin' class='ltx_marginpar_right'><ltx:inline-logical-block>#2</ltx:inline-logical-block></ltx:note>))"
+    . "(<ltx:note role='margin' class='ltx_marginpar'><ltx:inline-logical-block>#2</ltx:inline-logical-block></ltx:note>)");
 DefRegister('\marginparpush', Dimension(0));
 
 #**********************************************************************
@@ -4835,13 +4838,7 @@ RawTeX(<<'EOL');
 \DeclareRobustCommand\usebox[1]{\leavevmode\copy #1\relax}
 EOL
 
-# A soft sorta \par that only closes an ltx:p, but not ltx:para
-DefConstructor('\lx@parboxnewline[]', sub {
-    my ($document, $ignore, %props) = @_;
-    $document->maybeCloseElement('ltx:p');
-    return; },
-  properties => { isBreak => 1 });
-
+Let('\lx@parboxnewline[]', '\lx@newline');    # Obsolete, but in case still used
 # NOTE: There are 2 extra arguments (See LaTeX Companion, p.866)
 # for height and inner-pos.  We're ignoring them, for now, though.
 DefConstructor('\parbox[] OptionalUndigested OptionalUndigested {Dimension} VBoxContents', sub {
@@ -4861,7 +4858,7 @@ DefConstructor('\parbox[] OptionalUndigested OptionalUndigested {Dimension} VBox
   beforeDigest => sub {
     reenterTextMode(1);    # actually vertical mode!
     AssignRegister('\hsize' => $_[4]);
-    Let('\\\\', '\lx@parboxnewline'); });
+    Let('\\\\', '\lx@newline'); });
 DefMacroI('\@parboxrestore', undef, Tokens());
 
 DefConditional('\if@minipage');
@@ -4870,7 +4867,6 @@ DefEnvironment('{minipage}[][][]{Dimension}', sub {
     my ($document, $attachment, $b, $c, $width, %props) = @_;
     my $vattach = translateAttachment($attachment);
     insertBlock($document, $props{body},
-      para    => 1,
       width   => $width,
       vattach => $vattach,
       class   => 'ltx_minipage');
@@ -4884,8 +4880,8 @@ DefEnvironment('{minipage}[][][]{Dimension}', sub {
     reenterTextMode(1);    # actually vertical mode!
     Digest(T_CS('\@minipagetrue'));
     AssignRegister('\hsize' => $_[4]);
-    # this conflicts (& not needed?) with insertBlock
-    Let('\\\\', '\lx@parboxnewline'); });
+    Let('\\\\', '\lx@newline');
+  });
 
 DefConstructor('\rule[Dimension]{Dimension}{Dimension}',
   "<ltx:rule ?#offset(yoffset='#offset') width='#width' height='#height'/>",