summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am1
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in1
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/citation-style-language/citeproc-lua.lua12
-rw-r--r--Build/source/texk/texlive/linked_scripts/citation-style-language/citeproc.lua19
-rw-r--r--Build/source/texk/texlive/linked_scripts/scripts.lst1
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
-rw-r--r--Master/tlpkg/tlpsrc/citation-style-language.tlpsrc2
7 files changed, 13 insertions, 25 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 295f1d256ac..8faa0dd4bf0 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -114,7 +114,6 @@ texmf_other_scripts = \
bundledoc/bundledoc \
cachepic/cachepic.tlu \
checkcites/checkcites.lua \
- citation-style-language/citeproc.lua \
citation-style-language/citeproc-lua.lua \
chklref/chklref.pl \
cjk-gs-integrate/cjk-gs-integrate.pl \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 08dc9d96225..66ef362368d 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -328,7 +328,6 @@ texmf_other_scripts = \
bundledoc/bundledoc \
cachepic/cachepic.tlu \
checkcites/checkcites.lua \
- citation-style-language/citeproc.lua \
citation-style-language/citeproc-lua.lua \
chklref/chklref.pl \
cjk-gs-integrate/cjk-gs-integrate.pl \
diff --git a/Build/source/texk/texlive/linked_scripts/citation-style-language/citeproc-lua.lua b/Build/source/texk/texlive/linked_scripts/citation-style-language/citeproc-lua.lua
new file mode 100755
index 00000000000..c670866813a
--- /dev/null
+++ b/Build/source/texk/texlive/linked_scripts/citation-style-language/citeproc-lua.lua
@@ -0,0 +1,12 @@
+#!/usr/bin/env texlua
+
+--
+-- Copyright (c) 2021-2022 Zeping Lee
+-- Released under the MIT license.
+-- Repository: https://github.com/zepinglee/citeproc-lua
+--
+
+kpse.set_program_name("luatex")
+
+local cli = require("citeproc-cli")
+cli.main()
diff --git a/Build/source/texk/texlive/linked_scripts/citation-style-language/citeproc.lua b/Build/source/texk/texlive/linked_scripts/citation-style-language/citeproc.lua
deleted file mode 100644
index b266abbdc5a..00000000000
--- a/Build/source/texk/texlive/linked_scripts/citation-style-language/citeproc.lua
+++ /dev/null
@@ -1,19 +0,0 @@
---
--- Copyright (c) 2021-2022 Zeping Lee
--- Released under the MIT license.
--- Repository: https://github.com/zepinglee/citeproc-lua
---
-
-local citeproc = {}
-
-local engine = require("citeproc-engine")
-local bib = require("citeproc-bib")
-local util = require("citeproc-util")
-
-citeproc.__VERSION__ = "0.2.0"
-
-citeproc.new = engine.CiteProc.new
-citeproc.parse_bib = bib.parse
-citeproc.util = util
-
-return citeproc
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index b6ca32318f4..a5e6a59862c 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -53,7 +53,6 @@ bundledoc/arlatex
bundledoc/bundledoc
cachepic/cachepic.tlu
checkcites/checkcites.lua
-citation-style-language/citeproc.lua
citation-style-language/citeproc-lua.lua
chklref/chklref.pl
cjk-gs-integrate/cjk-gs-integrate.pl
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index cb8ab16cdbf..69f66a6f8a0 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3496,7 +3496,7 @@ $standardttf = '\.ttf|\.TTC';
'checkcites' => '\.lua$',
'checklistings' => '\.sh$',
'chklref' => '\.pl',
- 'citation-style-language' => 'citeproc(-lua)?\.lua$',
+ 'citation-style-language' => 'citeproc-lua\.lua$',
'cjk-gs-integrate' => '\.pl$',
'clojure-pamphlet' => 'pamphletangler$',
'cluttex' => 'cluttex\.lua$', # moved by prehook
diff --git a/Master/tlpkg/tlpsrc/citation-style-language.tlpsrc b/Master/tlpkg/tlpsrc/citation-style-language.tlpsrc
index 9817833298c..a207bcae757 100644
--- a/Master/tlpkg/tlpsrc/citation-style-language.tlpsrc
+++ b/Master/tlpkg/tlpsrc/citation-style-language.tlpsrc
@@ -1,7 +1,5 @@
-#docpattern +f texmf-dist/doc/man/man1/citeproc.*
docpattern +f texmf-dist/doc/man/man1/citeproc-lua.*
binpattern f bin/${ARCH}/citeproc-lua
-binpattern f bin/${ARCH}/citeproc
depend luatex
depend l3kernel