Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] - Update CSL Branch #948

Merged
merged 96 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
2aae011
Fix lineskip in resume env for graduate format (fix #850)
Harry-Chen Apr 6, 2023
f4b34c5
Align test files with template
Harry-Chen Apr 6, 2023
8492617
Collect more logs when build fails
Harry-Chen Apr 6, 2023
d1138f9
Align more test files due to biblatex update
Harry-Chen Apr 6, 2023
c134870
Bump to v7.3.2
Harry-Chen Apr 6, 2023
705f1da
Fix missing small caps glyph in doc (fix #859)
zepinglee Apr 13, 2023
f864087
Add hyperref test
zepinglee Apr 22, 2023
a27401a
\PassOptionsToPackage hyperref (#863)
zepinglee Apr 22, 2023
f952488
Add keywords in translation abstract in appendix (close #865)
zepinglee Apr 22, 2023
9df4cc1
Add title page tests
zepinglee Apr 23, 2023
fbde540
Change "engineering field" to "professional-field" (fix #862)
zepinglee Apr 23, 2023
b1b3111
Fix title page layout (fix #861)
zepinglee May 1, 2023
6981aa7
Rename option "degree-name" to "degree-category" (#840)
zepinglee May 2, 2023
4946f8d
Add option "professional-field" and "engineering-field" (#840)
zepinglee May 2, 2023
bf93da1
Fix baseline skip in achievements env (#850)
zepinglee May 3, 2023
e26380b
Change mac monofont condition (#782)
zepinglee May 3, 2023
5c420fe
Fix overfull box warning
zepinglee May 3, 2023
c208916
Citations in appendices are separately numbered (#837)
zepinglee May 3, 2023
b05eb03
Fix typo in thuthesis.dtx
FantasqueX May 10, 2023
1ba52a5
Add TeXPage link
zepinglee May 12, 2023
1ab3762
Add \printbibliography in appendices (#875)
zepinglee May 12, 2023
f34e12d
Fix typo in CHANGELOG
Harry-Chen May 15, 2023
6121f55
Bump to v7.4.0
Harry-Chen May 15, 2023
c359034
Fix the charater spacing of title (#879)
zepinglee May 15, 2023
e54a4ba
Update test files
zepinglee May 15, 2023
af01aba
Remove inputting pdf spine (close #551)
zepinglee May 19, 2023
ea7722a
Fix bib in appendices for l3build typesetting (fix #890)
zepinglee Jun 6, 2023
a53218d
replace `/bin/bash` with `/usr/bin/env bash` in Makefile
SharzyL Jun 10, 2023
87b667f
Update test files
zepinglee Jun 12, 2023
195aab5
Fix undefined \printbibliography error (fix #882)
zepinglee Jun 12, 2023
68a018c
Update test files
zepinglee Jun 12, 2023
cdba5ba
Add biblatex for survey env (resolve #893)
zepinglee Jun 13, 2023
aa6b64b
Update test files
zepinglee Sep 6, 2023
95d5ea6
Update the font size of degree category (resolve #899)
zepinglee Sep 6, 2023
dd0a96d
Unify and simplify title page layout (close #900)
zepinglee Sep 7, 2023
1fc96a7
Center supervisor names in English title page (resolve #883)
zepinglee Sep 7, 2023
8a354c7
Fix extra space with "glossaries" and "hyperref" (fix #901)
zepinglee Sep 20, 2023
a32a0f5
Update Overleaf links
zepinglee Oct 21, 2023
7406f14
Update test files
Harry-Chen Nov 7, 2023
e574e84
Update action version in workflow
Harry-Chen Nov 7, 2023
93a582f
Update test files for package-algorithms
Harry-Chen Nov 7, 2023
fedf6da
Fix font path of MS Word on mac (resolve #913)
zepinglee Jan 31, 2024
6324127
feat: implement thesis-type option for bachelor proposals
YuruiHong Jan 31, 2024
11bf0d8
Fix the case of SimSun font file
zepinglee Feb 6, 2024
eb938d8
Check and use Windows font files (#747)
zepinglee Feb 6, 2024
1aaacb6
Fix args for test
zepinglee Feb 6, 2024
b1bd9ab
Adapt Cell citation style (#921)
zepinglee Feb 15, 2024
4d64a7c
Update test files
zepinglee Feb 15, 2024
b1d8f02
Update actions to build release zip in all run
Harry-Chen Feb 27, 2024
01e5237
Remove unusable action in workflow
Harry-Chen Feb 27, 2024
589ef5a
Add missing packages in test-env Dockerfile [ci skip]
Harry-Chen Feb 27, 2024
325e58f
Add more documentation on font selection
Harry-Chen Feb 27, 2024
ff9f197
Change the spacing of chapter headings in TOC (#926)
zepinglee Mar 2, 2024
17bd760
Fix Windows font file names
zepinglee Mar 2, 2024
d67c61d
Bib: Select inbook format based on booktitle field (#930)
zepinglee Mar 8, 2024
b86ca79
chore: fix some typos
xinhangzhou Mar 13, 2024
44bd13b
Merge pull request #931 from xinhangzhou/master
Harry-Chen Mar 13, 2024
c15ad64
Add entrytypes: report and thesis
vincent-skywalker Mar 18, 2024
53d7a5c
ci: add lt3luabridge in required packages [ci skip]
Harry-Chen Mar 20, 2024
e9095b0
ci: switch to CTAN mirror when installing tex live [ci skip]
Harry-Chen Mar 20, 2024
5e3c0f4
chore: add debug print in log
Harry-Chen Mar 20, 2024
3fd0226
ci: add build results in artifacts
Harry-Chen Mar 20, 2024
f02a8cc
test: update cases
Harry-Chen Mar 20, 2024
b7e0838
Remove all spine related files, refine wording
Harry-Chen Mar 20, 2024
ef02bab
test: update package-algorithms test result
Harry-Chen Mar 20, 2024
a60b518
build: rewrite gulpfile to use es modules
Harry-Chen Mar 20, 2024
b0e644c
ci: split to build & test jobs, upload snapshot build result
Harry-Chen Mar 20, 2024
a8200a5
ci: switch to npm to avoid installing yarn in container
Harry-Chen Mar 20, 2024
6f8d892
ci: try to fix setup-node action
Harry-Chen Mar 20, 2024
4e92ca2
ci: get rid of all nodejs stuff, add Python script to create release zip
Harry-Chen Mar 20, 2024
3dc9dbb
ci: install python3 in docker [ci skip]
Harry-Chen Mar 20, 2024
6ccec19
ci: fix typo in Dockerfile [ci skip]
Harry-Chen Mar 20, 2024
904012d
ci: try to fix script evaluation bug
Harry-Chen Mar 20, 2024
47844c1
ci: fix git permission problem by specifying uid in docker
Harry-Chen Mar 21, 2024
e398238
ci: fetch all tags in actions/checkout
Harry-Chen Mar 21, 2024
f9cc56b
build: move build-related files to utils/
Harry-Chen Mar 21, 2024
c5d67f1
chore: replace issue template with yaml format
Harry-Chen Mar 21, 2024
ad9e747
chore: add config for issue template chooser
Harry-Chen Mar 21, 2024
19a3079
chore: fix issue template
Harry-Chen Mar 21, 2024
4d3ee01
chore: update issue template & fix ci config
Harry-Chen Mar 21, 2024
0e789c8
ci: add cell in required packages
Harry-Chen Mar 21, 2024
2cbf6ce
doc: update README
Harry-Chen Mar 21, 2024
658899e
ci: drop custom Docker image again
Harry-Chen Mar 21, 2024
9118c0c
ci: fix syntax errors in test.yml
Harry-Chen Mar 21, 2024
2c378a8
ci: cleanup unused configuration
Harry-Chen Mar 21, 2024
3438724
fix: update test files, revert f02a8ccc02
Harry-Chen Mar 29, 2024
99b8534
doc: update description on student-id option
Harry-Chen Mar 29, 2024
c2b4c17
doc: add student-id in thusetup.tex, fix #614
Harry-Chen Mar 29, 2024
5b1a3d9
chore: remove markdown quirk in doc
Harry-Chen Mar 29, 2024
4a9ad77
doc: update CHANGE.md
Harry-Chen Mar 29, 2024
78d5c5e
chore: bump version to v7.5.0
Harry-Chen Mar 29, 2024
0be3ca0
Fix typo in thuthesis.dtx
jjyyxx Mar 30, 2024
9307b22
Merge pull request #939 from jjyyxx/patch-1
Harry-Chen Mar 30, 2024
4cdcf4e
Refine handling of student-id option, fix #945
Harry-Chen Apr 15, 2024
8eff4c4
Fix a typo in 4cdcf4e
Harry-Chen Apr 15, 2024
a829acf
Merge remote-tracking branch 'origin/master' into csl
evie-mo Apr 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 104 additions & 0 deletions .github/ISSUE_TEMPLATE/1-bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: Bug Report / Feature Request
description: 报告模板中的问题或者请求实现更多功能。

body:
- type: checkboxes
id: checklist
attributes:
label: 提交前检查
description: 请确保你提交的问题符合以下的要求。
options:
- label: 我已经充分阅读了模板文档。
required: true
- label: 我的问题并非关于模板的用法(否则请前往 discussions 提出)。
required: true
- label: 我已经搜索了已有的 issues 和 discussion,确认没有重复提交。
required: true

- type: input
id: system
attributes:
label: 系统
description: 使用的系统
placeholder: macOS 13.2 / Windows 11 / Ubuntu 24.04 / Overleaf / TeXPage
validations:
required: true

- type: input
id: tex-distro
attributes:
label: TeX 发行版
description: 使用的 TeX 发行版(在线平台可在项目设置中查看)
placeholder: TeX Live 2024 / MiKTeX 24.1 / CTEX 3.0.216.3
validations:
required: true

- type: input
id: tex-program
attributes:
label: TeX 编译器
description: 使用的 TeX 程序(如不了解,保留默认值)
placeholder: XeLaTeX / LuaLaTeX / pdfLaTeX
value: XeLaTeX
validations:
required: true

- type: input
id: version
attributes:
label: 版本
description: 使用的模板版本(可打开 `thuthesis.cls` 搜索 `\ProvidesClass` 查看)
placeholder: '7.4.0'
validations:
required: true

- type: dropdown
id: degree-type
attributes:
label: 学位类型
description: 模板的学位论文类型
options:
- bachelor
- master
- doctor
- postdoc
validations:
required: true

- type: textarea
id: bug-report
attributes:
label: 问题描述
description: 请简要描述你遇到的问题,并附上必要的截图等。
placeholder: |
《研究生学位论文写作指南》第 xx 页要求……
而模板编译的结果是……
validations:
required: true

- type: textarea
id: reproducer
attributes:
label: 复现代码
description: 能复现上述问题的最小代码片段
render: TeX
placeholder: |
\documentclass[degree=doctor]{thuthesis}
\begin{document}
abc
\end{document}
validations:
required: true

- type: textarea
id: log
attributes:
label: 编译日志
description: 相关的编译日志(文本形式粘贴)
render: Text

- type: textarea
id: additional-info
attributes:
label: 其他信息
description: 其他你认为有必要提供的信息
25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: true
contact_links:
- name: 模板文档
url: http://mirrors.ctan.org/macros/latex/contrib/thuthesis/thuthesis.pdf
about: 阅读模板使用文档。
- name: GitHub Discussions
url: https://github.com/tuna/thuthesis/discussions
about: 在讨论区询问模板的使用方法。
18 changes: 0 additions & 18 deletions .github/workflows/Dockerfile

This file was deleted.

38 changes: 0 additions & 38 deletions .github/workflows/build_test_env.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/install-packages.sh

This file was deleted.

17 changes: 0 additions & 17 deletions .github/workflows/install-texlive.sh

This file was deleted.

108 changes: 78 additions & 30 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,43 +1,91 @@
name: Test

on: [push, pull_request]
on: [push, pull_request, workflow_dispatch]

env:
XECJK_PKGS: fontspec xecjk ulem xetex
CTEX_PKGS: cjk ctex everysel zhnumber
BIBLATEX_PKGS: biber biblatex biblatex-apa biblatex-gb7714-2015 biblatex-mla xstring
HYPERREF_PKGS: pdflscape
NOMENCL_PKGS: nomencl koma-script xkeyval
BIN_PKGS: latexmk l3build
REQUIRED_PKGS: >-
scheme-basic bibunits bigfoot caption enumitem
environ etoolbox filehook footmisc notoccite pdfpages threeparttable
titlesec trimspaces unicode-math lt3luabridge cell
FONT_PKGS: fandol tex-gyre xits
EXTRA_PKGS: algorithms apacite booktabs ntheorem siunitx
MARKDOWN_PKGS: markdown fancyvrb csvsimple gobble
DOC_PKGS: hologo hypdoc listings xcolor
EXAMPLE_PLGS: float fp metalogo multirow mwe


jobs:

test:
build:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip')"
container: ghcr.io/tuna/thuthesis-test-env
steps:
- uses: actions/checkout@v3
- name: Test thesis
run: make thesis
- name: Test spine
run: make spine
- name: Test doc
run: make doc
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install TeX Live
uses: teatimeguest/setup-texlive-action@v3
with:
packages: >-
${{ env.XECJK_PKGS }} ${{ env.CTEX_PKGS }} ${{ env.BIBLATEX_PKGS }}
${{ env.HYPERREF_PKGS }} ${{ env.NOMENCL_PKGS }} ${{ env.BIN_PKGS }}
${{ env.REQUIRED_PKGS }} ${{ env.FONT_PKGS }} ${{ env.EXTRA_PKGS }}
${{ env.MARKDOWN_PKGS }} ${{ env.DOC_PKGS }} ${{ env.EXAMPLE_PLGS }}
update-all-packages: true
- name: Build documentation and example
run: make all-dev
- name: Upload build results
uses: actions/upload-artifact@v4
with:
name: build-result
path: |
thuthesis.pdf
thuthesis-example.pdf
- name: Build release zip
run: |
version=$(git describe --tags)
echo "Current git revision: $version"
python3 utils/create_release.py --version $version
- name: Build CTAN release zip with l3build
run: l3build ctan --config utils/build-ctan
- name: Upload release zip
uses: actions/upload-artifact@v4
with:
name: thuthesis-snapshot-release
path: |
thuthesis-ctan.zip
dist/thuthesis-*.zip

test:
if: "!contains(github.event.head_commit.message, 'ci skip')"
strategy:
matrix:
os: [ubuntu-latest, macos-14, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- name: Install TeX Live
uses: teatimeguest/setup-texlive-action@v3
with:
packages: >-
${{ env.XECJK_PKGS }} ${{ env.CTEX_PKGS }} ${{ env.BIBLATEX_PKGS }}
${{ env.HYPERREF_PKGS }} ${{ env.NOMENCL_PKGS }} ${{ env.BIN_PKGS }}
${{ env.REQUIRED_PKGS }} ${{ env.FONT_PKGS }} ${{ env.EXTRA_PKGS }}
${{ env.MARKDOWN_PKGS }} ${{ env.DOC_PKGS }} ${{ env.EXAMPLE_PLGS }}
update-all-packages: true
- name: Test with l3build
run: make test
- name: Upload test results if failed
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: test-result
path: build/test/


build_release:
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/v') || contains(github.event.head_commit.message, '[zip]')"
container: ghcr.io/tuna/thuthesis-test-env
steps:
- uses: actions/checkout@v3
- name: Install required packages
run: bash .github/workflows/install-packages.sh
- name: Build release zip with l3build
run: l3build ctan --config build-ctan
- name: Upload release zip
uses: actions/upload-artifact@v3
with:
name: thuthesis-ctan
path: thuthesis-ctan.zip
name: test-result-${{ matrix.os }}
path: |
build/test
build/test-testfiles
8 changes: 0 additions & 8 deletions .github/workflows/texlive.profile

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -296,3 +296,6 @@ TSWLatexianTemp*
*.sta

yarn.lock

*.luabridge.lua

Loading
Loading