diff --git a/packages/guides-restructured-text/resources/template/html/body/directive/confval.html.twig b/packages/guides-restructured-text/resources/template/html/body/directive/confval.html.twig index ab31c44a1..0716a2e88 100644 --- a/packages/guides-restructured-text/resources/template/html/body/directive/confval.html.twig +++ b/packages/guides-restructured-text/resources/template/html/body/directive/confval.html.twig @@ -1,5 +1,5 @@
-
+
{{ node.plainContent }}
diff --git a/packages/guides-restructured-text/src/RestructuredText/Directives/ConfvalDirective.php b/packages/guides-restructured-text/src/RestructuredText/Directives/ConfvalDirective.php index 9c978f6d4..b157d290f 100644 --- a/packages/guides-restructured-text/src/RestructuredText/Directives/ConfvalDirective.php +++ b/packages/guides-restructured-text/src/RestructuredText/Directives/ConfvalDirective.php @@ -83,6 +83,8 @@ protected function processSub( $type = $this->inlineParser->parse($directive->getOption('default')->toString(), $blockContext); } + $noindex = $directive->hasOption('noindex'); + foreach ($directive->getOptions() as $option) { if (in_array($option->getName(), ['type', 'required', 'default', 'noindex', 'name'], true)) { continue; @@ -91,6 +93,6 @@ protected function processSub( $additionalOptions[$option->getName()] = $this->inlineParser->parse($option->toString(), $blockContext); } - return new ConfvalNode($id, $directive->getData(), $type, $required, $default, $additionalOptions, $collectionNode->getChildren()); + return new ConfvalNode($id, $directive->getData(), $type, $required, $default, $additionalOptions, $collectionNode->getChildren(), $noindex); } } diff --git a/packages/guides-restructured-text/src/RestructuredText/Nodes/ConfvalNode.php b/packages/guides-restructured-text/src/RestructuredText/Nodes/ConfvalNode.php index c092dfc07..7045d7476 100644 --- a/packages/guides-restructured-text/src/RestructuredText/Nodes/ConfvalNode.php +++ b/packages/guides-restructured-text/src/RestructuredText/Nodes/ConfvalNode.php @@ -17,6 +17,7 @@ use phpDocumentor\Guides\Nodes\InlineCompoundNode; use phpDocumentor\Guides\Nodes\LinkTargetNode; use phpDocumentor\Guides\Nodes\Node; +use phpDocumentor\Guides\Nodes\OptionalLinkTargetsNode; /** * The confval directive configuration values. @@ -25,7 +26,7 @@ * * @extends CompoundNode */ -final class ConfvalNode extends CompoundNode implements LinkTargetNode +final class ConfvalNode extends CompoundNode implements LinkTargetNode, OptionalLinkTargetsNode { public const LINK_TYPE = 'std:confval'; @@ -41,6 +42,7 @@ public function __construct( private readonly InlineCompoundNode|null $default = null, private readonly array $additionalOptions = [], array $value = [], + private readonly bool $noindex = false, ) { parent::__construct($value); } @@ -85,4 +87,9 @@ public function getAdditionalOptions(): array { return $this->additionalOptions; } + + public function isNoindex(): bool + { + return $this->noindex; + } } diff --git a/packages/guides/src/Compiler/NodeTransformers/CollectLinkTargetsTransformer.php b/packages/guides/src/Compiler/NodeTransformers/CollectLinkTargetsTransformer.php index 86a5187ca..11ee71f88 100644 --- a/packages/guides/src/Compiler/NodeTransformers/CollectLinkTargetsTransformer.php +++ b/packages/guides/src/Compiler/NodeTransformers/CollectLinkTargetsTransformer.php @@ -21,6 +21,7 @@ use phpDocumentor\Guides\Nodes\LinkTargetNode; use phpDocumentor\Guides\Nodes\MultipleLinkTargetsNode; use phpDocumentor\Guides\Nodes\Node; +use phpDocumentor\Guides\Nodes\OptionalLinkTargetsNode; use phpDocumentor\Guides\Nodes\SectionNode; use phpDocumentor\Guides\ReferenceResolvers\AnchorNormalizer; use Psr\Log\LoggerInterface; @@ -94,6 +95,10 @@ public function enterNode(Node $node, CompilerContext $compilerContext): Node } if ($node instanceof LinkTargetNode) { + if ($node instanceof OptionalLinkTargetsNode && $node->isNoindex()) { + return $node; + } + $currentDocument = $this->documentStack->top(); Assert::notNull($currentDocument); $anchor = $this->anchorReducer->reduceAnchor($node->getId()); diff --git a/packages/guides/src/Nodes/OptionalLinkTargetsNode.php b/packages/guides/src/Nodes/OptionalLinkTargetsNode.php new file mode 100644 index 000000000..46453d573 --- /dev/null +++ b/packages/guides/src/Nodes/OptionalLinkTargetsNode.php @@ -0,0 +1,26 @@ + - - Another Page - Bootstrap Theme - - - - - - - -
- - +
+
+
+
+
+
+ + -
-

Another Page

- -

Lorem Ipsum Dolor.

- -
- -
-
+
+
+ + + + +
+

Another Page

+ +

Lorem Ipsum Dolor.

+ +
+
-
-
+
+ + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/index.html b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/index.html index 6dbd12d5b..355c0799a 100644 --- a/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/index.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/index.html @@ -1,189 +1,189 @@ - - Document Title - Bootstrap Theme - - - - - - - -
- - -
-
-
-
-
-
- - - -
-
- - - - -
-

Document Title

- -

Lorem Ipsum Dolor.

- -
-

Main Menu

- -
-
-

Additional Menu

- -
-
- -
-
+
+ + + + +
+

Document Title

+ +

Lorem Ipsum Dolor.

+ +
+

Main Menu

+ +
+
+

Additional Menu

+ +
+
+
-
-
+ diff --git a/tests/Integration/tests/configuration/config-simple/expected/index.html b/tests/Integration/tests/configuration/config-simple/expected/index.html index 38c73b16a..82ad60194 100644 --- a/tests/Integration/tests/configuration/config-simple/expected/index.html +++ b/tests/Integration/tests/configuration/config-simple/expected/index.html @@ -2,8 +2,9 @@

Document Title

-

Lorem Ipsum Dolor.

+

Lorem Ipsum Dolor.

+ 
$some = 'PHP code';
-
+ diff --git a/tests/Integration/tests/confval/confval-name/expected/another.html b/tests/Integration/tests/confval/confval-name/expected/another.html index 9305c7a54..72b040cdf 100644 --- a/tests/Integration/tests/confval/confval-name/expected/another.html +++ b/tests/Integration/tests/confval/confval-name/expected/another.html @@ -1,31 +1,27 @@ - - - - Confval directive - - - - -
+ +

Confval directive

-
-
- demo
-
-
-
Type: "Hello World"
-
Required: true
-
Custom Info: custom
-
-
-

This is the confval demo content!

-

Another paragraph.

-
-
-
-

See option demo.

+
+ demo
+
+
+
Type: "Hello World"
+
Required: true
+
Custom Info: custom
+ +
+
+ +

This is the confval demo content!

+ +

Another paragraph.

+
- - - +
+ + +

See option demo.

+ +
+ diff --git a/tests/Integration/tests/confval/confval-name/expected/index.html b/tests/Integration/tests/confval/confval-name/expected/index.html index 16cea5c5f..274055cb0 100644 --- a/tests/Integration/tests/confval/confval-name/expected/index.html +++ b/tests/Integration/tests/confval/confval-name/expected/index.html @@ -1,37 +1,36 @@ - - - - Confval directive - - - -
+ +

Confval directive

-
-
- demo
-
-
-
Type: "Hello World"
-
Required: true
-
Custom Info: custom
-
-
-

This is the confval demo content!

-

Another paragraph.

-
-
-
-

See option demo.

-
- +
+ demo
+
+
+
Type: "Hello World"
+
Required: true
+
Custom Info: custom
+
+
+ +

This is the confval demo content!

+ +

Another paragraph.

+
- - - +
+ + +

See option demo.

+ +
+ +
+
+ diff --git a/tests/Integration/tests/confval/confval-noindex/expected/another.html b/tests/Integration/tests/confval/confval-noindex/expected/another.html new file mode 100644 index 000000000..c92d9aa22 --- /dev/null +++ b/tests/Integration/tests/confval/confval-noindex/expected/another.html @@ -0,0 +1,27 @@ + +
+

Confval directive

+
+
+ demo
+
+
+
Type: "Hello World"
+
Required: true
+
Custom Info: custom
+ +
+
+ +

This is the confval demo content!

+ +

Another paragraph.

+ +
+
+
+ +

See option demo.

+ +
+ diff --git a/tests/Integration/tests/confval/confval-noindex/expected/index.html b/tests/Integration/tests/confval/confval-noindex/expected/index.html new file mode 100644 index 000000000..274055cb0 --- /dev/null +++ b/tests/Integration/tests/confval/confval-noindex/expected/index.html @@ -0,0 +1,36 @@ + +
+

Confval directive

+
+
+ demo
+
+
+
Type: "Hello World"
+
Required: true
+
Custom Info: custom
+ +
+
+ +

This is the confval demo content!

+ +

Another paragraph.

+ +
+
+
+ +

See option demo.

+ +
+ +
+
+ diff --git a/tests/Integration/tests/confval/confval-noindex/expected/objects.inv.json b/tests/Integration/tests/confval/confval-noindex/expected/objects.inv.json new file mode 100644 index 000000000..d3cc33c90 --- /dev/null +++ b/tests/Integration/tests/confval/confval-noindex/expected/objects.inv.json @@ -0,0 +1,32 @@ +{ + "std:doc": { + "another": [ + "-", + "-", + "another.html", + "Confval directive" + ], + "index": [ + "-", + "-", + "index.html", + "Confval directive" + ] + }, + "std:label": { + "confval-directive": [ + "-", + "-", + "index.html#confval-directive", + "Confval directive" + ] + }, + "std:confval": { + "demo": [ + "-", + "-", + "index.html#demo", + "demo" + ] + } +} \ No newline at end of file diff --git a/tests/Integration/tests/confval/confval-noindex/input/another.rst b/tests/Integration/tests/confval/confval-noindex/input/another.rst new file mode 100644 index 000000000..f1c28fcfd --- /dev/null +++ b/tests/Integration/tests/confval/confval-noindex/input/another.rst @@ -0,0 +1,15 @@ +Confval directive +================= + +.. confval:: demo + :type: :php:`string` + :default: ``"Hello World"`` + :required: true + :Custom Info: **custom** + :noindex: + + This is the confval ``demo`` content! + + Another paragraph. + +See option :confval:`demo`. \ No newline at end of file diff --git a/tests/Integration/tests/confval/confval-noindex/input/index.rst b/tests/Integration/tests/confval/confval-noindex/input/index.rst new file mode 100644 index 000000000..68c08f569 --- /dev/null +++ b/tests/Integration/tests/confval/confval-noindex/input/index.rst @@ -0,0 +1,19 @@ +Confval directive +================= + +.. confval:: demo + :type: :php:`string` + :default: ``"Hello World"`` + :required: true + :Custom Info: **custom** + + This is the confval ``demo`` content! + + Another paragraph. + +See option :confval:`demo`. + +.. toctree:: + :glob: + + * diff --git a/tests/Integration/tests/confval/confval-warning/expected/another.html b/tests/Integration/tests/confval/confval-warning/expected/another.html index 4846e0a3b..29f982b47 100644 --- a/tests/Integration/tests/confval/confval-warning/expected/another.html +++ b/tests/Integration/tests/confval/confval-warning/expected/another.html @@ -1,31 +1,27 @@ - - - - Confval directive - - - - -
+ +

Confval directive

-
-
- demo
-
-
-
Type: "Hello World"
-
Required: true
-
Custom Info: custom
-
-
-

This is the confval demo content!

-

Another paragraph.

-
-
-
-

See option demo.

+
+ demo
+
+
+
Type: "Hello World"
+
Required: true
+
Custom Info: custom
+ +
+
+ +

This is the confval demo content!

+ +

Another paragraph.

+
- - - +
+ + +

See option demo.

+ +
+ diff --git a/tests/Integration/tests/confval/confval-warning/expected/index.html b/tests/Integration/tests/confval/confval-warning/expected/index.html index 016178a6f..206975b33 100644 --- a/tests/Integration/tests/confval/confval-warning/expected/index.html +++ b/tests/Integration/tests/confval/confval-warning/expected/index.html @@ -1,38 +1,36 @@ - - - - Confval directive - - - - -
+ +

Confval directive

-
-
- demo
-
-
-
Type: "Hello World"
-
Required: true
-
Custom Info: custom
-
-
-

This is the confval demo content!

-

Another paragraph.

-
-
-
-

See option demo.

-
- +
+ demo
+
+
+
Type: "Hello World"
+
Required: true
+
Custom Info: custom
+
+
+ +

This is the confval demo content!

+ +

Another paragraph.

+
- - - +
+ + +

See option demo.

+ +
+ +
+
+ diff --git a/tests/Integration/tests/directives/directive-configuration-block/expected/index.html b/tests/Integration/tests/directives/directive-configuration-block/expected/index.html index 58036f796..bc56ad509 100644 --- a/tests/Integration/tests/directives/directive-configuration-block/expected/index.html +++ b/tests/Integration/tests/directives/directive-configuration-block/expected/index.html @@ -1,7 +1,6 @@

Directive tests

-
-
- diff --git a/tests/Integration/tests/directives/directive-glossary/expected/index.html b/tests/Integration/tests/directives/directive-glossary/expected/index.html index 74518215f..703bbfe99 100644 --- a/tests/Integration/tests/directives/directive-glossary/expected/index.html +++ b/tests/Integration/tests/directives/directive-glossary/expected/index.html @@ -1,17 +1,17 @@ -
-

Directive tests

+
+

Directive tests

+
+
environment
-
-
environment
-
A structure where information about all documents under the root is - saved, and used for cross-referencing. The environment is pickled - after the parsing stage, so that successive runs only need to read - and parse new and changed documents.
+
A structure where information about all documents under the root is +saved, and used for cross-referencing. The environment is pickled +after the parsing stage, so that successive runs only need to read +and parse new and changed documents.
+
source directory
-
source directory
-
The directory which, including its subdirectories, contains all - source files for one documentation project.
-
-
+
The directory which, including its subdirectories, contains all +source files for one documentation project.
+
+
diff --git a/tests/Integration/tests/directives/directive-math/expected/index.html b/tests/Integration/tests/directives/directive-math/expected/index.html index abade1ad4..73a18c3c8 100644 --- a/tests/Integration/tests/directives/directive-math/expected/index.html +++ b/tests/Integration/tests/directives/directive-math/expected/index.html @@ -1,7 +1,6 @@

Directive tests

- α t @@ -23,7 +22,5 @@

Directive tests

λ ) -
- diff --git a/tests/Integration/tests/directives/directive-only/expected/index.html b/tests/Integration/tests/directives/directive-only/expected/index.html index f4df0690e..df6e2d4b2 100644 --- a/tests/Integration/tests/directives/directive-only/expected/index.html +++ b/tests/Integration/tests/directives/directive-only/expected/index.html @@ -2,9 +2,11 @@

