diff --git a/packages/guides-theme-bootstrap/resources/template/structure/layout.html.twig b/packages/guides-theme-bootstrap/resources/template/structure/layout.html.twig index 26cd873a1..f0b3c7d96 100644 --- a/packages/guides-theme-bootstrap/resources/template/structure/layout.html.twig +++ b/packages/guides-theme-bootstrap/resources/template/structure/layout.html.twig @@ -27,8 +27,10 @@
{% block breadcrumb %} {% endblock %} + {% block body %} {% endblock %} +
diff --git a/packages/guides/resources/template/html/structure/layout.html.twig b/packages/guides/resources/template/html/structure/layout.html.twig index 99539d59d..a1101081e 100644 --- a/packages/guides/resources/template/html/structure/layout.html.twig +++ b/packages/guides/resources/template/html/structure/layout.html.twig @@ -8,7 +8,9 @@ {%~ endblock %} + {%~ block body %} {%~ endblock %} + diff --git a/tests/Integration/IntegrationTest.php b/tests/Integration/IntegrationTest.php index 348e416b0..258fd600d 100644 --- a/tests/Integration/IntegrationTest.php +++ b/tests/Integration/IntegrationTest.php @@ -21,9 +21,13 @@ use function file_exists; use function file_get_contents; use function implode; +use function PHPUnit\Framework\assertIsString; use function setlocale; use function str_ends_with; use function str_replace; +use function strlen; +use function strpos; +use function substr; use function system; use function trim; @@ -31,6 +35,9 @@ class IntegrationTest extends ApplicationTestCase { + private const CONTENT_START = ''; + private const CONTENT_END = ''; + protected function setUp(): void { setlocale(LC_ALL, 'en_US.utf8'); @@ -44,6 +51,23 @@ public function testHtmlIntegration( string $outputPath, array $compareFiles, ): void { + $this->compareHtmlIntegration($outputPath, $inputPath, $expectedPath, $compareFiles, true); + } + + /** @param list $compareFiles */ + #[DataProvider('getTestsForDirectoryTestsFull')] + public function testHtmlIntegrationFullFile( + string $inputPath, + string $expectedPath, + string $outputPath, + array $compareFiles, + ): void { + $this->compareHtmlIntegration($outputPath, $inputPath, $expectedPath, $compareFiles, false); + } + + /** @param list $compareFiles */ + private function compareHtmlIntegration(string $outputPath, string $inputPath, string $expectedPath, array $compareFiles, bool $htmlOnlyBetweenMarkers): void + { system('rm -rf ' . escapeshellarg($outputPath)); self::assertDirectoryExists($inputPath); self::assertDirectoryExists($expectedPath); @@ -91,6 +115,14 @@ public function testHtmlIntegration( $outputFile = str_replace($expectedPath, $outputPath, $compareFile); if (str_ends_with($compareFile, '.log')) { self::assertFileContainsLines($compareFile, $outputFile); + } elseif ($htmlOnlyBetweenMarkers && str_ends_with($compareFile, '.html')) { + self::assertFileEqualsTrimmedBetweenMarkers( + $compareFile, + $outputFile, + 'Expected file path: ' . $compareFile, + self::CONTENT_START, + self::CONTENT_END, + ); } else { self::assertFileEqualsTrimmed($compareFile, $outputFile, 'Expected file path: ' . $compareFile); } @@ -106,6 +138,37 @@ public function testHtmlIntegration( self::assertFalse($skip, 'Test passes while marked as SKIP.'); } + /** + * Asserts that each line of the expected file is contained in actual + * + * @throws ExpectationFailedException + */ + private static function assertFileEqualsTrimmedBetweenMarkers(string $expected, string $actual, string $message, string $startMarker, string $endMarker): void + { + self::assertFileExists($expected); + self::assertFileExists($actual); + + $expectedContent = self::extractContentBetweenMarkers($expected, $startMarker, $endMarker); + $actualContent = self::extractContentBetweenMarkers($actual, $startMarker, $endMarker); + + self::assertEquals(self::getTrimmedContent($expectedContent), self::getTrimmedContent($actualContent), $message); + } + + /** + * Extract content between specified markers in a file. + */ + private static function extractContentBetweenMarkers(string $filePath, string $startMarker, string $endMarker): string + { + $fileContent = file_get_contents($filePath); + self::assertIsString($fileContent); + $startPos = strpos($fileContent, $startMarker); + self::assertIsInt($startPos, 'Start marker not found in file: ' . $filePath); + $endPos = strpos($fileContent, $endMarker, $startPos + strlen($startMarker)); + self::assertIsInt($endPos, 'End marker not found in file: ' . $filePath); + + return substr($fileContent, $startPos + strlen($startMarker), $endPos - $startPos - strlen($startMarker)); + } + /** * Asserts that each line of the expected file is contained in actual * @@ -145,6 +208,13 @@ public static function assertFileEqualsTrimmed(string $expected, string $actual, public static function getTrimmedFileContent(string $file): string { $fileContent = file_get_contents($file); + assertIsString($fileContent); + + return self::getTrimmedContent($fileContent); + } + + public static function getTrimmedContent(string $fileContent): string + { self::assertIsString($fileContent); $contentArray = explode("\n", $fileContent); array_walk($contentArray, static function (&$value): void { @@ -164,9 +234,9 @@ public static function getTestsForDirectoryTest(): array } /** @return mixed[] */ - public static function getTestsForLatex(): array + public static function getTestsForDirectoryTestsFull(): array { - return self::getTestsForDirectory(__DIR__ . '/tests-latex'); + return self::getTestsForDirectory(__DIR__ . '/tests-full'); } /** @return mixed[] */ diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/expected/anotherPage.html b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/anotherPage.html similarity index 97% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu-several/expected/anotherPage.html rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/anotherPage.html index 91f51d078..5f072161a 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/expected/anotherPage.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/anotherPage.html @@ -80,6 +80,7 @@

Additional Menu

+
@@ -88,6 +89,7 @@

Another Page

Lorem Ipsum Dolor.

+ diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/expected/index.html b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/index.html similarity index 97% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu-several/expected/index.html rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/index.html index ed1d5b73f..3c4a09f17 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/expected/index.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/index.html @@ -79,6 +79,7 @@

Additional Menu

+
@@ -89,6 +90,7 @@

Document Title

+ diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/expected/somePage.html b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/somePage.html similarity index 97% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu-several/expected/somePage.html rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/somePage.html index 83aa3a946..e799c8d50 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/expected/somePage.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/expected/somePage.html @@ -80,6 +80,7 @@

Additional Menu

+
@@ -88,6 +89,7 @@

Some Page

Lorem Ipsum Dolor.

+ diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/anotherPage.rst b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/anotherPage.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/anotherPage.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/anotherPage.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/guides.xml b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/guides.xml similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/guides.xml rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/guides.xml diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/include.rst.txt b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/include.rst.txt similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/include.rst.txt rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/include.rst.txt diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/index.rst b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/index.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/index.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/index.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/somePage.rst b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/somePage.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/somePage.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/somePage.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/yetAnotherPage.rst b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/yetAnotherPage.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu-several/input/yetAnotherPage.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu-several/input/yetAnotherPage.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu/expected/anotherPage.html b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/expected/anotherPage.html similarity index 93% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu/expected/anotherPage.html rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu/expected/anotherPage.html index 5c868830f..bbbc2fe59 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-default-menu/expected/anotherPage.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/expected/anotherPage.html @@ -10,7 +10,8 @@
-
@@ -47,7 +48,7 @@
+
@@ -83,6 +85,7 @@

Another Page

Lorem Ipsum Dolor.

+
diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu/expected/index.html b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/expected/index.html similarity index 93% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu/expected/index.html rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu/expected/index.html index d6020871e..afe22deb0 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-default-menu/expected/index.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/expected/index.html @@ -10,7 +10,8 @@
-
@@ -47,7 +48,7 @@
+
@@ -83,6 +85,7 @@

Document Title

+
diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu/expected/somePage.html b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/expected/somePage.html similarity index 93% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu/expected/somePage.html rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu/expected/somePage.html index 686cd5e2c..44a312bd0 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-default-menu/expected/somePage.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/expected/somePage.html @@ -10,7 +10,8 @@
-
@@ -47,7 +48,7 @@
+
@@ -83,6 +85,7 @@

Some Page

Lorem Ipsum Dolor.

+
diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu/input/anotherPage.rst b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/anotherPage.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu/input/anotherPage.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/anotherPage.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu/input/guides.xml b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/guides.xml similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu/input/guides.xml rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/guides.xml diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu/input/include.rst.txt b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/include.rst.txt similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu/input/include.rst.txt rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/include.rst.txt diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu/input/index.rst b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/index.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu/input/index.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/index.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu/input/somePage.rst b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/somePage.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu/input/somePage.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/somePage.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-default-menu/input/yetAnotherPage.rst b/tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/yetAnotherPage.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-default-menu/input/yetAnotherPage.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-default-menu/input/yetAnotherPage.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-index/expected/anotherPage.html b/tests/Integration/tests-full/bootstrap/bootstrap-index/expected/anotherPage.html similarity index 93% rename from tests/Integration/tests/bootstrap/bootstrap-index/expected/anotherPage.html rename to tests/Integration/tests-full/bootstrap/bootstrap-index/expected/anotherPage.html index 70e0a55c2..67dc35e1a 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-index/expected/anotherPage.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-index/expected/anotherPage.html @@ -10,7 +10,8 @@
-
@@ -49,7 +49,7 @@ +
@@ -84,6 +85,7 @@

Another Page

Lorem Ipsum Dolor.

+ diff --git a/tests/Integration/tests/bootstrap/bootstrap-index/expected/index.html b/tests/Integration/tests-full/bootstrap/bootstrap-index/expected/index.html similarity index 93% rename from tests/Integration/tests/bootstrap/bootstrap-index/expected/index.html rename to tests/Integration/tests-full/bootstrap/bootstrap-index/expected/index.html index a246e4710..722013bd0 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-index/expected/index.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-index/expected/index.html @@ -10,7 +10,8 @@
-
@@ -49,7 +49,7 @@ +
@@ -84,6 +85,7 @@

Document Title

+ diff --git a/tests/Integration/tests/bootstrap/bootstrap-index/expected/somePage.html b/tests/Integration/tests-full/bootstrap/bootstrap-index/expected/somePage.html similarity index 90% rename from tests/Integration/tests/bootstrap/bootstrap-index/expected/somePage.html rename to tests/Integration/tests-full/bootstrap/bootstrap-index/expected/somePage.html index 3ec5764ee..2ba65d261 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-index/expected/somePage.html +++ b/tests/Integration/tests-full/bootstrap/bootstrap-index/expected/somePage.html @@ -5,12 +5,13 @@ - +
-
@@ -47,9 +47,9 @@
Main Menu
- +
- + - + +

Some Page

-

Lorem Ipsum Dolor.

+

Lorem Ipsum Dolor.

+
@@ -94,7 +96,7 @@

Some Page

Generated by phpDocumentor.

- + diff --git a/tests/Integration/tests/bootstrap/bootstrap-index/input/anotherPage.rst b/tests/Integration/tests-full/bootstrap/bootstrap-index/input/anotherPage.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-index/input/anotherPage.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-index/input/anotherPage.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-index/input/guides.xml b/tests/Integration/tests-full/bootstrap/bootstrap-index/input/guides.xml similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-index/input/guides.xml rename to tests/Integration/tests-full/bootstrap/bootstrap-index/input/guides.xml diff --git a/tests/Integration/tests/bootstrap/bootstrap-index/input/include.rst.txt b/tests/Integration/tests-full/bootstrap/bootstrap-index/input/include.rst.txt similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-index/input/include.rst.txt rename to tests/Integration/tests-full/bootstrap/bootstrap-index/input/include.rst.txt diff --git a/tests/Integration/tests/bootstrap/bootstrap-index/input/index.rst b/tests/Integration/tests-full/bootstrap/bootstrap-index/input/index.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-index/input/index.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-index/input/index.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-index/input/somePage.rst b/tests/Integration/tests-full/bootstrap/bootstrap-index/input/somePage.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-index/input/somePage.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-index/input/somePage.rst diff --git a/tests/Integration/tests/bootstrap/bootstrap-index/input/yetAnotherPage.rst b/tests/Integration/tests-full/bootstrap/bootstrap-index/input/yetAnotherPage.rst similarity index 100% rename from tests/Integration/tests/bootstrap/bootstrap-index/input/yetAnotherPage.rst rename to tests/Integration/tests-full/bootstrap/bootstrap-index/input/yetAnotherPage.rst diff --git a/tests/Integration/tests/index/expected/index.html b/tests/Integration/tests-full/index/expected/index.html similarity index 56% rename from tests/Integration/tests/index/expected/index.html rename to tests/Integration/tests-full/index/expected/index.html index 14293f2c0..41d8b1c03 100644 --- a/tests/Integration/tests/index/expected/index.html +++ b/tests/Integration/tests-full/index/expected/index.html @@ -1,12 +1,17 @@ -Document Title + Document Title + +

Document Title

-

Lorem Ipsum Dolor.

+ +

Lorem Ipsum Dolor.

+ + diff --git a/tests/Integration/tests/index/input/index.rst b/tests/Integration/tests-full/index/input/index.rst similarity index 100% rename from tests/Integration/tests/index/input/index.rst rename to tests/Integration/tests-full/index/input/index.rst diff --git a/tests/Integration/tests/anchor/anchor-link-in-list/expected/index.html b/tests/Integration/tests/anchor/anchor-link-in-list/expected/index.html index 3ffec2f7f..e091a4db7 100644 --- a/tests/Integration/tests/anchor/anchor-link-in-list/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-link-in-list/expected/index.html @@ -1,14 +1,8 @@ - - - - Test - - - +

Test

- +
- - + diff --git a/tests/Integration/tests/anchor/anchor-ref-title-equals-title/expected/index.html b/tests/Integration/tests/anchor/anchor-ref-title-equals-title/expected/index.html index c8898dec8..76c676479 100644 --- a/tests/Integration/tests/anchor/anchor-ref-title-equals-title/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-ref-title-equals-title/expected/index.html @@ -1,10 +1,4 @@ - - - - Anchors between pages - - - +

Anchors between pages

@@ -12,5 +6,4 @@

Anchors between pages

This is a link to the Sphinx Overview: Overview 2

- - + diff --git a/tests/Integration/tests/anchor/anchor-ref-title-equals-title/expected/overview.html b/tests/Integration/tests/anchor/anchor-ref-title-equals-title/expected/overview.html index 39a5ddb64..ee4517828 100644 --- a/tests/Integration/tests/anchor/anchor-ref-title-equals-title/expected/overview.html +++ b/tests/Integration/tests/anchor/anchor-ref-title-equals-title/expected/overview.html @@ -1,21 +1,21 @@ - - - - Overview - - -
+ +

Overview

-
-

Overview 1

- -

RST Overview content

+ +
+

Overview 1

+ + +

RST Overview content

-
-

Overview 2

- -

Sphinx Overview content

+ +
+

Overview 2

+ + +

Sphinx Overview content

-
- - + +
+ + diff --git a/tests/Integration/tests/anchor/anchor-title-overriden-by-ref-title/expected/index.html b/tests/Integration/tests/anchor/anchor-title-overriden-by-ref-title/expected/index.html index 47e6b5ff8..a4d7ab4e2 100644 --- a/tests/Integration/tests/anchor/anchor-title-overriden-by-ref-title/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-title-overriden-by-ref-title/expected/index.html @@ -1,25 +1,23 @@ - - - - Overview - - - -
+ +

Overview

- -

RST Overview content

-
+ + +

RST Overview content

+
+

Overview

- -

Sphinx Overview content

-
-

Somewhere else

-

This is a link to the RST Overview: RST Overview

-

This is a link to the Sphinx Overview: Sphinx Overview

+ + +

Sphinx Overview content

+
+

Somewhere else

+ +

This is a link to the RST Overview: RST Overview

+

This is a link to the Sphinx Overview: Sphinx Overview

+
+
-
- - + diff --git a/tests/Integration/tests/anchor/anchor-to-page/expected/index.html b/tests/Integration/tests/anchor/anchor-to-page/expected/index.html index fa9bacdfa..d9f089248 100644 --- a/tests/Integration/tests/anchor/anchor-to-page/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-to-page/expected/index.html @@ -1,10 +1,4 @@ - - - - Page - - - +

Page

@@ -12,5 +6,4 @@

Page

This is a link to the Sphinx Overview: Overview

- - + diff --git a/tests/Integration/tests/anchor/anchor-to-page/expected/objects.inv.json b/tests/Integration/tests/anchor/anchor-to-page/expected/objects.inv.json index cdd885b13..6f02c1dc6 100644 --- a/tests/Integration/tests/anchor/anchor-to-page/expected/objects.inv.json +++ b/tests/Integration/tests/anchor/anchor-to-page/expected/objects.inv.json @@ -27,10 +27,10 @@ "Page" ], "overview": [ - null, - null, - "sphinx-overview.html#overview", - "Overview" + null, + null, + "sphinx-overview.html#overview", + "Overview" ], "rst-overview": [ null, @@ -45,4 +45,4 @@ "Overview" ] } -} +} \ No newline at end of file diff --git a/tests/Integration/tests/anchor/anchor-to-section-relative/expected/index.html b/tests/Integration/tests/anchor/anchor-to-section-relative/expected/index.html index e54799d06..03623271c 100644 --- a/tests/Integration/tests/anchor/anchor-to-section-relative/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-to-section-relative/expected/index.html @@ -1,16 +1,9 @@ - - - -Anchors - - +

