From c364b055adb89a8b13841450e55d4bbb3e16fa10 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Mar 2021 23:01:58 +0000 Subject: thuthesis (12mar21) git-svn-id: svn://tug.org/texlive/trunk@58300 c570f23f-e606-0410-a88d-b1316a301751 --- .../bibtex/bst/thuthesis/thuthesis-author-year.bst | 46 +++++++++++++--------- .../bibtex/bst/thuthesis/thuthesis-bachelor.bst | 44 ++++++++++++--------- .../bibtex/bst/thuthesis/thuthesis-numeric.bst | 46 +++++++++++++--------- 3 files changed, 80 insertions(+), 56 deletions(-) (limited to 'Master/texmf-dist/bibtex') diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst index 2a361a97c26..22126985c57 100644 --- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst +++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst @@ -4,13 +4,13 @@ %% %% The original source files were: %% -%% gbt7714.dtx (with options: `thu,2015,authoryear') +%% gbt7714.dtx (with options: `2015,thu,authoryear') %% ------------------------------------------------------------------- -%% GB/T 7714-2015 BibTeX Style +%% GB/T 7714—2015 BibTeX Style %% https://github.com/CTeX-org/gbt7714-bibtex-style -%% Version: 2020/06/08 v2.0.2 +%% Version: 2020/12/17 v2.1 %% ------------------------------------------------------------------- -%% Copyright (C) 2016-2020 by Zeping Lee +%% Copyright (C) 2016—2021 by Zeping Lee %% ------------------------------------------------------------------- %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -18,7 +18,7 @@ %% The latest version of this license is in %% https://www.latex-project.org/lppl.txt %% and version 1.3c or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. +%% version 2008 or later. %% ------------------------------------------------------------------- INTEGERS { citation.et.al.min @@ -41,6 +41,7 @@ INTEGERS { italic.journal bold.journal.volume show.missing.address.publisher + space.before.pages only.start.page show.urldate show.url @@ -77,6 +78,7 @@ FUNCTION {load.config} #0 'italic.journal := #0 'bold.journal.volume := #0 'show.missing.address.publisher := + #0 'space.before.pages := #0 'only.start.page := #1 'show.urldate := #1 'show.url := @@ -198,9 +200,16 @@ FUNCTION {citation.et.al} FUNCTION {bbl.colon} { ": " } +FUNCTION {bbl.pages.colon} +{ space.before.pages + { ": " } + { ":\allowbreak " } + if$ +} + FUNCTION {bbl.wide.space} { "\quad " } -FUNCTION {bbl.slash} { "// " } +FUNCTION {bbl.slash} { "//\allowbreak " } FUNCTION {bbl.sine.loco} { entry.lang lang.zh = @@ -1032,9 +1041,10 @@ FUNCTION {format.mark} if$ 'entry.mark := space.before.mark - { " [" entry.mark * "]" * } - { "[" entry.mark * "]" * } + { " " } + { "\allowbreak" } if$ + "[" * entry.mark * "]" * } { "" } if$ @@ -1367,7 +1377,7 @@ FUNCTION {format.journal.volume} FUNCTION {format.journal.number} { number empty$ not - { "\penalty0 (" number * ")" * } + { "\allowbreak (" number * ")" * } { "" } if$ } @@ -1375,9 +1385,7 @@ FUNCTION {format.journal.number} FUNCTION {format.journal.pages} { pages empty$ { "" } - { ": " - format.extracted.pages * - } + { format.extracted.pages } if$ } @@ -1391,7 +1399,7 @@ FUNCTION {format.periodical.year.volume.number} 'skip$ if$ number empty$ not - { "\penalty0 (" * number extract.before.dash * ")" * } + { "\allowbreak (" * number extract.before.dash * ")" * } 'skip$ if$ "--" * @@ -1407,7 +1415,7 @@ FUNCTION {format.periodical.year.volume.number} 'skip$ if$ number empty$ not - { "\penalty0 (" * number extract.after.dash * ")" * } + { "\allowbreak (" * number extract.after.dash * ")" * } 'skip$ if$ } @@ -1659,7 +1667,7 @@ FUNCTION {monograph} { format.year "year" output.check } 'skip$ if$ - format.pages bbl.colon output.after + format.pages bbl.pages.colon output.after format.urldate "" output.after output.url output.doi @@ -1700,7 +1708,7 @@ FUNCTION {incollection} { format.year "year" output.check } 'skip$ if$ - format.extracted.pages bbl.colon output.after + format.extracted.pages bbl.pages.colon output.after format.urldate "" output.after output.url output.doi @@ -1773,7 +1781,7 @@ FUNCTION {article} if$ format.journal.volume output format.journal.number "" output.after - format.journal.pages "" output.after + format.journal.pages bbl.pages.colon output.after format.urldate "" output.after output.url output.doi @@ -1841,7 +1849,7 @@ FUNCTION {electronic} } 'skip$ if$ - format.pages bbl.colon output.after + format.pages bbl.pages.colon output.after format.editdate "" output.after format.urldate "" output.after output.url @@ -1892,7 +1900,7 @@ FUNCTION {preprint} { format.year "year" output.check } 'skip$ if$ - format.pages bbl.colon output.after + format.pages bbl.pages.colon output.after format.urldate "" output.after output.url new.block diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst index 9094bc339bb..1dd06bb8871 100644 --- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst +++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst @@ -6,11 +6,11 @@ %% %% gbt7714.dtx (with options: `2015,numerical,noslsn') %% ------------------------------------------------------------------- -%% GB/T 7714-2015 BibTeX Style +%% GB/T 7714—2015 BibTeX Style %% https://github.com/CTeX-org/gbt7714-bibtex-style -%% Version: 2020/06/08 v2.0.2 +%% Version: 2020/12/17 v2.1 %% ------------------------------------------------------------------- -%% Copyright (C) 2016-2020 by Zeping Lee +%% Copyright (C) 2016—2021 by Zeping Lee %% ------------------------------------------------------------------- %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -18,7 +18,7 @@ %% The latest version of this license is in %% https://www.latex-project.org/lppl.txt %% and version 1.3c or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. +%% version 2008 or later. %% ------------------------------------------------------------------- INTEGERS { citation.et.al.min @@ -41,6 +41,7 @@ INTEGERS { italic.journal bold.journal.volume show.missing.address.publisher + space.before.pages only.start.page show.urldate show.url @@ -64,7 +65,7 @@ FUNCTION {load.config} #0 'link.title := #1 'title.in.journal := #1 'show.mark := - #1 'space.before.mark := + #0 'space.before.mark := #1 'show.medium.type := #1 'slash.for.extraction := #0 'in.booktitle := @@ -72,6 +73,7 @@ FUNCTION {load.config} #0 'italic.journal := #0 'bold.journal.volume := #0 'show.missing.address.publisher := + #1 'space.before.pages := #0 'only.start.page := #1 'show.urldate := #1 'show.url := @@ -188,6 +190,13 @@ FUNCTION {citation.et.al} FUNCTION {bbl.colon} { ": " } +FUNCTION {bbl.pages.colon} +{ space.before.pages + { ": " } + { ":\allowbreak " } + if$ +} + FUNCTION {bbl.wide.space} { "\quad " } FUNCTION {bbl.slash} { "//\allowbreak " } @@ -1022,9 +1031,10 @@ FUNCTION {format.mark} if$ 'entry.mark := space.before.mark - { " [" entry.mark * "]" * } - { "[" entry.mark * "]" * } + { " " } + { "\allowbreak" } if$ + "[" * entry.mark * "]" * } { "" } if$ @@ -1357,7 +1367,7 @@ FUNCTION {format.journal.volume} FUNCTION {format.journal.number} { number empty$ not - { "\penalty0 (" number * ")" * } + { "\allowbreak (" number * ")" * } { "" } if$ } @@ -1365,9 +1375,7 @@ FUNCTION {format.journal.number} FUNCTION {format.journal.pages} { pages empty$ { "" } - { ": " - format.extracted.pages * - } + { format.extracted.pages } if$ } @@ -1381,7 +1389,7 @@ FUNCTION {format.periodical.year.volume.number} 'skip$ if$ number empty$ not - { "\penalty0 (" * number extract.before.dash * ")" * } + { "\allowbreak (" * number extract.before.dash * ")" * } 'skip$ if$ "--" * @@ -1397,7 +1405,7 @@ FUNCTION {format.periodical.year.volume.number} 'skip$ if$ number empty$ not - { "\penalty0 (" * number extract.after.dash * ")" * } + { "\allowbreak (" * number extract.after.dash * ")" * } 'skip$ if$ } @@ -1649,7 +1657,7 @@ FUNCTION {monograph} { format.year "year" output.check } 'skip$ if$ - format.pages bbl.colon output.after + format.pages bbl.pages.colon output.after format.urldate "" output.after output.url output.doi @@ -1690,7 +1698,7 @@ FUNCTION {incollection} { format.year "year" output.check } 'skip$ if$ - format.extracted.pages bbl.colon output.after + format.extracted.pages bbl.pages.colon output.after format.urldate "" output.after output.url output.doi @@ -1763,7 +1771,7 @@ FUNCTION {article} if$ format.journal.volume output format.journal.number "" output.after - format.journal.pages "" output.after + format.journal.pages bbl.pages.colon output.after format.urldate "" output.after output.url output.doi @@ -1831,7 +1839,7 @@ FUNCTION {electronic} } 'skip$ if$ - format.pages bbl.colon output.after + format.pages bbl.pages.colon output.after format.editdate "" output.after format.urldate "" output.after output.url @@ -1882,7 +1890,7 @@ FUNCTION {preprint} { format.year "year" output.check } 'skip$ if$ - format.pages bbl.colon output.after + format.pages bbl.pages.colon output.after format.urldate "" output.after output.url new.block diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst index 9bb0702e39e..6c1eaa63d78 100644 --- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst +++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst @@ -4,13 +4,13 @@ %% %% The original source files were: %% -%% gbt7714.dtx (with options: `thu,2015,numerical') +%% gbt7714.dtx (with options: `2015,thu,numerical') %% ------------------------------------------------------------------- -%% GB/T 7714-2015 BibTeX Style +%% GB/T 7714—2015 BibTeX Style %% https://github.com/CTeX-org/gbt7714-bibtex-style -%% Version: 2020/06/08 v2.0.2 +%% Version: 2020/12/17 v2.1 %% ------------------------------------------------------------------- -%% Copyright (C) 2016-2020 by Zeping Lee +%% Copyright (C) 2016—2021 by Zeping Lee %% ------------------------------------------------------------------- %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -18,7 +18,7 @@ %% The latest version of this license is in %% https://www.latex-project.org/lppl.txt %% and version 1.3c or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. +%% version 2008 or later. %% ------------------------------------------------------------------- INTEGERS { citation.et.al.min @@ -41,6 +41,7 @@ INTEGERS { italic.journal bold.journal.volume show.missing.address.publisher + space.before.pages only.start.page show.urldate show.url @@ -72,6 +73,7 @@ FUNCTION {load.config} #0 'italic.journal := #0 'bold.journal.volume := #0 'show.missing.address.publisher := + #0 'space.before.pages := #0 'only.start.page := #1 'show.urldate := #1 'show.url := @@ -188,9 +190,16 @@ FUNCTION {citation.et.al} FUNCTION {bbl.colon} { ": " } +FUNCTION {bbl.pages.colon} +{ space.before.pages + { ": " } + { ":\allowbreak " } + if$ +} + FUNCTION {bbl.wide.space} { "\quad " } -FUNCTION {bbl.slash} { "// " } +FUNCTION {bbl.slash} { "//\allowbreak " } FUNCTION {bbl.sine.loco} { entry.lang lang.zh = @@ -1022,9 +1031,10 @@ FUNCTION {format.mark} if$ 'entry.mark := space.before.mark - { " [" entry.mark * "]" * } - { "[" entry.mark * "]" * } + { " " } + { "\allowbreak" } if$ + "[" * entry.mark * "]" * } { "" } if$ @@ -1357,7 +1367,7 @@ FUNCTION {format.journal.volume} FUNCTION {format.journal.number} { number empty$ not - { "\penalty0 (" number * ")" * } + { "\allowbreak (" number * ")" * } { "" } if$ } @@ -1365,9 +1375,7 @@ FUNCTION {format.journal.number} FUNCTION {format.journal.pages} { pages empty$ { "" } - { ": " - format.extracted.pages * - } + { format.extracted.pages } if$ } @@ -1381,7 +1389,7 @@ FUNCTION {format.periodical.year.volume.number} 'skip$ if$ number empty$ not - { "\penalty0 (" * number extract.before.dash * ")" * } + { "\allowbreak (" * number extract.before.dash * ")" * } 'skip$ if$ "--" * @@ -1397,7 +1405,7 @@ FUNCTION {format.periodical.year.volume.number} 'skip$ if$ number empty$ not - { "\penalty0 (" * number extract.after.dash * ")" * } + { "\allowbreak (" * number extract.after.dash * ")" * } 'skip$ if$ } @@ -1649,7 +1657,7 @@ FUNCTION {monograph} { format.year "year" output.check } 'skip$ if$ - format.pages bbl.colon output.after + format.pages bbl.pages.colon output.after format.urldate "" output.after output.url output.doi @@ -1690,7 +1698,7 @@ FUNCTION {incollection} { format.year "year" output.check } 'skip$ if$ - format.extracted.pages bbl.colon output.after + format.extracted.pages bbl.pages.colon output.after format.urldate "" output.after output.url output.doi @@ -1763,7 +1771,7 @@ FUNCTION {article} if$ format.journal.volume output format.journal.number "" output.after - format.journal.pages "" output.after + format.journal.pages bbl.pages.colon output.after format.urldate "" output.after output.url output.doi @@ -1831,7 +1839,7 @@ FUNCTION {electronic} } 'skip$ if$ - format.pages bbl.colon output.after + format.pages bbl.pages.colon output.after format.editdate "" output.after format.urldate "" output.after output.url @@ -1882,7 +1890,7 @@ FUNCTION {preprint} { format.year "year" output.check } 'skip$ if$ - format.pages bbl.colon output.after + format.pages bbl.pages.colon output.after format.urldate "" output.after output.url new.block -- cgit v1.2.3