This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch DOXIA-668 in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
commit 13dcd963f59e26a6228fc9e9da341e7a9e9b8eb7 Author: Michael Osipov <[email protected]> AuthorDate: Sat Oct 1 20:37:04 2022 +0200 [DOXIA-672] Parse id attribute only on <a /> elements by default In DOXIA-599 the sink was modified, now the parser is modified to only recognize id attribute. --- .../org/apache/maven/doxia/parser/Xhtml5BaseParser.java | 17 +++-------------- .../apache/maven/doxia/parser/Xhtml5BaseParserTest.java | 4 ++-- .../doxia-module-xhtml5/src/test/resources/test.xhtml | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java index 6672f280..52b2381f 100644 --- a/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java +++ b/doxia-core/src/main/java/org/apache/maven/doxia/parser/Xhtml5BaseParser.java @@ -632,7 +632,6 @@ public class Xhtml5BaseParser else if ( parser.getName().equals( HtmlMarkup.TABLE.toString() ) ) { sink.tableRows_(); - sink.table_(); } else if ( parser.getName().equals( HtmlMarkup.TR.toString() ) ) @@ -1044,22 +1043,12 @@ public class Xhtml5BaseParser } else { - String name = parser.getAttributeValue( null, Attribute.NAME.toString() ); - - if ( name != null ) + String id = parser.getAttributeValue( null, Attribute.ID.toString() ); + if ( id != null ) { - sink.anchor( validAnchor( name ), attribs ); + sink.anchor( validAnchor( id ), attribs ); isAnchor = true; } - else - { - String id = parser.getAttributeValue( null, Attribute.ID.toString() ); - if ( id != null ) - { - sink.anchor( validAnchor( id ), attribs ); - isAnchor = true; - } - } } } diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java index 9fd83ef4..05c073f4 100644 --- a/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java +++ b/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java @@ -739,8 +739,8 @@ public class Xhtml5BaseParserTest "<a href=\"valid\"></a>" + "<a href=\"#1invalid\"></a>" + "<a href=\"http://www.fo.com/index.html#1invalid\";></a>" + - "<a name=\"valid\"></a>" + - "<a name=\"1invalid\"></a>" + + "<a id=\"valid\"></a>" + + "<a id=\"1invalid\"></a>" + "<a id=\"1invalid\"></a></div>"; parser.parse( text, sink ); diff --git a/doxia-modules/doxia-module-xhtml5/src/test/resources/test.xhtml b/doxia-modules/doxia-module-xhtml5/src/test/resources/test.xhtml index a93e0d3f..7fa89509 100644 --- a/doxia-modules/doxia-module-xhtml5/src/test/resources/test.xhtml +++ b/doxia-modules/doxia-module-xhtml5/src/test/resources/test.xhtml @@ -114,7 +114,7 @@ under the License. <p><i>Italic</i> font. <b>Bold</b> font. <code>Monospaced</code> font.</p> <p> - <a name="Anchor">Anchor</a>. + <a id="Anchor">Anchor</a>. Link to <a href="#Anchor">Anchor</a>. Link to <a href="http://www.pixware.fr"; class="externalLink">http://www.pixware.fr</a>. Link to <a href="#Anchor">showing alternate text</a>.