Anchors

-

go to lists

- - + diff --git a/tests/Integration/tests/anchor/anchor-to-section/expected/index.html b/tests/Integration/tests/anchor/anchor-to-section/expected/index.html index 368733e65..1529c6bf2 100644 --- a/tests/Integration/tests/anchor/anchor-to-section/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-to-section/expected/index.html @@ -1,16 +1,9 @@ - - - -Anchors - - +

Anchors

-

go to lists

- - + diff --git a/tests/Integration/tests/anchor/anchor-to-title-on-another-page/expected/index.html b/tests/Integration/tests/anchor/anchor-to-title-on-another-page/expected/index.html index 33979b96c..d7d3b8712 100644 --- a/tests/Integration/tests/anchor/anchor-to-title-on-another-page/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-to-title-on-another-page/expected/index.html @@ -1,15 +1,9 @@ - - - - Anchors between pages - - - -
+ +

Anchors between pages

-

This is a link to the RST Overview: Overview

-

This is a link to the Sphinx Overview: Overview

-
- - +

This is a link to the RST Overview: Overview

+

This is a link to the Sphinx Overview: Overview

+
+ + diff --git a/tests/Integration/tests/anchor/anchor-to-title/expected/index.html b/tests/Integration/tests/anchor/anchor-to-title/expected/index.html index 3ad2a08b0..2383f8dff 100644 --- a/tests/Integration/tests/anchor/anchor-to-title/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-to-title/expected/index.html @@ -1,25 +1,23 @@ - - - - Overview - - - -
+ +

Overview

- -

RST Overview content

-
+ + +

RST Overview content

+
+

Overview

- -

Sphinx Overview content

-
-

Somewhere else

-

This is a link to the RST Overview: Overview

-

This is a link to the Sphinx Overview: Overview

+ + +

Sphinx Overview content

+
+

Somewhere else

+ +

This is a link to the RST Overview: Overview

+

This is a link to the Sphinx Overview: Overview

+
+
-
- - + diff --git a/tests/Integration/tests/anchor/anchor-whitespace/expected/index.html b/tests/Integration/tests/anchor/anchor-whitespace/expected/index.html index 3ad2a08b0..2383f8dff 100644 --- a/tests/Integration/tests/anchor/anchor-whitespace/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-whitespace/expected/index.html @@ -1,25 +1,23 @@ - - - - Overview - - - -
+ +

Overview

- -

