dump v1.2.0

DapengFeng · Jun 6, 2024 · 59e29dc · 59e29dc
1 parent 8244e5c
commit 59e29dc
Show file tree

Hide file tree

Showing 13 changed files with 759 additions and 1,127 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@ dtx-style.sty
 # sysuthesis.cls
 # sysuthesis.pdf
 # sysuthesis-example.pdf
-spine.pdf
+lyx/sysuthesis-example.tex
 *.hd
 
 ## test files:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@
 
 ## [Unreleased]
 
+## [v1.2.0] - 2024-06-06
+### Update
+ - 更新lyx模板
+### Merge
+ - 合并ThuThesis v7.5.1
+
 ## [v1.1.1] - 2023-10-18
 ### Add
  - 添加封面和封底扫描版
@@ -33,7 +39,8 @@
 - 改变研究生的titlepage和copyrightpage
 
 
-[Unreleased]: https://github.com/DapengFeng/sysuthesis/compare/v1.1.1...HEAD
+[Unreleased]: https://github.com/DapengFeng/sysuthesis/compare/v1.2.0...HEAD
+[v1.2.0]:     https://github.com/DapengFeng/sysuthesis/releases/tag/v1.2.0
 [v1.1.1]:     https://github.com/DapengFeng/sysuthesis/releases/tag/v1.1.1
 [v1.1.0]:     https://github.com/DapengFeng/sysuthesis/releases/tag/v1.1.0
 [v1.0.1]:     https://github.com/DapengFeng/sysuthesis/releases/tag/v1.0.1

diff --git a/Makefile b/Makefile
diff --git a/lyx/sysuthesis.layout b/lyx/sysuthesis.layout
@@ -5,6 +5,7 @@
 Format                35
 Sides                 2
 provides mathrsfs 1
+provides subfig 1
 
 Input article.layout
 Input stdclass.inc

diff --git a/spine.tex b/spine.tex
diff --git a/sysusetup.tex b/sysusetup.tex
@@ -14,6 +14,9 @@
   %   选择打印版（print）或用于提交的电子版（electronic），前者会插入空白页以便直接双面打印
   %
   output = electronic,
+  % 格式类型
+  %   默认为论文（thesis），也可以设置为开题报告（proposal）
+  % thesis-type = proposal,
   %
   % 标题
   %   可使用“\\”命令手动控制换行
@@ -66,6 +69,10 @@
   %
   author  = {[姓名]},
   author* = {[Name]},
