This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch DOXIA-619 in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 27ac349180049d769585e5cd2e7f7979af596287 Author: Michael Osipov <[email protected]> AuthorDate: Sat Jun 26 13:30:44 2021 +0200 First shot --- .../src/test/resources/site/xdoc/references/xdoc-format.xml | 2 +- .../maven/doxia/siterenderer/resources/css/maven-base.css | 2 +- .../maven/doxia/siterenderer/resources/default-site-macros.vm | 6 +++--- .../src/test/resources/site-validate/xdoc/entityTest.xml | 10 +++++----- doxia-site-renderer/src/test/resources/site/xdoc/macro.xml | 6 +++--- .../src/test/resources/site/xdoc/nestedItems.xml | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doxia-doc-renderer/src/test/resources/site/xdoc/references/xdoc-format.xml b/doxia-doc-renderer/src/test/resources/site/xdoc/references/xdoc-format.xml index ff935e6..4b16045 100644 --- a/doxia-doc-renderer/src/test/resources/site/xdoc/references/xdoc-format.xml +++ b/doxia-doc-renderer/src/test/resources/site/xdoc/references/xdoc-format.xml @@ -110,7 +110,7 @@ code line 2 <code><h6></code>) inside a subsection. For instance, </p> - <source><![CDATA[<h4>A subsubsection</h4>]]></source> + <source><![CDATA[<h3>A subsubsection</h3>]]></source> <p> will produce: diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css index 45dc441..8ad7892 100644 --- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css +++ b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/css/maven-base.css @@ -76,7 +76,7 @@ div.clear hr { #navcolumn { padding: 8px 4px 0 8px; } -#navcolumn h5 { +#navcolumn h4 { margin: 0; padding: 0; font-size: small; diff --git a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm index a2371dc..1d5231c 100644 --- a/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm +++ b/doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site-macros.vm @@ -287,12 +287,12 @@ $indent </ul>## #* *##set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + $title + "/>" ) ## #* *##if ( $position == "left" ) - <h5>$img $menu.name</h5> + <h4>$img $menu.name</h4> #* *##else - <h5>$menu.name $img</h5> + <h4>$menu.name $img</h4> #* *##end #* *##else - <h5>$menu.name</h5> + <h4>$menu.name</h4> #* *##end #* *##end #* *##if ( $menu.items && $menu.items.size() > 0 ) diff --git a/doxia-site-renderer/src/test/resources/site-validate/xdoc/entityTest.xml b/doxia-site-renderer/src/test/resources/site-validate/xdoc/entityTest.xml index 48460b7..f524fe7 100644 --- a/doxia-site-renderer/src/test/resources/site-validate/xdoc/entityTest.xml +++ b/doxia-site-renderer/src/test/resources/site-validate/xdoc/entityTest.xml @@ -50,17 +50,17 @@ <section name="section name with entities: '&' 'Α' ' ' '&tritPos;'"> - <h4>Entities</h4> - <h3>Generic Entities: '&' '<' '>' '"' '''</h3> + <h3>Entities</h3> + <h2>Generic Entities: '&' '<' '>' '"' '''</h2> <p>'&' '<' '>' '"' '''</p> - <h3>Local Entities: 'Α' 'Β' 'Γ' '&tritPos;'</h3> + <h2>Local Entities: 'Α' 'Β' 'Γ' '&tritPos;'</h2> <p>'Α' 'Β' 'Γ' '&tritPos;𝟭' '&flo;ř' '&myCustomEntity;'</p> - <h3>DTD Entities: ' ' '¡' '¢'</h3> + <h2>DTD Entities: ' ' '¡' '¢'</h2> <p>' ' '¡' '¢'</p> - <h4>CDATA</h4> + <h3>CDATA</h3> <source><![CDATA[<project xmlns:ant="jelly:ant">]]></source> <p><![CDATA[' ' '¡']]></p> diff --git a/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml b/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml index b57d9c5..7d3f0bf 100644 --- a/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml +++ b/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml @@ -50,7 +50,7 @@ <section name="TITLE 1"> <subsection name="SUB TITLE 1.1"><p>bla bla...</p></subsection> <subsection name="SUB TITLE 1.2"><p>bla bla...</p> - <h4>SUB SUB TITLE 1.2.1</h4> + <h3>SUB SUB TITLE 1.2.1</h3> </subsection> <subsection name="SUB TITLE 1.3"><p>bla bla...</p></subsection> </section> @@ -58,7 +58,7 @@ <section name="TITLE 2"> <subsection name="SUB TITLE 2.1"><p>bla bla...</p></subsection> <subsection name="SUB TITLE 2.2"><p>bla bla...</p> - <h4>SUB SUB TITLE 2.2.1</h4> + <h3>SUB SUB TITLE 2.2.1</h3> </subsection> <subsection name="SUB TITLE 2.3"><p>bla bla...</p></subsection> </section> @@ -66,7 +66,7 @@ <section name="TITLE 3"> <subsection name="SUB TITLE 3.1"><p>bla bla...</p> </subsection> <subsection name="SUB TITLE 3.2"><p>bla bla...</p> - <h4>SUB SUB TITLE 3.2.1</h4> + <h3>SUB SUB TITLE 3.2.1</h3> </subsection> <subsection name="SUB TITLE 3.3"><p>bla bla...</p></subsection> </section> diff --git a/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml b/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml index 5ffa9b8..a24d413 100644 --- a/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml +++ b/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml @@ -27,7 +27,7 @@ under the License. <body> <section name="List Section"> - <h4>Unordered lists</h4> + <h3>Unordered lists</h3> <p> Below is an unordered list, followed by six paragraphs. </p> @@ -92,7 +92,7 @@ under the License. Paragraph 6 below list. </p> - <h4>Ordered lists</h4> + <h3>Ordered lists</h3> <p> Below is an ordered list, followed by six paragraphs. </p> @@ -157,7 +157,7 @@ under the License. Paragraph 6 below list. </p> - <h4>Definition lists</h4> + <h3>Definition lists</h3> <p> Below is a definition list, followed by six paragraphs. </p>