RST Overview content

-
+ + +

RST Overview content

+
+

Overview

- -

Sphinx Overview content

-
-

Somewhere else

-

This is a link to the RST Overview: Overview

-

This is a link to the Sphinx Overview: Overview

+ + +

Sphinx Overview content

+
+

Somewhere else

+ +

This is a link to the RST Overview: Overview

+

This is a link to the Sphinx Overview: Overview

+
+
-
- - + diff --git a/tests/Integration/tests/anchor/anchor-within-text/expected/index.html b/tests/Integration/tests/anchor/anchor-within-text/expected/index.html index e971a9410..fbe50cf52 100644 --- a/tests/Integration/tests/anchor/anchor-within-text/expected/index.html +++ b/tests/Integration/tests/anchor/anchor-within-text/expected/index.html @@ -1,10 +1,4 @@ - - - - Page - - - +

Page

@@ -12,5 +6,4 @@

Page

This is a link to the Sphinx Overview: Sphinx Overview

- - + diff --git a/tests/Integration/tests/body-elements/block-quotes/expected/index.html b/tests/Integration/tests/body-elements/block-quotes/expected/index.html index 1d859187d..244129328 100644 --- a/tests/Integration/tests/body-elements/block-quotes/expected/index.html +++ b/tests/Integration/tests/body-elements/block-quotes/expected/index.html @@ -1,10 +1,4 @@ - - - - Some Blockquotes - - - +

Some Blockquotes

@@ -26,5 +20,4 @@

Some Blockquotes

- - + diff --git a/tests/Integration/tests/body-elements/citation/citation-page/expected/citations.html b/tests/Integration/tests/body-elements/citation/citation-page/expected/citations.html index 421fb992d..836689cfc 100644 --- a/tests/Integration/tests/body-elements/citation/citation-page/expected/citations.html +++ b/tests/Integration/tests/body-elements/citation/citation-page/expected/citations.html @@ -1,29 +1,25 @@ - - - - Document Title - - - +

Document Title

-
+
[Ref1]
Book or article reference, URL or whatever.
-
+ +
[Ref2]
Another Book
-
+ +
[phpdoc]
https://www.phpdoc.org/
+
- - + diff --git a/tests/Integration/tests/body-elements/citation/citation-page/expected/index.html b/tests/Integration/tests/body-elements/citation/citation-page/expected/index.html index a86e82ced..560ba2cdc 100644 --- a/tests/Integration/tests/body-elements/citation/citation-page/expected/index.html +++ b/tests/Integration/tests/body-elements/citation/citation-page/expected/index.html @@ -1,15 +1,8 @@ - - - - Document Title - - - +

Document Title

Lorem ipsum [Ref1] dolor sit amet [Ref2] and [phpdoc].

- - + diff --git a/tests/Integration/tests/body-elements/citation/citation-same-page/expected/index.html b/tests/Integration/tests/body-elements/citation/citation-same-page/expected/index.html index 1bfe20fe2..5e8f5a558 100644 --- a/tests/Integration/tests/body-elements/citation/citation-same-page/expected/index.html +++ b/tests/Integration/tests/body-elements/citation/citation-same-page/expected/index.html @@ -1,20 +1,14 @@ - - - - Document Title - - - +

Document Title

Lorem ipsum [Ref] dolor sit amet.

-
+
[Ref]
Book or article reference, URL or whatever.
+
- - + diff --git a/tests/Integration/tests/body-elements/citation/citation-unknown/expected/index.html b/tests/Integration/tests/body-elements/citation/citation-unknown/expected/index.html index 7f145965e..699f0bca7 100644 --- a/tests/Integration/tests/body-elements/citation/citation-unknown/expected/index.html +++ b/tests/Integration/tests/body-elements/citation/citation-unknown/expected/index.html @@ -1,15 +1,8 @@ - - - - Document Title - - - +

Document Title

Lorem ipsum [UnkownCitation] dolor sit amet.

- - + diff --git a/tests/Integration/tests/body-elements/footnote/footnote-list/expected/index.html b/tests/Integration/tests/body-elements/footnote/footnote-list/expected/index.html index 0437a5e7e..171ebb26c 100644 --- a/tests/Integration/tests/body-elements/footnote/footnote-list/expected/index.html +++ b/tests/Integration/tests/body-elements/footnote/footnote-list/expected/index.html @@ -1,10 +1,4 @@ - - - - Document Title - - - +

Document Title

@@ -25,5 +19,4 @@

Document Title

- - + diff --git a/tests/Integration/tests/body-elements/footnote/footnote-named/expected/index.html b/tests/Integration/tests/body-elements/footnote/footnote-named/expected/index.html index 43005e6d8..b897bc09f 100644 --- a/tests/Integration/tests/body-elements/footnote/footnote-named/expected/index.html +++ b/tests/Integration/tests/body-elements/footnote/footnote-named/expected/index.html @@ -1,10 +1,4 @@ - - - - Document Title - - - +

Document Title

@@ -12,17 +6,18 @@

Document Title

See also [#f2] dolor sit

Footnotes
-
+
[1]
Text of the first footnote.
-
+ +
[2]
Text of the second footnote.
+
- - + diff --git a/tests/Integration/tests/body-elements/footnote/footnote-numbered/expected/index.html b/tests/Integration/tests/body-elements/footnote/footnote-numbered/expected/index.html index fbc523575..9002f4b00 100644 --- a/tests/Integration/tests/body-elements/footnote/footnote-numbered/expected/index.html +++ b/tests/Integration/tests/body-elements/footnote/footnote-numbered/expected/index.html @@ -1,27 +1,22 @@ - - - - Document Title - - - +

Document Title

Lorem ipsum [1] dolor sit amet [2].

Footnotes
-
+
[1]
Some numbered footnote
-
+ +
[2]
Another numbered footnote
+
- - + diff --git a/tests/Integration/tests/body-elements/footnote/footnotes-on-document/expected/index.html b/tests/Integration/tests/body-elements/footnote/footnotes-on-document/expected/index.html index fbc523575..9002f4b00 100644 --- a/tests/Integration/tests/body-elements/footnote/footnotes-on-document/expected/index.html +++ b/tests/Integration/tests/body-elements/footnote/footnotes-on-document/expected/index.html @@ -1,27 +1,22 @@ - - - - Document Title - - - +

Document Title

Lorem ipsum [1] dolor sit amet [2].

Footnotes
-
+
[1]
Some numbered footnote
-
+ +
[2]
Another numbered footnote
+
- - + diff --git a/tests/Integration/tests/body-elements/footnote/footnotes-on-document/expected/page1.html b/tests/Integration/tests/body-elements/footnote/footnotes-on-document/expected/page1.html index 6cce220b6..dc31a964c 100644 --- a/tests/Integration/tests/body-elements/footnote/footnotes-on-document/expected/page1.html +++ b/tests/Integration/tests/body-elements/footnote/footnotes-on-document/expected/page1.html @@ -1,27 +1,22 @@ - - - - Page 1 - - - +

Page 1

Lorem ipsum [1] dolor sit amet [2].

Footnotes
-
+
[1]
Some numbered footnote
-
+ +
[2]
Another numbered footnote
+
- - + diff --git a/tests/Integration/tests/body-elements/horizontal-line/expected/index.html b/tests/Integration/tests/body-elements/horizontal-line/expected/index.html index 98bd84a4b..dc855c3c7 100644 --- a/tests/Integration/tests/body-elements/horizontal-line/expected/index.html +++ b/tests/Integration/tests/body-elements/horizontal-line/expected/index.html @@ -1,18 +1,11 @@ - - - - Some Document - - - -
+ +

Some Document

-

Testing separator

-
+

Testing separator

+
-

Hey!

-
+

Hey!

+
- - + diff --git a/tests/Integration/tests/body-elements/image/expected/index.html b/tests/Integration/tests/body-elements/image/expected/index.html index da8d3fd27..620313687 100644 --- a/tests/Integration/tests/body-elements/image/expected/index.html +++ b/tests/Integration/tests/body-elements/image/expected/index.html @@ -1,30 +1,35 @@ - - - -Document Title - - +

Document Title

+

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/body-elements/image/expected/subfolder/subpage.html b/tests/Integration/tests/body-elements/image/expected/subfolder/subpage.html index e29210494..6aabf492a 100644 --- a/tests/Integration/tests/body-elements/image/expected/subfolder/subpage.html +++ b/tests/Integration/tests/body-elements/image/expected/subfolder/subpage.html @@ -1,24 +1,26 @@ - - - -Subpage - - +

Subpage

+

Lorem Ipsum Dolor.

An image with absolute paths

+ Alternative text +
+

An image with relative paths

+ Alternative text +
+
- - + + diff --git a/tests/Integration/tests/bootstrap/bootstrap-admonition/expected/index.html b/tests/Integration/tests/bootstrap/bootstrap-admonition/expected/index.html index 4340ab529..b79a39d13 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-admonition/expected/index.html +++ b/tests/Integration/tests/bootstrap/bootstrap-admonition/expected/index.html @@ -1,51 +1,8 @@ - - - - Document Title - - - - - - - -
- - -
-
-
-
-
-
- - -
-
- - - +

Document Title

- + -
-
-
-
-
- - - - - - - - - - + diff --git a/tests/Integration/tests/bootstrap/bootstrap-tabs/expected/index.html b/tests/Integration/tests/bootstrap/bootstrap-tabs/expected/index.html index 7cece4330..f91dfbbd2 100644 --- a/tests/Integration/tests/bootstrap/bootstrap-tabs/expected/index.html +++ b/tests/Integration/tests/bootstrap/bootstrap-tabs/expected/index.html @@ -1,47 +1,4 @@ - - - - Document Title - - - - - - - -
- - -
-
-
-
-
-
- - -
-
- - - +

Document Title

@@ -93,21 +50,4 @@

Document Title

-
-
-
-
-
- - - - - - - - - - + diff --git a/tests/Integration/tests/class/class-directive-non-block/expected/index.html b/tests/Integration/tests/class/class-directive-non-block/expected/index.html index 655f5cbd2..62b57d6e8 100644 --- a/tests/Integration/tests/class/class-directive-non-block/expected/index.html +++ b/tests/Integration/tests/class/class-directive-non-block/expected/index.html @@ -1,10 +1,4 @@ - - - - Class directives - - - +

Class directives

@@ -14,10 +8,10 @@

Class directives

Test special-paragraph2 1.

Test special-paragraph2 2.

-

Test

+

Test

- +
  • Test list item 1.
    • @@ -33,26 +27,24 @@

    Class directives

    term 1
    - +
    Definition 1
    - - - - - - - + + + + + + - - - - - + + + + +
    First colSecond col
    First colSecond col
    Second rowOther col
    Second rowOther col
- - + diff --git a/tests/Integration/tests/class/class-directive-sections/expected/index.html b/tests/Integration/tests/class/class-directive-sections/expected/index.html index 2f3a73b73..d9195f148 100644 --- a/tests/Integration/tests/class/class-directive-sections/expected/index.html +++ b/tests/Integration/tests/class/class-directive-sections/expected/index.html @@ -1,14 +1,11 @@ - - - -An Exceptional Section - - +

This is a "special" paragraph.

An Exceptional Section

+

This is an ordinary paragraph.

First paragraph.

Second paragraph.

+
- - + + diff --git a/tests/Integration/tests/class/class-directive/expected/index.html b/tests/Integration/tests/class/class-directive/expected/index.html index f5854bd58..79f888d55 100644 --- a/tests/Integration/tests/class/class-directive/expected/index.html +++ b/tests/Integration/tests/class/class-directive/expected/index.html @@ -1,10 +1,4 @@ - - - - Document title - - - +

Document title

@@ -18,11 +12,11 @@

Document title

-
+

A Note with a class

-
+

A note without a class

@@ -30,5 +24,4 @@

Document title

- - + diff --git a/tests/Integration/tests/class/class-in-list/expected/index.html b/tests/Integration/tests/class/class-in-list/expected/index.html index 63b63d609..3aba44e33 100644 --- a/tests/Integration/tests/class/class-in-list/expected/index.html +++ b/tests/Integration/tests/class/class-in-list/expected/index.html @@ -1,21 +1,15 @@ - - - - rst-class within list - - - +

rst-class within list

- - + +

  1. ONE One one bignums-xxl

    This is the story of my life ...

    - +

    1. When I was young

      - +
      1. this
        2. @@ -37,5 +31,4 @@

        rst-class within list

- - + diff --git a/tests/Integration/tests/class/class-option-directive/expected/index.html b/tests/Integration/tests/class/class-option-directive/expected/index.html index dd1afbbe5..c79886ce9 100644 --- a/tests/Integration/tests/class/class-option-directive/expected/index.html +++ b/tests/Integration/tests/class/class-option-directive/expected/index.html @@ -1,19 +1,13 @@ - - - - Document title - - - +

Document title

-

A Note with a class

+

A Note with a class

-

A Note with a class

+

A Note with a class

<?php
@@ -24,5 +18,4 @@ 
Document title

 echo 'Hi';
- - + diff --git a/tests/Integration/tests/class/literalinclude/expected/index.html b/tests/Integration/tests/class/literalinclude/expected/index.html index 222ca1b46..72f99438f 100644 --- a/tests/Integration/tests/class/literalinclude/expected/index.html +++ b/tests/Integration/tests/class/literalinclude/expected/index.html @@ -1,13 +1,8 @@ - - - -index - - -
+ +

index

- 
<?php
+            
<?php
 
 declare(strict_types=1);
 
@@ -19,7 +14,6 @@ 
index

     }
 }
 

