release v3.1.04

ustctug · Mar 21, 2019 · cc19903 · cc19903
1 parent 7d0764a
commit cc19903
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 24 deletions.
diff --git a/ustcthesis-authoryear.bst b/ustcthesis-authoryear.bst
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% gbt7714.dtx  (with options: `2015,authoryear,noslsn,period')
+%% gbt7714.dtx  (with options: `ustc,2015,authoryear')
 %% -------------------------------------------------------------------
 %% GB/T 7714-2015 BibTeX Style
 %% https://github.com/CTeX-org/gbt7714-bibtex-style
-%% Version: 2019/01/02 v1.1
+%% Version: 2019/03/21 v1.1.1
 %% -------------------------------------------------------------------
 %% Copyright (C) 2016-2019 by Zeping Lee <zepinglee AT gmail.com>
 %% -------------------------------------------------------------------
@@ -35,6 +35,11 @@ INTEGERS {
   show.url
   show.doi
   show.note
+  lang.zh.order
+  lang.ja.order
+  lang.en.order
+  lang.ru.order
+  lang.other.order
 }
 
 FUNCTION {load.config}
@@ -55,6 +60,11 @@ FUNCTION {load.config}
   #1 'show.url :=
   #1 'show.doi :=
   #0 'show.note :=
+  #1 'lang.zh.order :=
+  #2 'lang.ja.order :=
+  #3 'lang.en.order :=
+  #4 'lang.ru.order :=
+  #5 'lang.other.order :=
 }
 
 ENTRY
@@ -859,8 +869,7 @@ FUNCTION {format.series.vol.num.booktitle}
 
 FUNCTION {format.journal}
 { journal
-  italic.jounal
-  entry.lang lang.en = and
+  italic.jounal entry.lang lang.en = and
     'italicize
     'skip$
   if$
@@ -1764,21 +1773,22 @@ FUNCTION {calc.label}
 
 FUNCTION {sort.language.label}
 { entry.lang lang.zh =
-    { "a zh " }
+    { lang.zh.order }
     { entry.lang lang.ja =
-        { "b ja " }
+        { lang.ja.order }
         { entry.lang lang.en =
-            { "c en " }
+            { lang.en.order }
             { entry.lang lang.ru =
-                { "d ru " }
-                { "e other " }
+                { lang.ru.order }
+                { lang.other.order }
               if$
             }
           if$
         }
       if$
     }
   if$
+  int.to.chr$
 }
 
 FUNCTION {sort.format.names}

diff --git a/ustcthesis-bachelor.bst b/ustcthesis-bachelor.bst
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% gbt7714.dtx  (with options: `2015,numerical,nouppercase,nomark,italicjournal,noslsn')
+%% gbt7714.dtx  (with options: `ustc,2015,numerical,nouppercase,nomark,italicjournal')
 %% -------------------------------------------------------------------
 %% GB/T 7714-2015 BibTeX Style
 %% https://github.com/CTeX-org/gbt7714-bibtex-style
-%% Version: 2019/01/02 v1.1
+%% Version: 2019/03/21 v1.1.1
 %% -------------------------------------------------------------------
 %% Copyright (C) 2016-2019 by Zeping Lee <zepinglee AT gmail.com>
 %% -------------------------------------------------------------------
@@ -42,7 +42,6 @@ FUNCTION {load.config}
   #1 'uppercase.name :=
   #0 'uppercase.name :=
   #3 'max.num.authors :=
-  #0 'period.between.author.year :=
   #1 'sentence.case.title :=
   #0 'link.title :=
   #1 'show.mark :=
@@ -861,8 +860,7 @@ FUNCTION {format.series.vol.num.booktitle}
 
 FUNCTION {format.journal}
 { journal
-  italic.jounal
-  entry.lang lang.en = and
+  italic.jounal entry.lang lang.en = and
     'italicize
     'skip$
   if$

diff --git a/ustcthesis-numerical.bst b/ustcthesis-numerical.bst
@@ -4,11 +4,11 @@
 %%
 %% The original source files were:
 %%
-%% gbt7714.dtx  (with options: `2015,numerical,noslsn')
+%% gbt7714.dtx  (with options: `ustc,2015,numerical')
 %% -------------------------------------------------------------------
 %% GB/T 7714-2015 BibTeX Style
 %% https://github.com/CTeX-org/gbt7714-bibtex-style
-%% Version: 2019/01/02 v1.1
+%% Version: 2019/03/21 v1.1.1
 %% -------------------------------------------------------------------
 %% Copyright (C) 2016-2019 by Zeping Lee <zepinglee AT gmail.com>
 %% -------------------------------------------------------------------
@@ -41,7 +41,6 @@ FUNCTION {load.config}
 {
   #1 'uppercase.name :=
   #3 'max.num.authors :=
-  #0 'period.between.author.year :=
   #1 'sentence.case.title :=
   #0 'link.title :=
   #1 'show.mark :=
@@ -858,8 +857,7 @@ FUNCTION {format.series.vol.num.booktitle}
 
 FUNCTION {format.journal}
 { journal
-  italic.jounal
-  entry.lang lang.en = and
+  italic.jounal entry.lang lang.en = and
     'italicize
     'skip$
   if$

diff --git a/ustcthesis.cls b/ustcthesis.cls
@@ -18,10 +18,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{ustcthesis}
-  [2019/01/01 v3.1.03 USTC thesis template]
+  [2019/03/21 v3.1.04 USTC thesis template]
 \RequirePackage{ifxetex}
 \ifxetex\else
-  \ClassError{thuthesis}{XeLaTeX is required to compile the document}{}
+  \ClassError{ustcthesis}{XeLaTeX is required to compile the document}{}
 \fi
 \newif\ifustc@doctor
 \newif\ifustc@master

diff --git a/ustcthesis.dtx b/ustcthesis.dtx
@@ -50,7 +50,7 @@ version 2005/12/01 or later.
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{ustcthesis}
 %<*class>
-  [2019/01/01 v3.1.03 USTC thesis template]
+  [2019/03/21 v3.1.04 USTC thesis template]
 %</class>
 %
 %<*driver>
@@ -2093,7 +2093,7 @@ version 2005/12/01 or later.
 \sloppy
 %    \end{macrocode}
 %
-% \changes{v3.1.04}{2019/01/10}{禁止扩大段间距。}
+% \changes{v3.1.04}{2019/03/21}{禁止扩大段间距。}
 % 禁止扩大段间距。（\href{https://github.com/ustctug/ustcthesis/issues/209}{
 %   ustctug/ustcthesis\#209}）
 %    \begin{macrocode}
@@ -2221,7 +2221,7 @@ version 2005/12/01 or later.
 % 用 \pkg{caption} 宏包设置图、表的格式
 % 注意计算 belowskip 必须用 \pkg{calc} 宏包修正。
 % \changes{v3.0}{2017/07/01}{图表的编号号、标题加粗}
-% \changes{v3.1.04}{2019/03/11}{修正图表标题与正文之间的距离}
+% \changes{v3.1.04}{2019/03/21}{修正图表标题与正文之间的距离}
 %    \begin{macrocode}
 \setlength{\floatsep}{6\bp@}
 \setlength{\textfloatsep}{6\bp@}