Directive tests

-

This is only displayed in HTML.

+

This is only displayed in HTML.

+ -

This is only displayed in both HTML and Latex.

-
+

This is only displayed in both HTML and Latex.

+ +
diff --git a/tests/Integration/tests/directives/directive-only/expected/index.tex b/tests/Integration/tests/directives/directive-only/expected/index.tex index 668c2ea33..76bcf6b27 100644 --- a/tests/Integration/tests/directives/directive-only/expected/index.tex +++ b/tests/Integration/tests/directives/directive-only/expected/index.tex @@ -16,4 +16,4 @@ This is only displayed in Latex. This is only displayed in both HTML and Latex. -\end{document} +\end{document} \ No newline at end of file diff --git a/tests/Integration/tests/directives/directive-topic/expected/index.html b/tests/Integration/tests/directives/directive-topic/expected/index.html index de5e7d10e..a4b018a37 100644 --- a/tests/Integration/tests/directives/directive-topic/expected/index.html +++ b/tests/Integration/tests/directives/directive-topic/expected/index.html @@ -1,12 +1,14 @@ -
-

Directive tests

+
+

Directive tests

+ +
+

This is the topic

+ +

Lorem Ipsum Dolor

+
Some Rubric
+

Dolor sit!

-
-

This is the topic

-

Lorem Ipsum Dolor

-
Some Rubric
-

Dolor sit!

-
+
diff --git a/tests/Integration/tests/directives/directive-unkown/expected/index.html b/tests/Integration/tests/directives/directive-unkown/expected/index.html index 7b8553c11..50c4ca6ac 100644 --- a/tests/Integration/tests/directives/directive-unkown/expected/index.html +++ b/tests/Integration/tests/directives/directive-unkown/expected/index.html @@ -1,10 +1,10 @@

Test

- .. some-unknown-directive:: with Content -

And sub-content.

-
+

And sub-content.

+ +
diff --git a/tests/Integration/tests/directives/directive-wrap/expected/index.html b/tests/Integration/tests/directives/directive-wrap/expected/index.html index 6978e02cc..cdd4b0137 100644 --- a/tests/Integration/tests/directives/directive-wrap/expected/index.html +++ b/tests/Integration/tests/directives/directive-wrap/expected/index.html @@ -1,10 +1,9 @@ -
-

Directive tests

- -
-

Lorem Ipsum Dolor

-
+
+

Directive tests

+
+

Lorem Ipsum Dolor

+
diff --git a/tests/Integration/tests/directives/include/expected/index.html b/tests/Integration/tests/directives/include/expected/index.html index 775bf3a5f..f6dd0759f 100644 --- a/tests/Integration/tests/directives/include/expected/index.html +++ b/tests/Integration/tests/directives/include/expected/index.html @@ -2,8 +2,5 @@

Document

- -
- diff --git a/tests/Integration/tests/directives/role-directive/expected/index.html b/tests/Integration/tests/directives/role-directive/expected/index.html index 14d1e203c..7006f0571 100644 --- a/tests/Integration/tests/directives/role-directive/expected/index.html +++ b/tests/Integration/tests/directives/role-directive/expected/index.html @@ -2,12 +2,22 @@

Some Title

-

An example of using interpreted text

-

text

-

raw text

-

interpreted text

-

An example of a default role.

-

An example of a custom default role.

-
+

An example of using interpreted text

+ + +

text

+ + +

raw text

+ +

interpreted text

+ + +

An example of a default role.

+ + +

An example of a custom default role.

+ +
diff --git a/tests/Integration/tests/directives/role-directive/expected/someFile.html b/tests/Integration/tests/directives/role-directive/expected/someFile.html index cd2281853..315eab3af 100644 --- a/tests/Integration/tests/directives/role-directive/expected/someFile.html +++ b/tests/Integration/tests/directives/role-directive/expected/someFile.html @@ -2,7 +2,7 @@

Some File

-

The default role is applied by the standard, changes from another document are not applied.

-
+

The default role is applied by the standard, changes from another document are not applied.

+
diff --git a/tests/Integration/tests/directives/sectionauthor/expected/index.html b/tests/Integration/tests/directives/sectionauthor/expected/index.html index 5d00898d7..d2b3496d2 100644 --- a/tests/Integration/tests/directives/sectionauthor/expected/index.html +++ b/tests/Integration/tests/directives/sectionauthor/expected/index.html @@ -1,33 +1,25 @@

Document Title

-

Some Section

- -
-

Some other section

- - - 
Lorem *Ipsum* Dolor
-
- +
diff --git a/tests/Integration/tests/directives/variables-replace/expected/index.html b/tests/Integration/tests/directives/variables-replace/expected/index.html index c0a0f7bce..c7165afeb 100644 --- a/tests/Integration/tests/directives/variables-replace/expected/index.html +++ b/tests/Integration/tests/directives/variables-replace/expected/index.html @@ -2,7 +2,7 @@

Document Title

-

We are using ReStructuredText here.

-
+

We are using ReStructuredText here.

+
diff --git a/tests/Integration/tests/directives/youtube/expected/index.html b/tests/Integration/tests/directives/youtube/expected/index.html index 8e2b8b468..d29edeb6b 100644 --- a/tests/Integration/tests/directives/youtube/expected/index.html +++ b/tests/Integration/tests/directives/youtube/expected/index.html @@ -1,10 +1,7 @@

Document Title

- -
- diff --git a/tests/Integration/tests/graphs/plantuml-external/expected/Plantuml/index.html b/tests/Integration/tests/graphs/plantuml-external/expected/Plantuml/index.html index 4fda10313..1a93dce09 100644 --- a/tests/Integration/tests/graphs/plantuml-external/expected/Plantuml/index.html +++ b/tests/Integration/tests/graphs/plantuml-external/expected/Plantuml/index.html @@ -1,7 +1,6 @@

Uml Directive

-
@@ -13,5 +12,4 @@

Uml Directive

75038c5ec593504a90a100f9668e1138
Figure 1-1: Application flow
- diff --git a/tests/Integration/tests/graphs/plantuml-external/expected/index.html b/tests/Integration/tests/graphs/plantuml-external/expected/index.html index eba4650f3..a731f116f 100644 --- a/tests/Integration/tests/graphs/plantuml-external/expected/index.html +++ b/tests/Integration/tests/graphs/plantuml-external/expected/index.html @@ -1,26 +1,24 @@ -
-

Uml Directive

- -
+

Uml Directive

+
75038c5ec593504a90a100f9668e1138 -
Figure 1-1: Application flow
-
Figure 1-1: Application flow
+
75038c5ec593504a90a100f9668e1138 -
Figure 1-1: Application flow
-
-
+
+ -
+ +
- +
diff --git a/tests/Integration/tests/graphs/plantuml-inline/expected/index.html b/tests/Integration/tests/graphs/plantuml-inline/expected/index.html index f2eeab029..c886287ba 100644 --- a/tests/Integration/tests/graphs/plantuml-inline/expected/index.html +++ b/tests/Integration/tests/graphs/plantuml-inline/expected/index.html @@ -1,7 +1,6 @@

Uml Directive

-
@@ -13,5 +12,4 @@

Uml Directive

2c5f59f569e09c9c8c693c4e924815fa
Some Caption
- diff --git a/tests/Integration/tests/hyperlink-to-anchor/expected/index.html b/tests/Integration/tests/hyperlink-to-anchor/expected/index.html index c5a2d0958..b4af94eb3 100644 --- a/tests/Integration/tests/hyperlink-to-anchor/expected/index.html +++ b/tests/Integration/tests/hyperlink-to-anchor/expected/index.html @@ -3,14 +3,10 @@

Some file

-
- diff --git a/tests/Integration/tests/hyperlink-to-email/expected/index.html b/tests/Integration/tests/hyperlink-to-email/expected/index.html index 68310488e..4d1fec31a 100644 --- a/tests/Integration/tests/hyperlink-to-email/expected/index.html +++ b/tests/Integration/tests/hyperlink-to-email/expected/index.html @@ -2,7 +2,7 @@

Some file

-

link to email

-
+

link to email

+
diff --git a/tests/Integration/tests/hyperlink-to-page/expected/index.html b/tests/Integration/tests/hyperlink-to-page/expected/index.html index 789940653..6aefa57f8 100644 --- a/tests/Integration/tests/hyperlink-to-page/expected/index.html +++ b/tests/Integration/tests/hyperlink-to-page/expected/index.html @@ -3,14 +3,10 @@

Some file

- - diff --git a/tests/Integration/tests/hyperlink-to-page/expected/subpages/index.html b/tests/Integration/tests/hyperlink-to-page/expected/subpages/index.html index c02d20aa1..9a6d329ec 100644 --- a/tests/Integration/tests/hyperlink-to-page/expected/subpages/index.html +++ b/tests/Integration/tests/hyperlink-to-page/expected/subpages/index.html @@ -4,28 +4,17 @@

Some file

- - diff --git a/tests/Integration/tests/images/figure-relative/expected/index.html b/tests/Integration/tests/images/figure-relative/expected/index.html index c6b19e275..5548c75e4 100644 --- a/tests/Integration/tests/images/figure-relative/expected/index.html +++ b/tests/Integration/tests/images/figure-relative/expected/index.html @@ -1,46 +1,51 @@ -
-

Document Title

+
+

Document Title

Lorem Ipsum Dolor.

-
-

A local image

- -
- Alternative text -
-

Description

-
-
-
-
-

An image with absolute paths

- -
- Alternative text -
-

Description

-
-
+
+

A local image

+
+ Alternative text + + + +
+

Description

+
+
+
+

An image with absolute paths

+
+ Alternative text + + -
-

An image with relative paths

- -
- Alternative text -
-

Description

-
-
+
+

Description

+
+
-
+
+

An image with relative paths

+
+ Alternative text + + +
+

Description

+
+
+ +
+
diff --git a/tests/Integration/tests/images/figure-relative/expected/subfolder/subpage.html b/tests/Integration/tests/images/figure-relative/expected/subfolder/subpage.html index 7d414784c..249b3f25c 100644 --- a/tests/Integration/tests/images/figure-relative/expected/subfolder/subpage.html +++ b/tests/Integration/tests/images/figure-relative/expected/subfolder/subpage.html @@ -1,32 +1,37 @@ -
-

Subpage

+
+

Subpage

Lorem Ipsum Dolor.

-
-

An image with absolute paths

- -
- Alternative text -
-

Description

-
-
+ +
+

An image with absolute paths

+
+ Alternative text + + + +
+

Description

+
+
+
+

An image with relative paths

+
+ Alternative text -
-

An image with relative paths

- -
- Alternative text -
-

Description

-
-
+ + +
+

Description