-
+
- - + diff --git a/tests/Integration/tests/class/literalincludeLineNos/expected/index.html b/tests/Integration/tests/class/literalincludeLineNos/expected/index.html index f151007ce..d7316eef3 100644 --- a/tests/Integration/tests/class/literalincludeLineNos/expected/index.html +++ b/tests/Integration/tests/class/literalincludeLineNos/expected/index.html @@ -1,13 +1,8 @@ - - - -index - - -
+ +

index

- 
<?php
+            
<?php
 
 declare(strict_types=1);
 
@@ -19,7 +14,6 @@ 
index

     }
 }
 

-
+
- - + diff --git a/tests/Integration/tests/code/code-block-emphasize/expected/index.html b/tests/Integration/tests/code/code-block-emphasize/expected/index.html index ef6bf853a..a4cec7f66 100644 --- a/tests/Integration/tests/code/code-block-emphasize/expected/index.html +++ b/tests/Integration/tests/code/code-block-emphasize/expected/index.html @@ -1,10 +1,4 @@ - - - - Title - - - +

Title

@@ -15,5 +9,4 @@

Title

print('...but this one is.')
- - + diff --git a/tests/Integration/tests/code/code-block-hightlight/expected/index.html b/tests/Integration/tests/code/code-block-hightlight/expected/index.html index 9d8425e39..0fce4b5c4 100644 --- a/tests/Integration/tests/code/code-block-hightlight/expected/index.html +++ b/tests/Integration/tests/code/code-block-hightlight/expected/index.html @@ -1,10 +1,4 @@ - - - - Title - - - +

Title

@@ -22,5 +16,4 @@

Title

<language>XML</language>
- - + diff --git a/tests/Integration/tests/code/code-block-lineno/expected/index.html b/tests/Integration/tests/code/code-block-lineno/expected/index.html index 429f066e1..6022f78b3 100644 --- a/tests/Integration/tests/code/code-block-lineno/expected/index.html +++ b/tests/Integration/tests/code/code-block-lineno/expected/index.html @@ -1,15 +1,8 @@ - - - - Title - - - +

Title

Some more Ruby code, with line numbering starting at 10.
- - + diff --git a/tests/Integration/tests/code/code-with-underscore/expected/index.html b/tests/Integration/tests/code/code-with-underscore/expected/index.html index 2e4ff65d0..748a3c641 100644 --- a/tests/Integration/tests/code/code-with-underscore/expected/index.html +++ b/tests/Integration/tests/code/code-with-underscore/expected/index.html @@ -1,10 +1,4 @@ - - - - Title - - - +

Title

@@ -15,5 +9,4 @@

Title

Some _.htaccess and _web.config.

- - + diff --git a/tests/Integration/tests/code/code-with-whitespace/expected/index.html b/tests/Integration/tests/code/code-with-whitespace/expected/index.html index 32365f6e7..8033e3e3a 100644 --- a/tests/Integration/tests/code/code-with-whitespace/expected/index.html +++ b/tests/Integration/tests/code/code-with-whitespace/expected/index.html @@ -1,10 +1,4 @@ - - - - Code Block - - - +

Code Block

@@ -12,5 +6,4 @@

Code Block

Some more code
- - + diff --git a/tests/Integration/tests/code/literal-block-default-language-php/expected/index.html b/tests/Integration/tests/code/literal-block-default-language-php/expected/index.html index e5efac4b6..6aacd2d72 100644 --- a/tests/Integration/tests/code/literal-block-default-language-php/expected/index.html +++ b/tests/Integration/tests/code/literal-block-default-language-php/expected/index.html @@ -1,10 +1,4 @@ - - - - Code Block - - - +

Code Block

@@ -13,5 +7,4 @@

Code Block

$someThing = 'else';
- - + diff --git a/tests/Integration/tests/configuration/config-project/expected/index.html b/tests/Integration/tests/configuration/config-project/expected/index.html index f33115937..16c68d83f 100644 --- a/tests/Integration/tests/configuration/config-project/expected/index.html +++ b/tests/Integration/tests/configuration/config-project/expected/index.html @@ -1,15 +1,8 @@ - - - - Document Title - Title - - - +

Document Title

Lorem Ipsum Dolor.

- - + diff --git a/tests/Integration/tests/configuration/config-simple/expected/index.html b/tests/Integration/tests/configuration/config-simple/expected/index.html index 1b7cdc1ba..943605086 100644 --- a/tests/Integration/tests/configuration/config-simple/expected/index.html +++ b/tests/Integration/tests/configuration/config-simple/expected/index.html @@ -1,10 +1,4 @@ - - - - Document Title - - - +

Document Title

@@ -12,5 +6,4 @@

Document Title

$some = 'PHP code';
- - + diff --git a/tests/Integration/tests/confval/expected/index.html b/tests/Integration/tests/confval/expected/index.html index bd87e2839..4916618b0 100644 --- a/tests/Integration/tests/confval/expected/index.html +++ b/tests/Integration/tests/confval/expected/index.html @@ -1,10 +1,4 @@ - - - - Confval directive - - - +

Confval directive

@@ -27,5 +21,4 @@

Confval directive

.

- - + diff --git a/tests/Integration/tests/directives/directive-topic/expected/index.html b/tests/Integration/tests/directives/directive-topic/expected/index.html index b4ec2b6e0..16783ce64 100644 --- a/tests/Integration/tests/directives/directive-topic/expected/index.html +++ b/tests/Integration/tests/directives/directive-topic/expected/index.html @@ -1,14 +1,8 @@ - - - - Directive tests - - - +

Directive tests

- +

This is the topic

Lorem Ipsum Dolor

Some Rubric
@@ -17,5 +11,4 @@

Directive tests

- - + diff --git a/tests/Integration/tests/directives/directive-unkown/expected/index.html b/tests/Integration/tests/directives/directive-unkown/expected/index.html index 4e67db890..7998077e8 100644 --- a/tests/Integration/tests/directives/directive-unkown/expected/index.html +++ b/tests/Integration/tests/directives/directive-unkown/expected/index.html @@ -1,10 +1,4 @@ - - - - Test - - - +

Test

@@ -13,5 +7,4 @@

Test

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 64cec7db6..c82ba2a38 100644 --- a/tests/Integration/tests/directives/directive-wrap/expected/index.html +++ b/tests/Integration/tests/directives/directive-wrap/expected/index.html @@ -1,10 +1,4 @@ - - - - Directive tests - - - +

Directive tests

@@ -12,5 +6,4 @@

Directive tests

