Tag visited.
*
@@ -344,7 +350,7 @@ public void visitEndTag(Tag tag) {
endup();
}
if (isPreformattingTag(tag)) {
- preformatting = false;
+ betweenPreformattingTags = false;
}
queuePrefix(tag);
}
@@ -580,6 +586,8 @@ protected void endup() {
Node node = allNodesInParagraph.get(i);
if (node instanceof Tag) {
writeout("<" + node.getText() + ">");
+ } else if (node instanceof Remark) {
+ writeout(node.toHtml());
} else {
writeout(compressWhitespace(node.getText()));
}
@@ -591,7 +599,9 @@ protected void endup() {
for (int i = firstTagToIncludeFromPreceding; i <= lastTagKeptInFollowing; i++) {
Node node = allNodesInParagraph.get(i);
if (node instanceof Tag) {
- shortcut((Tag) node, paragraph);
+ assignShortcut((Tag) node, paragraph);
+ } else if (node instanceof Remark) {
+ assignShortcut((Remark) node, paragraph);
} else { // node instanceof Text
paragraph.append(HTMLUtils.entitiesToChars(node.toHtml()));
}
@@ -613,7 +623,7 @@ protected void endup() {
// (This changes the layout, therefore it is an option. NB: an alternative implementation is to compress by
// default, and use Core.getFilterMaster().getConfig().isPreserveSpaces() option instead to compress if
// not checked.)
- if (!preformatting) {
+ if (!betweenPreformattingTags) {
spacePrefix = HTMLUtils.getSpacePrefix(uncompressed, options.getCompressWhitespace());
spacePostfix = HTMLUtils.getSpacePostfix(uncompressed, options.getCompressWhitespace());
@@ -640,7 +650,7 @@ protected void endup() {
// note that this doesn't change < and > of tag shortcuts
translation = HTMLUtils.charsToEntities(translation, filter.getTargetEncoding(), sShortcuts);
// expands tag shortcuts into full-blown tags
- translation = unshorcutize(translation);
+ translation = revertShortcut(translation);
// writing out the paragraph into target file
writeout(spacePrefix);
writeout(translation);
@@ -651,6 +661,8 @@ protected void endup() {
Node node = allNodesInParagraph.get(i);
if (node instanceof Tag) {
writeout("<" + node.getText() + ">");
+ } else if (node instanceof Remark) {
+ writeout(node.toHtml());
} else {
writeout(compressWhitespace(node.getText()));
}
@@ -678,7 +690,7 @@ private void cleanup() {
/**
* Creates and stores a shortcut for the tag.
*/
- private void shortcut(Tag tag, StringBuilder paragraph) {
+ private void assignShortcut(Tag tag, StringBuilder paragraph) {
StringBuilder result = new StringBuilder();
result.append('<');
int n = -1;
@@ -687,17 +699,18 @@ private void shortcut(Tag tag, StringBuilder paragraph) {
// trying to lookup for appropriate starting tag
int recursion = 1;
for (int i = sTags.size() - 1; i >= 0; i--) {
- Tag othertag = sTags.get(i);
- if (othertag.getTagName().equals(tag.getTagName())) {
- if (othertag.isEndTag()) {
- recursion++;
- } else {
- recursion--;
- if (recursion == 0) {
- // we've found a starting tag for this ending one
- // !!!
- n = sTagNumbers.get(i);
- break;
+ if (sTags.get(i) instanceof Tag) {
+ Tag othertag = (Tag) sTags.get(i);
+ if (othertag.getTagName().equals(tag.getTagName())) {
+ if (othertag.isEndTag()) {
+ recursion++;
+ } else {
+ recursion--;
+ if (recursion == 0) {
+ // found starting tag for this endTag
+ n = sTagNumbers.get(i);
+ break;
+ }
}
}
}
@@ -742,23 +755,51 @@ private void shortcut(Tag tag, StringBuilder paragraph) {
paragraph.append(shortcut);
}
+ /**
+ * Creates and stores a shortcut for the comment (Remark node).
+ */
+ private void assignShortcut(Remark remark, StringBuilder paragraph) {
+ StringBuilder result = new StringBuilder();
+ int n = sNumShortcuts++;
+ result.append("@@ -810,20 +865,28 @@ protected void queuePrefix(Tag tag) { } /** - * Queues up some text, possibly before a meaningful text. If the text is - * collected now, the tag is queued up as translatable by calling - * {@link #queueTranslatable(Tag)}, otherwise it's collected to a special - * list that is inspected when the translatable text is sent to OmegaT core. + * Queues up some Text node, possibly before more meaningful text. + * The Text node is added to the precedingNodes list. */ private void queuePrefix(Text txt) { precedingNodes.add(txt); } + /** + * Queues up some Remark node (HTML comment), possibly before more meaningful + * text. The Remark node is added to the precedingNodes list. + */ + private void queuePrefix(Remark remark) { + precedingNodes.add(remark); + } + /** Saves "precedingNodes" to output stream and cleans the list. */ private void writeOutPrecedingNodes() { for (Node node : precedingNodes) { if (node instanceof Tag) { writeout("<" + node.getText() + ">"); + } else if (node instanceof Remark) { + writeout(node.toHtml()); } else { writeout(compressWhitespace(node.getText())); } diff --git a/test/data/filters/html/file-HTMLFilter2-ignored-comments-no-break-SF610.html b/test/data/filters/html/file-HTMLFilter2-ignored-comments-no-break-SF610.html new file mode 100644 index 0000000000..3d79a73477 --- /dev/null +++ b/test/data/filters/html/file-HTMLFilter2-ignored-comments-no-break-SF610.html @@ -0,0 +1,11 @@ + + +
++ This is the first line. +
+ This is the second line. +
+ + + \ No newline at end of file diff --git a/test/src/org/omegat/filters/HTMLFilter2Test.java b/test/src/org/omegat/filters/HTMLFilter2Test.java index 975dc361a4..9b13d5dae2 100644 --- a/test/src/org/omegat/filters/HTMLFilter2Test.java +++ b/test/src/org/omegat/filters/HTMLFilter2Test.java @@ -54,6 +54,17 @@ public void testParse() throws Exception { assertEquals("This is second line.", entries.get(2)); } + @Test + public void testIgnoreCommentParse() throws Exception { + Map