Skip to content

Commit

Permalink
Bump to v2.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
zepinglee committed Oct 3, 2022
1 parent ccf79ef commit 8120195
Show file tree
Hide file tree
Showing 19 changed files with 66 additions and 51 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
build/
*.zip
gbt7714/
*.curlopt
*.zip

## Core latex/pdflatex auxiliary files:
*.aux
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [v2.1.5] - 2022-10-03

### Changed

- “volume”和“number”改为缩写“Vol.”和“No.”([#104](https://github.com/zepinglee/gbt7714-bibtex-style/issues/104))。
- 纯电子文献缺失“出版日期”时不再警告。

## [v2.1.4] - 2022-03-21

Expand Down Expand Up @@ -230,7 +233,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Initial release.。

[Unreleased]: https://github.com/zepinglee/gbt7714-bibtex-style/compare/v2.1.4...HEAD
[Unreleased]: https://github.com/zepinglee/gbt7714-bibtex-style/compare/v2.1.5...HEAD
[v2.1.5]: https://github.com/zepinglee/gbt7714-bibtex-style/compare/v2.1.4...v2.1.5
[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
Expand Down
5 changes: 5 additions & 0 deletions DEPENDS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# The format of this file is described in https://www.tug.org/texlive/pkgcontrib.html#deps.

hard bibtex
hard natbib
hard url
71 changes: 38 additions & 33 deletions build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ module = "gbt7714"
testfiledir = "./test/testfiles"
testsuppdir = testfiledir .. "/support"

sourcefiles = {"*.dtx", "*.sty", "*.bst"}
installfiles = {"*.sty", "*.bst"}
tagfiles = {"*.dtx", "*.ins", "CHANGELOG.md", "variants/*.ins"}
textfiles = {"*.md", "LICENSE"}

checkengines = {"xetex"}
stdengine = "xetex"
Expand All @@ -26,27 +26,28 @@ checkruns = 3
checkopts = "-file-line-error -halt-on-error -interaction=nonstopmode"
typesetopts = "-file-line-error -halt-on-error -interaction=nonstopmode"

changeslisting = nil
do
local f = assert(io.open("CHANGELOG.md", "r"))
changeslisting = f:read("*all")
f:close()
end
pkgversion = string.match(changeslisting, "## %[(v%S+)%] - ")
local f = assert(io.open("CHANGELOG.md", "r"))
local change_log_content = f:read("*all")
f:close()
local pkg_version = string.match(change_log_content, "## %[v([%d%.]+)%] - ")
print(string.format("Package version: %s", pkg_version))

uploadconfig = {
author = "Zeping Lee",
license = "lppl1.3c",
version = pkgversion,
summary = "BibTeX implementation of Chinese bibliography style standard GB/T 15",
topic = {"bibtex-supp", "chinese"},
ctanPath = "/biblio/bibtex/contrib/gbt7714",
repository = "https://github.com/zepinglee/gbt7714-bibtex-style",
bugtracker = "https://github.com/zepinglee/gbt7714-bibtex-style/issues",
update = true,
description = [[
The package provides a BibTeX implementation for the Chinese national bibliography style standard GB/T 15. It consists of two bst files for numerical and author-year styles and a LaTeX package which provides the citation style defined in the standard. It also support automatic language recognization (Chinese and English) for each biblilography entry and is designed to be fully compatible with natbib.
]],
version = pkg_version,
author = "Zeping Lee",
license = "lppl1.3c",
uploader = "Zeping Lee",
email = "[email protected]",
summary = "BibTeX implementation of China’s bibliography style standard GB/T 7714—2015",
description = [[
The package pr ovides a BibTeX implementation for the Chinese national bibliography style standard GB/T 7714—2015. It consists of two bst files for numerical and author-year styles as well as a LaTeX package which provides the citation style defined in the standard. The package is compatible with natbib and supports language detection (Chinese and English) for each biblilography entry.]],
note = "Uploaded automatically by l3build...",
ctanPath = "/biblio/bibtex/contrib/gbt7714",
repository = "https://github.com/zepinglee/gbt7714-bibtex-style",
bugtracker = "https://github.com/zepinglee/gbt7714-bibtex-style/issues",
topic = {"bibtex-sty", "chinese", "std-conform"},
announcement_file = "ctan.ann",
update = true,
}

lvtext = ".tex"
Expand All @@ -56,22 +57,26 @@ function runtest_tasks(name, run)
end

function update_tag(file, content, tagname, tagdate)
local iso = "%d%d%d%d%-%d%d%-%d%d"
local url = "https://github.com/zepinglee/gbt7714-bibtex-style"
local date = string.gsub(tagdate, "%-", "/")
if string.match(file, "%.dtx$") or string.match(file, "%.ins$") then
return string.gsub(content, "%d%d%d%d/%d%d/%d%d v[%d.]+",
date .. " " .. tagname)
elseif string.match(file, "CHANGELOG.md") then
local previous = string.match(content, "/compare/(.*)%.%.%.HEAD")
if tagname == previous then return content end
tagname = string.gsub(tagname, "^v", "")

if string.match(file,"CHANGELOG.md") then
local pattern = "[%d%.]+"
local url = "https://github.com/zepinglee/gbt7714-bibtex-style"
local previous = string.match(content, "compare/v(" .. pattern .. ")%.%.%.HEAD")
if tagname == previous then
return content
end
content = string.gsub(content,
"## %[Unreleased%]",
"## [Unreleased]\n\n## [" .. tagname .."] - " .. tagdate)
"## [Unreleased]\n\n## [v" .. tagname .."] - " .. tagdate)
return string.gsub(content,
previous .. "%.%.%.HEAD",
tagname .. "...HEAD\n[" .. tagname .. "]: " .. url .. "/compare/"
.. previous .. "..." .. tagname)
"v" .. pattern .. "%.%.%.HEAD",
"v" .. tagname .. "...HEAD\n[v" .. tagname .. "]: " .. url .. "/compare/v" .. previous
.. "...v" .. tagname)
else
local date = string.gsub(tagdate, "%-", "/")
return string.gsub(content, "%d%d%d%d/%d%d/%d%d v[%d.]+",
date .. " v" .. tagname)
end
return content
end
2 changes: 1 addition & 1 deletion gbt7714-2005-author-year.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion gbt7714-2005-numerical.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion gbt7714-author-year.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion gbt7714-numerical.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion gbt7714.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{gbt7714}
%<package> [2022/03/21 v2.1.4 GB/T 7714 BibTeX Style]
%<package> [2022/10/03 v2.1.5 GB/T 7714 BibTeX Style]
%
%<*driver>
\documentclass[a4paper]{l3doc}
Expand Down
2 changes: 1 addition & 1 deletion gbt7714.ins
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
-------------------------------------------------------------------
GB/T 7714 BibTeX Style
https://github.com/zepinglee/gbt7714-bibtex-style
Version: 2022/03/21 v2.1.4
Version: 2022/10/03 v2.1.5
-------------------------------------------------------------------
Copyright (C) 2016--\the\year by Zeping Lee <zepinglee AT gmail.com>
-------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions gbt7714.sty
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand All @@ -22,7 +22,7 @@
%% -------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{gbt7714}
[2022/03/21 v2.1.4 GB/T 7714 BibTeX Style]
[2022/10/03 v2.1.5 GB/T 7714 BibTeX Style]
\newif\ifgbt@legacy@interface
\newif\ifgbt@mmxv
\newif\ifgbt@numerical
Expand Down
2 changes: 1 addition & 1 deletion variants/gbt7714-variants.ins
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
-------------------------------------------------------------------
GB/T 7714 BibTeX Style
https://github.com/zepinglee/gbt7714-bibtex-style
Version: 2022/03/21 v2.1.4
Version: 2022/10/03 v2.1.5
-------------------------------------------------------------------
Copyright (C) 2016--\the\year by Zeping Lee <zepinglee AT gmail.com>
-------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion variants/thu/thuthesis-author-year.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion variants/thu/thuthesis-bachelor.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion variants/thu/thuthesis-numeric.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion variants/ucas/ucasthesis-author-year.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion variants/ucas/ucasthesis-numerical.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion variants/ustc/ustcthesis-authoryear.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion variants/ustc/ustcthesis-numerical.bst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%% -------------------------------------------------------------------
%% GB/T 7714 BibTeX Style
%% https://github.com/zepinglee/gbt7714-bibtex-style
%% Version: 2022/03/21 v2.1.4
%% Version: 2022/10/03 v2.1.5
%% -------------------------------------------------------------------
%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
%% -------------------------------------------------------------------
Expand Down

0 comments on commit 8120195

Please sign in to comment.