+
+
+ +
-
diff --git a/tests/Integration/tests/images/image-absolute/expected/index.html b/tests/Integration/tests/images/image-absolute/expected/index.html index 9c86f7796..f2bc59cf7 100644 --- a/tests/Integration/tests/images/image-absolute/expected/index.html +++ b/tests/Integration/tests/images/image-absolute/expected/index.html @@ -2,35 +2,29 @@

Document Title

-

Lorem Ipsum Dolor.

+

Lorem Ipsum Dolor.

+

A local image

- Alternative text
-

An image with absolute paths

- Alternative text
-

An image with relative paths

- Alternative text
-
- diff --git a/tests/Integration/tests/images/image-absolute/expected/subfolder/subpage.html b/tests/Integration/tests/images/image-absolute/expected/subfolder/subpage.html index 10c04f946..00b524396 100644 --- a/tests/Integration/tests/images/image-absolute/expected/subfolder/subpage.html +++ b/tests/Integration/tests/images/image-absolute/expected/subfolder/subpage.html @@ -2,25 +2,21 @@

Subpage

-

Lorem Ipsum Dolor.

+

Lorem Ipsum Dolor.

+

An image with absolute paths

- Alternative text
-

An image with relative paths

- Alternative text
-
- diff --git a/tests/Integration/tests/images/image-relative/expected/index.html b/tests/Integration/tests/images/image-relative/expected/index.html index 1c45b4237..6c502e98f 100644 --- a/tests/Integration/tests/images/image-relative/expected/index.html +++ b/tests/Integration/tests/images/image-relative/expected/index.html @@ -2,35 +2,29 @@

Document Title

-

Lorem Ipsum Dolor.

+

Lorem Ipsum Dolor.

+

A local image

- Alternative text
-

An image with absolute paths

- Alternative text
-

An image with relative paths

- Alternative text
-
- diff --git a/tests/Integration/tests/images/image-relative/expected/subfolder/subpage.html b/tests/Integration/tests/images/image-relative/expected/subfolder/subpage.html index 1d9ae6a08..2e09af754 100644 --- a/tests/Integration/tests/images/image-relative/expected/subfolder/subpage.html +++ b/tests/Integration/tests/images/image-relative/expected/subfolder/subpage.html @@ -2,26 +2,22 @@

Subpage

-

Lorem Ipsum Dolor.

+

Lorem Ipsum Dolor.

+

An image with absolute paths

- Alternative text
-

An image with relative paths

- Alternative text
-
- diff --git a/tests/Integration/tests/images/image-target/expected/index.html b/tests/Integration/tests/images/image-target/expected/index.html index 612df3bd9..88c0cced9 100644 --- a/tests/Integration/tests/images/image-target/expected/index.html +++ b/tests/Integration/tests/images/image-target/expected/index.html @@ -1,59 +1,53 @@ -
- -

Document Title

+
+ +

Document Title

Lorem Ipsum Dolor.

- diff --git a/tests/Integration/tests/interlink/interlink-inventory-page-unknown/expected/Index.html b/tests/Integration/tests/interlink/interlink-inventory-page-unknown/expected/Index.html index 9fefbcb36..eda7ff744 100644 --- a/tests/Integration/tests/interlink/interlink-inventory-page-unknown/expected/Index.html +++ b/tests/Integration/tests/interlink/interlink-inventory-page-unknown/expected/Index.html @@ -2,8 +2,10 @@

Document Title

-

Lorem Ipsum Dolor.

-

See the TYPO3 documentation!

-
+

Lorem Ipsum Dolor.

+ +

See the TYPO3 documentation!

+ +
diff --git a/tests/Integration/tests/interlink/interlink-inventory-reference-unknown/expected/Index.html b/tests/Integration/tests/interlink/interlink-inventory-reference-unknown/expected/Index.html index 9fefbcb36..eda7ff744 100644 --- a/tests/Integration/tests/interlink/interlink-inventory-reference-unknown/expected/Index.html +++ b/tests/Integration/tests/interlink/interlink-inventory-reference-unknown/expected/Index.html @@ -2,8 +2,10 @@

Document Title

-

Lorem Ipsum Dolor.

-

See the TYPO3 documentation!

-
+

Lorem Ipsum Dolor.

+ +

See the TYPO3 documentation!

+ +
diff --git a/tests/Integration/tests/interlink/interlink-inventory-unknown/expected/Index.html b/tests/Integration/tests/interlink/interlink-inventory-unknown/expected/Index.html index 9fefbcb36..eda7ff744 100644 --- a/tests/Integration/tests/interlink/interlink-inventory-unknown/expected/Index.html +++ b/tests/Integration/tests/interlink/interlink-inventory-unknown/expected/Index.html @@ -2,8 +2,10 @@

Document Title

-

Lorem Ipsum Dolor.

-

See the TYPO3 documentation!

-
+

Lorem Ipsum Dolor.

+ +

See the TYPO3 documentation!

+ +
diff --git a/tests/Integration/tests/interlink/interlink-ref-inventory-unknown/expected/Index.html b/tests/Integration/tests/interlink/interlink-ref-inventory-unknown/expected/Index.html index 8fde42119..6425d23ce 100644 --- a/tests/Integration/tests/interlink/interlink-ref-inventory-unknown/expected/Index.html +++ b/tests/Integration/tests/interlink/interlink-ref-inventory-unknown/expected/Index.html @@ -3,8 +3,10 @@

Document Title

-

Lorem Ipsum Dolor.

-

See the TYPO3 documentation!

-
+

Lorem Ipsum Dolor.

+ +

See the TYPO3 documentation!

+ + diff --git a/tests/Integration/tests/interlink/interlink-to-doc-in-path/expected/Index.html b/tests/Integration/tests/interlink/interlink-to-doc-in-path/expected/Index.html index 6ca9325d5..1d74dfdf2 100644 --- a/tests/Integration/tests/interlink/interlink-to-doc-in-path/expected/Index.html +++ b/tests/Integration/tests/interlink/interlink-to-doc-in-path/expected/Index.html @@ -2,8 +2,10 @@

Document Title

-

See Feature: #89010 - Introduce Site Configuration for Distribution Packages.

-

See Feature: #89010 - Introduce Site Configuration for Distribution Packages.

-
+

See Feature: #89010 - Introduce Site Configuration for Distribution Packages.

+ +

See Feature: #89010 - Introduce Site Configuration for Distribution Packages.

+ + diff --git a/tests/Integration/tests/interlink/interlink-to-index/expected/Index.html b/tests/Integration/tests/interlink/interlink-to-index/expected/Index.html index 4efe19d77..adb1d6c73 100644 --- a/tests/Integration/tests/interlink/interlink-to-index/expected/Index.html +++ b/tests/Integration/tests/interlink/interlink-to-index/expected/Index.html @@ -2,8 +2,10 @@

Document Title

-

Lorem Ipsum Dolor.

-

See the TYPO3 documentation

-
+

Lorem Ipsum Dolor.

+ +

See the TYPO3 documentation

+ + diff --git a/tests/Integration/tests/interlink/intersphinx-link/expected/index.html b/tests/Integration/tests/interlink/intersphinx-link/expected/index.html index 20aa3889f..f216e5f4f 100644 --- a/tests/Integration/tests/interlink/intersphinx-link/expected/index.html +++ b/tests/Integration/tests/interlink/intersphinx-link/expected/index.html @@ -2,8 +2,10 @@

Document Title

-

Lorem Ipsum Dolor.

-

See the TYPO3 documentation

-
+

Lorem Ipsum Dolor.

+ +

See the TYPO3 documentation

+ + diff --git a/tests/Integration/tests/interlink/intersphinx-numeric/expected/index.html b/tests/Integration/tests/interlink/intersphinx-numeric/expected/index.html index ab8e3ab92..9c1b9e093 100644 --- a/tests/Integration/tests/interlink/intersphinx-numeric/expected/index.html +++ b/tests/Integration/tests/interlink/intersphinx-numeric/expected/index.html @@ -2,8 +2,10 @@

Document Title

-

Lorem Ipsum Dolor.

-

See the TYPO3 documentation

-
+

Lorem Ipsum Dolor.

+ +

See the TYPO3 documentation

+ + diff --git a/tests/Integration/tests/last-rendered/expected/index.html b/tests/Integration/tests/last-rendered/expected/index.html index 5b86005f6..697d965b0 100644 --- a/tests/Integration/tests/last-rendered/expected/index.html +++ b/tests/Integration/tests/last-rendered/expected/index.html @@ -2,7 +2,7 @@

Document Title

-

Lorem Ipsum Dolor. Sun, 01 Jan 2023 12:00:00 +0000

-
+

Lorem Ipsum Dolor. Sun, 01 Jan 2023 12:00:00 +0000

+ diff --git a/tests/Integration/tests/latex/latex-confval/expected/index.tex b/tests/Integration/tests/latex/latex-confval/expected/index.tex index 274fc62c2..55ee20500 100644 --- a/tests/Integration/tests/latex/latex-confval/expected/index.tex +++ b/tests/Integration/tests/latex/latex-confval/expected/index.tex @@ -24,4 +24,4 @@ This is the confval \texttt{demo} content! \end{description} -\end{document} +\end{document} \ No newline at end of file diff --git a/tests/Integration/tests/latex/latex-index/expected/index.tex b/tests/Integration/tests/latex/latex-index/expected/index.tex index cb4d39d90..f4357da24 100644 --- a/tests/Integration/tests/latex/latex-index/expected/index.tex +++ b/tests/Integration/tests/latex/latex-index/expected/index.tex @@ -14,4 +14,4 @@ \section{Document Title} Lorem Ipsum Dolor. -\end{document} +\end{document} \ No newline at end of file diff --git a/tests/Integration/tests/lists/big-numbers/expected/index.html b/tests/Integration/tests/lists/big-numbers/expected/index.html index 3b0a301b6..9cc00ae5f 100644 --- a/tests/Integration/tests/lists/big-numbers/expected/index.html +++ b/tests/Integration/tests/lists/big-numbers/expected/index.html @@ -1,27 +1,35 @@ -
-

Some Document

- -
    -
  1. -

    First Item

    -

    This is the body text

    -
    2. -
  2. -

    Second Item

    -

    More body text

    -
    3. -
- -
    -
  1. -

    And then with xxl big numbers

    -

    This is the body text

    -
    2. -
  2. -

    The second xxl item

    -

    More body text ....

    -
    3. -
-
+
+

Some Document

+ + +
    +
  1. +

    First Item

    + +

    This is the body text

    +
    2. +
  2. +

    Second Item

    + +

    More body text

    +
    3. +
+ + + +
    +
  1. +

    And then with xxl big numbers

    + +

    This is the body text

    +
    2. +
  2. +

    The second xxl item

    + +

    More body text ....

    +
    3. +
+ +
diff --git a/tests/Integration/tests/lists/definition-lists/expected/index.html b/tests/Integration/tests/lists/definition-lists/expected/index.html index 1c1e877b5..f82fae69a 100644 --- a/tests/Integration/tests/lists/definition-lists/expected/index.html +++ b/tests/Integration/tests/lists/definition-lists/expected/index.html @@ -1,22 +1,25 @@ -
-

Definition list with textrole in term

+
+

Definition list with textrole in term

+
+
One definition
-
-
One definition
-

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam

-

Nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.

-
+

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam

+ +

Nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.

+ +
Another definition
-
Another definition
-
-

sed diam voluptua. At vero eos et accusam et justo duo dolores - et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est.

-
-

Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur.

-
-
+
+ +

sed diam voluptua. At vero eos et accusam et justo duo dolores +et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est.

+
+

Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur.

+ +
+
diff --git a/tests/Integration/tests/lists/field-list-empty-lines/expected/index.html b/tests/Integration/tests/lists/field-list-empty-lines/expected/index.html index 1f9055e5d..ad27f683b 100644 --- a/tests/Integration/tests/lists/field-list-empty-lines/expected/index.html +++ b/tests/Integration/tests/lists/field-list-empty-lines/expected/index.html @@ -1,33 +1,41 @@ -
-

Test

- - - +
+

Test

+
+ + - + + - + + - + +
Version +
Language -

en

+ +

en
Author -

Contributors

+ +

Contributors
Rendered -

Sun, 01 Jan 2023 12:00:00 +0000

+ +

Sun, 01 Jan 2023 12:00:00 +0000

Something else.

-
+ +
diff --git a/tests/Integration/tests/lists/list-warning/expected/index.html b/tests/Integration/tests/lists/list-warning/expected/index.html index ff76f45fb..c833a78c2 100644 --- a/tests/Integration/tests/lists/list-warning/expected/index.html +++ b/tests/Integration/tests/lists/list-warning/expected/index.html @@ -2,24 +2,23 @@

Document Title

-

This is an empty list

+

This is an empty list

+ -

This list has an empty point:

+ +

This list has an empty point:

+
- diff --git a/tests/Integration/tests/lists/list-with-code/expected/index.html b/tests/Integration/tests/lists/list-with-code/expected/index.html index c8358b4b7..279adc686 100644 --- a/tests/Integration/tests/lists/list-with-code/expected/index.html +++ b/tests/Integration/tests/lists/list-with-code/expected/index.html @@ -3,18 +3,12 @@

Test

