Merge branch 'esperantigo/unua-provo' into norwd-patch-6

Signed-off-by: Y. Meyer-Norwood <[email protected]>
norwd · Jan 10, 2025 · e2dc2fc · e2dc2fc
2 parents 1eb3c36 + 4969789
commit e2dc2fc
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 1 deletion.
diff --git a/.github/workflows/kunmetu.yml b/.github/workflows/kunmetu.yml
@@ -37,7 +37,8 @@ jobs:
           diff -u hpmor-prev.html hpmor.html > hpmor-html-diff.log || :
           rm hpmor-prev.html
 
-      - uses: actions/upload-artifact@v4
+      - id: upload-artifact
+        uses: actions/upload-artifact@v4
         with:
           name: bitlibrojn
           retention-days: 14
@@ -48,6 +49,10 @@ jobs:
             ./hpmor.fb2
             ./hpmor.html
 
+      - run: echo "ARTIFACT_URL=${ARTIFACT_URL}" | tee -a "$GITHUB_ENV" | tee -a "${GITHUB_STEP_SUMMARY}"
+        env:
+          ARTIFACT_URL: ${{ steps.upload-artifact.outputs.artifact-url }}
+
       - if: github.ref_name == 'esperantigo/unua-provo'
         uses: softprops/action-gh-release@v2
         with:

diff --git a/layout/hp-format.tex b/layout/hp-format.tex
@@ -110,6 +110,80 @@
 \widowpenalty 10000
 \clubpenalty 10000
 
+% For modulo and integer division operations
+\usepackage{intcalc}
+
+% Fake Esperanto NUMBERstring support in fmtcount
+% https://tex.stackexchange.com/a/578200
+\renewcommand{\NUMBERstring}[1]{\NUMBERstringnum{\the\value{#1}}}
+\renewcommand{\NUMBERstringnum}[1]{%
+\ifcase\intcalcDiv{\intcalcMod{#1}{10000}}{1000}\relax% Case 0.
+\or MIL% Case 1.
+\or DUMIL% Case 2.
+\or TRIMIL% Case 3.
+\or KVARMIL% Case 4.
+\or KVINMIL% Case 5.
+\or SESMIL% Case 6.
+\or SEPMIL% Case 7.
+\or OKMIL% Case 8.
+\or NAŬMIL% Case 9.
+\fi%
+\ifcase\intcalcDiv{\intcalcMod{#1}{1000}}{100}\relax%
+\else\ifcase\intcalcDiv{\intcalcMod{#1}{10000}}{1000}\relax%
+\else\ %
+\fi%
+\fi%
+\ifcase\intcalcDiv{\intcalcMod{#1}{1000}}{100}\relax% Case 0.
+\or CENT% Case 1.
+\or DUCENT% Case 2.
+\or TRICENT% Case 3.
+\or KVARCENT% Case 4.
+\or KVINCENT% Case 5.
+\or SESCENT% Case 6.
+\or SEPCENT% Case 7.
+\or OKCENT% Case 8.
+\or NAŬCENT% Case 9.
+\fi%
+\ifcase\intcalcDiv{\intcalcMod{#1}{100}}{10}\relax%
+\else\ifcase\intcalcDiv{\intcalcMod{#1}{1000}}{100}\ifcase\intcalcDiv{\intcalcMod{#1}{10000}}{1000}\relax%
+\else\ %
+\fi%
+\else\ %
+\fi%
+\fi%
+\ifcase\intcalcDiv{\intcalcMod{#1}{100}}{10}\relax% Case 0.
+\or DEK% Case 1.
+\or DUDEK% Case 2.
+\or TRIDEK% Case 3.
+\or KVARDEK% Case 4.
+\or KVINDEK% Case 5.
+\or SESDEK% Case 6.
+\or SEPDEK% Case 7.
+\or OKDEK% Case 8.
+\or NAŬDEK% Case 9.
+\fi%
+\ifcase\intcalcMod{#1}{10}\relax%
+\else\ifcase\intcalcDiv{\intcalcMod{#1}{100}}{10}\ifcase\intcalcDiv{\intcalcMod{#1}{1000}}{100}\ifcase\intcalcDiv{\intcalcMod{#1}{10000}}{1000}\relax%
+\else\ %
+\fi%
+\else\ %
+\fi%
+\else\ %
+\fi%
+\fi%
+\ifcase\intcalcMod{#1}{10}\relax% Case 0.
+\or UNU% Case 1.
+\or DU% Case 2.
+\or TRI% Case 3.
+\or KVAR% Case 4.
+\or KVIN% Case 5.
+\or SES% Case 6.
+\or SEP% Case 7.
+\or OK% Case 8.
+\or NAŬ% Case 9.
+\fi%
+}
+
 % Various packages used
 \usepackage[normalem]{ulem}
 \usepackage{xfrac}