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

合并 dev 到 master, 发布 0.10 #265

Merged
merged 28 commits into from
Jan 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5f59859
font: Add fandol as default option
gaocegege Jan 27, 2017
0206271
Fix a type: 邱乐徳 -> 邱乐德。
weijianwen Jan 28, 2017
8ede6b0
Replace ccaption with caption+bicaption.
weijianwen Feb 19, 2017
c0a3a65
sjtuthesis.cls: reset algorithm counter
gaocegege May 18, 2017
73b6c31
thesis.tex: Fix ad-hoc code
gaocegege May 18, 2017
0dd0947
Add TeXLive 2017 into supporting distros.
weijianwen Jun 11, 2017
2e49200
Fix the typesetting of captions.
AlexaraWu Dec 6, 2017
693589f
Add Travis CI support. (#222)
AlexaraWu Jan 5, 2018
e858dd0
Fix an issue related to package dcolumn. (#219)
AlexaraWu Jan 5, 2018
7ff5ca8
Fix macro commands in PDF bookmarks. (#220)
AlexaraWu Jan 5, 2018
f6c6c49
New font settings. (#218)
AlexaraWu Jan 5, 2018
634ca9e
docs: 更新链接到 SJTUG (#239)
gaocegege Jan 5, 2018
0a2cbdb
bachelor: 添加学士学位论文标题页支持 (#242)
AlexaraWu Jan 5, 2018
dc34c03
Use CTeX default fontset. (#221)
AlexaraWu Jan 6, 2018
7edb3cd
更新 Windows 编译脚本 (#246)
AlexaraWu Jan 6, 2018
5d49490
README: Add badge (#249)
gaocegege Jan 7, 2018
06ab64b
添加英文模板支持 (#214)
AlexaraWu Jan 8, 2018
46967ad
[enhancement] 完善 .gitignore 文件 (#251)
gaocegege Jan 8, 2018
e90299e
[enhancement] 添加 .gitattributes (#252)
gaocegege Jan 8, 2018
7254dc4
[feature] 使用 subcaption 宏包替换 subfigure 宏包 (#250)
AlexaraWu Jan 8, 2018
ff2fd82
Several little fixes before v0.10. (#254)
AlexaraWu Jan 8, 2018
4a80123
[enhancement] 添加 GitHub 问题模板 (#253)
gaocegege Jan 8, 2018
4fb61cc
[enhancement] 去掉多余的 badge (#255)
gaocegege Jan 8, 2018
b27d134
[enhancement] 修改表格脚注的字号 (#258)
AlexaraWu Jan 8, 2018
9dc693e
[enhancement] [docs] 更新后续计划 (#260)
gaocegege Jan 8, 2018
b027811
[enhancement] 恢复非上标的引用命令为 \parencite{} (#261)
AlexaraWu Jan 8, 2018
ab82f29
[docs] 更新文档, 准备更新版本 (#264)
gaocegege Jan 8, 2018
a1e8e5e
[docs] 添加致谢信息 (#262)
gaocegege Jan 9, 2018
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
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Auto detect text files and perform LF normalization
* text=auto

# except .bat
*.bat eol=crlf

# Ignore binary or vendored files
*.pl linguist-vendored
14 changes: 14 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!-- 如果你是在使用过程中遇到了技术问题, 请按照下面的模板提交 issue -->
<!-- 如果你是想请求新的功能, 请无视下面的模板 -->

**问题描述**:


**系统信息**:

- OS版本(带版本号): macOS/Windows/Linux
- TeX 发行版(带版本号): TeX Live/MiKTeX/MacTeX

**日志信息**:

<!-- 请在 https://pastebin.ubuntu.com/ 中的 Content 处粘贴上 `thesis.log` 内全部内容, 并将生成的链接附在此处, 如 https://pastebin.ubuntu.com/26345571/ -->
256 changes: 241 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,248 @@
*.bcf
*.xml
thesis.pdf
README.pdf
*.bak
*.fls
# See https://github.com/github/gitignore/blob/master/TeX.gitignore
## Core latex/pdflatex auxiliary files:
*.aux
*.lof
*.log
*.lot
*.loa
*.fls
*.out
*.toc
*.blg
*.bbl
*.lof
*.swp
*.swo
*.fmt
*.fot
*.cb
*.cb2

## Intermediate documents:
*.dvi
*.xdv
*~
*-converted-to.*
# these rules might exclude image files for figures etc.
# *.ps
# *.eps
# *.pdf

## Generated if empty string is given at "Please type another file name for output:"
.pdf

## Bibliography auxiliary files (bibtex/biblatex/biber):
*.bbl
*.bcf
*.blg
*-blx.aux
*-blx.bib
*.run.xml

## Build tool auxiliary files:
*.fdb_latexmk
*.zip
*.gz
*.synctex
*.synctex(busy)
*.synctex.gz
*.synctex.gz(busy)
*.pdfsync

## Auxiliary and intermediate files from other packages:
# algorithms
*.alg
*.loa

# achemso
acs-*.bib

# amsthm
*.thm

# beamer
*.nav
*.pre
*.snm
*.vrb

# changes
*.soc

# cprotect
*.cpt

# elsarticle (documentclass of Elsevier journals)
*.spl

# endnotes
*.ent

# fixme
*.lox

# feynmf/feynmp
*.mf
*.mp
*.t[1-9]
*.t[1-9][0-9]
*.tfm

#(r)(e)ledmac/(r)(e)ledpar
*.end
*.?end
*.[1-9]
*.[1-9][0-9]
*.[1-9][0-9][0-9]
*.[1-9]R
*.[1-9][0-9]R
*.[1-9][0-9][0-9]R
*.eledsec[1-9]
*.eledsec[1-9]R
*.eledsec[1-9][0-9]
*.eledsec[1-9][0-9]R
*.eledsec[1-9][0-9][0-9]
*.eledsec[1-9][0-9][0-9]R

# glossaries
*.acn
*.acr
*.glg
*.glo
*.gls
*.glsdefs

# gnuplottex
*-gnuplottex-*

# gregoriotex
*.gaux
*.gtex

# hyperref
*.brf

# knitr
*-concordance.tex
# TODO Comment the next line if you want to keep your tikz graphics files
*.tikz
*-tikzDictionary

# listings
*.lol

# makeidx
*.idx
*.ilg
*.ind
*.ist

# minitoc
*.maf
*.mlf
*.mlt
*.mtc[0-9]*
*.slf[0-9]*
*.slt[0-9]*
*.stc[0-9]*

# minted
_minted*
*.pyg

# morewrites
*.mw

# nomencl
*.nlo

# pax
*.pax

# pdfpcnotes
*.pdfpc

# sagetex
*.sagetex.sage
*.sagetex.py
*.sagetex.scmd

# scrwfile
*.wrt

# sympy
*.sout
*.sympy
sympy-plots-for-*.tex/

# pdfcomment
*.upa
*.upb

# pythontex
*.pytxcode
pythontex-files-*/

# thmtools
*.loe

# TikZ & PGF
*.dpth
*.md5
*.auxlock

# todonotes
*.tdo

# easy-todo
*.lod

# xindy
*.xdy

# xypic precompiled matrices
*.xyc

# endfloat
*.ttt
*.fff

# Latexian
TSWLatexianTemp*

## Editors:
# WinEdt
*.bak
*.sav

# Texpad
.texpadtmp

# Kile
*.backup

# KBibTeX
*~[0-9]*

# auto folder when using emacs and auctex
./auto/*
*.el

# expex forward references with \gathertags
*-tags.tex

# standalone packages
*.sta

# See https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
# macOS General
.DS_Store
.AppleDouble
.LSOverride

# Thumbnails
._*

# See https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Folder config file
[Dd]esktop.ini

# Project specific
thesis.pdf
README.pdf
1 change: 1 addition & 0 deletions .latexmkrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$clean_ext = 'bbl loa run.xml xdv';
41 changes: 41 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
os:
- linux

sudo: required

install:
- REMOTE="http://mirror.ctan.org/systems/texlive/tlnet"
- INSTALL="/tmp/install-texlive"
- mkdir -p $INSTALL
- curl -sSL $REMOTE/install-tl-unx.tar.gz | tar -xzv -C $INSTALL --strip-components=1

- echo "selected_scheme scheme-basic" >> $INSTALL/tl.profile
- echo "collection-basic 1" >> $INSTALL/tl.profile
- echo "collection-bibtexextra 1" >> $INSTALL/tl.profile
- echo "collection-fontsextra 1" >> $INSTALL/tl.profile
- echo "collection-fontsrecommended 1" >> $INSTALL/tl.profile
- echo "collection-langchinese 1" >> $INSTALL/tl.profile
- echo "collection-latex 1" >> $INSTALL/tl.profile
- echo "collection-latexextra 1" >> $INSTALL/tl.profile
- echo "collection-latexrecommended 1" >> $INSTALL/tl.profile
- echo "collection-mathscience 1" >> $INSTALL/tl.profile
- echo "collection-xetex 1" >> $INSTALL/tl.profile
- echo "tlpdbopt_autobackup 0" >> $INSTALL/tl.profile
- echo "tlpdbopt_install_docfiles 0" >> $INSTALL/tl.profile
- echo "tlpdbopt_install_srcfiles 0" >> $INSTALL/tl.profile

- sudo $INSTALL/install-tl -profile $INSTALL/tl.profile

- VERSION=$($INSTALL/install-tl --version | grep 'version' | grep -o '[0-9]\{4\}')
- PLATFORM=$($INSTALL/install-tl --print-platform)
- TEXBIN="/usr/local/texlive/${VERSION}/bin/${PLATFORM}"
- export "PATH=$TEXBIN:$PATH"

- sudo $TEXBIN/tlmgr install latexmk ulem

before_script:
- sed -i 's/,\s*fontset=\?\w*//' thesis.tex
- sed -i '/setmainfont/d' sjtuthesis.cls

script:
- make validate
14 changes: 9 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LATEXMK_OPT_PVC = $(LATEXMK_OPT_BASE) -pvc

all: $(THESIS).pdf

.PHONY : all clean pvc view wordcount git zip
.PHONY : all cleanall pvc view wordcount git zip

$(THESIS).pdf : $(THESIS).tex $(TEX_DIR)/*.tex $(BIB_DIR)/*.bib sjtuthesis.cls sjtuthesis.cfg Makefile
-latexmk $(LATEXMK_OPT) $(THESIS)
Expand All @@ -26,13 +26,17 @@ view : $(THESIS).pdf
open $<

wordcount:
@perl texcount.pl $(THESIS).tex -inc | awk '/total/ {getline; print "词数 :",$$4}'
@perl texcount.pl $(THESIS).tex -inc -char | awk '/total/ {getline; print "字符数 :",$$4}'
@perl texcount.pl $(THESIS).tex -inc | awk '/total/ {getline; print "词数  :",$$4}'
@perl texcount.pl $(THESIS).tex -inc -char | awk '/total/ {getline; print "字符数 :",$$4}'
@perl texcount.pl $(THESIS).tex -inc -ch-only | awk '/total/ {getline; print "中文字数:",$$4}'

clean :
latexmk -C
-@rm -f *.xdv *.bbl *.fls $(TEX_DIR)/*.xdv $(TEX_DIR)/*.aux $(TEX_DIR)/*.log $(TEX_DIR)/*.fls _tmp_.pdf *.xml 2> /dev/null || true
-@latexmk -c -silent 2> /dev/null
-@rm -f $(TEX_DIR)/*.aux 2> /dev/null || true

cleanall :
-@latexmk -C -silent 2> /dev/null
-@rm -f $(TEX_DIR)/*.aux 2> /dev/null || true

s3 : $(THESIS).pdf
s3cmd put $< s3://sjtuthesis/README.pdf
Expand Down
Loading