- - diff --git a/tests/Integration/tests/lists/lists-hlist/expected/index.html b/tests/Integration/tests/lists/lists-hlist/expected/index.html index 5aa5be157..9b36629bb 100644 --- a/tests/Integration/tests/lists/lists-hlist/expected/index.html +++ b/tests/Integration/tests/lists/lists-hlist/expected/index.html @@ -1,21 +1,15 @@

Document Title

-
@@ -24,15 +18,10 @@

Document Title

@@ -41,15 +30,10 @@

Document Title

@@ -58,18 +42,12 @@

Document Title

- diff --git a/tests/Integration/tests/lists/lists-nested/expected/index.html b/tests/Integration/tests/lists/lists-nested/expected/index.html index f33edacb4..0fbcc5c21 100644 --- a/tests/Integration/tests/lists/lists-nested/expected/index.html +++ b/tests/Integration/tests/lists/lists-nested/expected/index.html @@ -1,18 +1,22 @@ -
-

Document Title

+
+

Document Title

- -
+ + + +
diff --git a/tests/Integration/tests/lists/numbered-lists/expected/index.html b/tests/Integration/tests/lists/numbered-lists/expected/index.html index a4690eb64..903055283 100644 --- a/tests/Integration/tests/lists/numbered-lists/expected/index.html +++ b/tests/Integration/tests/lists/numbered-lists/expected/index.html @@ -1,20 +1,24 @@ -
-

Document Title

+
+

Document Title

-
    -
  1. First numbered list item.
    2. -
  2. This is the second numbered list item.
    3. -
  3. and then the third numbered list item.
    4. -
  4. First numbered list item.
    5. -
  5. This is the second numbered list item.
    6. -
  6. -

    and then the third numbered list item.

    -
      -
    1. This is an indented numbered list.
      2. -
    2. This is the second item.
      3. -
    -
    7. -
-
+ +
    +
  1. First numbered list item.
    2. +
  2. This is the second numbered list item.
    3. +
  3. and then the third numbered list item.
    4. +
  4. First numbered list item.
    5. +
  5. This is the second numbered list item.
    6. +
  6. +

    and then the third numbered list item.

    + + +
      +
    1. This is an indented numbered list.
      2. +
    2. This is the second item.
      3. +
    +
    7. +
+ +
diff --git a/tests/Integration/tests/markdown/blockquote-md/expected/index.html b/tests/Integration/tests/markdown/blockquote-md/expected/index.html index df86b36a6..9c884e5c9 100644 --- a/tests/Integration/tests/markdown/blockquote-md/expected/index.html +++ b/tests/Integration/tests/markdown/blockquote-md/expected/index.html @@ -1,47 +1,46 @@ -
-

Markdown Blockquotes

- -
-

This is a blockquote.It can span multiple lines.

-
- -
-

Blockquotes with Multiple Paragraphs

- -
-

Dorothy followed her through many of the beautiful rooms in her castle.

-

The Witch bade her clean the pots and kettles and sweep the floor and keep the fire fed with wood.

-
+
+

Markdown Blockquotes

+
+

This is a blockquote.It can span multiple lines.

+
+
+

Blockquotes with Multiple Paragraphs

+
+

Dorothy followed her through many of the beautiful rooms in her castle.

+ +

The Witch bade her clean the pots and kettles and sweep the floor and keep the fire fed with wood.

+
- -
-

Blockquotes with Other Elements

- -
-

The quarterly results look great!

-
    -
  • -

    Revenue was off the chart.

    -
    • -
  • -

    Profits were higher than ever.

    -
    • -
-

Everything is going according to plan.

-
+
+

Blockquotes with Other Elements

+
+

The quarterly results look great!

+ + +
    +
  • +

    Revenue was off the chart.

    +
    • +
  • +

    Profits were higher than ever.

    +
    • +
+ +

Everything is going according to plan.

+
+
+

Blockquotes Best Practices

-
-

Blockquotes Best Practices

+

Try to put a blank line before...

-

Try to put a blank line before...

-
-

This is a blockquote

-
+
+

This is a blockquote

+
-

...and after a blockquote.

-
-
+

...and after a blockquote.

+
+
diff --git a/tests/Integration/tests/markdown/code-md/expected/index.html b/tests/Integration/tests/markdown/code-md/expected/index.html index 564510409..db3810e90 100644 --- a/tests/Integration/tests/markdown/code-md/expected/index.html +++ b/tests/Integration/tests/markdown/code-md/expected/index.html @@ -1,26 +1,24 @@

Markdown with Code Blocks

- 
<html>
   <head>
   </head>
 </html>
+

Fenced Code Blocks

- 
{
   "firstName": "John",
   "lastName": "Smith",
   "age": 25
 }
-
+

Fenced Code Block with caption

- 
procedure startSwinging(swing, child)
    while child.isComfortable()
        swing.giveGentlePush()
@@ -28,8 +26,7 @@ 
Fenced Code Block with caption

    end while
 end procedure
-
- +
diff --git a/tests/Integration/tests/markdown/emphasis-md/expected/index.html b/tests/Integration/tests/markdown/emphasis-md/expected/index.html index 8b21fd92c..289fbc654 100644 --- a/tests/Integration/tests/markdown/emphasis-md/expected/index.html +++ b/tests/Integration/tests/markdown/emphasis-md/expected/index.html @@ -2,7 +2,7 @@

Markdown with emphasis

-

Italic or ItalicBold or Bold

-
+

Italic or ItalicBold or Bold

+ diff --git a/tests/Integration/tests/markdown/html-inline-md/expected/index.html b/tests/Integration/tests/markdown/html-inline-md/expected/index.html index 46b258c54..b55a33f7a 100644 --- a/tests/Integration/tests/markdown/html-inline-md/expected/index.html +++ b/tests/Integration/tests/markdown/html-inline-md/expected/index.html @@ -2,7 +2,7 @@

Markdown with html

-

In files of text, where words take flight,Markdown weaves its magic, bold and bright.Hashes and stars, a simple code,A poet's playground, where stories unfold. <BR>

-
+

In files of text, where words take flight,Markdown weaves its magic, bold and bright.Hashes and stars, a simple code,A poet's playground, where stories unfold. <BR>

+ diff --git a/tests/Integration/tests/markdown/html-md/expected/index.html b/tests/Integration/tests/markdown/html-md/expected/index.html index 84d873058..5b5e2b178 100644 --- a/tests/Integration/tests/markdown/html-md/expected/index.html +++ b/tests/Integration/tests/markdown/html-md/expected/index.html @@ -2,12 +2,12 @@

Markdown with html

-

<div align="center"> +

<div align="center"> In files of text, where words take flight, Markdown weaves its magic, bold and bright. Hashes and stars, a simple code, A poet's playground, where stories unfold. </div>

-
+ diff --git a/tests/Integration/tests/markdown/image-empty-alt-md/expected/index.html b/tests/Integration/tests/markdown/image-empty-alt-md/expected/index.html index 70ad3fa61..fa1d8e4cb 100644 --- a/tests/Integration/tests/markdown/image-empty-alt-md/expected/index.html +++ b/tests/Integration/tests/markdown/image-empty-alt-md/expected/index.html @@ -2,8 +2,10 @@

Images with and without alt text

-

with alt Text

-

-
+

with alt Text

+ +

+ + diff --git a/tests/Integration/tests/markdown/image-md/expected/index.html b/tests/Integration/tests/markdown/image-md/expected/index.html index d91fce99d..cc74d8483 100644 --- a/tests/Integration/tests/markdown/image-md/expected/index.html +++ b/tests/Integration/tests/markdown/image-md/expected/index.html @@ -2,7 +2,7 @@

Markdown Image

-

Hero Illustrations

-
+

Hero Illustrations

+ diff --git a/tests/Integration/tests/markdown/index-md/expected/index.html b/tests/Integration/tests/markdown/index-md/expected/index.html index 5566e6b41..5d8662485 100644 --- a/tests/Integration/tests/markdown/index-md/expected/index.html +++ b/tests/Integration/tests/markdown/index-md/expected/index.html @@ -2,14 +2,16 @@

Markdown Example

-

This is a Markdown document with some basic formatting.

+

This is a Markdown document with some basic formatting.

+

Headings

-

You can create headings using hash symbols.

-

This text is part of a paragraph under the "Headings" heading.

-
+

You can create headings using hash symbols.

-
+

This text is part of a paragraph under the "Headings" heading.

+ + + diff --git a/tests/Integration/tests/markdown/inline-code-md/expected/index.html b/tests/Integration/tests/markdown/inline-code-md/expected/index.html index 03f32c9d0..412fc639f 100644 --- a/tests/Integration/tests/markdown/inline-code-md/expected/index.html +++ b/tests/Integration/tests/markdown/inline-code-md/expected/index.html @@ -2,8 +2,10 @@

Markdown with inline Code

-

Lorem Ipsum Dolor: $dolor...

-

Use `code` in your Markdown file.

-
+

Lorem Ipsum Dolor: $dolor...

+ +

Use `code` in your Markdown file.

+ + diff --git a/tests/Integration/tests/markdown/link-md/expected/index.html b/tests/Integration/tests/markdown/link-md/expected/index.html index 0423deed1..6c2486a09 100644 --- a/tests/Integration/tests/markdown/link-md/expected/index.html +++ b/tests/Integration/tests/markdown/link-md/expected/index.html @@ -2,8 +2,10 @@ +

This is a Markdown document with some basic formatting.

+ +

See also: Link Text

+ + diff --git a/tests/Integration/tests/markdown/link-page-md/expected/index.html b/tests/Integration/tests/markdown/link-page-md/expected/index.html index 5c9bc1ba5..72f99b7ee 100644 --- a/tests/Integration/tests/markdown/link-page-md/expected/index.html +++ b/tests/Integration/tests/markdown/link-page-md/expected/index.html @@ -1,18 +1,22 @@ - diff --git a/tests/Integration/tests/markdown/link-page-md/expected/subpages/index.html b/tests/Integration/tests/markdown/link-page-md/expected/subpages/index.html index f84ca8f8a..feea5bcf7 100644 --- a/tests/Integration/tests/markdown/link-page-md/expected/subpages/index.html +++ b/tests/Integration/tests/markdown/link-page-md/expected/subpages/index.html @@ -1,30 +1,34 @@ -
-

Page 1

+
+

Page 1

This is a Markdown document with some basic formatting.

-
+
+ + + + + + diff --git a/tests/Integration/tests/markdown/lists-md/expected/index.html b/tests/Integration/tests/markdown/lists-md/expected/index.html index 98290f1bb..997a44ca4 100644 --- a/tests/Integration/tests/markdown/lists-md/expected/index.html +++ b/tests/Integration/tests/markdown/lists-md/expected/index.html @@ -1,53 +1,59 @@ -
-

Markdown Lists

- -
-

Unordered

- - +
+

Markdown Lists

+
+

Unordered

+ + +
    +
  • +

    Item 1

    +
    • +
  • +

    Item 2

    + + +
      +
    • +

      Subitem A

      +
      • +
    • +

      Subitem B

      +
      • +
    +
    • +
  • +

    Item 3

    +
    • +
+
+
+

Ordered

-
-

Ordered

- -
    -
  1. -

    First item

    -
    2. -
  2. -

    Second item

    -
      -
    1. -

      Subitem A

      -
      2. -
    2. -

      Subitem B

      -
      3. -
    -
    3. -
  3. -

    Third item

    -
    4. -
+ +
    +
  1. +

    First item

    +
    2. +
  2. +

    Second item

    + + +
      +
    1. +

      Subitem A

      +
      2. +
    2. +

      Subitem B

      +
      3. +
    +
    3. +
  3. +

    Third item

    +
    4. +
+ +
-
diff --git a/tests/Integration/tests/markdown/readme-md/expected/index.html b/tests/Integration/tests/markdown/readme-md/expected/index.html index 0db385745..c7f51fed5 100644 --- a/tests/Integration/tests/markdown/readme-md/expected/index.html +++ b/tests/Integration/tests/markdown/readme-md/expected/index.html @@ -1,144 +1,156 @@ -
-

Child's Swing Usage Guide

+
+

Child's Swing Usage Guide

Welcome to the world of fun and laughter with our child's swing! Follow thesimple steps below to ensure a safe and enjoyable experience for your littleone.

-
-

Table of Contents

- - - -
-
-
-

Installation

- -

Swing Image

-
    -
  1. -

    Choose a Sturdy Location: Select a location with a sturdy beam or swingset structure capable of supporting the weight of the swing and the child.

    -
    2. -
  2. -

    Securely Attach the Swing: Use strong and reliable ropesor chains to securely attach the swing to the chosen location. Double-checkthe knots or hardware to ensure they are tight and safe.

    -
    3. -
  3. -

    Adjust the Height: Adjust the height of the swing to a level that iscomfortable for your child. Ensure that it is not too high or too low.

    -
    4. -
+
+

Table of Contents

+ + + + +
+
+

Installation

+ +

Swing Image

+ + -
-

Usage

