refactor(packages): Move CSL support module unter bibtex package

sile-typesetter · Nov 23, 2024 · cc581e2 · cc581e2
1 parent d4b0e7f
commit cc581e2
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 25 deletions.
diff --git a/csl/spec/csl_spec.lua → packages/bibtex/csl/csl_spec.lua b/csl/spec/csl_spec.lua → packages/bibtex/csl/csl_spec.lua
@@ -1,12 +1,12 @@
 SILE = require("core.sile")
 
-local CslLocale = require("csl.core.locale").CslLocale
-local CslStyle = require("csl.core.style").CslStyle
-local CslEngine = require("csl.core.engine").CslEngine
+local CslLocale = require("packages.bibtex.csl.locale")
+local CslStyle = require("packages.bibtex.csl.style")
+local CslEngine = require("packages.bibtex.csl.engine")
 
 describe("CSL engine", function ()
-   local locale, err1 = CslLocale.read("csl/locales/locales-en-US.xml")
-   local style, err2 = CslStyle.read("csl/styles/chicago-author-date.csl")
+   local locale, err1 = CslLocale.read("packages/bibtex/csl/locales/locales-en-US.xml")
+   local style, err2 = CslStyle.read("packages/bibtex/csl/styles/chicago-author-date.csl")
 
    -- The expected internal representation of the CSL entry is similar to CSL-JSON
    -- but with some differences:

diff --git a/csl/core/engine.lua → packages/bibtex/csl/engine.lua b/csl/core/engine.lua → packages/bibtex/csl/engine.lua
@@ -27,9 +27,9 @@
 --
 -- luacheck: no unused args
 
-local CslLocale = require("csl.core.locale").CslLocale
+local CslLocale = require("packages.bibtex.csl.locale")
 
-local superfolding = require("csl.core.utils.superfolding")
+local superfolding = require("packages.bibtex.csl.utils.superfolding")
 local endash = luautf8.char(0x2013)
 local emdash = luautf8.char(0x2014)
 
@@ -1505,6 +1505,4 @@ function CslEngine:reference (entries)
    return self:_process(entries, "bibliography")
 end
 
-return {
-   CslEngine = CslEngine,
-}
+return CslEngine
diff --git a/csl/core/locale.lua → packages/bibtex/csl/locale.lua b/csl/core/locale.lua → packages/bibtex/csl/locale.lua
@@ -11,9 +11,9 @@
 --  - CslLocale:case(text, textCase) -> string
 --
 
-local casing = require("csl.core.utils.casing")
+local casing = require("packages.bibtex.csl.utils.casing")
+local xmlparser = require("packages.bibtex.csl.utils.xmlparser")
 
-local xmlparser = require("csl.core.utils.xmlparser")
 local parse = xmlparser.parse
 local rules = {
    prefix = "cs:",
@@ -241,6 +241,4 @@ function CslLocale.read (filename)
    return CslLocale.parse(doc)
 end
 
-return {
-   CslLocale = CslLocale,
-}
+return CslLocale
diff --git a/csl/locales/README.md → packages/bibtex/csl/locales/README.md b/csl/locales/README.md → packages/bibtex/csl/locales/README.md
diff --git a/csl/locales/locales-en-US.xml → ...ages/bibtex/csl/locales/locales-en-US.xml b/csl/locales/locales-en-US.xml → ...ages/bibtex/csl/locales/locales-en-US.xml
diff --git a/csl/locales/locales-fr-FR.xml → ...ages/bibtex/csl/locales/locales-fr-FR.xml b/csl/locales/locales-fr-FR.xml → ...ages/bibtex/csl/locales/locales-fr-FR.xml
diff --git a/csl/core/style.lua → packages/bibtex/csl/style.lua b/csl/core/style.lua → packages/bibtex/csl/style.lua
@@ -7,7 +7,8 @@
 --  - (static method) CslStyle.read(filename) -> CslStyle
 --
 
-local xmlparser = require("csl.core.utils.xmlparser")
+local xmlparser = require("packages.bibtex.csl.utils.xmlparser")
+
 local parse = xmlparser.parse
 local rules = {
    prefix = "cs:",
@@ -95,6 +96,4 @@ function CslStyle.read (filename)
    return CslStyle.parse(doc)
 end
 
-return {
-   CslStyle = CslStyle,
-}
+return CslStyle
diff --git a/csl/styles/README.md → packages/bibtex/csl/styles/README.md b/csl/styles/README.md → packages/bibtex/csl/styles/README.md
diff --git a/csl/styles/chicago-author-date-fr.csl → ...tex/csl/styles/chicago-author-date-fr.csl b/csl/styles/chicago-author-date-fr.csl → ...tex/csl/styles/chicago-author-date-fr.csl
diff --git a/csl/styles/chicago-author-date.csl → ...bibtex/csl/styles/chicago-author-date.csl b/csl/styles/chicago-author-date.csl → ...bibtex/csl/styles/chicago-author-date.csl
diff --git a/csl/core/utils/casing.lua → packages/bibtex/csl/utils/casing.lua b/csl/core/utils/casing.lua → packages/bibtex/csl/utils/casing.lua
diff --git a/csl/core/utils/superfolding.lua → packages/bibtex/csl/utils/superfolding.lua b/csl/core/utils/superfolding.lua → packages/bibtex/csl/utils/superfolding.lua
diff --git a/csl/core/utils/xmlparser.lua → packages/bibtex/csl/utils/xmlparser.lua b/csl/core/utils/xmlparser.lua → packages/bibtex/csl/utils/xmlparser.lua
diff --git a/packages/bibtex/init.lua b/packages/bibtex/init.lua
@@ -4,13 +4,13 @@ local loadkit = require("loadkit")
 local cslStyleLoader = loadkit.make_loader("csl")
 local cslLocaleLoader = loadkit.make_loader("xml")
 
-local CslLocale = require("csl.core.locale").CslLocale
-local CslStyle = require("csl.core.style").CslStyle
-local CslEngine = require("csl.core.engine").CslEngine
+local CslLocale = require("packages.bibtex.csl.locale")
+local CslStyle = require("packages.bibtex.csl.style")
+local CslEngine = require("packages.bibtex.csl.engine")
 
 local function loadCslLocale (name)
-   local filename = SILE.resolveFile("csl/locales/locales-" .. name .. ".xml")
-      or cslLocaleLoader("csl.locales.locales-" .. name)
+   local filename = SILE.resolveFile("packages/bibtex/csl/locales/locales-" .. name .. ".xml")
+      or cslLocaleLoader("packages.bibtex.csl.locales.locales-" .. name)
    if not filename then
       SU.error("Could not find CSL locale '" .. name .. "'")
    end
@@ -22,7 +22,7 @@ local function loadCslLocale (name)
    return locale
 end
 local function loadCslStyle (name)
-   local filename = SILE.resolveFile("csl/styles/" .. name .. ".csl") or cslStyleLoader("csl.styles." .. name)
+   local filename = SILE.resolveFile("packages/bibtex/csl/styles/" .. name .. ".csl") or cslStyleLoader("packages.bibtex.csl.styles." .. name)
    if not filename then
       SU.error("Could not find CSL style '" .. name .. "'")
    end