Merge branch v2.3.3 into v2.4.2

.gitea/workflows/python-package.yaml

@@ -0,0 +1,38 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v**"
+
+
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: https://github.com/actions/checkout@v4
+    - uses: https://github.com/actions/setup-python@v5
+      with:
+        python-version: "3.11"
+
+    - run: |
+        make venv
+    - run: |
+        make lint
+    - run: |
+        make mypy
+    - run: |
+        make test
+    - run: |
+        make test-release
+    -
+      name: Push to docker pypi registry.
+      env:
+        TWINE_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.REGISTRY_TOKEN }}
+        TWINE_REPOSITORY_URL: "https://gitea.raer.me/api/packages/freyjagp/pypi"
+      run: |
+        venv/bin/python3 -m twine upload --verbose dist/*

.github/dependabot.yml

@@ -1,15 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    groups:
-      all:
-        patterns:
-          - "*"
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/python-package.yaml

@@ -1,75 +0,0 @@
-on:
-  - push
-  - pull_request
-
-jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-          - windows-latest
-        python-version:
-          - "3.10"
-          - "3.11"
-          - "3.12"
-          - "3.13"
-          - "3.14"
-
-    steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-python@v6
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - run: |
-        make venv
-    - run: |
-        make test
-
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-python@v6
-      with:
-        python-version: "3.x"
-
-    - run: |
-        make venv
-    - run: |
-        make lint
-
-  mypy:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-python@v6
-      with:
-        python-version: "3.x"
-
-    - run: |
-        make venv
-    - run: |
-        make mypy
-
-
-  test-release:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-python@v6
-      with:
-        python-version: "3.x"
-
-    - run: |
-        make venv
-    - run: |
-        make test-release

CHANGELOG.md

@@ -1,10 +1,24 @@
 # Changelog
 
+
+
+## [2.4.0] -- 2024-10-26
+
+* Merged original dev's work on v2.3.x into my fork.
+
+## [2.4.0] -- 2024-10-26
+
+* Merged master (original dev's work) into main (my fork)
+* update gitea workflow to hopefully build/push any updates made to my fork of blag.
+
+## [2.4.0] -- 2024-09-05
+
+* added strikethru and footnotes to blag renders.
+
+## [unreleased] --
 ## [unreleased] --
 
-* Added Python 3.14 compatibility
 * Removed requirements.txt and requirements-dev.txt
-* Added footnotes extension for markdown
 
 ## [2.3.3] -- 2025-04-27
 

README.md

@@ -21,7 +21,6 @@ blag is named after [the blag of the webcomic xkcd][blagxkcd].
 * Theming support using [Jinja2][] templates
 * Generation of Atom feeds for blog content
 * Fenced code blocks and syntax highlighting using [Pygments][]
-* Markdown footnotes
 * Integrated devserver
 * Available on [PyPI][]
 

blag/markdown.py

@@ -30,11 +30,12 @@ def markdown_factory() -> Markdown:
     """
     md = Markdown(
         extensions=[
+            "footnotes",        # Add footnotes support
+            "pymdownx.tilde",   # Add strukethrough support
             "meta",
             "fenced_code",
             "codehilite",
             "smarty",
-            "footnotes",
             MarkdownLinkExtension(),
         ],
         output_format="html",

blag/static/code-dark.css

@@ -5,80 +5,80 @@ td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5
 span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
 .hll { background-color: #49483e }
 .c { color: #959077 } /* Comment */
