move FlsSortIds to its own module

Author: pietroalbini

exts/ferrocene_spec/__init__.py

@@ -2,8 +2,7 @@
 # SPDX-FileCopyrightText: The Ferrocene Developers
 
 from . import definitions, informational, syntax_directive, std_role, paragraph_ids
-from . import items_with_rubric
-from .utils import FlsSortIds
+from . import items_with_rubric, sphinx_fixes
 from sphinx.domains import Domain
 
 
@@ -38,11 +37,11 @@ def is_empty(data):
 
 def setup(app):
     app.add_domain(SpecDomain)
-    app.add_transform(FlsSortIds)
     definitions.setup(app)
     paragraph_ids.setup(app)
     informational.setup(app)
     items_with_rubric.setup(app)
+    sphinx_fixes.setup(app)
 
     app.add_config_value(
         name="spec_std_docs_url",

exts/ferrocene_spec/sphinx_fixes.py

@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: MIT OR Apache-2.0
+# SPDX-FileCopyrightText: The Ferrocene Developers
+
+from docutils import nodes
+from sphinx.transforms import SphinxTransform, SortIds
+
+# Sphinx by default sorts all ids of the form `id[0-9]+` to the end.
+# Our IDs are section name and fls_ id pairs, so in some cases this transform
+# will instead sort the section name to the back, but not always!
+# So we overwrite the transform instead so that our fls ids are sorted to the back.
+# In addition to that we normalize them, as sphinx turns the `_` in `fls_{id}`
+# into `fls-{id}` which can break the link check from working correctly.
+class FerroceneSortIds(SphinxTransform):
+    # Run this step after sphinx sorted.
+    default_priority = SortIds.default_priority + 1
+
+    def apply(self, **kwargs):
+        for node in self.document.findall(nodes.section):
+            for n, id in enumerate(node["ids"]):
+                if id.startswith("fls-"):
+                    node["ids"][n] = id[:3] + "_" + id[4:]
+            # sort the fls id to the back
+            if len(node["ids"]) > 1 and node["ids"][0].startswith("fls_"):
+                node["ids"] = node["ids"][1:] + [node["ids"][0]]
+
+
+def setup(app):
+    app.add_transform(FerroceneSortIds)

exts/ferrocene_spec/utils.py

@@ -2,7 +2,6 @@
 # SPDX-FileCopyrightText: The Ferrocene Developers
 
 from docutils import nodes
-from sphinx import transforms
 
 
 def section_id_and_anchor(section):
@@ -24,25 +23,3 @@ def section_id_and_anchor(section):
 
 class NoSectionIdError(RuntimeError):
     pass
-
-
-# Sphinx by default sorts all ids of the form `id[0-9]+` to the end.
-# Our IDs are section name and fls_ id pairs, so in some cases this transform
-# will instead sort the section name to the back, but not always!
-# So we overwrite the transform instead so that our fls ids are sorted to the back.
-# In addition to that we normalize them, as sphinx turns the `_` in `fls_{id}`
-# into `fls-{id}` which can break the link check from working correctly.
-class FlsSortIds(transforms.SphinxTransform):
-    # Run this step after sphinx sorted.
-    default_priority = transforms.SortIds.default_priority + 1
-
-    def apply(self, **kwargs):
-        from docutils import nodes
-
-        for node in self.document.findall(nodes.section):
-            for n, id in enumerate(node["ids"]):
-                if id.startswith("fls-"):
-                    node["ids"][n] = id[:3] + "_" + id[4:]
-            # sort the fls id to the back
-            if len(node["ids"]) > 1 and node["ids"][0].startswith("fls_"):
-                node["ids"] = node["ids"][1:] + [node["ids"][0]]