You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/07/31 09:07:29 UTC

[maven-doxia] branch DOXIA-599 updated (5cf32f19 -> 6b5d94d1)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch DOXIA-599
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git


    omit 5cf32f19 [DOXIA-599] Replace <a /> element's name attribute with id attribute
     add d32ab08b [DOXIA-666] Remove code duplication Xhtml5Sink
     add 03ceb77b [DOXIA-665] Add anchors around FML parts
     new 6b5d94d1 [DOXIA-599] Replace <a /> element's name attribute with id attribute

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5cf32f19)
            \
             N -- N -- N   refs/heads/DOXIA-599 (6b5d94d1)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/maven/doxia/module/fml/FmlParser.java   |   2 +
 .../maven/doxia/module/fml/FmlParserTest.java      |   4 +
 .../maven/doxia/module/xhtml5/Xhtml5Sink.java      | 106 ---------------------
 3 files changed, 6 insertions(+), 106 deletions(-)


[maven-doxia] 01/01: [DOXIA-599] Replace element's name attribute with id attribute

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch DOXIA-599
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git

commit 6b5d94d18876b7e95773edbbac47afb9691973e1
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Wed Jul 27 18:16:54 2022 +0200

    [DOXIA-599] Replace <a /> element's name attribute with id attribute
---
 .../src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java  | 2 +-
 .../test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java  | 2 +-
 .../src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java  | 2 +-
 .../src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java  | 2 +-
 .../test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5SinkTest.java  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
index a7bc84c7..5a9a4cc7 100644
--- a/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
+++ b/doxia-core/src/main/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSink.java
@@ -1771,7 +1771,7 @@ public class Xhtml5BaseSink
         }
 
         MutableAttributeSet att = new SinkEventAttributeSet();
-        att.addAttribute( Attribute.NAME, id );
+        att.addAttribute( Attribute.ID, id );
         att.addAttributes( atts );
 
         writeStartTag( HtmlMarkup.A, att );
diff --git a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
index 6bc76fbc..2ac2dbc8 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
@@ -1254,7 +1254,7 @@ public class Xhtml5BaseSinkTest
             sink.close();
         }
 
-        assertEquals( "<a name=\"anchor\" style=\"bold\"></a>", writer.toString() );
+        assertEquals( "<a id=\"anchor\" style=\"bold\"></a>", writer.toString() );
     }
 
     /**
diff --git a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
index 7d9457df..e6c22128 100644
--- a/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
+++ b/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java
@@ -289,7 +289,7 @@ public class FmlParserTest
             content = IOUtil.toString( reader );
         }
 
-        assertTrue( content.contains( "<a name=\"macro-definition\">Macro Question</a>" ) );
+        assertTrue( content.contains( "<a id=\"macro-definition\">Macro Question</a>" ) );
     }
 
     private void assertTextEvent( SinkEventElement textEvt, String string )
diff --git a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
index 3f2ca708..3e8613f8 100644
--- a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
+++ b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
@@ -293,7 +293,7 @@ public class XdocSinkTest
     /** {@inheritDoc} */
     protected String getAnchorBlock( String anchor )
     {
-        return "<a name=\"" + anchor + "\">" + anchor + "</a>";
+        return "<a id=\"" + anchor + "\">" + anchor + "</a>";
     }
 
     /** {@inheritDoc} */
diff --git a/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5SinkTest.java b/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5SinkTest.java
index 093db562..9b900454 100644
--- a/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5SinkTest.java
+++ b/doxia-modules/doxia-module-xhtml5/src/test/java/org/apache/maven/doxia/module/xhtml5/Xhtml5SinkTest.java
@@ -297,7 +297,7 @@ public class Xhtml5SinkTest
     /** {@inheritDoc} */
     protected String getAnchorBlock( String anchor )
     {
-        return "<a name=\"" + anchor + "\">" + anchor + "</a>";
+        return "<a id=\"" + anchor + "\">" + anchor + "</a>";
     }
 
     /** {@inheritDoc} */