creating different numfig types

Author: AakashGfude

sphinx_proof/__init__.py

@@ -25,6 +25,22 @@
 
 logger = logging.getLogger(__name__)
 
+NUMFIG_TYPES = {
+    "axiom": "axiom ",
+    "theorem": "theorem ",
+    "lemma": "lemma ",
+    "algorithm": "algorithm ",
+    "definition": "definition ",
+    "remark": "remark ",
+    "conjecture": "conjecture ",
+    "corollary": "corollary ",
+    "criterion": "criterion ",
+    "example": "example ",
+    "property": "property ",
+    "observation": "observation ",
+    "proposition": "proposition ",
+}
+
 
 def purge_proofs(app: Sphinx, env: BuildEnvironment, docname: str) -> None:
     if not hasattr(env, "proof_list"):
@@ -52,9 +68,9 @@ def merge_proofs(
 def init_numfig(app: Sphinx, config: Config) -> None:
     """Initialize proof numfig format."""
     config["numfig"] = True
-    numfig_format = {
-        "proof": "Proof %s",
-    }
+    numfig_format = {}
+    for typ, val in NUMFIG_TYPES.items():
+        numfig_format[typ] = val + "%s"
     numfig_format.update(config.numfig_format)
     config.numfig_format = numfig_format
 

sphinx_proof/domain.py

@@ -119,15 +119,12 @@ def resolve_xref(
 
         todocname = match["docname"]
         title = contnode[0]
-        import pdb
 
-        pdb.set_trace()
         if target in contnode[0]:
             number = ""
             if not env.proof_list[target]["nonumber"]:
-                number = ".".join(
-                    map(str, env.toc_fignumbers[todocname]["proof"][target])
-                )
+                typ = env.proof_list[target]["type"]
+                number = ".".join(map(str, env.toc_fignumbers[todocname][typ][target]))
             title = nodes.Text(f"{match['type'].title()} {number}")
         # builder, fromdocname, todocname, targetid, child, title=None
         return make_refnode(builder, fromdocname, todocname, target, title)

sphinx_proof/nodes.py

@@ -16,42 +16,6 @@
 latex_admonition_end = "\\end{sphinxadmonition}" + CR
 
 
-class proof_node(nodes.Admonition, nodes.Element):
-    pass
-
-
-class axiom_node(nodes.Admonition, nodes.Element):
-    pass
-
-
-class theorem_node(nodes.Admonition, nodes.Element):
-    pass
-
-
-class lemma_node(nodes.Admonition, nodes.Element):
-    pass
-
-
-class algorithm_node(nodes.Admonition, nodes.Element):
-    pass
-
-
-class enumerable_node(nodes.Admonition, nodes.Element):
-    pass
-
-
-class unenumerable_node(nodes.Admonition, nodes.Element):
-    pass
-
-
-NODE_TYPES = {
-    "axiom": axiom_node,
-    "theorem": theorem_node,
-    "lemma": lemma_node,
-    "algorithm": algorithm_node,
-}
-
-
 def visit_enumerable_node(self, node: Node) -> None:
     if isinstance(self, LaTeXTranslator):
         docname = find_parent(self.builder.env, node, "section")
@@ -71,10 +35,7 @@ def depart_enumerable_node(self, node: Node) -> None:
     else:
         # Find index in list of 'Proof #'
         number = get_node_number(self, node, typ)
-        import pdb
-
-        pdb.set_trace()
-        idx = self.body.index(f"Proof {number} ")
+        idx = self.body.index(f"{typ} {number} ")
         self.body[idx] = f"{typ.title()} {number} "
         self.body.append("</div>")
 
@@ -153,3 +114,80 @@ def list_rindex(li, x) -> int:
         if li[i] == x:
             return i
     raise ValueError("{} is not in list".format(x))
+
+
+class proof_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class axiom_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class theorem_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class lemma_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class algorithm_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class definition_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class remark_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class conjecture_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class corollary_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class criterion_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class example_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class property_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class observation_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class proposition_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+class unenumerable_node(nodes.Admonition, nodes.Element):
+    pass
+
+
+NODE_TYPES = {
+    "axiom": axiom_node,
+    "theorem": theorem_node,
+    "lemma": lemma_node,
+    "algorithm": algorithm_node,
+    "definition": definition_node,
+    "remark": remark_node,
+    "conjecture": conjecture_node,
+    "corollary": corollary_node,
+    "criterion": criterion_node,
+    "example": example_node,
+    "property": property_node,
+    "observation": observation_node,
+    "proposition": proposition_node,
+}

sphinx_proof/proof_type.py

@@ -94,15 +94,13 @@ class PropositionDirective(ElementDirective):
     "theorem": TheoremDirective,
     "lemma": LemmaDirective,
     "algorithm": AlgorithmDirective,
+    "definition": DefinitionDirective,
+    "remark": RemarkDirective,
+    "conjecture": ConjectureDirective,
+    "corollary": CorollaryDirective,
+    "criterion": CriterionDirective,
+    "example": ExampleDirective,
+    "property": PropertyDirective,
+    "observation": ObservationDirective,
+    "proposition": PropositionDirective,
 }
-
-# "definition": DefinitionDirective,
-# "remark": RemarkDirective,
-# "conjecture": ConjectureDirective,
-# "corollary": CorollaryDirective,
-# "algorithm": AlgorithmDirective,
-# "criterion": CriterionDirective,
-# "example": ExampleDirective,
-# "property": PropertyDirective,
-# "observation": ObservationDirective,
-# "proposition": PropositionDirective,