Major Refactoring

_test/EndToEndTest.php

@@ -2,6 +2,7 @@
 
 namespace dokuwiki\plugin\dw2pdf\test;
 
+use dokuwiki\plugin\dw2pdf\src\BookCreatorLiveSelectionCollector;
 use dokuwiki\plugin\dw2pdf\src\Cache;
 use dokuwiki\plugin\dw2pdf\src\Config;
 use dokuwiki\plugin\dw2pdf\src\PageCollector;
@@ -26,28 +27,36 @@ public function setUp(): void
 
 
     /**
-     * Create the page, render it through the PdfExportService in debug mode and return the resulting HTML.
+     * Create the pages, render them through the PdfExportService in debug mode and return the resulting HTML.
      *
-     * @param string $pageId
-     * @return string
-     * @throws \Mpdf\MpdfException
+     * @param string|string[] $pages One or more pages to be included in the export
+     * @return string Rendered HTML output
      */
-    protected function getDebugHTML(string $pageId, $conf = []): string
+    protected function getDebugHTML($pages, $conf = []): string
     {
-        $data = file_get_contents(__DIR__ . '/pages/' . $pageId . '.txt');
-        saveWikiText($pageId, $data, 'dw2pdf end-to-end test');
+        $pages = (array)$pages;
+
+        foreach ($pages as $page) {
+            $data = file_get_contents(__DIR__ . '/pages/' . $page . '.txt');
+            saveWikiText($page, $data, 'dw2pdf end-to-end test');
+        }
 
         $config = new Config(array_merge(
             $conf,
-            ['debug' => 1, 'exportid' => $pageId]
+            [
+                'debug' => 1,
+                'liveselection' => json_encode($pages)
+            ]
         ));
-        $collector = new PageCollector($config);
+        $collector = new BookCreatorLiveSelectionCollector($config);
         $cache = new Cache($config, $collector);
         $service = new PdfExportService($config, $collector, $cache, 'Contents', 'tester');
         return $service->getDebugHtml();
     }
 
-
+    /**
+     * Test that numbered headers are rendered correctly
+     */
     public function testNumberedHeaders(): void
     {
         global $conf;
@@ -68,4 +77,23 @@ public function testNumberedHeaders(): void
             $this->assertMatchesRegularExpression('/^\d\.\d\.\d\. Header/', $h->text());
         });
     }
+
+    /**
+     * Test that numbered headers are rendered correctly across multiple pages
+     *
+     * Each new page should increase the top-level header number
+     */
+    public function testNumberedHeadersMultipage(): void
+    {
+        global $conf;
+        $conf['plugin']['dw2pdf']['headernumber'] = 1; // Currently Config values are not passed to the renderer
+        $html = $this->getDebugHTML(['headers', 'simple'], ['headernumber' => 1]);
+
+        $dom = (new Document())->html($html);
+
+        $count = 1;
+        $dom->find('h1')->each(function ($h) use (&$count) {
+            $this->assertMatchesRegularExpression('/^' . ($count++) . '\. /', $h->text());
+        });
+    }
 }

_test/pages/simple.txt

@@ -0,0 +1,3 @@
+====== A Simple Page ======
+
+This is a simple page with simple text for simple testing.

renderer.php

@@ -17,8 +17,19 @@ class renderer_plugin_dw2pdf extends Doku_Renderer_xhtml
     private $lastHeaderLevel = -1;
     private $originalHeaderLevel = 0;
     private $difference = 0;
-    private static $header_count = [];
-    private static $previous_level = 0;
+    private $header_count = [];
+    private $previous_level = 0;
+    private int $chapter = 0;
+
+    /**
+     * The Writer will reinitialize the renderer for each export, but the object will be reused within one export.
+     *
+     * @inheritdoc
+     */
+    public function isSingleton()
+    {
+        return true;
+    }
 
     public function document_start()
     {
@@ -33,9 +44,9 @@ public function document_start()
         $this->doc .= "<a name=\"{$pid}__\">";
         $this->doc .= "</a>";
 
-        static $chapter = 0; // FIXME we can probably do without a static here and use a class property
-        self::$header_count[1] = $chapter;
-        $chapter++;
+
+        $this->header_count[1] = $this->chapter;
+        $this->chapter++;
     }
 
     /**
@@ -83,17 +94,17 @@ public function header($text, $level, $pos, $returnonly = false)
         $header_prefix = '';
         if ($isnumberedheadings) {
             if ($level > 0) {
-                if (self::$previous_level > $level) {
-                    for ($i = $level + 1; $i <= self::$previous_level; $i++) {
-                        self::$header_count[$i] = 0;
+                if ($this->previous_level > $level) {
+                    for ($i = $level + 1; $i <= $this->previous_level; $i++) {
+                        $this->header_count[$i] = 0;
                     }
                 }
             }
-            self::$header_count[$level] = (self::$header_count[$level] ?? 0) + 1;
+            $this->header_count[$level] = ($this->header_count[$level] ?? 0) + 1;
 
             // $header_prefix = "";
             for ($i = 1; $i <= $level; $i++) {
-                $header_prefix .= self::$header_count[$i] . ".";
+                $header_prefix .= $this->header_count[$i] . ".";
             }
         }
         if($header_prefix !== '') {
@@ -120,7 +131,7 @@ public function header($text, $level, $pos, $returnonly = false)
         $this->doc .= $this->_xmlEntities($text);
         $this->doc .= "</a>";
         $this->doc .= "</h$level>" . DOKU_LF;
-        self::$previous_level = $level;
+        $this->previous_level = $level;
     }
 
     /**

src/Writer.php

@@ -45,6 +45,10 @@ public function __construct(DokuPdf $mpdf, Config $config, Template $template, S
         $this->template = $template;
         $this->styles = $styles;
         $this->debug = $config->isDebugEnabled();
+
+        // initialize a new renderer instance (singleton instance will be reused in later p_* calls)
+        $renderer = plugin_load('renderer', 'dw2pdf', true);
+        // FIXME set configuration on the renderer here
     }
 
     /**