crieur 1.9.0__py3-none-any.whl → 1.10.0__py3-none-any.whl

crieur/__init__.py

@@ -1,4 +1,4 @@
 from pathlib import Path
 
-VERSION = "1.9.0"
+VERSION = "1.10.0"
 ROOT_DIR = Path(__file__).parent

crieur/generator.py

@@ -15,7 +15,12 @@ from .typography import typographie
 from .utils import neighborhood
 
 locale.setlocale(locale.LC_ALL, "")
-mistune_plugins = ["footnotes", "superscript", "table"]
+mistune_plugins = [
+    "footnotes",
+    "superscript",
+    "table",
+    "crieur.plugins.inline_footnotes",
+]
 md = mistune.create_markdown(plugins=mistune_plugins, escape=False)
 
 

crieur/models.py

@@ -258,9 +258,11 @@ def collect_authors(numeros):
             if not article.authors:
                 continue
             for athr in article.authors:
-                author_forname = athr["forname"]
-                author_surname = athr["surname"]
-                author_name = f"{author_forname} {author_surname}"
+                author_forname = athr.get("forname", "")
+                author_surname = athr.get("surname", "")
+                author_name = f"{author_forname} {author_surname}".strip()
+                if not author_name:
+                    continue
                 author_slug = slugify(author_name)
                 if author_slug in authors:
                     authors[author_slug].articles.append(article)

crieur/plugins.py

@@ -0,0 +1,110 @@
+from typing import Any, Dict, List, Match, Union
+
+from mistune.core import BlockState
+
+__all__ = ["inline_footnotes"]
+
+# https://michelf.ca/projects/php-markdown/extra/#footnotes
+INLINE_FOOTNOTE = r"\^\[(?P<footnote_inlined>[^\]]*)\]"
+
+
+def parse_inline_footnote(
+    inline: "InlineParser", m: Match[str], state: "InlineState"
+) -> int:
+    key = m.group("footnote_inlined")
+    notes = state.env.get("inline_footnotes")
+    if not notes:
+        notes = []
+    if key not in notes:
+        notes.append(key)
+        state.env["inline_footnotes"] = notes
+    state.append_token(
+        {
+            "type": "footnote_ref",
+            "raw": key,
+            "attrs": {"index": notes.index(key) + 1},
+        }
+    )
+    return m.end()
+
+
+def parse_footnote_item(
+    block: "BlockParser", key: str, index: int, state: BlockState
+) -> Dict[str, Any]:
+    return {
+        "type": "footnote_item",
+        "children": [{"type": "paragraph", "text": key}],
+        "attrs": {"key": key, "index": index},
+    }
+
+
+def md_footnotes_hook(
+    md: "Markdown", result: Union[str, List[Dict[str, Any]]], state: BlockState
+) -> Union[str, List[Dict[str, Any]]]:
+    notes = state.env.get("inline_footnotes")
+    if not notes:
+        return result
+
+    children = [
+        parse_footnote_item(md.block, k, i + 1, state) for i, k in enumerate(notes)
+    ]
+    state = BlockState()
+    state.tokens = [{"type": "footnotes", "children": children}]
+    output = md.render_state(state)
+    return result + output  # type: ignore[operator]
+
+
+def render_inline_footnote_ref(renderer: "BaseRenderer", key: str, index: int) -> str:
+    i = str(index)
+    html = '<sup class="footnote-ref" id="fnref-' + i + '">'
+    return html + '<a href="#fn-' + i + '">' + i + "</a></sup>"
+
+
+def render_inline_footnotes(renderer: "BaseRenderer", text: str) -> str:
+    return '<section class="footnotes">\n<ol>\n' + text + "</ol>\n</section>\n"
+
+
+def render_inline_footnote_item(
+    renderer: "BaseRenderer", text: str, key: str, index: int
+) -> str:
+    i = str(index)
+    back = '<a href="#fnref-' + i + '" class="footnote">&#8617;</a>'
+    text = text.rstrip()[:-4] + back + "</p>"
+    return '<li id="fn-' + i + '">' + text + "</li>\n"
+
+
+def inline_footnotes(md: "Markdown") -> None:
+    """A mistune plugin to support inline footnotes, spec defined at
+    https://michelf.ca/projects/php-markdown/extra/#footnotes
+
+    Here is an example:
+
+    .. code-block:: text
+
+        That's some text with a footnote.^[And that's the footnote.]
+
+    It will be converted into HTML:
+
+    .. code-block:: html
+
+        <p>That's some text with a footnote.<sup class="footnote-ref" id="fnref-1"><a href="#fn-1">1</a></sup></p>
+        <section class="footnotes">
+        <ol>
+        <li id="fn-1"><p>And that's the footnote.<a href="#fnref-1" class="footnote">&#8617;</a></p></li>
+        </ol>
+        </section>
+
+    :param md: Markdown instance
+    """
+    md.inline.register(
+        "inline_footnote",
+        INLINE_FOOTNOTE,
+        parse_inline_footnote,
+        before="link",
+    )
+    md.after_render_hooks.append(md_footnotes_hook)
+
+    if md.renderer and md.renderer.NAME == "html":
+        md.renderer.register("footnote_ref", render_inline_footnote_ref)
+        md.renderer.register("footnote_item", render_inline_footnote_item)
+        md.renderer.register("footnotes", render_inline_footnotes)