- - + diff --git a/tests/Integration/tests/directives/include/expected/index.html b/tests/Integration/tests/directives/include/expected/index.html index b04c5ab4d..9e68baae0 100644 --- a/tests/Integration/tests/directives/include/expected/index.html +++ b/tests/Integration/tests/directives/include/expected/index.html @@ -1,16 +1,9 @@ - - - - Document - - - +

Document

- +
- - + diff --git a/tests/Integration/tests/directives/role-directive/expected/index.html b/tests/Integration/tests/directives/role-directive/expected/index.html index 88cd60dcc..00cf30580 100644 --- a/tests/Integration/tests/directives/role-directive/expected/index.html +++ b/tests/Integration/tests/directives/role-directive/expected/index.html @@ -1,10 +1,4 @@ - - - - Some Title - - - +

Some Title

@@ -16,5 +10,4 @@

Some Title

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 19e00950c..f9645ea4b 100644 --- a/tests/Integration/tests/directives/role-directive/expected/someFile.html +++ b/tests/Integration/tests/directives/role-directive/expected/someFile.html @@ -1,15 +1,8 @@ - - - - Some File - - - +

Some File

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

- - + diff --git a/tests/Integration/tests/directives/variables-replace/expected/index.html b/tests/Integration/tests/directives/variables-replace/expected/index.html index b28d3fae4..898d850e2 100644 --- a/tests/Integration/tests/directives/variables-replace/expected/index.html +++ b/tests/Integration/tests/directives/variables-replace/expected/index.html @@ -1,15 +1,8 @@ - - - - Document Title - - - +

Document Title

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 2de254e00..f5d69969b 100644 --- a/tests/Integration/tests/directives/youtube/expected/index.html +++ b/tests/Integration/tests/directives/youtube/expected/index.html @@ -1,3 +1,5 @@ + + .. youtube:: dtRKsxzjKj0 - \ No newline at end of file + + diff --git a/tests/Integration/tests/graphs/plantuml-inline/expected/index.html b/tests/Integration/tests/graphs/plantuml-inline/expected/index.html index adb14f2ef..22f86639f 100644 --- a/tests/Integration/tests/graphs/plantuml-inline/expected/index.html +++ b/tests/Integration/tests/graphs/plantuml-inline/expected/index.html @@ -1,17 +1,10 @@ - - - - Uml Directive - - - -
+ +

Uml Directive

-
classclassotherClassotherClassmessage
-
+
classclassotherClassotherClassmessage
+
- - + diff --git a/tests/Integration/tests/hyperlink-to-anchor/expected/index.html b/tests/Integration/tests/hyperlink-to-anchor/expected/index.html index 72ad7d219..f25707e68 100644 --- a/tests/Integration/tests/hyperlink-to-anchor/expected/index.html +++ b/tests/Integration/tests/hyperlink-to-anchor/expected/index.html @@ -1,14 +1,8 @@ - - - - Some file - - - +

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 f124aeb8f..b60114597 100644 --- a/tests/Integration/tests/hyperlink-to-email/expected/index.html +++ b/tests/Integration/tests/hyperlink-to-email/expected/index.html @@ -1,15 +1,8 @@ - - - - Some file - - - +

Some file

link to email

- - + diff --git a/tests/Integration/tests/include-parts/expected/index.html b/tests/Integration/tests/include-parts/expected/index.html new file mode 100644 index 000000000..a5b971b0a --- /dev/null +++ b/tests/Integration/tests/include-parts/expected/index.html @@ -0,0 +1,25 @@ + +
+

index

+ +
+

Part 1

+ +
+ + +
+

Part 2

+ +
+ + +
+

Part 3

+ +
+ + +
+ + diff --git a/tests/Integration/tests/include/input/index.rst b/tests/Integration/tests/include-parts/input/index.rst similarity index 100% rename from tests/Integration/tests/include/input/index.rst rename to tests/Integration/tests/include-parts/input/index.rst diff --git a/tests/Integration/tests/include/input/part1.rst.txt b/tests/Integration/tests/include-parts/input/part1.rst.txt similarity index 100% rename from tests/Integration/tests/include/input/part1.rst.txt rename to tests/Integration/tests/include-parts/input/part1.rst.txt diff --git a/tests/Integration/tests/include/input/part2.rst.txt b/tests/Integration/tests/include-parts/input/part2.rst.txt similarity index 100% rename from tests/Integration/tests/include/input/part2.rst.txt rename to tests/Integration/tests/include-parts/input/part2.rst.txt diff --git a/tests/Integration/tests/include/input/part3.rst.txt b/tests/Integration/tests/include-parts/input/part3.rst.txt similarity index 100% rename from tests/Integration/tests/include/input/part3.rst.txt rename to tests/Integration/tests/include-parts/input/part3.rst.txt diff --git a/tests/Integration/tests/include/expected/index.html b/tests/Integration/tests/include/expected/index.html deleted file mode 100644 index 0a763ee14..000000000 --- a/tests/Integration/tests/include/expected/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - - -index - - -
-

index

- -
-

Part 1

- -
- - -
-

Part 2

- -
- - -
-

Part 3

- -
- - -
- - - diff --git a/tests/Integration/tests/index-html-only/expected/index.html b/tests/Integration/tests/index-html-only/expected/index.html index 14293f2c0..16c68d83f 100644 --- a/tests/Integration/tests/index-html-only/expected/index.html +++ b/tests/Integration/tests/index-html-only/expected/index.html @@ -1,12 +1,8 @@ - - - -Document Title - - +

Document Title

-

Lorem Ipsum Dolor.

+ +

Lorem Ipsum Dolor.

- - + + diff --git a/tests/Integration/tests/input-file/expected/README.html b/tests/Integration/tests/input-file/expected/README.html index dc68ec3f3..16c68d83f 100644 --- a/tests/Integration/tests/input-file/expected/README.html +++ b/tests/Integration/tests/input-file/expected/README.html @@ -1,12 +1,8 @@ - - - -Document Title - - +

Document Title

+

Lorem Ipsum Dolor.

- - + + diff --git a/tests/Integration/tests/last-rendered/expected/index.html b/tests/Integration/tests/last-rendered/expected/index.html index 3942dc3f4..02beaa4f0 100644 --- a/tests/Integration/tests/last-rendered/expected/index.html +++ b/tests/Integration/tests/last-rendered/expected/index.html @@ -1,15 +1,8 @@ - - - - Document Title - - - +

Document Title

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

- - + diff --git a/tests/Integration/tests/latex/latex-index/expected/index.tex b/tests/Integration/tests/latex/latex-index/expected/index.tex index 9a0ecf0b2..ba5f7bd00 100644 --- a/tests/Integration/tests/latex/latex-index/expected/index.tex +++ b/tests/Integration/tests/latex/latex-index/expected/index.tex @@ -1,4 +1,3 @@ - \documentclass[11pt]{report} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} @@ -12,7 +11,7 @@ \usepackage{listings} \begin{document} \label{} -\section{Document Title} + \section{Document Title} Lorem Ipsum Dolor. diff --git a/tests/Integration/tests/lists/big-numbers/expected/index.html b/tests/Integration/tests/lists/big-numbers/expected/index.html index 755f2dd5d..c6d409442 100644 --- a/tests/Integration/tests/lists/big-numbers/expected/index.html +++ b/tests/Integration/tests/lists/big-numbers/expected/index.html @@ -1,15 +1,9 @@ - - - - Some Document - - - +

Some Document

- - + +

  1. First Item

    This is the body text

    2. @@ -17,8 +11,8 @@

    Some Document

- - + +

  1. And then with xxl big numbers

    This is the body text

    2. @@ -28,5 +22,4 @@

    Some Document

- - + diff --git a/tests/Integration/tests/lists/list-warning/expected/index.html b/tests/Integration/tests/lists/list-warning/expected/index.html index 59eb422f1..46c595eb5 100644 --- a/tests/Integration/tests/lists/list-warning/expected/index.html +++ b/tests/Integration/tests/lists/list-warning/expected/index.html @@ -1,15 +1,9 @@ - - - - Document Title - - - +

Document Title

This is an empty list

- +
  • @@ -17,7 +11,7 @@

    Document Title

This list has an empty point:

- +
  • Something
    • @@ -28,5 +22,4 @@

    Document Title

- - + 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 0d41b5ca8..8401f5cf7 100644 --- a/tests/Integration/tests/lists/list-with-code/expected/index.html +++ b/tests/Integration/tests/lists/list-with-code/expected/index.html @@ -1,14 +1,8 @@ - - - - Test - - - +

Test

- +
  • Lorem: Ipsum
    • @@ -23,5 +17,4 @@

    Test

- - + diff --git a/tests/Integration/tests/lists/lists-nested/expected/index.html b/tests/Integration/tests/lists/lists-nested/expected/index.html index 476286c38..480074385 100644 --- a/tests/Integration/tests/lists/lists-nested/expected/index.html +++ b/tests/Integration/tests/lists/lists-nested/expected/index.html @@ -1,22 +1,28 @@ - - - - Document Title - - -
+ +

Document Title

-
    -
  • List item 1
    • -
  • This is list item two
    • -
  • And finally, list item three.
    • -

  • Another list

    -
      -
    • that is indented
      • -
    • indented list item
      • -
    -
    • -
-
- - + + + +
    +
  • List item 1
    • + +
  • This is list item two
    • + +
  • And finally, list item three.
    • + +

  • Another list

    + +
      +
    • that is indented
      • + +
    • indented list item
      • + +
    +
    • + +
+ +
+ + diff --git a/tests/Integration/tests/lists/numbered-lists/expected/index.html b/tests/Integration/tests/lists/numbered-lists/expected/index.html index 1f87736d3..91197b866 100644 --- a/tests/Integration/tests/lists/numbered-lists/expected/index.html +++ b/tests/Integration/tests/lists/numbered-lists/expected/index.html @@ -1,24 +1,32 @@ - - - - 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 c715e0dfb..236b10ea8 100644 --- a/tests/Integration/tests/markdown/blockquote-md/expected/index.html +++ b/tests/Integration/tests/markdown/blockquote-md/expected/index.html @@ -1,10 +1,4 @@ - - - - Markdown Blockquotes - Project Title - - - +

