Stray comments #2420
Merged
Stray comments #2420
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dginev
approved these changes
Sep 23, 2024
lib/LaTeXML/Engine/LaTeX.pool.ltxml
Outdated
| last if !$previous || $previous->isSameNode($skip); } | ||
| while (@children) { | ||
| my $skip = $children[0]; | ||
| last if !$previous; |
There was a problem hiding this comment.
since $previous is not changed during this while loop, maybe the check that it's defined can be lifted up? As in:
if ($previous) {
while (my $skip = shift(@children)) {
last if $previous->isSameNode($skip);
}
}| @@ -368,8 +368,8 @@ sub insertBlock { | |||
| my $inline = $is_svg || $document->canContain($context_tag, '#PCDATA'); | |||
| my $container = $document->openElement('ltx:_CaptureBlock_', '_vertical_mode_' => 1, %blockattr); | |||
| $document->absorb($contents); | |||
| my @nodes = $container->childNodes; | |||
| my @node_tags = map { $document->getNodeQName($_); } @nodes; | |||
| my @nodes = grep { $_->nodeType != XML_COMMENT_NODE; } $container->childNodes; | |||
There was a problem hiding this comment.
should we make a new method akin to element_nodes that gets "material" child nodes?
Actually that may be easier with an accept-list rather than a reject-list, as in
sub content_nodes {
my ($node) = @_;
return ($node ? grep { my $t = $_->nodeType; $t == XML_ELEMENT_NODE || $t == XML_TEXT_NODE }
$node->childNodes : ()); }
|
Thanks for the good suggestions; adopted. Yes, it's possible there are other cases; a superficial scan suggests it's done correctly in most cases, but it's an easy thing to overlook when developing new code and you're obsessed with finding the nodes you want. |
teepeemm
pushed a commit
to teepeemm/LaTeXML
that referenced
this pull request
Oct 29, 2024
* Be careful of unexpected Comment nodes when scanning element children for specific patterns * Update tests to recover missing block alignments (center, left,...) * Code cleanup (suggested by D.Ginev) * Code cleanup (suggested by D.Ginev)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When characterizing certain blocks of XML, we need to be careful of unexpected comment nodes, since the exact order of appearance can be affected by other code changes. For example, this can affect marking nodes due to
\centeringor similar. This PR fixes a couple of such cases, and updates some test cases which seem to have been missingltx_centering(or similar).