diff options
Diffstat (limited to 'biblio/bibtex')
| -rw-r--r-- | biblio/bibtex/contrib/gbt7714/CHANGELOG.md | 22 | ||||
| -rw-r--r-- | biblio/bibtex/contrib/gbt7714/gbt7714-2005-author-year.bst | 69 | ||||
| -rw-r--r-- | biblio/bibtex/contrib/gbt7714/gbt7714-2005-numerical.bst | 69 | ||||
| -rw-r--r-- | biblio/bibtex/contrib/gbt7714/gbt7714-author-year.bst | 69 | ||||
| -rw-r--r-- | biblio/bibtex/contrib/gbt7714/gbt7714-numerical.bst | 69 | ||||
| -rw-r--r-- | biblio/bibtex/contrib/gbt7714/gbt7714.pdf | bin | 371002 -> 486968 bytes | |||
| -rw-r--r-- | biblio/bibtex/contrib/gbt7714/gbt7714.sty | 6 |
7 files changed, 215 insertions, 89 deletions
diff --git a/biblio/bibtex/contrib/gbt7714/CHANGELOG.md b/biblio/bibtex/contrib/gbt7714/CHANGELOG.md index 28bda24f17..5b19827d80 100644 --- a/biblio/bibtex/contrib/gbt7714/CHANGELOG.md +++ b/biblio/bibtex/contrib/gbt7714/CHANGELOG.md @@ -2,10 +2,27 @@ All notable changes to this project will be documented in this file. -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [v2.1.4] - 2022-03-21 + +### Added + +- 新增选项 `component.part.label` 控制表示析出文献的符号，可选 `“slash”`, `"in"`, `"none"`。 +- 新增 `entrysubtype` 域的支持（[hushidong/biblatex-gb7714-2015/#113](https://github.com/hushidong/biblatex-gb7714-2015/issues/113)）。 +- 不著录第 1 版（[hushidong/biblatex-gb7714-2015#117](https://github.com/hushidong/biblatex-gb7714-2015/issues/117）。 + +### Changed + +- 表示析出文献的“In:”改为编者姓名前。 + +### Removed + +- 移除选项 `slash.for.extraction` 和 `in.booktitle`。 + ## [v2.1.3] - 2021-12-08 ### Added @@ -209,7 +226,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Initial release.。 -[Unreleased]: https://github.com/zepinglee/gbt7714-bibtex-style/compare/v2.1.3...HEAD +[Unreleased]: https://github.com/zepinglee/gbt7714-bibtex-style/compare/v2.1.4...HEAD +[v2.1.4]: https://github.com/zepinglee/gbt7714-bibtex-style/compare/v2.1.3...v2.1.4 [v2.1.3]: https://github.com/zepinglee/gbt7714-bibtex-style/compare/v2.1.2...v2.1.3 [v2.1.2]: https://github.com/zepinglee/gbt7714-bibtex-style/compare/v2.1.1...v2.1.2 [v2.1.1]: https://github.com/zepinglee/gbt7714-bibtex-style/compare/v2.1...v2.1.1 diff --git a/biblio/bibtex/contrib/gbt7714/gbt7714-2005-author-year.bst b/biblio/bibtex/contrib/gbt7714/gbt7714-2005-author-year.bst index 14128183e7..fd4f0c4c05 100644 --- a/biblio/bibtex/contrib/gbt7714/gbt7714-2005-author-year.bst +++ b/biblio/bibtex/contrib/gbt7714/gbt7714-2005-author-year.bst @@ -8,9 +8,9 @@ %% ------------------------------------------------------------------- %% GB/T 7714 BibTeX Style %% https://github.com/zepinglee/gbt7714-bibtex-style -%% Version: 2021/12/08 v2.1.3 +%% Version: 2022/03/21 v2.1.4 %% ------------------------------------------------------------------- -%% Copyright (C) 2016—2021 by Zeping Lee <zepinglee AT gmail.com> +%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com> %% ------------------------------------------------------------------- %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -37,8 +37,6 @@ INTEGERS { show.mark space.before.mark show.medium.type - slash.for.extraction - in.booktitle short.journal italic.journal bold.journal.volume @@ -60,6 +58,10 @@ INTEGERS { lang.other.order } +STRINGS { + component.part.label +} + FUNCTION {load.config} { #2 'citation.et.al.min := @@ -78,8 +80,7 @@ FUNCTION {load.config} #1 'show.mark := #0 'space.before.mark := #1 'show.medium.type := - #1 'slash.for.extraction := - #0 'in.booktitle := + "slash" 'component.part.label := #0 'short.journal := #0 'italic.journal := #0 'bold.journal.volume := @@ -112,6 +113,7 @@ ENTRY editor eprint eprinttype + entrysubtype howpublished institution journal @@ -392,9 +394,22 @@ FUNCTION {new.sentence} FUNCTION {new.slash} { output.state before.all = 'skip$ - { slash.for.extraction + { component.part.label "slash" = { after.slash 'output.state := } - { after.block 'output.state := } + { new.block + component.part.label "in" = + { entry.lang lang.en = + { "In: " output + write$ + "" + before.all 'output.state := + } + 'skip$ + if$ + } + 'skip$ + if$ + } if$ } if$ @@ -987,14 +1002,6 @@ FUNCTION {format.series.vol.num.booktitle} { format.booktitle.vol.num } if$ format.btitle - in.booktitle - { duplicate$ empty$ not entry.lang lang.en = and - { "In: " swap$ * } - 'skip$ - if$ - } - 'skip$ - if$ } FUNCTION {remove.period} @@ -1136,9 +1143,13 @@ FUNCTION {format.edition} { edition empty$ { "" } { edition is.number - { entry.lang lang.zh = - { edition " 版" * } - { edition num.to.ordinal " ed." * } + { edition "1" = not + { entry.lang lang.zh = + { edition " 版" * } + { edition num.to.ordinal " ed." * } + if$ + } + 'skip$ if$ } { entry.lang lang.en = @@ -1338,7 +1349,15 @@ FUNCTION {format.date} { date empty$ not { type$ "patent" = type$ "newspaper" = or { date } - { format.year } + { entrysubtype empty$ not + { type$ "article" = entrysubtype "newspaper" = and + { date } + { format.year } + if$ + } + { format.year } + if$ + } if$ } { year empty$ not @@ -1806,7 +1825,15 @@ FUNCTION {journal.article} new.block title.in.journal { format.title "title" output.check - "J" set.entry.mark + entrysubtype empty$ not + { + entrysubtype "newspaper" = + { "N" set.entry.mark } + { "J" set.entry.mark } + if$ + } + { "J" set.entry.mark } + if$ format.mark "" output.after new.block } diff --git a/biblio/bibtex/contrib/gbt7714/gbt7714-2005-numerical.bst b/biblio/bibtex/contrib/gbt7714/gbt7714-2005-numerical.bst index 5c8b1da6bf..3b4b5c0eee 100644 --- a/biblio/bibtex/contrib/gbt7714/gbt7714-2005-numerical.bst +++ b/biblio/bibtex/contrib/gbt7714/gbt7714-2005-numerical.bst @@ -8,9 +8,9 @@ %% ------------------------------------------------------------------- %% GB/T 7714 BibTeX Style %% https://github.com/zepinglee/gbt7714-bibtex-style -%% Version: 2021/12/08 v2.1.3 +%% Version: 2022/03/21 v2.1.4 %% ------------------------------------------------------------------- -%% Copyright (C) 2016—2021 by Zeping Lee <zepinglee AT gmail.com> +%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com> %% ------------------------------------------------------------------- %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -37,8 +37,6 @@ INTEGERS { show.mark space.before.mark show.medium.type - slash.for.extraction - in.booktitle short.journal italic.journal bold.journal.volume @@ -55,6 +53,10 @@ INTEGERS { end.with.period } +STRINGS { + component.part.label +} + FUNCTION {load.config} { #2 'citation.et.al.min := @@ -73,8 +75,7 @@ FUNCTION {load.config} #1 'show.mark := #0 'space.before.mark := #1 'show.medium.type := - #1 'slash.for.extraction := - #0 'in.booktitle := + "slash" 'component.part.label := #0 'short.journal := #0 'italic.journal := #0 'bold.journal.volume := @@ -102,6 +103,7 @@ ENTRY editor eprint eprinttype + entrysubtype howpublished institution journal @@ -382,9 +384,22 @@ FUNCTION {new.sentence} FUNCTION {new.slash} { output.state before.all = 'skip$ - { slash.for.extraction + { component.part.label "slash" = { after.slash 'output.state := } - { after.block 'output.state := } + { new.block + component.part.label "in" = + { entry.lang lang.en = + { "In: " output + write$ + "" + before.all 'output.state := + } + 'skip$ + if$ + } + 'skip$ + if$ + } if$ } if$ @@ -977,14 +992,6 @@ FUNCTION {format.series.vol.num.booktitle} { format.booktitle.vol.num } if$ format.btitle - in.booktitle - { duplicate$ empty$ not entry.lang lang.en = and - { "In: " swap$ * } - 'skip$ - if$ - } - 'skip$ - if$ } FUNCTION {remove.period} @@ -1126,9 +1133,13 @@ FUNCTION {format.edition} { edition empty$ { "" } { edition is.number - { entry.lang lang.zh = - { edition " 版" * } - { edition num.to.ordinal " ed." * } + { edition "1" = not + { entry.lang lang.zh = + { edition " 版" * } + { edition num.to.ordinal " ed." * } + if$ + } + 'skip$ if$ } { entry.lang lang.en = @@ -1328,7 +1339,15 @@ FUNCTION {format.date} { date empty$ not { type$ "patent" = type$ "newspaper" = or { date } - { format.year } + { entrysubtype empty$ not + { type$ "article" = entrysubtype "newspaper" = and + { date } + { format.year } + if$ + } + { format.year } + if$ + } if$ } { year empty$ not @@ -1796,7 +1815,15 @@ FUNCTION {journal.article} new.block title.in.journal { format.title "title" output.check - "J" set.entry.mark + entrysubtype empty$ not + { + entrysubtype "newspaper" = + { "N" set.entry.mark } + { "J" set.entry.mark } + if$ + } + { "J" set.entry.mark } + if$ format.mark "" output.after new.block } diff --git a/biblio/bibtex/contrib/gbt7714/gbt7714-author-year.bst b/biblio/bibtex/contrib/gbt7714/gbt7714-author-year.bst index 656d256311..4637e4d270 100644 --- a/biblio/bibtex/contrib/gbt7714/gbt7714-author-year.bst +++ b/biblio/bibtex/contrib/gbt7714/gbt7714-author-year.bst @@ -8,9 +8,9 @@ %% ------------------------------------------------------------------- %% GB/T 7714 BibTeX Style %% https://github.com/zepinglee/gbt7714-bibtex-style -%% Version: 2021/12/08 v2.1.3 +%% Version: 2022/03/21 v2.1.4 %% ------------------------------------------------------------------- -%% Copyright (C) 2016—2021 by Zeping Lee <zepinglee AT gmail.com> +%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com> %% ------------------------------------------------------------------- %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -37,8 +37,6 @@ INTEGERS { show.mark space.before.mark show.medium.type - slash.for.extraction - in.booktitle short.journal italic.journal bold.journal.volume @@ -60,6 +58,10 @@ INTEGERS { lang.other.order } +STRINGS { + component.part.label +} + FUNCTION {load.config} { #2 'citation.et.al.min := @@ -78,8 +80,7 @@ FUNCTION {load.config} #1 'show.mark := #0 'space.before.mark := #1 'show.medium.type := - #1 'slash.for.extraction := - #0 'in.booktitle := + "slash" 'component.part.label := #0 'short.journal := #0 'italic.journal := #0 'bold.journal.volume := @@ -112,6 +113,7 @@ ENTRY editor eprint eprinttype + entrysubtype howpublished institution journal @@ -392,9 +394,22 @@ FUNCTION {new.sentence} FUNCTION {new.slash} { output.state before.all = 'skip$ - { slash.for.extraction + { component.part.label "slash" = { after.slash 'output.state := } - { after.block 'output.state := } + { new.block + component.part.label "in" = + { entry.lang lang.en = + { "In: " output + write$ + "" + before.all 'output.state := + } + 'skip$ + if$ + } + 'skip$ + if$ + } if$ } if$ @@ -987,14 +1002,6 @@ FUNCTION {format.series.vol.num.booktitle} { format.booktitle.vol.num } if$ format.btitle - in.booktitle - { duplicate$ empty$ not entry.lang lang.en = and - { "In: " swap$ * } - 'skip$ - if$ - } - 'skip$ - if$ } FUNCTION {remove.period} @@ -1136,9 +1143,13 @@ FUNCTION {format.edition} { edition empty$ { "" } { edition is.number - { entry.lang lang.zh = - { edition " 版" * } - { edition num.to.ordinal " ed." * } + { edition "1" = not + { entry.lang lang.zh = + { edition " 版" * } + { edition num.to.ordinal " ed." * } + if$ + } + 'skip$ if$ } { entry.lang lang.en = @@ -1338,7 +1349,15 @@ FUNCTION {format.date} { date empty$ not { type$ "patent" = type$ "newspaper" = or { date } - { format.year } + { entrysubtype empty$ not + { type$ "article" = entrysubtype "newspaper" = and + { date } + { format.year } + if$ + } + { format.year } + if$ + } if$ } { year empty$ not @@ -1806,7 +1825,15 @@ FUNCTION {journal.article} new.block title.in.journal { format.title "title" output.check - "J" set.entry.mark + entrysubtype empty$ not + { + entrysubtype "newspaper" = + { "N" set.entry.mark } + { "J" set.entry.mark } + if$ + } + { "J" set.entry.mark } + if$ format.mark "" output.after new.block } diff --git a/biblio/bibtex/contrib/gbt7714/gbt7714-numerical.bst b/biblio/bibtex/contrib/gbt7714/gbt7714-numerical.bst index a6eb769bdc..daeb70f367 100644 --- a/biblio/bibtex/contrib/gbt7714/gbt7714-numerical.bst +++ b/biblio/bibtex/contrib/gbt7714/gbt7714-numerical.bst @@ -8,9 +8,9 @@ %% ------------------------------------------------------------------- %% GB/T 7714 BibTeX Style %% https://github.com/zepinglee/gbt7714-bibtex-style -%% Version: 2021/12/08 v2.1.3 +%% Version: 2022/03/21 v2.1.4 %% ------------------------------------------------------------------- -%% Copyright (C) 2016—2021 by Zeping Lee <zepinglee AT gmail.com> +%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com> %% ------------------------------------------------------------------- %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -37,8 +37,6 @@ INTEGERS { show.mark space.before.mark show.medium.type - slash.for.extraction - in.booktitle short.journal italic.journal bold.journal.volume @@ -55,6 +53,10 @@ INTEGERS { end.with.period } +STRINGS { + component.part.label +} + FUNCTION {load.config} { #2 'citation.et.al.min := @@ -73,8 +75,7 @@ FUNCTION {load.config} #1 'show.mark := #0 'space.before.mark := #1 'show.medium.type := - #1 'slash.for.extraction := - #0 'in.booktitle := + "slash" 'component.part.label := #0 'short.journal := #0 'italic.journal := #0 'bold.journal.volume := @@ -102,6 +103,7 @@ ENTRY editor eprint eprinttype + entrysubtype howpublished institution journal @@ -382,9 +384,22 @@ FUNCTION {new.sentence} FUNCTION {new.slash} { output.state before.all = 'skip$ - { slash.for.extraction + { component.part.label "slash" = { after.slash 'output.state := } - { after.block 'output.state := } + { new.block + component.part.label "in" = + { entry.lang lang.en = + { "In: " output + write$ + "" + before.all 'output.state := + } + 'skip$ + if$ + } + 'skip$ + if$ + } if$ } if$ @@ -977,14 +992,6 @@ FUNCTION {format.series.vol.num.booktitle} { format.booktitle.vol.num } if$ format.btitle - in.booktitle - { duplicate$ empty$ not entry.lang lang.en = and - { "In: " swap$ * } - 'skip$ - if$ - } - 'skip$ - if$ } FUNCTION {remove.period} @@ -1126,9 +1133,13 @@ FUNCTION {format.edition} { edition empty$ { "" } { edition is.number - { entry.lang lang.zh = - { edition " 版" * } - { edition num.to.ordinal " ed." * } + { edition "1" = not + { entry.lang lang.zh = + { edition " 版" * } + { edition num.to.ordinal " ed." * } + if$ + } + 'skip$ if$ } { entry.lang lang.en = @@ -1328,7 +1339,15 @@ FUNCTION {format.date} { date empty$ not { type$ "patent" = type$ "newspaper" = or { date } - { format.year } + { entrysubtype empty$ not + { type$ "article" = entrysubtype "newspaper" = and + { date } + { format.year } + if$ + } + { format.year } + if$ + } if$ } { year empty$ not @@ -1796,7 +1815,15 @@ FUNCTION {journal.article} new.block title.in.journal { format.title "title" output.check - "J" set.entry.mark + entrysubtype empty$ not + { + entrysubtype "newspaper" = + { "N" set.entry.mark } + { "J" set.entry.mark } + if$ + } + { "J" set.entry.mark } + if$ format.mark "" output.after new.block } diff --git a/biblio/bibtex/contrib/gbt7714/gbt7714.pdf b/biblio/bibtex/contrib/gbt7714/gbt7714.pdf Binary files differindex 30856d7356..8ac00c1415 100644 --- a/biblio/bibtex/contrib/gbt7714/gbt7714.pdf +++ b/biblio/bibtex/contrib/gbt7714/gbt7714.pdf diff --git a/biblio/bibtex/contrib/gbt7714/gbt7714.sty b/biblio/bibtex/contrib/gbt7714/gbt7714.sty index 494e36e4e6..bb202cb319 100644 --- a/biblio/bibtex/contrib/gbt7714/gbt7714.sty +++ b/biblio/bibtex/contrib/gbt7714/gbt7714.sty @@ -8,9 +8,9 @@ %% ------------------------------------------------------------------- %% GB/T 7714 BibTeX Style %% https://github.com/zepinglee/gbt7714-bibtex-style -%% Version: 2021/12/08 v2.1.3 +%% Version: 2022/03/21 v2.1.4 %% ------------------------------------------------------------------- -%% Copyright (C) 2016—2021 by Zeping Lee <zepinglee AT gmail.com> +%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com> %% ------------------------------------------------------------------- %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -22,7 +22,7 @@ %% ------------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{gbt7714} - [2021/12/08 v2.1.3 GB/T 7714 BibTeX Style] + [2022/03/21 v2.1.4 GB/T 7714 BibTeX Style] \newif\ifgbt@legacy@interface \newif\ifgbt@mmxv \newif\ifgbt@numerical |