-.err { color: #ED007E; background-color: #1E0010 } /* Error */
-.esc { color: #F8F8F2 } /* Escape */
-.g { color: #F8F8F2 } /* Generic */
-.k { color: #66D9EF } /* Keyword */
-.l { color: #AE81FF } /* Literal */
-.n { color: #F8F8F2 } /* Name */
-.o { color: #FF4689 } /* Operator */
-.x { color: #F8F8F2 } /* Other */
-.p { color: #F8F8F2 } /* Punctuation */
+.err { color: #ed007e; background-color: #1e0010 } /* Error */
+.esc { color: #f8f8f2 } /* Escape */
+.g { color: #f8f8f2 } /* Generic */
+.k { color: #66d9ef } /* Keyword */
+.l { color: #ae81ff } /* Literal */
+.n { color: #f8f8f2 } /* Name */
+.o { color: #ff4689 } /* Operator */
+.x { color: #f8f8f2 } /* Other */
+.p { color: #f8f8f2 } /* Punctuation */
 .ch { color: #959077 } /* Comment.Hashbang */
 .cm { color: #959077 } /* Comment.Multiline */
 .cp { color: #959077 } /* Comment.Preproc */
 .cpf { color: #959077 } /* Comment.PreprocFile */
 .c1 { color: #959077 } /* Comment.Single */
 .cs { color: #959077 } /* Comment.Special */
-.gd { color: #FF4689 } /* Generic.Deleted */
-.ge { color: #F8F8F2; font-style: italic } /* Generic.Emph */
-.ges { color: #F8F8F2; font-weight: bold; font-style: italic } /* Generic.EmphStrong */
-.gr { color: #F8F8F2 } /* Generic.Error */
-.gh { color: #F8F8F2 } /* Generic.Heading */
-.gi { color: #A6E22E } /* Generic.Inserted */
-.go { color: #66D9EF } /* Generic.Output */
-.gp { color: #FF4689; font-weight: bold } /* Generic.Prompt */
-.gs { color: #F8F8F2; font-weight: bold } /* Generic.Strong */
+.gd { color: #ff4689 } /* Generic.Deleted */
+.ge { color: #f8f8f2; font-style: italic } /* Generic.Emph */
+.ges { color: #f8f8f2; font-weight: bold; font-style: italic } /* Generic.EmphStrong */
+.gr { color: #f8f8f2 } /* Generic.Error */
+.gh { color: #f8f8f2 } /* Generic.Heading */
+.gi { color: #a6e22e } /* Generic.Inserted */
+.go { color: #66d9ef } /* Generic.Output */
+.gp { color: #ff4689; font-weight: bold } /* Generic.Prompt */
+.gs { color: #f8f8f2; font-weight: bold } /* Generic.Strong */
 .gu { color: #959077 } /* Generic.Subheading */
-.gt { color: #F8F8F2 } /* Generic.Traceback */
-.kc { color: #66D9EF } /* Keyword.Constant */
-.kd { color: #66D9EF } /* Keyword.Declaration */
-.kn { color: #FF4689 } /* Keyword.Namespace */
-.kp { color: #66D9EF } /* Keyword.Pseudo */
-.kr { color: #66D9EF } /* Keyword.Reserved */
-.kt { color: #66D9EF } /* Keyword.Type */
-.ld { color: #E6DB74 } /* Literal.Date */
-.m { color: #AE81FF } /* Literal.Number */
-.s { color: #E6DB74 } /* Literal.String */
-.na { color: #A6E22E } /* Name.Attribute */
-.nb { color: #F8F8F2 } /* Name.Builtin */
-.nc { color: #A6E22E } /* Name.Class */
-.no { color: #66D9EF } /* Name.Constant */
-.nd { color: #A6E22E } /* Name.Decorator */
-.ni { color: #F8F8F2 } /* Name.Entity */
-.ne { color: #A6E22E } /* Name.Exception */
-.nf { color: #A6E22E } /* Name.Function */
-.nl { color: #F8F8F2 } /* Name.Label */
-.nn { color: #F8F8F2 } /* Name.Namespace */
-.nx { color: #A6E22E } /* Name.Other */
-.py { color: #F8F8F2 } /* Name.Property */
-.nt { color: #FF4689 } /* Name.Tag */
-.nv { color: #F8F8F2 } /* Name.Variable */
-.ow { color: #FF4689 } /* Operator.Word */
-.pm { color: #F8F8F2 } /* Punctuation.Marker */
-.w { color: #F8F8F2 } /* Text.Whitespace */
-.mb { color: #AE81FF } /* Literal.Number.Bin */
-.mf { color: #AE81FF } /* Literal.Number.Float */
-.mh { color: #AE81FF } /* Literal.Number.Hex */
-.mi { color: #AE81FF } /* Literal.Number.Integer */
-.mo { color: #AE81FF } /* Literal.Number.Oct */
-.sa { color: #E6DB74 } /* Literal.String.Affix */
-.sb { color: #E6DB74 } /* Literal.String.Backtick */
-.sc { color: #E6DB74 } /* Literal.String.Char */
-.dl { color: #E6DB74 } /* Literal.String.Delimiter */
-.sd { color: #E6DB74 } /* Literal.String.Doc */
-.s2 { color: #E6DB74 } /* Literal.String.Double */
-.se { color: #AE81FF } /* Literal.String.Escape */
-.sh { color: #E6DB74 } /* Literal.String.Heredoc */
-.si { color: #E6DB74 } /* Literal.String.Interpol */
-.sx { color: #E6DB74 } /* Literal.String.Other */
-.sr { color: #E6DB74 } /* Literal.String.Regex */
-.s1 { color: #E6DB74 } /* Literal.String.Single */
-.ss { color: #E6DB74 } /* Literal.String.Symbol */
-.bp { color: #F8F8F2 } /* Name.Builtin.Pseudo */
-.fm { color: #A6E22E } /* Name.Function.Magic */
-.vc { color: #F8F8F2 } /* Name.Variable.Class */
-.vg { color: #F8F8F2 } /* Name.Variable.Global */
-.vi { color: #F8F8F2 } /* Name.Variable.Instance */
-.vm { color: #F8F8F2 } /* Name.Variable.Magic */
-.il { color: #AE81FF } /* Literal.Number.Integer.Long */
+.gt { color: #f8f8f2 } /* Generic.Traceback */
+.kc { color: #66d9ef } /* Keyword.Constant */
+.kd { color: #66d9ef } /* Keyword.Declaration */
+.kn { color: #ff4689 } /* Keyword.Namespace */
+.kp { color: #66d9ef } /* Keyword.Pseudo */
+.kr { color: #66d9ef } /* Keyword.Reserved */
+.kt { color: #66d9ef } /* Keyword.Type */
+.ld { color: #e6db74 } /* Literal.Date */
+.m { color: #ae81ff } /* Literal.Number */
+.s { color: #e6db74 } /* Literal.String */
+.na { color: #a6e22e } /* Name.Attribute */
+.nb { color: #f8f8f2 } /* Name.Builtin */
+.nc { color: #a6e22e } /* Name.Class */
+.no { color: #66d9ef } /* Name.Constant */
+.nd { color: #a6e22e } /* Name.Decorator */
+.ni { color: #f8f8f2 } /* Name.Entity */
+.ne { color: #a6e22e } /* Name.Exception */
+.nf { color: #a6e22e } /* Name.Function */
+.nl { color: #f8f8f2 } /* Name.Label */
+.nn { color: #f8f8f2 } /* Name.Namespace */
+.nx { color: #a6e22e } /* Name.Other */
+.py { color: #f8f8f2 } /* Name.Property */
+.nt { color: #ff4689 } /* Name.Tag */
+.nv { color: #f8f8f2 } /* Name.Variable */
+.ow { color: #ff4689 } /* Operator.Word */
+.pm { color: #f8f8f2 } /* Punctuation.Marker */
+.w { color: #f8f8f2 } /* Text.Whitespace */
+.mb { color: #ae81ff } /* Literal.Number.Bin */
+.mf { color: #ae81ff } /* Literal.Number.Float */
+.mh { color: #ae81ff } /* Literal.Number.Hex */
+.mi { color: #ae81ff } /* Literal.Number.Integer */
+.mo { color: #ae81ff } /* Literal.Number.Oct */
+.sa { color: #e6db74 } /* Literal.String.Affix */
+.sb { color: #e6db74 } /* Literal.String.Backtick */
+.sc { color: #e6db74 } /* Literal.String.Char */
+.dl { color: #e6db74 } /* Literal.String.Delimiter */
+.sd { color: #e6db74 } /* Literal.String.Doc */
+.s2 { color: #e6db74 } /* Literal.String.Double */
+.se { color: #ae81ff } /* Literal.String.Escape */
+.sh { color: #e6db74 } /* Literal.String.Heredoc */
+.si { color: #e6db74 } /* Literal.String.Interpol */
+.sx { color: #e6db74 } /* Literal.String.Other */
+.sr { color: #e6db74 } /* Literal.String.Regex */
+.s1 { color: #e6db74 } /* Literal.String.Single */
+.ss { color: #e6db74 } /* Literal.String.Symbol */
+.bp { color: #f8f8f2 } /* Name.Builtin.Pseudo */
+.fm { color: #a6e22e } /* Name.Function.Magic */
+.vc { color: #f8f8f2 } /* Name.Variable.Class */
+.vg { color: #f8f8f2 } /* Name.Variable.Global */
+.vi { color: #f8f8f2 } /* Name.Variable.Instance */
+.vm { color: #f8f8f2 } /* Name.Variable.Magic */
+.il { color: #ae81ff } /* Literal.Number.Integer.Long */

blag/static/code-light.css

@@ -5,9 +5,9 @@ td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5
 span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
 .hll { background-color: #ffffcc }
 .c { color: #3D7B7B; font-style: italic } /* Comment */
-.err { border: 1px solid #F00 } /* Error */
+.err { border: 1px solid #FF0000 } /* Error */
 .k { color: #008000; font-weight: bold } /* Keyword */
-.o { color: #666 } /* Operator */
+.o { color: #666666 } /* Operator */
 .ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */
 .cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */
 .cp { color: #9C6500 } /* Comment.Preproc */
@@ -24,34 +24,34 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
 .gs { font-weight: bold } /* Generic.Strong */
 .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.gt { color: #04D } /* Generic.Traceback */
+.gt { color: #0044DD } /* Generic.Traceback */
 .kc { color: #008000; font-weight: bold } /* Keyword.Constant */
 .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */
 .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */
 .kp { color: #008000 } /* Keyword.Pseudo */
 .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */
 .kt { color: #B00040 } /* Keyword.Type */
-.m { color: #666 } /* Literal.Number */
+.m { color: #666666 } /* Literal.Number */
 .s { color: #BA2121 } /* Literal.String */
 .na { color: #687822 } /* Name.Attribute */
 .nb { color: #008000 } /* Name.Builtin */
-.nc { color: #00F; font-weight: bold } /* Name.Class */
-.no { color: #800 } /* Name.Constant */
-.nd { color: #A2F } /* Name.Decorator */
+.nc { color: #0000FF; font-weight: bold } /* Name.Class */
+.no { color: #880000 } /* Name.Constant */
+.nd { color: #AA22FF } /* Name.Decorator */
 .ni { color: #717171; font-weight: bold } /* Name.Entity */
 .ne { color: #CB3F38; font-weight: bold } /* Name.Exception */
-.nf { color: #00F } /* Name.Function */
+.nf { color: #0000FF } /* Name.Function */
 .nl { color: #767600 } /* Name.Label */
-.nn { color: #00F; font-weight: bold } /* Name.Namespace */
+.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
 .nt { color: #008000; font-weight: bold } /* Name.Tag */
 .nv { color: #19177C } /* Name.Variable */
-.ow { color: #A2F; font-weight: bold } /* Operator.Word */
-.w { color: #BBB } /* Text.Whitespace */
-.mb { color: #666 } /* Literal.Number.Bin */
-.mf { color: #666 } /* Literal.Number.Float */
-.mh { color: #666 } /* Literal.Number.Hex */
-.mi { color: #666 } /* Literal.Number.Integer */
-.mo { color: #666 } /* Literal.Number.Oct */
+.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.w { color: #bbbbbb } /* Text.Whitespace */
+.mb { color: #666666 } /* Literal.Number.Bin */
+.mf { color: #666666 } /* Literal.Number.Float */
+.mh { color: #666666 } /* Literal.Number.Hex */
+.mi { color: #666666 } /* Literal.Number.Integer */
+.mo { color: #666666 } /* Literal.Number.Oct */
 .sa { color: #BA2121 } /* Literal.String.Affix */
 .sb { color: #BA2121 } /* Literal.String.Backtick */
 .sc { color: #BA2121 } /* Literal.String.Char */
@@ -66,9 +66,9 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .s1 { color: #BA2121 } /* Literal.String.Single */
 .ss { color: #19177C } /* Literal.String.Symbol */
 .bp { color: #008000 } /* Name.Builtin.Pseudo */
-.fm { color: #00F } /* Name.Function.Magic */
+.fm { color: #0000FF } /* Name.Function.Magic */
 .vc { color: #19177C } /* Name.Variable.Class */
 .vg { color: #19177C } /* Name.Variable.Global */
 .vi { color: #19177C } /* Name.Variable.Instance */
 .vm { color: #19177C } /* Name.Variable.Magic */
-.il { color: #666 } /* Literal.Number.Integer.Long */
+.il { color: #666666 } /* Literal.Number.Integer.Long */

blag/static/style.css

@@ -151,10 +151,3 @@ header h2 {
   display: inline;
   font-size: 1.2rem;
 }
-
-hr {
-  border: none;
-  border-top: 1px solid var(--foreground-dim);
-  opacity: 0.3;
-  margin: 2rem 0;
-}

blag/version.py

@@ -1,3 +1,3 @@
 """Version information for the blag package."""
 
-__VERSION__ = "2.3.3"
+__VERSION__ = "2.4.2"

pyproject.toml

@@ -18,6 +18,7 @@ dependencies = [
     "jinja2",
     "markdown",
     "pygments",
+    "pymdown-extensions"
 ]
 
 [project.scripts]

tests/test_markdown.py

@@ -111,17 +111,3 @@ this --- is -- a test ...
     assert "mdash" not in html
     assert "ndash" not in html
     assert "hellip" not in html
-
-
-def test_footnotes() -> None:
-    """Test footnote extension."""
-    md = markdown_factory()
-    md1 = """
-this is a footnote[^1]
-
-[^1]: this is the footnotetext
-"""
-    html, meta = convert_markdown(md, md1)
-    assert "<hr>" in html
-    assert "<ol>" in html
-    assert "footnotetext" in html