- -
    -
  1. -

    Place the Child in the Swing: Gently place your child in the swing seat,ensuring they are properly seated and secure.

    -
    2. -
  2. -

    Hold onto the Swing: Provide support and hold onto the swing until yourchild is comfortably seated and ready to swing.

    -
    3. -
  3. -

    Start Swinging: Give a gentle push to start the swinging motion. Observeyour child's comfort level and adjust the swinging speed accordingly.

    - 
    procedure startSwinging(swing, child)
+
      
+    
    1. 
+    
      Choose a Sturdy Location: Select a location with a sturdy beam or swingset structure capable of supporting the weight of the swing and the child.
      
+
      2. 
+    
    2. 
+    
      Securely Attach the Swing: Use strong and reliable ropesor chains to securely attach the swing to the chosen location. Double-checkthe knots or hardware to ensure they are tight and safe.
      
+
      3. 
+    
    3. 
+    
      Adjust the Height: Adjust the height of the swing to a level that iscomfortable for your child. Ensure that it is not too high or too low.
      
+
      4. 
+
    
+
+
+
+

Usage

+ + +
    +
  1. +

    Place the Child in the Swing: Gently place your child in the swing seat,ensuring they are properly seated and secure.

    +
    2. +
  2. +

    Hold onto the Swing: Provide support and hold onto the swing until yourchild is comfortably seated and ready to swing.

    +
    3. +
  3. +

    Start Swinging: Give a gentle push to start the swinging motion. Observeyour child's comfort level and adjust the swinging speed accordingly.

    +
    procedure startSwinging(swing, child)
     while child.isComfortable()
         swing.giveGentlePush()
         waitForNextIteration()
     end while
 end procedure
-
    -
    4. -
  4. -

    Supervise Always: Always supervise your child while they are using theswing. Ensure they are using it safely and within the recommended age and weightlimits.

    -
    5. -
- -
-

"Swinging is not just a physical activity; it's a journey into the world ofimagination and joy."

