texlive[46863] Master/texmf-dist: cquthesis (6mar18)
commits+karl at tug.org
commits+karl at tug.org
Tue Mar 6 23:52:46 CET 2018
Revision: 46863
http://tug.org/svn/texlive?view=revision&revision=46863
Author: karl
Date: 2018-03-06 23:52:46 +0100 (Tue, 06 Mar 2018)
Log Message:
-----------
cquthesis (6mar18)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bst/cquthesis/cqunumerical.bst
trunk/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md
trunk/Master/texmf-dist/doc/latex/cquthesis/Makefile
trunk/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md
trunk/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex
trunk/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf
trunk/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty
trunk/Master/texmf-dist/doc/latex/cquthesis/ref/refs.bib
trunk/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx
trunk/Master/texmf-dist/source/latex/cquthesis/makewin.bat
trunk/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
trunk/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/cquthesis/README
trunk/Master/texmf-dist/doc/latex/cquthesis/figures/README
trunk/Master/texmf-dist/source/latex/cquthesis/makewin-en.bat
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/cquthesis/README.md
trunk/Master/texmf-dist/source/latex/cquthesis/makewin-English.bat
Modified: trunk/Master/texmf-dist/bibtex/bst/cquthesis/cqunumerical.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/cquthesis/cqunumerical.bst 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/bibtex/bst/cquthesis/cqunumerical.bst 2018-03-06 22:52:46 UTC (rev 46863)
@@ -1,54 +1,40 @@
%%
-%% This is file `cqunumerical.bst',
+%% This is file `gbt7714-unsrt.bst',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
-%% cquthesis.dtx (with options: `bst')
+%% gbt7714.dtx (with options: `numerical')
%%
-%% This is a generated file.
+%% Copyright (C) 2016-2018 by Zeping Lee <zepinglee AT gmail.com>
%%
-%% Copyright (C) 2016-2016 by Zhennan Li <i at nanmu.me>
%% This file 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 1.2 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
+%% 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.
+%% and version 1.2 or later is part of all distributions of
+%% LaTeX version 1999/12/01 or later.
%%
-%% This is the .bst file of the cquthesis package with LaTeX2e.
+%% This BibTeX style file is derived from `plainnat.bst' by Patrick W Daly,
+%% which was designed for use with the `natbib.sty' package.
%%
-%% This file contains code from USTC TeX User Group:
-%%
-%% https://github.com/ustctug/gbt-7714-20155
-%%
-%% The author would like to acknowledge the contributors for their efforts and, essentially, beautiful mind.
-%%
ENTRY
{ address
author
booktitle
- chapter
- citedate
+ date
doi
- eid
edition
editor
- editdate
- howpublished
institution
- isbn
- issn
journal
key
language
mark
- media
- month
- note
+ medium
number
organization
pages
@@ -57,27 +43,31 @@
series
title
translator
- type
url
+ urldate
volume
year
}
- { lang }
- { label extra.label sort.label short.list }
+ { entry.lang }
+ { label extra.label sort.label short.list entry.mark }
-INTEGERS { output.state before.all mid.sentence after.sentence after.block }
-INTEGERS { lang.zh lang.ja lang.en lang.ru lang.default }
+INTEGERS { output.state before.all mid.sentence after.sentence after.block after.slash }
+INTEGERS { lang.zh lang.ja lang.en lang.ru lang.other }
+
+INTEGERS { charptr stringlength }
+
FUNCTION {init.state.consts}
{ #0 'before.all :=
#1 'mid.sentence :=
#2 'after.sentence :=
#3 'after.block :=
- #4 'lang.zh :=
- #5 'lang.ja :=
+ #4 'after.slash :=
+ #3 'lang.zh :=
+ #4 'lang.ja :=
#1 'lang.en :=
- #3 'lang.ru :=
- #0 'lang.default :=
+ #2 'lang.ru :=
+ #0 'lang.other :=
}
STRINGS { s t }
@@ -98,6 +88,18 @@
top$
}
+FUNCTION {punct.colon}
+{ ": "
+}
+
+FUNCTION {punct.slash}
+{ "//\allowbreak{}"
+}
+
+FUNCTION {punct.space}
+{ " "
+}
+
FUNCTION {output.nonnull}
{ 's :=
output.state mid.sentence =
@@ -109,7 +111,11 @@
}
{ output.state before.all =
'write$
- { add.period$ " " * write$ }
+ { output.state after.slash =
+ { punct.slash * write$ }
+ { add.period$ " " * write$ }
+ if$
+ }
if$
}
if$
@@ -134,13 +140,17 @@
output.state mid.sentence =
{ t * write$ }
{ output.state after.block =
- { t * write$
+ { add.period$ write$
newline$
"\newblock " write$
}
{ output.state before.all =
'write$
- { t * write$ }
+ { output.state after.slash =
+ { punct.slash * write$ }
+ { add.period$ " " * write$ }
+ if$
+ }
if$
}
if$
@@ -152,18 +162,6 @@
if$
}
-FUNCTION {punct.colon}
-{ ": "
-}
-
-FUNCTION {punct.slash}
-{ "//"
-}
-
-FUNCTION {punct.space}
-{ " "
-}
-
FUNCTION {output.check}
{ 't :=
duplicate$ empty$
@@ -181,7 +179,11 @@
FUNCTION {new.block}
{ output.state before.all =
'skip$
- { after.block 'output.state := }
+ { output.state after.slash =
+ 'skip$
+ { after.block 'output.state := }
+ if$
+ }
if$
}
@@ -190,12 +192,23 @@
'skip$
{ output.state before.all =
'skip$
- { after.sentence 'output.state := }
+ { output.state after.slash =
+ 'skip$
+ { after.sentence 'output.state := }
+ if$
+ }
if$
}
if$
}
+FUNCTION {new.slash}
+{ output.state before.all =
+ 'skip$
+ { after.slash 'output.state := }
+ if$
+}
+
FUNCTION {not}
{ { #0 }
{ #1 }
@@ -260,8 +273,63 @@
if$
}
+INTEGERS { ascii }
+
+FUNCTION {get.char.lang}
+{ chr.to.int$ 'ascii :=
+ ascii #64 > ascii #91 < and ascii #96 > ascii #123 < and or
+ { lang.en }
+ { ascii #227 > ascii #234 < and
+ { lang.zh }
+ { ascii #227 =
+ { lang.ja }
+ { ascii #207 > ascii #212 < and
+ { lang.ru }
+ { lang.en }
+ if$
+ }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+INTEGERS { char.lang tmp.lang }
+
+STRINGS { tmp.str }
+
+FUNCTION {get.str.lang}
+{ 'tmp.str :=
+ lang.other 'tmp.lang :=
+ tmp.str empty$
+ { "Empty string!" warning$ }
+ { #1 'charptr :=
+ tmp.str text.length$ #1 + 'stringlength :=
+ { charptr stringlength < }
+ { tmp.str charptr #1 substring$ get.char.lang 'char.lang :=
+ char.lang tmp.lang >
+ { char.lang 'tmp.lang := }
+ 'skip$
+ if$
+
+ char.lang lang.zh = char.lang lang.ja = or
+ { charptr #3 + 'charptr := }
+ { char.lang lang.ru =
+ { charptr #2 + 'charptr := }
+ { charptr #1 + 'charptr := }
+ if$
+ }
+ if$
+ }
+ while$
+ }
+ if$
+ tmp.lang
+}
+
FUNCTION {is.in.chinese}
-{ lang lang.zh =
+{ entry.lang lang.zh =
}
FUNCTION {format.et.al}
@@ -273,12 +341,12 @@
FUNCTION {format.anonymous}
{ is.in.chinese
- { "佚名"}
- { "Anon, " year * }
+ { "佚名" }
+ { "Anon" }
if$
}
-INTEGERS { nameptr namesleft numnames }
+INTEGERS { nameptr namesleft numnames name.lang}
FUNCTION {format.names}
{ 's :=
@@ -286,7 +354,15 @@
s num.names$ 'numnames :=
numnames 'namesleft :=
{ namesleft #0 > nameptr #4 < and }
- { s nameptr "{vv~}{ll}{ f{ }}{, jj}" format.name$ 't :=
+ { s nameptr "{vv~}{ll}{, jj}{, ff}" format.name$ 't :=
+ t get.str.lang 'name.lang :=
+ name.lang lang.en =
+ { t #1 "{vv~}{ll}{ f{~}}" format.name$ "u" change.case$
+ t #1 "{, jj}" format.name$ *
+ 't :=
+ }
+ { t #1 "{ll}{ff}" format.name$ 't := }
+ if$
nameptr #1 >
{ namesleft #1 >
{ ", " * t * }
@@ -326,8 +402,7 @@
FUNCTION {format.editors}
{ editor empty$
{ "" }
- { editor format.names
- }
+ { editor format.names }
if$
}
@@ -336,7 +411,11 @@
{ "" }
{ translator format.names
is.in.chinese
- { ",译" * }
+ { translator num.names$ #3 >
+ { "译" * }
+ { ", 译" * }
+ if$
+ }
'skip$
if$
}
@@ -343,24 +422,26 @@
if$
}
-FUNCTION {format.isbn}
-{ isbn empty$
+FUNCTION {format.url}
+{ url empty$
{ "" }
- { new.block "ISBN " isbn * }
+ { new.block "\url{" url * "}" * }
if$
}
-FUNCTION {format.issn}
-{ issn empty$
- { "" }
- { new.block "ISSN " issn * }
- if$
-}
-
-FUNCTION {format.url}
+FUNCTION {is.doi.in.url}
{ url empty$
- { "" }
- { new.block "\url{" url * "}" * }
+ { #0 }
+ { doi text.length$ 'stringlength :=
+ url text.length$ 'charptr :=
+ { url charptr stringlength substring$ doi = not
+ charptr #0 >
+ and
+ }
+ { charptr #1 - 'charptr := }
+ while$
+ charptr
+ }
if$
}
@@ -367,7 +448,11 @@
FUNCTION {format.doi}
{ doi empty$
{ "" }
- { new.block "\doi{" doi * "}" * }
+ { is.doi.in.url
+ { "" }
+ { new.block "\doi{" doi * "}" * }
+ if$
+ }
if$
}
@@ -378,23 +463,28 @@
if$
}
-FUNCTION {format.mark}
-{ mark empty$
- 'skip$
- { pop$ mark }
- if$
- "[" swap$ *
- media empty$
- { url empty$
- 'skip$
- { "" * }
+FUNCTION {set.mark}
+{ entry.mark empty$ not
+ 'pop$
+ { mark empty$ not
+ { pop$ mark 'entry.mark := }
+ { 'entry.mark := }
if$
+ medium empty$ not
+ { entry.mark "/" * medium * 'entry.mark := }
+ { url empty$ not
+ { entry.mark "/OL" * 'entry.mark := }
+ 'skip$
+ if$
+ }
+ if$
}
- { "/" * media * }
if$
- "]" *
}
+FUNCTION {format.mark}
+{ "\allowbreak[" entry.mark * "]" * }
+
FUNCTION {format.full.names}
{'s :=
#1 'nameptr :=
@@ -401,8 +491,12 @@
s num.names$ 'numnames :=
numnames 'namesleft :=
{ namesleft #0 > }
- { s nameptr
- "{vv~}{ll}" format.name$ 't :=
+ { s nameptr "{vv~}{ll}{, jj}{, ff}" format.name$ 't :=
+ t get.str.lang 'name.lang :=
+ name.lang lang.en =
+ { t #1 "{vv~}{ll}" format.name$ 't := }
+ { t #1 "{ll}{ff}" format.name$ 't := }
+ if$
nameptr #1 >
{
namesleft #1 >
@@ -457,7 +551,9 @@
type$ "inbook" =
or
'author.editor.full
- { type$ "proceedings" =
+ { type$ "collection" =
+ type$ "proceedings" =
+ or
'editor.full
'author.full
if$
@@ -506,35 +602,104 @@
while$
}
-FUNCTION {format.date}
-{ year duplicate$ empty$
- { "empty year in " cite$ * warning$
- pop$ "" }
- 'skip$
+FUNCTION {extract.before.dash}
+{ duplicate$ empty$
+ { pop$ "" }
+ { 's :=
+ #1 'charptr :=
+ s text.length$ #1 + 'stringlength :=
+ { charptr stringlength <
+ s charptr #1 substring$ "-" = not
+ and
+ }
+ { charptr #1 + 'charptr := }
+ while$
+ s #1 charptr #1 - substring$
+ }
if$
- month empty$
- 'skip$
- { month
- " " * swap$ *
+}
+
+FUNCTION {extract.after.dash}
+{ duplicate$ empty$
+ { pop$ "" }
+ { 's :=
+ #1 'charptr :=
+ s text.length$ #1 + 'stringlength :=
+ { charptr stringlength <
+ s charptr #1 substring$ "-" = not
+ and
+ }
+ { charptr #1 + 'charptr := }
+ while$
+ { charptr stringlength <
+ s charptr #1 substring$ "-" =
+ and
+ }
+ { charptr #1 + 'charptr := }
+ while$
+ s charptr global.max$ substring$
}
if$
+}
+
+FUNCTION {contains.dash}
+{ duplicate$ empty$
+ { pop$ #0 }
+ { 's :=
+ { s empty$ not
+ s #1 #1 substring$ "-" = not
+ and
+ }
+ { s #2 global.max$ substring$ 's := }
+ while$
+ s empty$ not
+ }
+ if$
+}
+
+FUNCTION {format.year}
+{ year empty$ not
+ { year extract.before.dash }
+ { date empty$ not
+ { date extract.before.dash }
+ { "empty year in " cite$ * warning$
+ ""
+ }
+ if$
+ }
+ if$
extra.label *
}
+FUNCTION {format.date}
+{ type$ "patent" = type$ "newspaper" = or
+ date empty$ not and
+ { date }
+ { year }
+ if$
+}
+
FUNCTION {format.editdate}
-{ editdate empty$
+{ date empty$ not
+ type$ "newspaper" = not and
+ url empty$ not doi empty$ not or
+ and
+ { "\allowbreak(" date * ")" * }
{ "" }
- { "(" citedate * ")" * }
if$
}
-FUNCTION {format.citedate}
-{ citedate empty$
+FUNCTION {format.urldate}
+{ urldate empty$ not
+ { "\allowbreak[" urldate * "]" * }
{ "" }
- { "[" citedate * "]" * }
if$
}
+FUNCTION {format.btitle}
+{ title emphasize
+}
+
FUNCTION {tie.or.space.connect}
{ duplicate$ text.length$ #3 <
{ "~" }
@@ -566,8 +731,6 @@
if$
}
-INTEGERS { charptr stringlength }
-
FUNCTION {is.number}
{ 's :=
s empty$
@@ -584,7 +747,7 @@
if$
}
-FUNCTION {format.bvolume}
+FUNCTION {format.volume}
{ volume empty$
{ "" }
{ volume is.number
@@ -604,7 +767,7 @@
{ "" }
{ number is.number
{ is.in.chinese
- { "第" volume * "册" * }
+ { "第" number * "册" * }
{ "number" number tie.or.space.connect }
if$
}
@@ -614,56 +777,49 @@
if$
}
-FUNCTION {format.number.series}
-{ volume empty$
- { number empty$
- { series field.or.null }
- { output.state mid.sentence =
- { "number" }
- { "Number" }
- if$
- number tie.or.space.connect
- series empty$
- { "there's a number but no series in " cite$ * warning$ }
- { " in " * series * }
- if$
- }
- if$
- }
- { "" }
+FUNCTION {format.volume.number}
+{ volume empty$ not
+ { format.volume }
+ { format.number }
if$
}
-FUNCTION {format.series.volume.title}
-{ series empty$
- { title
- volume empty$
+FUNCTION {format.series.vol.num.title}
+{ format.volume.number 's :=
+ series empty$ not
+ { series ": " *
+ s empty$ not
+ { s * "\quad " * }
'skip$
- { ": " * format.bvolume * }
if$
+ title *
}
- { series
- volume empty$
- { number empty$
- 'skip$
- { ": " * format.number * }
- if$ }
- { volume empty$
- 'skip$
- { ": " * format.bvolume * }
- if$
- }
+ { title
+ s empty$ not
+ { ": " * s * }
+ 'skip$
if$
- "\hspace{1em}" * title *
}
if$
+ "t" change.case$
}
-FUNCTION {format.journal}
-{ journal
- is.in.chinese
- 'skip$
- { "\ustcjournal{" swap$ * "}" * }
+FUNCTION {format.series.vol.num.booktitle}
+{ format.volume.number 's :=
+ series empty$ not
+ { series ": " *
+ s empty$ not
+ { s * "\quad " * }
+ 'skip$
+ if$
+ booktitle *
+ }
+ { booktitle
+ s empty$ not
+ { ": " * s * }
+ 'skip$
+ if$
+ }
if$
}
@@ -693,145 +849,147 @@
{ edition num.to.ordinal " ed." * }
if$
}
- { edition "t" change.case$
- edition "Revised" =
- { "Rev. ed." }
- { edition "Revised edition" =
+ { entry.lang lang.en =
+ { edition "t" change.case$ 's :=
+ s "Revised" = s "Revised edition" = or
{ "Rev. ed." }
- 'skip$
+ { s " ed." *}
if$
}
+ { edition }
if$
- }
+ }
if$
}
if$
}
+FUNCTION {format.sine.loco}
+{ is.in.chinese
+ { "[出版地不详]" }
+ { "[S.l.]" }
+ if$
+}
+
FUNCTION {format.address}
-{ address empty$
- { url empty$
- { is.in.chinese
- { "[出版地不详]" }
- { "[S.l.]" }
- if$
- }
- { "" }
- if$
- }
- { address }
+{ address }
+
+FUNCTION {format.sine.nomine}
+{ is.in.chinese
+ { "[出版地不详]" }
+ { "[s.n.]" }
if$
}
FUNCTION {format.publisher}
-{ publisher empty$
- { url empty$
- { is.in.chinese
- { "[出版者不详]" }
- { "[s.n.]" }
+{ publisher empty$ not
+ { publisher }
+ { school empty$ not
+ { school }
+ { organization empty$ not
+ { organization }
+ { institution empty$ not
+ { institution }
+ { "" }
+ if$
+ }
if$
}
- { "" }
if$
}
- { publisher }
if$
}
-INTEGERS { multiresult }
+FUNCTION {format.sine.loco.sine.nomine}
+{ is.in.chinese
+ { "[出版地不详: 出版者不详]" }
+ { "[S.l.: s.n.]" }
+ if$
+}
-FUNCTION {multi.page.check}
-{ 't :=
- #0 'multiresult :=
- { multiresult not
- t empty$ not
- and
+FUNCTION {format.address.publisher}
+{ address empty$ not
+ { address
+ format.publisher empty$ not
+ { ": " * format.publisher * }
+ { url empty$ doi empty$ and
+ { ": " * format.sine.nomine * }
+ 'skip$
+ if$
+ }
+ if$
}
- { t #1 #1 substring$
- duplicate$ "-" =
- swap$ duplicate$ "," =
- swap$ "+" =
- or or
- { #1 'multiresult := }
- { t #2 global.max$ substring$ 't := }
+ { url empty$ doi empty$ and
+ { format.publisher empty$ not
+ { format.sine.loco ": " * format.publisher * }
+ { format.sine.loco.sine.nomine }
+ if$
+ }
+ { format.publisher empty$ not
+ { format.publisher }
+ { "" }
+ if$
+ }
if$
}
- while$
- multiresult
+ if$
}
FUNCTION {format.pages}
{ pages empty$
{ "" }
- { pages }
+ { pages n.dashify }
if$
}
-FUNCTION {format.eid}
-{ eid empty$
+FUNCTION {format.journal.volume}
+{ volume }
+
+FUNCTION {format.journal.number}
+{ number empty$ not
+ { "\penalty0 (" number * ")" * }
{ "" }
- { "art." eid tie.or.space.connect }
if$
}
-FUNCTION {format.vol.num.pages}
-{ volume field.or.null
- number empty$
+FUNCTION {format.periodical.year.volume.number}
+{ year empty$ not
+ { year extract.before.dash }
+ { "No year in periodical " cite$ * warning$ }
+ if$
+ volume empty$ not
+ { ", " * volume extract.before.dash * }
'skip$
- { "\penalty0 (" number * ")" * *
- volume empty$
- { "there's a number but no volume in " cite$ * warning$ }
- 'skip$
- if$
- }
if$
- pages empty$
+ number empty$ not
+ { "\penalty0 (" * number extract.before.dash * ")" * }
'skip$
- { duplicate$ empty$
- { pop$ format.pages }
- { ":\penalty0 " * pages n.dashify * }
- if$
- }
if$
-}
-
-FUNCTION {format.vol.num.eid}
-{ volume field.or.null
- number empty$
- 'skip$
- { "\penalty0 (" number * ")" * *
- volume empty$
- { "there's a number but no volume in " cite$ * warning$ }
+ year contains.dash
+ { "--" *
+ year extract.after.dash empty$
+ volume extract.after.dash empty$ and
+ number extract.after.dash empty$ and not
+ { year extract.after.dash empty$ not
+ { year extract.after.dash * }
+ { year extract.before.dash * }
+ if$
+ volume empty$ not
+ { ", " * volume extract.after.dash * }
+ 'skip$
+ if$
+ number empty$ not
+ { "\penalty0 (" * number extract.after.dash * ")" * }
+ 'skip$
+ if$
+ }
'skip$
if$
}
- if$
- eid empty$
'skip$
- { duplicate$ empty$
- { pop$ format.eid }
- { ":\penalty0 " * eid * }
- if$
- }
if$
}
-FUNCTION {format.chapter.pages}
-{ chapter empty$
- 'format.pages
- { type empty$
- { "chapter" }
- { type "l" change.case$ }
- if$
- chapter tie.or.space.connect
- pages empty$
- 'skip$
- { ", " * format.pages * }
- if$
- }
- if$
-}
-
FUNCTION {format.in.ed.booktitle}
{ booktitle empty$
{ "" }
@@ -844,9 +1002,9 @@
}
FUNCTION {empty.misc.check}
-{ author empty$ title empty$ howpublished empty$
- month empty$ year empty$ note empty$
- and and and and and
+{ author empty$ title empty$
+ year empty$
+ and and
key empty$ not and
{ "all relevant fields are empty in " cite$ * warning$ }
'skip$
@@ -853,26 +1011,6 @@
if$
}
-FUNCTION {format.thesis.type}
-{ type empty$
- 'skip$
- { pop$
- type "t" change.case$
- }
- if$
-}
-
-FUNCTION {format.tr.number}
-{ type empty$
- { "Technical Report" }
- 'type
- if$
- number empty$
- { "t" change.case$ }
- { number tie.or.space.connect }
- if$
-}
-
FUNCTION {format.article.crossref}
{ key empty$
{ journal empty$
@@ -938,460 +1076,234 @@
" \citet{" * crossref * "}" *
}
-FUNCTION {archive}
+FUNCTION {monograph}
{ output.bibitem
- format.authors output
- author format.key output
+ author empty$ not
+ { format.authors }
+ { editor empty$ not
+ { format.editors }
+ { "" }
+ if$
+ }
+ if$
+ output
new.block
- format.series.volume.title "title" output.check
- "A" format.mark "" output.after
+ format.series.vol.num.title "title" output.check
+ "M" set.mark
+ format.mark "" output.after
new.block
format.translators output
+ new.sentence
+ format.edition output
new.block
- format.edition output
- new.sentence
- format.address output
- format.publisher punct.colon output.after
- format.date "year" output.check
+ format.address.publisher output
+ format.year "year" output.check
format.pages punct.colon output.after
- format.citedate "" output.after
+ format.urldate "" output.after
format.url output
format.doi output
fin.entry
}
-FUNCTION {article}
+FUNCTION {incollection}
{ output.bibitem
format.authors "author" output.check
author format.key output
new.block
format.title "title" output.check
- journal empty$
- { "M" format.mark "" output.after
- new.block
- format.translators output
- new.block
- format.editors punct.slash output.after
- new.block
- booktitle "booktitle" output.check
- new.block
- format.bvolume punct.colon output.after
- new.block
- format.edition output
- new.block
- format.address output
- format.publisher punct.colon output.after
- format.date "year" output.check
- format.pages punct.colon output.after
- }
- { "J" format.mark "" output.after
- new.block
- format.journal "journal" output.check
- new.block
- format.date "year" output.check
- format.vol.num.pages output
- }
- if$
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
-}
-
-FUNCTION {book}
-{ output.bibitem
- author empty$
- { format.editors "author and editor" output.check
- editor format.key output
- }
- { format.authors output.nonnull
- crossref missing$
- { "author and editor" editor either.or.check }
- 'skip$
- if$
- }
- if$
+ "M" set.mark
+ format.mark "" output.after
new.block
- format.series.volume.title "title" output.check
- "M" format.mark "" output.after
- new.block
format.translators output
+ new.slash
+ format.editors output
new.block
+ format.series.vol.num.booktitle "booktitle" output.check
+ new.block
format.edition output
- new.sentence
- format.address output
- format.publisher punct.colon output.after
- format.date "year" output.check
+ new.block
+ format.address.publisher output
+ format.year "year" output.check
format.pages punct.colon output.after
- format.citedate "" output.after
+ format.urldate "" output.after
format.url output
format.doi output
fin.entry
}
-FUNCTION {collection}
+FUNCTION {periodical}
{ output.bibitem
- author empty$
- { format.editors "author and editor" output.check
- editor format.key output
- }
- { format.authors output.nonnull
- crossref missing$
- { "author and editor" editor either.or.check }
- 'skip$
- if$
- }
- if$
+ format.authors "author" output.check
+ author format.key output
new.block
- format.series.volume.title "title" output.check
- "G" format.mark "" output.after
+ format.title "title" output.check
+ "J" set.mark
+ format.mark "" output.after
new.block
- format.translators output
+ format.periodical.year.volume.number output
new.block
- format.edition output
- new.sentence
- format.address output
- format.publisher punct.colon output.after
+ format.address.publisher output
format.date "year" output.check
- format.pages punct.colon output.after
- format.citedate "" output.after
+ format.urldate "" output.after
format.url output
format.doi output
fin.entry
}
-FUNCTION {database}
+FUNCTION {article.in.journal}
{ output.bibitem
- format.authors output
+ format.authors "author" output.check
author format.key output
new.block
- format.series.volume.title "title" output.check
- "DB" format.mark "" output.after
+ format.title "title" output.check
+ "J" set.mark
+ format.mark "" output.after
new.block
+ journal "journal" output.check
format.date "year" output.check
+ volume output
+ format.journal.number "" output.after
+ format.pages punct.colon output.after
format.editdate "" output.after
- format.citedate "" output.after
+ format.urldate "" output.after
format.url output
format.doi output
fin.entry
}
-FUNCTION {dataset}
+FUNCTION {patent}
{ output.bibitem
format.authors output
author format.key output
new.block
- format.series.volume.title "title" output.check
- "DS" format.mark "" output.after
+ format.title
+ number empty$ not
+ { punct.colon * number * }
+ 'skip$
+ if$
+ "title" output.check
+ "P" set.mark
+ format.mark "" output.after
new.block
- format.translators output
- new.block
- format.edition output
- new.sentence
- format.address output
- format.publisher punct.colon output.after
format.date "year" output.check
- format.pages punct.colon output.after
- format.editdate "" output.after
- format.citedate "" output.after
+ format.urldate "" output.after
format.url output
format.doi output
fin.entry
}
-FUNCTION {inbook} { book }
-
-FUNCTION {incollection} { book }
-
-FUNCTION {inproceedings}
+FUNCTION {online}
{ output.bibitem
- format.authors "author" output.check
+ format.authors output
author format.key output
new.block
- format.title "title" output.check
- "C" format.mark "" output.after
+ format.series.vol.num.title "title" output.check
+ "EB" set.mark
+ format.mark "" output.after
new.block
- format.translators output
- new.block
- editor empty$
- { organization }
- { format.editors }
- if$ punct.slash output.after
- new.block
- booktitle "booktitle" output.check
- new.block
- format.bvolume punct.colon output.after
- new.block
- format.edition output
- new.sentence
- format.address output
- publisher empty$
- { organization }
- { format.publisher }
- if$ punct.colon output.after
- format.date "year" output.check
+ format.address.publisher output
+ date empty$
+ { format.date output }
+ 'skip$
+ if$
format.pages punct.colon output.after
- format.citedate "" output.after
+ format.editdate "" output.after
+ format.urldate "" output.after
format.url output
format.doi output
fin.entry
}
-FUNCTION {conference} { inproceedings }
+FUNCTION {misc}
+{ journal empty$ not
+ 'article.in.journal
+ { booktitle empty$ not
+ 'incollection
+ { url empty$ not
+ 'online
+ { "Z" set.mark
+ monograph
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ empty.misc.check
+}
-FUNCTION {manual}
-{ output.bibitem
- format.authors output
- author format.key output
- new.block
- format.series.volume.title "title" output.check
- organization address new.block.checkb
- organization output
- format.address output
- format.edition output
- format.date output
- format.url output
- new.block
- note output
- fin.entry
+FUNCTION {archive}
+{ "A" set.mark
+ misc
}
-FUNCTION {map}
-{ output.bibitem
- format.authors output
- author format.key output
- new.block
- format.series.volume.title "title" output.check
- "CM" format.mark "" output.after
- new.block
- format.translators output
- new.block
- format.edition output
- new.sentence
- format.address output
- format.publisher punct.colon output.after
- format.date "year" output.check
- format.pages punct.colon output.after
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+FUNCTION {article} { misc }
+
+FUNCTION {book} { monograph }
+
+FUNCTION {collection}
+{ "G" set.mark
+ monograph
}
-FUNCTION {mastersthesis}
-{ output.bibitem
- format.authors output
- author format.key output
- new.block
- format.series.volume.title "title" output.check
- "D" format.mark ": [Master]" * "" output.after
- new.block
- format.translators output
- new.block
- format.edition output
- new.sentence
- format.address output
- school empty$
- { format.publisher }
- { school }
- if$ punct.colon output.after
- format.date "year" output.check
- format.pages punct.colon output.after
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+FUNCTION {database}
+{ "DB" set.mark
+ misc
}
-FUNCTION {misc}
-{ output.bibitem
- format.authors output
- author format.key output
- new.block
- format.series.volume.title "title" output.check
- "EB" format.mark "" output.after
- new.block
- format.translators output
- new.block
- format.edition output
- new.sentence
- format.address output
- format.publisher punct.colon output.after
- format.date "year" output.check
- format.pages punct.colon output.after
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+FUNCTION {dataset}
+{ "DS" set.mark
+ misc
}
-FUNCTION {newspaper}
-{ output.bibitem
- format.authors "author" output.check
- author format.key output
- new.block
- format.title "title" output.check
- "N" format.mark "" output.after
- new.block
- journal "journal" output.check
- new.block
- format.date "year" output.check
- format.vol.num.pages output
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+FUNCTION {inbook} { book }
+
+FUNCTION {inproceedings}
+{ "C" set.mark
+ incollection
}
-FUNCTION {patent}
-{ output.bibitem
- format.authors output
- author format.key output
- new.block
- format.title "title" output.check
- "P" format.mark "" output.after
- new.block
- format.date "year" output.check
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+FUNCTION {conference} { inproceedings }
+
+FUNCTION {map}
+{ "CM" set.mark
+ misc
}
-FUNCTION {phdthesis}
-{ output.bibitem
- format.authors output
- author format.key output
- new.block
- format.series.volume.title "title" output.check
- "D" format.mark "" * "" output.after
- %%"D" format.mark ": [PhD]" * "" output.after
- new.block
- format.translators output
- new.block
- format.edition output
- new.sentence
- format.address output
- school empty$
- { format.publisher }
- { school }
- if$ punct.colon output.after
- format.date "year" output.check
- format.pages punct.colon output.after
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+FUNCTION {mastersthesis}
+{ "D" set.mark
+ monograph
}
+FUNCTION {newspaper}
+{ "N" set.mark
+ article.in.journal
+}
+
+FUNCTION {phdthesis} { mastersthesis }
+
FUNCTION {proceedings}
-{ output.bibitem
- format.editors output
- editor format.key output
- new.block
- format.series.volume.title "title" output.check
- "C" format.mark "" output.after
- new.block
- format.translators output
- new.block
- format.edition output
- new.sentence
- format.address output
- publisher empty$
- { organization }
- { format.publisher }
- if$ punct.colon output.after
- format.date "year" output.check
- format.pages punct.colon output.after
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+{ "C" set.mark
+ monograph
}
-FUNCTION {program}
-{ output.bibitem
- format.authors output
- author format.key output
- new.block
- format.series.volume.title "title" output.check
- "CP" format.mark "" output.after
- new.block
- format.date "year" output.check
- format.editdate "" output.after
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+FUNCTION {software}
+{ "CP" set.mark
+ misc
}
FUNCTION {standard}
-{ output.bibitem
- format.authors output
- author format.key output
- new.block
- format.series.volume.title "title" output.check
- "S" format.mark "" output.after
- new.block
- format.translators output
- new.block
- format.edition output
- new.sentence
- format.address output
- format.publisher punct.colon output.after
- format.date "year" output.check
- format.pages punct.colon output.after
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+{ "S" set.mark
+ misc
}
FUNCTION {techreport}
-{ output.bibitem
- author empty$
- { institution output
- institution format.key output
- }
- { format.authors output
- author format.key output
- }
- if$
- new.block
- format.series.volume.title "title" output.check
- "R" format.mark "" output.after
- new.block
- format.translators output
- new.block
- format.edition output
- new.sentence
- format.address output
- format.publisher punct.colon output.after
- format.date "year" output.check
- format.pages punct.colon output.after
- format.editdate "" output.after
- format.citedate "" output.after
- format.url output
- format.doi output
- fin.entry
+{ "R" set.mark
+ misc
}
-FUNCTION {unpublished}
-{ output.bibitem
- format.authors "author" output.check
- author format.key output
- new.block
- format.title "title" output.check
- new.block
- note "note" output.check
- format.date output
- format.url output
- fin.entry
-}
-
FUNCTION {default.type} { misc }
-
MACRO {jan} {"January"}
MACRO {feb} {"February"}
@@ -1416,8 +1328,6 @@
MACRO {dec} {"December"}
-
-
MACRO {acmcs} {"ACM Computing Surveys"}
MACRO {acta} {"Acta Informatica"}
@@ -1459,68 +1369,32 @@
MACRO {tcs} {"Theoretical Computer Science"}
-
READ
EXECUTE {init.state.consts}
-INTEGERS { ascii }
-
-FUNCTION {char.lang}
-{ chr.to.int$ 'ascii :=
- ascii #31 > ascii #128 < and
- { lang.en }
- { ascii #227 > ascii #234 < and
- { lang.zh }
- { ascii #227 =
- { lang.ja }
- { lang.default }
- if$
- }
- if$
- }
- if$
-}
-
-FUNCTION {set.language}
+FUNCTION {set.entry.lang}
{ language empty$
- { lang.default 'lang :=
- author field.or.null title field.or.null * 's :=
- s empty$
- 'skip$
- { #1 'charptr :=
- s text.length$ #1 + 'stringlength :=
- { charptr stringlength < }
- { s charptr #1 substring$ char.lang
- duplicate$ #3 >
- { charptr #2 + 'charptr := }
- 'skip$
- if$
- duplicate$ lang >
- { 'lang := }
- 'pop$
- if$
- charptr #1 + 'charptr :=
- }
- while$
- }
- if$
- }
- { language "en" =
+ { author field.or.null title field.or.null * get.str.lang }
+ { language "english" = language "american" = or language "british" = or
{ lang.en }
- { language "zh" =
+ { language "chinese" =
{ lang.zh }
- { language "ja" =
+ { language "japanese" =
{ lang.ja }
- { lang.default }
+ { language "russian" =
+ { lang.ru }
+ { lang.other }
+ if$
+ }
if$
}
if$
}
if$
- 'lang :=
}
if$
+ 'entry.lang :=
}
FUNCTION {sortify}
@@ -1541,9 +1415,14 @@
FUNCTION {format.lab.names}
{ 's :=
- s #1 "{vv~}{ll}" format.name$
+ s #1 "{vv~}{ll}{, jj}{, ff}" format.name$ 't :=
+ t get.str.lang 'name.lang :=
+ name.lang lang.en =
+ { t #1 "{vv~}{ll}" format.name$}
+ { t #1 "{ll}{ff}" format.name$}
+ if$
s num.names$ #1 >
- { ", " * format.et.al * }
+ { "\ " * format.et.al * }
'skip$
if$
}
@@ -1609,13 +1488,15 @@
type$ "inbook" =
or
'author.editor.key.label
- { type$ "proceedings" =
- 'editor.key.organization.label
- { type$ "manual" =
+ { type$ "collection" =
+ type$ "proceedings" =
+ or
+ { editor empty$ not
+ 'editor.key.organization.label
'author.key.organization.label
- 'author.key.label
if$
}
+ 'author.key.label
if$
}
if$
@@ -1627,7 +1508,7 @@
short.list
"("
*
- year duplicate$ empty$
+ format.year duplicate$ empty$
short.list key field.or.null = or
{ pop$ "" }
'skip$
@@ -1648,9 +1529,8 @@
#-1 #10 substring$
}
-
FUNCTION {presort}
-{ set.language
+{ set.entry.lang
calc.label
label sortify
" "
@@ -1727,22 +1607,20 @@
'skip$
{ preamble$ write$ newline$ }
if$
- "\bibpunct{[}{]}{,}{s}{,}{,}"
- write$ newline$
"\begin{thebibliography}{" number.label int.to.str$ * "}" *
write$ newline$
- "\ifx\ustcjournal\undefined\newcommand\ustcjournal{\relax}\fi"
- write$ newline$
"\providecommand{\natexlab}[1]{#1}"
write$ newline$
- "\providecommand{\url}[1]{\texttt{#1}}"
+ "\providecommand{\url}[1]{#1}"
write$ newline$
- "\expandafter\ifx\csname urlstyle\endcsname\relax"
+ "\providecommand{\href}[2]{\url{#2}}"
write$ newline$
- " \providecommand{\doi}[1]{DOI: #1}\else"
+ "\providecommand{\doi}[1]{DOI: \href{http://dx.doi.org/#1}{#1}}"
write$ newline$
- " \providecommand{\doi}{DOI: \begingroup \urlstyle{rm}\Url}\fi"
+ "\expandafter\ifx\csname urlstyle\endcsname\relax\relax\else"
write$ newline$
+ " \urlstyle{same}\fi"
+ write$ newline$
}
EXECUTE {begin.bib}
@@ -1754,7 +1632,4 @@
"\end{thebibliography}" write$ newline$
}
-EXECUTE {end.bib}
-
-%%
-%% End of file `cqunumerical.bst'.
+EXECUTE {end.bib}
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/doc/latex/cquthesis/CONTRIBUTORS.md 2018-03-06 22:52:46 UTC (rev 46863)
@@ -9,8 +9,10 @@
* **rhiswell**（[Issue #28](https://github.com/nanmu42/CQUThesis/issues/28)，一个振奋人心的好消息）
* **fengzipei**（[Issue #30](https://github.com/nanmu42/CQUThesis/issues/30)）
* **craneaow**（[Issue #20](https://github.com/nanmu42/CQUThesis/issues/20)，这带来了一个新功能！）
+* **交换団**（重庆大学TeX用户组成员，他发现了.bat文件中由Git引入的换行符的问题。这里有[解决方法](https://stackoverflow.com/questions/19551037/git-how-to-keep-crlf-endings-for-specific-files-only)）
* **Zousiyu**（重庆大学TeX用户组成员，他贡献了开发思路）
-* **Lotus**（重庆大学TeX用户组成员，他在群里各种--瞎--带节奏）
+* **Lotus**（重庆大学TeX用户组成员，他在群里各种 ~~瞎~~ 带节奏）
+* **珍惜拥有**（重庆大学TeX用户组成员，他反馈了`bst`文件过时的问题）
还有，
* 我的母校，**重庆大学**
Modified: trunk/Master/texmf-dist/doc/latex/cquthesis/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cquthesis/Makefile 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/doc/latex/cquthesis/Makefile 2018-03-06 22:52:46 UTC (rev 46863)
@@ -4,7 +4,7 @@
# Compiling method: latexmk/xelatex/pdflatex
METHOD = latexmk
# Set opts for latexmk if you use it
-LATEXMKOPTS = -xelatex
+LATEXMKOPTS = -xelatex -quiet -halt-on-error -interaction=nonstopmode
# Basename of thesis
THESISMAIN = main
@@ -28,7 +28,7 @@
OPEN = open
endif
-.PHONY: all clean cls check doc distclean thesis viewthesis viewdoc FORCE_MAKE
+.PHONY: all clean cleanall cls check doc distclean thesis viewthesis viewdoc FORCE_MAKE
all: doc thesis
Added: trunk/Master/texmf-dist/doc/latex/cquthesis/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cquthesis/README (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/cquthesis/README 2018-03-06 22:52:46 UTC (rev 46863)
@@ -0,0 +1,52 @@
+# CQUThesis v1.30 (2018/02/23)
+[](https://travis-ci.org/nanmu42/CQUThesis)
+[](https://www.ctan.org/pkg/cquthesis)
+[](https://github.com/nanmu42/CQUThesis/releases/latest)
+[](https://github.com/nanmu42/CQUThesis/commits/master)
+[](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.
+
+
+
+# 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.
Property changes on: trunk/Master/texmf-dist/doc/latex/cquthesis/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/doc/latex/cquthesis/README-Chinese.md 2018-03-06 22:52:46 UTC (rev 46863)
@@ -1,8 +1,8 @@
-# 嗨，这里是CQUThesis！
-
+# 嗨，这里是CQUThesis！ v1.30 (2018/02/23)
+[](https://travis-ci.org/nanmu42/CQUThesis)
[](https://www.ctan.org/pkg/cquthesis)
[](https://github.com/nanmu42/CQUThesis/releases/latest)
-[](https://github.com/nanmu42/CQUThesis/commits/master)
+[](https://github.com/nanmu42/CQUThesis/commits/master)
[](https://zenodo.org/badge/latestdoi/58866503)
CQUThesis表示的是**C**hong**Q**ing **U**niversity **Thesis**.
@@ -17,7 +17,8 @@
* 内置封面、目录、索引、授权书等论文部件，可按需自动生成；
* 自动侦测文档页数，生成相应的单面打印/双面打印PDF文件；
* 预置一批优化过的宏包和小功能，包含中英双语题注及配套图录、表录，国际标准单位、化学式支持、三线表等，可按需开启；
-* 支持基于cwl文件的代码着色和补全，makefile功能能够在Linux, Mac, Windows三平台通用。
+* 支持基于cwl文件的代码着色和补全，makefile功能能够在Linux, Mac, Windows三平台通用；
+* 每周自动进行持续集成测试，保证模板在最新宏包环境下能够正常运行。
@@ -90,21 +91,16 @@
* [Github Issues](https://github.com/nanmu42/CQUThesis/issues)
* 加入[重庆大学TeX用户组](http://jq.qq.com/?_wv=1027&k=2HvYu95)寻求支持
-# 用户协议
-
-1. 本模板按照[LaTeX Project Public License](https://latex-project.org/lppl/lppl-1-3.txt)发布，协议版本号为1.3或以后的任何版本（随你意）。本条款不适用于重庆大学LaTeX模板工具箱（CQUThesis Toolkit）；
-1. 截止本文档编译时，重庆大学教务处和研究生院只提供了毕业论文写作指南，没有提供官方模板，也没有授权或认证任何第三方模板为官方模板。本模板是按照写作指南的参考实现，模板作者自当尽力，但不保证审查老师不提意见。在开始使用前，您同意，任何由于本模板而引起的论文格式审查问题与本模板作者无关。
-
-# About CQUThesis
-
-CQUThesis stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
-
# 致谢 / Acknowledgements
这个模板是站在巨人肩膀上的成果，感谢LaTeX 2e计划，感谢[CTeX社区](https://github.com/CTeX-org/ctex-kit)提供的中文解决方案，感谢薛瑞尼副教授的[先驱之作](https://github.com/xueruini/thuthesis)，感谢[中国科学技术大学TeX用户组](https://github.com/ustctug/gbt-7714-2015)。向你们致以真诚的问候和感激！
+持续集成构建服务由[Travis CI](https://travis-ci.org/)提供，在构建中，CQUThesis使用了由Christian Schenk开发的[MiKTeX](https://miktex.org)，使用[Docker](https://www.docker.com/)进行了[虚拟化](https://github.com/nanmu42/TeXPackageTestBench)，镜像中包含[Ubuntu发行版](https://www.ubuntu.com)，作者在此特别致谢。
+
特别感谢参与CQUThesis的开发和维护的诸位[**直接贡献者**](https://github.com/nanmu42/CQUThesis/blob/master/CONTRIBUTORS.md)，向你们致以真诚的敬意和感激！
+特别感谢我的母校重庆大学无偿提供[CTAN镜像](https://mirrors.cqu.edu.cn/ctan/)服务，这对于中国西南地区的TeX用户而言是极大的利好。感谢[CQU Mirror Site Dev. Task Force](https://github.com/cqumirror)和[重庆大学蓝盟](http://lanunion.cqu.edu.cn/)的维护支持！
+
世界因你们更美好。
The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind:
@@ -115,14 +111,28 @@
* [Chongqing University Opensource Mirror](https://github.com/cqumirror)
* [CQU Mirror Site Dev. Task Force](https://github.com/cqumirror)
* [Chongqing University Lan-Union for Computer and Network](http://lanunion.cqu.edu.cn/)
+* [Travis CI](https://travis-ci.org/)
+* [MiKTeX](https://miktex.org)
+* [Docker](https://www.docker.com/)
+* [Ubuntu](https://www.ubuntu.com)
+# CQUThesis Toolkit
+
+重庆大学LaTeX模板工具箱（CQUThesis Toolkit）是为了增强CQUThesis而提供的额外文件和程序，这些内容往往是对CQUThesis易用性或功能的增强，没有它们，CQUThesis仍然可以良好地独立运行。
+
+这些内容有着自己的授权方式和简单的用户协议，不会随本模板的CTAN版本发布，CQUThesis的Github源是这些内容唯一的官方源，程序的更新和修正都会在这里进行。
+
+# 用户协议
+
+1. 本模板按照[LaTeX Project Public License](https://latex-project.org/lppl/lppl-1-3.txt)发布，协议版本号为1.3或以后的任何版本（随你意）。本条款不适用于重庆大学LaTeX模板工具箱（CQUThesis Toolkit）；
+1. 截止本文档编译时，重庆大学教务处和研究生院只提供了毕业论文写作指南，没有提供官方模板，也没有授权或认证任何第三方模板为官方模板。本模板是按照写作指南的参考实现，模板作者自当尽力，但不保证审查老师不提意见。在开始使用前，您同意，任何由于本模板而引起的论文格式审查问题与本模板作者无关。
+
# 论文写作规范
- [重庆大学本科毕业设计（论文）撰写规范化要求（2007修订）.pdf](https://github.com/nanmu42/CQUThesis/files/644308/2007.pdf)
- [重庆大学博士、硕士学位论文撰写格式标准（2007修订）.pdf](https://github.com/nanmu42/CQUThesis/files/644309/2007.pdf)
+- [GB/T 7714-2015 信息与文献 参考文献著录规则.pdf](https://github.com/nanmu42/CQUThesis/files/1096886/GBT.7714-2015.pdf)
-# 关于CQUThesis Toolkit
+# About CQUThesis
-重庆大学LaTeX模板工具箱（CQUThesis Toolkit）是为了增强CQUThesis而提供的额外文件和程序，这些内容往往是对CQUThesis易用性或功能的增强，没有它们，CQUThesis仍然可以良好地独立运行。
-
-这些内容有着自己的授权方式和简单的用户协议，不会随本模板的CTAN版本发布，CQUThesis的Github源是这些内容唯一的官方源，程序的更新和修正都会在这里进行。
+CQUThesis stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
Deleted: trunk/Master/texmf-dist/doc/latex/cquthesis/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cquthesis/README.md 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/doc/latex/cquthesis/README.md 2018-03-06 22:52:46 UTC (rev 46863)
@@ -1,50 +0,0 @@
-# About CQUThesis
-[](https://www.ctan.org/pkg/cquthesis)
-[](https://github.com/nanmu42/CQUThesis/releases/latest)
-[](https://github.com/nanmu42/CQUThesis/commits/master)
-
-**CQUThesis** stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
-
-
-
-# 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.
Modified: trunk/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/doc/latex/cquthesis/contents/analysis.tex 2018-03-06 22:52:46 UTC (rev 46863)
@@ -356,7 +356,7 @@
\cquthesis 同时提供正文模式的参考文献引用功能\cs{inlinecite}，适用于以下情况：
-文献\inlinecite{r6}表明，文献\inlinecite{r7,r8,r9}所述的情况是有理论依据的。
+文献\inlinecite{r6,z1,z2,z3}表明，文献\inlinecite{r7,r8,r9,r10}所述的情况是有理论依据的。
\section{数学公式}
\label{sec:equation}
Modified: trunk/Master/texmf-dist/doc/latex/cquthesis/cquthesis.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/doc/latex/cquthesis/dtx-style.sty 2018-03-06 22:52:46 UTC (rev 46863)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2016-2017 by Zhennan Li <i at nanmu.me>
+%% Copyright (C) 2016-2018 by Zhennan Li <i at nanmu.me>
%% This file 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
Added: trunk/Master/texmf-dist/doc/latex/cquthesis/figures/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cquthesis/figures/README (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/cquthesis/figures/README 2018-03-06 22:52:46 UTC (rev 46863)
@@ -0,0 +1,8 @@
+Notice For CTAN
+
+The file "CQUbadge.pdf" is a vector graph in PDF format, which can be transformed loselessly to .eps file. Thus, it should be regarded as "Source File".
+
+The .eps version is deprecated due to its unreasonable file size(~1.2 MB).
+
+Zhennan Li
+Author of CQUThesis, LATEX Thesis Template for Chongqing University.
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/cquthesis/figures/README
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/cquthesis/ref/refs.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cquthesis/ref/refs.bib 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/doc/latex/cquthesis/ref/refs.bib 2018-03-06 22:52:46 UTC (rev 46863)
@@ -404,6 +404,18 @@
web-of-science-categories = {Electrochemistry; Materials Science, Coatings \& Films}
}
+ at InProceedings{r10,
+ author = {Ross Girshick and Jeff Donahue and Trevor Darrell and Jitendra Malik},
+ title = {Rich Feature Hierarchies for Accurate Object Detection and Semantic Segmentation},
+ booktitle = {Proceedings of the IEEE Conference on Computer Vision and Pattern Recognition (CVPR)},
+ year = {2014},
+ editor = {},
+ volume = {},
+ pages = {580--587},
+ address = {Ohio, USA},
+ publisher = {IEEE}
+}
+
@Article{z1,
author = {胡壮麒 and 刘丽荣 and 金涛 and 孙晓峰},
title = {镍基单晶高温合金的发展},
Modified: trunk/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/source/latex/cquthesis/cquthesis.dtx 2018-03-06 22:52:46 UTC (rev 46863)
@@ -16,7 +16,7 @@
%
% \iffalse
%<*driver>
-\ProvidesFile{cquthesis.dtx}[2017/05/30 v1.20 Chongqing University Thesis Template]
+\ProvidesFile{cquthesis.dtx}[2018/02/23 v1.30 Chongqing University Thesis Template]
\documentclass{ltxdoc}
\usepackage{dtx-style}
@@ -89,7 +89,9 @@
% \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}。}
%
+%
% \def\indexname{代码索引}
% \def\glossaryname{更新记录}
% \IndexPrologue{\section{\indexname}}
@@ -775,7 +777,7 @@
%<cls>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<cls>\ProvidesClass{cquthesis}
%<cfg>\ProvidesFile{cquthesis.cfg}
-%<cls|cfg>[2017/05/30 v1.20 Chongqing University Thesis Template]
+%<cls|cfg>[2018/02/23 v1.30 Chongqing University Thesis Template]
% \end{macrocode}
% 定义一些开发常量：
% \begin{macrocode}
@@ -782,7 +784,7 @@
%<*cls>
\hyphenation{Cqu-Thesis}
\newcommand{\cquthesis}{\textsc{CquThesis}}
-\def\version{1.20}
+\def\version{1.30}
%</cls>
% \end{macrocode}
% \file{cquthesis.cfg}中，涉及文档部件的部分常量：
Deleted: trunk/Master/texmf-dist/source/latex/cquthesis/makewin-English.bat
===================================================================
--- trunk/Master/texmf-dist/source/latex/cquthesis/makewin-English.bat 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/source/latex/cquthesis/makewin-English.bat 2018-03-06 22:52:46 UTC (rev 46863)
@@ -1,139 +0,0 @@
- at echo off
-cd /d %~dp0
-
-title CQUThesis Build Helper
-
-set flag=%1
-if %flag%x == x (
- set flag=thesis
-)
-
-if %flag%x == thesisx (
- call:thesis
- goto :EOF
-)
-if %flag%x == thesisxx (
- call:thesisx
- goto :EOF
-)
-if %flag%x == docx (
- call:extract
- call:document
- goto :EOF
-)
-if %flag%x == cleanx (
- call:cleanaux
- goto :EOF
-)
-if %flag%x == cleanpdfx (
- call:cleanpdf
- goto :EOF
-)
-if %flag%x == cleanallx (
- call:cleanaux
- call:cleanpdf
- goto :EOF
-)
-if %flag%x == extractx (
- call:extract
- goto :EOF
-)
-if %flag%x == allx (
- call:thesis
- call:document
- goto :EOF
-)
-if %flag%x == buildx (
- call:extract
- call:thesis
- goto :EOF
-)
-if %flag%x == buildxx (
- call:extract
- call:thesis
- call:document
- goto :EOF
-)
-
-:help
- echo *************************************************************
- echo This is the Makefile script for CQUThesis on Windows.
- echo For CQUThesis: https://github.com/nanmu42/CQUThesis
- echo by Zhennan Li (C) 2016 under LPPL 1.3
- echo The idea comes from Github Liam0205/sduthesis, Many thanks!
- echo *************************************************************
- echo *
- echo USAGE:
- echo makewin [param]
- echo param:
- echo help Display this help text
- echo thesis (default)Compile the thesis via latexmk
- echo thesisx Compile the thesis via XeLaTeX(only if latexmk is not installed.)
- echo doc Compile the documentation of CQUThesis
- echo clean Clean all aux files
- echo cleanpdf Clean all PDFs
- echo cleanall Clean all aux files and all PDFs
- echo extract Extract the Thesis Template from .dtx files.
- echo all thesis + doc
- echo build extract + thesis
- echo buildx extract + thesis + doc
- echo *
- echo ***********************Happy TeXing**************************
-goto :EOF
-
-:checkfiles
- IF NOT EXIST cquthesis.cls call:extract
- IF NOT EXIST cquthesis.cfg call:extract
-goto :EOF
-
-:thesis
- call:checkfiles
- latexmk -xelatex main.tex
-goto :EOF
-
-:thesisx
- call:checkfiles
- xelatex main.tex
- bibtex main.tex
- xelatex main.tex
- xelatex main.tex
- xelatex main.tex
-goto :EOF
-
-:cleanaux
- echo cleaning aux...
- for %%i in (*.aux *.bbl *.equ *.glo *.gls *.hd *.idx *.ilg *.ind *.lof *.lot *.out *.blg *.log *.thm *.toc *.synctex.gz *.lofEN *.lotEN *.equEN) do (
- del %%i
- )
- echo Done.
-goto :EOF
-
-:cleanpdf
- echo cleaning pdf...
- for %%i in (*.pdf) do (
- del %%i
- )
- echo Done.
-goto :EOF
-
-:clean_all
- call:cleanaux
- call:cleanpdf
-goto :EOF
-
-:extract
- echo extracting...
- latex cquthesis.ins
- echo *******CQUThesis has been extracted.********
-goto :EOF
-
-:document
- echo building documents...
- set cmode=-interaction=batchmode
- xelatex cquthesis.dtx
- makeindex -s gind.ist -o cquthesis.ind cquthesis.idx
- makeindex -s gglo.ist -o cquthesis.gls cquthesis.glo
- xelatex cquthesis.dtx
- xelatex cquthesis.dtx
- xelatex cquthesis.dtx
-goto :EOF
Added: trunk/Master/texmf-dist/source/latex/cquthesis/makewin-en.bat
===================================================================
--- trunk/Master/texmf-dist/source/latex/cquthesis/makewin-en.bat (rev 0)
+++ trunk/Master/texmf-dist/source/latex/cquthesis/makewin-en.bat 2018-03-06 22:52:46 UTC (rev 46863)
@@ -0,0 +1,141 @@
+ at echo off
+
+
+cd /d "%~dp0"
+
+title CQUThesis Build Helper
+
+set flag=%1
+if %flag%x == x (
+ set flag=thesis
+)
+
+if %flag%x == thesisx (
+ call:thesis
+ goto :EOF
+)
+if %flag%x == thesisxx (
+ call:thesisx
+ goto :EOF
+)
+if %flag%x == docx (
+ call:extract
+ call:document
+ goto :EOF
+)
+if %flag%x == cleanx (
+ call:cleanaux
+ goto :EOF
+)
+if %flag%x == cleanpdfx (
+ call:cleanpdf
+ goto :EOF
+)
+if %flag%x == cleanallx (
+ call:cleanaux
+ call:cleanpdf
+ goto :EOF
+)
+if %flag%x == extractx (
+ call:extract
+ goto :EOF
+)
+if %flag%x == allx (
+ call:thesis
+ call:document
+ goto :EOF
+)
+if %flag%x == buildx (
+ call:extract
+ call:thesis
+ goto :EOF
+)
+if %flag%x == buildxx (
+ call:extract
+ call:thesis
+ call:document
+ goto :EOF
+)
+
+:help
+ echo *************************************************************
+ echo This is the Makefile script for CQUThesis on Windows.
+ echo For CQUThesis: https://github.com/nanmu42/CQUThesis
+ echo by Zhennan Li (C) 2016 under LPPL 1.3
+ echo The idea comes from Github Liam0205/sduthesis, Many thanks!
+ echo *************************************************************
+ echo *
+ echo USAGE:
+ echo makewin [param]
+ echo param:
+ echo help Display this help text
+ echo thesis (default)Compile the thesis via latexmk
+ echo thesisx Compile the thesis via XeLaTeX(only if latexmk is not installed.)
+ echo doc Compile the documentation of CQUThesis
+ echo clean Clean all aux files
+ echo cleanpdf Clean all PDFs
+ echo cleanall Clean all aux files and all PDFs
+ echo extract Extract the Thesis Template from .dtx files.
+ echo all thesis + doc
+ echo build extract + thesis
+ echo buildx extract + thesis + doc
+ echo *
+ echo ***********************Happy TeXing**************************
+goto :EOF
+
+:checkfiles
+ IF NOT EXIST cquthesis.cls call:extract
+ IF NOT EXIST cquthesis.cfg call:extract
+goto :EOF
+
+:thesis
+ call:checkfiles
+ latexmk -xelatex main.tex
+goto :EOF
+
+:thesisx
+ call:checkfiles
+ xelatex main.tex
+ bibtex main.tex
+ xelatex main.tex
+ xelatex main.tex
+ xelatex main.tex
+goto :EOF
+
+:cleanaux
+ echo cleaning aux...
+ for %%i in (*.aux *.bbl *.equ *.glo *.gls *.hd *.idx *.ilg *.ind *.lof *.lot *.out *.blg *.log *.thm *.toc *.synctex.gz *.lofEN *.lotEN *.equEN) do (
+ del %%i
+ )
+ echo Done.
+goto :EOF
+
+:cleanpdf
+ echo cleaning pdf...
+ for %%i in (*.pdf) do (
+ del %%i
+ )
+ echo Done.
+goto :EOF
+
+:clean_all
+ call:cleanaux
+ call:cleanpdf
+goto :EOF
+
+:extract
+ echo extracting...
+ latex cquthesis.ins
+ echo *******CQUThesis has been extracted.********
+goto :EOF
+
+:document
+ echo building documents...
+ set cmode=-interaction=batchmode
+ xelatex cquthesis.dtx
+ makeindex -s gind.ist -o cquthesis.ind cquthesis.idx
+ makeindex -s gglo.ist -o cquthesis.gls cquthesis.glo
+ xelatex cquthesis.dtx
+ xelatex cquthesis.dtx
+ xelatex cquthesis.dtx
+goto :EOF
Property changes on: trunk/Master/texmf-dist/source/latex/cquthesis/makewin-en.bat
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/latex/cquthesis/makewin.bat
===================================================================
--- trunk/Master/texmf-dist/source/latex/cquthesis/makewin.bat 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/source/latex/cquthesis/makewin.bat 2018-03-06 22:52:46 UTC (rev 46863)
@@ -1,7 +1,8 @@
@echo off
+
rem \xB1\xDC\xC3\xE2\xD4ڹ\xDC\xC0\xEDԱ\xC9\xED\xB7\xDD\xCFµ\xC4·\xBE\xB6\xCE\xCA\xCC\xE2
-cd /d %~dp0
+cd /d "%~dp0"
title CQUThesis\xD7Զ\xAF\xBB\xAF\xB1\xE0\xD2\xEB\xB3\xCC\xD0\xF2
Modified: trunk/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cfg 2018-03-06 22:52:46 UTC (rev 46863)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2016-2017 by Zhennan Li <i at nanmu.me>
+%% Copyright (C) 2016-2018 by Zhennan Li <i at nanmu.me>
%% This file 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
@@ -22,8 +22,8 @@
%% This is the configuration file of the cquthesis package with LaTeX2e.
%%
\ProvidesFile{cquthesis.cfg}
-[2017/05/30 v1.20 Chongqing University Thesis Template]
-\def\cqueqshortname {式}
+[2018/02/23 v1.30 Chongqing University Thesis Template]
+\def\cqueqshortname {式}
\def\cqu at denotation@name {主要符号对照表}
\def\shorttablename {表}
\def\shorttablenameEN {Table}
Modified: trunk/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls 2018-03-06 22:52:16 UTC (rev 46862)
+++ trunk/Master/texmf-dist/tex/latex/cquthesis/cquthesis.cls 2018-03-06 22:52:46 UTC (rev 46863)
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2016-2017 by Zhennan Li <i at nanmu.me>
+%% Copyright (C) 2016-2018 by Zhennan Li <i at nanmu.me>
%% This file 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
@@ -21,10 +21,10 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{cquthesis}
-[2017/05/30 v1.20 Chongqing University Thesis Template]
+[2018/02/23 v1.30 Chongqing University Thesis Template]
\hyphenation{Cqu-Thesis}
\newcommand{\cquthesis}{\textsc{CquThesis}}
-\def\version{1.20}
+\def\version{1.30}
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
family=cqu,
@@ -144,7 +144,7 @@
bookmarksopenlevel=1,
breaklinks=true,
colorlinks=false,
-plainpages=false,
+plainpages=false,
pdfborder=0 0 0}
\urlstyle{same}
\ifxetex
@@ -189,7 +189,7 @@
section/number = \Alph{section},
section/name = {,.},
subsection/number = \CTEXthesection{}\arabic{subsection},}%
-\setcounter{chapter}{0}
+\setcounter{chapter}{0}
}
\RequirePackage{geometry}
\geometry{
@@ -200,7 +200,7 @@
\regtotcounter[auxfile=maxpage.aux]{page}
\if at autoprint
\ifcqu at bachelor
-\ifnum\totvalue{page}>70 \@twosideprinttrue\else\@onesideprinttrue\fi
+\ifnum\totvalue{page}>70 \@twosideprinttrue\else\@onesideprinttrue\fi
\else
\ifnum \totvalue{page}>60 \@twosideprinttrue\else\@onesideprinttrue\fi
\fi
@@ -528,7 +528,7 @@
\\ \vspace{\stretch{1}}
\zihao{-2}\cqu at thesistypenameCN
\ifcqu at master{}\\\cqu at mastertype\fi
-\\ \vspace{\stretch{2}}
+\\ \vspace{\stretch{2}}
\fi
\ifcqu at bachelor
\zihao{3}
More information about the tex-live-commits
mailing list