From 8c7835b4875d1d64d5e964adce4cef2f35a8ed6d Mon Sep 17 00:00:00 2001
From: Michael Ficarra <m.ficarra@f5.com>
Date: Thu, 21 Mar 2024 18:08:15 -0600
Subject: [PATCH] fix ToC numbering and don't break on all clauses (#582)

---
 css/print.css | 34 +++++++++++++++++++---------------
 src/Spec.ts   |  8 ++++++++
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/css/print.css b/css/print.css
index 8963f678..eed8e19a 100644
--- a/css/print.css
+++ b/css/print.css
@@ -59,7 +59,7 @@ emu-figure img {
   padding-left: 0.5em;
   background: #fff;
 }
-/* NOTE: hacks because paged.js doesn't support leader() in content directives */
+/* NOTE: hacks because Paged.js doesn't support leader() in content directives */
 #toc ol {
   overflow-x: hidden;
 }
@@ -72,14 +72,28 @@ emu-figure img {
     '. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .';
 }
 
+/* skip the Introduction since it's before the first emu-clause (and therefore doesn't have a proper page number) */
+#toc > ol > li:first-child {
+  display: none;
+}
+
 #toc,
 #spec-container > emu-intro,
-#spec-container > emu-clause,
 #spec-container > emu-annex {
   break-before: recto;
   break-after: always;
 }
 
+/* according to Ecma guidelines, we're actually not supposed to break before every clause (only the first), but Paged.js fails if we do that */
+/* so instead, just break before any of the clauses that have sub-clauses */
+#spec-container > emu-clause:has(emu-clause:not([example])) {
+  break-before: always;
+}
+
+#spec-container > emu-clause:first-of-type {
+  break-before: recto;
+}
+
 emu-note,
 emu-note p,
 emu-table tr,
@@ -133,14 +147,9 @@ emu-table tfoot {
 }
 
 :root {
-  counter-reset: page;
   --page-number-style: decimal;
 }
 
-@page {
-  counter-increment: page 1;
-}
-
 #toc {
   page: toc;
 }
@@ -154,16 +163,11 @@ emu-intro {
   --page-number-style: lower-roman;
 }
 
-@page :first {
-  counter-set: page 0;
+#toc {
+  counter-reset: page 1;
 }
-/* NOTE: we kind of rely on this section being a single page since the "page" directive doesn't just name a page, it also forces a page break */
 #spec-container > emu-clause:first-of-type {
-  page: first-clause;
-}
-/* NOTE: we can only reset the counter and have it take effect on the same page in a @page rule */
-@page first-clause {
-  counter-set: page 1;
+  counter-reset: page 1;
 }
 
 @page :left {
diff --git a/src/Spec.ts b/src/Spec.ts
index d8b414f1..c54afd19 100644
--- a/src/Spec.ts
+++ b/src/Spec.ts
@@ -1174,6 +1174,14 @@ ${await utils.readFile(path.join(__dirname, '../js/multipage.js'))}
           content: '';
         }
       }
+      @page :blank {
+        @bottom-left {
+          content: '';
+        }
+        @bottom-right {
+          content: '';
+        }
+      }
     }
     `;
     this.doc.head.appendChild(currentYearStyle);