diff options
Diffstat (limited to 'biblio')
18 files changed, 260 insertions, 180 deletions
diff --git a/biblio/citation-style-language/CHANGELOG.md b/biblio/citation-style-language/CHANGELOG.md index 85ffb9f43d..312b82ef03 100644 --- a/biblio/citation-style-language/CHANGELOG.md +++ b/biblio/citation-style-language/CHANGELOG.md @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.4.5] - 2023-10-05 + +### Fixed + +- Fix tilde (nonbreakable space) incorrectly displayed in LuaTeX ([#42](https://github.com/zepinglee/citeproc-lua/issues/42)). +- If no style is defined, a warning is given and the default APA style will be used ([#43](https://github.com/zepinglee/citeproc-lua/issues/43)). +- The JSON decoding error is now correctly issued. + ## [0.4.4] - 2023-09-16 ### Fixed @@ -146,7 +154,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Initial CTAN release. -[Unreleased]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.4...HEAD +[Unreleased]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.5...HEAD +[0.4.5]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.4...v0.4.5 [0.4.4]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.3...v0.4.4 [0.4.3]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.2...v0.4.3 [0.4.2]: https://github.com/zepinglee/citeproc-lua/compare/v0.4.1...v0.4.2 diff --git a/biblio/citation-style-language/citation-style-language-doc.pdf b/biblio/citation-style-language/citation-style-language-doc.pdf Binary files differindex b18b95c0eb..9d4c11658f 100644 --- a/biblio/citation-style-language/citation-style-language-doc.pdf +++ b/biblio/citation-style-language/citation-style-language-doc.pdf diff --git a/biblio/citation-style-language/citation-style-language-doc.tex b/biblio/citation-style-language/citation-style-language-doc.tex index 4c2f500ca7..e904d6caf3 100644 --- a/biblio/citation-style-language/citation-style-language-doc.tex +++ b/biblio/citation-style-language/citation-style-language-doc.tex @@ -49,7 +49,7 @@ }% } -\date{2023-09-16 v0.4.4} +\date{2023-10-05 v0.4.5} \maketitle diff --git a/biblio/citation-style-language/citation-style-language-init.sty b/biblio/citation-style-language/citation-style-language-init.sty index db7dc0111a..5425eaac27 100644 --- a/biblio/citation-style-language/citation-style-language-init.sty +++ b/biblio/citation-style-language/citation-style-language-init.sty @@ -25,12 +25,17 @@ \cs_new:Npn \__csl_write_aux_info: { - \tl_if_empty:NTF \l__csl_style_tl + \tl_if_empty:NT \l__csl_style_tl { \tl_set_eq:NN \l__csl_style_tl \g__csl_aux_bibstyle_tl \edef \csl@style { \g__csl_aux_bibstyle_tl } } - { \exp_args:Nx \__csl_write_aux_bibstyle:n { \l__csl_style_tl } } + \tl_if_empty:VTF \l__csl_style_tl + { + \msg_warning:nn { citation-style-language } { missing-style-name } + \tl_set:Nn \l__csl_style_tl { apa } + } + { \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl } \clist_if_empty:NTF \l__csl_bib_resources_clist { \clist_set_eq:NN \l__csl_bib_resources_clist \g__csl_aux_bib_files_clist } { @@ -65,22 +70,18 @@ \cs_new:Npn \__csl_initialize_lua_module: { - \tl_if_blank:VTF \l__csl_style_tl - { \msg_warning:nn { citation-style-language } { empty-style-name } } + \clist_if_empty:NT \l__csl_bib_resources_clist + { \msg_warning:nn { citation-style-language } { empty-bib-resources } } + \lua_now:e { - \clist_if_empty:NTF \l__csl_bib_resources_clist - { \msg_warning:nn { citation-style-language } { empty-bib-resources } } - { - \lua_now:e - { - csl.init( - "\l__csl_style_tl", - "\l__csl_bib_resources_clist", - "\l__csl_locale_tl" - ) - } - } + csl.init( + "\l__csl_style_tl", + "\l__csl_bib_resources_clist", + "\l__csl_locale_tl" + ) } + + \str_if_eq:eeT { \lua_now:n { tex.print(csl.initialized) } } { true } { \bool_set_true:N \l__csl_engine_initialized_bool } \__csl_get_style_class: @@ -89,11 +90,11 @@ { } } -\msg_new:nnn { citation-style-language } { empty-style-name } - { Style~ name~ not~ specified. } +\msg_new:nnn { citation-style-language } { missing-style-name } + { Missing~ style~ name.\\Will~ use~ default~ APA~ style. } \msg_new:nnn { citation-style-language } { empty-bib-resources } - { Empty~ bibliographic~ resources. Use~ \token_to_str:N \addbibresource. } + { Empty~ bibliographic~ resources.~ Use~ \token_to_str:N \addbibresource. } % \str_new:N \l__csl_style_class_str @@ -325,18 +326,22 @@ \ior_new:N \l__csl_style_ior \cs_new:Npn \__csl_read_style_class: { - \exp_args:NNx \ior_open:Nn \l__csl_style_ior { \l__csl_style_tl .csl } - \ior_map_inline:Nn \l__csl_style_ior + \bool_set_false:N \l__csl_note_bool + \tl_if_blank:VF \l__csl_style_tl { - % \tl_show:n {##1} - \tl_if_in:nnT {##1} { class="note" } + \exp_args:NNx \ior_open:Nn \l__csl_style_ior { \l__csl_style_tl .csl } + \ior_map_inline:Nn \l__csl_style_ior { - \tl_set:Nn \l__csl_class_tl { note } - \bool_set_true:N \l__csl_note_bool - \ior_map_break: + % \tl_show:n {##1} + \tl_if_in:nnT {##1} { class="note" } + { + \tl_set:Nn \l__csl_class_tl { note } + \bool_set_true:N \l__csl_note_bool + \ior_map_break: + } } + \ior_close:N \l__csl_style_ior } - \ior_close:N \l__csl_style_ior } % \msg_new:nnn { citation-style-language } { file / non-exist } diff --git a/biblio/citation-style-language/citation-style-language.sty b/biblio/citation-style-language/citation-style-language.sty index b7f8f9a36f..af8a8ea903 100644 --- a/biblio/citation-style-language/citation-style-language.sty +++ b/biblio/citation-style-language/citation-style-language.sty @@ -9,7 +9,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} -\ProvidesExplPackage {citation-style-language} {2023-09-16} {0.4.4} +\ProvidesExplPackage {citation-style-language} {2023-10-05} {0.4.5} {Citation Style Language for LaTeX} \RequirePackage { l3keys2e } @@ -46,7 +46,7 @@ \bool_new:N \l__csl_regression_test_bool \tl_new:N \l__csl_style_tl \newcommand \csl@style {} % For latex2e interface -\tl_new:N \l__csl_class_tl +\tl_new:N \l__csl_class_tl % TODO: This should be removed \bool_new:N \l__csl_note_bool \clist_new:N \l__csl_bib_resources_clist \tl_new:N \l__csl_locale_tl diff --git a/biblio/citation-style-language/citeproc-cli.lua b/biblio/citation-style-language/citeproc-cli.lua index f82d6e3c02..4a2dcee563 100644 --- a/biblio/citation-style-language/citeproc-cli.lua +++ b/biblio/citation-style-language/citeproc-cli.lua @@ -209,7 +209,8 @@ local function process_aux_file(aux_file) if style_name and style_name ~= "" then util.info(string.format("The style file: %s.csl", style_name)) else - util.error("citeproc-lua: missing style name") + util.warning("Missing style name. Will use default APA style.") + style_name = "apa" end if #citations == 0 then diff --git a/biblio/citation-style-language/citeproc-latex-core.lua b/biblio/citation-style-language/citeproc-latex-core.lua index 42beb07735..5a795ca060 100644 --- a/biblio/citation-style-language/citeproc-latex-core.lua +++ b/biblio/citation-style-language/citeproc-latex-core.lua @@ -129,7 +129,7 @@ local function read_data_files(data_files) if format == "json" then local ok, res = pcall(json_decode, contents) - if ok then + if ok and res then ---@cast res CslData csl_items = res else @@ -138,7 +138,13 @@ local function read_data_files(data_files) elseif format == "yaml" then yaml = yaml or require("citeproc-yaml") - csl_items = yaml.parse(contents) + local ok, res = pcall(yaml.parse, contents) + if ok and res then + ---@cast res CslData + csl_items = res + else + util.error(string.format('YAML decode error in file "%s".', file)) + end elseif format == "bibtex" then local bib_data, exceptions = bibtex_parser.parse(contents, bibtex_strings) diff --git a/biblio/citation-style-language/citeproc-latex.lua b/biblio/citation-style-language/citeproc-latex.lua index 74c3637733..4f87010a1c 100644 --- a/biblio/citation-style-language/citeproc-latex.lua +++ b/biblio/citation-style-language/citeproc-latex.lua @@ -24,7 +24,11 @@ csl.preview_mode = false -- Whether to use citeproc:preview_citation function csl.init(style_name, bib_files, lang) - bib_files = util.split(util.strip(bib_files), "%s*,%s*") + if string.match(bib_files, "^%s*$") then + bib_files = {} + else + bib_files = util.split(util.strip(bib_files), "%s*,%s*") + end csl.engine = core.init(style_name, bib_files, lang) @@ -111,7 +115,11 @@ function csl.cite(citation_info) -- tex.sprint(citation_str) -- tex.setcatcode(35, 12) -- # -- tex.setcatcode(37, 12) -- % - token.set_macro("l__csl_citation_tl", citation_str) + -- token.set_macro("l__csl_citation_tl", citation_str) + -- Don't use `token.set_macro`. + -- See <https://github.com/zepinglee/citeproc-lua/issues/42> + -- and <https://tex.stackexchange.com/questions/519954/backslashes-in-macros-defined-in-lua-code>. + tex.sprint(string.format("\\expandafter\\def\\csname l__csl_citation_tl\\endcsname{%s}", citation_str)) for _, cite_item in ipairs(citation.citationItems) do if not core.item_dict[cite_item.id] then diff --git a/biblio/citation-style-language/citeproc-lua.1 b/biblio/citation-style-language/citeproc-lua.1 index 5b62299f57..eac58ea82d 100644 --- a/biblio/citation-style-language/citeproc-lua.1 +++ b/biblio/citation-style-language/citeproc-lua.1 @@ -1,4 +1,4 @@ -.TH citeproc-lua 1 "0.4.4" +.TH citeproc-lua 1 "0.4.5" .SH NAME citeproc-lua \- make CSL citations and bibliography for LaTeX .SH SYNOPSIS diff --git a/biblio/citation-style-language/citeproc-output.lua b/biblio/citation-style-language/citeproc-output.lua index f596a39e3a..617440e531 100644 --- a/biblio/citation-style-language/citeproc-output.lua +++ b/biblio/citation-style-language/citeproc-output.lua @@ -1742,18 +1742,25 @@ LatexWriter.markups = { -- ["@display/indent"] = '<div class="csl-indent">%s</div>\n ', } +local latex_escape_table = { + ["\\"] = "\\textbackslash{}", + ["{"] = "\\{", + ["}"] = "\\}", + ["$"] = "\\$", + ["&"] = "\\&", + ["#"] = "\\#", + ["^"] = "\\^", + ["_"] = "\\_", + ["%"] = "\\%", + ["~"] = "\\~", +} + +---@param str string +---@param context Context +---@return string function LatexWriter:write_escaped(str, context) -- TeXbook, p. 38 - str = str:gsub("\\", "\\textbackslash{}") - str = str:gsub("{", "\\{") - str = str:gsub("}", "\\}") - str = str:gsub("%$", "\\$") - str = str:gsub("&", "\\&") - str = str:gsub("#", "\\#") - str = str:gsub("%^", "\\^") - str = str:gsub("_", "\\_") - str = str:gsub("%%", "\\%%") - str = str:gsub("~", "\\~") + str = str:gsub("[\\{}$&#^_%%~]", latex_escape_table) str = str:gsub(util.unicode["em space"], "\\quad ") str = str:gsub(util.unicode["no-break space"], "~") for char, sub in pairs(util.superscripts) do diff --git a/biblio/citation-style-language/citeproc-util.lua b/biblio/citation-style-language/citeproc-util.lua index 56f9ae5fb1..a9e2b09abe 100644 --- a/biblio/citation-style-language/citeproc-util.lua +++ b/biblio/citation-style-language/citeproc-util.lua @@ -152,6 +152,7 @@ function util.error(message) -- The luatexbase.module_error() prints the traceback, which causes panic -- luatexbase.module_error("citeproc", message) + -- TODO: Enhance the error output. Make it like `\msg_error`. texio.write_nl("term", "\n") tex.error("Module citeproc Error: " .. message) @@ -177,12 +178,12 @@ function util.warning(message) -- tex.print(string.format("\\PackageWarning{citation-style-language}{%s}{}", message)) else - message = "Warning: " .. message + message = "Warning: " .. message if util.logging_file then util.logging_file:write(message .. "\n") end if util.warning_enabled then - io.stderr:write("Warning: " .. message, "\n") + io.stderr:write(message, "\n") end end end diff --git a/biblio/citation-style-language/citeproc.lua b/biblio/citation-style-language/citeproc.lua index a69367b606..4d69ac755f 100644 --- a/biblio/citation-style-language/citeproc.lua +++ b/biblio/citation-style-language/citeproc.lua @@ -16,7 +16,7 @@ else util = require("citeproc.util") end -citeproc.__VERSION__ = "0.4.4" +citeproc.__VERSION__ = "0.4.5" citeproc.new = engine.CiteProc.new citeproc.util = util diff --git a/biblio/citation-style-language/csl-locales-en-US.xml b/biblio/citation-style-language/csl-locales-en-US.xml index a12fb4373d..b7deb1026b 100644 --- a/biblio/citation-style-language/csl-locales-en-US.xml +++ b/biblio/citation-style-language/csl-locales-en-US.xml @@ -17,7 +17,7 @@ <name>Brenton M. Wiernik</name> </translator> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> - <updated>2022-10-12T15:53:27-04:00</updated> + <updated>2023-09-20T11:36:32-04:00</updated> </info> <style-options punctuation-in-quote="true"/> <date form="text"> diff --git a/biblio/citation-style-language/csl-locales-hr-HR.xml b/biblio/citation-style-language/csl-locales-hr-HR.xml index bf5cac29ed..c626508f76 100644 --- a/biblio/citation-style-language/csl-locales-hr-HR.xml +++ b/biblio/citation-style-language/csl-locales-hr-HR.xml @@ -5,7 +5,7 @@ <name>tvrbanec</name> </translator> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> - <updated>2022-10-12T15:53:27-04:00</updated> + <updated>2023-09-21T10:32:52-04:00</updated> </info> <style-options punctuation-in-quote="false"/> <date form="text"> @@ -48,7 +48,7 @@ <term name="working-paper">working paper</term> <term name="accessed">pristupljeno</term> <term name="and">i</term> - <term name="and others">i ostali</term> + <term name="and others">i dr.</term> <term name="anonymous">anonimno</term> <term name="anonymous" form="short">anon.</term> <term name="at">na</term> @@ -62,7 +62,7 @@ <multiple>izdanja</multiple> </term> <term name="edition" form="short">izd.</term> - <term name="et-al">i ostali</term> + <term name="et-al">i sur.</term> <term name="forthcoming">u pripremi</term> <term name="from">od</term> <term name="ibid">ibid.</term> diff --git a/biblio/citation-style-language/csl-locales-ja-JP.xml b/biblio/citation-style-language/csl-locales-ja-JP.xml index 0057e9b48a..71545c8d78 100644 --- a/biblio/citation-style-language/csl-locales-ja-JP.xml +++ b/biblio/citation-style-language/csl-locales-ja-JP.xml @@ -4,8 +4,16 @@ <translator> <name>Shoji Takahashi</name> </translator> + <translator> + <name>cmplstofB</name> + </translator> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> - <updated>2022-10-12T15:53:27-04:00</updated> + <updated>2023-09-21T12:37:26-04:00</updated> + <!-- + 日本語化にあたって参考にした文献 + * SIST 02:2007「参照文献の書き方」 + * JIS X 0807:1999「電子文献の引用法」 + --> </info> <style-options punctuation-in-quote="false"/> <date form="text"> @@ -48,15 +56,15 @@ <term name="working-paper">working paper</term> <term name="accessed">参照</term> <term name="and">と</term> - <term name="and others">and others</term> - <term name="anonymous">anonymous</term> - <term name="anonymous" form="short">anon</term> - <term name="at">at</term> - <term name="available at">available at</term> - <term name="by">by</term> - <term name="circa">circa</term> - <term name="circa" form="short">c.</term> - <term name="cited">cited</term> + <term name="and others">ほか</term> + <term name="anonymous">匿名</term> + <term name="anonymous" form="short">匿名</term> + <term name="at">にて</term> + <term name="available at">入手先</term> + <term name="by">による</term> + <term name="circa">およそ</term> + <term name="circa" form="short">およそ</term> + <term name="cited">引用</term> <term name="edition"> <single>版</single> <multiple>版</multiple> @@ -67,24 +75,24 @@ <term name="from">から</term> <term name="ibid">前掲</term> <term name="in"></term> - <term name="in press">in press</term> - <term name="internet">internet</term> + <term name="in press">近刊</term> + <term name="internet">インターネット</term> <term name="letter">手紙</term> - <term name="no date">no date</term> + <term name="no date">日付なし</term> <term name="no date" form="short">日付なし</term> <term name="online">online</term> <term name="presented at">presented at the</term> <term name="reference"> - <single>reference</single> - <multiple>references</multiple> + <single>参照</single> + <multiple>参照</multiple> </term> <term name="reference" form="short"> - <single>ref.</single> - <multiple>refs.</multiple> + <single>参照</single> + <multiple>参照</multiple> </term> <term name="retrieved">読み込み</term> - <term name="scale">scale</term> - <term name="version">version</term> + <term name="scale">位</term> + <term name="version">版</term> <!-- LONG ITEM TYPE FORMS --> <term name="article">preprint</term> @@ -106,7 +114,7 @@ <!-- figure is in the list of locator terms --> <term name="graphic">graphic</term> <term name="hearing">hearing</term> - <term name="interview">interview</term> + <term name="interview">面接</term> <term name="legal_case">legal case</term> <term name="legislation">legislation</term> <term name="manuscript">manuscript</term> @@ -142,7 +150,7 @@ <term name="document" form="short">doc.</term> <!-- figure is in the list of locator terms --> <term name="graphic" form="short">graph.</term> - <term name="interview" form="short">interv.</term> + <term name="interview">面接</term> <term name="manuscript" form="short">MS</term> <term name="motion_picture" form="short">video rec.</term> <term name="report" form="short">rep.</term> @@ -151,8 +159,8 @@ <term name="song" form="short">audio rec.</term> <!-- HISTORICAL ERA TERMS --> - <term name="ad">AD</term> - <term name="bc">BC</term> + <term name="ad">紀元前</term> + <term name="bc">紀元後</term> <term name="bce">BCE</term> <term name="ce">CE</term> @@ -167,25 +175,25 @@ <term name="semicolon">;</term> <!-- ORDINALS --> - <term name="ordinal">th</term> - <term name="ordinal-01">st</term> - <term name="ordinal-02">nd</term> - <term name="ordinal-03">rd</term> - <term name="ordinal-11">th</term> - <term name="ordinal-12">th</term> - <term name="ordinal-13">th</term> + <term name="ordinal">番目</term> + <term name="ordinal-01">番目</term> + <term name="ordinal-02">番目</term> + <term name="ordinal-03">番目</term> + <term name="ordinal-11">番目</term> + <term name="ordinal-12">番目</term> + <term name="ordinal-13">番目</term> <!-- LONG ORDINALS --> - <term name="long-ordinal-01">first</term> - <term name="long-ordinal-02">second</term> - <term name="long-ordinal-03">third</term> - <term name="long-ordinal-04">fourth</term> - <term name="long-ordinal-05">fifth</term> - <term name="long-ordinal-06">sixth</term> - <term name="long-ordinal-07">seventh</term> - <term name="long-ordinal-08">eighth</term> - <term name="long-ordinal-09">ninth</term> - <term name="long-ordinal-10">tenth</term> + <term name="long-ordinal-01">1番目</term> + <term name="long-ordinal-02">2番目</term> + <term name="long-ordinal-03">3番目</term> + <term name="long-ordinal-04">4番目</term> + <term name="long-ordinal-05">5番目</term> + <term name="long-ordinal-06">6番目</term> + <term name="long-ordinal-07">7番目</term> + <term name="long-ordinal-08">8番目</term> + <term name="long-ordinal-09">9番目</term> + <term name="long-ordinal-10">10番目</term> <!-- LONG LOCATOR FORMS --> <term name="act"> @@ -233,40 +241,40 @@ <multiple>titles</multiple> </term> <term name="book"> - <single>book</single> - <multiple>books</multiple> + <single>書籍</single> + <multiple>書籍</multiple> </term> <term name="chapter"> - <single>chapter</single> - <multiple>chapters</multiple> + <single>章</single> + <multiple>章</multiple> </term> <term name="column"> - <single>column</single> - <multiple>columns</multiple> + <single>欄</single> + <multiple>欄</multiple> </term> <term name="figure"> - <single>figure</single> - <multiple>figures</multiple> + <single>図</single> + <multiple>図</multiple> </term> <term name="folio"> - <single>folio</single> - <multiple>folios</multiple> + <single>面</single> + <multiple>面</multiple> </term> <term name="issue"> - <single>number</single> - <multiple>numbers</multiple> + <single>号</single> + <multiple>号</multiple> </term> <term name="line"> <single>行</single> <multiple>行</multiple> </term> <term name="note"> - <single>note</single> - <multiple>notes</multiple> + <single>註</single> + <multiple>註</multiple> </term> <term name="opus"> - <single>opus</single> - <multiple>opera</multiple> + <single>作品</single> + <multiple>作品</multiple> </term> <term name="page"> <single>ページ</single> @@ -281,24 +289,28 @@ <multiple>段落</multiple> </term> <term name="part"> - <single>part</single> - <multiple>parts</multiple> + <single>部</single> + <multiple>部</multiple> </term> <term name="section"> - <single>section</single> - <multiple>sections</multiple> + <single>節</single> + <multiple>節</multiple> </term> <term name="sub-verbo"> - <single>sub verbo</single> - <multiple>sub verbis</multiple> + <!-- + 『辞書』における「単語」 + ^^^^^^^^ + --> + <single>における</single> + <multiple>における</multiple> </term> <term name="verse"> - <single>verse</single> - <multiple>verses</multiple> + <single>詩歌</single> + <multiple>詩歌</multiple> </term> <term name="volume"> - <single>volume</single> - <multiple>volumes</multiple> + <single>巻</single> + <multiple>巻</multiple> </term> <!-- SHORT LOCATOR FORMS --> @@ -435,28 +447,28 @@ <multiple>series creators</multiple> </term> <term name="director"> - <single>director</single> - <multiple>directors</multiple> + <single>指導者</single> + <multiple>指導者</multiple> </term> <term name="editor"> - <single>編</single> - <multiple>編</multiple> + <single>編集者</single> + <multiple>編集者</multiple> </term> <term name="editorial-director"> - <single>editor</single> - <multiple>editors</multiple> + <single>編集者</single> + <multiple>編集者</multiple> </term> <term name="illustrator"> - <single>illustrator</single> - <multiple>illustrators</multiple> + <single>図解者</single> + <multiple>図解者</multiple> </term> <term name="translator"> <single>翻訳者</single> <multiple>翻訳者</multiple> </term> <term name="editortranslator"> - <single>editor & translator</single> - <multiple>editors & translators</multiple> + <single>編集・翻訳者</single> + <multiple>編集・翻訳者</multiple> </term> <!-- SHORT ROLE FORMS --> @@ -501,28 +513,28 @@ <multiple>cres.</multiple> </term> <term name="director" form="short"> - <single>dir.</single> - <multiple>dirs.</multiple> + <single>指導</single> + <multiple>指導</multiple> </term> <term name="editor" form="short"> <single>編</single> <multiple>編</multiple> </term> <term name="editorial-director" form="short"> - <single>ed.</single> - <multiple>eds.</multiple> + <single>編</single> + <multiple>編</multiple> </term> <term name="illustrator" form="short"> - <single>ill.</single> - <multiple>ills.</multiple> + <single>図</single> + <multiple>図</multiple> </term> <term name="translator" form="short"> - <single>翻訳者</single> - <multiple>翻訳者</multiple> + <single>訳</single> + <multiple>訳</multiple> </term> <term name="editortranslator" form="short"> - <single>ed. & tran.</single> - <multiple>eds. & trans.</multiple> + <single>編・訳</single> + <multiple>編・訳</multiple> </term> <!-- VERB ROLE FORMS --> @@ -539,16 +551,16 @@ <term name="producer" form="verb">produced by</term> <term name="script-writer" form="verb">written by</term> <term name="series-creator" form="verb">created by</term> - <term name="container-author" form="verb">by</term> - <term name="director" form="verb">directed by</term> - <term name="editor" form="verb">編集者：</term> - <term name="editorial-director" form="verb">edited by</term> - <term name="illustrator" form="verb">illustrated by</term> - <term name="interviewer" form="verb">interview by</term> - <term name="recipient" form="verb">to</term> - <term name="reviewed-author" form="verb">by</term> - <term name="translator" form="verb">翻訳者：</term> - <term name="editortranslator" form="verb">edited & translated by</term> + <term name="container-author" form="verb">作者: </term> + <term name="director" form="verb">指導者: </term> + <term name="editor" form="verb">編集者: </term> + <term name="editorial-director" form="verb">編集者: </term> + <term name="illustrator" form="verb">図解者: </term> + <term name="interviewer" form="verb">面接者: </term> + <term name="recipient" form="verb">受領者: </term> + <term name="reviewed-author" form="verb">査読者: </term> + <term name="translator" form="verb">翻訳者: </term> + <term name="editortranslator" form="verb">編集・翻訳者: </term> <!-- SHORT VERB ROLE FORMS --> <term name="compiler" form="verb-short">comp. by</term> @@ -563,12 +575,12 @@ <term name="producer" form="verb-short">prod. by</term> <term name="script-writer" form="verb-short">writ. by</term> <term name="series-creator" form="verb-short">cre. by</term> - <term name="director" form="verb-short">dir.</term> - <term name="editor" form="verb-short">編集者：</term> - <term name="editorial-director" form="verb-short">ed.</term> - <term name="illustrator" form="verb-short">illus.</term> - <term name="translator" form="verb-short">翻訳者：</term> - <term name="editortranslator" form="verb-short">ed. & trans. by</term> + <term name="director" form="verb-short">指導: </term> + <term name="editor" form="verb-short">編: </term> + <term name="editorial-director" form="verb-short">編: </term> + <term name="illustrator" form="verb-short">図: </term> + <term name="translator" form="verb-short">訳: </term> + <term name="editortranslator" form="verb-short">編・訳: </term> <!-- LONG MONTH FORMS --> <term name="month-01">1月</term> @@ -599,9 +611,9 @@ <term name="month-12" form="short">12月</term> <!-- SEASONS --> - <term name="season-01">Spring</term> - <term name="season-02">Summer</term> - <term name="season-03">Autumn</term> - <term name="season-04">Winter</term> + <term name="season-01">春季</term> + <term name="season-02">夏季</term> + <term name="season-03">秋季</term> + <term name="season-04">冬季</term> </terms> </locale> diff --git a/biblio/citation-style-language/ieee.csl b/biblio/citation-style-language/ieee.csl index 5a642d3113..6567e479bb 100644 --- a/biblio/citation-style-language/ieee.csl +++ b/biblio/citation-style-language/ieee.csl @@ -45,7 +45,7 @@ <category field="engineering"/> <category field="generic-base"/> <summary>IEEE style as per the 2021 guidelines, V 01.29.2021.</summary> - <updated>2023-04-22T23:05:51-04:00</updated> + <updated>2023-09-24T22:45:14-04:00</updated> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> </info> <locale xml:lang="en"> @@ -200,12 +200,16 @@ <!-- https://url.com/ (accessed Mon. DD, YYYY). --> <choose> <if variable="URL"> - <group prefix=" " delimiter=" "> - <text variable="URL"/> - <group delimiter=" " prefix="(" suffix=")."> - <text term="accessed"/> + <group delimiter=". " prefix=" "> + <group delimiter=": "> + <text term="accessed" text-case="capitalize-first"/> <date variable="accessed" form="text"/> </group> + <text term="online" prefix="[" suffix="]" text-case="capitalize-first"/> + <group delimiter=": "> + <text term="available at" text-case="capitalize-first"/> + <text variable="URL"/> + </group> </group> </if> </choose> @@ -359,17 +363,15 @@ <text macro="access"/> </else-if> <else-if type="chapter"> - <group delimiter=", " suffix=", "> + <group delimiter=", " suffix=". "> <text macro="title"/> <group delimiter=" "> <text term="in" suffix=" "/> <text variable="container-title" font-style="italic"/> </group> - </group> - <text macro="editor" suffix=", "/> - <text macro="edition"/> - <text macro="collection"/> - <group delimiter=", " suffix="."> + <text macro="locators"/> + <text macro="editor"/> + <text macro="collection"/> <text macro="publisher"/> <text macro="issued"/> <text macro="page"/> @@ -400,8 +402,7 @@ <else-if type="webpage post-weblog post" match="any"> <group delimiter=", " suffix="."> <text macro="title"/> - <text variable="container-title" font-style="italic"/> - <text macro="issued"/> + <text variable="container-title"/> </group> <text macro="access"/> </else-if> diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib index f9f665a4fe..32d5a0b3da 100644 --- a/biblio/ctan-bibdata/ctan.bib +++ b/biblio/ctan-bibdata/ctan.bib @@ -1,7 +1,7 @@ %% bib file of all CTAN packages %% (C) Herbert Voß %% -%% created at 05-10-2023, 02:00:51 +%% created at 06-10-2023, 02:00:35 %% %% This file is provided under the terms of the LPPL v1.3 or @@ -12603,6 +12603,17 @@ url = {https://ctan.org/pkg/circuitikz}, } +@manual{ctan-circularglyphs, + title = {The \texttt{circularglyphs} package}, + subtitle = {A circular glyphs alphabet}, + author = {Cédric Pierquet}, + date = {2023-10-05}, + version = {0.1.0}, + license = {lppl1.3c,other-free}, + mirror = {https://mirror.ctan.org/graphics/pgf/contrib/circularglyphs}, + url = {https://ctan.org/pkg/circularglyphs}, +} + @manual{ctan-cirth, title = {The \texttt{cirth} package}, subtitle = {Fonts for Cirth}, @@ -12618,8 +12629,8 @@ title = {The \texttt{citation-style-language} package}, subtitle = {Bibliography formatting with Citation Style Language}, author = {Zeping Lee}, - date = {2023-09-16}, - version = {0.4.4}, + date = {2023-10-05}, + version = {0.4.5}, license = {mit,cc-by-sa-3}, mirror = {https://mirror.ctan.org/biblio/citation-style-language}, url = {https://ctan.org/pkg/citation-style-language}, @@ -50118,6 +50129,25 @@ url = {https://ctan.org/pkg/opacity-pro}, } +@manual{ctan-opbible, + title = {The \texttt{OpBible} package}, + subtitle = {Creating a study Bible with OpTeX}, + author = {Petr Olšák}, + date = {2023-10-05}, + version = {0.31}, + license = {gpl}, + mirror = {https://mirror.ctan.org/macros/luatex/generic/opbible}, + url = {https://ctan.org/pkg/opbible}, + annotation = {This package includes macros + which allow to create a study Bible in many language variants. + The main Bible text is in separate files while the commentary + apparatus can be written in other files. + \TeX{} is able to join all these data into a single print of a + study Bible. + Moreover, multiple language variants and translation subvariants + are provided.}, +} + @manual{ctan-opcit, title = {The \texttt{opcit} package}, subtitle = {Footnote-style bibliographical references}, @@ -51920,8 +51950,8 @@ title = {The \texttt{pdfjam} package}, subtitle = {Shell scripts interfacing to pdfpages}, author = {David Firth and Reuben Thomas}, - date = {2023-09-12}, - version = {3.08}, + date = {2023-10-05}, + version = {3.09}, license = {gpl2+}, mirror = {https://mirror.ctan.org/support/pdfjam}, url = {https://ctan.org/pkg/pdfjam}, @@ -62596,8 +62626,8 @@ title = {The \texttt{sidenotesplus} package}, subtitle = {Place referenced notes, alerts, figures and tables into the document margin}, author = {Anton Vrba}, - date = {2022-07-09}, - version = {1.02}, + date = {2023-10-05}, + version = {1.03}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/sidenotesplus}, url = {https://ctan.org/pkg/sidenotesplus}, diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf Binary files differindex de33567bec..ad87ce1e6c 100644 --- a/biblio/ctan-bibdata/ctan.pdf +++ b/biblio/ctan-bibdata/ctan.pdf |