+  % 学号
+  % 仅当书写开题报告时需要（同时设置 `thesis-type = proposal'）
+  %
+  % student-id = {2000310000},
   %
   % 指导教师
   %   中文姓名和职称之间以英文逗号“,”分开，下同
@@ -159,13 +166,19 @@
 % \usepackage{natbib}
 % \bibliographystyle{sysuthesis-author-year}
 
+
+% 生命科学学院要求使用 Cell 参考文献格式（2023 年以前使用 author-date 格式）
+% \usepackage{natbib}
+% \bibliographystyle{cell}
+
 % 本科生参考文献的著录格式
 % \usepackage[sort]{natbib}
 % \bibliographystyle{sysuthesis-bachelor}
 
 % 参考文献使用 BibLaTeX 宏包
 % \usepackage[style=sysuthesis-numeric]{biblatex}
 % \usepackage[style=sysuthesis-author-year]{biblatex}
+% \usepackage[style=gb7714-2015]{biblatex}
 % \usepackage[style=apa]{biblatex}
 % \usepackage[style=mla-new]{biblatex}
 % 声明 BibLaTeX 的数据库

diff --git a/sysuthesis-author-year.bst b/sysuthesis-author-year.bst
@@ -8,9 +8,9 @@
 %% -------------------------------------------------------------------
 %% GB/T 7714 BibTeX Style
 %% https://github.com/zepinglee/gbt7714-bibtex-style
-%% Version: 2022/03/21 v2.1.4
+%% Version: 2024/03/08 v2.1.6
 %% -------------------------------------------------------------------
-%% Copyright (C) 2016--2022 by Zeping Lee <zepinglee AT gmail.com>
+%% Copyright (C) 2016--2024 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
@@ -39,6 +39,7 @@ INTEGERS {
   show.medium.type
   short.journal
   italic.journal
+  link.journal
   bold.journal.volume
   show.missing.address.publisher
   space.before.pages
@@ -83,6 +84,7 @@ FUNCTION {load.config}
   "slash" 'component.part.label :=
   #0 'short.journal :=
   #0 'italic.journal :=
+  #0 'link.journal :=
   #0 'bold.journal.volume :=
   #0 'show.missing.address.publisher :=
   #1 'space.before.pages :=
@@ -745,7 +747,7 @@ FUNCTION {editor.full}
 
 FUNCTION {make.full.names}
 { type$ "book" =
-  type$ "inbook" =
+  type$ "inbook" = booktitle empty$ not and
   or
     'author.editor.full
     { type$ "collection" =
@@ -887,7 +889,7 @@ FUNCTION {format.volume}
     { volume is.number
         { entry.lang lang.zh =
             { "第 " volume * " 卷" * }
-            { "volume" volume tie.or.space.connect }
+            { "Vol." volume tie.or.space.connect }
           if$
         }
         { volume }
@@ -902,7 +904,7 @@ FUNCTION {format.number}
     { number is.number
         { entry.lang lang.zh =
             { "第 " number * " 册" * }
-            { "number" number tie.or.space.connect }
+            { "No." number tie.or.space.connect }
           if$
         }
         { number }
@@ -1067,7 +1069,7 @@ FUNCTION {get.journal.title}
 }
 
 FUNCTION {check.arxiv.preprint}
-{ #1 #5 substring$ "l" change.case$ "arxiv" =
+{ #1 #5 substring$ purify$ "l" change.case$ "arxiv" =
     { #1 }
     { #0 }
   if$
@@ -1080,6 +1082,10 @@ FUNCTION {format.journal}
         'emphasize
         'skip$
       if$
+      link.journal
+        'add.link
+        'skip$
+      if$
     }
     'skip$
   if$
@@ -1308,7 +1314,7 @@ FUNCTION {extract.after.slash}
 
 FUNCTION {format.year}
 { year empty$ not
-    { year extract.before.slash extra.label * }
+    { year extra.label * }
     { date empty$ not
         { date extract.before.dash extra.label * }
         { entry.is.electronic not
@@ -1488,7 +1494,7 @@ FUNCTION {format.periodical.year.volume.number}
 
 FUNCTION {check.url}
 { url empty$ not
-    { "\url{" url * "}" * 'entry.url :=
+    { url 'entry.url :=
       #1 'entry.is.electronic :=
     }
     { howpublished empty$ not
@@ -1519,7 +1525,11 @@ FUNCTION {output.url}
 { show.url is.pure.electronic or
   entry.url empty$ not and
     { new.block
-      entry.url output
+      entry.url #1 #5 substring$ "\url{" =
+        { entry.url }
+        { "\url{" entry.url * "}" * }
+      if$
+      output
     }
     'skip$
   if$
@@ -1539,8 +1549,8 @@ FUNCTION {is.in.url}
     { entry.url empty$
         { #0 }
         { s text.length$ 'len :=
-          entry.url text.length$ 'charptr :=
-            { entry.url charptr len substring$ s = not
+          entry.url "l" change.case$ text.length$ 'charptr :=
+            { entry.url "l" change.case$ charptr len substring$ s "l" change.case$ = not
               charptr #0 >
               and
             }
@@ -1976,6 +1986,10 @@ FUNCTION {preprint}
   format.urldate "" output.after
   output.eprint
   output.url
+  show.preprint not eprint empty$ or
+    'output.doi
+    'skip$
+  if$
   new.block
   format.note output
   fin.entry
@@ -2040,7 +2054,12 @@ FUNCTION {dataset}
   electronic
 }
 
-FUNCTION {inbook} { book }
+FUNCTION {inbook} {
+  booktitle empty$
+    'book
+    'incollection
+  if$
+}
 
 FUNCTION {inproceedings}
 { "C" set.entry.mark
@@ -2281,7 +2300,7 @@ FUNCTION {editor.key.organization.label}
 FUNCTION {calc.short.authors}
 { "" 'short.label :=
   type$ "book" =
-  type$ "inbook" =
+  type$ "inbook" = booktitle empty$ not and
   or
     'author.editor.key.label
     { type$ "collection" =
@@ -2483,7 +2502,7 @@ FUNCTION {presort}
   "    "
   *
   type$ "book" =
-  type$ "inbook" =
+  type$ "inbook" = booktitle empty$ not and
   or
     'author.editor.sort
     { type$ "collection" =