Merge pull request #133 from bittorala/fix-inner-headings

Fix inner headings

Author: timvink

docs/contributing.md

@@ -35,7 +35,7 @@ Tip: If you use google chrome, you can also view the print version of a page ins
 
 ## Code Style
 
-Make sure your code *roughly* follows [PEP-8](https://www.python.org/dev/peps/pep-0008/) and keeps things consistent with the rest of the code. I recommended using [black](https://github.com/psf/black) to automatically format your code.
+Make sure your code *roughly* follows [PEP-8](https://www.python.org/dev/peps/pep-0008/) and keeps things consistent with the rest of the code. I recommended using [Ruff](https://github.com/astral-sh/ruff) to automatically format your code.
 
 We use google-style docstrings.
 

src/mkdocs_print_site_plugin/exclude.py

@@ -8,19 +8,20 @@
 import fnmatch
 from typing import List
 
-   
+
 import fnmatch
 import os
 from typing import List
 
+
 def exclude(path: str, exclude_patterns: List[str]) -> bool:
     """
     Check if a path should be excluded based on a list of patterns.
-    
+
     Args:
         path: The path to check
         exclude_patterns: List of glob patterns to exclude
-        
+
     Returns:
         True if the path should be excluded, False otherwise
     """
@@ -29,27 +30,27 @@ def exclude(path: str, exclude_patterns: List[str]) -> bool:
 
     if not exclude_patterns:
         return False
-        
+
     # Normalize path separators to handle both Windows and Unix paths
-    path = path.replace('\\', '/')
-    
+    path = path.replace("\\", "/")
+
     for pattern in exclude_patterns:
         # Normalize pattern separators
-        pattern = pattern.replace('\\', '/')
-        
+        pattern = pattern.replace("\\", "/")
+
         # Check for directory patterns (ending with /)
-        if pattern.endswith('/'):
-            if path.startswith(pattern) or path.startswith(pattern[:-1] + '/'):
+        if pattern.endswith("/"):
+            if path.startswith(pattern) or path.startswith(pattern[:-1] + "/"):
                 return True
         # Regular glob pattern matching
         elif fnmatch.fnmatch(path, pattern):
             return True
         # Check if path is in a directory that matches the pattern
-        elif '/' in path:
-            path_parts = path.split('/')
+        elif "/" in path:
+            path_parts = path.split("/")
             for i in range(1, len(path_parts)):
-                partial_path = '/'.join(path_parts[:i])
+                partial_path = "/".join(path_parts[:i])
                 if fnmatch.fnmatch(partial_path, pattern) or partial_path == pattern:
                     return True
-    
-    return False
+
+    return False

src/mkdocs_print_site_plugin/renderer.py

@@ -231,16 +231,26 @@ def _toc(self):
         """
 
     def _set_inner_heading_styles(self, id: str, prefix: str, level: int) -> str:
+        """
+        By "inner heading" we mean that even if the heading numbers are fully determined by
+        the nav's hierarchy, if a page has number 3.2.1, we will add a further numbering
+        to headings such as h2 and h3 inside the page, so that the first h2 that appears is
+        3.2.1.1, the next one is 3.2.1.2, etc. In this case we will require that the number
+        of items in this index be <= toc_depth, which is not the case in the ToC (as its depth
+        is fully determined by the nav's depth).
+        """
         result = ""
         toc_depth = self.plugin_config.get("toc_depth") or 1
-        h_level = level + 2
-        counter_names = [f"counter-{id}-{i}" for i in range(h_level, toc_depth + 1)]
-        while h_level <= toc_depth:
-            counters_to_reset = " ".join([f"{x} 1" for x in counter_names[h_level - 1 :]])
+        # Start from h2's
+        h_level = 2
+        counter_names = [f"counter-{id}-{i}" for i in range(h_level, toc_depth - level + 1)]
+        while h_level <= toc_depth - level:
+            counters_to_reset = " ".join([f"{x} " for x in counter_names[h_level - 1 :]])
+            counter_reset = f" counter-reset: {counters_to_reset}; " if len(counters_to_reset) > 0 else ""
             counters_to_display = " '.' ".join([f"counter({x})" for x in counter_names[: h_level - 1]])
             result += f"""
-                .print-site-enumerate-headings #{id} h{h_level} {{ counter-reset: {counters_to_reset}; counter-increment: counter-{id}-{h_level} }}
                 .print-site-enumerate-headings #{id} h{h_level}:before {{ content: '{prefix}.' {counters_to_display} ' ' }}
+                .print-site-enumerate-headings #{id} h{h_level} {{ {counter_reset} counter-increment: counter-{id}-{h_level} }}
             """
             h_level += 1