{crieur-1.9.0.dist-info → crieur-1.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crieur
-Version: 1.9.0
+Version: 1.10.0
 Summary: A Static Revue Generator.
 Project-URL: Homepage, https://gitlab.huma-num.fr/ecrinum/crieur
 Project-URL: Issues, https://gitlab.huma-num.fr/ecrinum/crieur/-/issues

{crieur-1.9.0.dist-info → crieur-1.10.0.dist-info}/RECORD

@@ -1,8 +1,9 @@
-crieur/__init__.py,sha256=ZJOCIUzy2o5L-mgMGxNHIWtADhWrRpuSlc6YJ2m3vwM,77
+crieur/__init__.py,sha256=O8TcYHRBh9cCuyhUXFklX555xLzv9Z1Bzo6NbVUvJQE,78
 crieur/__main__.py,sha256=bYt9eEaoRQWdejEHFD8REx9jxVEdZptECFsV7F49Ink,30
 crieur/cli.py,sha256=trYYSwcYsyPoWluZSVLoSA-8w86uQy3Wnw_w6724g8k,5809
-crieur/generator.py,sha256=druWYkgrSzdWnRJDQkLT-EuabdMib_nw1tdIS1fGLPM,4745
-crieur/models.py,sha256=9bWbUW6wuZATTJq9DsawQ5a5EQnmByu-o812ImZY4sE,9239
+crieur/generator.py,sha256=FPj-W7-d20KUTe9fGjFApZoBMeEFO2TM57c1zuGgaOs,4799
+crieur/models.py,sha256=gBQx-3OFAsksfxH-OHI8Tm1J5YAwxyvfkQfoQkl5TP8,9328
+crieur/plugins.py,sha256=UquWD5QpQWKjlYSowC00CqJaMdrltaFmGX87EzOzjmA,3375
 crieur/typography.py,sha256=zZHJLZ8aUslMuiNX6z4buKNDZuj7gcrUxcIGACWmIHw,2759
 crieur/utils.py,sha256=kIdxpd5LgVv13Lx2aEXzjQttBDtcppRlwNsH0vwX8f0,1566
 crieur/statics/pico.css,sha256=VdrimW9PLcEIzqJ__s062OrwBj_Jb6jZIwbtdqOtM-w,93407
@@ -12,8 +13,8 @@ crieur/templates/base.html,sha256=4ZOLAnmle0_m8Y3lWT6wcH8f-_7SymxEDeIUzDQNnks,16
 crieur/templates/homepage.html,sha256=7YG7kA4AFuyrSuqWeFAVj09ogwsybE7w0-NKMLWms5s,2994
 crieur/templates/keyword.html,sha256=Hv3Ep3R6oN5pBw14gfQT-aeqEiuFiatmVZLWn5hR1e4,428
 crieur/templates/numero.html,sha256=F7hCaAHJ1WRWxD_zfhJzyLaiwXblJWJF7DUTy41Mnu8,1849
-crieur-1.9.0.dist-info/METADATA,sha256=VLt9yDF14XYgJUYNk1eQcBWRDnOkvqRfbN-3PRq6ynk,45269
-crieur-1.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-crieur-1.9.0.dist-info/entry_points.txt,sha256=edmbmPxs9QXyvSMpPJBDPGw3vZOJEKqXJhysYNx3QSM,43
-crieur-1.9.0.dist-info/licenses/LICENSE,sha256=F5acw9_laHeyi4wPmQyf_ttyz81VqCIwScwO8C1FhXU,34519
-crieur-1.9.0.dist-info/RECORD,,
+crieur-1.10.0.dist-info/METADATA,sha256=s-B0VdShODsfSvAeTVVHDi4jreOEtZhNvrUYpnvw5-U,45270
+crieur-1.10.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+crieur-1.10.0.dist-info/entry_points.txt,sha256=edmbmPxs9QXyvSMpPJBDPGw3vZOJEKqXJhysYNx3QSM,43
+crieur-1.10.0.dist-info/licenses/LICENSE,sha256=F5acw9_laHeyi4wPmQyf_ttyz81VqCIwScwO8C1FhXU,34519
+crieur-1.10.0.dist-info/RECORD,,