Markdown Blockquotes

This is a blockquote.It can span multiple lines.

@@ -31,5 +25,4 @@

Blockquotes Best Practices

This is 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 bba8f8ee5..47277eb67 100644 --- a/tests/Integration/tests/markdown/code-md/expected/index.html +++ b/tests/Integration/tests/markdown/code-md/expected/index.html @@ -1,10 +1,4 @@ - - - - Markdown with Code Blocks - Project Title - - - +

Markdown with Code Blocks

<html>
@@ -29,5 +23,4 @@ 
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 014e2c53c..42ead99cd 100644 --- a/tests/Integration/tests/markdown/emphasis-md/expected/index.html +++ b/tests/Integration/tests/markdown/emphasis-md/expected/index.html @@ -1,12 +1,5 @@ - - - - Markdown with emphasis - Project Title - - - +

Markdown with emphasis

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 23fddfbd1..79627cf9d 100644 --- a/tests/Integration/tests/markdown/html-inline-md/expected/index.html +++ b/tests/Integration/tests/markdown/html-inline-md/expected/index.html @@ -1,12 +1,5 @@ - - - - Markdown with html - Project Title - - - +

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>

- - + diff --git a/tests/Integration/tests/markdown/html-md/expected/index.html b/tests/Integration/tests/markdown/html-md/expected/index.html index 6c87385e8..37ab96a1a 100644 --- a/tests/Integration/tests/markdown/html-md/expected/index.html +++ b/tests/Integration/tests/markdown/html-md/expected/index.html @@ -1,10 +1,4 @@ - - - - Markdown with html - Project Title - - - +

Markdown with html

<div align="center"> @@ -13,5 +7,4 @@

Markdown with html

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 8bafbe8ea..062e3a2cb 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 @@ -1,13 +1,6 @@ - - - - Images with and without alt text - Project Title - - - +

Images with and without 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 6b4d3eb45..16f35237f 100644 --- a/tests/Integration/tests/markdown/image-md/expected/index.html +++ b/tests/Integration/tests/markdown/image-md/expected/index.html @@ -1,12 +1,5 @@ - - - - Markdown Image - Project Title - - - +

Markdown Image

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 6fbd4488d..ddee1c6ab 100644 --- a/tests/Integration/tests/markdown/index-md/expected/index.html +++ b/tests/Integration/tests/markdown/index-md/expected/index.html @@ -1,10 +1,4 @@ - - - - Markdown Example - Project Title - - - +

Markdown Example

This is a Markdown document with some basic formatting.

@@ -12,5 +6,4 @@

Headings

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 7bba725e2..f6d983bce 100644 --- a/tests/Integration/tests/markdown/inline-code-md/expected/index.html +++ b/tests/Integration/tests/markdown/inline-code-md/expected/index.html @@ -1,13 +1,6 @@ - - - - Markdown with inline Code - Project Title - - - +

Markdown with inline Code

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 018f82157..9198e10ab 100644 --- a/tests/Integration/tests/markdown/link-md/expected/index.html +++ b/tests/Integration/tests/markdown/link-md/expected/index.html @@ -1,13 +1,6 @@ - - - - Markdown with links - Project Title - - - +

Markdown with links

This is a Markdown document with some basic formatting.

See also: Link Text

- - + diff --git a/tests/Integration/tests/markdown/linked-image-md/expected/index.html b/tests/Integration/tests/markdown/linked-image-md/expected/index.html index ecda92859..bccebd8fc 100644 --- a/tests/Integration/tests/markdown/linked-image-md/expected/index.html +++ b/tests/Integration/tests/markdown/linked-image-md/expected/index.html @@ -1,12 +1,5 @@ - - - - Markdown with linked images - Project Title - - - +

Markdown with linked images

-

- - +

https://github.com/AOEpeople/TYPO3-Feature-Flag/actionshttps://scrutinizer-ci.com/g/AOEpeople/TYPO3-Feature-Flag/?branch=mainhttps://scrutinizer-ci.com/g/AOEpeople/TYPO3-Feature-Flag/?branch=main

+ diff --git a/tests/Integration/tests/markdown/lists-md/expected/index.html b/tests/Integration/tests/markdown/lists-md/expected/index.html index c2389178c..ec4fe07e4 100644 --- a/tests/Integration/tests/markdown/lists-md/expected/index.html +++ b/tests/Integration/tests/markdown/lists-md/expected/index.html @@ -1,10 +1,4 @@ - - - - Markdown Lists - Project Title - - - +

Markdown Lists

Unordered

@@ -31,12 +25,12 @@

Unordered

Ordered