-
- -
+ + + +
  • +

    Supervise Always: Always supervise your child while they are using theswing. Ensure they are using it safely and within the recommended age and weightlimits.

    +
    • + + +
    +

    "Swinging is not just a physical activity; it's a journey into the world ofimagination and joy."

    +
    +

    Additional Tips:

    -
      -
    • -

      Bring your child's favorite toys to make swinging even more enjoyable.

      -
      • -
    • -

      Consider creating a soft landing area with cushions or grass underneath the swing.

      -
      • -
    -
    + +
      +
    • +

      Bring your child's favorite toys to make swinging even more enjoyable.

      +
      • +
    • +

      Consider creating a soft landing area with cushions or grass underneath the swing.

      +
      • +
    + +
    +
    +

    Safety Guidelines

    + + +
      +
    1. +

      Check Hardware Regularly: Periodically inspect the ropes or chains, aswell as any hardware used to attach the swing. Replace any damaged or worn-outparts immediately.

      +
      2. +
    2. +

      Set Age and Weight Limits: Follow the manufacturer's recommended age andweight limits for the swing. Do not exceed these limits to ensure safety.

      +
      3. +
    3. +

      Use Proper Attire: Encourage your child to wear appropriate clothing,including closed-toe shoes, to prevent any injuries.

      +
      4. +
    4. +

      No Rough Play: Instruct your child not to engage in rough play or attemptto stand up in the swing.

      +
      5. +
    -
    -

    Safety Guidelines

    - -
      -
    1. -

      Check Hardware Regularly: Periodically inspect the ropes or chains, aswell as any hardware used to attach the swing. Replace any damaged or worn-outparts immediately.

      -
      2. -
    2. -

      Set Age and Weight Limits: Follow the manufacturer's recommended age andweight limits for the swing. Do not exceed these limits to ensure safety.

      -
      3. -
    3. -

      Use Proper Attire: Encourage your child to wear appropriate clothing,including closed-toe shoes, to prevent any injuries.

      -
      4. -
    4. -

      No Rough Play: Instruct your child not to engage in rough play or attemptto stand up in the swing.

      -
      5. -
    +
    +

    Maintenance

    + + +
      +
    1. +

      Clean the Swing: Wipe down the swing seat regularly to keep it clean andfree from dirt or debris.

      +
      2. +
    2. +

      Inspect for Wear: Check the swing's components for signs of wear ordamage. Replace any worn-out parts promptly.

      +
      3. +
    3. +

      Tighten Loose Hardware: Ensure that all nuts and bolts are securelytightened to maintain stability.

      +
      4. +
    -
    -

    Maintenance

    - -
      -
    1. -

      Clean the Swing: Wipe down the swing seat regularly to keep it clean andfree from dirt or debris.

      -
      2. -
    2. -

      Inspect for Wear: Check the swing's components for signs of wear ordamage. Replace any worn-out parts promptly.

      -
      3. -
    3. -

      Tighten Loose Hardware: Ensure that all nuts and bolts are securelytightened to maintain stability.

      -
      4. -
    +
    +

    Troubleshooting

    + + +
      +
    • +

      Swing Doesn't Move Smoothly: Check for any knots or tangles in the ropesor chains. Untangle and ensure a smooth swinging motion.

      +
      • +
    • +

      Unusual Sounds: If you hear any creaking or unusual sounds, inspect thehardware for any loose or damaged parts.

      -
      -

      Troubleshooting

      - -
        -
      • -

        Swing Doesn't Move Smoothly: Check for any knots or tangles in the ropesor chains. Untangle and ensure a smooth swinging motion.

        -
        • -
      • -

        Unusual Sounds: If you hear any creaking or unusual sounds, inspect thehardware for any loose or damaged parts.

        -

        If you hear screaming or crying, untangle the child.

        -
        • -
      • -

        Uneven Swinging: Adjust the height of the swing to achieve a balanced andeven swinging motion.

        -
        • -
      - -

      Remember, safety first! Enjoy your time on the swing with your little one.

      +

      If you hear screaming or crying, untangle the child.

      +
      • +
    • +

      Uneven Swinging: Adjust the height of the swing to achieve a balanced andeven swinging motion.

      +
      • +
    + + +

    Remember, safety first! Enjoy your time on the swing with your little one.

    + +
    -
    diff --git a/tests/Integration/tests/markdown/sections-md/expected/index.html b/tests/Integration/tests/markdown/sections-md/expected/index.html index d1c1837fd..87b5e034d 100644 --- a/tests/Integration/tests/markdown/sections-md/expected/index.html +++ b/tests/Integration/tests/markdown/sections-md/expected/index.html @@ -1,49 +1,47 @@

    Sample Markdown Document

    -

    Introduction

    -

    This is a sample Markdown document demonstrating sections and subsections.

    -
    +

    This is a sample Markdown document demonstrating sections and subsections.

    +

    Section 1

    -

    This is the first section of the document.

    +

    This is the first section of the document.

    +

    Subsection 1.1

    -

    This is a subsection under Section 1.

    -
    +

    This is a subsection under Section 1.

    +

    Subsection 1.2

    -

    Another subsection under Section 1.

    -
    +

    Another subsection under Section 1.

    - +

    Section 2

    -

    Moving on to the second section of the document.

    +

    Moving on to the second section of the document.

    +

    Subsection 2.1

    -

    A subsection under Section 2.

    -
    +

    A subsection under Section 2.

    - +

    Conclusion

    -

    In conclusion, this is a simple example of a Markdown document with various sections and subsections.

    -
    +

    In conclusion, this is a simple example of a Markdown document with various sections and subsections.

    - +
    diff --git a/tests/Integration/tests/meta/config-file/expected/index.html b/tests/Integration/tests/meta/config-file/expected/index.html index 2f67cc958..e62c56a79 100644 --- a/tests/Integration/tests/meta/config-file/expected/index.html +++ b/tests/Integration/tests/meta/config-file/expected/index.html @@ -2,7 +2,7 @@

    Title

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    +
    diff --git a/tests/Integration/tests/meta/meta-data/expected/index.html b/tests/Integration/tests/meta/meta-data/expected/index.html index d696c38ee..2abb6eb06 100644 --- a/tests/Integration/tests/meta/meta-data/expected/index.html +++ b/tests/Integration/tests/meta/meta-data/expected/index.html @@ -2,7 +2,7 @@

    Document Title

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/meta/meta-title-by-directive/expected/index.html b/tests/Integration/tests/meta/meta-title-by-directive/expected/index.html index d696c38ee..2abb6eb06 100644 --- a/tests/Integration/tests/meta/meta-title-by-directive/expected/index.html +++ b/tests/Integration/tests/meta/meta-title-by-directive/expected/index.html @@ -2,7 +2,7 @@

    Document Title

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/meta/orphan-without-title/expected/index.html b/tests/Integration/tests/meta/orphan-without-title/expected/index.html index 20a023c79..bb46fd1fb 100644 --- a/tests/Integration/tests/meta/orphan-without-title/expected/index.html +++ b/tests/Integration/tests/meta/orphan-without-title/expected/index.html @@ -2,7 +2,7 @@

    Document Title

    -

    Some Document

    -
    +

    Some Document

    + diff --git a/tests/Integration/tests/meta/orphan-without-title/expected/orphan.html b/tests/Integration/tests/meta/orphan-without-title/expected/orphan.html index 998795ac4..5c104c468 100644 --- a/tests/Integration/tests/meta/orphan-without-title/expected/orphan.html +++ b/tests/Integration/tests/meta/orphan-without-title/expected/orphan.html @@ -1,3 +1,5 @@ +

    A page without title that is marked as orphan does not cause warnings.

    + diff --git a/tests/Integration/tests/meta/project-meta-global/expected/a_page.html b/tests/Integration/tests/meta/project-meta-global/expected/a_page.html index 566d2586b..8dbec1a65 100644 --- a/tests/Integration/tests/meta/project-meta-global/expected/a_page.html +++ b/tests/Integration/tests/meta/project-meta-global/expected/a_page.html @@ -2,7 +2,7 @@

    A Page

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/meta/project-meta-global/expected/index.html b/tests/Integration/tests/meta/project-meta-global/expected/index.html index d696c38ee..2abb6eb06 100644 --- a/tests/Integration/tests/meta/project-meta-global/expected/index.html +++ b/tests/Integration/tests/meta/project-meta-global/expected/index.html @@ -2,7 +2,7 @@

    Document Title

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/meta/project-meta/expected/index.html b/tests/Integration/tests/meta/project-meta/expected/index.html index d696c38ee..2abb6eb06 100644 --- a/tests/Integration/tests/meta/project-meta/expected/index.html +++ b/tests/Integration/tests/meta/project-meta/expected/index.html @@ -2,7 +2,7 @@

    Document Title

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/meta/project-title-override-warning/expected/index.html b/tests/Integration/tests/meta/project-title-override-warning/expected/index.html index d696c38ee..2abb6eb06 100644 --- a/tests/Integration/tests/meta/project-title-override-warning/expected/index.html +++ b/tests/Integration/tests/meta/project-title-override-warning/expected/index.html @@ -2,7 +2,7 @@

    Document Title

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/meta/project-title/expected/index.html b/tests/Integration/tests/meta/project-title/expected/index.html index d696c38ee..2abb6eb06 100644 --- a/tests/Integration/tests/meta/project-title/expected/index.html +++ b/tests/Integration/tests/meta/project-title/expected/index.html @@ -2,7 +2,7 @@

    Document Title

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/meta/settings/expected/index.html b/tests/Integration/tests/meta/settings/expected/index.html index d696c38ee..2abb6eb06 100644 --- a/tests/Integration/tests/meta/settings/expected/index.html +++ b/tests/Integration/tests/meta/settings/expected/index.html @@ -2,7 +2,7 @@

    Document Title

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/meta/variables-from-project/expected/index.html b/tests/Integration/tests/meta/variables-from-project/expected/index.html index 197f9d922..daf610ccf 100644 --- a/tests/Integration/tests/meta/variables-from-project/expected/index.html +++ b/tests/Integration/tests/meta/variables-from-project/expected/index.html @@ -2,7 +2,7 @@

    Some Document

    -

    Project My Project in version 3.14

    -
    +

    Project My Project in version 3.14

    + diff --git a/tests/Integration/tests/meta/version-from-guides-xml/expected/index.html b/tests/Integration/tests/meta/version-from-guides-xml/expected/index.html index 56aacf4b1..317e9b9d6 100644 --- a/tests/Integration/tests/meta/version-from-guides-xml/expected/index.html +++ b/tests/Integration/tests/meta/version-from-guides-xml/expected/index.html @@ -2,7 +2,7 @@

    Some Document

    -

    Project Render guides in version 3.0, release 3.0.0.

    -
    +

    Project Render guides in version 3.0, release 3.0.0.

    + diff --git a/tests/Integration/tests/navigation/breadcrumb/expected/index.html b/tests/Integration/tests/navigation/breadcrumb/expected/index.html index 49a5e31ad..a886720ab 100644 --- a/tests/Integration/tests/navigation/breadcrumb/expected/index.html +++ b/tests/Integration/tests/navigation/breadcrumb/expected/index.html @@ -1,81 +1,89 @@ -
    -

    Document Title

    - - +
    +

    Document Title

    +

    Lorem Ipsum Dolor.

    -
    -
    + +
  • + Subpage 2, Level 2-2 + + +
    • + + + + + + +
  • + Level 1-2 + + +
    • + +
    +
    diff --git a/tests/Integration/tests/navigation/breadcrumb/expected/level-1-1/level-2-1/subpage1.html b/tests/Integration/tests/navigation/breadcrumb/expected/level-1-1/level-2-1/subpage1.html index d6f1df207..7c8a90297 100644 --- a/tests/Integration/tests/navigation/breadcrumb/expected/level-1-1/level-2-1/subpage1.html +++ b/tests/Integration/tests/navigation/breadcrumb/expected/level-1-1/level-2-1/subpage1.html @@ -1,7 +1,6 @@

    Subpage 1, Level 2-1

    - -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/navigation/breadcrumb/expected/level-1-1/subpage1.html b/tests/Integration/tests/navigation/breadcrumb/expected/level-1-1/subpage1.html index 56306de3b..8ffd7c559 100644 --- a/tests/Integration/tests/navigation/breadcrumb/expected/level-1-1/subpage1.html +++ b/tests/Integration/tests/navigation/breadcrumb/expected/level-1-1/subpage1.html @@ -1,7 +1,6 @@

    Subpage 1, Level 1-1

    - -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/navigation/breadcrumb/expected/page1.html b/tests/Integration/tests/navigation/breadcrumb/expected/page1.html index 41eaddad9..dd4f6ad22 100644 --- a/tests/Integration/tests/navigation/breadcrumb/expected/page1.html +++ b/tests/Integration/tests/navigation/breadcrumb/expected/page1.html @@ -1,98 +1,100 @@ -
    -

    Page 1

    - - +
    +

    Page 1

    +

    Lorem Ipsum Dolor.

    -
    - -
    -

    Page 1 Level 3

    + +
  • + Level 2-2 +
    • -
    + + -
    + + + + +
  • + Level 1-2 + +
    • + +
    +
    +

    Page 1 Level 2

    +
    +

    Page 1 Level 3

    +
    +

    Page 1 Level 4

    +
    +
    +
    + diff --git a/tests/Integration/tests/navigation/contents/contents-depth-1/expected/index.html b/tests/Integration/tests/navigation/contents/contents-depth-1/expected/index.html index e38c2bd31..58ce576b4 100644 --- a/tests/Integration/tests/navigation/contents/contents-depth-1/expected/index.html +++ b/tests/Integration/tests/navigation/contents/contents-depth-1/expected/index.html @@ -1,60 +1,43 @@ -
    -

    Title

    - -
    +
    +

    Title

    +
    -
    + +
  • + 2. Depth Level 1 -
    -

    Depth Level 1

    -
    +
    • + +
    +
    +

    Depth Level 1

    +

    Depth Level 2

    -
    -

    Depth Level 3

    - -
    -
    Depth Level 4
    - -
    - -
    - -
    - +

    Depth Level 3

    +
    +
    Depth Level 4
    - -
    -

    2. Depth Level 1

    - -
    +
    +
    +
    +
    +

    2. Depth Level 1

    +

    2. Depth Level 2

    -
    -

    2. Depth Level 3

    - -
    -
    2. Depth Level 4
    - -
    - -
    - -
    - +

    2. Depth Level 3

    +
    +
    2. Depth Level 4
    +
    +
    +
    +
    - - - diff --git a/tests/Integration/tests/navigation/contents/contents-depth-2/expected/index.html b/tests/Integration/tests/navigation/contents/contents-depth-2/expected/index.html index 0ca3c1939..cb1dc1cab 100644 --- a/tests/Integration/tests/navigation/contents/contents-depth-2/expected/index.html +++ b/tests/Integration/tests/navigation/contents/contents-depth-2/expected/index.html @@ -1,72 +1,55 @@ -
    -

    Title

    - -
    +
    +

    Title

    +
    + + + +
  • + 2. Depth Level 1 -
    -

    Depth Level 1

    + +
    • + +
    +
    +

    Depth Level 1

    +
    +

    Depth Level 2

    -

    Depth Level 3

    - -
    -
    Depth Level 4
    - -
    - -
    - -
    - +

    Depth Level 3

    +
    +
    Depth Level 4
    - -
    -

    2. Depth Level 1

    - -
    +
    +
    +
    +
    +

    2. Depth Level 1

    +

    2. Depth Level 2

    -
    -

    2. Depth Level 3

    - -
    -
    2. Depth Level 4
    - -
    - -
    - -
    - +

    2. Depth Level 3

    +
    +
    2. Depth Level 4
    +
    +
    +
    +
    - - - diff --git a/tests/Integration/tests/navigation/contents/contents-depth-3/expected/index.html b/tests/Integration/tests/navigation/contents/contents-depth-3/expected/index.html index 6db14311b..17114789a 100644 --- a/tests/Integration/tests/navigation/contents/contents-depth-3/expected/index.html +++ b/tests/Integration/tests/navigation/contents/contents-depth-3/expected/index.html @@ -1,84 +1,67 @@ -
    -

    Title

    - -
    +
    +

    Title

    +
    -
    + + + +
    +
    +

    Depth Level 1

    +
    +

    Depth Level 2

    -

    Depth Level 3

    - -
    -
    Depth Level 4
    - -
    - -
    - -
    - +

    Depth Level 3

    +
    +
    Depth Level 4
    - -
    -

    2. Depth Level 1

    - -
    +
    +
    +
    +
    +

    2. Depth Level 1

    +

    2. Depth Level 2

    -
    -

    2. Depth Level 3

    - -
    -
    2. Depth Level 4
    - -
    - -
    - -
    - +

    2. Depth Level 3

    +
    +
    2. Depth Level 4
    +
    +
    +
    +
    - - - diff --git a/tests/Integration/tests/navigation/contents/contents-no-depth/expected/index.html b/tests/Integration/tests/navigation/contents/contents-no-depth/expected/index.html index 953dac1d7..703526f2b 100644 --- a/tests/Integration/tests/navigation/contents/contents-no-depth/expected/index.html +++ b/tests/Integration/tests/navigation/contents/contents-no-depth/expected/index.html @@ -1,96 +1,79 @@ -
    -

    Title

    - -
    +
    +

    Title

    +
    + + + + + +
    +
    +

    Depth Level 1

    +

    Depth Level 2

    -
    -

    Depth Level 3

    - -
    -
    Depth Level 4
    - -
    - -
    - -
    - +

    Depth Level 3

    +
    +
    Depth Level 4
    - -
    -

    2. Depth Level 1

    - -
    +
    +
    +
    +
    +

    2. Depth Level 1

    +

    2. Depth Level 2

    -
    -

    2. Depth Level 3

    - -
    -
    2. Depth Level 4
    - -
    - -
    - -
    - +

    2. Depth Level 3

    +
    +
    2. Depth Level 4
    +
    +
    +
    +
    - - - diff --git a/tests/Integration/tests/navigation/contents/contents-with-title/expected/index.html b/tests/Integration/tests/navigation/contents/contents-with-title/expected/index.html index 04dbe6303..5b3d3ce17 100644 --- a/tests/Integration/tests/navigation/contents/contents-with-title/expected/index.html +++ b/tests/Integration/tests/navigation/contents/contents-with-title/expected/index.html @@ -1,55 +1,45 @@ -
    -

    Title

    - -
    +
    +

    Title

    +

    Table of Content

    + + + + + + + +
    +
    +

    Depth Level 1

    +

    Depth Level 2

    -
    -

    Depth Level 3

    - -
    -
    Depth Level 4
    - -
    - -
    - -
    - +

    Depth Level 3

    +
    +
    Depth Level 4
    +
    +
    +
    +
    - - - diff --git a/tests/Integration/tests/navigation/docref/expected/index.html b/tests/Integration/tests/navigation/docref/expected/index.html index cedf2aa15..e7a88e7e0 100644 --- a/tests/Integration/tests/navigation/docref/expected/index.html +++ b/tests/Integration/tests/navigation/docref/expected/index.html @@ -1,7 +1,5 @@

    Root

    -
    - diff --git a/tests/Integration/tests/navigation/docref/expected/subfolder/index.html b/tests/Integration/tests/navigation/docref/expected/subfolder/index.html index 67a15c218..c65d27f1e 100644 --- a/tests/Integration/tests/navigation/docref/expected/subfolder/index.html +++ b/tests/Integration/tests/navigation/docref/expected/subfolder/index.html @@ -2,7 +2,7 @@

    Subfolder index

    -

    Root

    -
    +

    Root

    + diff --git a/tests/Integration/tests/navigation/index_camel/expected/Index.html b/tests/Integration/tests/navigation/index_camel/expected/Index.html index d696c38ee..2abb6eb06 100644 --- a/tests/Integration/tests/navigation/index_camel/expected/Index.html +++ b/tests/Integration/tests/navigation/index_camel/expected/Index.html @@ -2,7 +2,7 @@

    Document Title

    -

    Lorem Ipsum Dolor.

    -
    +

    Lorem Ipsum Dolor.

    + diff --git a/tests/Integration/tests/navigation/menu-level-3/expected/level-1-1/level-2-2/subpage1.html b/tests/Integration/tests/navigation/menu-level-3/expected/level-1-1/level-2-2/subpage1.html index 3986564a1..aba0eca73 100644 --- a/tests/Integration/tests/navigation/menu-level-3/expected/level-1-1/level-2-2/subpage1.html +++ b/tests/Integration/tests/navigation/menu-level-3/expected/level-1-1/level-2-2/subpage1.html @@ -1,77 +1,86 @@ -
    -

    Subpage 1, Level 2-2

    +
    +

    Subpage 1, Level 2-2

    Lorem Ipsum Dolor.

    -
    - + + +
  • + Level 1-2 +
    • + +
  • + Subpage 2, Level 1-2 + + +
    • + + + + +
    +
    diff --git a/tests/Integration/tests/navigation/menu-level-3/expected/level-1-2/subpage1.html b/tests/Integration/tests/navigation/menu-level-3/expected/level-1-2/subpage1.html index 40d707342..912028bd1 100644 --- a/tests/Integration/tests/navigation/menu-level-3/expected/level-1-2/subpage1.html +++ b/tests/Integration/tests/navigation/menu-level-3/expected/level-1-2/subpage1.html @@ -1,77 +1,86 @@ -
    -

    Subpage 1, Level 1-2

    +
    +

    Subpage 1, Level 1-2

    Lorem Ipsum Dolor.

    -
    -
    + +
  • + Subpage 2, Level 2-1 + + +
    • + + + +
  • + Level 2-2 + + +
    • + + + +
  • + Level 1-2 + + +
    • + +
    +
    diff --git a/tests/Integration/tests/navigation/menu-level-3/expected/page1.html b/tests/Integration/tests/navigation/menu-level-3/expected/page1.html index db2928d19..65e88e487 100644 --- a/tests/Integration/tests/navigation/menu-level-3/expected/page1.html +++ b/tests/Integration/tests/navigation/menu-level-3/expected/page1.html @@ -1,92 +1,95 @@ -
    -

    Page 1

    +
    +

    Page 1

    Lorem Ipsum Dolor.

    -
    - -
    -

    Page 1 Level 3

    + +
  • + Level 2-2 +
    • -
    + + -
    + + + + +
  • + Level 1-2 + +
    • + +
    +
    +

    Page 1 Level 2

    +
    +

    Page 1 Level 3

    +
    +

    Page 1 Level 4

    +
    +
    +
    + diff --git a/tests/Integration/tests/navigation/menu-relative/expected/level-1-1/level-2-2/subpage1.html b/tests/Integration/tests/navigation/menu-relative/expected/level-1-1/level-2-2/subpage1.html index bee02ef0a..567608ded 100644 --- a/tests/Integration/tests/navigation/menu-relative/expected/level-1-1/level-2-2/subpage1.html +++ b/tests/Integration/tests/navigation/menu-relative/expected/level-1-1/level-2-2/subpage1.html @@ -1,77 +1,86 @@ -
    -

    Subpage 1, Level 2-2

    +
    +

    Subpage 1, Level 2-2

    Lorem Ipsum Dolor.

    -
    - + + +
  • + Level 1-2 +
    • + +
  • + Subpage 2, Level 1-2 + + +
    • + + + + +
    +
    diff --git a/tests/Integration/tests/navigation/menu-relative/expected/level-1-2/subpage1.html b/tests/Integration/tests/navigation/menu-relative/expected/level-1-2/subpage1.html index 4c66b3335..afbf450a5 100644 --- a/tests/Integration/tests/navigation/menu-relative/expected/level-1-2/subpage1.html +++ b/tests/Integration/tests/navigation/menu-relative/expected/level-1-2/subpage1.html @@ -1,77 +1,86 @@ -
    -

    Subpage 1, Level 1-2

    +
    +

    Subpage 1, Level 1-2

    Lorem Ipsum Dolor.

    -
    -
    + +
  • + Subpage 2, Level 2-1 + + +
    • + + + +
  • + Level 2-2 + + +
    • + + + +
  • + Level 1-2 + + +
    • + +
    +
    diff --git a/tests/Integration/tests/navigation/menu-relative/expected/page1.html b/tests/Integration/tests/navigation/menu-relative/expected/page1.html index daea1823d..52acdf154 100644 --- a/tests/Integration/tests/navigation/menu-relative/expected/page1.html +++ b/tests/Integration/tests/navigation/menu-relative/expected/page1.html @@ -1,92 +1,95 @@ -
    -

    Page 1

    +
    +

    Page 1

    Lorem Ipsum Dolor.

    -
    - -
    -

    Page 1 Level 3

    + +
  • + Level 2-2 +
    • -
    + + -
    + + + + +
  • + Level 1-2 + +
    • + +
    +
    +

    Page 1 Level 2

    +
    +

    Page 1 Level 3

    +
    +

    Page 1 Level 4

    +
    +
    +
    + diff --git a/tests/Integration/tests/navigation/reference-not-found/expected/index.html b/tests/Integration/tests/navigation/reference-not-found/expected/index.html index a14a66baf..a3db41c90 100644 --- a/tests/Integration/tests/navigation/reference-not-found/expected/index.html +++ b/tests/Integration/tests/navigation/reference-not-found/expected/index.html @@ -3,18 +3,24 @@

    Overview

    -

    RST Overview content

    - +

    RST Overview content

    +

    Overview

    -

    Other Overview content

    -

    This is a link to the RST Overview: alternative

    -

    This is a link to the Other Overview:

    -

    This is a link to +

    Other Overview content

    + + +

    This is a link to the RST Overview: alternative

    + + +

    This is a link to the Other Overview:

    + + +

    This is a link to This is a link to with alternative text alternative

    -
    + diff --git a/tests/Integration/tests/navigation/reference-with-angle-bracket/expected/index.html b/tests/Integration/tests/navigation/reference-with-angle-bracket/expected/index.html index c0dc91101..565f1908a 100644 --- a/tests/Integration/tests/navigation/reference-with-angle-bracket/expected/index.html +++ b/tests/Integration/tests/navigation/reference-with-angle-bracket/expected/index.html @@ -1,18 +1,18 @@ -
    -

    Overview

    +
    +

    Overview

    The uid must be given as a positive integer. - For new records, use the <be:link.newRecordViewHelper>.

    -
    - -
    +
    +
    + + +
    +
    diff --git a/tests/Integration/tests/navigation/references/expected/index.html b/tests/Integration/tests/navigation/references/expected/index.html index 35d0e5b2b..4062802db 100644 --- a/tests/Integration/tests/navigation/references/expected/index.html +++ b/tests/Integration/tests/navigation/references/expected/index.html @@ -3,18 +3,24 @@

    Overview

    -

    RST Overview content

    - +

    RST Overview content

    +

    Overview

    -

    Other Overview content

    -

    This is a link to the RST Overview: alternative

    -

    This is a link to the Other Overview: Overview

    -

    This is a link to Page 1 +

    Other Overview content

    + + +

    This is a link to the RST Overview: alternative

    + + +

    This is a link to the Other Overview: Overview

    + + +

    This is a link to Page 1 This is a link to with alternative text alternative

    -
    + diff --git a/tests/Integration/tests/navigation/references/expected/page.html b/tests/Integration/tests/navigation/references/expected/page.html index eaa53ebbd..ff968f886 100644 --- a/tests/Integration/tests/navigation/references/expected/page.html +++ b/tests/Integration/tests/navigation/references/expected/page.html @@ -2,13 +2,13 @@

    Page 1

    -

    This is page 1

    +

    This is page 1

    +

    Overview

    -

    This is some subsection

    -
    +

    This is some subsection

    - + diff --git a/tests/Integration/tests/navigation/references/expected/subfolder/index.html b/tests/Integration/tests/navigation/references/expected/subfolder/index.html index b9d488076..301f99d0e 100644 --- a/tests/Integration/tests/navigation/references/expected/subfolder/index.html +++ b/tests/Integration/tests/navigation/references/expected/subfolder/index.html @@ -2,7 +2,7 @@

    Subfolder index

    -

    Page 1

    -
    +

    Page 1

    + diff --git a/tests/Integration/tests/numeral-rst/expected/index.html b/tests/Integration/tests/numeral-rst/expected/index.html index a4e46f8db..6a3c812f0 100644 --- a/tests/Integration/tests/numeral-rst/expected/index.html +++ b/tests/Integration/tests/numeral-rst/expected/index.html @@ -2,7 +2,7 @@

    Some Title

    -

    Lorem Ipsum

    -
    +

    Lorem Ipsum

    + diff --git a/tests/Integration/tests/option/expected/index.html b/tests/Integration/tests/option/expected/index.html index de46e929b..cbb6121b9 100644 --- a/tests/Integration/tests/option/expected/index.html +++ b/tests/Integration/tests/option/expected/index.html @@ -1,24 +1,26 @@

    Some Title

    -
    dest_dir
    -

    Destination directory.

    + +

    Destination directory.

    +
    -
    -m <module>, --module <module>
    -

    Run a module as a script.

    + +

    Run a module as a script.

    +
    -

    See option dest_dir and -m <module>, --module <module>.

    -
    +

    See option dest_dir and -m <module>, --module <module>.

    + diff --git a/tests/Integration/tests/references/reference-level-3-relative/expected/index.html b/tests/Integration/tests/references/reference-level-3-relative/expected/index.html index 910b5cf97..d704971a1 100644 --- a/tests/Integration/tests/references/reference-level-3-relative/expected/index.html +++ b/tests/Integration/tests/references/reference-level-3-relative/expected/index.html @@ -1,68 +1,94 @@ -
    -

    Document Title

    +
    +

    Document Title

    Lorem Ipsum Dolor.

    - -
    - + + +
  • + Level 2-2 + + +
    • + + + +
  • + Level 1-2 + + +
    • +
    +
    diff --git a/tests/Integration/tests/references/reference-level-3-relative/expected/level-1-1/level-2-1/subpage1.html b/tests/Integration/tests/references/reference-level-3-relative/expected/level-1-1/level-2-1/subpage1.html index df65bc96b..49d3d05fe 100644 --- a/tests/Integration/tests/references/reference-level-3-relative/expected/level-1-1/level-2-1/subpage1.html +++ b/tests/Integration/tests/references/reference-level-3-relative/expected/level-1-1/level-2-1/subpage1.html @@ -3,18 +3,15 @@

    Subpage 1, Level 2-1

    -

    Lorem Ipsum Dolor.

    +

    Lorem Ipsum Dolor.

    +
    - diff --git a/tests/Integration/tests/references/reference-level-3-relative/expected/level-1-2/subpage2.html b/tests/Integration/tests/references/reference-level-3-relative/expected/level-1-2/subpage2.html index 5ff4edd02..e59d7fada 100644 --- a/tests/Integration/tests/references/reference-level-3-relative/expected/level-1-2/subpage2.html +++ b/tests/Integration/tests/references/reference-level-3-relative/expected/level-1-2/subpage2.html @@ -3,18 +3,15 @@

    Subpage 2, Level 1-2

    -

    Lorem Ipsum Dolor.

    +

    Lorem Ipsum Dolor.

    + - diff --git a/tests/Integration/tests/references/reference-level-3/expected/index.html b/tests/Integration/tests/references/reference-level-3/expected/index.html index 6e7b6cdc9..dcbd4bf50 100644 --- a/tests/Integration/tests/references/reference-level-3/expected/index.html +++ b/tests/Integration/tests/references/reference-level-3/expected/index.html @@ -1,68 +1,94 @@ -
    -

    Document Title

    +
    +

    Document Title

    Lorem Ipsum Dolor.

    - -
    - + + +
  • + Level 2-2 + + +
    • + + + +
  • + Level 1-2 + + +
    • +
    +
    diff --git a/tests/Integration/tests/references/reference-level-3/expected/level-1-1/level-2-1/subpage1.html b/tests/Integration/tests/references/reference-level-3/expected/level-1-1/level-2-1/subpage1.html index 7c10ecba2..83798cef3 100644 --- a/tests/Integration/tests/references/reference-level-3/expected/level-1-1/level-2-1/subpage1.html +++ b/tests/Integration/tests/references/reference-level-3/expected/level-1-1/level-2-1/subpage1.html @@ -3,18 +3,15 @@

    Subpage 1, Level 2-1

    -

    Lorem Ipsum Dolor.

    +

    Lorem Ipsum Dolor.

    +
    - diff --git a/tests/Integration/tests/references/reference-level-3/expected/level-1-2/subpage2.html b/tests/Integration/tests/references/reference-level-3/expected/level-1-2/subpage2.html index e63fd07f7..d79f05ebb 100644 --- a/tests/Integration/tests/references/reference-level-3/expected/level-1-2/subpage2.html +++ b/tests/Integration/tests/references/reference-level-3/expected/level-1-2/subpage2.html @@ -3,18 +3,15 @@

    Subpage 2, Level 1-2

    -

    Lorem Ipsum Dolor.

    +

    Lorem Ipsum Dolor.

    + - diff --git a/tests/Integration/tests/references/reference-without-space/expected/index.html b/tests/Integration/tests/references/reference-without-space/expected/index.html index 436ab108b..7f49e0eea 100644 --- a/tests/Integration/tests/references/reference-without-space/expected/index.html +++ b/tests/Integration/tests/references/reference-without-space/expected/index.html @@ -3,7 +3,7 @@

    the <head>

    -

    See also This is the anchor.

    - +

    See also This is the anchor.

    + diff --git a/tests/Integration/tests/sections/expected/index.html b/tests/Integration/tests/sections/expected/index.html index 2d7918b2e..bbc4dece9 100644 --- a/tests/Integration/tests/sections/expected/index.html +++ b/tests/Integration/tests/sections/expected/index.html @@ -1,49 +1,47 @@

    Sample RST Document

    -

    Introduction

    -

    This is a sample reStructuredText document demonstrating sections and subsections.

    -
    +

    This is a sample reStructuredText document demonstrating sections and subsections.

    +

    Section 1

    -

    This is the first section of the document.

    +

    This is the first section of the document.

    +

    Subsection 1.1

    -

    This is a subsection under Section 1.

    -
    +

    This is a subsection under Section 1.

    +

    Subsection 1.2

    -

    Another subsection under Section 1.

    -
    +

    Another subsection under Section 1.

    - +

    Section 2

    -

    Moving on to the second section of the document.

    +

    Moving on to the second section of the document.

    +

    Subsection 2.1

    -

    A subsection under Section 2.

    -
    +

    A subsection under Section 2.

    - +

    Conclusion

    -

    In conclusion, this is a simple example of a reStructuredText document with various sections and subsections.

    -
    +

    In conclusion, this is a simple example of a reStructuredText document with various sections and subsections.

    - + diff --git a/tests/Integration/tests/tables/list-table-directive/expected/index.html b/tests/Integration/tests/tables/list-table-directive/expected/index.html index f13f0c6c7..43365f862 100644 --- a/tests/Integration/tests/tables/list-table-directive/expected/index.html +++ b/tests/Integration/tests/tables/list-table-directive/expected/index.html @@ -1,7 +1,6 @@

    table

    - @@ -34,7 +33,6 @@

    table

    - @@ -60,7 +58,5 @@

    table

    And another table
    -
    - diff --git a/tests/Integration/tests/tables/simple-table-error1/expected/index.html b/tests/Integration/tests/tables/simple-table-error1/expected/index.html index 51743d3e9..ceb71d224 100644 --- a/tests/Integration/tests/tables/simple-table-error1/expected/index.html +++ b/tests/Integration/tests/tables/simple-table-error1/expected/index.html @@ -1,7 +1,6 @@

    Some malformed table

    - @@ -21,7 +20,5 @@

    Some malformed table
    -
    - diff --git a/tests/Integration/tests/tables/simple-table-with-variable/expected/index.html b/tests/Integration/tests/tables/simple-table-with-variable/expected/index.html index a52749e9e..8eefb5453 100644 --- a/tests/Integration/tests/tables/simple-table-with-variable/expected/index.html +++ b/tests/Integration/tests/tables/simple-table-with-variable/expected/index.html @@ -1,7 +1,6 @@

    Some table with long lines

    - @@ -16,7 +15,5 @@

    Some table with long lines

    -
    - diff --git a/tests/Integration/tests/tables/table-csv-table-with-content/expected/index.html b/tests/Integration/tests/tables/table-csv-table-with-content/expected/index.html index 96ce68b90..4f2fbf5c0 100644 --- a/tests/Integration/tests/tables/table-csv-table-with-content/expected/index.html +++ b/tests/Integration/tests/tables/table-csv-table-with-content/expected/index.html @@ -1,28 +1,27 @@ -
    -

    Csv table with content

    - - - - - - +
    +

    Csv table with content

    +
    + + + + - - - + + + - - - - - - - - - - -
    Header 1Header 2
    Header 1Header 2
    1one
    2two
    -
    + + + 1 + one + + + 2 + two + + + + diff --git a/tests/Integration/tests/tables/table-csv-table-with-header/expected/index.html b/tests/Integration/tests/tables/table-csv-table-with-header/expected/index.html index 8c729841a..eaac8d938 100644 --- a/tests/Integration/tests/tables/table-csv-table-with-header/expected/index.html +++ b/tests/Integration/tests/tables/table-csv-table-with-header/expected/index.html @@ -1,7 +1,6 @@

    Csv table

    - @@ -21,7 +20,7 @@

    Csv table

    -

    test

    -
    +

    test

    + diff --git a/tests/Integration/tests/tables/table-csv-table-with-markup/expected/index.html b/tests/Integration/tests/tables/table-csv-table-with-markup/expected/index.html index 3ea59e41f..8c5fa665c 100644 --- a/tests/Integration/tests/tables/table-csv-table-with-markup/expected/index.html +++ b/tests/Integration/tests/tables/table-csv-table-with-markup/expected/index.html @@ -1,7 +1,6 @@

    Csv table

    - @@ -25,7 +24,7 @@

    Csv table

    -

    test

    -
    +

    test

    + diff --git a/tests/Integration/tests/tables/table-csv-table/expected/index.html b/tests/Integration/tests/tables/table-csv-table/expected/index.html index a9153bdf6..8938cc690 100644 --- a/tests/Integration/tests/tables/table-csv-table/expected/index.html +++ b/tests/Integration/tests/tables/table-csv-table/expected/index.html @@ -1,7 +1,6 @@

    Csv table

    - @@ -19,7 +18,7 @@

    Csv table
    -

    test

    -
    +

    test

    + diff --git a/tests/Integration/tests/tables/table-directive/expected/index.html b/tests/Integration/tests/tables/table-directive/expected/index.html index 70c356458..343fc438d 100644 --- a/tests/Integration/tests/tables/table-directive/expected/index.html +++ b/tests/Integration/tests/tables/table-directive/expected/index.html @@ -1,7 +1,6 @@

    table

    - @@ -25,7 +24,5 @@

    table

    My table caption
    -
    - diff --git a/tests/Integration/tests/text-with-pipe/expected/index.html b/tests/Integration/tests/text-with-pipe/expected/index.html index 04255acee..5cf59b036 100644 --- a/tests/Integration/tests/text-with-pipe/expected/index.html +++ b/tests/Integration/tests/text-with-pipe/expected/index.html @@ -2,7 +2,7 @@

    Some Title

    -

    string | array | object

    -
    +

    string | array | object

    + diff --git a/tests/Integration/tests/toctree/toctree-caption/expected/index.html b/tests/Integration/tests/toctree/toctree-caption/expected/index.html index 0494bb4ff..f300d81f4 100644 --- a/tests/Integration/tests/toctree/toctree-caption/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-caption/expected/index.html @@ -1,17 +1,20 @@ -
    -

    Document Title

    +
    +

    Document Title

    +
    +

    Table of Contents

    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-entry-not-found/expected/index.html b/tests/Integration/tests/toctree/toctree-entry-not-found/expected/index.html index 0494bb4ff..f300d81f4 100644 --- a/tests/Integration/tests/toctree/toctree-entry-not-found/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-entry-not-found/expected/index.html @@ -1,17 +1,20 @@ -
    -

    Document Title

    +
    +

    Document Title

    +
    +

    Table of Contents

    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-external-linktargets/expected/index.html b/tests/Integration/tests/toctree/toctree-external-linktargets/expected/index.html index 2088c5e6e..3855e9767 100644 --- a/tests/Integration/tests/toctree/toctree-external-linktargets/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-external-linktargets/expected/index.html @@ -1,20 +1,25 @@ -
    -

    Document Title

    +
    +

    Document Title

    +
    +

    Some Caption

    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-glob-level-1/expected/index.html b/tests/Integration/tests/toctree/toctree-glob-level-1/expected/index.html index 22689c302..a75d2cdaa 100644 --- a/tests/Integration/tests/toctree/toctree-glob-level-1/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-glob-level-1/expected/index.html @@ -1,17 +1,22 @@ -
    -

    Document Title

    +
    +

    Document Title

    Lorem Ipsum Dolor.

    -
    - -
    + +
    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-glob-level-2/expected/index.html b/tests/Integration/tests/toctree/toctree-glob-level-2/expected/index.html index 475fd0479..f4ff22928 100644 --- a/tests/Integration/tests/toctree/toctree-glob-level-2/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-glob-level-2/expected/index.html @@ -1,39 +1,54 @@ -
    -

    Document Title

    +
    +

    Document Title

    Lorem Ipsum Dolor.

    -
    - + + +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-glob-level-2/expected/subfolder/index.html b/tests/Integration/tests/toctree/toctree-glob-level-2/expected/subfolder/index.html index c24218e4a..4155bfa6d 100644 --- a/tests/Integration/tests/toctree/toctree-glob-level-2/expected/subfolder/index.html +++ b/tests/Integration/tests/toctree/toctree-glob-level-2/expected/subfolder/index.html @@ -1,23 +1,27 @@ -
    -

    Subfolder Index

    +
    +

    Subfolder Index

    Lorem Ipsum Dolor.

    -
    -
    A Definition List
    +
    +
    A Definition List
    +
    Some definition.
    -
    +
    +
    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-glob-level-2/expected/subfolder2/index.html b/tests/Integration/tests/toctree/toctree-glob-level-2/expected/subfolder2/index.html index b4af7b275..6c4a9fcb1 100644 --- a/tests/Integration/tests/toctree/toctree-glob-level-2/expected/subfolder2/index.html +++ b/tests/Integration/tests/toctree/toctree-glob-level-2/expected/subfolder2/index.html @@ -2,9 +2,9 @@

    Subfolder Index

    -

    The toctree on this page is hidden. Its subpages are displayed only in +

    The toctree on this page is hidden. Its subpages are displayed only in the parent menu.

    -
    +
    diff --git a/tests/Integration/tests/toctree/toctree-glob-level-3/expected/index.html b/tests/Integration/tests/toctree/toctree-glob-level-3/expected/index.html index de71a512d..9ca200408 100644 --- a/tests/Integration/tests/toctree/toctree-glob-level-3/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-glob-level-3/expected/index.html @@ -1,61 +1,86 @@ -
    -

    Document Title

    +
    +

    Document Title

    Lorem Ipsum Dolor.

    -
    - -
    + +
    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-level-2/expected/index.html b/tests/Integration/tests/toctree/toctree-level-2/expected/index.html index 475fd0479..f4ff22928 100644 --- a/tests/Integration/tests/toctree/toctree-level-2/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-level-2/expected/index.html @@ -1,39 +1,54 @@ -
    -

    Document Title

    +
    +

    Document Title

    Lorem Ipsum Dolor.

    -
    - + + +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-level-2/expected/subfolder/index.html b/tests/Integration/tests/toctree/toctree-level-2/expected/subfolder/index.html index c24218e4a..4155bfa6d 100644 --- a/tests/Integration/tests/toctree/toctree-level-2/expected/subfolder/index.html +++ b/tests/Integration/tests/toctree/toctree-level-2/expected/subfolder/index.html @@ -1,23 +1,27 @@ -
    -

    Subfolder Index

    +
    +

    Subfolder Index

    Lorem Ipsum Dolor.

    -
    -
    A Definition List
    +
    +
    A Definition List
    +
    Some definition.
    -
    +
    +
    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-level-2/expected/subfolder2/index.html b/tests/Integration/tests/toctree/toctree-level-2/expected/subfolder2/index.html index b4af7b275..6c4a9fcb1 100644 --- a/tests/Integration/tests/toctree/toctree-level-2/expected/subfolder2/index.html +++ b/tests/Integration/tests/toctree/toctree-level-2/expected/subfolder2/index.html @@ -2,9 +2,9 @@

    Subfolder Index

    -

    The toctree on this page is hidden. Its subpages are displayed only in +

    The toctree on this page is hidden. Its subpages are displayed only in the parent menu.

    -
    +
    diff --git a/tests/Integration/tests/toctree/toctree-level-3-maxdepth-1/expected/index.html b/tests/Integration/tests/toctree/toctree-level-3-maxdepth-1/expected/index.html index dccbb803e..0ed4754b4 100644 --- a/tests/Integration/tests/toctree/toctree-level-3-maxdepth-1/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-level-3-maxdepth-1/expected/index.html @@ -1,23 +1,32 @@ -
    -

    Document Title

    +
    +

    Document Title

    Lorem Ipsum Dolor.

    -
    - -
    + +
    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-level-3-maxdepth-2/expected/index.html b/tests/Integration/tests/toctree/toctree-level-3-maxdepth-2/expected/index.html index ee60feaba..1272c954d 100644 --- a/tests/Integration/tests/toctree/toctree-level-3-maxdepth-2/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-level-3-maxdepth-2/expected/index.html @@ -1,45 +1,64 @@ -
    -

    Document Title

    +
    +

    Document Title

    Lorem Ipsum Dolor.

    -
    - + + +
  • + Level 1-2 + + +
    • +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-level-3/expected/index.html b/tests/Integration/tests/toctree/toctree-level-3/expected/index.html index de71a512d..9ca200408 100644 --- a/tests/Integration/tests/toctree/toctree-level-3/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-level-3/expected/index.html @@ -1,61 +1,86 @@ -
    -

    Document Title

    +
    +

    Document Title

    Lorem Ipsum Dolor.

    -
    - -
    + +
    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-maxdepth/expected/index.html b/tests/Integration/tests/toctree/toctree-maxdepth/expected/index.html index 5b91509b5..9c956ccee 100644 --- a/tests/Integration/tests/toctree/toctree-maxdepth/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-maxdepth/expected/index.html @@ -1,384 +1,509 @@ -
    -

    Index

    +
    +

    Index

    Maxdepth 1

    -
    - + + +
  • + Subpage 2, Page 1, Level 1 + + +
    • + +

    Maxdepth 3

    -
    - -
    + +
    + +

    Maxdepth 4

    -
    - -
    + +
    + +

    Maxdepth 5

    -
    - -
    + +
    + +

    No Maxdepth

    -
    - -
    -

    Glob

    -
    - + +
  • + Subpage 1, Page 1, Level 2.2 + + +
    • + + +
  • + Subpage 1, Page 2, Level 1 + + +
    • + + + +
  • + Subpage 2, Page 1, Level 1 + + +
    • +
    + +

    Glob

    + +
    + +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-no-duplicates/expected/index.html b/tests/Integration/tests/toctree/toctree-no-duplicates/expected/index.html index 5b58fddeb..f1190bda0 100644 --- a/tests/Integration/tests/toctree/toctree-no-duplicates/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-no-duplicates/expected/index.html @@ -1,22 +1,29 @@ -
    -

    index

    - -
    - -
    +
    +

    index

    +
    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-no-duplicates/expected/overview.html b/tests/Integration/tests/toctree/toctree-no-duplicates/expected/overview.html index 5bc9905a2..905d7d259 100644 --- a/tests/Integration/tests/toctree/toctree-no-duplicates/expected/overview.html +++ b/tests/Integration/tests/toctree/toctree-no-duplicates/expected/overview.html @@ -1,23 +1,32 @@ -
    -

    Overview

    +
    +

    Overview

    Lorem Ipsum Dolor

    -
    - -
    + +
    +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-not-included/expected/index.html b/tests/Integration/tests/toctree/toctree-not-included/expected/index.html index 1edcdb245..66995bd5a 100644 --- a/tests/Integration/tests/toctree/toctree-not-included/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-not-included/expected/index.html @@ -1,7 +1,5 @@

    index

    -
    - diff --git a/tests/Integration/tests/toctree/toctree-not-included/expected/overview.html b/tests/Integration/tests/toctree/toctree-not-included/expected/overview.html index a8809b579..c991fd286 100644 --- a/tests/Integration/tests/toctree/toctree-not-included/expected/overview.html +++ b/tests/Integration/tests/toctree/toctree-not-included/expected/overview.html @@ -2,7 +2,7 @@

    Overview

    -

    Lorem Ipsum Dolor

    -
    +

    Lorem Ipsum Dolor

    +
    diff --git a/tests/Integration/tests/toctree/toctree-simple/expected/index.html b/tests/Integration/tests/toctree/toctree-simple/expected/index.html index cf83fb073..7882d8648 100644 --- a/tests/Integration/tests/toctree/toctree-simple/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-simple/expected/index.html @@ -1,24 +1,30 @@ -
    -

    index

    +
    +

    index

    +
    + + +
  • + Page 2 + + +
    • +
    +
    diff --git a/tests/Integration/tests/toctree/toctree-titlesonly/expected/index.html b/tests/Integration/tests/toctree/toctree-titlesonly/expected/index.html index a028b5a0e..dfaaf2c64 100644 --- a/tests/Integration/tests/toctree/toctree-titlesonly/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-titlesonly/expected/index.html @@ -1,16 +1,19 @@ -
    -

    Document Title

    +
    +

    Document Title

    +
    +
    +