From 3afcae17b4a1a6dffbaa749a6fd0b6406c4d34a9 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 13 Oct 2019 03:01:18 +0000 Subject: CTAN sync 201910130301 --- macros/latex/contrib/cquthesis/Makefile | 8 ++-- macros/latex/contrib/cquthesis/README | 52 ----------------------- macros/latex/contrib/cquthesis/README-Chinese.md | 4 +- macros/latex/contrib/cquthesis/README.md | 52 +++++++++++++++++++++++ macros/latex/contrib/cquthesis/cquthesis.dtx | 20 ++++----- macros/latex/contrib/cquthesis/cquthesis.pdf | Bin 1035298 -> 1084846 bytes 6 files changed, 67 insertions(+), 69 deletions(-) delete mode 100644 macros/latex/contrib/cquthesis/README create mode 100644 macros/latex/contrib/cquthesis/README.md (limited to 'macros/latex/contrib/cquthesis') diff --git a/macros/latex/contrib/cquthesis/Makefile b/macros/latex/contrib/cquthesis/Makefile index 2a22bbaae7..900f583af0 100644 --- a/macros/latex/contrib/cquthesis/Makefile +++ b/macros/latex/contrib/cquthesis/Makefile @@ -50,12 +50,12 @@ thesis: $(THESISMAIN).pdf ifeq ($(METHOD),latexmk) $(PACKAGE).pdf: $(CLSFILES) - xelatex $(PACKAGE).dtx + xelatex -quiet -halt-on-error -interaction=nonstopmode $(PACKAGE).dtx makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo - xelatex $(PACKAGE).dtx - xelatex $(PACKAGE).dtx - xelatex $(PACKAGE).dtx + xelatex -quiet -halt-on-error -interaction=nonstopmode $(PACKAGE).dtx + xelatex -quiet -halt-on-error -interaction=nonstopmode $(PACKAGE).dtx + xelatex -quiet -halt-on-error -interaction=nonstopmode $(PACKAGE).dtx $(THESISMAIN).pdf: $(CLSFILES) $(METHOD) $(LATEXMKOPTS) $(THESISMAIN) diff --git a/macros/latex/contrib/cquthesis/README b/macros/latex/contrib/cquthesis/README deleted file mode 100644 index ba4f7b7451..0000000000 --- a/macros/latex/contrib/cquthesis/README +++ /dev/null @@ -1,52 +0,0 @@ -# CQUThesis v1.30 (2018/02/23) -[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](https://travis-ci.org/nanmu42/CQUThesis) -[![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://www.ctan.org/pkg/cquthesis) -[![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=Github)](https://github.com/nanmu42/CQUThesis/releases/latest) -[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.30.svg)](https://github.com/nanmu42/CQUThesis/commits/master) -[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503) - -**CQUThesis** stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed. - -![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png) - -# Deployment -## Download -Version | Link | Description ---- | --- | --- -Dev. |[Click Here](https://github.com/nanmu42/cquthesis/zipball/master) | Recommend with new features and bug fixes -Pre-release | [Github Link](https://github.com/nanmu42/CQUThesis/releases) | Accumulation of commits from Dev. -Release |[CTAN Page](https://www.ctan.org/pkg/cquthesis)| Scheduled updates for CTAN, MikTeX and TeX Live - -## Installation -Unzip all files to a new folder as your future work folder: -* Windows users may easily double-click on `makewin.bat`; -* Linux or Mac users may start the terminal: -``` -cd path/to/cquthesis -make thesis -``` -If everything goes smoothly, CQUThesis is ready for work, with typeseting example named `main.pdf` in your work folder. - -# Question, Contribution and Contact -Feel free to raise any question, and any possible contribution is highly appreciated. -* [Github Issues](https://github.com/nanmu42/CQUThesis/issues); -* Join [CQU TeX QQ Group](http://jq.qq.com/?_wv=1027&k=2HvYu95) - -Writing in English or Chinese is needed. - -# Acknowledgements -The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind: - -* [The CTeX Community](https://github.com/CTeX-org/ctex-kit) -* [XUE, Ruini](https://github.com/xueruini/thuthesis) -* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-2015) - -# About the Author -Zhennan Li (i at nanmu dot me) proudly presents this work for you. - -# License -This whole project may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in: - -http://www.latex-project.org/lppl.txt - -and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. diff --git a/macros/latex/contrib/cquthesis/README-Chinese.md b/macros/latex/contrib/cquthesis/README-Chinese.md index f9026bb757..7e03272dd1 100644 --- a/macros/latex/contrib/cquthesis/README-Chinese.md +++ b/macros/latex/contrib/cquthesis/README-Chinese.md @@ -1,8 +1,8 @@ -# 嗨,这里是CQUThesis! v1.30 (2018/02/23) +# 嗨,这里是CQUThesis! [![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](https://travis-ci.org/nanmu42/CQUThesis) [![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://www.ctan.org/pkg/cquthesis) [![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=Github)](https://github.com/nanmu42/CQUThesis/releases/latest) -[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.30.svg)](https://github.com/nanmu42/CQUThesis/commits/master) +[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.40.svg)](https://github.com/nanmu42/CQUThesis/commits/master) [![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503) CQUThesis表示的是**C**hong**Q**ing **U**niversity **Thesis**. diff --git a/macros/latex/contrib/cquthesis/README.md b/macros/latex/contrib/cquthesis/README.md new file mode 100644 index 0000000000..bfa0213a6a --- /dev/null +++ b/macros/latex/contrib/cquthesis/README.md @@ -0,0 +1,52 @@ +# About CQUThesis +[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](https://travis-ci.org/nanmu42/CQUThesis) +[![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://www.ctan.org/pkg/cquthesis) +[![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=Github)](https://github.com/nanmu42/CQUThesis/releases/latest) +[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.40.svg)](https://github.com/nanmu42/CQUThesis/commits/master) +[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503) + +**CQUThesis** stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed. + +![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png) + +# Deployment +## Download +Version | Link | Description +--- | --- | --- +Dev. |[Click Here](https://github.com/nanmu42/cquthesis/zipball/master) | Recommend with new features and bug fixes +Pre-release | [Github Link](https://github.com/nanmu42/CQUThesis/releases) | Accumulation of commits from Dev. +Release |[CTAN Page](https://www.ctan.org/pkg/cquthesis)| Scheduled updates for CTAN, MikTeX and TeX Live + +## Installation +Unzip all files to a new folder as your future work folder: +* Windows users may easily double-click on `makewin.bat`; +* Linux or Mac users may start the terminal: +``` +cd path/to/cquthesis +make thesis +``` +If everything goes smoothly, CQUThesis is ready for work, with typeseting example named `main.pdf` in your work folder. + +# Question, Contribution and Contact +Feel free to raise any question, and any possible contribution is highly appreciated. +* [Github Issues](https://github.com/nanmu42/CQUThesis/issues); +* Join [CQU TeX QQ Group](http://jq.qq.com/?_wv=1027&k=2HvYu95) + +Writing in English or Chinese is needed. + +# Acknowledgements +The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind: + +* [The CTeX Community](https://github.com/CTeX-org/ctex-kit) +* [XUE, Ruini](https://github.com/xueruini/thuthesis) +* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-2015) + +# About the Author +Zhennan Li (i at nanmu dot me) proudly presents this work for you. + +# License +This whole project may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in: + +http://www.latex-project.org/lppl.txt + +and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. diff --git a/macros/latex/contrib/cquthesis/cquthesis.dtx b/macros/latex/contrib/cquthesis/cquthesis.dtx index 7750fb6ca3..60df9b710d 100644 --- a/macros/latex/contrib/cquthesis/cquthesis.dtx +++ b/macros/latex/contrib/cquthesis/cquthesis.dtx @@ -16,7 +16,7 @@ % % \iffalse %<*driver> -\ProvidesFile{cquthesis.dtx}[2018/02/23 v1.30 Chongqing University Thesis Template] +\ProvidesFile{cquthesis.dtx}[2019/10/12 v1.40 Chongqing University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -30,7 +30,7 @@ % % \fi % -% \CheckSum{1893} +% \CheckSum{1891} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -89,7 +89,8 @@ % \changes{v1.20}{2017/05/30}{调整了几个可选项的默认值,现在,openright默认开启。} % \changes{v1.20}{2017/05/30}{新功能:盲审模式,由开关blindtrail和\cs{secretize}宏以及\env{secretizeEnv}环境构成。} % \changes{v1.20}{2017/05/30}{再次改进了\file{makewin.bat},现在,Windows用户以管理员身份运行\file{makewin.bat}时不再会遭遇路径错误了。此外,\file{makewin.bat}有中英文两个版本了。} -% \changes{v1.30}{2017/05/30}{从\href{https://github.com/zepinglee/gbt7714-bibtex-style}{上游供应商zepinglee/gbt7714-bibtex-style}更新了\file{cqunumerical.bst}。} +% \changes{v1.30}{2018/02/23}{从\href{https://github.com/zepinglee/gbt7714-bibtex-style}{上游供应商zepinglee/gbt7714-bibtex-style}更新了\file{cqunumerical.bst}。} +% \changes{v1.40}{2019/10/12}{修复了\href{https://github.com/nanmu42/CQUThesis/issues/44}{Issue 44}。} % % % \def\indexname{代码索引} @@ -777,7 +778,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesClass{cquthesis} %\ProvidesFile{cquthesis.cfg} -%[2018/02/23 v1.30 Chongqing University Thesis Template] +%[2019/10/12 v1.40 Chongqing University Thesis Template] % \end{macrocode} % 定义一些开发常量: % \begin{macrocode} @@ -960,7 +961,6 @@ % 一些字体相关的宏包: % \begin{macrocode} \RequirePackage[defaultsups]{newtxtext} -\RequirePackage{newtxmath} \RequirePackage{pifont} \RequirePackage{CJKfntef} % \end{macrocode} @@ -1388,7 +1388,7 @@ % 定理环境中文定义在.cfg中完成 % \begin{macrocode} %<*cfg> -\theoremsymbol{\ensuremath{\square}} +\theoremsymbol{\ensuremath{\ding{110}}} \newtheorem*{proof}{证明} \theoremstyle{plain} \theoremsymbol{} @@ -1437,9 +1437,9 @@ % \begin{macrocode} %<*cfg> \sisetup{% - list-final-separator = {和}, - list-pair-separator = {和}, - range-phrase = {$ \sim $}, + list-final-separator = { 和 }, + list-pair-separator = { 和 }, + range-phrase = {~}, }%\sisetup % \end{macrocode} % @@ -2390,8 +2390,6 @@ \RequirePackage[bottom,perpage,hang,]{footmisc} \RequirePackage{hypdoc} \RequirePackage[UTF8,scheme=chinese]{ctex} -\RequirePackage{newpxtext} -\RequirePackage{newpxmath} \RequirePackage[ top=2.5cm, bottom=2.5cm, left=4cm, right=2cm, diff --git a/macros/latex/contrib/cquthesis/cquthesis.pdf b/macros/latex/contrib/cquthesis/cquthesis.pdf index 2847fb3c37..515c3cb05a 100644 Binary files a/macros/latex/contrib/cquthesis/cquthesis.pdf and b/macros/latex/contrib/cquthesis/cquthesis.pdf differ -- cgit v1.2.3