- +

  1. First item

  2. Second item

    - +

    1. Subitem A

      2. @@ -49,5 +43,4 @@

      Ordered

    - - + diff --git a/tests/Integration/tests/markdown/readme-md/expected/index.html b/tests/Integration/tests/markdown/readme-md/expected/index.html index f8c7e585d..8306d3cc7 100644 --- a/tests/Integration/tests/markdown/readme-md/expected/index.html +++ b/tests/Integration/tests/markdown/readme-md/expected/index.html @@ -1,10 +1,4 @@ - - - - Child's Swing Usage Guide - Project Title - - - +

    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.

    @@ -31,7 +25,7 @@

    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. @@ -44,7 +38,7 @@

      Installation

      Usage

      - +

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

        2. @@ -79,7 +73,7 @@

        Additional Tips:

        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. @@ -94,7 +88,7 @@

          Safety Guidelines

          Maintenance

          - +

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

            2. @@ -118,5 +112,4 @@

            Troubleshooting

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

            - - + diff --git a/tests/Integration/tests/meta/config-file/expected/index.html b/tests/Integration/tests/meta/config-file/expected/index.html index 94b62fd21..9657400ed 100644 --- a/tests/Integration/tests/meta/config-file/expected/index.html +++ b/tests/Integration/tests/meta/config-file/expected/index.html @@ -1,15 +1,8 @@ - - - - Title - Project Title - - - +
            -

            Title

            +

            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 ee5f5e110..16c68d83f 100644 --- a/tests/Integration/tests/meta/meta-data/expected/index.html +++ b/tests/Integration/tests/meta/meta-data/expected/index.html @@ -1,24 +1,8 @@ - - - - Document Title - My Project - - - - - - - - - - - +

            Document Title

            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 3d8dcc494..16c68d83f 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 @@ -1,12 +1,8 @@ - - - -Title from directive - - +

            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 9f51a44cc..d0fa4430a 100644 --- a/tests/Integration/tests/meta/orphan-without-title/expected/index.html +++ b/tests/Integration/tests/meta/orphan-without-title/expected/index.html @@ -1,15 +1,8 @@ - - - - Document Title - - - +

            Document Title

            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 816e7dc2d..998795ac4 100644 --- a/tests/Integration/tests/meta/orphan-without-title/expected/orphan.html +++ b/tests/Integration/tests/meta/orphan-without-title/expected/orphan.html @@ -1,11 +1,3 @@ - - - - - - - - +

            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 6d80fa1fa..3d975eba7 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 @@ -1,15 +1,8 @@ - - - - A Page - My Project - - - +

            A Page

            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 395fa185f..16c68d83f 100644 --- a/tests/Integration/tests/meta/project-meta-global/expected/index.html +++ b/tests/Integration/tests/meta/project-meta-global/expected/index.html @@ -1,15 +1,8 @@ - - - - Document Title - My Project - - - +

            Document Title

            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 c0465d2d9..16c68d83f 100644 --- a/tests/Integration/tests/meta/project-meta/expected/index.html +++ b/tests/Integration/tests/meta/project-meta/expected/index.html @@ -1,12 +1,8 @@ - - - -Document Title - My Project - - +

            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 c0465d2d9..16c68d83f 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 @@ -1,12 +1,8 @@ - - - -Document Title - My Project - - +

            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 c0465d2d9..16c68d83f 100644 --- a/tests/Integration/tests/meta/project-title/expected/index.html +++ b/tests/Integration/tests/meta/project-title/expected/index.html @@ -1,12 +1,8 @@ - - - -Document Title - My Project - - +

            Document Title

            -

            Lorem Ipsum Dolor.

            + +

            Lorem Ipsum Dolor.

            - - + + diff --git a/tests/Integration/tests/meta/project-title/expected/objects.inv.json b/tests/Integration/tests/meta/project-title/expected/objects.inv.json index 871ca8b28..9b804edf5 100644 --- a/tests/Integration/tests/meta/project-title/expected/objects.inv.json +++ b/tests/Integration/tests/meta/project-title/expected/objects.inv.json @@ -15,4 +15,4 @@ "Document Title" ] } -} +} \ No newline at end of file diff --git a/tests/Integration/tests/meta/settings/expected/index.html b/tests/Integration/tests/meta/settings/expected/index.html index c0465d2d9..16c68d83f 100644 --- a/tests/Integration/tests/meta/settings/expected/index.html +++ b/tests/Integration/tests/meta/settings/expected/index.html @@ -1,12 +1,8 @@ - - - -Document Title - My Project - - +

            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 254af1cce..bc00f4cf8 100644 --- a/tests/Integration/tests/meta/variables-from-project/expected/index.html +++ b/tests/Integration/tests/meta/variables-from-project/expected/index.html @@ -1,15 +1,8 @@ - - - - Some Document - My Project - - - +

            Some Document

            Project My Project in version 3.14

            - - + diff --git a/tests/Integration/tests/navigation/breadcrumb/expected/index.html b/tests/Integration/tests/navigation/breadcrumb/expected/index.html index dc474540d..29d9ceae3 100644 --- a/tests/Integration/tests/navigation/breadcrumb/expected/index.html +++ b/tests/Integration/tests/navigation/breadcrumb/expected/index.html @@ -1,10 +1,4 @@ - - - - Document Title - - - +

            Document Title

            @@ -52,5 +46,4 @@

            Document Title

            - - + 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 b2ea37edf..f29333e90 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,10 +1,4 @@ - - - - Subpage 1, Level 2-1 - - - +

            Subpage 1, Level 2-1

            @@ -21,5 +15,4 @@

            Subpage 1, Level 2-1

            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 9ee42b17b..e7a6cf080 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,10 +1,4 @@ - - - - Subpage 1, Level 1-1 - - - +

            Subpage 1, Level 1-1

            @@ -19,5 +13,4 @@

            Subpage 1, Level 1-1

            Lorem Ipsum Dolor.

            - - + diff --git a/tests/Integration/tests/navigation/breadcrumb/expected/page1.html b/tests/Integration/tests/navigation/breadcrumb/expected/page1.html index be5693286..c03513139 100644 --- a/tests/Integration/tests/navigation/breadcrumb/expected/page1.html +++ b/tests/Integration/tests/navigation/breadcrumb/expected/page1.html @@ -1,10 +1,4 @@ - - - - Page 1 - - - +

            Page 1

            @@ -69,5 +63,4 @@

            Page 1 Level 4

            - - + diff --git a/tests/Integration/tests/navigation/contents/expected/contents-depth-1.html b/tests/Integration/tests/navigation/contents/expected/contents-depth-1.html index 8771cd21c..4dbe08b7f 100644 --- a/tests/Integration/tests/navigation/contents/expected/contents-depth-1.html +++ b/tests/Integration/tests/navigation/contents/expected/contents-depth-1.html @@ -1,10 +1,4 @@ - - - - Title - - - +

            Title

            @@ -12,8 +6,7 @@

            Title

            Depth Level 1

            - -
            +

            Depth Level 2

            @@ -32,5 +25,4 @@
            Depth Level 4
            - - + diff --git a/tests/Integration/tests/navigation/contents/expected/contents-depth-2.html b/tests/Integration/tests/navigation/contents/expected/contents-depth-2.html index 5a27d3692..9437caa65 100644 --- a/tests/Integration/tests/navigation/contents/expected/contents-depth-2.html +++ b/tests/Integration/tests/navigation/contents/expected/contents-depth-2.html @@ -1,10 +1,4 @@ - - - - Title - - - +

            Title

            @@ -31,5 +25,4 @@
            Depth Level 4
            - - + diff --git a/tests/Integration/tests/navigation/contents/expected/contents-depth-3.html b/tests/Integration/tests/navigation/contents/expected/contents-depth-3.html index a8f0900e9..090e0018a 100644 --- a/tests/Integration/tests/navigation/contents/expected/contents-depth-3.html +++ b/tests/Integration/tests/navigation/contents/expected/contents-depth-3.html @@ -1,10 +1,4 @@ - - - - Title - - - +

            Title

            @@ -31,5 +25,4 @@
            Depth Level 4
            - - + diff --git a/tests/Integration/tests/navigation/contents/expected/contents-with-title.html b/tests/Integration/tests/navigation/contents/expected/contents-with-title.html index ccfabc08d..7da65808c 100644 --- a/tests/Integration/tests/navigation/contents/expected/contents-with-title.html +++ b/tests/Integration/tests/navigation/contents/expected/contents-with-title.html @@ -1,10 +1,4 @@ - - - - Title - - - +

            Title

            @@ -31,5 +25,4 @@
            Depth Level 4
            - - + diff --git a/tests/Integration/tests/navigation/contents/expected/index.html b/tests/Integration/tests/navigation/contents/expected/index.html index 8610f85a8..7aceea517 100644 --- a/tests/Integration/tests/navigation/contents/expected/index.html +++ b/tests/Integration/tests/navigation/contents/expected/index.html @@ -1,10 +1,4 @@ - - - - Title - - - +

            Title

            @@ -31,5 +25,4 @@
            Depth Level 4
            - - + diff --git a/tests/Integration/tests/navigation/docref/expected/index.html b/tests/Integration/tests/navigation/docref/expected/index.html index 77d0dbdf1..b7a2a2044 100644 --- a/tests/Integration/tests/navigation/docref/expected/index.html +++ b/tests/Integration/tests/navigation/docref/expected/index.html @@ -1,14 +1,7 @@ - - - - Root - - - +

            Root

            - - + diff --git a/tests/Integration/tests/navigation/docref/expected/subfolder/index.html b/tests/Integration/tests/navigation/docref/expected/subfolder/index.html index 8dd758276..f9d02c649 100644 --- a/tests/Integration/tests/navigation/docref/expected/subfolder/index.html +++ b/tests/Integration/tests/navigation/docref/expected/subfolder/index.html @@ -1,15 +1,8 @@ - - - - Subfolder index - - - +

            Subfolder index

            Root

            - - + diff --git a/tests/Integration/tests/navigation/index_camel/expected/Index.html b/tests/Integration/tests/navigation/index_camel/expected/Index.html index dc68ec3f3..16c68d83f 100644 --- a/tests/Integration/tests/navigation/index_camel/expected/Index.html +++ b/tests/Integration/tests/navigation/index_camel/expected/Index.html @@ -1,12 +1,8 @@ - - - -Document Title - - +

            Document Title

            +

            Lorem Ipsum Dolor.

            - - + + diff --git a/tests/Integration/tests/navigation/intersphinx-link/expected/index.html b/tests/Integration/tests/navigation/intersphinx-link/expected/index.html index 4ab24bcf6..a0c32b07a 100644 --- a/tests/Integration/tests/navigation/intersphinx-link/expected/index.html +++ b/tests/Integration/tests/navigation/intersphinx-link/expected/index.html @@ -1,10 +1,4 @@ - - - - Document Title - My Project - - - +

            Document Title

            @@ -12,5 +6,4 @@

            Document Title

            See the TYPO3 documentation

            - - + diff --git a/tests/Integration/tests/navigation/intersphinx-numeric/expected/index.html b/tests/Integration/tests/navigation/intersphinx-numeric/expected/index.html index 67c74ad92..ae81e0113 100644 --- a/tests/Integration/tests/navigation/intersphinx-numeric/expected/index.html +++ b/tests/Integration/tests/navigation/intersphinx-numeric/expected/index.html @@ -1,10 +1,4 @@ - - - - Document Title - My Project - - - +

            Document Title

            @@ -12,5 +6,4 @@

            Document Title

            See the TYPO3 documentation

            - - + diff --git a/tests/Integration/tests/navigation/inventory_json/expected/objects.inv.json b/tests/Integration/tests/navigation/inventory_json/expected/objects.inv.json index d7423548a..8a0ac0a1d 100644 --- a/tests/Integration/tests/navigation/inventory_json/expected/objects.inv.json +++ b/tests/Integration/tests/navigation/inventory_json/expected/objects.inv.json @@ -75,4 +75,4 @@ "Subpage 2" ] } -} +} \ No newline at end of file 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 e0f624b81..fa774d79e 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,10 +1,4 @@ - - - - Subpage 1, Level 2-2 - - - +

            Subpage 1, Level 2-2

            @@ -48,5 +42,4 @@

            Subpage 1, Level 2-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 7998c88ee..5b54a0b5c 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,10 +1,4 @@ - - - - Subpage 1, Level 1-2 - - - +

            Subpage 1, Level 1-2

            @@ -48,5 +42,4 @@

            Subpage 1, 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 ec1f82b0f..c18e4cee6 100644 --- a/tests/Integration/tests/navigation/menu-level-3/expected/page1.html +++ b/tests/Integration/tests/navigation/menu-level-3/expected/page1.html @@ -1,10 +1,4 @@ - - - - Page 1 - - - +

            Page 1

            @@ -63,5 +57,4 @@

            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 380bf3cc2..7b68736a1 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,10 +1,4 @@ - - - - Subpage 1, Level 2-2 - - - +

            Subpage 1, Level 2-2

            @@ -48,5 +42,4 @@

            Subpage 1, Level 2-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 29499d6d3..ac3e58fc1 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,10 +1,4 @@ - - - - Subpage 1, Level 1-2 - - - +

            Subpage 1, Level 1-2

            @@ -48,5 +42,4 @@

            Subpage 1, 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 ae16acaa0..e1c68b4ba 100644 --- a/tests/Integration/tests/navigation/menu-relative/expected/page1.html +++ b/tests/Integration/tests/navigation/menu-relative/expected/page1.html @@ -1,10 +1,4 @@ - - - - Page 1 - - - +

            Page 1

            @@ -63,5 +57,4 @@

            Page 1 Level 4

            - - + diff --git a/tests/Integration/tests/navigation/references/expected/index.html b/tests/Integration/tests/navigation/references/expected/index.html index 095fcbfeb..50a081c58 100644 --- a/tests/Integration/tests/navigation/references/expected/index.html +++ b/tests/Integration/tests/navigation/references/expected/index.html @@ -1,10 +1,4 @@ - - - - Overview - - - +

            Overview

            @@ -24,5 +18,4 @@

            Overview

            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 07717b142..5517f0f86 100644 --- a/tests/Integration/tests/navigation/references/expected/page.html +++ b/tests/Integration/tests/navigation/references/expected/page.html @@ -1,10 +1,4 @@ - - - - Page 1 - - - +

            Page 1

            @@ -17,5 +11,4 @@

            Overview

            - - + diff --git a/tests/Integration/tests/navigation/references/expected/subfolder/index.html b/tests/Integration/tests/navigation/references/expected/subfolder/index.html index cfa2e14f0..6568803e3 100644 --- a/tests/Integration/tests/navigation/references/expected/subfolder/index.html +++ b/tests/Integration/tests/navigation/references/expected/subfolder/index.html @@ -1,15 +1,8 @@ - - - - Subfolder index - - - +

            Subfolder index

            Page 1

            - - + diff --git a/tests/Integration/tests/option/expected/index.html b/tests/Integration/tests/option/expected/index.html index 06867b5e3..13ae3a9ff 100644 --- a/tests/Integration/tests/option/expected/index.html +++ b/tests/Integration/tests/option/expected/index.html @@ -1,10 +1,4 @@ - - - - Some Title - - - +

            Some Title

            @@ -29,5 +23,4 @@

            Some Title

            .

            - - + 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 5fcb21c3a..a78b0a4fb 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,15 +1,9 @@ - - - - Document Title - - - +

            Document Title

            Lorem Ipsum Dolor.

            - +
            - - + 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 c6994dfba..7a73d3b86 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 @@ -1,16 +1,10 @@ - - - - Subpage 1, Level 2-1 - - - +

            Subpage 1, Level 2-1

            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 915979109..a75eec10d 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 @@ -1,16 +1,10 @@ - - - - Subpage 2, Level 1-2 - - - +

            Subpage 2, Level 1-2

            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 e5d1c5e06..9713c4a03 100644 --- a/tests/Integration/tests/references/reference-level-3/expected/index.html +++ b/tests/Integration/tests/references/reference-level-3/expected/index.html @@ -1,15 +1,9 @@ - - - - Document Title - - - +

            Document Title

            Lorem Ipsum Dolor.

            - +
            - - + 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 18143c220..bfdf50734 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 @@ -1,16 +1,10 @@ - - - - Subpage 1, Level 2-1 - - - +

            Subpage 1, Level 2-1

            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 02db152e2..ecb6a307d 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 @@ -1,16 +1,10 @@ - - - - Subpage 2, Level 1-2 - - - +

            Subpage 2, Level 1-2

            Lorem Ipsum Dolor.

            - +
            - - + 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 260ffff54..60acba0d0 100644 --- a/tests/Integration/tests/tables/simple-table-error1/expected/index.html +++ b/tests/Integration/tests/tables/simple-table-error1/expected/index.html @@ -1,35 +1,27 @@ - - - - Some malformed table - - - +

            Some malformed table

            - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
            First colSecond colThird col
            Second rowOther collOther col
            Third rowOther colLast col
            First colSecond colThird col
            Second rowOther collOther col
            Third rowOther colLast col
            - - + 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 09cafe15c..70fe0a698 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,30 +1,22 @@ - - - - Some table with long lines - - - +

            Some table with long lines

            - - - - - - - + + + + + + - - - - - + + + + +
            ProjectLinks
            ProjectLinks
            TSconfig Reference (full)|unkown| and another reStructuredText variable
            TSconfig Reference (full)|unkown| and another |known| variable
            - - + diff --git a/tests/Integration/tests/tables/simple-table-with-variable/input/skip b/tests/Integration/tests/tables/simple-table-with-variable/input/skip deleted file mode 100644 index beb1b18d9..000000000 --- a/tests/Integration/tests/tables/simple-table-with-variable/input/skip +++ /dev/null @@ -1 +0,0 @@ -Variables in simple tables do not get replaced \ No newline at end of file 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 8c5829313..0eb8a0b9f 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,10 +1,4 @@ - - - - Csv table with content - - - +

            Csv table with content

            @@ -33,5 +27,4 @@

            Csv table with content

            - - + 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 414e095e9..f90366d0e 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,35 +1,27 @@ - - - - Csv table - - - -
            + +

            Csv table

            - - - - - - +
            col 1col 2
            + + + + + - - - + + - - + + - - -
            col 1col 2
            a b
            c d
            + + + -

            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 de514df57..4aba5951d 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,39 +1,31 @@ - - - - Csv table - - - -
            + +

            Csv table

            - - - - - - +
            col 1col 2
            + + + + + - - - + + - - + + - - + + - - -
            col 1col 2
            a quoted column is unquoted
            c d
              first column is empty
            + + + -

            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 82e0dfe54..0d396e72e 100644 --- a/tests/Integration/tests/tables/table-csv-table/expected/index.html +++ b/tests/Integration/tests/tables/table-csv-table/expected/index.html @@ -1,33 +1,25 @@ - - - - Csv table - - - -
            + +

            Csv table

            - - - - +
            + + - - + + - - + + - - -
            col 1 col 2
            a b
            c d
            + + + -

            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 f5fce5917..fd1ee00f9 100644 --- a/tests/Integration/tests/tables/table-directive/expected/index.html +++ b/tests/Integration/tests/tables/table-directive/expected/index.html @@ -1,42 +1,31 @@ - - - - table - - - +

            table

            - - - - - - - - - - - - - - - - +
            My table caption
            Data 1Data 2
            + + + + + + + + + + + - - - - - - - - - + + + + + + + + +
            My table caption
            Data 1Data 2
            Row 1, Col 1Row 1, Col 2
            Row 2, Col 1Row 2, Col 2
            Row 1, Col 1Row 1, Col 2
            Row 2, Col 1Row 2, Col 2
            - - + 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 53dff1cd6..d327f8772 100644 --- a/tests/Integration/tests/toctree/toctree-level-2/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-level-2/expected/index.html @@ -1,10 +1,4 @@ - - - - Document Title - - - +

            Document Title

            @@ -34,5 +28,4 @@

            Document Title

            - - + 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 08800c021..2e3190924 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,10 +1,4 @@ - - - - Subfolder Index - - - +

            Subfolder Index

            @@ -25,5 +19,4 @@

            Subfolder Index

            - - + 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 a5c109a77..e6b216612 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 @@ -1,17 +1,10 @@ - - - - Subfolder Index - - - +

            Subfolder Index

            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 bcfaf35e7..1e7cb7880 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,10 +1,4 @@ - - - - Document Title - - - +

            Document Title

            @@ -24,5 +18,4 @@

            Document Title

            - - + 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 2ceb50017..2aaadf763 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,10 +1,4 @@ - - - - Document Title - - - +

            Document Title

            @@ -38,5 +32,4 @@

            Document Title

            - - + 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 0f17431c2..7a006bea5 100644 --- a/tests/Integration/tests/toctree/toctree-level-3/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-level-3/expected/index.html @@ -1,10 +1,4 @@ - - - - Document Title - - - +

            Document Title

            @@ -48,5 +42,4 @@

            Document Title

            - - + 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 7777a7a8e..1f4d1693a 100644 --- a/tests/Integration/tests/toctree/toctree-no-duplicates/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-no-duplicates/expected/index.html @@ -1,10 +1,4 @@ - - - - index - - - +

            index

            @@ -23,5 +17,4 @@

            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 8a6a0db7c..7bf16dfca 100644 --- a/tests/Integration/tests/toctree/toctree-no-duplicates/expected/overview.html +++ b/tests/Integration/tests/toctree/toctree-no-duplicates/expected/overview.html @@ -1,10 +1,4 @@ - - - - Overview - - - +

            Overview

            @@ -24,5 +18,4 @@

            Overview

            - - + diff --git a/tests/Integration/tests/toctree/toctree-simple/expected/index.html b/tests/Integration/tests/toctree/toctree-simple/expected/index.html index 17948184d..c3bfacc42 100644 --- a/tests/Integration/tests/toctree/toctree-simple/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-simple/expected/index.html @@ -1,10 +1,4 @@ - - - - index - - - +

            index

            @@ -24,5 +18,4 @@

            index

            - - + diff --git a/tests/Integration/tests/toctree/toctree-titlesonly/expected/index.html b/tests/Integration/tests/toctree/toctree-titlesonly/expected/index.html index e00cf22e0..066a504bc 100644 --- a/tests/Integration/tests/toctree/toctree-titlesonly/expected/index.html +++ b/tests/Integration/tests/toctree/toctree-titlesonly/expected/index.html @@ -1,10 +1,4 @@ - - - - Document Title - - - +

            Document Title

            @@ -19,5 +13,4 @@

            Document Title

            - - + diff --git a/tools/integration-test-copy-baseline.php b/tools/integration-test-copy-baseline.php new file mode 100644 index 000000000..b329173f5 --- /dev/null +++ b/tools/integration-test-copy-baseline.php @@ -0,0 +1,81 @@ +directories() + ->in($directory) + ->depth('>= 0'); + + foreach ($finder as $dir) { + $inputDirectory = $dir->getRealPath() . '/input'; + if (!is_dir($inputDirectory)) { + continue; + } + $tempDir = $dir->getPathname() . '/temp'; + $expectedDir = $dir->getPathname() . '/expected'; + if (!file_exists($tempDir)) { + echo sprintf("Skipped %s - temp directory does not exist\n", $dir); + continue; + } + + $fileFinder = new \Symfony\Component\Finder\Finder(); + $fileFinder + ->files() + ->in($dir->getPathname() . '/expected') + ->depth('>= 0'); + foreach ($fileFinder as $file) { + $relativePath = $file->getRelativePathname(); + $tempFile = $tempDir . '/' . $relativePath; + $outputFile = $expectedDir . '/' . $relativePath; + if (file_exists($tempFile)) { + if (pathinfo($tempFile, PATHINFO_EXTENSION) === 'log') { + echo sprintf("Ignoring log file %s\n", $outputFile); + } else if ($shortenHtml && pathinfo($tempFile, PATHINFO_EXTENSION) === 'html') { + // Handle HTML file with content markers + copyHtmlWithMarkers($tempFile, $outputFile); + echo sprintf("Updated %s\n", $outputFile); + } else { + // Copy non-HTML files as-is + copy($tempFile, $outputFile); + echo sprintf("Updated %s\n", $outputFile); + } + } else { + echo sprintf("Skipped %s - %s does not exist\n", $outputFile, $tempFile); + } + } + } +} + +/** + * Copy HTML file with content markers. + */ +function copyHtmlWithMarkers(string $sourceFile, string $destinationFile): void +{ + $startMarker = ''; + $endMarker = ''; + + $fileContent = file_get_contents($sourceFile); + assert(is_string($fileContent)); + $startPos = strpos($fileContent, $startMarker); + $endPos = strpos($fileContent, $endMarker, $startPos + strlen($startMarker)); + + if ($startPos === false || $endPos === false) { + echo sprintf("Skipped %s - Start or end marker not found\n", $destinationFile); + return; + } + + $contentBetweenMarkers = substr($fileContent, $startPos, $endPos + strlen($endMarker) - $startPos); + $lines = explode("\n", $contentBetweenMarkers); + $trimmedLines = array_map('rtrim', $lines); + $trimmedContent = implode("\n", $trimmedLines) . "\n"; + + file_put_contents($destinationFile, $trimmedContent); + echo sprintf("Updated %s\n", $destinationFile); +}