summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example')
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.jpgbin264716 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.pngbin0 -> 94458 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.jpgbin299042 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.pngbin0 -> 101374 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignleft.pdfbin59190 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignright.pdfbin59198 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.pdfbin140490 -> 189552 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.tex628
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeameray.pdfbin140547 -> 145549 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooks.pdfbin129178 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooksay.pdfbin147769 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmt.jpgbin477701 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmt.pngbin0 -> 84331 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmta.pdfbin42684 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmtb.pdfbin42661 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalse.pdfbin25697 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalseay.pdfbin35408 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrue.pdfbin25700 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrueay.pdfbin24501 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubfalse.pdfbin27849 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubtrue.pdfbin28458 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournal.pdfbin101591 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournalay.pdfbin105135 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonline.pdfbin28319 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonlineay.pdfbin28415 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcd.pdfbin50301 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcday.pdfbin49930 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreport.pdfbin40694 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreportay.pdfbin41305 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egspecialchar.bib4
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.bib86
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.pdfbin50813 -> 100848 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.tex808
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatent.pdfbin50849 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatentay.pdfbin50019 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/example.bib102
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/filecodegbkeg.tex207
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/filecodeutfeg.tex253
-rwxr-xr-xMaster/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makeclear.bat2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makecompilerec.dat40
-rwxr-xr-xMaster/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefileeg.bat7
-rwxr-xr-xMaster/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefileegtest.bat25
-rwxr-xr-xMaster/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefilegbk.bat44
-rwxr-xr-xMaster/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefiletest.bat41
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015.pdf (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.pdf)bin54417 -> 54146 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.tex)2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015ay.pdf (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.pdf)bin52898 -> 52900 bytes
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015ay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.tex)8
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testalignleft.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignleft.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testalignright.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignright.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testbooks.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooks.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testbooksay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooksay.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testciteay.tex218
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcitenum.tex212
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcollection.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubtrue.tex)5
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcollectionay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmtb.tex)10
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testentrytypes.tex320
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testfontinbiblio.tex74
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbnoauthorfalseay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalseay.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbnoauthortrueay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrueay.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbpubfalse.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubfalse.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbpubtrue.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmta.tex)17
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testjournal.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournal.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testjournalay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournalay.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilan.tex90
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.tex95
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testnamefmt.tex237
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonline.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonline.tex)2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonlineay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonlineay.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonlyurl.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalse.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonlyurlay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrue.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testopttitlelink.tex52
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testproceedings.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcd.tex)2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testproceedingsay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcday.tex)2
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testreport.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreport.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testreportay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreportay.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testtextcite.tex110
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testtextciteay.tex110
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testthesispatent.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatent.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testthesispatentay.tex (renamed from Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatentay.tex)0
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistory.tex84
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.md83
-rw-r--r--Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.tex911
83 files changed, 3766 insertions, 1125 deletions
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.jpg b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.jpg
deleted file mode 100644
index 21a71a85883..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.jpg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.png b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.png
new file mode 100644
index 00000000000..022607a5dde
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.jpg b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.jpg
deleted file mode 100644
index c44feb558c5..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.jpg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.png b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.png
new file mode 100644
index 00000000000..c4839f55e6a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignleft.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignleft.pdf
deleted file mode 100644
index 543173d54d7..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignleft.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignright.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignright.pdf
deleted file mode 100644
index d40ed9bad2a..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignright.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.pdf
index 5f3a55ccaf8..237f8166a80 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.tex
index 602af754361..0ba87a88500 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeamer.tex
@@ -6,10 +6,594 @@
\usepackage{xcolor}
\usepackage{listings}
-\usepackage[backend=biber,style=gb7714-2015,gbtype=true,gbalign=gb7714-2015]{biblatex}
+%\usepackage[backend=biber,style=gb7714-2015,gbalign=gb7714-2015,
+%gbnamefmt=apa,gbtostd=true,gbtype=false,gbpunctin=false,gbpub=false]{biblatex}
+
+\usepackage[backend=biber,style=gb7714-2015,gbalign=gb7714-2015]{biblatex}
+
+%\usepackage[backend=biber,style=numeric-comp,giveninits=false]{biblatex}%giveninits=false
+
\renewcommand{\bibfont}{\zihao{8}\songti}
\addbibresource[location=local]{example.bib}
+ \usepackage{filecontents}
+ \begin{filecontents}{\jobname.bib}
+ @ARTICLE{方军雄2007所有制,
+ AUTHOR = {方军雄},
+ DATE = {2007},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {方军雄2007所有制},
+ PAGES = {82--92},
+ TITLE = {所有制, 制度环境与信贷资金配置},
+ VOLUME = {12},
+}
+
+@ARTICLE{李晓西1994转轨过程中的结构性通货膨胀,
+ AUTHOR = {李晓西},
+ DATE = {1994},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {李晓西1994转轨过程中的结构性通货膨胀},
+ NUMBER = {10},
+ PAGES = {28--32},
+ TITLE = {转轨过程中的结构性通货膨胀},
+}
+
+@ARTICLE{刘凤良2017,
+ AUTHOR = {刘凤良 and 章潇萌 and 于泽},
+ DATE = {2017},
+ JOURNALTITLE = {金融研究},
+ KEYWORDS = {刘凤良2017},
+ NUMBER = {2},
+ PAGES = {54--69},
+ TITLE = {高投资、结构失衡与价格指数二元分化},
+}
+
+@ARTICLE{楼继伟2016改革,
+ AUTHOR = {楼继伟},
+ DATE = {2016},
+ JOURNALTITLE = {求是},
+ KEYWORDS = {楼继伟2016改革},
+ NUMBER = {1},
+ PAGES = {24--26},
+ TITLE = {中国经济最大潜力在于改革},
+}
+
+@ARTICLE{吕捷2015cpi,
+ AUTHOR = {吕捷 and 王高望},
+ DATE = {2015},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {吕捷2015cpi},
+ PAGES = {011},
+ TITLE = {CPI 与 PPI “背离” 的结构性解释},
+ VOLUME = {4},
+}
+
+@ARTICLE{罗德明2012要素市场扭曲,
+ AUTHOR = {罗德明 and 李晔 and 史晋川},
+ DATE = {2012},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {罗德明2012要素市场扭曲},
+ NUMBER = {3},
+ PAGES = {4--14},
+ TITLE = {要素市场扭曲、资源错置与生产率},
+}
+
+@ARTICLE{王国静2014金融冲击,
+ AUTHOR = {王国静 and 田国强},
+ DATE = {2014},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {王国静2014金融冲击},
+ NUMBER = {3},
+ PAGES = {20--34},
+ TITLE = {金融冲击和中国经济波动},
+ VOLUME = {49},
+}
+
+@ARTICLE{王文甫2010价格粘性,
+ AUTHOR = {王文甫},
+ DATE = {2010},
+ JOURNALTITLE = {管理世界},
+ KEYWORDS = {王文甫2010价格粘性},
+ NUMBER = {9},
+ PAGES = {11--25},
+ TITLE = {价格粘性, 流动性约束与中国财政政策的宏观效应——动态新凯恩斯主义视角},
+}
+
+@ARTICLE{徐伟康2010对,
+ AUTHOR = {徐伟康},
+ DATE = {2010},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {徐伟康2010对},
+ NUMBER = {5},
+ PAGES = {139--148},
+ TITLE = {对《 消费者价格指数与生产者价格指数: 谁带动谁?》 一文的质疑},
+}
+
+@ARTICLE{杨光2015经济波动,
+ AUTHOR = {杨光 and 孙浦阳 and 龚刚},
+ DATE = {2015},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {杨光2015经济波动},
+ NUMBER = {2},
+ PAGES = {47--60},
+ TITLE = {经济波动, 成本约束与资源配置},
+ VOLUME = {50},
+}
+
+@ARTICLE{杨汝岱2015中国制造,
+ AUTHOR = {杨汝岱},
+ DATE = {2015},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {杨汝岱2015中国制造},
+ PAGES = {61--74},
+ TITLE = {中国制造业企业全要素生产率研究},
+ VOLUME = {2},
+}
+
+@ARTICLE{张成思2010长期均衡,
+ AUTHOR = {张成思},
+ DATE = {2010},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {张成思2010长期均衡},
+ PAGES = {42--52},
+ TITLE = {长期均衡, 价格倒逼与货币驱动},
+ VOLUME = {6},
+}
+
+@INCOLLECTION{adam2011house,
+ AUTHOR = {Adam, Klaus and Kuang, Pei and Marcet, Albert},
+ PUBLISHER = {University of Chicago Press},
+ BOOKTITLE = {NBER Macroeconomics Annual 2011, Volume 26},
+ DATE = {2011},
+ KEYWORDS = {adam2011house},
+ PAGES = {77--122},
+ TITLE = {House price booms and the current account},
+}
+
+@ARTICLE{bernanke1989agency,
+ AUTHOR = {Bernanke, Ben and Gertler, Mark},
+ PUBLISHER = {JSTOR},
+ DATE = {1989},
+ JOURNALTITLE = {The American Economic Review},
+ KEYWORDS = {bernanke1989agency},
+ PAGES = {14--31},
+ TITLE = {Agency costs, net worth, and business fluctuations},
+}
+
+@REPORT{calvo2006phoenix,
+ AUTHOR = {Calvo, Guillermo A and Izquierdo, Alejandro and Talvi, Ernesto},
+ INSTITUTION = {National Bureau of Economic Research},
+ DATE = {2006},
+ KEYWORDS = {calvo2006phoenix},
+ TITLE = {Phoenix miracles in emerging markets: recovering without credit from systemic financial crises},
+}
+
+@ARTICLE{davis2005housing,
+ AUTHOR = {Davis, Morris A and Heathcote, Jonathan},
+ PUBLISHER = {Wiley Online Library},
+ DATE = {2005},
+ JOURNALTITLE = {International Economic Review},
+ KEYWORDS = {davis2005housing},
+ NUMBER = {3},
+ PAGES = {751--784},
+ TITLE = {Housing and the business cycle},
+ VOLUME = {46},
+}
+
+@ARTICLE{enders2009international,
+ AUTHOR = {Enders, Zeno and M{ü}ller, Gernot J},
+ PUBLISHER = {Elsevier},
+ DATE = {2009},
+ JOURNALTITLE = {Journal of International Economics},
+ KEYWORDS = {enders2009international},
+ NUMBER = {1},
+ PAGES = {45--59},
+ TITLE = {On the international transmission of technology shocks},
+ VOLUME = {78},
+}
+
+@ARTICLE{fazzari1993working,
+ AUTHOR = {Fazzari, Steven M and Petersen, Bruce C},
+ PUBLISHER = {JSTOR},
+ DATE = {1993},
+ JOURNALTITLE = {The RAND Journal of Economics},
+ KEYWORDS = {fazzari1993working},
+ PAGES = {328--342},
+ TITLE = {Working capital and fixed investment: new evidence on financing constraints},
+}
+
+@ARTICLE{greenwood1988investment,
+ AUTHOR = {Greenwood, Jeremy and Hercowitz, Zvi and Huffman, Gregory W},
+ PUBLISHER = {JSTOR},
+ DATE = {1988},
+ JOURNALTITLE = {The American Economic Review},
+ KEYWORDS = {greenwood1988investment},
+ PAGES = {402--417},
+ TITLE = {Investment, capacity utilization, and the real business cycle},
+}
+
+@ARTICLE{hayashi1985tests,
+ AUTHOR = {Hayashi, Fumio},
+ DATE = {1985},
+ JOURNALTITLE = {NBER Working Paper},
+ KEYWORDS = {hayashi1985tests},
+ NUMBER = {w1720},
+ TITLE = {Tests for Liquidity Constraints: a Critical Survey},
+}
+
+@ARTICLE{iacoviello2005house,
+ AUTHOR = {Iacoviello, Matteo},
+ PUBLISHER = {American Economic Association},
+ DATE = {2005},
+ JOURNALTITLE = {The American economic review},
+ KEYWORDS = {iacoviello2005house},
+ NUMBER = {3},
+ PAGES = {739--764},
+ TITLE = {House prices, borrowing constraints, and monetary policy in the business cycle},
+ VOLUME = {95},
+}
+
+@ARTICLE{jermann2012macroeconomic,
+ AUTHOR = {Jermann, Urban and Quadrini, Vincenzo},
+ PUBLISHER = {American Economic Association},
+ DATE = {2012},
+ JOURNALTITLE = {The American Economic Review},
+ KEYWORDS = {jermann2012macroeconomic},
+ NUMBER = {1},
+ PAGES = {238--271},
+ TITLE = {Macroeconomic effects of financial shocks},
+ VOLUME = {102},
+}
+
+@ARTICLE{khan2013credit,
+ AUTHOR = {Khan, Aubhik and Thomas, Julia K},
+ PUBLISHER = {University of Chicago Press},
+ DATE = {2013},
+ JOURNALTITLE = {Journal of Political Economy},
+ KEYWORDS = {khan2013credit},
+ NUMBER = {6},
+ PAGES = {1055--1107},
+ TITLE = {Credit shocks and aggregate fluctuations in an economy with production heterogeneity},
+ VOLUME = {121},
+}
+
+@ARTICLE{kiyotaki1997credit,
+ AUTHOR = {Kiyotaki, Nobuhiro and Moore, John},
+ PUBLISHER = {University of Chicago Press},
+ DATE = {1997},
+ JOURNALTITLE = {Journal of Political Economy},
+ KEYWORDS = {kiyotaki1997credit},
+ NUMBER = {2},
+ PAGES = {211--248},
+ TITLE = {Credit cycles},
+ VOLUME = {105},
+}
+
+@ARTICLE{kocherlakota2000creating,
+ AUTHOR = {Kocherlakota, Narayana and others},
+ DATE = {2000},
+ JOURNALTITLE = {Federal Reserve Bank of Minneapolis Quarterly Review},
+ KEYWORDS = {kocherlakota2000creating},
+ NUMBER = {3},
+ PAGES = {2--10},
+ TITLE = {Creating business cycles through credit constraints},
+ VOLUME = {24},
+}
+
+@INPROCEEDINGS{lucas1976econometric,
+ AUTHOR = {Lucas, Robert E},
+ ORGANIZATION = {North-Holland},
+ BOOKTITLE = {Carnegie-Rochester conference series on public policy},
+ DATE = {1976},
+ KEYWORDS = {lucas1976econometric},
+ PAGES = {19--46},
+ TITLE = {Econometric policy evaluation: A critique},
+ VOLUME = {1},
+}
+
+@ARTICLE{lucas1987money,
+ AUTHOR = {Lucas, Robert and Stokey, Nancy},
+ PUBLISHER = {Econometric Society},
+ DATE = {1987},
+ JOURNALTITLE = {Econometrica},
+ KEYWORDS = {lucas1987money},
+ NUMBER = {3},
+ PAGES = {491--513},
+ TITLE = {Money and Interest in a Cash-in-Advance Economy},
+ VOLUME = {55},
+}
+
+@ARTICLE{quadrini2011financial,
+ AUTHOR = {Quadrini, Vincenzo},
+ DATE = {2011},
+ JOURNALTITLE = {Economic Quarterly},
+ KEYWORDS = {quadrini2011financial},
+ NUMBER = {3},
+ PAGES = {209--254},
+ TITLE = {Financial Frictions in Macroeconomic Fluctuations},
+ VOLUME = {79},
+}
+
+@ARTICLE{saiz2010geographic,
+ AUTHOR = {Saiz, Albert},
+ PUBLISHER = {JSTOR},
+ DATE = {2010},
+ JOURNALTITLE = {quarterly Journal of Economics},
+ KEYWORDS = {saiz2010geographic},
+ NUMBER = {3},
+ TITLE = {The geographic determinants of housing supply},
+ VOLUME = {125},
+}
+
+@ARTICLE{wang2006another,
+ AUTHOR = {Wang, Peng-fei and Wen, Yi},
+ PUBLISHER = {Elsevier},
+ DATE = {2006},
+ JOURNALTITLE = {Journal of Economic Dynamics and Control},
+ KEYWORDS = {wang2006another},
+ NUMBER = {12},
+ PAGES = {2533--2552},
+ TITLE = {Another look at sticky prices and output persistence},
+ VOLUME = {30},
+}
+
+@REPORT{xu2012role,
+ AUTHOR = {Xu, TengTeng},
+ INSTITUTION = {Faculty of Economics, University of Cambridge},
+ DATE = {2012},
+ KEYWORDS = {xu2012role},
+ TITLE = {The role of credit in international business cycles},
+}
+
+@ARTICLE{zhang2009china,
+ AUTHOR = {Zhang, Wenlang},
+ PUBLISHER = {Elsevier},
+ DATE = {2009},
+ JOURNALTITLE = {Journal of Macroeconomics},
+ KEYWORDS = {zhang2009china},
+ NUMBER = {3},
+ PAGES = {473--484},
+ TITLE = {China’s monetary policy: Quantity versus price rules},
+ VOLUME = {31},
+}
+
+
+ @Book{Yi2014--,
+ Title = {Test},
+ Address = {Address},
+ Author = {Yi and B and C},
+ Publisher = {Publisher},
+ Year = {2014}
+ }
+ @Book{Yi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {BeiJing},
+ Author = {Yi, S H and Zhao, Y X and He, L and Zhang, M L},
+ Publisher = {National Defense Industry Press},
+ Year = {2013}
+ }
+
+ @Periodical{AAAS1883--,
+ Title = {Science},
+ Date = {1883},
+ Editor = {{American Association for the Advancement of Science}},
+ Number = {1},
+ Volume = {1},
+ Location = {Washington, D.C.},
+ Publisher = {American Association for the Advancement of Science}
+}
+
+@Proceedings{ROSENTHALL1963--,
+ Title = {Proceedings of the Fifth Canadian Mathematical Congress, University of Montreal, 1961},
+ Date = {1963},
+ Publisher = {University of Toronto Press},
+ Editor = {E M ROSENTHALL},
+ Location = {Toronto}
+}
+
+@Thesis{CALMS1965--,
+ Title = {Infrared spectroscopic studies on solid oxygen},
+ Author = {R B CALMS},
+ Date = {1965},
+ Institution = {Univ. of California},
+ Location = {Berkeley}
+}
+
+@Report{WHO1970--,
+ Title = {Factors regulating the immune response},
+ Author = {{World Health Organization}},
+ Date = {1970},
+ Institution = {WHO},
+ Location = {Geneva},
+ Titleaddon = {report of WHO Scientific Group}
+}
+
+@Inproceedings{FOURNEY1971-17-38,
+ Title = {Advances in holographic photoelasticity},
+ Author = {M E FOURNEY},
+ Booktitle = {Symposium on Applications of Holography in Mechanics, August 23-25, 1971, University of Southern California, Los Angeles, California},
+ Date = {1971},
+ Pages = {17-38},
+ Publisher = {ASME},
+ Location = {New York}
+}
+
+ @Article{abx2007-500-503,
+ Title = {超声速短化喷管的设计和试验研究},
+ Author = {张敏莉 and 易仕和 and 赵玉新 and 李明},
+ Journal = {空气动力学报},
+ Year = {2007},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ language = {chinese}
+ }
+
+
+
+ @BOOK{张伯伟2002--,
+ AUTHOR = {张伯伟},
+ LOCATION = {南京},
+ PUBLISHER = {江苏古籍出版社},
+ DATE = {2002},
+ KEYWORDS = {张伯伟2002--},
+ PAGES = {288},
+ TITLE = {全唐五代诗格会考},
+ language = {chinese}
+}
+
+@PROCEEDINGS{雷光春2012--,
+ AUTHOR = {雷光春},
+ LOCATION = {北京},
+ PUBLISHER = {海洋出版社},
+ DATE = {2012},
+ KEYWORDS = {雷光春2012--},
+ TITLE = {综合湿地管理:综合湿地管理国际研讨会论文集},
+ language = {chinese}
+}
+
+@REPORT{汤万金2013-09-30--,
+ AUTHOR = {汤万金 and 杨跃翔 and 刘文 and others},
+ URL = {http://www.nstrs.org.cn},
+ DATE = {2013-09-30},
+ KEYWORDS = {汤万金2013-09-30--},
+ TITLE = {人体安全重要技术标准研制最终报告:7178999X},
+ URLDATE = {2014-06-24},
+ language = {chinese}
+}
+
+@INPROCEEDINGS{贾东琴2011-45-52,
+ AUTHOR = {贾东琴 and 柯平},
+ BOOKAUTHOR = {中国图书馆学会},
+ LOCATION = {北京},
+ PUBLISHER = {国家图书馆出版社},
+ BOOKTITLE = {中国图书馆学会年会论文集:2011年卷},
+ DATE = {2011},
+ KEYWORDS = {贾东琴2011-45-52},
+ PAGES = {45--52},
+ TITLE = {面向数字素养的高校图书馆数字服务体系研究},
+ language = {chinese}
+}
+
+@INCOLLECTION{韩吉人1985-90-99,
+ AUTHOR = {韩吉人},
+ BOOKAUTHOR = {中国职工教育研究会},
+ LOCATION = {北京},
+ PUBLISHER = {人民教育出版社},
+ BOOKTITLE = {职工教育研究论文集},
+ DATE = {1985},
+ KEYWORDS = {韩吉人1985-90-99},
+ PAGES = {90--99},
+ TITLE = {论职工教育的特点},
+ language = {chinese}
+}
+
+@THESIS{马欢2011-27-27,
+ AUTHOR = {马欢},
+ INSTITUTION = {清华大学},
+ LOCATION = {北京},
+ URL = {http://www.cnki.net},
+ DATE = {2011},
+ KEYWORDS = {马欢2011-27-27},
+ PAGES = {27},
+ TITLE = {人类活动影响下海河流域典型区水循环变化分析},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@PATENT{张凯军2012-04-05--,
+ AUTHOR = {张凯军},
+ DATE = {2012-04-05},
+ KEYWORDS = {张凯军2012-04-05--},
+ NUMBER = {201220158825.2},
+ TITLE = {轨道火车及高速轨道火车紧急安全制动辅助装置},
+ language = {chinese}
+}
+
+@BOOK{国家环境保护局科技标准司1996-2-3,
+ AUTHOR = {国家环境保护局科技标准司},
+ LOCATION = {北京},
+ PUBLISHER = {中国标准出版社},
+ URL = {http://wenku.baidu.com},
+ DATE = {1996},
+ KEYWORDS = {国家环境保护局科技标准司1996-2-3,standard},
+ NOTE = {standard},
+ PAGES = {2--3},
+ TITLE = {土壤环境质量标准:GB 15616-1995},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@INBOOK{白书农1998-146-163,
+ AUTHOR = {白书农},
+ BOOKAUTHOR = {李承森},
+ LOCATION = {北京},
+ PUBLISHER = {高等教育出版社},
+ BOOKTITLE = {植物科学进展},
+ DATE = {1998},
+ KEYWORDS = {白书农1998-146-163},
+ PAGES = {146--163},
+ TITLE = {植物开花研究},
+ language = {chinese}
+}
+
+@ARTICLE{杨洪升2013-56-75,
+ AUTHOR = {杨洪升},
+ DATE = {2013},
+ JOURNALTITLE = {文献},
+ KEYWORDS = {杨洪升2013-56-75},
+ NUMBER = {1},
+ PAGES = {56--75},
+ TITLE = {四库馆私家抄校书考略},
+ language = {chinese}
+}
+
+@COLLECTION{中国职工教育研究会1985--,
+ AUTHOR = {中国职工教育研究会},
+ LOCATION = {北京},
+ PUBLISHER = {人民教育出版社},
+ DATE = {1985},
+ KEYWORDS = {中国职工教育研究会1985--},
+ TITLE = {职工教育研究论文集},
+ language = {chinese}
+}
+
+@ARTICLE{丁文祥2000--,
+ AUTHOR = {丁文祥},
+ DATE = {2000-11-20},
+ JOURNALTITLE = {中国青年报},
+ KEYWORDS = {丁文祥2000--,news},
+ NOTE = {news},
+ NUMBER = {15},
+ TITLE = {数字革命与竞争国际化},
+ language = {chinese}
+}
+
+@ONLINE{李强2012-05-03--,
+ AUTHOR = {李强},
+ URL = {http://wenku.baidu.com},
+ DATE = {2012-05-03},
+ KEYWORDS = {李强2012-05-03--},
+ TITLE = {化解医患矛盾需釜底抽薪},
+ URLDATE = {2013-03-25},
+ language = {chinese}
+}
+
+@PERIODICAL{中华医学会湖北分会1984--,
+ EDITOR = {中华医学会湖北分会},
+ INSTITUTION = {中华医学会湖北分会},
+ LOCATION = {武汉},
+ DATE = {1984},
+ KEYWORDS = {中华医学会湖北分会1984--},
+ NUMBER = {1},
+ TITLE = {临床内科杂志},
+ VOLUME = {1},
+ language = {chinese}
+}
+ \end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+
\title{\LaTeX{} 参考文献之 \newline
Biblatex宏包使用和GB/T7714-2015参考文献样式}
@@ -47,10 +631,50 @@ Biblatex宏包使用和GB/T7714-2015参考文献样式}
\begin{frame}{参考文献}
%\noindent\setlength{\parindent}{0pt}
-\printbibliography[heading=bibliography,title=参考文献]
+\printbibliography[segment=0,heading=bibliography,title=参考文献]
\end{frame}
+\begin{frame}
+ created with biblatex v\versionofbiblatex, last revised at \today;\\ \hspace*{1.5em} Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.
+ \begin{refsegment}
+ 文献\cite{adam2011house,AAAS1883--,bernanke1989agency,CALMS1965--,
+calvo2006phoenix,davis2005housing,enders2009international,
+fazzari1993working,FOURNEY1971-17-38,greenwood1988investment}
+ \end{refsegment}
+ \begin{refsegment}
+ \cite{hayashi1985tests,iacoviello2005house,jermann2012macroeconomic,
+ khan2013credit,kiyotaki1997credit,kocherlakota2000creating,lucas1987money,
+ lucas1976econometric,WHO1970--,quadrini2011financial}
+ \end{refsegment}
+ \begin{refsegment}
+ \cite{ROSENTHALL1963--,saiz2010geographic,wang2006another,xu2012role,
+ Yi2014--,Yi2013--,zhang2009china, 白书农1998-146-163,
+ 丁文祥2000--,方军雄2007所有制}
+ \end{refsegment}
+ \begin{refsegment}
+ \cite{国家环境保护局科技标准司1996-2-3,韩吉人1985-90-99,贾东琴2011-45-52,雷光春2012--,李强2012-05-03--,李晓西1994转轨过程中的结构性通货膨胀,刘凤良2017,楼继伟2016改革,吕捷2015cpi,罗德明2012要素市场扭曲,马欢2011-27-27,汤万金2013-09-30--}
+ \end{refsegment}
+ \begin{refsegment}
+ \cite{王国静2014金融冲击,王文甫2010价格粘性,徐伟康2010对,杨光2015经济波动,杨洪升2013-56-75,杨汝岱2015中国制造,张伯伟2002--,张成思2010长期均衡,张凯军2012-04-05--,abx2007-500-503,中国职工教育研究会1985--,中华医学会湖北分会1984--}
+ \end{refsegment}
+ \end{frame}
+ \begin{frame}
+ \printbibliography[segment=1]
+ \end{frame}
+ \begin{frame}
+ \printbibliography[segment=2]
+ \end{frame}
+ \begin{frame}
+ \printbibliography[segment=3]
+ \end{frame}
+ \begin{frame}
+ \printbibliography[segment=4]
+ \end{frame}
+ \begin{frame}
+ \printbibliography[segment=5]
+ \end{frame}
+
\end{document}
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeameray.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeameray.pdf
index eb914595835..d1c519a2068 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeameray.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbeameray.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooks.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooks.pdf
deleted file mode 100644
index bec81ef6e42..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooks.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooksay.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooksay.pdf
deleted file mode 100644
index 5c37425a52f..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooksay.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmt.jpg b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmt.jpg
deleted file mode 100644
index 12393130041..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmt.jpg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmt.png b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmt.png
new file mode 100644
index 00000000000..59f25259af0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmt.png
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmta.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmta.pdf
deleted file mode 100644
index cf021af2b2c..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmta.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmtb.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmtb.pdf
deleted file mode 100644
index e127c2c7ff3..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmtb.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalse.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalse.pdf
deleted file mode 100644
index 8f10aa27be8..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalse.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalseay.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalseay.pdf
deleted file mode 100644
index b2ff054bf31..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalseay.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrue.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrue.pdf
deleted file mode 100644
index b67703de2d8..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrue.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrueay.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrueay.pdf
deleted file mode 100644
index 2c4a2dee70f..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrueay.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubfalse.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubfalse.pdf
deleted file mode 100644
index 420cb81eea9..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubfalse.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubtrue.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubtrue.pdf
deleted file mode 100644
index dc8ce90822d..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubtrue.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournal.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournal.pdf
deleted file mode 100644
index 436dce300e4..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournal.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournalay.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournalay.pdf
deleted file mode 100644
index 00bf15c7730..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournalay.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonline.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonline.pdf
deleted file mode 100644
index 68ef7332c5c..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonline.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonlineay.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonlineay.pdf
deleted file mode 100644
index 804ca689288..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonlineay.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcd.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcd.pdf
deleted file mode 100644
index 18aec55f2b7..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcd.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcday.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcday.pdf
deleted file mode 100644
index 7008e1ccc25..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcday.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreport.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreport.pdf
deleted file mode 100644
index 6d2a8ef1ec3..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreport.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreportay.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreportay.pdf
deleted file mode 100644
index 3b347bceeb0..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreportay.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egspecialchar.bib b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egspecialchar.bib
index 7891355d285..28357202d7c 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egspecialchar.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egspecialchar.bib
@@ -1,10 +1,10 @@
%% LaTeX2e file `example/egspecialchar.bib'
%% generated by the `filecontents' environment
-%% from source `biblatex-gb7714-2015' on 2018/04/10.
+%% from source `biblatex-gb7714-2015' on 2018/07/02.
%%
@Inproceedings{ref-replace-char,
Title = {Cognitive Radio and Cooperative Strategies for Power Saving in Multi-Standard Wireless Devices},
- Address = { Florence, Italy},
+ Address = {Florence, Italy},
Author = {Rodriguez, J. and P. Marques and A. Radwan and K. Moessner and R. Tafazolli and others},
Booktitle = {Future % Network & Mobile # Summit 2010},
Date = {June 2010}
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.bib b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.bib
deleted file mode 100644
index 8c5a62c9643..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.bib
+++ /dev/null
@@ -1,86 +0,0 @@
-% This file was created with JabRef 2.11.
-% Encoding: UTF8
-
-
-@Online{1989--,
- Title = {PACS-L:the public-access computer systems forum},
- Date = {1989},
- Url = {http://info.lib.uh.edu/pacsl.html},
- Urldate = {1995-05-17},
- Location = {Houston},
- Publisher = {Tex: University of Houston Libraries}
-}
-
-@Online{李强2012-05-03--,
- Title = {化解医患矛盾需釜底抽薪},
- Author = {李强},
- Url = {http://wenku.baidu.com},
- Urldate = {2013-03-25},
- Year = {2012-05-03}
-}
-
-@Online{Dublin2012-06-14--,
- Title = {Dublin Core metadata element set: version 1.1},
- Url = {http://dublincore.org},
- Urldate = {2014-06-11},
- Year = {2012-06-14}
-}
-
-@Online{Alliance--,
- Url = {www.wimedia.org}
-}
-
-@Online{Commonwealth--,
- Title = {Pennsylvania library laws},
- Author = {{Commonwealth libraries bureau of library development.Pennsylvania department of education office}},
- Url = {http://www.racc.edu},
- Urldate = {2013-03-24}
-}
-
-@Online{HOPKINSON--,
- Title = {UNIMARC and metadata: Dublin Core},
- Author = {A HOPKINSON},
- Url = {http://www.rfla.org/IV/rfla64/13801613.htm},
- Urldate = {1999-12-08}
-}
-
-@Online{JabRef中文手册--,
- Title = {JabRef中文手册},
- Url = {http://blog.csdn.net/zd0303/article/details/7676807}
-}
-
-@Online{OCLC--,
- Title = {History of OCLC},
- Author = {{Online Computer Library Center, Inc.}},
- Url = {http://www.oclc.org/about/history/default.htm},
- Urldate = {2000-01-08}
-}
-
-@Online{olqa2016--,
- Title = {求助beamerposter制作海报时参考文献样式的问题},
- Date = {2016},
- Url = {http://bbs.ctex.org/forum.php?mod=viewthread&tid=153061&page=1&extra=#pid544787}
-}
-
-@Online{北京交通大学研究生公众号2016--,
- Title = {新学期定个小目标—学会在LaTeX中管理参考文献},
- Author = {北京交通大学研究生公众号},
- Date = {2016-09-17},
- Url = {http://www.latexstudio.net/archives/7488}
-}
-
-@Online{olref2016--,
- Title = {如何在LaTeX写作中管理参考文献?},
- Date = {2016-08-12},
- Url = {http://www.latexstudio.net/archives/7131}
-}
-
-@Online{文献助手2016--,
- Title = {参考文献格式搜索神器上线了},
- Author = {文献助手},
- Date = {2016-09-21},
- Url = {http://www.latexstudio.net/archives/7560}
-}
-
-@comment{jabref-entrytype: Online: req[author;title;date;url;urldate] opt[doi]}
-
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.pdf
index 1109f08c5fd..3d30d95136d 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.tex
index f847b89ddea..fccc2e9337a 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egtest.tex
@@ -1,64 +1,746 @@
\documentclass[twoside]{article}
-\usepackage{ctex}
-\usepackage{geometry}
-\geometry{paperwidth=21cm,paperheight=29cm,top=1.5cm, bottom=1.5cm, left=2.54cm,right=2.54cm}
-\usepackage{xcolor}
-\usepackage[CJKbookmarks,colorlinks,bookmarksnumbered=true,pdfstartview=FitH,linkcolor=blue]{hyperref}
-\usepackage[backend=biber,style=gb7714-2015,gbtype=true]{biblatex}%align=gb7714-2015
-%\addbibresource[location=local]{egtest.bib}
-\addbibresource[location=local]{example.bib}
-%\addbibresource[location=local]{egspecialchar.bib}
-%\renewcommand{\bibfont}{\zihao{5}}
-%\setlength{\bibitemsep}{0ex}
-%\setlength{\bibnamesep}{0ex}
-%\setlength{\bibinitsep}{0ex}
-%\renewcommand{\thefootnote}{\textcircled{\tiny\arabic{footnote}}}
-
-\begin{document}
-编译信息:biblatex v\versionofbiblatex;gb7714-2015*.* version number \versionofgbtstyle.
-%%%测试作者年/biblatex版本兼容性的文件
-%%%test file for author year style
-
-\section{文献表}
-文献
-\cite{张伯伟2002--}
-\cite{雷光春2012--}
-\cite{汤万金2013-09-30--}
-\cite{贾东琴2011-45-52}
-\cite{韩吉人1985-90-99}
-\cite{马欢2011-27-27}
-\cite{张凯军2012-04-05--}
-\cite{国家环境保护局科技标准司1996-2-3}
-\cite{白书农1998-146-163}
-\cite{杨洪升2013-56-75}
-\cite{中国职工教育研究会1985--}
-\cite{丁文祥2000--}
-\cite{李强2012-05-03--}
-\cite{中华医学会湖北分会1984--}
-
-
-%\cite{1962-50-50,2009-155-155}
-%
-%\cite{olnoauthorcn}
-%\cite{olnoauthoren}
-%\cite{Allianceurlonly}
-%
-%\cite{萧钰2001--}
-%\cite{李强2012-05-03--,Commonwealth--,HOPKINSON--,OCLC--}
-%\cite{傅刚2000--}
-%\cite{蔡敏2006--}
-%\cite{Saito2006-169-176}
-%\cite{CRAWFPRD1995--}\cite{Proakis2007--}
-%\cite{Giorgetti2005-1037-1042,Giorgetti2005-794-798}
-%\cite{Haemaelaeinen2002-1712-1721}
-%\cite{Oetiker2011--}
-%\cite{刘彻东1998-38-39}
-%\cite{Commonwealth--}
-
-{
-%\hyphenation{kurose-gawa}
-%\hyphenpenalty=1000
-%\tolerance=500
-\printbibliography%[heading=subbibintoc,title=【参考文献】]
-}
-\end{document} \ No newline at end of file
+ \usepackage{ctex}
+ \usepackage{xcolor}
+ \usepackage{toolbox}
+ \usepackage{hyperref}
+ \usepackage{lipsum}
+ \usepackage[top=10pt,bottom=10pt,left=1cm,right=1cm,showframe,showcrop]{geometry}
+
+%\usepackage[backend=biber,style=chem-biochem]{biblatex}
+%\usepackage[backend=biber,style=gb7714-2015ay,gbalign=gb7714-2015,gbbiblabel=bracket]{biblatex}
+\usepackage[backend=biber,style=gb7714-2015,gbalign=center,gbbiblabel=bracket]{biblatex}
+%\setlength{\bibhang}{0pt}
+%\setlength{\bibitemindent}{0em}
+
+%\usepackage[backend=biber,style=numeric-comp,giveninits=false]{biblatex}%giveninits=false
+
+%\csdef{mkdaterangegb7714-2015}#1{#1}
+
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+
+
+
+
+@patent{IEEEexample:jppat,
+ author = "U. Hideki",
+ title = "Quadrature Modulation Circuit",
+ type = "patentjp",
+ number = "152932/92",
+ year = "1992-05-20"
+}
+
+@patent{IEEEexample:frenchpatreq,
+ author = "F. Kowalik and M. Isard",
+ title = "Estimateur d'un D{\'e}faut de Fonctionnement
+ d'un Modulateur en Quadrature et {\'E}tage de Modulation
+ l'Utilisant",
+ language = "french",
+ type = "French Patent Request",
+ number = "9500261",
+ year = "1995-01-11"
+}
+
+@patent{IEEEexample:uspat,
+ author = "Ronald E. Sorace and Victor S. Reinhardt and
+ Steven A. Vaughn",
+ holder = "Hughes Aircraft Company",
+ location = "Los Angeles, CA",
+ title = "High-Speed Digital-to-{RF} Converter",
+ type = "patentus",
+ number = "5668842",
+ yearfiled = "1995-02-28",
+ year = "1997-09-16",
+}
+
+
+@inbook{IEEEexample:repeatedauthorone,
+ author = "W. Dai and H. V. Pham and O. Milenkovic",
+ title = "Distortion-rate functions for quantized compressive sensing",
+ booktitle =
+ "IEEE Information Theory Workshop on Networking and Information Theory",
+ year = "2009"
+}
+
+@inbook{IEEEexample:repeatedauthortwo,
+ author = "W. Dai and H. V. Pham and O. Milenkovic",
+ title = "comparative study of quantized compressive sensing schemes",
+ booktitle =
+ "IEEE Information Theory Workshop on Networking and Information Theory",
+ year = "2009"
+}
+
+
+@thesis{IEEEexample:masterstype,
+ author = "A. Karnik",
+ title = "Performance of {TCP} Congestion Control with Rate
+ Feedback: {TCP/ABR} and Rate Adaptive {TCP/IP}",
+ institution = "Indian Institute of Science",
+ type = "M. Eng. thesis",
+ location = "Bangalore, India",
+ year = "1999-01"
+}
+
+@unpublished{IEEEexample:unpublished,
+ author = "T. J. Ott and N. Aggarwal",
+ title = "{TCP} over {ATM}: {ABR} or {UBR}",
+ howpublished = "Unpublished"
+}
+
+
+
+
+@database{databaseeg,
+ AUTHOR = {Zhang, San},
+ DATE = {2007},
+ TITLE = {A data base},
+ medium={CD}
+}
+
+@dataset{dataseteg,
+ AUTHOR = {Zhang, Yi},
+ DATE = {2008},
+ TITLE = {A data set},
+ medium={DK}
+}
+
+@archive{archiveeg,
+ AUTHOR = {Zhang, Er},
+ DATE = {2009},
+ TITLE = {An archive for friend B},
+ medium={MT}
+}
+
+@software{softwareeg,
+ AUTHOR = {Zhang, Liu},
+ DATE = {2009},
+ TITLE = {A software for science computation},
+ medium={CD}
+}
+
+@map{mapeg,
+ AUTHOR = {Zhang, Si},
+ DATE = {2010},
+ TITLE = {An map},
+}
+
+@Misc{Misceg,
+ AUTHOR = {Zhang, Wu},
+ DATE = {2010},
+ TITLE = {An unknow type reference},
+}
+
+@ARTICLE{aritileeg,
+ AUTHOR = {Zhang, Qi},
+ DATE = {2007},
+ JOURNALTITLE = {An periodical},
+ PAGES = {82--92},
+ TITLE = {An article for test},
+ VOLUME = {12},
+ NUMBER ={2},
+ mark={J},
+ medium={OL},
+}
+
+@ARTICLE{方军雄2007所有制,
+ AUTHOR = {方军雄},
+ DATE = {2007},
+ JOURNALTITLE = {经济研究},
+ PAGES = {82--92},
+ TITLE = {所有制, 制度环境与信贷资金配置},
+ VOLUME = {12},
+}
+
+@ARTICLE{李晓西1994转轨过程中的结构性通货膨胀,
+ AUTHOR = {李晓西},
+ DATE = {1994},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {李晓西1994转轨过程中的结构性通货膨胀},
+ NUMBER = {10},
+ PAGES = {28--32},
+ TITLE = {转轨过程中的结构性通货膨胀},
+}
+
+@ARTICLE{刘凤良2017,
+ AUTHOR = {刘凤良 and 章潇萌 and 于泽},
+ DATE = {2017},
+ JOURNALTITLE = {金融研究},
+ KEYWORDS = {刘凤良2017},
+ NUMBER = {2},
+ PAGES = {54--69},
+ TITLE = {高投资、结构失衡与价格指数二元分化},
+}
+
+@ARTICLE{楼继伟2016改革,
+ AUTHOR = {楼继伟},
+ DATE = {2016},
+ JOURNALTITLE = {求是},
+ KEYWORDS = {楼继伟2016改革},
+ NUMBER = {1},
+ PAGES = {24--26},
+ TITLE = {中国经济最大潜力在于改革},
+}
+
+@ARTICLE{吕捷2015cpi,
+ AUTHOR = {吕捷 and 王高望},
+ DATE = {2015},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {吕捷2015cpi},
+ PAGES = {011},
+ TITLE = {CPI 与 PPI “背离” 的结构性解释},
+ VOLUME = {4},
+}
+
+@ARTICLE{罗德明2012要素市场扭曲,
+ AUTHOR = {罗德明 and 李晔 and 史晋川},
+ DATE = {2012},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {罗德明2012要素市场扭曲},
+ NUMBER = {3},
+ PAGES = {4--14},
+ TITLE = {要素市场扭曲、资源错置与生产率},
+}
+
+@ARTICLE{王国静2014金融冲击,
+ AUTHOR = {王国静 and 田国强},
+ DATE = {2014},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {王国静2014金融冲击},
+ NUMBER = {3},
+ PAGES = {20--34},
+ TITLE = {金融冲击和中国经济波动},
+ VOLUME = {49},
+}
+
+@ARTICLE{王文甫2010价格粘性,
+ AUTHOR = {王文甫},
+ DATE = {2010},
+ JOURNALTITLE = {管理世界},
+ KEYWORDS = {王文甫2010价格粘性},
+ NUMBER = {9},
+ PAGES = {11--25},
+ TITLE = {价格粘性, 流动性约束与中国财政政策的宏观效应——动态新凯恩斯主义视角},
+}
+
+@ARTICLE{徐伟康2010对,
+ AUTHOR = {徐伟康},
+ DATE = {2010},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {徐伟康2010对},
+ NUMBER = {5},
+ PAGES = {139--148},
+ TITLE = {对《 消费者价格指数与生产者价格指数: 谁带动谁?》 一文的质疑},
+}
+
+@ARTICLE{杨光2015经济波动,
+ AUTHOR = {杨光 and 孙浦阳 and 龚刚},
+ DATE = {2015},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {杨光2015经济波动},
+ NUMBER = {2},
+ PAGES = {47--60},
+ TITLE = {经济波动, 成本约束与资源配置},
+ VOLUME = {50},
+}
+
+@ARTICLE{杨汝岱2015中国制造,
+ AUTHOR = {杨汝岱},
+ DATE = {2015},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {杨汝岱2015中国制造},
+ PAGES = {61--74},
+ TITLE = {中国制造业企业全要素生产率研究},
+ VOLUME = {2},
+}
+
+@ARTICLE{张成思2010长期均衡,
+ AUTHOR = {张成思},
+ DATE = {2010},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {张成思2010长期均衡},
+ PAGES = {42--52},
+ TITLE = {长期均衡, 价格倒逼与货币驱动},
+ VOLUME = {6},
+}
+
+@INCOLLECTION{adam2011house,
+ AUTHOR = {Adam, Klaus and Kuang, Pei and Marcet, Albert},
+ PUBLISHER = {University of Chicago Press},
+ BOOKTITLE = {NBER Macroeconomics Annual 2011, Volume 26},
+ DATE = {2011},
+ KEYWORDS = {adam2011house},
+ PAGES = {77--122},
+ TITLE = {House price booms and the current account},
+}
+
+@ARTICLE{bernanke1989agency,
+ AUTHOR = {Bernanke, Ben and Gertler, Mark},
+ PUBLISHER = {JSTOR},
+ DATE = {1989},
+ JOURNALTITLE = {The American Economic Review},
+ KEYWORDS = {bernanke1989agency},
+ PAGES = {14--31},
+ TITLE = {Agency costs, net worth, and business fluctuations},
+}
+
+@REPORT{calvo2006phoenix,
+ AUTHOR = {Calvo, Guillermo A and Izquierdo, Alejandro and Talvi, Ernesto},
+ INSTITUTION = {National Bureau of Economic Research},
+ DATE = {2006},
+ KEYWORDS = {calvo2006phoenix},
+ TITLE = {Phoenix miracles in emerging markets: recovering without credit from systemic financial crises},
+}
+
+@ARTICLE{davis2005housing,
+ AUTHOR = {Davis, Morris A and Heathcote, Jonathan},
+ PUBLISHER = {Wiley Online Library},
+ DATE = {2005},
+ JOURNALTITLE = {International Economic Review},
+ KEYWORDS = {davis2005housing},
+ NUMBER = {3},
+ PAGES = {751--784},
+ TITLE = {Housing and the business cycle},
+ VOLUME = {46},
+}
+
+@ARTICLE{enders2009international,
+ AUTHOR = {Enders, Zeno and M{ü}ller, Gernot J},
+ PUBLISHER = {Elsevier},
+ DATE = {2009},
+ JOURNALTITLE = {Journal of International Economics},
+ KEYWORDS = {enders2009international},
+ NUMBER = {1},
+ PAGES = {45--59},
+ TITLE = {On the international transmission of technology shocks},
+ VOLUME = {78},
+}
+
+@ARTICLE{fazzari1993working,
+ AUTHOR = {Fazzari, Steven M and Petersen, Bruce C},
+ PUBLISHER = {JSTOR},
+ DATE = {1993},
+ JOURNALTITLE = {The RAND Journal of Economics},
+ KEYWORDS = {fazzari1993working},
+ PAGES = {328--342},
+ TITLE = {Working capital and fixed investment: new evidence on financing constraints},
+}
+
+@ARTICLE{greenwood1988investment,
+ AUTHOR = {Greenwood, Jeremy and Hercowitz, Zvi and Huffman, Gregory W},
+ PUBLISHER = {JSTOR},
+ DATE = {1988},
+ JOURNALTITLE = {The American Economic Review},
+ KEYWORDS = {greenwood1988investment},
+ PAGES = {402--417},
+ TITLE = {Investment, capacity utilization, and the real business cycle},
+}
+
+@ARTICLE{hayashi1985tests,
+ AUTHOR = {Hayashi, Fumio},
+ DATE = {1985},
+ JOURNALTITLE = {NBER Working Paper},
+ KEYWORDS = {hayashi1985tests},
+ NUMBER = {w1720},
+ TITLE = {Tests for Liquidity Constraints: a Critical Survey},
+}
+
+@ARTICLE{iacoviello2005house,
+ AUTHOR = {Iacoviello, Matteo},
+ PUBLISHER = {American Economic Association},
+ DATE = {2005},
+ JOURNALTITLE = {The American economic review},
+ KEYWORDS = {iacoviello2005house},
+ NUMBER = {3},
+ PAGES = {739--764},
+ TITLE = {House prices, borrowing constraints, and monetary policy in the business cycle},
+ VOLUME = {95},
+}
+
+@ARTICLE{jermann2012macroeconomic,
+ AUTHOR = {Jermann, Urban and Quadrini, Vincenzo},
+ PUBLISHER = {American Economic Association},
+ DATE = {2012},
+ JOURNALTITLE = {The American Economic Review},
+ KEYWORDS = {jermann2012macroeconomic},
+ NUMBER = {1},
+ PAGES = {238--271},
+ TITLE = {Macroeconomic effects of financial shocks},
+ VOLUME = {102},
+}
+
+@ARTICLE{khan2013credit,
+ AUTHOR = {Khan, Aubhik and Thomas, Julia K},
+ PUBLISHER = {University of Chicago Press},
+ DATE = {2013},
+ JOURNALTITLE = {Journal of Political Economy},
+ KEYWORDS = {khan2013credit},
+ NUMBER = {6},
+ PAGES = {1055--1107},
+ TITLE = {Credit shocks and aggregate fluctuations in an economy with production heterogeneity},
+ VOLUME = {121},
+}
+
+@ARTICLE{kiyotaki1997credit,
+ AUTHOR = {Kiyotaki, Nobuhiro and Moore, John},
+ PUBLISHER = {University of Chicago Press},
+ DATE = {1997},
+ JOURNALTITLE = {Journal of Political Economy},
+ KEYWORDS = {kiyotaki1997credit},
+ NUMBER = {2},
+ PAGES = {211--248},
+ TITLE = {Credit cycles},
+ VOLUME = {105},
+}
+
+@ARTICLE{kocherlakota2000creating,
+ AUTHOR = {Kocherlakota, Narayana and others},
+ DATE = {2000},
+ JOURNALTITLE = {Federal Reserve Bank of Minneapolis Quarterly Review},
+ KEYWORDS = {kocherlakota2000creating},
+ NUMBER = {3},
+ PAGES = {2--10},
+ TITLE = {Creating business cycles through credit constraints},
+ VOLUME = {24},
+}
+
+@INPROCEEDINGS{lucas1976econometric,
+ AUTHOR = {Lucas, Robert E},
+ ORGANIZATION = {North-Holland},
+ BOOKTITLE = {Carnegie-Rochester conference series on public policy},
+ DATE = {1976},
+ KEYWORDS = {lucas1976econometric},
+ PAGES = {19--46},
+ TITLE = {Econometric policy evaluation: A critique},
+ VOLUME = {1},
+}
+
+@ARTICLE{lucas1987money,
+ AUTHOR = {Lucas, Robert and Stokey, Nancy},
+ PUBLISHER = {Econometric Society},
+ DATE = {1987},
+ JOURNALTITLE = {Econometrica},
+ KEYWORDS = {lucas1987money},
+ NUMBER = {3},
+ PAGES = {491--513},
+ TITLE = {Money and Interest in a Cash-in-Advance Economy},
+ VOLUME = {55},
+}
+
+@ARTICLE{quadrini2011financial,
+ AUTHOR = {Quadrini, Vincenzo},
+ DATE = {2011},
+ JOURNALTITLE = {Economic Quarterly},
+ KEYWORDS = {quadrini2011financial},
+ NUMBER = {3},
+ PAGES = {209--254},
+ TITLE = {Financial Frictions in Macroeconomic Fluctuations},
+ VOLUME = {79},
+}
+
+@ARTICLE{saiz2010geographic,
+ AUTHOR = {Saiz, Albert},
+ PUBLISHER = {JSTOR},
+ DATE = {2010},
+ JOURNALTITLE = {quarterly Journal of Economics},
+ KEYWORDS = {saiz2010geographic},
+ NUMBER = {3},
+ TITLE = {The geographic determinants of housing supply},
+ VOLUME = {125},
+}
+
+@ARTICLE{wang2006another,
+ AUTHOR = {Wang, Peng-fei and Wen, Yi},
+ PUBLISHER = {Elsevier},
+ DATE = {2006},
+ JOURNALTITLE = {Journal of Economic Dynamics and Control},
+ KEYWORDS = {wang2006another},
+ NUMBER = {12},
+ PAGES = {2533--2552},
+ TITLE = {Another look at sticky prices and output persistence},
+ VOLUME = {30},
+}
+
+@REPORT{xu2012role,
+ AUTHOR = {Xu, TengTeng},
+ INSTITUTION = {Faculty of Economics, University of Cambridge},
+ DATE = {2012},
+ KEYWORDS = {xu2012role},
+ TITLE = {The role of credit in international business cycles},
+}
+
+@ARTICLE{zhang2009china,
+ AUTHOR = {Zhang, Wenlang},
+ PUBLISHER = {Elsevier},
+ DATE = {2009},
+ JOURNALTITLE = {Journal of Macroeconomics},
+ KEYWORDS = {zhang2009china},
+ NUMBER = {3},
+ PAGES = {473--484},
+ TITLE = {China’s monetary policy: Quantity versus price rules},
+ VOLUME = {31},
+}
+
+
+ @Book{Yi2014--,
+ Title = {Test},
+ Address = {Address},
+ Author = {Yi and B and C},
+ Publisher = {Publisher},
+ Year = {2014}
+ }
+ @Book{Yi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {BeiJing},
+ Author = {Yi, S H and Zhao, Y X and He, L and Zhang, M L},
+ Publisher = {National Defense Industry Press},
+ Year = {2013}
+ }
+
+ @Periodical{AAAS1883--,
+ Title = {Science},
+ Date = {1883},
+ Editor = {{American Association for the Advancement of Science}},
+ Number = {1},
+ Volume = {1},
+ Location = {Washington, D.C.},
+ Publisher = {American Association for the Advancement of Science}
+}
+
+@Proceedings{ROSENTHALL1963--,
+ Title = {Proceedings of the Fifth Canadian Mathematical Congress, University of Montreal, 1961},
+ Date = {1963},
+ Publisher = {University of Toronto Press},
+ Editor = {E M ROSENTHALL},
+ Location = {Toronto}
+}
+
+@Thesis{CALMS1965--,
+ Title = {Infrared spectroscopic studies on solid oxygen},
+ Author = {R B CALMS},
+ Date = {1965},
+ Institution = {Univ. of California},
+ Location = {Berkeley}
+}
+
+@Report{WHO1970--,
+ Title = {Factors regulating the immune response},
+ Author = {{World Health Organization}},
+ Date = {1970},
+ Institution = {WHO},
+ Location = {Geneva},
+ Titleaddon = {report of WHO Scientific Group}
+}
+
+@Inproceedings{FOURNEY1971-17-38,
+ Title = {Advances in holographic photoelasticity},
+ Author = {M E FOURNEY},
+ Booktitle = {Symposium on Applications of Holography in Mechanics, August 23-25, 1971, University of Southern California, Los Angeles, California},
+ Date = {1971},
+ Pages = {17-38},
+ Publisher = {ASME},
+ Location = {New York}
+}
+
+ @Article{abx2007-500-503,
+ Title = {超声速短化喷管的设计和试验研究},
+ Author = {张敏莉 and 易仕和 and 赵玉新 and 李明},
+ Journal = {空气动力学报},
+ Year = {2007},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ language = {chinese}
+ }
+
+
+
+ @BOOK{张伯伟2002--,
+ AUTHOR = {张伯伟},
+ LOCATION = {南京},
+ PUBLISHER = {江苏古籍出版社},
+ DATE = {2002},
+ KEYWORDS = {张伯伟2002--},
+ PAGES = {288},
+ TITLE = {全唐五代诗格会考},
+ language = {chinese}
+}
+
+@PROCEEDINGS{雷光春2012--,
+ AUTHOR = {雷光春},
+ LOCATION = {北京},
+ PUBLISHER = {海洋出版社},
+ DATE = {2012},
+ KEYWORDS = {雷光春2012--},
+ TITLE = {综合湿地管理:综合湿地管理国际研讨会论文集},
+ language = {chinese}
+}
+
+@REPORT{汤万金2013-09-30--,
+ AUTHOR = {汤万金 and 杨跃翔 and 刘文 and others},
+ URL = {http://www.nstrs.org.cn},
+ DATE = {2013-09-30},
+ KEYWORDS = {汤万金2013-09-30--},
+ TITLE = {人体安全重要技术标准研制最终报告:7178999X},
+ URLDATE = {2014-06-24},
+ language = {chinese}
+}
+
+@INPROCEEDINGS{贾东琴2011-45-52,
+ AUTHOR = {贾东琴 and 柯平},
+ BOOKAUTHOR = {中国图书馆学会},
+ LOCATION = {北京},
+ PUBLISHER = {国家图书馆出版社},
+ BOOKTITLE = {中国图书馆学会年会论文集:2011年卷},
+ DATE = {2011},
+ KEYWORDS = {贾东琴2011-45-52},
+ PAGES = {45--52},
+ TITLE = {面向数字素养的高校图书馆数字服务体系研究},
+ language = {chinese}
+}
+
+@INCOLLECTION{韩吉人1985-90-99,
+ AUTHOR = {韩吉人},
+ BOOKAUTHOR = {中国职工教育研究会},
+ LOCATION = {北京},
+ PUBLISHER = {人民教育出版社},
+ BOOKTITLE = {职工教育研究论文集},
+ DATE = {1985},
+ KEYWORDS = {韩吉人1985-90-99},
+ PAGES = {90--99},
+ TITLE = {论职工教育的特点},
+ language = {chinese}
+}
+
+@THESIS{马欢2011-27-27,
+ AUTHOR = {马欢},
+ INSTITUTION = {清华大学},
+ LOCATION = {北京},
+ URL = {http://www.cnki.net},
+ DATE = {2011},
+ KEYWORDS = {马欢2011-27-27},
+ PAGES = {27},
+ TITLE = {人类活动影响下海河流域典型区水循环变化分析},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@PATENT{张凯军2012-04-05--,
+ AUTHOR = {张凯军},
+ DATE = {2012-04-05},
+ KEYWORDS = {张凯军2012-04-05--},
+ NUMBER = {201220158825.2},
+ TITLE = {轨道火车及高速轨道火车紧急安全制动辅助装置},
+ language = {chinese}
+}
+
+@BOOK{国家环境保护局科技标准司1996-2-3,
+ AUTHOR = {国家环境保护局科技标准司},
+ LOCATION = {北京},
+ PUBLISHER = {中国标准出版社},
+ URL = {http://wenku.baidu.com},
+ DATE = {1996},
+ KEYWORDS = {国家环境保护局科技标准司1996-2-3,standard},
+ NOTE = {standard},
+ PAGES = {2--3},
+ TITLE = {土壤环境质量标准:GB 15616-1995},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@INBOOK{白书农1998-146-163,
+ AUTHOR = {白书农},
+ BOOKAUTHOR = {李承森},
+ LOCATION = {北京},
+ PUBLISHER = {高等教育出版社},
+ BOOKTITLE = {植物科学进展},
+ DATE = {1998},
+ KEYWORDS = {白书农1998-146-163},
+ PAGES = {146--163},
+ TITLE = {植物开花研究},
+ language = {chinese}
+}
+
+@ARTICLE{杨洪升2013-56-75,
+ AUTHOR = {杨洪升},
+ DATE = {2013},
+ JOURNALTITLE = {文献},
+ KEYWORDS = {杨洪升2013-56-75},
+ NUMBER = {1},
+ PAGES = {56--75},
+ TITLE = {四库馆私家抄校书考略},
+ language = {chinese}
+}
+
+@COLLECTION{中国职工教育研究会1985--,
+ AUTHOR = {中国职工教育研究会},
+ LOCATION = {北京},
+ PUBLISHER = {人民教育出版社},
+ DATE = {1985},
+ KEYWORDS = {中国职工教育研究会1985--},
+ TITLE = {职工教育研究论文集},
+ language = {chinese}
+}
+
+@ARTICLE{丁文祥2000--,
+ AUTHOR = {丁文祥},
+ DATE = {2000-11-20},
+ JOURNALTITLE = {中国青年报},
+ KEYWORDS = {丁文祥2000--,news},
+ NOTE = {news},
+ NUMBER = {15},
+ TITLE = {数字革命与竞争国际化},
+ language = {chinese}
+}
+
+@ONLINE{李强2012-05-03--,
+ AUTHOR = {李强},
+ URL = {http://wenku.baidu.com},
+ DATE = {2012-05-03},
+ KEYWORDS = {李强2012-05-03--},
+ TITLE = {化解医患矛盾需釜底抽薪},
+ URLDATE = {2013-03-25},
+ language = {chinese}
+}
+
+@PERIODICAL{中华医学会湖北分会1984--,
+ EDITOR = {中华医学会湖北分会},
+ INSTITUTION = {中华医学会湖北分会},
+ LOCATION = {武汉},
+ DATE = {1984},
+ KEYWORDS = {中华医学会湖北分会1984--},
+ NUMBER = {1},
+ TITLE = {临床内科杂志},
+ VOLUME = {1},
+ language = {chinese}
+}
+\end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+ \makeatletter
+ \def\versionofgbtstyle{2018/04/03 v1.0k}
+ \def\versionofbiblatex{\abx@version}
+ \makeatother
+ %\renewcommand{\bibtitlefont}{\kaishu}
+
+ \begin{document}
+ \section{set title}
+
+ \framebox{1}
+ \textcircled{12}
+
+ \meaning\mkgbnumlabel
+
+ %\csuse{mkdaterangegb7714-2015}{abc}
+
+ created with biblatex v\versionofbiblatex, last revised at \today;\\ \hspace*{1.5em} Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.
+
+ 文献\nocite{*}
+ 文献\cite{zhang2009china,abx2007-500-503,丁文祥2000--,Yi2013--,张伯伟2002--,国家环境保护局科技标准司1996-2-3,中国职工教育研究会1985--,白书农1998-146-163,adam2011house,韩吉人1985-90-99,FOURNEY1971-17-38,贾东琴2011-45-52,李强2012-05-03--,张凯军2012-04-05--,AAAS1883--,中华医学会湖北分会1984--,ROSENTHALL1963--,雷光春2012--,WHO1970--,汤万金2013-09-30--,CALMS1965--,马欢2011-27-27}
+
+ \cite{IEEEexample:jppat,IEEEexample:frenchpatreq,IEEEexample:uspat,
+IEEEexample:repeatedauthorone,IEEEexample:repeatedauthortwo,
+IEEEexample:masterstype,IEEEexample:unpublished}
+
+ \printbibliography
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatent.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatent.pdf
deleted file mode 100644
index 1a385713c3e..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatent.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatentay.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatentay.pdf
deleted file mode 100644
index 13dcc11301e..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatentay.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/example.bib b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/example.bib
index 525c906e69f..008eaab12a5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/example.bib
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/example.bib
@@ -1,7 +1,9 @@
-% Encoding: UTF-8
+% This file was created with JabRef 2.11.
+% Encoding: UTF8
-@Set{易仕和,2013,
- entryset = {易仕和2013--,Yi2013--},
+
+@Other{易仕和,2013,
+ Entryset = {易仕和2013--,Yi2013--}
}
@Book{王夫之1845--,
@@ -1504,7 +1506,6 @@ Workshop on Computer Algebra in Scientific Computing, Samarkand, October 5-9, 20
Year = {2007}
}
-
@Book{全国广播电视标准化技术委员会2007-1-1,
Title = {广播电视音像资料编目规范:第2部分~ 广播资料:GY/T202.2-2007},
Address = {北京},
@@ -2078,7 +2079,6 @@ Workshop on Computer Algebra in Scientific Computing, Samarkand, October 5-9, 20
Year = {2003}
}
-
@Inbook{马克思2013-302-302,
Title = {政治经济学批判},
Address = {北京},
@@ -2294,7 +2294,9 @@ Workshop on Computer Algebra in Scientific Computing, Samarkand, October 5-9, 20
@Manual{胡振震2016,
Title = {符合 GB7714-2015 标准的 biblatex 参考文献样式文件},
Author = {胡振震},
- Date = {2016-07-01}
+ Date = {2016-07-01},
+ Url = {https://ctan.org/pkg/biblatex-gb7714-2015},
+ Urldate = {2018-04-23}
}
@Online{Alliance--,
@@ -2342,6 +2344,11 @@ Workshop on Computer Algebra in Scientific Computing, Samarkand, October 5-9, 20
Url = {http://blog.csdn.net/zd0303/article/details/7676807}
}
+@Online{JabRefManual--,
+ Title = {JabRef Manual},
+ Url = {http://blog.csdn.net/zd0303/article/details/7676807}
+}
+
@Online{OCLC--,
Title = {History of OCLC},
Author = {{Online Computer Library Center, Inc.}},
@@ -2365,10 +2372,10 @@ Workshop on Computer Algebra in Scientific Computing, Samarkand, October 5-9, 20
}
@Book{standardinfoiso158,
- title = {Information and documentation-the Dublin core metadata element set:ISO 15836:2009},
- note = {standard},
- url = {http://www.iso.org},
- urldate = {2013-03-24},
+ Title = {Information and documentation-the Dublin core metadata element set:ISO 15836:2009},
+ Note = {standard},
+ Url = {http://www.iso.org},
+ Urldate = {2013-03-24}
}
@Book{鸟哥--,
@@ -2438,14 +2445,77 @@ Workshop on Computer Algebra in Scientific Computing, Samarkand, October 5-9, 20
Year = {2015}
}
-@Book{--,
+@Manual{Tantau2015--,
+ Title = {The beamer class -- User Guide for version 3.36},
+ Author = {Till Tantau and Joseph Wright and Vedran Miletić},
+ Date = {2015-03-08},
+ Url = {http://bitbucket.org/rivanvx/beamer}
}
-@Online{JabRefManual--,
- Title = {JabRef Manual},
- Url = {http://blog.csdn.net/zd0303/article/details/7676807}
+@Manual{Oetiker--,
+ Title = {一份不太简短的LATEX2ε介绍},
+ Author = {Tobias Oetiker and Hubert Partl and Irene Hyna and Elisabeth Schlegl},
+ Date = {2017-03},
+ Translator = {ChinaTEX论坛},
+ Url = {https://ctan.org/pkg/lshort-zh-cn},
+ Urldate = {2018-04-23},
+ Version = {5.10}
+}
+
+@Manual{Daly2010--,
+ Title = {Natural Sciences Citations and References (package natbib)},
+ Author = {Patrick W. Daly},
+ Date = {2010-09-13},
+ Url = {https://ctan.org/pkg/natbib},
+ Urldate = {2018-04-27},
+ Version = {8.31b}
}
-@Comment{jabref-meta: databaseType:biblatex;}
+@Manual{Arseneau2010--,
+ Title = {chapterbib multiple bibliographies in LATEX},
+ Author = {Donald Arseneau},
+ Date = {2010-09-05},
+ Url = {https://ctan.org/pkg/chapterbib},
+ Urldate = {2018-04-23}
+}
+
+@Manual{Shell2013--,
+ Title = {Mciteplus: Enhanced Multicitations},
+ Author = {Michael Shell},
+ Date = {2013-09-13},
+ Url = {https://ctan.org/pkg/mciteplus},
+ Urldate = {2018-04-23},
+ Version = {1.2}
+}
+
+@Online{Hansen2008--,
+ Title = {The multibib Package},
+ Author = {Thorsten Hansen},
+ Date = {2008-12-10},
+ Url = {https://www.ctan.org/pkg/multibib},
+ Urldate = {2018-05-04},
+ Version = {v1.4}
+}
+
+@Online{Seindal1994--,
+ Title = {Inline bibliography style},
+ Author = {René Seindal},
+ Date = {1994-12-06},
+ Url = {https://www.ctan.org/pkg/inlinebib},
+ Urldate = {2018-05-04}
+}
+
+@comment{jabref-meta: databaseType:biblatex;}
+
+@comment{jabref-entrytype: Collection: req[author;title;location;publisher;date] opt[]}
+
+@comment{jabref-entrytype: Newspaper: req[] opt[]}
+
+@comment{jabref-entrytype: Online: req[author;title;date;url;urldate;version] opt[doi]}
+
+@comment{jabref-entrytype: Report: req[author;title;type;number;address;institution;date;pages] opt[url;urldate;doi;subtitle]}
+
+@comment{jabref-entrytype: Thesis: req[author;title;type;address;institution;date;pages] opt[url;urldate;doi]}
+
+@comment{jabref-entrytype: Www: req[;author;title;url;urldate] opt[]}
-@Comment{jabref-entrytype: Newspaper: req[] opt[]}
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/filecodegbkeg.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/filecodegbkeg.tex
new file mode 100644
index 00000000000..06d6088e456
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/filecodegbkeg.tex
@@ -0,0 +1,207 @@
+\documentclass[twoside]{article}
+ \usepackage{ctex}
+ \usepackage{xcolor}
+ \usepackage{hyperref}
+ \usepackage{lipsum}
+ %\usepackage[backend=biber,style=caspervector,gbk]{biblatex}
+ \usepackage[backend=biber,style=gb7714-2015ay,gbcodegbk=true]{biblatex}
+ \usepackage{filecontents}
+ \begin{filecontents}{\jobname.bib}
+ @Book{Yi2014--,
+ Title = {Test},
+ Address = {Address},
+ Author = {Yi and B and C},
+ Publisher = {Publisher},
+ Year = {2014}
+ }
+ @Book{Yi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {BeiJing},
+ Author = {Yi, S H and Zhao, Y X and He, L and Zhang, M L},
+ Publisher = {National Defense Industry Press},
+ Year = {2013}
+ }
+
+ @Article{abx2007-500-503,
+ Title = {ٶ̻ܵƺо},
+ Author = { and ˺ and and },
+ Journal = {ѧ},
+ Year = {2007},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ language = {chinese}
+ }
+
+
+ @BOOK{zbw2002--,
+ AUTHOR = {Ųΰ},
+ LOCATION = {Ͼ},
+ PUBLISHER = {չż},
+ DATE = {2002},
+ KEYWORDS = {Ųΰ2002--},
+ PAGES = {288},
+ TITLE = {ȫʫῼ},
+ language = {chinese}
+}
+
+@PROCEEDINGS{lgc2012--,
+ AUTHOR = {׹ⴺ},
+ LOCATION = {},
+ PUBLISHER = {},
+ DATE = {2012},
+ KEYWORDS = {׹ⴺ2012--},
+ TITLE = {ۺʪع:ۺʪعֻļ},
+ language = {chinese}
+}
+
+@REPORT{twj2013-09-30--,
+ AUTHOR = { and Ծ and and others},
+ URL = {http://www.nstrs.org.cn},
+ DATE = {2013-09-30},
+ KEYWORDS = {2013-09-30--},
+ TITLE = {尲ȫҪ׼ձ:7178999X},
+ URLDATE = {2014-06-24},
+ language = {chinese}
+}
+
+@INPROCEEDINGS{jdq2011-45-52,
+ AUTHOR = {ֶ and ƽ},
+ BOOKAUTHOR = {йͼѧ},
+ LOCATION = {},
+ PUBLISHER = {ͼݳ},
+ BOOKTITLE = {йͼѧļ:2011},
+ DATE = {2011},
+ KEYWORDS = {ֶ2011-45-52},
+ PAGES = {45--52},
+ TITLE = {ĸУͼַϵо},
+ language = {chinese}
+}
+
+@INCOLLECTION{hjr1985-90-99,
+ AUTHOR = {},
+ BOOKAUTHOR = {йְо},
+ LOCATION = {},
+ PUBLISHER = {},
+ BOOKTITLE = {ְоļ},
+ DATE = {1985},
+ KEYWORDS = {1985-90-99},
+ PAGES = {90--99},
+ TITLE = {ְص},
+ language = {chinese}
+}
+
+@THESIS{mh2011-27-27,
+ AUTHOR = {},
+ INSTITUTION = {廪ѧ},
+ LOCATION = {},
+ URL = {http://www.cnki.net},
+ DATE = {2011},
+ KEYWORDS = {2011-27-27},
+ PAGES = {27},
+ TITLE = {Ӱºˮѭ仯},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@PATENT{zkj2012-04-05--,
+ AUTHOR = {ſ},
+ DATE = {2012-04-05},
+ KEYWORDS = {ſ2012-04-05--},
+ NUMBER = {201220158825.2},
+ TITLE = {𳵼ٹ𳵽ȫƶװ},
+ language = {chinese}
+}
+
+@BOOK{gjhjbhs1996-2-3,
+ AUTHOR = {һֿƼ׼˾},
+ LOCATION = {},
+ PUBLISHER = {й׼},
+ URL = {http://wenku.baidu.com},
+ DATE = {1996},
+ KEYWORDS = {һֿƼ׼˾1996-2-3,standard},
+ NOTE = {standard},
+ PAGES = {2--3},
+ TITLE = {׼:GB 15616-1995},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@INBOOK{bsn1998-146-163,
+ AUTHOR = {ũ},
+ BOOKAUTHOR = {ɭ},
+ LOCATION = {},
+ PUBLISHER = {ߵȽ},
+ BOOKTITLE = {ֲѧչ},
+ DATE = {1998},
+ KEYWORDS = {ũ1998-146-163},
+ PAGES = {146--163},
+ TITLE = {ֲ↑о},
+ language = {chinese}
+}
+
+@ARTICLE{yhs2013-56-75,
+ AUTHOR = {},
+ DATE = {2013},
+ JOURNALTITLE = {},
+ KEYWORDS = {2013-56-75},
+ NUMBER = {1},
+ PAGES = {56--75},
+ TITLE = {Ŀ˽ҳУ鿼},
+ language = {chinese}
+}
+
+@COLLECTION{zgzyyjh1985--,
+ AUTHOR = {йְо},
+ LOCATION = {},
+ PUBLISHER = {},
+ DATE = {1985},
+ KEYWORDS = {йְо1985--},
+ TITLE = {ְоļ},
+ language = {chinese}
+}
+
+@ARTICLE{dwx2000--,
+ AUTHOR = {},
+ DATE = {2000-11-20},
+ JOURNALTITLE = {й걨},
+ KEYWORDS = {2000--,news},
+ NOTE = {news},
+ NUMBER = {15},
+ TITLE = {ָ뾺ʻ},
+ language = {chinese}
+}
+
+@ONLINE{liq2012-05-03--,
+ AUTHOR = {ǿ},
+ URL = {http://wenku.baidu.com},
+ DATE = {2012-05-03},
+ KEYWORDS = {ǿ2012-05-03--},
+ TITLE = {ҽì踪׳н},
+ URLDATE = {2013-03-25},
+ language = {chinese}
+}
+
+@PERIODICAL{zhyxh1984--,
+ EDITOR = {лҽѧֻ},
+ INSTITUTION = {лҽѧֻ},
+ LOCATION = {人},
+ DATE = {1984},
+ KEYWORDS = {лҽѧֻ1984--},
+ NUMBER = {1},
+ TITLE = {ٴڿ־},
+ VOLUME = {1},
+ language = {chinese}
+}
+ \end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+
+ \begin{document}
+ \section{set title}
+
+ \nocite{*}
+
+ \printbibliography
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/filecodeutfeg.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/filecodeutfeg.tex
new file mode 100644
index 00000000000..b92e1ee905c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/filecodeutfeg.tex
@@ -0,0 +1,253 @@
+\documentclass[twoside]{article}
+ \usepackage{ctex}
+ \usepackage{xcolor}
+ \usepackage{hyperref}
+ \usepackage{lipsum}
+ %\usepackage[backend=biber,style=caspervector,gbk]{biblatex}
+ \usepackage[backend=biber,style=gb7714-2015ay]{biblatex}
+ \usepackage{filecontents}
+ \begin{filecontents}{\jobname.bib}
+ @Book{Yi2014--,
+ Title = {Test},
+ Address = {Address},
+ Author = {Yi and B and C},
+ Publisher = {Publisher},
+ Year = {2014}
+ }
+ @Book{Yi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {BeiJing},
+ Author = {Yi, S H and Zhao, Y X and He, L and Zhang, M L},
+ Publisher = {National Defense Industry Press},
+ Year = {2013}
+ }
+
+ @Periodical{AAAS1883--,
+ Title = {Science},
+ Date = {1883},
+ Editor = {{American Association for the Advancement of Science}},
+ Number = {1},
+ Volume = {1},
+ Location = {Washington, D.C.},
+ Publisher = {American Association for the Advancement of Science}
+}
+
+@Proceedings{ROSENTHALL1963--,
+ Title = {Proceedings of the Fifth Canadian Mathematical Congress, University of Montreal, 1961},
+ Date = {1963},
+ Publisher = {University of Toronto Press},
+ Editor = {E M ROSENTHALL},
+ Location = {Toronto}
+}
+
+@Thesis{CALMS1965--,
+ Title = {Infrared spectroscopic studies on solid oxygen},
+ Author = {R B CALMS},
+ Date = {1965},
+ Institution = {Univ. of California},
+ Location = {Berkeley}
+}
+
+@Report{WHO1970--,
+ Title = {Factors regulating the immune response},
+ Author = {{World Health Organization}},
+ Date = {1970},
+ Institution = {WHO},
+ Location = {Geneva},
+ Titleaddon = {report of WHO Scientific Group}
+}
+
+@Inproceedings{FOURNEY1971-17-38,
+ Title = {Advances in holographic photoelasticity},
+ Author = {M E FOURNEY},
+ Booktitle = {Symposium on Applications of Holography in Mechanics, August 23-25, 1971, University of Southern California, Los Angeles, California},
+ Date = {1971},
+ Pages = {17-38},
+ Publisher = {ASME},
+ Location = {New York}
+}
+
+ @Article{abx2007-500-503,
+ Title = {超声速短化喷管的设计和试验研究},
+ Author = {张敏莉 and 易仕和 and 赵玉新 and 李明},
+ Journal = {空气动力学报},
+ Year = {2007},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ language = {chinese}
+ }
+
+
+
+ @BOOK{张伯伟2002--,
+ AUTHOR = {张伯伟},
+ LOCATION = {南京},
+ PUBLISHER = {江苏古籍出版社},
+ DATE = {2002},
+ KEYWORDS = {张伯伟2002--},
+ PAGES = {288},
+ TITLE = {全唐五代诗格会考},
+ language = {chinese}
+}
+
+@PROCEEDINGS{雷光春2012--,
+ AUTHOR = {雷光春},
+ LOCATION = {北京},
+ PUBLISHER = {海洋出版社},
+ DATE = {2012},
+ KEYWORDS = {雷光春2012--},
+ TITLE = {综合湿地管理:综合湿地管理国际研讨会论文集},
+ language = {chinese}
+}
+
+@REPORT{汤万金2013-09-30--,
+ AUTHOR = {汤万金 and 杨跃翔 and 刘文 and others},
+ URL = {http://www.nstrs.org.cn},
+ DATE = {2013-09-30},
+ KEYWORDS = {汤万金2013-09-30--},
+ TITLE = {人体安全重要技术标准研制最终报告:7178999X},
+ URLDATE = {2014-06-24},
+ language = {chinese}
+}
+
+@INPROCEEDINGS{贾东琴2011-45-52,
+ AUTHOR = {贾东琴 and 柯平},
+ BOOKAUTHOR = {中国图书馆学会},
+ LOCATION = {北京},
+ PUBLISHER = {国家图书馆出版社},
+ BOOKTITLE = {中国图书馆学会年会论文集:2011年卷},
+ DATE = {2011},
+ KEYWORDS = {贾东琴2011-45-52},
+ PAGES = {45--52},
+ TITLE = {面向数字素养的高校图书馆数字服务体系研究},
+ language = {chinese}
+}
+
+@INCOLLECTION{韩吉人1985-90-99,
+ AUTHOR = {韩吉人},
+ BOOKAUTHOR = {中国职工教育研究会},
+ LOCATION = {北京},
+ PUBLISHER = {人民教育出版社},
+ BOOKTITLE = {职工教育研究论文集},
+ DATE = {1985},
+ KEYWORDS = {韩吉人1985-90-99},
+ PAGES = {90--99},
+ TITLE = {论职工教育的特点},
+ language = {chinese}
+}
+
+@THESIS{马欢2011-27-27,
+ AUTHOR = {马欢},
+ INSTITUTION = {清华大学},
+ LOCATION = {北京},
+ URL = {http://www.cnki.net},
+ DATE = {2011},
+ KEYWORDS = {马欢2011-27-27},
+ PAGES = {27},
+ TITLE = {人类活动影响下海河流域典型区水循环变化分析},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@PATENT{张凯军2012-04-05--,
+ AUTHOR = {张凯军},
+ DATE = {2012-04-05},
+ KEYWORDS = {张凯军2012-04-05--},
+ NUMBER = {201220158825.2},
+ TITLE = {轨道火车及高速轨道火车紧急安全制动辅助装置},
+ language = {chinese}
+}
+
+@BOOK{国家环境保护局科技标准司1996-2-3,
+ AUTHOR = {国家环境保护局科技标准司},
+ LOCATION = {北京},
+ PUBLISHER = {中国标准出版社},
+ URL = {http://wenku.baidu.com},
+ DATE = {1996},
+ KEYWORDS = {国家环境保护局科技标准司1996-2-3,standard},
+ NOTE = {standard},
+ PAGES = {2--3},
+ TITLE = {土壤环境质量标准:GB 15616-1995},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@INBOOK{白书农1998-146-163,
+ AUTHOR = {白书农},
+ BOOKAUTHOR = {李承森},
+ LOCATION = {北京},
+ PUBLISHER = {高等教育出版社},
+ BOOKTITLE = {植物科学进展},
+ DATE = {1998},
+ KEYWORDS = {白书农1998-146-163},
+ PAGES = {146--163},
+ TITLE = {植物开花研究},
+ language = {chinese}
+}
+
+@ARTICLE{杨洪升2013-56-75,
+ AUTHOR = {杨洪升},
+ DATE = {2013},
+ JOURNALTITLE = {文献},
+ KEYWORDS = {杨洪升2013-56-75},
+ NUMBER = {1},
+ PAGES = {56--75},
+ TITLE = {四库馆私家抄校书考略},
+ language = {chinese}
+}
+
+@COLLECTION{中国职工教育研究会1985--,
+ AUTHOR = {中国职工教育研究会},
+ LOCATION = {北京},
+ PUBLISHER = {人民教育出版社},
+ DATE = {1985},
+ KEYWORDS = {中国职工教育研究会1985--},
+ TITLE = {职工教育研究论文集},
+ language = {chinese}
+}
+
+@ARTICLE{丁文祥2000--,
+ AUTHOR = {丁文祥},
+ DATE = {2000-11-20},
+ JOURNALTITLE = {中国青年报},
+ KEYWORDS = {丁文祥2000--,news},
+ NOTE = {news},
+ NUMBER = {15},
+ TITLE = {数字革命与竞争国际化},
+ language = {chinese}
+}
+
+@ONLINE{李强2012-05-03--,
+ AUTHOR = {李强},
+ URL = {http://wenku.baidu.com},
+ DATE = {2012-05-03},
+ KEYWORDS = {李强2012-05-03--},
+ TITLE = {化解医患矛盾需釜底抽薪},
+ URLDATE = {2013-03-25},
+ language = {chinese}
+}
+
+@PERIODICAL{中华医学会湖北分会1984--,
+ EDITOR = {中华医学会湖北分会},
+ INSTITUTION = {中华医学会湖北分会},
+ LOCATION = {武汉},
+ DATE = {1984},
+ KEYWORDS = {中华医学会湖北分会1984--},
+ NUMBER = {1},
+ TITLE = {临床内科杂志},
+ VOLUME = {1},
+ language = {chinese}
+}
+ \end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+
+ \begin{document}
+ \section{set title}
+
+ 文献\nocite{*}
+
+ \printbibliography
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makeclear.bat b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makeclear.bat
index 15f275bbb71..bb8a8d821fc 100755
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makeclear.bat
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makeclear.bat
@@ -2,4 +2,4 @@
del /q *.aux *.bbl *.blg *.log *.out *.toc *.bcf *.xml *.synctex *.nlo *.nls *.bak *.ind *.idx *.ilg *.lof *.lot *.ent-x *.tmp *.ltx *.los *.lol *.loc *.listing *.gz *.synctex(busy)
-del /q *.nav *.snm *.vrb
+del /q *.nav *.snm *.vrb *.fls *.xdv *.fdb_latexmk
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makecompilerec.dat b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makecompilerec.dat
index 4aedec45d14..89a92c90198 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makecompilerec.dat
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makecompilerec.dat
@@ -1,33 +1,7 @@
-compiled files info:
-egaligngb7714-2015.tex
-egaligngb7714-2015ay.tex
-egalignleft.tex
-egalignright.tex
-egbeamer.tex
-egbeameray.tex
-egbooks.tex
-egbooksay.tex
-eggbnamefmta.tex
-eggbnamefmtb.tex
-eggbnoauthorfalse.tex
-eggbnoauthorfalseay.tex
-eggbnoauthortrue.tex
-eggbnoauthortrueay.tex
-eggbpubfalse.tex
-eggbpubtrue.tex
-egjournal.tex
-egjournalay.tex
-egonline.tex
-egonlineay.tex
-egprcdorinprcd.tex
-egprcdorinprcday.tex
-egreport.tex
-egreportay.tex
-egtest.tex
-egthesispatent.tex
-egthesispatentay.tex
-biblatex-gb7714-2015.tex
-biblatex-gb7714-2015.tex
-biblatex-gb7714-2015.tex
-biblatex-gb7714-2015.tex
-biblatex-gb7714-2015.tex
+compiled files info:
+egbeamer.tex
+egbeameray.tex
+egtest.tex
+biblatex-gb7714-2015.tex
+biblatex-gb7714-2015.tex
+biblatex-gb7714-2015.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefileeg.bat b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefileeg.bat
index 55ff648da7f..e7c6b485711 100755
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefileeg.bat
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefileeg.bat
@@ -6,6 +6,7 @@ copy ..\gb7714-2015.bbx . /y
copy ..\gb7714-2015.cbx . /y
copy ..\gb7714-2015ay.bbx . /y
copy ..\gb7714-2015ay.cbx . /y
+copy ..\gb7714-2015-gbk.def . /y
)
echo compiled files info: > makecompilerec.dat
@@ -27,8 +28,14 @@ setlocal DISABLEDELAYEDEXPANSION
call makeclear
+::call maketestutf.bat
+::call maketestgbk.bat
+
+call makeclear
+
del *.bbx /Q
del *.cbx /Q
+del *.def /Q
::pause
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefileegtest.bat b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefileegtest.bat
deleted file mode 100755
index edf183038f8..00000000000
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefileegtest.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-:: Copyright (c) 2012-2016 hzz
-
-@echo off
-
-IF NOT EXIST gb7714-2015.bbx (
-copy ..\gb7714-2015.bbx . /y
-copy ..\gb7714-2015.cbx . /y
-copy ..\gb7714-2015ay.bbx . /y
-copy ..\gb7714-2015ay.cbx . /y
-)
-
-
-:: compile the tex file
-
-xelatex.exe --synctex=-1 egtest.tex
-biber egtest
-xelatex.exe --synctex=-1 egtest.tex
-
-del *.bbx /Q
-del *.cbx /Q
-
-
-
-
-
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefilegbk.bat b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefilegbk.bat
new file mode 100755
index 00000000000..ae868cb5e58
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefilegbk.bat
@@ -0,0 +1,44 @@
+@echo off
+
+
+setlocal enabledelayedexpansion
+for %%a in ( filecodegbkeg.tex ) do (
+call makeclear
+set jobfile=%%a
+set jobname=!jobfile:~0,-4!
+echo %%a
+echo !jobfile!
+echo !jobname!
+echo !jobfile! >> makecompilerec.dat
+pdflatex.exe --synctex=-1 !jobfile!
+biber !jobname!
+pdflatex.exe --synctex=-1 !jobfile!
+pdflatex.exe --synctex=-1 !jobfile!
+)
+setlocal DISABLEDELAYEDEXPANSION
+
+::call makeclear
+
+
+::pause
+
+
+setlocal enabledelayedexpansion
+for %%a in ( filecodeutfeg.tex ) do (
+call makeclear
+set jobfile=%%a
+set jobname=!jobfile:~0,-4!
+echo %%a
+echo !jobfile!
+echo !jobname!
+echo !jobfile! >> makecompilerec.dat
+xelatex.exe --synctex=-1 !jobfile!
+biber !jobname!
+xelatex.exe --synctex=-1 !jobfile!
+)
+setlocal DISABLEDELAYEDEXPANSION
+
+::call makeclear
+
+
+::pause
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefiletest.bat b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefiletest.bat
new file mode 100755
index 00000000000..987fc5ff5b1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefiletest.bat
@@ -0,0 +1,41 @@
+@echo off
+
+
+IF NOT EXIST gb7714-2015.bbx (
+copy ..\gb7714-2015.bbx . /y
+copy ..\gb7714-2015.cbx . /y
+copy ..\gb7714-2015ay.bbx . /y
+copy ..\gb7714-2015ay.cbx . /y
+copy ..\gb7714-2015-gbk.def . /y
+)
+
+echo compiled files info: > makecompilerec.dat
+
+setlocal enabledelayedexpansion
+for %%a in ( test*.tex ) do (
+call makeclear
+set jobfile=%%a
+set jobname=!jobfile:~0,-4!
+echo %%a
+echo !jobfile!
+echo !jobname!
+echo !jobfile! >> makecompilerec.dat
+xelatex.exe --synctex=-1 !jobfile!
+biber !jobname!
+xelatex.exe --synctex=-1 !jobfile!
+)
+setlocal DISABLEDELAYEDEXPANSION
+
+call makeclear
+
+::call maketestutf.bat
+::call maketestgbk.bat
+
+call makeclear
+
+del *.bbx /Q
+del *.cbx /Q
+del *.def /Q
+
+
+::pause
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015.pdf
index 99d6fd1cb54..b1a057d57e8 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015.tex
index 2e3133f395f..5920e0387ed 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015.tex
@@ -1,7 +1,7 @@
\documentclass[twoside]{article}
\usepackage{ctex}
\usepackage{geometry}
-\geometry{paperwidth=21cm,paperheight=20cm,top=1.5cm, bottom=1.5cm, left=1cm,right=1cm}
+\geometry{paperwidth=21cm,paperheight=29cm,top=2cm, bottom=2cm, left=2cm,right=2cm}
\usepackage{xcolor}
\usepackage[CJKbookmarks,colorlinks,bookmarksnumbered=true,pdfstartview=FitH,linkcolor=blue]{hyperref}
\usepackage[backend=biber,style=gb7714-2015,gbalign=gb7714-2015,gbnamefmt=pinyin]{biblatex}
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015ay.pdf
index 72fac7fba85..de5c7490d4f 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015ay.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015ay.tex
index 034761b56c4..27659be6d1b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egaligngb7714-2015ay.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testaligngb7714-2015ay.tex
@@ -1,7 +1,7 @@
\documentclass[twoside]{article}
\usepackage{ctex}
\usepackage{geometry}
-\geometry{paperwidth=21cm,paperheight=20cm,top=1.5cm, bottom=1.5cm, left=1cm,right=1cm}
+\geometry{paperwidth=21cm,paperheight=29cm,top=2cm, bottom=2cm, left=2cm,right=2cm}
\usepackage{xcolor}
\usepackage[CJKbookmarks,colorlinks,bookmarksnumbered=true,pdfstartview=FitH,linkcolor=blue]{hyperref}
\usepackage[backend=biber,style=gb7714-2015ay]{biblatex}
@@ -27,8 +27,10 @@
文献\cite{王夫之1845--}\cite{陈建军2010-93-93};
文献\parencite{张田勤2000--}\parencite{吴云芳2003--};
文献\pagescite[][300]{汤万金2013-09-30--}\pagescite[][100-107]{张凯军2012-04-05--};
-文献:萧钰\yearpagescite{萧钰2001--},国家环境保护局科技标准司\yearpagescite{国家环境保护局科技标准司1996-2-3};
-其它\cite{Calkin2011-8-9,CRAWFPRD1995--,Babu2014--,CALMS1965--,DESMARAIS1992-605-609}
+文献:萧钰\yearpagescite{萧钰2001--},
+国家环境保护局科技标准司\yearpagescite{国家环境保护局科技标准司1996-2-3};
+其它\cite{Calkin2011-8-9,CRAWFPRD1995--,
+Babu2014--,CALMS1965--,DESMARAIS1992-605-609}
\printbibliography[heading=subbibintoc,title=【参考文献】]
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignleft.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testalignleft.tex
index 9f0edb382e9..9f0edb382e9 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignleft.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testalignleft.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignright.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testalignright.tex
index 801099a3062..801099a3062 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egalignright.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testalignright.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooks.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testbooks.tex
index 9729db20ca1..9729db20ca1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooks.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testbooks.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooksay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testbooksay.tex
index df7ab779393..df7ab779393 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egbooksay.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testbooksay.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testciteay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testciteay.tex
new file mode 100644
index 00000000000..ec74f9a30f2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testciteay.tex
@@ -0,0 +1,218 @@
+\documentclass[twoside]{article}
+\usepackage{ctex}
+\usepackage{xcolor}
+\usepackage{hyperref}
+\usepackage{lipsum}
+\usepackage[top=10pt,bottom=10pt,left=10pt,right=10pt]{geometry}
+%\usepackage[backend=biber,style=gb7714-2015,gbalign=gb7714-2015,
+%gbnamefmt=none,gbfieldstd=false,gbtype=true,gbpunctin=true,gbpub=true]{biblatex}
+
+\usepackage[backend=biber,style=gb7714-2015ay]{biblatex}
+%gbnamefmt=givenahead,lowercase,familyahead,pinyin
+
+
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+@ARTICLE{fazzari1993working,
+ AUTHOR = {Fazzari, Steven M and Petersen, Bruce C},
+ PUBLISHER = {JSTOR},
+ DATE = {1993},
+ JOURNALTITLE = {The RAND Journal of Economics},
+ PAGES = {328--342},
+ TITLE = {Working capital and fixed investment: new evidence on financing constraints},
+ nameformat={lowercase},
+}%namefmtid={1},
+
+@INCOLLECTION{adam2011house,
+ AUTHOR = {Adam, Klaus and Kuang, Pei and Marcet, Albert},
+ PUBLISHER = {University of Chicago Press},
+ BOOKTITLE = {NBER Macroeconomics Annual 2011, Volume 26},
+ DATE = {2011},
+ PAGES = {77--122},
+ TITLE = {House price booms and the current account},
+}%namefmtid={0},
+
+@ARTICLE{bernanke1989agency,
+ AUTHOR = {Bernanke, Ben and Gertler, Mark},
+ PUBLISHER = {JSTOR},
+ DATE = {1989},
+ JOURNALTITLE = {The American Economic Review},
+ PAGES = {14--31},
+ TITLE = {Agency costs, net worth, and business fluctuations},
+ nameformat={givenahead},
+}%namefmtid={2},
+
+@REPORT{calvo2006phoenix,
+ AUTHOR = {Calvo, Guillermo A and Izquierdo, Alejandro and Talvi, Ernesto},
+ INSTITUTION = {National Bureau of Economic Research},
+ DATE = {2006},
+ TITLE = {Phoenix miracles in emerging markets: recovering without credit from systemic financial crises},
+ nameformat={familyahead},
+}%namefmtid={3},
+
+@ARTICLE{wang2006another,
+ AUTHOR = {Wang, Peng-fei and Wen, Yi},
+ PUBLISHER = {Elsevier},
+ DATE = {2006},
+ JOURNALTITLE = {Journal of Economic Dynamics and Control},
+ NUMBER = {12},
+ PAGES = {2533--2552},
+ TITLE = {Another look at sticky prices and output persistence},
+ VOLUME = {30},
+ nameformat={pinyin},
+}%namefmtid={4},
+
+@REPORT{xu2012role,
+ AUTHOR = {Xu, TengTeng},
+ INSTITUTION = {Faculty of Economics, University of Cambridge},
+ DATE = {2012},
+ TITLE = {The role of credit in international business cycles},
+ nameformat={pinyin},
+}
+
+@ARTICLE{zhang2009china,
+ AUTHOR = {Zhang, Wen lang},
+ PUBLISHER = {Elsevier},
+ DATE = {2009},
+ JOURNALTITLE = {Journal of Macroeconomics},
+ NUMBER = {3},
+ PAGES = {473--484},
+ TITLE = {China’s monetary policy: Quantity versus price rules},
+ VOLUME = {31},
+ nameformat={pinyin},
+}
+
+ @Book{Yi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {BeiJing},
+ Author = {Yi, Shi-He and Zhao, Yu Xin and He, Lin and Zhang, Ming Li},
+ Publisher = {National Defense Industry Press},
+ Year = {2013},
+ nameformat={pinyin},
+ }
+
+ @Book{易仕和2013--,
+ Title = {超声速和高超声速喷管设计},
+ Address = {北京},
+ Author = {易仕和 and 赵玉新 and 何霖 and 张敏莉},
+ Publisher = {国防工业出版社},
+ Year = {2013}
+}
+
+ @Periodical{AAAS1883--,
+ Title = {Science},
+ Date = {1883},
+ Editor = {{American Association for the Advancement of Science}},
+ Number = {1},
+ Volume = {1},
+ Location = {Washington, D.C.},
+ Publisher = {American Association for the Advancement of Science}
+}
+
+@Proceedings{ROSENTHALL1963--,
+ Title = {Proceedings of the Fifth Canadian Mathematical Congress, University of Montreal, 1961},
+ Date = {1963},
+ Publisher = {University of Toronto Press},
+ Editor = {E M ROSENTHALL},
+ Location = {Toronto}
+}
+
+@Thesis{CALMS1965--,
+ Title = {Infrared spectroscopic studies on solid oxygen},
+ Author = {R B CALMS},
+ Date = {1965},
+ Institution = {Univ. of California},
+ Location = {Berkeley}
+}
+
+@Report{WHO1970--,
+ Title = {Factors regulating the immune response},
+ Author = {{World Health Organization}},
+ Date = {1970},
+ Institution = {WHO},
+ Location = {Geneva},
+ Titleaddon = {report of WHO Scientific Group}
+}
+
+@Inproceedings{FOURNEY1971-17-38,
+ Title = {Advances in holographic photoelasticity},
+ Author = {M E FOURNEY and others},
+ Booktitle = {Symposium on Applications of Holography in Mechanics, August 23-25, 1971, University of Southern California, Los Angeles, California},
+ Date = {1971},
+ Pages = {17-38},
+ Publisher = {ASME},
+ Location = {New York}
+}
+
+@Article{Zhang2007-500-503,
+ Title = {The design and experimental investigations of supersonic length shorted nozzle},
+ Author = {Zhang, Min-li and Yi, Shi he and Zhao, Yuxin and Li, Ming},
+ Journal = {ACTA AERODYNAMICA SINICA},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ Year = {2007},
+ nameformat={pinyin},
+}
+
+ @Article{张2007-500-503,
+ Title = {超声速短化喷管的设计和试验研究},
+ Author = {张敏莉 and 易仕和 and 赵玉新 and 李明},
+ Journal = {空气动力学报},
+ Year = {2007},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ language = {chinese}
+ }
+\end{filecontents}
+\addbibresource{\jobname.bib}
+
+\defbibentryset{bilangyi2013}{易仕和2013--,Yi2013--}
+\defbibentryset{bilangzhang2007}{张2007-500-503,Zhang2007-500-503}
+
+\DeclareBibliographyCategory{kindsofnameformats}
+\addtocategory{kindsofnameformats}{zhang2009china,xu2012role,wang2006another,
+calvo2006phoenix,bernanke1989agency,adam2011house,fazzari1993working}
+
+ \begin{document}
+ \section{作者姓名格式}
+
+ 不带页码的引用(上标,方括号包围):
+ \cite{FOURNEY1971-17-38}\cite{wang2006another}
+
+ 不带页码的引用(非上标,方括号包围):
+ \parencite{FOURNEY1971-17-38}\parencite{wang2006another}
+ \upcite{FOURNEY1971-17-38}\upcite{wang2006another}
+
+ 带页码的引用:
+ \cite[见][49页]{FOURNEY1971-17-38} \parencite[见][49页]{wang2006another}
+ \pagescite{FOURNEY1971-17-38}\pagescite[150]{wang2006another}
+
+
+作者年制文中已有作者只需给出年份和页码的引用:
+见赵耀东\yearpagescite[][205]{FOURNEY1971-17-38}和Simon\yearpagescite[][15]{wang2006another}。
+
+作者年制文中已有作者只需给出年份的引用,三种方式:
+
+见赵耀东\yearcite{FOURNEY1971-17-38},赵耀东\yearcite{wang2006another}
+
+见赵耀东(\cite*{FOURNEY1971-17-38}),赵耀东(\cite*{wang2006another})
+
+见赵耀东(\citeyear{FOURNEY1971-17-38}),赵耀东(\citeyear{wang2006another})
+
+作者年制文中无作者需要标注命令给出作者作为主语的引用:
+见\textcite{FOURNEY1971-17-38},\textcite{wang2006another}
+
+在页脚中引用和打印文献表:
+
+ \footnote{在脚注中引用\footcite{FOURNEY1971-17-38}} \footfullcite{FOURNEY1971-17-38}
+ \footnote{在脚注中引用\footcite{wang2006another}} \footfullcite{wang2006another}
+
+ \nocite{*}
+
+ \printbibliography[category=kindsofnameformats,title=五种不同的姓名格式]
+
+ \printbibliography[notcategory=kindsofnameformats,title=某种期刊的姓名格式]
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcitenum.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcitenum.tex
new file mode 100644
index 00000000000..a5c2df1371e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcitenum.tex
@@ -0,0 +1,212 @@
+\documentclass[twoside]{article}
+\usepackage{ctex}
+\usepackage{xcolor}
+\usepackage{hyperref}
+\usepackage{lipsum}
+\usepackage[top=10pt,bottom=10pt,left=10pt,right=10pt]{geometry}
+%\usepackage[backend=biber,style=gb7714-2015,gbalign=gb7714-2015,
+%gbnamefmt=none,gbfieldstd=false,gbtype=true,gbpunctin=true,gbpub=true]{biblatex}
+
+\usepackage[backend=biber,style=gb7714-2015,gbalign=center]{biblatex}
+%gbnamefmt=givenahead,lowercase,familyahead,pinyin
+
+
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+@ARTICLE{fazzari1993working,
+ AUTHOR = {Fazzari, Steven M and Petersen, Bruce C},
+ PUBLISHER = {JSTOR},
+ DATE = {1993},
+ JOURNALTITLE = {The RAND Journal of Economics},
+ PAGES = {328--342},
+ TITLE = {Working capital and fixed investment: new evidence on financing constraints},
+ nameformat={lowercase},
+}%namefmtid={1},
+
+@INCOLLECTION{adam2011house,
+ AUTHOR = {Adam, Klaus and Kuang, Pei and Marcet, Albert},
+ PUBLISHER = {University of Chicago Press},
+ BOOKTITLE = {NBER Macroeconomics Annual 2011, Volume 26},
+ DATE = {2011},
+ PAGES = {77--122},
+ TITLE = {House price booms and the current account},
+}%namefmtid={0},
+
+@ARTICLE{bernanke1989agency,
+ AUTHOR = {Bernanke, Ben and Gertler, Mark},
+ PUBLISHER = {JSTOR},
+ DATE = {1989},
+ JOURNALTITLE = {The American Economic Review},
+ PAGES = {14--31},
+ TITLE = {Agency costs, net worth, and business fluctuations},
+ nameformat={givenahead},
+}%namefmtid={2},
+
+@REPORT{calvo2006phoenix,
+ AUTHOR = {Calvo, Guillermo A and Izquierdo, Alejandro and Talvi, Ernesto},
+ INSTITUTION = {National Bureau of Economic Research},
+ DATE = {2006},
+ TITLE = {Phoenix miracles in emerging markets: recovering without credit from systemic financial crises},
+ nameformat={familyahead},
+}%namefmtid={3},
+
+@ARTICLE{wang2006another,
+ AUTHOR = {Wang, Peng-fei and Wen, Yi},
+ PUBLISHER = {Elsevier},
+ DATE = {2006},
+ JOURNALTITLE = {Journal of Economic Dynamics and Control},
+ NUMBER = {12},
+ PAGES = {2533--2552},
+ TITLE = {Another look at sticky prices and output persistence},
+ VOLUME = {30},
+ nameformat={pinyin},
+}%namefmtid={4},
+
+@REPORT{xu2012role,
+ AUTHOR = {Xu, TengTeng},
+ INSTITUTION = {Faculty of Economics, University of Cambridge},
+ DATE = {2012},
+ TITLE = {The role of credit in international business cycles},
+ nameformat={pinyin},
+}
+
+@ARTICLE{zhang2009china,
+ AUTHOR = {Zhang, Wen lang},
+ PUBLISHER = {Elsevier},
+ DATE = {2009},
+ JOURNALTITLE = {Journal of Macroeconomics},
+ NUMBER = {3},
+ PAGES = {473--484},
+ TITLE = {China’s monetary policy: Quantity versus price rules},
+ VOLUME = {31},
+ nameformat={pinyin},
+}
+
+ @Book{Yi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {BeiJing},
+ Author = {Yi, Shi-He and Zhao, Yu Xin and He, Lin and Zhang, Ming Li},
+ Publisher = {National Defense Industry Press},
+ Year = {2013},
+ nameformat={pinyin},
+ }
+
+ @Book{易仕和2013--,
+ Title = {超声速和高超声速喷管设计},
+ Address = {北京},
+ Author = {易仕和 and 赵玉新 and 何霖 and 张敏莉},
+ Publisher = {国防工业出版社},
+ Year = {2013}
+}
+
+ @Periodical{AAAS1883--,
+ Title = {Science},
+ Date = {1883},
+ Editor = {{American Association for the Advancement of Science}},
+ Number = {1},
+ Volume = {1},
+ Location = {Washington, D.C.},
+ Publisher = {American Association for the Advancement of Science}
+}
+
+@Proceedings{ROSENTHALL1963--,
+ Title = {Proceedings of the Fifth Canadian Mathematical Congress, University of Montreal, 1961},
+ Date = {1963},
+ Publisher = {University of Toronto Press},
+ Editor = {E M ROSENTHALL},
+ Location = {Toronto}
+}
+
+@Thesis{CALMS1965--,
+ Title = {Infrared spectroscopic studies on solid oxygen},
+ Author = {R B CALMS},
+ Date = {1965},
+ Institution = {Univ. of California},
+ Location = {Berkeley}
+}
+
+@Report{WHO1970--,
+ Title = {Factors regulating the immune response},
+ Author = {{World Health Organization}},
+ Date = {1970},
+ Institution = {WHO},
+ Location = {Geneva},
+ Titleaddon = {report of WHO Scientific Group}
+}
+
+@Inproceedings{FOURNEY1971-17-38,
+ Title = {Advances in holographic photoelasticity},
+ Author = {M E FOURNEY and others},
+ Booktitle = {Symposium on Applications of Holography in Mechanics, August 23-25, 1971, University of Southern California, Los Angeles, California},
+ Date = {1971},
+ Pages = {17-38},
+ Publisher = {ASME},
+ Location = {New York}
+}
+
+@Article{Zhang2007-500-503,
+ Title = {The design and experimental investigations of supersonic length shorted nozzle},
+ Author = {Zhang, Min-li and Yi, Shi he and Zhao, Yuxin and Li, Ming},
+ Journal = {ACTA AERODYNAMICA SINICA},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ Year = {2007},
+ nameformat={pinyin},
+}
+
+ @Article{张2007-500-503,
+ Title = {超声速短化喷管的设计和试验研究},
+ Author = {张敏莉 and 易仕和 and 赵玉新 and 李明},
+ Journal = {空气动力学报},
+ Year = {2007},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ language = {chinese}
+ }
+\end{filecontents}
+\addbibresource{\jobname.bib}
+
+\defbibentryset{bilangyi2013}{易仕和2013--,Yi2013--}
+\defbibentryset{bilangzhang2007}{张2007-500-503,Zhang2007-500-503}
+
+\DeclareBibliographyCategory{kindsofnameformats}
+\addtocategory{kindsofnameformats}{zhang2009china,xu2012role,wang2006another,
+calvo2006phoenix,bernanke1989agency,adam2011house,fazzari1993working}
+
+ \begin{document}
+ \section{作者姓名格式}
+
+ 不带页码的引用(上标,方括号包围):
+ \cite{FOURNEY1971-17-38}\cite{wang2006another}
+
+ 不带页码的引用(非上标,方括号包围):
+ \parencite{FOURNEY1971-17-38}\parencite{wang2006another}
+ \upcite{FOURNEY1971-17-38}\upcite{wang2006another}
+
+ 带页码的引用:
+ \cite[见][49页]{FOURNEY1971-17-38} \parencite[见][49页]{wang2006another}
+ \pagescite{FOURNEY1971-17-38}\pagescite[150]{wang2006another}
+
+
+ 同时输出作者和顺序编码的三种引用方式:
+
+(a)直接的方法:见\citeauthor{FOURNEY1971-17-38}\cite{FOURNEY1971-17-38}, \citeauthor{wang2006another}\cite{wang2006another}
+
+(b)定义新的标注命令:见\authornumcite{FOURNEY1971-17-38,wang2006another}
+
+(c)用textcite但没有上标:见\textcite{FOURNEY1971-17-38,wang2006another}
+
+ 在页脚中引用和打印文献表:
+
+ \footnote{在脚注中引用\footcite{FOURNEY1971-17-38}} \footfullcite{FOURNEY1971-17-38}
+ \footnote{在脚注中引用\footcite{wang2006another}} \footfullcite{wang2006another}
+
+ \nocite{*}
+
+ \printbibliography[category=kindsofnameformats,title=五种不同的姓名格式]
+
+ \printbibliography[notcategory=kindsofnameformats,title=某种期刊的姓名格式]
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubtrue.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcollection.tex
index df71bd868a7..a378140fcaf 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubtrue.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcollection.tex
@@ -20,9 +20,8 @@
%%%test file for author year style
\section{文献表}
-文献
-\cite{Parsons2000noloc--,Parsons2000nopub--,booknolocation,booknopublisher}
-\cite{赵学功2001--}\cite{裴丽生1981-2-10,Nemec1997-209-214}
+
+汇编文集类似于book和inbook\cite{韩吉人1985-90-99}\cite{中国职工教育研究会1985--}
{
%\hyphenation{kurose-gawa}
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmtb.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcollectionay.tex
index 4938c73e8de..d96c09d93bf 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmtb.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcollectionay.tex
@@ -4,7 +4,7 @@
\geometry{paperwidth=21cm,paperheight=29cm,top=1.5cm, bottom=1.5cm, left=2.54cm,right=2.54cm}
\usepackage{xcolor}
\usepackage[CJKbookmarks,colorlinks,bookmarksnumbered=true,pdfstartview=FitH,linkcolor=blue]{hyperref}
-\usepackage[backend=biber,style=gb7714-2015ay,gbpub=true,gbnamefmt=none]{biblatex}%align=gb7714-2015
+\usepackage[backend=biber,style=gb7714-2015ay,gbpub=true]{biblatex}%align=gb7714-2015
%\addbibresource[location=local]{egtest.bib}
\addbibresource[location=local]{example.bib}
\addbibresource[location=local]{egspecialchar.bib}
@@ -20,12 +20,8 @@
%%%test file for author year style
\section{文献表}
-\begin{enumerate}
- \item 文献\cite{张伯伟2002--}\cite{CRAWFPRD1995--}\cite{陈志勇2011--}\cite{Babu2014--}
-\cite{Calkin2011-8-9}\cite{吴云芳2003--}\cite{CALMS1965--}\cite{张凯军2012-04-05--}\cite{KOSEKI2002--}
-\cite{楼梦麟2011-11-12}\cite{BUSECK1980-117-211}
-\cite{DESMARAIS1992-605-609}\cite{张田勤2000--}
-\end{enumerate}
+
+汇编文集类似于book和inbook\cite{韩吉人1985-90-99}\cite{中国职工教育研究会1985--}
{
%\hyphenation{kurose-gawa}
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testentrytypes.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testentrytypes.tex
new file mode 100644
index 00000000000..50b9c888bf7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testentrytypes.tex
@@ -0,0 +1,320 @@
+\documentclass[twoside]{article}
+\usepackage{ctex}
+\usepackage{xcolor}
+\usepackage{hyperref}
+\usepackage{lipsum}
+\usepackage[top=10pt,bottom=10pt,left=10pt,right=10pt]{geometry}
+\usepackage[backend=biber,style=gb7714-2015]{biblatex}
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+@database{databaseeg,
+ AUTHOR = {Zhang, San},
+ DATE = {2007},
+ TITLE = {A data base},
+ medium={CD}
+}
+
+@dataset{dataseteg,
+ AUTHOR = {Zhang, Yi},
+ DATE = {2008},
+ TITLE = {A data set},
+ medium={DK}
+}
+
+@archive{archiveeg,
+ AUTHOR = {Zhang, Er},
+ DATE = {2009},
+ TITLE = {An archive for friend B},
+ medium={MT}
+}
+
+@software{softwareeg,
+ AUTHOR = {Zhang, Liu},
+ DATE = {2009},
+ TITLE = {A software for science computation},
+ medium={CD}
+}
+
+@map{mapeg,
+ AUTHOR = {Zhang, Si},
+ DATE = {2010},
+ TITLE = {An map},
+}
+
+@Misc{Misceg,
+ AUTHOR = {Zhang, Wu},
+ DATE = {2010},
+ TITLE = {An unknow type reference},
+}
+
+@ARTICLE{aritileeg,
+ AUTHOR = {Zhang, Qi},
+ DATE = {2007},
+ JOURNALTITLE = {An periodical},
+ PAGES = {82--92},
+ TITLE = {An article for test},
+ VOLUME = {12},
+ NUMBER ={2},
+ mark={J},
+ medium={OL},
+}
+
+@ARTICLE{方军雄2007,
+ AUTHOR = {方军雄},
+ DATE = {2007},
+ JOURNALTITLE = {经济研究},
+ PAGES = {82--92},
+ TITLE = {所有制, 制度环境与信贷资金配置},
+ VOLUME = {12},
+}
+
+ @Book{Yi2014--,
+ Title = {Test},
+ Address = {Address},
+ Author = {Yi and B and C},
+ Publisher = {Publisher},
+ Year = {2014}
+ }
+ @Book{Yi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {BeiJing},
+ Author = {Yi, S H and Zhao, Y X and He, L and Zhang, M L},
+ Publisher = {National Defense Industry Press},
+ Year = {2013}
+ }
+
+ @Periodical{AAAS1883--,
+ Title = {Science},
+ Date = {1883},
+ Editor = {{American Association for the Advancement of Science}},
+ Number = {1},
+ Volume = {1},
+ Location = {Washington, D.C.},
+ Publisher = {American Association for the Advancement of Science}
+}
+
+@Proceedings{ROSENTHALL1963--,
+ Title = {Proceedings of the Fifth Canadian Mathematical Congress, University of Montreal, 1961},
+ Date = {1963},
+ Publisher = {University of Toronto Press},
+ Editor = {E M ROSENTHALL},
+ Location = {Toronto}
+}
+
+@Thesis{CALMS1965--,
+ Title = {Infrared spectroscopic studies on solid oxygen},
+ Author = {R B CALMS},
+ Date = {1965},
+ Institution = {Univ. of California},
+ Location = {Berkeley}
+}
+
+@Report{WHO1970--,
+ Title = {Factors regulating the immune response},
+ Author = {{World Health Organization}},
+ Date = {1970},
+ Institution = {WHO},
+ Location = {Geneva},
+ Titleaddon = {report of WHO Scientific Group}
+}
+
+@Inproceedings{FOURNEY1971-17-38,
+ Title = {Advances in holographic photoelasticity},
+ Author = {M E FOURNEY},
+ Booktitle = {Symposium on Applications of Holography in Mechanics, August 23-25, 1971, University of Southern California, Los Angeles, California},
+ Date = {1971},
+ Pages = {17-38},
+ Publisher = {ASME},
+ Location = {New York}
+}
+
+ @Article{abx2007-500-503,
+ Title = {超声速短化喷管的设计和试验研究},
+ Author = {张敏莉 and 易仕和 and 赵玉新 and 李明},
+ Journal = {空气动力学报},
+ Year = {2007},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ language = {chinese}
+ }
+
+
+
+ @BOOK{张伯伟2002--,
+ AUTHOR = {张伯伟},
+ LOCATION = {南京},
+ PUBLISHER = {江苏古籍出版社},
+ DATE = {2002},
+ KEYWORDS = {张伯伟2002--},
+ PAGES = {288},
+ TITLE = {全唐五代诗格会考},
+ language = {chinese}
+}
+
+@PROCEEDINGS{雷光春2012--,
+ AUTHOR = {雷光春},
+ LOCATION = {北京},
+ PUBLISHER = {海洋出版社},
+ DATE = {2012},
+ KEYWORDS = {雷光春2012--},
+ TITLE = {综合湿地管理:综合湿地管理国际研讨会论文集},
+ language = {chinese}
+}
+
+@REPORT{汤万金2013-09-30--,
+ AUTHOR = {汤万金 and 杨跃翔 and 刘文 and others},
+ URL = {http://www.nstrs.org.cn},
+ DATE = {2013-09-30},
+ KEYWORDS = {汤万金2013-09-30--},
+ TITLE = {人体安全重要技术标准研制最终报告:7178999X},
+ URLDATE = {2014-06-24},
+ language = {chinese}
+}
+
+@INPROCEEDINGS{贾东琴2011-45-52,
+ AUTHOR = {贾东琴 and 柯平},
+ BOOKAUTHOR = {中国图书馆学会},
+ LOCATION = {北京},
+ PUBLISHER = {国家图书馆出版社},
+ BOOKTITLE = {中国图书馆学会年会论文集:2011年卷},
+ DATE = {2011},
+ KEYWORDS = {贾东琴2011-45-52},
+ PAGES = {45--52},
+ TITLE = {面向数字素养的高校图书馆数字服务体系研究},
+ language = {chinese}
+}
+
+@INCOLLECTION{韩吉人1985-90-99,
+ AUTHOR = {韩吉人},
+ BOOKAUTHOR = {中国职工教育研究会},
+ LOCATION = {北京},
+ PUBLISHER = {人民教育出版社},
+ BOOKTITLE = {职工教育研究论文集},
+ DATE = {1985},
+ KEYWORDS = {韩吉人1985-90-99},
+ PAGES = {90--99},
+ TITLE = {论职工教育的特点},
+ language = {chinese}
+}
+
+@THESIS{马欢2011-27-27,
+ AUTHOR = {马欢},
+ INSTITUTION = {清华大学},
+ LOCATION = {北京},
+ URL = {http://www.cnki.net},
+ DATE = {2011},
+ KEYWORDS = {马欢2011-27-27},
+ PAGES = {27},
+ TITLE = {人类活动影响下海河流域典型区水循环变化分析},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@PATENT{张凯军2012-04-05--,
+ AUTHOR = {张凯军},
+ DATE = {2012-04-05},
+ KEYWORDS = {张凯军2012-04-05--},
+ NUMBER = {201220158825.2},
+ TITLE = {轨道火车及高速轨道火车紧急安全制动辅助装置},
+ language = {chinese}
+}
+
+@BOOK{国家环境保护局科技标准司1996-2-3,
+ AUTHOR = {国家环境保护局科技标准司},
+ LOCATION = {北京},
+ PUBLISHER = {中国标准出版社},
+ URL = {http://wenku.baidu.com},
+ DATE = {1996},
+ KEYWORDS = {国家环境保护局科技标准司1996-2-3,standard},
+ NOTE = {standard},
+ PAGES = {2--3},
+ TITLE = {土壤环境质量标准:GB 15616-1995},
+ URLDATE = {2013-10-14},
+ language = {chinese}
+}
+
+@INBOOK{白书农1998-146-163,
+ AUTHOR = {白书农},
+ BOOKAUTHOR = {李承森},
+ LOCATION = {北京},
+ PUBLISHER = {高等教育出版社},
+ BOOKTITLE = {植物科学进展},
+ DATE = {1998},
+ KEYWORDS = {白书农1998-146-163},
+ PAGES = {146--163},
+ TITLE = {植物开花研究},
+ language = {chinese}
+}
+
+@ARTICLE{杨洪升2013-56-75,
+ AUTHOR = {杨洪升},
+ DATE = {2013},
+ JOURNALTITLE = {文献},
+ KEYWORDS = {杨洪升2013-56-75},
+ NUMBER = {1},
+ PAGES = {56--75},
+ TITLE = {四库馆私家抄校书考略},
+ language = {chinese}
+}
+
+@COLLECTION{中国职工教育研究会1985--,
+ AUTHOR = {中国职工教育研究会},
+ LOCATION = {北京},
+ PUBLISHER = {人民教育出版社},
+ DATE = {1985},
+ KEYWORDS = {中国职工教育研究会1985--},
+ TITLE = {职工教育研究论文集},
+ language = {chinese}
+}
+
+@ARTICLE{丁文祥2000--,
+ AUTHOR = {丁文祥},
+ DATE = {2000-11-20},
+ JOURNALTITLE = {中国青年报},
+ KEYWORDS = {丁文祥2000--,news},
+ NOTE = {news},
+ NUMBER = {15},
+ TITLE = {数字革命与竞争国际化},
+ language = {chinese}
+}
+
+@ONLINE{李强2012-05-03--,
+ AUTHOR = {李强},
+ URL = {http://wenku.baidu.com},
+ DATE = {2012-05-03},
+ KEYWORDS = {李强2012-05-03--},
+ TITLE = {化解医患矛盾需釜底抽薪},
+ URLDATE = {2013-03-25},
+ language = {chinese}
+}
+
+@PERIODICAL{中华医学会湖北分会1984--,
+ EDITOR = {中华医学会湖北分会},
+ INSTITUTION = {中华医学会湖北分会},
+ LOCATION = {武汉},
+ DATE = {1984},
+ KEYWORDS = {中华医学会湖北分会1984--},
+ NUMBER = {1},
+ TITLE = {临床内科杂志},
+ VOLUME = {1},
+ language = {chinese}
+}
+\end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+ \makeatletter
+ \def\versionofgbtstyle{2018/04/03 v1.0k}
+ \def\versionofbiblatex{\abx@version}
+ \makeatother
+ %\renewcommand{\bibtitlefont}{\kaishu}
+
+ \begin{document}
+ \section{set title}
+ created with biblatex v\versionofbiblatex, last revised at \today;\\ \hspace*{1.5em} Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.
+
+ 文献\nocite{*}
+
+ \printbibliography
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testfontinbiblio.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testfontinbiblio.tex
new file mode 100644
index 00000000000..ca280586de2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testfontinbiblio.tex
@@ -0,0 +1,74 @@
+\documentclass[twoside]{article}
+\usepackage{ctex}
+\usepackage{geometry}
+\geometry{paperwidth=21cm,paperheight=29cm,top=1.5cm, bottom=1.5cm, left=2.54cm,right=2.54cm}
+\usepackage{xcolor}
+\usepackage[CJKbookmarks,colorlinks,bookmarksnumbered=true,pdfstartview=FitH,linkcolor=blue]{hyperref}
+\usepackage[backend=biber,style=gb7714-2015,gbtype=true,block=none]{biblatex}%align=gb7714-2015
+\addbibresource[location=local]{example.bib}
+
+% 换行的控制
+%
+% 选项 block=none , space , par , nbpar , ragged
+%\renewcommand*{\newblockpunct}{\par\nobreak}
+
+% 字体的控制:\textit,sl,emph-楷体,\textbf,sf-黑体,\texttt-仿宋,\textsc,md,up-宋体
+%
+% 全局字体
+\renewcommand{\bibfont}{\zihao{-5}}%\fangsong
+% 标题字体
+\renewcommand{\bibauthorfont}{\bfseries\color{teal}}%
+\renewcommand{\bibtitlefont}{\ttfamily\color{blue}}%
+\renewcommand{\bibpubfont}{\itshape\color{violet}}%
+% url和doi字体
+\def\UrlFont{\ttfamily} %\urlstyle{sf} %\def\UrlFont{\bfseries}
+
+% 间距的控制
+\setlength{\bibitemsep}{0ex}
+\setlength{\bibnamesep}{0ex}
+\setlength{\bibinitsep}{0ex}
+
+% 标点类型的控制(全局字体能控制标点的字体)
+
+
+%\renewcommand{\thefootnote}{\textcircled{\tiny\arabic{footnote}}}
+
+\begin{document}
+编译信息:biblatex v\versionofbiblatex;gb7714-2015*.* version number \versionofgbtstyle.
+%%%测试作者年/biblatex版本兼容性的文件
+%%%test file for author year style
+
+\section{文献表}
+文献
+\cite{张伯伟2002--}
+\cite{白书农1998-146-163}
+\cite{杨洪升2013-56-75}
+\cite{中华医学会湖北分会1984--}
+\cite{雷光春2012--}
+\cite{贾东琴2011-45-52}
+\cite{汤万金2013-09-30--}
+\cite{韩吉人1985-90-99}
+\cite{马欢2011-27-27}
+\cite{张凯军2012-04-05--}
+\cite{国家环境保护局科技标准司1996-2-3}
+\cite{中国职工教育研究会1985--}
+\cite{丁文祥2000--}
+\cite{李强2012-05-03--}
+
+\cite{OBRIEN1994--}
+\cite{FOURNEY1971-17-38}
+\cite{Park2010-696-715}
+\cite{Babu2014--}
+\cite{Calkin2011-8-9}
+\cite{CALMS1965--}
+\cite{KOSEKI2002--}
+\cite{standardinfoiso158}
+\cite{Dublin2012-06-14--}
+
+{
+%\hyphenation{kurose-gawa}
+%\hyphenpenalty=1000
+%\tolerance=500
+\printbibliography[heading=subbibliography,title=【参考文献】]
+}
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalseay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbnoauthorfalseay.tex
index 5dd0048b5d7..5dd0048b5d7 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalseay.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbnoauthorfalseay.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrueay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbnoauthortrueay.tex
index 9b8984fa9a1..9b8984fa9a1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrueay.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbnoauthortrueay.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubfalse.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbpubfalse.tex
index 977ddbc9d54..977ddbc9d54 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbpubfalse.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbpubfalse.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmta.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbpubtrue.tex
index 74d20da9064..28a8626355e 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnamefmta.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testgbpubtrue.tex
@@ -4,7 +4,7 @@
\geometry{paperwidth=21cm,paperheight=29cm,top=1.5cm, bottom=1.5cm, left=2.54cm,right=2.54cm}
\usepackage{xcolor}
\usepackage[CJKbookmarks,colorlinks,bookmarksnumbered=true,pdfstartview=FitH,linkcolor=blue]{hyperref}
-\usepackage[backend=biber,style=gb7714-2015ay,gbpub=true,gbnamefmt=lowercase]{biblatex}%align=gb7714-2015
+\usepackage[backend=biber,style=gb7714-2015]{biblatex}%align=gb7714-2015
%\addbibresource[location=local]{egtest.bib}
\addbibresource[location=local]{example.bib}
\addbibresource[location=local]{egspecialchar.bib}
@@ -16,21 +16,18 @@
\begin{document}
-%%%测试作者年/biblatex版本兼容性的文件
+%%%/biblatex汾Եļ
%%%test file for author year style
-\section{文献表}
-\begin{enumerate}
- \item 文献\cite{张伯伟2002--}\cite{CRAWFPRD1995--}\cite{陈志勇2011--}\cite{Babu2014--}
-\cite{Calkin2011-8-9}\cite{吴云芳2003--}\cite{CALMS1965--}\cite{张凯军2012-04-05--}\cite{KOSEKI2002--}
-\cite{楼梦麟2011-11-12}\cite{BUSECK1980-117-211}
-\cite{DESMARAIS1992-605-609}\cite{张田勤2000--}
-\end{enumerate}
+\section{ױ}
+
+\cite{Parsons2000noloc--,Parsons2000nopub--,booknolocation,booknopublisher}
+\cite{ѧ2001--}\cite{1981-2-10,Nemec1997-209-214}
{
%\hyphenation{kurose-gawa}
%\hyphenpenalty=1000
%\tolerance=500
-\printbibliography%[heading=subbibintoc,title=【参考文献】]
+\printbibliography%[heading=subbibintoc,title=οס]
}
\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournal.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testjournal.tex
index be3686dbc92..be3686dbc92 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournal.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testjournal.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournalay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testjournalay.tex
index 6be856240b5..6be856240b5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egjournalay.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testjournalay.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilan.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilan.tex
new file mode 100644
index 00000000000..1093b8ed4de
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilan.tex
@@ -0,0 +1,90 @@
+\documentclass[twoside]{article}
+\usepackage{ctex}
+%\usepackage[english,russian,french]{babel}
+\usepackage{fontspec}
+
+\setmainfont{CMU Serif}
+\usepackage{xcolor}
+\usepackage{hyperref}
+\usepackage{lipsum}
+\usepackage[top=10pt,bottom=10pt,left=10pt,right=10pt]{geometry}
+%,autolang=other
+\usepackage[backend=biber,style=gb7714-2015,gbpub=false]{biblatex}
+
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+
+@INPROCEEDINGS{frenchref,
+ AUTHOR = {Beneton Philippe and Touchard Jean and Beton Philippe and Betin Philippe},
+ BOOKTITLE = {Revue française de science politique},
+ DATE = {1968},
+ PAGES = {19--46},
+ TITLE = {ôçLes interprétations de la crise de mai-juinŕł},
+}
+
+@ARTICLE{greenwood1988,
+ AUTHOR = {Greenwood, Jeremy and Hercowitz, Zvi and Huffman, Gregory W and Williams, Joedge},
+ PUBLISHER = {JSTOR},
+ DATE = {1988},
+ JOURNALTITLE = {The American Economic Review},
+ KEYWORDS = {greenwood1988investment},
+ PAGES = {402--417},
+ TITLE = {Investment, capacity utilization, and the real business cycle},
+}
+%langid={english}
+
+@BOOK{russainref,
+ AUTHOR = {Кузнецов, А. В. and Кузнецов, C. В. and Кузнецов, D. В. and Кузнецов, E. В.},
+ TITLE = {Русский язык и языковая личность},
+ LOCATION = {М.},
+ PUBLISHER = {Диалог МГУ},
+ DATE = {1998},
+ PAGES = {28},
+}
+%langid={russian}
+
+@ARTICLE{刘凤良2017,
+ AUTHOR = {刘凤良 and 章潇萌 and 于泽 and 黄晓},
+ DATE = {2017},
+ JOURNALTITLE = {金融研究},
+ KEYWORDS = {刘凤良2017},
+ NUMBER = {2},
+ PAGES = {54--69},
+ TITLE = {高投资、结构失衡与价格指数二元分化},
+}% langid={english}
+
+@BOOK{青木昌彦1996--,
+ AUTHOR = {青木昌彦 and 青木昌一 and 青木昌二 and 青木昌三},
+ PUBLISHER = {東洋経済新報社},
+ DATE = {1996},
+ PAGES = {288},
+ TITLE = {メインバンク ・ システムのモニタリング機能としての特徴},
+}
+
+@INPROCEEDINGS{kereanref,
+ AUTHOR = {김주성 and 함승호 and 김기수 and 김기회},
+ BOOKTITLE = {2015 한국 CAD/CAM 학회 동계학술대회 논문집},
+ DATE = {2015},
+ address={울산},
+ PAGES = {19--46},
+ TITLE = {해저 저질과 환경 하중을 고려한 침몰 선체 인양 시뮬레이션},
+}
+
+\end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+ \makeatletter
+ \def\versionofgbtstyle{2018/04/03 v1.0k}
+ \def\versionofbiblatex{\abx@version}
+ \makeatother
+ %\renewcommand{\bibtitlefont}{\kaishu}
+
+ \begin{document}
+ \section{set title}
+ created with biblatex v\versionofbiblatex, last revised at \today;\\ \hspace*{1.5em} Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.
+
+ refs\nocite{*}
+
+ \printbibliography
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.tex
new file mode 100644
index 00000000000..1c27650e159
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.tex
@@ -0,0 +1,95 @@
+\documentclass[twoside]{article}
+ \usepackage{ctex}
+ \usepackage[english,russian,french]{babel}
+ \usepackage{fontspec}
+
+ \setmainfont{CMU Serif}
+ \usepackage{xcolor}
+ \usepackage{hyperref}
+ \usepackage{lipsum}
+ \usepackage[top=10pt,bottom=10pt,left=10pt,right=10pt]{geometry}
+%\usepackage[backend=biber,style=gb7714-2015,gbalign=gb7714-2015,
+%gbnamefmt=none,gbfieldstd=false,gbtype=true,gbpunctin=true,gbpub=true]{biblatex}
+%,gbnamefmt=apa,gbtitlelink=true
+\usepackage[backend=biber,style=gb7714-2015ay,gbpub=false,autolang=other]{biblatex}
+%\usepackage[backend=biber,style=authoryear,autolang=other]{biblatex}
+
+%\usepackage[backend=biber,style=numeric-comp,giveninits=false]{biblatex}%giveninits=false
+
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+
+@INPROCEEDINGS{frenchref,
+ AUTHOR = {Beneton Philippe and Touchard Jean and Beton Philippe and Betin Philippe},
+ BOOKTITLE = {Revue française de science politique},
+ DATE = {1968},
+ PAGES = {19--46},
+ TITLE = {ôçLes interprétations de la crise de mai-juinŕł},
+}
+
+@ARTICLE{greenwood1988,
+ AUTHOR = {Greenwood, Jeremy and Hercowitz, Zvi and Huffman, Gregory W and Williams, Joedge},
+ PUBLISHER = {JSTOR},
+ DATE = {1988},
+ JOURNALTITLE = {The American Economic Review},
+ KEYWORDS = {greenwood1988investment},
+ PAGES = {402--417},
+ TITLE = {Investment, capacity utilization, and the real business cycle},
+}
+%langid={english}
+
+@BOOK{russainref,
+ AUTHOR = {Кузнецов, А. В. and Кузнецов, C. В. and Кузнецов, D. В. and Кузнецов, E. В.},
+ TITLE = {Русский язык и языковая личность},
+ LOCATION = {М.},
+ PUBLISHER = {Диалог МГУ},
+ DATE = {1998},
+ PAGES = {28},
+}
+%langid={russian}
+
+@ARTICLE{刘凤良2017,
+ AUTHOR = {刘凤良 and 章潇萌 and 于泽 and 黄晓},
+ DATE = {2017},
+ JOURNALTITLE = {金融研究},
+ KEYWORDS = {刘凤良2017},
+ NUMBER = {2},
+ PAGES = {54--69},
+ TITLE = {高投资、结构失衡与价格指数二元分化},
+}% langid={english}
+
+@BOOK{青木昌彦1996--,
+ AUTHOR = {青木昌彦 and 青木昌一 and 青木昌二 and 青木昌三},
+ PUBLISHER = {東洋経済新報社},
+ DATE = {1996},
+ PAGES = {288},
+ TITLE = {メインバンク ・ システムのモニタリング機能としての特徴},
+}
+
+@INPROCEEDINGS{kereanref,
+ AUTHOR = {김주성 and 함승호 and 김기수 and 김기회},
+ BOOKTITLE = {2015 한국 CAD/CAM 학회 동계학술대회 논문집},
+ DATE = {2015},
+ address={울산},
+ PAGES = {19--46},
+ TITLE = {해저 저질과 환경 하중을 고려한 침몰 선체 인양 시뮬레이션},
+}
+
+\end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+ \makeatletter
+ \def\versionofgbtstyle{2018/04/03 v1.0k}
+ \def\versionofbiblatex{\abx@version}
+ \makeatother
+ %\renewcommand{\bibtitlefont}{\kaishu}
+
+ \begin{document}
+ \section{set title}
+ created with biblatex v\versionofbiblatex, last revised at \today;\\ \hspace*{1.5em} Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.
+
+ refs\nocite{*}
+
+ \printbibliography
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testnamefmt.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testnamefmt.tex
new file mode 100644
index 00000000000..c5341800e0b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testnamefmt.tex
@@ -0,0 +1,237 @@
+\documentclass[twoside]{article}
+\usepackage[heading]{ctex}
+\usepackage{geometry}
+\geometry{paperwidth=21cm,paperheight=29cm,top=1.5cm, bottom=1.5cm, left=2.54cm,right=2.54cm}
+\ctexset{
+section = {
+beforeskip ={0pt},
+afterskip={0pt} },
+subsection = {
+beforeskip ={0pt},
+afterskip={0pt} }
+}
+\usepackage{xcolor}
+\usepackage[CJKbookmarks,colorlinks,bookmarksnumbered=true,pdfstartview=FitH,linkcolor=blue]{hyperref}
+\usepackage[backend=biber,style=gb7714-2015,gbpub=true]{biblatex}%align=gb7714-2015,gbnamefmt=lowercase
+\renewcommand{\bibfont}{\zihao{-5}}
+\setlength{\bibitemsep}{0pt}
+\defbibheading{bibliography}[\refname]{%
+\subsection*{#1}}
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+ @Article{Zhang2007-500-503,
+ Title = {The design and experimental investigations of supersonic length shorted nozzle},
+ Author = {Zhang, Min-li and Yi, Shi-he and Zhao, Yu-xin},
+ Journal = {ACTA AERODYNAMICA SINICA},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ Year = {2007}
+ }
+
+ @Book{Yi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {Beijing},
+ Author = {Yi, Shi he and Zhao, Yu xin and He, Lin and Zhang, Min li},
+ Publisher = {National Defense Industry Press},
+ Year = {2013}
+ }
+
+ @Book{LIAO2012--,
+ Title = {Electronic countermeasure techniques for missile penetration},
+ Address = {Beijing},
+ Author = {LIAO, ping and JIANG, qin bo},
+ Publisher = {National Defense Industry Press},
+ Year = {2013}
+ }
+
+ @Book{LIU2003--,
+ Title = {Introduction of Ballistic Misille Techniques},
+ Address = {Beijing},
+ Author = {LIU, shi Qiu},
+ Publisher = {China Astronautic Publishing House},
+ Year = {2003}
+ }
+
+ @Article{lZhang2007-500-503,
+ Title = {The design and experimental investigations of supersonic length shorted nozzle},
+ Author = {Zhang, Min-li and Yi, Shi-he and Zhao, Yu-xin},
+ Journal = {ACTA AERODYNAMICA SINICA},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ nameformat={lowercase},
+ Year = {2007}
+ }
+
+ @Book{lYi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {Beijing},
+ Author = {Yi, Shi he and Zhao, Yu xin and He, Lin and Zhang, Min li},
+ Publisher = {National Defense Industry Press},
+ nameformat={lowercase},
+ Year = {2013}
+ }
+
+ @Book{lLIAO2012--,
+ Title = {Electronic countermeasure techniques for missile penetration},
+ Address = {Beijing},
+ Author = {LIAO, ping and JIANG, qin bo},
+ Publisher = {National Defense Industry Press},
+ nameformat={lowercase},
+ Year = {2013}
+ }
+
+ @Book{lLIU2003--,
+ Title = {Introduction of Ballistic Misille Techniques},
+ Address = {Beijing},
+ Author = {LIU, shi Qiu},
+ Publisher = {China Astronautic Publishing House},
+ nameformat={lowercase},
+ Year = {2003}
+ }
+
+ @Article{gZhang2007-500-503,
+ Title = {The design and experimental investigations of supersonic length shorted nozzle},
+ Author = {Zhang, Min-li and Yi, Shi-he and Zhao, Yu-xin},
+ Journal = {ACTA AERODYNAMICA SINICA},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ nameformat={givenahead},
+ Year = {2007}
+ }
+
+ @Book{gYi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {Beijing},
+ Author = {Yi, Shi he and Zhao, Yu xin and He, Lin and Zhang, Min li},
+ Publisher = {National Defense Industry Press},
+ nameformat={givenahead},
+ Year = {2013}
+ }
+
+ @Book{gLIAO2012--,
+ Title = {Electronic countermeasure techniques for missile penetration},
+ Address = {Beijing},
+ Author = {LIAO, ping and JIANG, qin bo},
+ Publisher = {National Defense Industry Press},
+ nameformat={givenahead},
+ Year = {2013}
+ }
+
+ @Book{gLIU2003--,
+ Title = {Introduction of Ballistic Misille Techniques},
+ Address = {Beijing},
+ Author = {LIU, shi Qiu},
+ Publisher = {China Astronautic Publishing House},
+ nameformat={givenahead},
+ Year = {2003}
+ }
+
+ @Article{fZhang2007-500-503,
+ Title = {The design and experimental investigations of supersonic length shorted nozzle},
+ Author = {Zhang, Min-li and Yi, Shi-he and Zhao, Yu-xin},
+ Journal = {ACTA AERODYNAMICA SINICA},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ nameformat={familyahead},
+ Year = {2007}
+ }
+
+ @Book{fYi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {Beijing},
+ Author = {Yi, Shi he and Zhao, Yu xin and He, Lin and Zhang, Min li},
+ Publisher = {National Defense Industry Press},
+ nameformat={familyahead},
+ Year = {2013}
+ }
+
+ @Book{fLIAO2012--,
+ Title = {Electronic countermeasure techniques for missile penetration},
+ Address = {Beijing},
+ Author = {LIAO, ping and JIANG, qin bo},
+ Publisher = {National Defense Industry Press},
+ nameformat={familyahead},
+ Year = {2013}
+ }
+
+ @Book{fLIU2003--,
+ Title = {Introduction of Ballistic Misille Techniques},
+ Address = {Beijing},
+ Author = {LIU, shi Qiu},
+ Publisher = {China Astronautic Publishing House},
+ nameformat={familyahead},
+ Year = {2003}
+ }
+
+ @Article{pZhang2007-500-503,
+ Title = {The design and experimental investigations of supersonic length shorted nozzle},
+ Author = {Zhang, Min-li and Yi, Shi-he and Zhao, Yu-xin},
+ Journal = {ACTA AERODYNAMICA SINICA},
+ Number = {4},
+ Pages = {500-503},
+ Volume = {25},
+ nameformat={pinyin},
+ Year = {2007}
+ }
+
+ @Book{pYi2013--,
+ Title = {Supersonic and hypersonic nozzle design},
+ Address = {Beijing},
+ Author = {Yi, Shi he and Zhao, Yu xin and He, Lin and Zhang, Min li},
+ Publisher = {National Defense Industry Press},
+ nameformat={pinyin},
+ Year = {2013}
+ }
+
+ @Book{pLIAO2012--,
+ Title = {Electronic countermeasure techniques for missile penetration},
+ Address = {Beijing},
+ Author = {LIAO, ping and JIANG, qin bo},
+ Publisher = {National Defense Industry Press},
+ nameformat={pinyin},
+ Year = {2013}
+ }
+
+ @Book{pLIU2003--,
+ Title = {Introduction of Ballistic Misille Techniques},
+ Address = {Beijing},
+ Author = {LIU, shi Qiu},
+ Publisher = {China Astronautic Publishing House},
+ nameformat={pinyin},
+ Year = {2003}
+ }
+\end{filecontents}
+\addbibresource{\jobname.bib}
+
+\defbibcheck{uppercase}{%
+\iffieldundef{nameformat}{}{\skipentry}}
+
+\defbibcheck{lowercase}{%
+\iffieldequalstr{nameformat}{lowercase}{}{\skipentry}}
+
+\defbibcheck{givenahead}{%
+\iffieldequalstr{nameformat}{givenahead}{}{\skipentry}}
+
+\defbibcheck{familyahead}{%
+\iffieldequalstr{nameformat}{familyahead}{}{\skipentry}}
+
+\defbibcheck{pinyin}{%
+\iffieldequalstr{nameformat}{pinyin}{}{\skipentry}}
+
+\begin{document}
+
+\section*{五种不同的姓名格式}
+\nocite{*}
+
+\printbibliography[check=uppercase,title=国标风格-全大写]
+\printbibliography[check=lowercase,title=国标风格-大小写不变]
+\printbibliography[check=pinyin,title=中文常见风格-拼音]
+\printbibliography[check=givenahead,title=biblatex标准风格-名在前]
+\printbibliography[check=familyahead,title=biblatex标准风格-姓在前]
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonline.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonline.tex
index 734b200b6fe..f5d4dfe3b7b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonline.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonline.tex
@@ -9,7 +9,7 @@
\addbibresource[location=local]{example.bib}
\addbibresource[location=local]{egspecialchar.bib}
%\renewcommand{\bibfont}{\zihao{5}}
-%\setlength{\bibitemsep}{0ex}
+\setlength{\bibitemsep}{0pt}
%\setlength{\bibnamesep}{0ex}
%\setlength{\bibinitsep}{0ex}
%\renewcommand{\thefootnote}{\textcircled{\tiny\arabic{footnote}}}
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonlineay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonlineay.tex
index 5414ae6ad28..5414ae6ad28 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egonlineay.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonlineay.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalse.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonlyurl.tex
index 2daf3c3fdae..2daf3c3fdae 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthorfalse.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonlyurl.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrue.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonlyurlay.tex
index 628b86a0247..628b86a0247 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/eggbnoauthortrue.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testonlyurlay.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testopttitlelink.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testopttitlelink.tex
new file mode 100644
index 00000000000..d12a533b354
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testopttitlelink.tex
@@ -0,0 +1,52 @@
+\documentclass[twoside]{article}
+\usepackage{ctex}
+\usepackage{fontspec}
+%\setmainfont{CMU Serif}
+\usepackage{xcolor}
+\usepackage{hyperref}
+\usepackage{lipsum}
+\usepackage[top=10pt,bottom=10pt,left=10pt,right=10pt]{geometry}
+\usepackage[backend=biber,style=gb7714-2015,gbpub=false,gbtitlelink=true]{biblatex}
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+
+@ARTICLE{greenwood1988,
+ AUTHOR = {Greenwood, Jeremy and Hercowitz, Zvi and Huffman, Gregory W and Williams, Joedge},
+ PUBLISHER = {JSTOR},
+ DATE = {1988},
+ JOURNALTITLE = {The American Economic Review},
+ KEYWORDS = {greenwood1988investment},
+ PAGES = {402--417},
+ TITLE = {Investment, capacity utilization, and the real business cycle},
+ url={http://www.greenwood.com},
+}
+
+@ARTICLE{刘凤良2017,
+ AUTHOR = {刘凤良 and 章潇萌 and 于泽 and 黄晓},
+ DATE = {2017},
+ JOURNALTITLE = {金融研究},
+ KEYWORDS = {刘凤良2017},
+ NUMBER = {2},
+ PAGES = {54--69},
+ TITLE = {高投资、结构失衡与价格指数二元分化},
+ url={http://www.finance.com},
+}% langid={english}
+
+\end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+ \makeatletter
+ \def\versionofgbtstyle{2018/04/03 v1.0k}
+ \def\versionofbiblatex{\abx@version}
+ \makeatother
+ %\renewcommand{\bibtitlefont}{\kaishu}
+
+ \begin{document}
+ \section{set title}
+ created with biblatex v\versionofbiblatex, last revised at \today;\\ \hspace*{1.5em} Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.
+
+ refs\nocite{*}
+
+ \printbibliography
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcd.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testproceedings.tex
index 2d181e4082e..750a036508b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcd.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testproceedings.tex
@@ -26,8 +26,6 @@
会议论文集\cite{陈志勇2011--,雷光春2012--,ROSENTHALL1963--,GANZHA2000--,Babu2014--,中国力学学会1999--, 中国社会科学院台湾史研究中心2012--}
-汇编文集类似于book和inbook\cite{韩吉人1985-90-99}\cite{中国职工教育研究会1985--}
-
{
%\hyphenation{kurose-gawa}
%\hyphenpenalty=1000
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcday.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testproceedingsay.tex
index e8106e858fd..1a08ffedea0 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egprcdorinprcday.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testproceedingsay.tex
@@ -26,8 +26,6 @@
会议论文集\cite{陈志勇2011--,雷光春2012--,ROSENTHALL1963--,GANZHA2000--,Babu2014--,中国力学学会1999--, 中国社会科学院台湾史研究中心2012--}
-汇编文集类似于book和inbook\cite{韩吉人1985-90-99}\cite{中国职工教育研究会1985--}
-
{
%\hyphenation{kurose-gawa}
%\hyphenpenalty=1000
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreport.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testreport.tex
index 2604b843b54..2604b843b54 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreport.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testreport.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreportay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testreportay.tex
index e07b0943aa1..e07b0943aa1 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egreportay.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testreportay.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testtextcite.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testtextcite.tex
new file mode 100644
index 00000000000..3e73e19b062
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testtextcite.tex
@@ -0,0 +1,110 @@
+\documentclass[twoside]{article}
+\usepackage{ctex}
+\usepackage{xcolor}
+\usepackage{hyperref}
+\usepackage{lipsum}
+\usepackage[top=2cm,bottom=1cm,left=3cm,right=3cm]{geometry}
+
+\usepackage[backend=biber,style=gb7714-2015]{biblatex}
+
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+@ARTICLE{徐伟康2010对,
+ AUTHOR = {徐伟康},
+ DATE = {2010},
+ JOURNALTITLE = {经济研究},
+ NUMBER = {5},
+ PAGES = {139--148},
+ TITLE = {对《 消费者价格指数与生产者价格指数: 谁带动谁?》 一文的质疑},
+ USERA = {J},
+}
+
+@ARTICLE{徐伟康2011,
+ AUTHOR = {徐伟康 and others},
+ DATE = {2011},
+ JOURNALTITLE = {经济研究},
+ NUMBER = {5},
+ PAGES = {139--148},
+ TITLE = {对《 消费者价格指数与生产者价格指数: 谁带动谁?》 一文的质疑},
+ USERA = {J},
+}
+
+@ARTICLE{杨光2015经济波动,
+ AUTHOR = {杨光 and 孙浦阳 and 龚刚 and 徐伟康},
+ DATE = {2015},
+ JOURNALTITLE = {经济研究},
+ NUMBER = {2},
+ PAGES = {47--60},
+ TITLE = {经济波动, 成本约束与资源配置},
+ VOLUME = {50},
+}
+
+@INPROCEEDINGS{FOURNEY1971-17-38,
+ AUTHOR = {FOURNEY, M E},
+ LOCATION = {New York},
+ PUBLISHER = {ASME},
+ BOOKTITLE = {Symposium on Applications of Holography in Mechanics, August 23-25, 1971, University of Southern California, Los Angeles, California},
+ DATE = {1971},
+ PAGES = {17--38},
+ TITLE = {Advances in holographic photoelasticity},
+}
+
+@BOOK{Yi2013--,
+ AUTHOR = {Yi, S H and Zhao, Y X and He, L and Zhang, M L},
+ LOCATION = {BeiJing},
+ PUBLISHER = {National Defense Industry Press},
+ DATE = {2013},
+ TITLE = {Supersonic and hypersonic nozzle design},
+}
+\end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+
+ \begin{document}
+ \section{set title}
+ created with biblatex v\versionofbiblatex, last revised at \today; Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.
+
+\bigskip
+ GB/T 7714-2015 标准 10.1.1 节,引用单篇文献:
+
+ 文献\cite{徐伟康2010对}提到。文献\cite{FOURNEY1971-17-38}提到。(use cite)\par
+ 文献\parencite{徐伟康2010对}提到。文献\parencite{FOURNEY1971-17-38}提到。(use parencite)\par
+ \textcite{徐伟康2010对}提到。\textcite{FOURNEY1971-17-38}提到。(use textcite)\par
+ \authornumcite{徐伟康2010对}提到。\authornumcite{FOURNEY1971-17-38}提到。
+ (use authornumcite)\par
+ \textcite{徐伟康2011}提到。(use textcite)
+
+\bigskip
+ GB/T 7714-2015 标准 10.1.2 节,引用多篇文献:
+
+ 文献\cite{杨光2015经济波动,Yi2013--}提到。(use cite)\par
+ 文献\parencite{杨光2015经济波动,Yi2013--}提到。(use parencite)\par
+ \textcite{杨光2015经济波动,Yi2013--}提到。(use textcite)\par
+ \authornumcite{杨光2015经济波动,Yi2013--}提到。(use authornumcite)\par
+
+
+\bigskip
+ GB/T 7714-2015 标准 10.1.3 节,多次引用文献:
+
+ 文献\pagescite[16]{杨光2015经济波动}提到。
+ 文献\pagescite[16]{徐伟康2010对}提到。
+ 文献\pagescite[16]{Yi2013--}提到。
+ 文献\pagescite[16]{FOURNEY1971-17-38}提到。(use pagescite)\par
+ \authornumcite{杨光2015经济波动}提到。
+ \authornumcite{徐伟康2010对}提到。
+ \authornumcite{Yi2013--}提到。
+ \authornumcite{FOURNEY1971-17-38}提到。(use authornumcite)\par
+
+\bigskip
+ 其它用法:
+
+ 文献\cite[见][49页]{杨光2015经济波动}。
+ 文献\parencite[见][49页]{杨光2015经济波动}。
+ 见\citeauthor{杨光2015经济波动}\cite{杨光2015经济波动}。
+ 文献\footnote{脚注中引用文献\footcite{杨光2015经济波动}。}。
+ 文献\footfullcite{杨光2015经济波动}。
+
+
+ \printbibliography
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testtextciteay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testtextciteay.tex
new file mode 100644
index 00000000000..a9f09221deb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testtextciteay.tex
@@ -0,0 +1,110 @@
+\documentclass[twoside]{article}
+\usepackage{ctex}
+\usepackage{xcolor}
+\usepackage{hyperref}
+\usepackage{lipsum}
+\usepackage[top=2cm,bottom=1cm,left=3cm,right=3cm]{geometry}
+
+\usepackage[backend=biber,style=gb7714-2015ay]{biblatex}
+
+\usepackage{filecontents}
+\begin{filecontents}{\jobname.bib}
+@ARTICLE{徐伟康2010对,
+ AUTHOR = {徐伟康},
+ DATE = {2010},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {徐伟康2010对},
+ NUMBER = {5},
+ PAGES = {139--148},
+ TITLE = {对《 消费者价格指数与生产者价格指数: 谁带动谁?》 一文的质疑},
+ USERA = {J},
+}
+
+@ARTICLE{徐伟康2011,
+ AUTHOR = {徐伟康 and others},
+ DATE = {2011},
+ JOURNALTITLE = {经济研究},
+ NUMBER = {5},
+ PAGES = {139--148},
+ TITLE = {对《 消费者价格指数与生产者价格指数: 谁带动谁?》 一文的质疑},
+ USERA = {J},
+}
+
+@ARTICLE{杨光2015经济波动,
+ AUTHOR = {杨光 and 孙浦阳 and 龚刚 and 徐伟康},
+ DATE = {2015},
+ JOURNALTITLE = {经济研究},
+ KEYWORDS = {杨光2015经济波动},
+ NUMBER = {2},
+ PAGES = {47--60},
+ TITLE = {经济波动, 成本约束与资源配置},
+ VOLUME = {50},
+}
+
+@INPROCEEDINGS{FOURNEY1971-17-38,
+ AUTHOR = {FOURNEY, M E},
+ LOCATION = {New York},
+ PUBLISHER = {ASME},
+ BOOKTITLE = {Symposium on Applications of Holography in Mechanics, August 23-25, 1971, University of Southern California, Los Angeles, California},
+ DATE = {1971},
+ PAGES = {17--38},
+ TITLE = {Advances in holographic photoelasticity},
+}
+
+@BOOK{Yi2013--,
+ AUTHOR = {Yi, S H and Zhao, Y X and He, L and Zhang, M L},
+ LOCATION = {BeiJing},
+ PUBLISHER = {National Defense Industry Press},
+ DATE = {2013},
+ TITLE = {Supersonic and hypersonic nozzle design},
+}
+\end{filecontents}
+ \addbibresource{\jobname.bib}
+ %
+
+ \begin{document}
+ \section{set title}
+ created with biblatex v\versionofbiblatex, last revised at \today; Style Files (gb7714-2015*.*) have version number: \versionofgbtstyle.
+
+\bigskip
+ GB/T 7714-2015 标准 10.2.1 节,引用单篇文献:
+
+ 文献\cite{徐伟康2010对}提到。文献\cite{FOURNEY1971-17-38}提到。(use cite)\par
+ 文献\parencite{徐伟康2010对}提到。文献\parencite{FOURNEY1971-17-38}提到。(use parencite)\par
+ 徐伟康\yearcite{徐伟康2010对}提到。FOURNEY\yearcite[18]{FOURNEY1971-17-38}提到。(use yearcite)\par
+ \textcite{徐伟康2010对}提到。\textcite{FOURNEY1971-17-38}提到。(use textcite)\par
+ \textcite{徐伟康2011}提到。(use textcite)
+
+\bigskip
+ GB/T 7714-2015 标准 10.2.2 节,引用单篇文献(多个作者的情况):
+
+ 文献\cite{杨光2015经济波动}提到。文献\cite{Yi2013--}提到。(use cite)\par
+ 文献\parencite{杨光2015经济波动}提到。文献\parencite{Yi2013--}提到。(use parencite)\par
+ 杨光\ 等\yearcite{杨光2015经济波动}提到。Yi et al. \yearcite{Yi2013--}提到。(use yearcite)\par
+ \textcite{杨光2015经济波动}提到。\textcite{Yi2013--}提到。(use textcite)\par
+
+
+\bigskip
+ GB/T 7714-2015 标准 10.2.4 节,多次引用文献:
+
+ 文献\pagescite[16]{杨光2015经济波动}提到。
+ 文献\pagescite[16]{徐伟康2010对}提到。
+ 文献\pagescite[16]{Yi2013--}提到。
+ 文献\pagescite[16]{FOURNEY1971-17-38}提到。(use pagescite)\par
+ 杨光\yearpagescite[17]{杨光2015经济波动}提到。
+ 徐伟康\yearpagescite[16]{徐伟康2010对}提到。Yi\yearpagescite[17]{Yi2013--}提到。FOURNEY\yearpagescite[17]{FOURNEY1971-17-38}提到。(use yearpagescite)\par
+
+\bigskip
+ 其它用法:
+
+ 文献\cite[见][49页]{杨光2015经济波动}。
+ 文献\parencite[见][49页]{杨光2015经济波动}。
+ 见赵耀东(\cite*{杨光2015经济波动})。
+ 见赵耀东(\citeyear{杨光2015经济波动})。
+ 文献\footnote{脚注中引用文献\footcite{杨光2015经济波动}。}。
+ 文献\footfullcite{杨光2015经济波动}。
+
+
+ \printbibliography
+
+ \end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatent.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testthesispatent.tex
index 1f5667b12d2..1f5667b12d2 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatent.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testthesispatent.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatentay.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testthesispatentay.tex
index 5363a76b2df..5363a76b2df 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/egthesispatentay.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testthesispatentay.tex
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistory.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistory.tex
index ca57f14f05e..0f4f78f6f08 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistory.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistory.tex
@@ -1,8 +1,92 @@
%更新历史仅给出更新针对的问题,相应的处理代码和解释不在此给出,详见提示对应的说明文档内容
+
+%============================
+\updateinfo[2018-06-01]{date of update: 2018-06-01 to version v1.0l}\label{up:180601}
+\begin{enumerate}
+
+\item 增加gbctexset选项设置参考文献标题内容的控制方式,即,除了相同的printbibliography选项方式外,选择是通过 bibname 或 refname 控制还是通过定义本地化字符串 bibliography 或 references 控制。 (20180702)
+
+add an option gbctexset to set the bibliography title's control method, i.e. besides the same printbibliography option method, two methods: control by bibname or refname and control by DefineBibliographyStrings is selected by this option.
+
+\item 增加gbbiblabel选项来控制顺序编码制文献表序号标签的格式,即用方括号、圆括号、点、方框、圆圈等来装饰序号数字。(20180623)
+
+add an option gbbiblabel to control the format of the numerical label, i.e. the label number is wrapped by bracket, parenthesis,dot,box,circle and so on.
+
+\item 增加 bibitemindent 尺寸配合 bibhang 设置基于list的文献表环境中项的缩进。(20180615)
+
+add a length bibitemindent to control the item indent of bibliography based on list env with bibhang。
+
+\item 增加upcite命令为兼容一些老的文档,顺序编码制中同supercite,作者年制中同yearcite。(20180604)
+
+add upcite to be compatible with some old doc,it behaves like supercite in numerical style and yearcite in author year style.
+
+\item 为更合理的表述选项值的意义,修改了gbnamefmt选项的值。同时为方便在一个文献表中实现不同姓名格式,增加了nameformat域来为每一个条目设置姓名的格式。(20180604)
+
+modify the values of the option gbnamefmt for standardising option terminology. add a nameformat to control the name format of each entry,in order to implement multiple name format in on bibliography.
+
+\item 为顺序编码样式gbalign增加了center选项值。(20180602)
+
+add a value: center of the gbalign option for numerical sequence style.
+
+\item 统一了url字体为roman字体。(20180601)
+
+font of url set to be same as the main text.
+
+
+\item 进一步完善了文档。(20180601)
+
+update the documentataion.
+\end{enumerate}
+
+
%============================
\updateinfo[2018-04-03]{date of update: 2018-04-03 to version v1.0k}\label{up:180403}
\begin{enumerate}
+\item 重新设计了语言排序机制,更好支持英/俄/法/日/韩/中等多语言。(20180524)
+
+sorting mechanism for different languages was redesigned to improve the support of languages like english/Russian/french/japanese/korean.
+
+\item 增加了一个gbtitlelink选项,用于设置文献表标题的超链接。(20180524)
+
+add an option gbtitlelink to set hyperlink for the reference title.
+
+\item 根据 liuhui 等的建议,修改textcite命令中的标点,去掉等/et al前面和后面的逗号。(20180523)
+
+del the comma before and after 等/et al in the cite label for command textcite,suggested by liuhui and others.
+
+\item 增加对数据库,数据集,软件,舆图等条目类型的处理,增加mark,medium域以更好的实现标准的要求,条目类型和域命名与Lee zeping的gbt7714宏包一致以兼容bib文件。 (20180520)
+
+add entry types:database, dataset, software, map, archive and fields: mark, medium to meet GB/T 7714-2015 betterly. the nomenclature of added entry types and fields is in keep with Pkg gbt7714 developed by Lee zeping to be compatible with bib files.
+
+\item 增加了选项gbfieldstd,用于控制一些域如标题,网址,卷等格式。 (20180515)
+
+add an option gbfieldstd to control the format of some fields like title, url, volume.
+
+\item 增加了选项gbcodegbk,用于兼容GBK编码的文件,方法源自biblatex-caspervector。 (20180509)
+
+add an option gbcodegbk to deal tex file encoded with GBK, the solution originated from biblatex-caspervector.
+
+\item 增加了选项gbstrict,用于控制bib文件中一些多余的域的输出,目的是为了兼容一些bib文件。 (20180509)
+
+add an option gbstrict to control the output of some unnecessary fields, in order to be compatible with some bib file.
+
+\item 增加了字体控制命令bibauthorfont,bibtitlefont,bibpubfont,用于控制文献表中作者、标题、出版项的字体和颜色。(20180427)
+
+add 3 font set cmds:bibauthorfont,bibtitlefont,bibpubfont to control the font and color of author,title,and publication items.
+
+\item 增加了标注命令authornumcite,用于在标注标签中同时输出作者和顺序编码。(20180427)
+
+add a citation cmd:authornumcite to print author and numeric number at the same time.
+
+\item 增加了gbpunctin选项,用于控制inbook等类型是否输出析出来源文献前的//符号,主要是为方便用户定制。
+
+add an option gbpunctin to control the output of // before bookauthor for entry types like inbook.
+
+\item 修正了析出文献来源的作者为editor是出现两次的问题,这个很简单的问题如果用bookauthor就不会出现问题,所以以前一直没有发现,才由杨志红提出来,感谢。
+
+correct a bug that the editor appears twice for the entry with booktitle's bookauthor is editor, which is reported by Yang zhihong,3ks!
+
\item 完善了github上的wiki。
WIKI on github was accomplished.
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.md b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.md
index 90370143994..50fa4758e6b 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.md
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.md
@@ -1,12 +1,83 @@
+### date of update: 2018-04-03 to version v1.0k
+- Changes to pkg code:
+
+ * ƣԸ֧Ӣ/////еȶԡ(20180524)
+
+ sorting mechanism for different languages was redesigned to improve the support of languages like english/Russian/french/japanese/korean.
+
+ * һgbtitlelinkѡױijӡ(20180524)
+
+ add an option gbtitlelink to set hyperlink for the reference title.
+
+ * liuhui ȵĽ飬޸textciteеı㣬ȥ/et alǰͺĶš(20180523)
+
+ del the comma before and after /et al in the cite label for command textcitesuggested by liuhui and others.
+
+ * Ӷݿ⣬ݼͼĿ͵ĴmarkmediumԸõʵֱ׼ҪĿͺLee zepinggbt7714һԼbibļ 20180520
+
+ add entry typesdatabase, dataset, software, map, archive and fields: mark, medium to meet GB/T 7714-2015 betterly. the nomenclature of added entry types and fields is in keep with Pkg gbt7714 developed by Lee zeping to be compatible with bib files.
+
+ * ѡgbfieldstdڿһЩ⣬ַȸʽ 20180515
+
+ add an option gbfieldstd to control the format of some fields like title, url, volume.
+
+ * ѡgbcodegbkڼGBKļԴbiblatex-caspervector 20180509
+
+ add an option gbcodegbk to deal tex file encoded with GBK, the solution originated from biblatex-caspervector.
+
+ * ѡgbstrictڿbibļһЩĿΪ˼һЩbibļ 20180509
+
+ add an option gbstrict to control the output of some unnecessary fields, in order to be compatible with some bib file.
+
+ * bibauthorfontbibtitlefontbibpubfontڿױߡ⡢ɫ20180427
+
+ add 3 font set cmdsbibauthorfontbibtitlefontbibpubfont to control the font and color of authortitleand publication items.
+
+ * ˱עauthornumciteڱעǩͬʱߺ˳롣20180427
+
+ add a citation cmdauthornumcite to print author and numeric number at the same time.
+
+
+ * gbpunctinѡڿinbookǷԴǰ//ţҪΪûơ
+
+ add an option gbpunctin to control the output of // before bookauthor for entry types like inbook.
+
+ * ԴΪeditordzε⣬ܼ򵥵bookauthorͲ⣬ǰһֱûз֣־л
+
+ correct a bug that the editor appears twice for the entry with booktitle's bookauthor is editor, which is reported by Yang zhihong,3ks!
+
+ * githubϵwiki
+
+ WIKI on github was accomplished.
+
+ * gbnamefmtеһЩС
+
+ correct some flaws for gbnamefmt option.
+
+ * ޸˴ڼ3.11汾
+
+ change the separator before related block for v3.11.
+
+ * ҳ뷶Χļen dashΪhyphen
+
+ change the pages range separator from en dash to hyphen.
+
+ * v3.7ϰ汾רйں⣬bug빫ûʹprinttext첽ƻ¡
+
+ correct a bug of newsdate in patent for biblatex >v3.7, which added an additional dot before urldate caused by broken asynchronous punctuation .
+
+ * texlive2017ϰ汾beamerб⣬beamerbibmacro\{title\}patchͬͨĵ࣬bugbeamerpatchݷ仯¡
+
+ correct a bug of punctuation after title with beamer for >texlive2017, the bug is caused by the update of beamer.
### date of change: 2018-01-20 to version v1.0j
* Changes to pkg code:
- "*.bbx": add an option `gbtype` to control the type and carrier identifier after title.
- "*.bbx": change the version code switch mechanism.
- "*.bbx": change the option align to `gbalign` for standardising option terminology.
- - "*.bbx": add an option `gbnamefmt` to control the letter case and format of author's name,and eliminate the comma in author names of the chinese references exported from cnki by `zotero`,these demand raised by liuxiaotao.
+ - "*.bbx": add an option `gbnamefmt` to control the letter case and format of author's nameand eliminate the comma in author names of the chinese references exported from cnki by `zotero`these demand raised by liuxiaotao.
- "*.bbx": correct the delimiter between author and year for author-year style with right using of the `\nameyeardelim`
- "*.bbx": add an cmd `\yearcite` to print year info only for author-year style when author has been written manually.
@@ -30,8 +101,8 @@
- "*.bbx": change the seperator between multi-language reference text from cmd par to cmd newline for the gb7714-2015 align style
- "*.bbx": fix a flaw reported by Lee Zeping. remove the comma between `journaltitle` and (number) when the volume is undefined.
- "*.bbx": add an option `gbpub` to control the publishing info. if `gbpub=false`, publishing info's format is the biblatex standard style, otherwise is gb7714-2015 style. The origin idea comes from Wayne08.
- - "*.bbx": fix a flaw reported by zjsdut@163.com. remove the dot before url when url is the only info available。
- - "*.bbx": add an option gbnoauthor for author-year style. when author is undefined, set option gbnoauthor=true then author with "佚名"or"NOAUTHOR" will be defined. note that with biblatex version 3.7 or higher for multiple DeclareStyleSourcemap support, code can be simplifed, because the realization code now with texlive2016(biblatex 3.4) is subjected to the one DeclareStyleSourcemap constraint.
+ - "*.bbx": fix a flaw reported by zjsdut@163.com. remove the dot before url when url is the only info available
+ - "*.bbx": add an option gbnoauthor for author-year style. when author is undefined, set option gbnoauthor=true then author with ""or"NOAUTHOR" will be defined. note that with biblatex version 3.7 or higher for multiple DeclareStyleSourcemap support, code can be simplifed, because the realization code now with texlive2016(biblatex 3.4) is subjected to the one DeclareStyleSourcemap constraint.
* Changes to documentation:
- biblatex-gb7714-2015.tex: revise this document
- *.bib: correct a warning which is caused by long multi-line url info.
@@ -43,7 +114,7 @@
- "*.bbx": for online type, the revised/changed date is denoted by date/enddate/eventdate
- "*.bbx": modify the usera field's format, taking into account the standard style's package option url, proposed by Sheng Wenbo.
- "*.bbx": add a no breakthinspace after the entrytype identifier (like [M]//) to make the next word break correctly
- - "*.bbx": add a feature for automatically dealing with special character(like &/%/#),compatibility with texlive2015 is done
+ - "*.bbx": add a feature for automatically dealing with special character(like &/%/#)compatibility with texlive2015 is done
* Changes to documentation:
- biblatex-gb7714-2015.tex: revise this document and add some explication
- *.bib: refine the bib source file
@@ -90,11 +161,11 @@
### date of change: 2016-11-14 to version v1.0c
* Changes to pkg code:to fix a few bugs
- - "*ay.bbx": add noauthor or "佚名" for the authoryear style
+ - "*ay.bbx": add noauthor or "" for the authoryear style
- "*ay.bbx": add some map cmds to automatically fill the userb field for sorting of the authoryear style
- "*ay.bbx": add a command yearpagescite for the authoryear style
- "*.bbx": add a dot after the null publisher with nothing followed
- - "*.bbx": modify the english local string backrefpage to chinese "引用页:"
+ - "*.bbx": modify the english local string backrefpage to chinese "ҳ:"
- "*ay.bbx": add some options such as uniquelist,labeldate,uniquename for the authoryear style
* Changes to documentation:
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.tex
index 00498bea6b3..19bf26f12e5 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/updatehistoryold.tex
@@ -1,35 +1,25 @@
-%============================
-\updateinfo[2018-04-03]{update to version 1.0k}\label{up:180403}
-\begin{enumerate}
-\item 修正了gbnamefmt中的一些小错误。
-\item 修改了代码用于兼容3.11版本
-\item 页码范围的间隔符从en dash改为hyphen
-\item 修正了v3.7以上版本中专利文献中公告日期后多出点的问题,该bug是由于输入公告日期没有使用printtext导致异步标点机制破坏所致。
-\item 修正了texlive2017以上版本中beamer类中标题后面多出点的问题,由于beamer会对bibmacro\{title\}做patch导致其输出不同于普通文档类,该bug是由于beamer升级后patch的内容发生变化导致。
-\end{enumerate}
%============================
\updateinfo[2018-01-20]{update to version 1.0j}\label{up:180120}
\begin{enumerate}
\item 增加gbtype选项用于控制是否输出题名后的标识符,见\ref{sec:added:opt} 节。
-\item 进一步修改了版本判断机制,以使最新版本的兼容性更强,见\ref{sec:blx:compatibility}节。
+\item 进一步修改了版本判断机制,以使最新版本的兼容性更强。
\item 根据刘小涛的需求和建议,增加了gbnamefmt选项用于控制姓名的大小写和输出格式,同时根据zotero从cnki识别输出中文文献姓名中带逗号的情况做了兼容性处理,见\ref{sec:opt:namefmt}节。
-\item 为统一样式增加的选项将原来的align选项修改为gbalign,见\ref{sec:added:opt}节。
-\item 通过正确使用nameyeardelim相关命令,修正了作者年制,标注和著录表中的中作者与年份之间的标点符号,
- 见\ref{sec:label:fmt}节。
-\item 根据ghiclgi的建议,增加了yearcite命令以满足,作者年制中作者已经给出仅需要年份信息而不需要页码信息的情况,说明和测试见\ref{sec:test:book},\ref{sec:cite:cmd:test}节。
+\item 为统一样式增加的选项,将原来的align选项修改为gbalign。
+\item 通过正确使用nameyeardelim相关命令,修正了作者年制,标注和著录表中的中作者与年份之间的标点符号。
+\item 根据ghiclgi的建议,增加了yearcite命令以满足,作者年制中作者已经给出仅需要年份信息而不需要页码信息的情况,
+ 说明和测试见\ref{sec:test:book},\ref{sec:cite:cmd:test}节。
\end{enumerate}
%============================
\updateinfo[2017-11-21]{update to version 1.0i}\label{up:171121}
\begin{enumerate}
\item 因为biblatex版本升级,3.8及以上版的set类型不再复制第一个子条目的信息,因此增加使用关联条目的解决方案,详见
-\ref{sec:multilan:implement}, \ref{sec:data:mdf:forrelated}节。
-\item 修正了一个liubenyuan发现的bug。当标题中含有\verb|\LaTeX{}|这样的宏时,cjk判断函数出错。解决如下:
- \begin{texlist}
- 这个问题是这样的,
- 因为在cjk判断函数中,使用了xtring的StrChar函数来抽取字符,但这个函数默认情况下需要其参数完全展开。因为\LaTeX{}宏比较复杂,展开时会出现问题。设置该函数不展开或展开一次,都可以解决判断出错的问题。比如:
+\ref{sec:multilan:implement}节。
+\item 修正了一个liubenyuan发现的bug。当标题中含有\verb|\LaTeX{}|这样的宏时,cjk判断函数出错。这个问题是这样的,
+ 因为在cjk判断函数中,使用了xtring的StrChar函数来抽取字符,但这个函数默认情况下需要其参数完全展开。因为\verb|\LaTeX{}|宏比较复杂,展开时会出现问题。设置该函数不展开或展开一次,都可以解决判断出错的问题。比如:
+ \begin{texlist}
\expandarg
%
\StrChar{english}{1}[\tempa]%
@@ -40,110 +30,27 @@
\StrChar{english \LaTeX{} abc}{1}[\tempa]%
\tempa
-
- 但解决的是直接给出文本的情况,在biblatex使用中需要用\thefield取出文本,显然\thefield不止展开一次,因此不展开或者展开一次,都会出现问题,所以无解。只能从另外一个角度出发。
-
- 考虑到动态数据修改时,也可以利用正则表达式抽取数据,因此利用它来将title信息的第一个非特殊符号字符抽取出来,放到userd 中用于cjk判断,这样就避开了\LaTeX{}展开的问题。
\end{texlist}
+ 但解决的是直接给出文本的情况,在biblatex使用中需要用 thefield 取出文本,显然 thefield 不止展开一次,因此不展开或者展开一次,都会出现问题,所以无解。只能从另外一个角度出发。考虑到动态数据修改时,也可以利用正则表达式抽取数据,因此利用它来将title 信息的第一个非特殊符号字符抽取出来,放到userd 中用于cjk判断,这样就避开了\verb|\LaTeX{}|展开的问题。
+
+\item 针对biblatex3.8a的更新做了兼容性处理,主要是修改版本判断和处理机制,替换新的宏包选项,替换新的排序格式命令。
-\item 针对biblatex3.8a的更新做了兼容性处理,主要是修改版本判断和处理机制,替换新的宏包选项,替换新的排序格式命令。详见第\ref{sec:blx:compatibility}节
-
-\item 重写了范围解析函数,详见\ref{sec:cjkjudge}节
+\item 重写了范围解析函数。
\end{enumerate}
\updateinfo[2017-04-11]{update to version 1.0h}\label{up:170411}
\begin{enumerate}
-\item texlive2017中biblatex3.7对于authoryear样式中的date+extrayear宏有一定的修改,从原来texlive2016中的命令printdateextralabel 转换到了printlabeldateextra。因此做一个修改。
- \begin{texlist}
- %设置因为mergedate默认为true时的情况,来自\bbx@opt@mergedate@compact
-%去掉作者后面包围年份的圆括号
-%这里因为biblatex版本的不同,做不同的处理,texlive2017版的在iftexliveseven=true中设置
-%2016等低版本的在iftexliveseven=false中设置
-%重设date+extrayear格式,源来自authoryear.BBX
-\iftoggle{iftexliveseven}{%
- \renewbibmacro*{date+extrayear}{%
- \iffieldundef{labelyear}
- {}
- {\printtext{%[parens]%这里把括号去掉
- \iffieldsequal{year}{labelyear}
- {\printlabeldateextra}%
- {\printfield{labelyear}%
- \printfield{extrayear}}}}}%
-}{%
-\renewbibmacro*{date+extrayear}{%
- \iffieldundef{\thefield{datelabelsource}year}
- {}
- {\printtext{%[parens]%这里把括号去掉
- \iffieldsequal{year}{\thefield{datelabelsource}year}
- {\printdateextralabel}%
- {\printfield{labelyear}%
- \printfield{extrayear}}}}}%
-}
- \end{texlist}
+\item texlive2017中biblatex3.7对于authoryear样式中的date+extrayear宏有一定的修改,从原来texlive2016中的命令printdateextralabel 转换到了printlabeldateextra。因此做修改。
- 当然其实这还有更简单的解决方法就是:
+ 如下的简单方法似乎有点问题:
\begin{texlist}
\let\printdateextralabel=\printlabeldateextra
\end{texlist}
- 这个方式似乎有点问题。
-\item 根据同学(zjsdut@163.com)发现的问题,修改一个bug,感谢。当online 类型仅有url 信息时,url前面多了一个点。这是modifydate宏设计中printtext位置导致标点异步处理机制失效所产生现象。因此作出修改,newbibmacro*\{modifydate\}宏详见\ref{sec:date:fmt}节。
-
-
-\item 增加一个选项gbnoauthor。当给出选项gbnoauthor=true时,作者年制中当作者缺省时,使用佚名或noauthor代替,即将佚名或noauthor作为作者处理。默认情况下gbnoauthor=true不处理,即当无作者进行处理,选择增加的代码详见\ref{sec:blx:compatibility}节。同时也修改了中英文排序判断和佚名代替的机制。
- \begin{texlist}
- \map{%因为无法进行cjk字符判断,所以用反的思路,判断没有英文字符,没有空格,没有逗号等字符情况下
- %认为是中文的,将文献userb设置成cn,用于排序
- \step[fieldsource=author,match=\regexp{[^a-zA-Z\s\.\,\'\{\}\-\:0-9]},final]
- \step[fieldset=userb,fieldvalue={cn}]
- }
- \map{%因为无法进行cjk字符判断,所以用反的思路,判断没有英文字符,没有空格,没有逗号等字符情况下
- %认为是中文的,将文献userb设置成cn,用于排序
- \step[fieldsource=title,match=\regexp{[^a-zA-Z\s\.\,\'\{\}\-\:0-9]},final]
- \step[fieldset=userb,fieldvalue={cn}]
- }%如果没有作者和标题,那么剩下的最可能有意义的只有网址了,而网址通常是英文的,因此不用再进一步对其它域进行判断了。
- \map{%将没有设置的userb设置成en,即认为不是中文的就是英文的。
- \step[fieldset=userb,fieldvalue={en}]
- }
- \end{texlist}
-
- \begin{texlist}
- \def\dealnoathor{
- \DeclareStyleSourcemap{
- \maps[datatype=bibtex]{
- \map{%默认情况下将空缺作者设置为佚名
- \step[fieldsource=userb,match={cn},final]
- \step[fieldset=author, fieldvalue={佚名}]
- }
- \map{%默认情况下将空缺作者设置为佚名
- \step[fieldsource=userb,match={en},final]
- \step[fieldset=author, fieldvalue={NOAUTHOR}]
- }
- }
- }}
- \end{texlist}
-
- 下面是已经取消的以前的处理方式:
- \begin{texlist}
- \map{%默认情况下将空缺作者设置为佚名
- \step[fieldset=author, fieldvalue={佚名}]
- }
- \map[overwrite]{%当标题带有英文字符,且作者为佚名的情况,设置作者为noauthor,
- %也有一些特殊情况可能处理不到,比如标题中英混合,作者又却是
- \step[fieldsource=title,match=\regexp{[a-zA-Z]},final]
- \step[fieldsource=author,match=\regexp{佚名}, replace={NOAUTHOR}]
- }
- \map{%因为无法进行cjk字符判断,所以用反的思路,判断没有英文字符,没有空格,没有逗号等字符情况下
- %认为是中文的,将文献userb设置成cn,用于排序
- \step[fieldsource=author,match=\regexp{[^a-zA-Z\s\.\,\'\{\}\-]},final]
- \step[fieldset=userb,fieldvalue={cn}]
- }
- \map{%将没有设置的userb设置成en,即认为不是中文的就是英文的。
- \step[fieldset=userb,fieldvalue={en}]
- }
- \end{texlist}
+\item 根据(zjsdut@163.com)发现的问题,修改一个bug,感谢。当online 类型仅有url 信息时,url前面多了一个点。这是modifydate宏设计中printtext位置导致标点异步处理机制失效所产生现象。因此对newbibmacro*\{modifydate\}宏作出修改。
+\item 增加一个选项gbnoauthor。当给出选项gbnoauthor=true时,作者年制中当作者缺省时,使用佚名或noauthor代替,即将佚名或noauthor作为作者处理。默认情况下gbnoauthor=true不处理,即当无作者进行处理。同时也修改了中英文排序判断和佚名代替的机制。
\item 修改多语言参考文献间的分割符号,即将par改为newline,避免采用gb7714-2015的项对齐方式时,不同语言的参考文献间的分段导致没有缩进。(测试结果见:\ref{sec:align:test}节的项对齐方式)
@@ -152,206 +59,9 @@
\renewcommand*{\entrysetpunct}{\adddot\newline\nobreak}
\end{texlist}
-\item Zeping Lee兄发现了一个小问题,感谢,一直没有注意到这个问题。这里做出修改:主要是作者年制中,期刊析出的文献中,当卷信息不存在时,期刊名和期是连在一起的,而不是中间有个逗号,例如GB/T 7714-2015 中第10.2.4 节中的“刘彻东条目”。主要修改如下(结果测试见:\ref{sec:article:novol}节):
-
- \begin{texlist}
- %调整期刊名的格式,源来自standard.bbx
- \renewbibmacro*{journal+issuetitle}{%
- \usebibmacro{journal}%
- %\setunit*{\addspace}%
- %\setunit*{\addcomma\addspace}%修改为增加一个逗号
- \iffieldundef{series}%
- {}%
- {\newunit%
- \printfield{series}%
- \setunit{\addspace}}%
- %\usebibmacro{volume+number+eid}%
- %\setunit{\addspace}%
- \usebibmacro{issue+date}%
- %\setunit{\addcolon\space}%
- %换成逗号和空格
- \usebibmacro{issue}%
- \iffieldundef{volume}{}{\setunit{\addcomma\space}}%
- \usebibmacro{volume+number+eid}%把卷期放到年份后面
- %\newunit
- }
-
- %调整journal,首先判断子标题,然后在设置标点。避免直接设置标点后,当volume不存在是需要使用\nopuct去标点进而引入不必要的空格
- \renewbibmacro*{journal}{%
- \iffieldundef{journaltitle}%
- {}%
- {\printtext[journaltitle]{%
- \printfield[titlecase]{journaltitle}%
- \iffieldundef{journalsubtitle}{}{\setunit{\subtitlepunct}%
- \printfield[titlecase]{journalsubtitle}}}}}
-
- %调整issue+date,原在authoryear.BBX中\bbx@opt@mergedate@compact中定义
- %当issue存在时,才设置newunit。避免直接设置标点后,当volume不存在是需要使用\nopuct 去标点进而引入不必要的空格
- \renewbibmacro*{issue+date}{%
- \iffieldundef{issue}%
- {}%
- {\printtext[parens]{\printfield{issue}}\newunit}}
-
- %增加一个number带括号的格式,避免使用mkbibparens而引入一个不必要的空格
- \DeclareFieldFormat{addnumflag}{%
- \nobreak\printtext{(}\nobreak #1\nobreak\printtext{)}}
-
- %调整期刊卷和期的格式,源来自standard.bbx
- \renewbibmacro*{volume+number+eid}{%
- \printfield{volume}%
- %\setunit*{\adddot}%去掉点号
- %\printfield{number}%
- \iffieldundef{number}{}{\printfield[addnumflag]{number}}%
- %\iffieldundef{number}{}{\printtext{\mkbibparens{\printfield{number}}}}% 增加一个圆括号
- \iffieldundef{eid}{}{%
- \setunit{\addcomma\space}%
- \printfield{eid}}}
- \end{texlist}
-
-\item wayne508同学提出了一个需求,就是不希望使用出版项缺省时的默认处理,即不使用[出版地不详],[出版者不详],[S.l.],[s.n.]等填充,因此增加了一个宏包选项gbpub,当等于false时,去掉自动处理,使用biblatex 的标准处理方式。增加选项代码见\ref{sec:blx:compatibility}节,下面给出的是具体的处理代码:
-
- \begin{texlist}
- %出版社和地址的处理
- \newbibmacro*{location+institution+date}{%
- \iftoggle{bbx:gbpub}%
- {\testCJKfirst{\thefield{title}}
- \iflistundef{location}{\iftoggle{ifCJKforgbt}{\printtext{[出版地不详]}}{\printtext{[S.l.\adddot]}}}%
- {\printlist{location}}%
- % \iflistundef{institution}
- % {\setunit*{\addcomma\space}}
- % {\setunit*{\addcolon\space}}%
- % \printlist{institution}%
- % \setunit*{\addcomma\space}%
- \addcolon\addspace%
- \iflistundef{institution}{%
- \iftoggle{ifCJKforgbt}{\printtext{[出版者不详]}}{\printtext{\mkbibbrackets{s.n.}}}}% \bibstring{nopublisher}%[s.n.\adddot]
- {\printlist{institution}}%
- \setunit{\addcomma\addspace}%
- %\usebibmacro{date}%
- \printfield{year}%
- \bibrangedash%
- \iffieldundef{endyear}{}{\printfield{endyear}}%
- \newunit}%
- { \printlist{location}%
- \iflistundef{institution}%
- {\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
- \printlist{institution}%
- \setunit*{\addcomma\space}%
- \usebibmacro{date}%
- \newunit}%
- }
-
- \renewbibmacro*{publisher+location+date}{%
- \iftoggle{bbx:gbpub}%
- {\testCJKfirst{\thefield{title}}%
- %\testifnoteeqstd%
- \iflistundef{location}{%\adddot
- \iffieldequalstr{note}{standard}{}{%从gbt7714-2015标准低19页看到,标准存在出版项时输出,没有时完全省略。
- %\iftoggle{ifnoteeqstandard}{}{%}替换为上一句,尽可能用biblatex提供的函数
- \iftoggle{ifCJKforgbt}{\printtext{[出版地不详]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\addcolon\addspace}%
- }}% \bibstring{noaddress}
- {\printlist{location}\addcolon\addspace}%
- %\addcolon\addspace%
- \iflistundef{publisher}{%
- \iffieldequalstr{note}{standard}{}{%
- %\iftoggle{ifnoteeqstandard}{}{%}替换为上一句,尽可能用biblatex提供的函数
- \iftoggle{ifCJKforgbt}{\printtext{[出版者不详]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
- {\printtext{\mkbibbrackets{s.n.}}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
- }}%
- {\printlist{publisher}\setunit*{\addcomma\addspace}}%
- %\addcomma\addspace%
- \usebibmacro{date}%
- %\newunit %去掉这个标点
- }%
- {\printlist{location}%
- \iflistundef{publisher}
- {\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
- \printlist{publisher}%
- \setunit*{\addcomma\space}%
- \usebibmacro{date}%
- %\newunit
- }%
- }
-
- \end{texlist}
-
-
-
- 下面这种处理方式是有问题的,即默认处理情况不是希望的true的情况,但如果给出宏包加载选项时没有问题的。因此采用上一种方式。
- \begin{texlist}
- %\newtoggle{bbx:gbpub}
- %\DeclareBibliographyOption[boolean]{gbpub}[true]{%
- % \settoggle{bbx:gbpub}{#1}}
- %这种机制的标识判断,能用于usemacro使用,域格式定义中,但无法用来定义macro
- %定义宏和使用宏是两个不同的展开层级
- %\ExecuteBibliographyOptions{gbpub}
- %但是使用这句默认设置可以用来定义macro
- \DeclareBibliographyOption[bool]{gbpub}[true]{%应使用这种直接的机制
- \ifstrequal{#1}{true}{\pubaddmacroredefine}{}}
-
- %出版社和地址的处理
- %新增一个样式用于输出连续出版物的地址,单位,时间
- %类似\newbibmacro*{publisher+location+date}
- \newbibmacro*{location+institution+date}{%
- \printlist{location}%
- \iflistundef{institution}
- {\setunit*{\addcomma\space}}
- {\setunit*{\addcolon\space}}%
- \printlist{institution}%
- \setunit*{\addcomma\space}%
- \usebibmacro{date}%
- \newunit}
- %当没有出版社地址时,直接判断title的信息是否是中文,若为中文,则写出版地不详,否则用英文的字符表示。
- %事实上title对于每个文献来说是必须的,所以用它判断是最快的,而且一般标题和出版社的语言是一样的。
- \def\pubaddmacroredefine{%
- \renewbibmacro*{publisher+location+date}{%
- \testCJKfirst{\thefield{title}}%
- %\testifnoteeqstd%
- \iflistundef{location}{%\adddot
- \iffieldequalstr{note}{standard}{}{%从gbt7714-2015标准低19页看到,标准存在出版项时输出,没有时完全省略。
- %\iftoggle{ifnoteeqstandard}{}{%}替换为上一句,尽可能用biblatex提供的函数
- \iftoggle{ifCJKforgbt}{\printtext{[出版地不详]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\addcolon\addspace}%
- }}% \bibstring{noaddress}
- {\printlist{location}\addcolon\addspace}%
- %\addcolon\addspace%
- \iflistundef{publisher}{%
- \iffieldequalstr{note}{standard}{}{%
- %\iftoggle{ifnoteeqstandard}{}{%}替换为上一句,尽可能用biblatex提供的函数
- \iftoggle{ifCJKforgbt}{\printtext{[出版者不详]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
- {\printtext{\mkbibbrackets{s.n.}}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
- }}%
- {\printlist{publisher}\setunit*{\addcomma\addspace}}%
- %\addcomma\addspace%
- \usebibmacro{date}%
- %\newunit %去掉这个标点
- }
- %新增一个样式用于输出连续出版物的地址,单位,时间
- %类似与上面的\newbibmacro*{publisher+location+date}
- \newbibmacro*{location+institution+date}{%
- \testCJKfirst{\thefield{title}}
- \iflistundef{location}{\iftoggle{ifCJKforgbt}{\printtext{[出版地不详]}}{\printtext{[S.l.\adddot]}}}%
- {\printlist{location}}%
- % \iflistundef{institution}
- % {\setunit*{\addcomma\space}}
- % {\setunit*{\addcolon\space}}%
- % \printlist{institution}%
- % \setunit*{\addcomma\space}%
- \addcolon\addspace%
- \iflistundef{institution}{%
- \iftoggle{ifCJKforgbt}{\printtext{[出版者不详]}}{\printtext{\mkbibbrackets{s.n.}}}}% \bibstring{nopublisher}%[s.n.\adddot]
- {\printlist{institution}}%
- \setunit{\addcomma\addspace}%
- %\usebibmacro{date}%
- \printfield{year}%
- \bibrangedash%
- \iffieldundef{endyear}{}{\printfield{endyear}}%
- \newunit}
- }
+\item Zeping Lee 发现了一个小问题,感谢,一直没有注意到这个问题。这里做出修改:主要是作者年制中,期刊析出的文献中,当卷信息不存在时,期刊名和期是连在一起的,而不是中间有个逗号,例如GB/T 7714-2015 中第10.2.4 节中的“刘彻东条目”。结果测试见:\ref{sec:article:novol}节)。
-
- \end{texlist}
+\item wayne508同学提出了一个需求,就是不希望使用出版项缺省时的默认处理,即不使用[出版地不详],[出版者不详],[S.l.],[s.n.]等填充,因此增加了一个宏包选项gbpub,当等于false时,去掉自动处理,使用biblatex 的标准处理方式。
\end{enumerate}
@@ -360,116 +70,30 @@
\begin{enumerate}
\item 进一步增加兼容性,支持条目类型比如MASTERSTHESIS,PHDTHESIS,www,electronic,standard,techreport,conference等,支持本样式增加的newspaper类型。因此在bib文件中可以直接使用这些条目类型。具体的测试详见\ref{sec:entrytype:compatibility}节。
- 为了实现兼容,主要从三个方面进行修改,包括用户层数据源映射,样式层的数据源映射,驱动。关于数据源映射和数据模型的原理详见\ref{sec:biblatex:mech} 节。
+ 为了实现兼容,主要从三个方面进行修改,包括用户层数据源映射,样式层的数据源映射,驱动。
- 因为biblatex提供的一些类型的别名的处理是在驱动层数据源映射时处理,所以要实现完全的兼容,还需要在用户层或者样式层进一步处理,首先是标识符的问题。因为以前做的标识符处理时在用户层映射中,所以这里仍然如此:
- \begin{texlist}
- \map{
- \pertype{newspaper}%增加一个新闻报纸的类型newspaper
- \step[fieldset=usera, fieldvalue={N}]%因为没有专门的驱动,这句的目的是定义一个usera 域,方便映射为article 后判断
- \step[fieldset=note, fieldvalue=news]
- }
- \map{
- \pertype{standard}%兼容老的standard类型
- \step[fieldset=usera, fieldvalue={S}]%因为没有专门的驱动,这句的目的是定义一个usera 域,方便映射为book和inbook后判断
- \step[fieldset=note, fieldvalue=standard]
- }
- \map{
- \pertype{inproceedings}
- \pertype{conference}%兼容老的conference类型
- \step[fieldset=usera, fieldvalue={C}]
- \step[fieldsource=institution] %有时会把version和edition 混淆,这里处理后就没有这个问题,可以直接用version
- \step[fieldset=publisher, origfieldval]
- \step[fieldsource=editor] %
- \step[fieldset=bookauthor, origfieldval]
- }
- \map{
- \pertype{report}
- \pertype{techreport}%techreport类型
- \step[fieldset=usera, fieldvalue={R}]
- }
- \map{
- \pertype{thesis}
- \pertype{mastersthesis}%兼容老的mastersthesis和phdthesis 类型
- \pertype{phdthesis}
- \step[fieldset=usera, fieldvalue={D}]
- }
- \map{
- \pertype{online}
- \pertype{electronic}%兼容老的electronic类型
- \pertype{www}%兼容老的www类型
- \step[fieldset=usera, fieldvalue={EB}]
- }
- \end{texlist}
+ 因为biblatex提供的一些类型的别名的处理是在驱动层数据源映射时处理,所以要实现完全的兼容,还需要在用户层或者样式层进一步处理,首先是标识符的问题。因为以前做的标识符处理时在用户层映射中,这里仍然如此。
- 其次,因为biblatex标准样式在处理条目别名是在驱动层的映射中,这里面引入了一些对于gb7714样式来说不需要的信息,比如type信息,因此需要将其去掉,所以在样式层映射中进行处理。因为standard条目可能用book也可能用inbook驱动输出,所以转换过程就需要有选择。这里有两种方式可以处理,一是用域是否存在进行判断(比如booktitle域),然后分别转换为book 类型和inbook类型,二是直接都转换成inbook类型,然后对inbook驱动进行修改,因为inbook 驱动与book驱动的差异仅在于所析出源文献那一块,所以,在驱动中用booktitle 域进行判断,如果该域不存在,那么去掉这一块的处理,inbook驱动可以等价于book驱动,但是这种方式中处理标识符后面的标点可能存在问题,biblatex 中处理标点的机制有很多好处,但是当样式作者在修改域格式是引入一些诸如[]之类符号时处理时比较麻烦的。这里采用第一种方式。
- 样式层映射为:
- \begin{texlist}
- \DeclareStyleSourcemap{
- \maps[datatype=bibtex]{
- % \map{%尝试未定义数据模型的newspaper类型映射为article,newspaper完全是针对gb7714的新类型,在biblatex中完全没有定义
- % %但从实践看,并没有什么影响,映射过来就可以了。这一段可以用下面的驱动层别名映射替代,所以这里注释掉用下面的\DeclareBibliographyAlias命令
- % \step[typesource=newspaper, typetarget=article, final]
- % }
- \map{%尝试未定义数据模型的standard类型映射为book,standard类型在blx-dm中有出现,但仅定义了类型,域和约束等都没有定义
- \step[fieldsource=booktitle,final]%当存在booktitle域是映射为inbook
- \step[typesource=standard, typetarget=inbook, final]
- }
- \map{%尝试未定义数据模型的standard类型映射为book,standard类型在blx-dm中有出现,但仅定义了类型,域和约束等都没有定义
- \step[typesource=standard, typetarget=book, final]%当不存在booktitle 域是映射为book
- }
- \map{%先于标准样式的driver层映射,将其先映射过来,并取消type设置
- \step[typesource=mastersthesis, typetarget=thesis, final]
- %\step[fieldset=type, fieldvalue=mathesis]
- }
- \map{%先于标准样式的driver层映射,将其先映射过来,并取消type设置
- \step[typesource=phdthesis, typetarget=thesis, final]
- %\step[fieldset=type, fieldvalue=phdthesis]
- }
- \map{%先于标准样式的driver层映射,将其先映射过来,并取消type设置
- \step[typesource=techreport, typetarget=report, final]
- %\step[fieldset=type, fieldvalue=techreport]
- }
- }
- }
- \DeclareBibliographyAlias{newspaper}{article}%定义驱动别名,尝试以替代驱动层映射,实践表明是可行的。
- \end{texlist}
+ 其次,因为biblatex标准样式在处理条目别名是在驱动层的映射中,这里面引入了一些对于gb7714样式来说不需要的信息,比如type信息,因此需要将其去掉,所以在样式层映射中进行处理。因为standard条目可能用book也可能用inbook驱动输出,所以转换过程就需要有选择。这里有两种方式可以处理,
+
+ 一是用域是否存在进行判断(比如booktitle域),然后分别转换为book 类型和inbook类型,
+ 二是直接都转换成inbook类型,然后对inbook驱动进行修改,因为inbook 驱动与book驱动的差异仅在于所析出源文献那一块,所以,在驱动中用booktitle 域进行判断,如果该域不存在,那么去掉这一块的处理,inbook驱动可以等价于book 驱动,但是这种方式中处理标识符后面的标点可能存在问题,biblatex 中处理标点的机制有很多好处,但是当样式作者在修改域格式是引入一些诸如[]之类符号时处理时比较麻烦的。这里采用第一种方式。
-\item 在online类型中,公告日期改为首选用date实现,然后用enddate,当没有date 和enddate时则用eventdate输出。代码详见\ref{sec:date:fmt}节。
+\item 在online类型中,公告日期改为首选用date实现,然后用enddate,当没有date 和enddate时则用eventdate输出。
-\item 为方便bib文件生成,构建可以从gb7714-2015格式的参考文献表文本转bib 文件的perl 程序,利用它可以批量解析参考文献信息并转换为bib数据源文件。详见:\href{run:./gb7714texttobib.pl}{gb7714texttobib.pl},测试文件见:\href{run:./gb7714texteg.dat}{gb7714texteg.dat}。
+\item 为方便bib文件生成,构建可以从gb7714-2015格式的参考文献表文本转bib 文件的perl 程序,利用它可以批量解析参考文献信息并转换为bib数据源文件。详见:\href{run:./gb7714texttobib.pl}{gb7714texttobib.pl},
+ 测试文件见:\href{run:./gb7714texteg.dat}{gb7714texteg.dat}。
-\item 在输出标识符的usera域格式中考虑标准样式的url选项,以便实现对是否打印url和urldate的控制。这个需求是Wenbo Sheng兄提出的,这里做出修改。
- \begin{texlist}
- \DeclareFieldFormat{gbtypeflag}{%
- \iftoggle{bbx:url}{\iffieldundef{url}%当存在url时,增加一个OL标识符
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{]}}%
- {\nobreak\printtext{[}\nobreak#1\nobreak\printtext{\texttt{/}OL]}}%
- }{\nobreak\printtext{[}\nobreak#1\nobreak\printtext{]}}}
-
- \DeclareFieldFormat{gbtypeflagn}{%用于报纸newspaper
- \iftoggle{bbx:url}{\iffieldundef{url}%当存在url时,增加一个OL标识符
- {\nobreak\printtext{[}\nobreak N\printtext{]}\nobreak}%
- {\nobreak\printtext{[}\nobreak N\printtext{\texttt{/}OL]}\nobreak}%
- }{\nobreak\printtext{[}\nobreak N\printtext{]}\nobreak}}
-
- \DeclareFieldFormat{gbtypeflags}{%用于标准standard
- \iftoggle{bbx:url}{\iffieldundef{url}%当存在url时,增加一个OL标识符
- {\nobreak\printtext{[}\nobreak S\printtext{]}\nobreak}%
- {\nobreak\printtext{[}\nobreak S\printtext{\texttt{/}OL]}\nobreak}%
- }{\nobreak\printtext{[}\nobreak S\printtext{]}\nobreak}}
- \end{texlist}
+\item 在输出标识符的usera域格式中考虑标准样式的url选项,以便实现对是否打印url和urldate的控制。这个需求是Wenbo Sheng提出的,这里做出修改。
\item 在一些条目类型如inbook等的标识符后面(如[M]//)加入一个不可断行短空格,使紧跟其后的单词能正确断行,当然也可以增加一个可断行的短空格addthinspace,方便直接在//后面断行。
\begin{texlist}
\usebibmacro{title}%
- %\nopunct
- %\iffieldundef{booktitle}{\adddot\addspace}{%兼容standard时,如果standard没有booktitle的应转换为book类,因为都转成inbook 类,所以这里做如下处理
\printtext{\texttt{//}\addnbthinspace}%%\texttt{//}
\usebibmacro{bybookauthor}%
\end{texlist}
-\item 对参考文献的一些域中存在的一些特殊字符比如\&,\%,\#等进行处理,方法是利用动态数据修改。同时因为texlive2015/texlive2016中biblatex 版本的不同分别进行处理。这个需求是湘厦人提出的,这里做出修改,详见\ref{sec:dynamic:modify}节。
+\item 对参考文献的一些域中存在的一些特殊字符比如\&,\%,\#等进行处理,方法是利用动态数据修改。同时因为texlive2015/texlive2016中biblatex 版本的不同分别进行处理。这个需求是湘厦人提出的,这里做出修改。
\end{enumerate}
@@ -477,68 +101,9 @@
%============================
\updateinfo[2016-12-31]{update to version 1.0f}\label{up:161231}
\begin{enumerate}
-\item 利用biblatex提供的iffieldequalstr函数替换用于判断note域值等于new 或standard 的函数,比如:
-\begin{texlist}
-%case 1:
-%\providetoggle{ifnoteeqstandard}%判断是否是标准
-%\def\testifnoteeqstd{%
-%\iffieldundef{note}{\togglefalse{ifnoteeqstandard}}%判断一下,是否是标准
-% {\def\comparetmp{standard}\edef\comparetmpb{\thefield{note}}%
-% \ifx\comparetmp\comparetmpb%
-% \toggletrue{ifnoteeqstandard}%
-% \else%
-% \togglefalse{ifnoteeqstandard}%
-% \fi}}
-%\iffieldequalstr{note}{standard}{true}{false} %可以利用这一函数代替
-
-%case 2:
-\iffieldequalstr{note}{standard}{\printfield[gbtypeflags]{usera}}%判断是否为标准
- {\iffieldequalstr{note}{news}{\printfield[gbtypeflagn]{usera}}% 判断是否为报纸
- {\printfield[gbtypeflag]{usera}}}% 其它
-% \def\comparetmp{news}\def\comparetmpa{standard}\edef\comparetmpb{\thefield{note}}%
-% \ifx\comparetmp\comparetmpb%判断是否为报纸
-% \printfield[gbtypeflagn]{usera}%
-% \else%
-% \ifx\comparetmpa\comparetmpb%判断是否为标准
-% \printfield[gbtypeflags]{usera}%
-% \else%
-% \printfield[gbtypeflag]{usera}%
-% \fi%
-% \fi%
-
-%case 3:
-\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸
- {\usebibmacro{date}}%
-% \def\comparetmp{news}\edef\comparetmpb{\thefield{note}}%
-% \ifx\comparetmp\comparetmpb%
-% \usebibmacro{newsdate}%
-% \else%
-% \usebibmacro{date}%
-% \fi
-
-%case 4:
-\renewbibmacro*{publisher+location+date}{%
-\testCJKfirst{\thefield{title}}%
-%\testifnoteeqstd%
-\iflistundef{location}{%\adddot
-\iffieldequalstr{note}{standard}{}{%从gbt7714-2015标准低19页看到,标准存在出版项时输出,没有时完全省略。
-%\iftoggle{ifnoteeqstandard}{}{%}替换为上一句,尽可能用biblatex提供的函数
-\iftoggle{ifCJKforgbt}{\printtext{[出版地不详]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\addcolon\addspace}}}% \bibstring{noaddress}
-{\printlist{location}\addcolon\addspace}%
-%\addcolon\addspace%
-\iflistundef{publisher}{%
-\iffieldequalstr{note}{standard}{}{%
-%\iftoggle{ifnoteeqstandard}{}{%}替换为上一句,尽可能用biblatex提供的函数
-\iftoggle{ifCJKforgbt}{\printtext{[出版者不详]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
-{\printtext{\mkbibbrackets{s.n.}}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}}}%
-{\printlist{publisher}\setunit*{\addcomma\addspace}}%
-%\addcomma\addspace%
-\usebibmacro{date}%
- %\newunit %去掉这个标点
-}
-\end{texlist}
+\item 利用biblatex提供的iffieldequalstr函数替换用于判断note域值等于new 或standard 的函数。
-\item 之前1.0e版增加gbalign选项的时候,没有测试对texlive2015的兼容性,所以导致一些错误。因为texlive2015的biblatex3.0版本的DeclareBibliographyOption 命令定义选项时不像texlive2016的biblatex3.4版的是带类型说明的。所以做出一定的处理,把该命令分两个版本进行设置。同时需要注意新定义的参考文献表环境在texlive2015中的biblatex3.0中无效且出错,所以直接去掉,因此文献表的标签的项对齐效果在texlive2015中的biblatex3.0 版中无法实现。代码详见\ref{sec:blx:compatibility}节。
+\item 之前1.0e版增加gbalign选项的时候,没有测试对texlive2015的兼容性,所以导致一些错误。因为texlive2015的biblatex3.0版本的DeclareBibliographyOption 命令定义选项时不像texlive2016的biblatex3.4版的是带类型说明的。所以做出一定的处理,把该命令分两个版本进行设置。同时需要注意新定义的参考文献表环境在texlive2015中的biblatex3.0中无效且出错,所以直接去掉,因此文献表的标签的项对齐效果在texlive2015中的biblatex3.0 版中无法实现。
\item 之前1.0e版解决编组符号包围的责任者的中英文判断问题的时候,没有测试对texlive2015的兼容性,所以导致一些错误。因为使用了xstring宏包的功能,但texlive2015的biblatex3.0版本不默认加载xstring宏包,所以在修改样式文件,在其中加载一下该宏包。
\begin{texlist}
@@ -550,166 +115,29 @@
%============================
\updateinfo[2016-12-07]{update to version 1.0e}\label{up:161207}
\begin{enumerate}
-\item 应海阔天空和xmtangjun等朋友的要求,在同一文献中可以使用上标或非上标的标注方式,修改顺序编码制的标注样式文件,去掉parencite命令的上标模式,恢复非上标方式。这样可以在同一文章中使用cite命令标注上标,而parencite命令标注非上标。而作者年制没有这一问题,不做修改。具体的效果见第\ref{sec:cite:cmd:test}节的内容。
+\item 应海阔天空和xmtangjun等朋友的要求,在同一文献中可以使用上标或非上标的标注方式,修改顺序编码制的标注样式文件,去掉parencite命令的上标模式,恢复非上标方式。这样可以在同一文章中使用cite命令标注上标,而parencite命令标注非上标。而作者年制没有这一问题,不做修改。
-\item 给宏包增加了一个选项gbalign,用于控制顺序编码制的参考文献表的标签对齐方式,默认是right即右对齐,可以设置left即左对齐,也可以设置gb7714-2015,即以各条参考文献自身为基准对齐实现对齐。效果见第\ref{sec:align:test}节的内容。增加一个选项,真正实现起来并不复杂,但在未明白其运行机制之前尝试了好长时间,显得很麻烦,具体的机制见第\ref{sec:biblatex:mech} 节。
- 修改代码如下:
-\begin{texlist}
-\DeclareBibliographyOption[string]{gbalign}[right]{%
-\ifstrequal{#1}{left}{\setalignleft}{}
-\ifstrequal{#1}{gb7714-2015}{\setaligngbstyle}{}
-}
-
-%修改序号标签格式为左对齐
-\def\setalignleft{\DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{##1}\hfill}}
-%修改序号标签格式为以各条参文献为基础进行对齐的方式
-\def\setaligngbstyle{%
-\def\blx@bibitem##1{%
- \blx@ifdata{##1}
- {\begingroup
- \blx@getdata{##1}%
- \blx@bibcheck
- \iftoggle{blx@skipentry}{}{%
- \blx@setdefaultrefcontext{##1}%
- \global\let\blx@noitem\@empty
- \blx@setoptions@type\abx@field@entrytype
- \blx@setoptions@entry
- \blx@thelabelnumber
- \addtocounter{instcount}\@ne
- \blx@initsep
- \blx@namesep
- \csuse{blx@item@\blx@theenv}\relax
-% \blx@initsep %移动到上面去,恢复bibnamesep等的作用机制
-% \blx@namesep
- \csuse{blx@hook@bibitem}%
- \blx@execute
- \blx@initunit
- \blx@anchor
- \blx@beglangbib
- \bibsentence
- \blx@pagetracker
- \blx@driver\abx@field@entrytype
- \blx@postpunct
- \blx@endlangbib}%
- \par\endgroup}%这里增加了一个\par
- {}}
-\newcommand{\itemcmd}{%
-\settowidth{\lengthid}{[\printfield{labelnumber}]}
-\addtolength{\lengthid}{\biblabelsep}
-\setlength{\lengthlw}{\textwidth}
-\addtolength{\lengthlw}{-\lengthid}
-\addvspace{\bibitemsep}%恢复\bibitemsep的作用
-%\parshape 2 0em \textwidth \lengthid \lengthlw
-\hangindent\lengthid
-[\printfield{labelnumber}]\hspace{\biblabelsep}}
-\newlength{\lengthid}
-\newlength{\lengthlw}
-\defbibenvironment{bibliography}
-{\begingroup\setlength{\parindent}{0em}}
-{\endgroup}
-{\itemcmd}}
-\end{texlist}
+\item 给宏包增加了一个选项gbalign,用于控制顺序编码制的参考文献表的标签对齐方式,默认是right即右对齐,可以设置left即左对齐,也可以设置gb7714-2015,即以各条参考文献自身为基准对齐实现对齐。增加一个选项,真正实现起来并不复杂,但在未明白其运行机制之前尝试了好长时间,显得很麻烦。
\item map中当有append选项时也需要overwrite选项,这不知道是不是texlive 2016 中biber 升级后的原因。之前使用texlive2015的时候没有问题。所以修改为:
-\begin{texlist}
-%*.bbx
- \map{%将entrykey放入keywords中用于后期的使用
- \step[fieldsource=entrykey]
- \step[fieldset=keywords, origfieldval]
- }
- \map[overwrite]{%这里还必须有overwrite,怎么之前会觉得没有问题呢,可能是之前版本拷错了,还是之前是texlive2015 变16后biber有了变化(2016-1207修改正确)
- \step[fieldsource=note, final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸
- \step[fieldset=keywords, fieldvalue={,}, append]
- \step[fieldset=keywords, origfieldval, append]
- }
-\end{texlist}
-\item 顺序制中,出版项后没有日期的情况下,出现逗号这是有问题的,所以修改为:
-\begin{texlist}
-%gb7714-2015.bbx
-%出版社和地址的处理,当没有出版社地址时
-%直接判断title的信息是否是中文,若为中文,则写出版地不详,否则用英文的字符表示。
-%事实上title对于每个文献来说是必须的,所以用它判断是最快的,而且一般标题和出版社的语言是一样的。
-\newbibmacro*{publisher+location+date}{%
-\testCJKfirst{\thefield{title}}%
-\testifnoteeqstd%
-\iflistundef{location}{%\adddot
-\iftoggle{ifnoteeqstandard}{}{%
-\iftoggle{ifCJKforgbt}{\printtext{[出版地不详]}\addcolon\addspace}{\printtext{[S.l.\adddot]}\addcolon\addspace}}}% \bibstring{noaddress}
-{\printlist{location}\addcolon\addspace}%
-%\addcolon\addspace%
-\iflistundef{publisher}{%
-\iftoggle{ifnoteeqstandard}{}{%
-\iftoggle{ifCJKforgbt}{\printtext{[出版者不详]}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}%
-{\printtext{\mkbibbrackets{s.n.}}\setunit{\adddot\addspace}\setunit*{\addcomma\addspace}}}}%
-{\printlist{publisher}\setunit*{\addcomma\addspace}}%在这里修改使用了setunit命令,与ay.bbx统一。
-%\addcomma\addspace%
-\usebibmacro{date}%
- %\newunit %去掉这个标点
-}
-\end{texlist}
+\item 顺序制中,出版项后没有日期的情况下,出现逗号这是有问题的,所以做修改。
-\item 当urldate域给出的信息不全时,比如只有年和月,而没有日,那么就需要进行判断,只输出存在的信息,因此对urldate域格式做修改,代码详见\ref{sec:date:fmt}节。
+\item 当urldate域给出的信息不全时,比如只有年和月,而没有日,那么就需要进行判断,只输出存在的信息,因此对urldate域格式做修改。
-\item 当责任者等需要判断中英文的信息是用编组符号包含的时候,原来的CJK判断函数会出现问题,所以利用xstring宏包做一定的修改,修改完成后可以应对信息中存在编组的情况,详见\ref{sec:cjkjudge}节。
+\item 当责任者等需要判断中英文的信息是用编组符号包含的时候,原来的CJK判断函数会出现问题,所以利用xstring宏包做一定的修改,修改完成后可以应对信息中存在编组的情况。
\end{enumerate}
%============================
\updateinfo[2016-11-24]{update to version 1.0d}
\begin{enumerate}
-\item 用于usera域的gbtypeflag域打印格式,明明在aritle/book类中没有问题,但在beamer中就会出现问题,多出一个点了。到现在还没有搞明白怎么会多出点来,printtext命令明明没有输出点,不像S.l.还有一个点的输出,这里只有]符号,但就是多了一个点。从最后修改成功看,这里就是多了一个点,而且是literal period,所以后面的点无法覆盖它,所以需要先用adddot命令将其转换为缩写的点,而且似乎用isdot 也不行,其原因还得再分析分析。因此做如下修改:
-
-\begin{texlist}
-%域格式修改
-\DeclareFieldFormat{title}{#1\adddot\addthinspace}%
-\DeclareFieldFormat{journaltitle}{#1\isdot}
-\DeclareFieldFormat%将期刊等文献的标题中原来带的引号去掉
- [article,patent,thesis,unpublished]
- {title}{#1\adddot\addthinspace}
-\DeclareFieldFormat%将期刊等文献的标题中原来带的引号去掉
- [inbook,incollection,inproceedings]
- {title}{#1\nopunct\unspace}
-
-%同时移动title的micro的printtext[title]的括号范围:
-%重设title的输出,将文献类型标识符输出出去,原输出来自biblatex.def文件
-\newbibmacro*{title}{%
- \ifboolexpr{%
- test{\iffieldundef{title}}%
- and%
- test{\iffieldundef{subtitle}}%
- }%
- {}%
- {\printtext[title]{%
- \printfield[titlecase]{title}%
- \ifboolexpr{test {\iffieldundef{subtitle}}}%这里增加了对子标题的判断,解决不判断多一个点的问题
- {}{\setunit{\subtitlepunct}%
- \printfield[titlecase]{subtitle}}%
- \iffieldundef{titleaddon}{}%判断一下titleaddon,否则直接加可能多一个空格
- {\setunit{\subtitlepunct}\printfield{titleaddon}}%
- \iffieldundef{note}{\printfield[gbtypeflag]{usera}}%在标题后直接给出文献标识字母,判断一下,是否是报纸和标准
- {\def\comparetmp{news}\def\comparetmpa{standard}\edef\comparetmpb{\thefield{note}}%
- \ifx\comparetmp\comparetmpb%判断是否为报纸
- \printfield[gbtypeflagn]{usera}%
- \else%
- \ifx\comparetmpa\comparetmpb%判断是否为标准
- \printfield[gbtypeflags]{usera}%
- \else%
- \printfield[gbtypeflag]{usera}%
- \fi%
- \fi%
- }%
- \iffieldundef{booktitle}{\newunit}{}%当title是析出时,不要标点
- %\newunit
- }%将\printtext[title]的结束编组放到这里来。
-}%
-}
-\end{texlist}
+\item 用于usera域的gbtypeflag域打印格式,明明在aritle/book类中没有问题,但在beamer中就会出现问题,多出一个点了。到现在还没有搞明白怎么会多出点来,printtext命令明明没有输出点,不像S.l.还有一个点的输出,这里只有]符号,但就是多了一个点。从最后修改成功看,这里就是多了一个点,而且是literal period,所以后面的点无法覆盖它,所以需要先用adddot命令将其转换为缩写的点,而且似乎用isdot 也不行,其原因还得再分析分析。
还需要注意的是如果gbtypeflag域格式中不直接输出[],而用mkbibbrackets也能解决这些个问题,但是会因为ctex对于中英文间空格的的默认处理加入空格,所以只能采用上面的方式。
-还有beamer类中很多不同域之间的空格似乎比其它类中更宽,不知道原因,难道是beamer重新定义了\textbackslash space命令?
+还有beamer类中很多不同域之间的空格似乎比其它类中更宽,不知道原因,难道是beamer重新定义了\textbackslash space命令? 这是beamer中做patch后导致的,biblatex升级后已经消除。
\item 在参考文献表中加入逐字文本(原样文本,如实文本),也就是直接插入文本信息,或者用printtext插入都会导致一些问题,上面的第1点就是典型问题之一,还比如出版项缺省等问题。在有利用printtext 插入原样文本的时候,要特别注意在driver中该命令前后几行的代码后加注释,否则容易带入空格,注释后就可以消除。
@@ -725,154 +153,20 @@
\updateinfo[2016-11-14]{update}\label{up:20161114}
\begin{enumerate}
\item 很早之前思考的利用biber的动态修改数据功能来进行佚名问题处理是合理的,因为biblatex不能在tex处理过程中添加域的信息,所以任何要进入域的信息都需要在运行biber命令之时或者之前处理。利用正则表达式可以完成一定的区分,尽管可能有一些特殊情况无法涵盖,但如下的处理可以基本正确的实现功能。
-如果不需要用佚名的方式,那么只要把这段处理注释掉就可以了。
-\begin{texlist}
-\map{%因为要做佚名处理,所以这里先对有些只有编者而没有作者的情况进行处理
- step[fieldsource=editor]
- \step[fieldset=author,origfieldval]
- }
-\map{%默认情况下将空缺作者设置为佚名
- \step[fieldset=author, fieldvalue={佚名}]
- }
-\map[overwrite]{%当标题带有英文字符,且作者为佚名的情况,设置作者为noauthor,
- %也有一些特殊情况可能处理不到,比如标题中英混合,作者又却是
- \step[fieldsource=title,match=\regexp{[a-zA-Z]},final]
- \step[fieldsource=author,match=\regexp{佚名}, replace={NOAUTHOR}]
- }
-\end{texlist}
+\item 关于文种分集排序的问题,之前要求用户自己往userb域填信息,现在通过如下处理,可以避免,也是用的正则表达式判断,但有些特殊情况可能会有问题,出现问题的话,手动在bib源文件中添加userb域信息是可以解决的。到这里为止,在使用本样式文件时,除了必须要输入的引文的信息外,其它信息都不需要再输入了,包括原来就已经处理的usera域(用于添加文献类型标识符的),这里的userb域用于文种分集排序的,都不必输入了。v1.0k版本以后改用language域代替userb域做处理。
-\item 关于文种分集排序的问题,之前要求用户自己往userb域填信息,现在通过如下处理,可以避免,也是用的正则表达式判断,但有些特殊情况可能会有问题,出现问题的话,手动在bib源文件中添加userb域信息是可以解决的。到这里为止,在使用本样式文件时,除了必须要输入的引文的信息外,其它信息都不需要再输入了,包括原来就已经处理的usera域(用于添加文献类型标识符的),这里的userb域用于文种分集排序的,都不必输入了。
+\item 增加了一个yearpagescite命令用于处理: 作者年制文中已有作者只需要年份和页码的情况,而顺序制的情况下该命令与pagescite命令作用相同。
-\begin{texlist}
-\map{%将entrykey放入keywords中用于后期的使用
- \step[fieldsource=entrykey]
- \step[fieldset=keywords, origfieldval]
- \step[fieldsource=note,final]%将note域信息复制给keywords,用于输出时容易区分标准和报纸
- \step[fieldset=keywords, fieldvalue={,},append]
- \step[fieldset=keywords, origfieldval,append]
- }
-\map{%因为无法进行cjk字符判断,所以用反的思路,判断没有英文字符,没有空格,没有逗号等字符情况下
- %认为是中文的,将文献userb设置成cn,用于排序
- \step[fieldsource=author,match=\regexp{[^a-zA-Z\s\.\,\'\{\}]},final]
- \step[fieldset=userb,fieldvalue={cn}]
- }
-\map{%将没有设置的userb设置成en,即认为不是中文的就是英文的。
- \step[fieldset=userb,fieldvalue={en}]
- }
-\end{texlist}
-
-\item 增加了一个yearpagescite命令用于处理: 作者年制文中已有作者只需要年份和页码的情况,而顺序制的情况下该命令与pagescite命令作用相同。其使用方式如下:
-
-\begin{texlist}
-%使用方式:
-见赵耀东\yearpagescite[][205]{赵耀东1998--}和Simon\yearpagescite[][15]{Simon2001--}的文献。
-
-%增加的命令:
-%*2015ay.cbx中:
-%增加一个命令yearpagescite用于当文中作者已经存在,需要页码和年份的情况。
-%参考来源,biblatex.DEF,其中\DeclareCiteCommand*{\citeyear}命令
-\DeclareCiteCommand{\yearpagescite}
- {\printtext{(}\usebibmacro{prenote}}
- {\printfield{year}\printfield{extrayear}}
- {\multicitedelim}
- {\printtext{)}\textsuperscript{\usebibmacro{postpages}}}
-%*2015.cbx中:
-%增加一个命令yearpagescite为与ay样式兼容,命令等同于\pagescite
-\DeclareCiteCommand{\yearpagescite}[\mkbibsuperscript]%\mkbibbrackets,仍然用上标
- {[\usebibmacro{cite:init}%
- \usebibmacro{prenote}%
- }
- {\usebibmacro{citeindex}%
- \usebibmacro{cite:comp}}
- {}
- {\usebibmacro{cite:dump}]%
- \usebibmacro{postpages}}
-\end{texlist}
-
-\item 在出版者缺省的情况下,当出版者后面没有更多信息的情况下,缺省字符串后面应该有一个点,因此做出修正为:
-\begin{texlist}
-%出版社和地址的处理,当没有出版社地址时
-%直接判断title的信息是否是中文,若为中文,则写出版地不详,否则用英文的字符表示。
-%事实上title对于每个文献来说是必须的,所以用它判断是最快的,而且一般标题和出版社的语言是一样的。
-\newbibmacro*{publisher+location+date}{%
-\iffieldundef{title}{}{\testCJKfirst{\thefield{title}}}%
-\testifnoteeqstd%
-\iflistundef{location}{%\adddot
-\iftoggle{ifnoteeqstandard}{}{%
-\iftoggle{ifCJKforgbt}{\printtext{[出版地不详]}\setunit*{\addcolon\addspace}}{\printtext{[S.l.\adddot]}\setunit*{\addcolon\addspace}}}}% \bibstring{noaddress}
-{\printlist{location}\setunit*{\addcolon\addspace}}%
-%\addcolon\addspace%
-\iflistundef{publisher}{%
-\iftoggle{ifnoteeqstandard}{}{%
-\iftoggle{ifCJKforgbt}{\printtext{[出版者不详]}\setunit{\adddot\addspace}\setunit*{\addcolon\addspace}}
-%\mkbibbrackets
-%{\printtext{[s.n.\adddot]}\setunit{\adddot\addspace}\setunit*{\addcolon\addspace}}}}%\bibstring{nopublisher}
-{\printtext{\mkbibbrackets{s.n.}}\setunit{\adddot\addspace}\setunit*{\addcolon\addspace}}}}
-{\printlist{publisher}\setunit*{\addcolon\addspace}}%
-%\addcomma\addspace%
-%\usebibmacro{date}%
-%\newunit %去掉这个标点
-}
-\end{texlist}
+\item 在出版者缺省的情况下,当出版者后面没有更多信息的情况下,缺省字符串后面应该有一个点,因此做修正。
\item 反向链接,backref的格式并没有要求,但考虑到中文环境还是将其格式改一下,因此修改英文本地化字符串为“引用页”。
-\begin{texlist}
-\DefineBibliographyStrings{english}{
-bibliography = {参考文献},
-references = {参考文献},
-%bytranslator= {\addcomma\ 译\adddot}, %将trans. by 改成 译
-bytranslator= {\addcomma\ 译},%\addperiod
-and = {\addcomma},%将第2和3人名见的and符号改成 逗号,用\finalnamedelim命令也可以定义,参见3.9.1节
-%andothers = {et al.}, %将超过3个人名的省略,et al.改成为 等
-andotherscn = {等}, %将超过3个人名的省略,et al.改成为 等
-noaddress = {[S.l.]},
-nopublisher = {[s.n.]},
-backrefpage = {引用页:},
-backrefpages = {引用页:},
-}
-\end{texlist}
-\item 在处理姓名相关的问题时,利用DeclareNameFormat的方式控制需要的姓和名的前后顺序,当maxbibnames和maxcitenames不一致时,可能用到last-first/first-last(biblatex3.2以前的版本)/family-given/given-family(3.3以后版本),其中第一个姓名和后面姓名的姓和名的前后顺序时不同的。可以直接利用其中的name:first-last和name:last-first或name:family-given和name:given-family宏做修改控制具体姓名成分的格式,而避免重定义DeclareNameFormat格式,详见\ref{sec:name:fmt:out} 节。
-\item 作者年制区分文献表和引用中的作者名数量,引用相关的选项设置需要放到cbx 文件中,否则可能失效。同时因为一些特殊情况下,姓名数量截短为1个的引用标签,可能无法区分文献,所以默认情况下,biblatex会增加作者数量用于区分,这是因为uniquelist会自动重设maxcitenames和mincitenames,因此修改uniquelist选项为minyear,明确在年份也一样的情况下再利用增加姓名进行区分。*ay.bbx文件中的选项设置为:
-\begin{texlist}
-\ExecuteBibliographyOptions{
- useprefix = true, %名字的信息包括前缀
- %firstinits = true, %名字有缩写,参考3.1.2.3 Internal
- giveninits = true,
- date = year, %日期仅写到年
- %maxnames = 3 , %设置名字最大数量
- %minnames = 3, %设置缩减后的名字最小数量
- maxbibnames=3, %将文献列表和引用中最大名字数量区分开
- minbibnames=3,
-}
-%biblatex3.3版前(比如texlive2015中的3.0版)的使用方式
-\ExecuteBibliographyOptions{
- useprefix = true, %名字的信息包括前缀
- firstinits = true, %名字有缩写,参考3.1.2.3 Internal
- date = year, %日期仅写到年
- %maxnames = 3 , %设置名字最大数量
- %minnames = 3, %设置缩减后的名字最小数量
- maxbibnames=3, %将文献列表和引用中最大名字数量区分开
- minbibnames=3,
-}
-\end{texlist}
+\item 在处理姓名相关的问题时,利用DeclareNameFormat的方式控制需要的姓和名的前后顺序,当maxbibnames和maxcitenames不一致时,可能用到last-first/first-last(biblatex3.2以前的版本)/family-given/given-family(3.3以后版本),其中第一个姓名和后面姓名的姓和名的前后顺序时不同的。可以直接利用其中的name:first-last和name:last-first或name:family-given和name:given-family宏做修改控制具体姓名成分的格式,而避免重定义DeclareNameFormat格式。
-*ay.cbx文件中的选项设置为:
-\begin{texlist}
-\ExecuteBibliographyOptions{
- %autocite = superscript ,
- %autopunct = true ,
- %sorting = none ,
- maxcitenames=1,
- mincitenames=1,
- uniquename=init,%因为使用了名字缩写选项,所以需要设置uniquename=init 而不是full 避免冲突
- labeldate=true,
- uniquelist=minyear,
-}
-\end{texlist}
+\item 作者年制区分文献表和引用中的作者名数量,引用相关的选项设置需要放到cbx 文件中,否则可能失效。同时因为一些特殊情况下,姓名数量截短为1个的引用标签,可能无法区分文献,所以默认情况下,biblatex会增加作者数量用于区分,这是因为uniquelist会自动重设maxcitenames和mincitenames,因此修改uniquelist选项为minyear,明确在年份也一样的情况下再利用增加姓名进行区分。
\end{enumerate}
%============================
@@ -881,132 +175,25 @@ backrefpages = {引用页:},
\item 说明文档增加了版本和修改时间信息,修正了一些错误和不妥的说法,增加了一些说明比如报纸版次,报告条目域格式等,去掉一些不必要的注释,简化各样式文件内容。
\item 由Harry Chen提议,将english本地化文件中的参考文献标题信息改为中文的,因为本样式多在中文环境下使用,修改为中文后,printbibliography命令中不提供title信息的情况下,参考文献列表标题默认为参考文献。感谢Harry Chen在github上的commit!
-修改如下:
-\begin{texlist}
-\DefineBibliographyStrings{english}{
-bibliography = {参考文献},
-references = {参考文献},
-%bytranslator= {\addcomma\ 译\adddot}, %将trans. by 改成 译
-bytranslator= {\addcomma\ 译},%\addperiod
-and = {\addcomma},%将第2和3人名见的and符号改成 逗号,用\finalnamedelim命令也可以定义,参见3.9.1节
-%andothers = {et al.}, %将超过3个人名的省略,et al.改成为 等
-andotherscn = {等}, %将超过3个人名的省略,et al.改成为 等
-noaddress = {[S.l.]},
-nopublisher = {[s.n.]}
-}
-\end{texlist}
-
-\item 当作者名只有一个,但又有and others表示多个作者的时候,标准样式中作者名和et al.之间是空格而不是逗号链接,但gb7714-2015要求在等之前用逗号,所以做出修改如下。
-
-\begin{texlist}
-%判断作者或译者是否中文,若中文用字符等,否则用etcl。
-\newbibmacro*{name:andothers}{%
- \ifboolexpr{%
- test {\ifnumequal{\value{listcount}}{\value{liststop}}}
- and
- test \ifmorenames
- }%
- {%这里做一个判断是在处理author还是translator用于两者是不同语言的情况
- \ifcurrentname{translator}{\testCJKfirst{\thefield{usere}}}{\testCJKfirst{\thefield{userf}}}%
- %这句判断如果放到\andothersdelim后面会在等或etc.前增加一个空格,所以放前面
- \ifnumgreater{\value{liststop}}{1}%
- {\finalandcomma}%
- {\finalandcomma}%biblatex作者要区别单作者加等的情况,这里为符合gbt7714-2015第7.2节的要求加上了逗号。
-\andothersdelim\iftoggle{ifCJKforgbt}{\bibstring{andotherscn}}{\bibstring{andothers}}%
-%\andothersdelim\bibstring{andotherscn}
-}%
-{}}
-\end{texlist}
+\item 当作者名只有一个,但又有and others表示多个作者的时候,标准样式中作者名和et al.之间是空格而不是逗号链接,但gb7714-2015要求在等之前用逗号,所以做出修改。
\item 给report和manual驱动添加了译者域,这在实际中是用的到的,同时打印version域的格式也做了处理,并且修改中文判断函数,增加了注释符以避免带入空格,这个问题在之前体现为版本域前多了一个空格。
-\begin{texlist}
-%对version的版本信息做出修改,源来自biblatex.DEF
-\DeclareFieldFormat{version}{%
-\testCJKfirst{\thefield{title}}%
-\ifinteger{#1}%
-{\iftoggle{ifCJKforgbt}{\printtext{#1版}}%
-{\mkbibordedition{#1}~\bibstring{version}}}%
-{#1\isdot}}
-\end{texlist}
-\item 把作者年制的参考文献列表和引用中的作者名数量做区分。列表中最大为3 个,引用中最大为1个。
-(这里还有点问题,进一步修改见2016-11-14的更新。)
-\begin{texlist}
-%%biblatex3.3版后(比如texlive2016中的3.4版)的使用方式
-%\ExecuteBibliographyOptions{
-% useprefix = true, %名字的信息包括前缀
-% %firstinits = true, %名字有缩写,参考3.1.2.3 Internal
-% giveninits = true,
-% date = year, %日期仅写到年
-% %maxnames = 3 , %设置名字最大数量
-% %minnames = 3, %设置缩减后的名字最小数量
-% maxbibnames=3, %将文献列表和引用中最大名字数量区分开
-% minbibnames=3,
-% maxcitenames=1,
-% mincitenames=1
-% %uniquename = init
-%}
-%
-%%biblatex3.3版前(比如texlive2015中的3.0版)的使用方式
-%\ExecuteBibliographyOptions{
-% useprefix = true, %名字的信息包括前缀
-% firstinits = true, %名字有缩写,参考3.1.2.3 Internal
-% date = year, %日期仅写到年
-% %maxnames = 3 , %设置名字最大数量
-% %minnames = 3, %设置缩减后的名字最小数量
-% maxbibnames=3, %将文献列表和引用中最大名字数量区分开
-% minbibnames=3,
-% maxcitenames=1,
-% mincitenames=1
-% %uniquename = init
-%}
-\end{texlist}
+
+\item 把作者年制的参考文献列表和引用中的作者名数量做区分。列表中最大为3 个,引用中最大为1个。(这里还有点问题,进一步修改见2016-11-14的更新。)
\end{enumerate}
%============================
\updateinfo[2016-10-22]{update}
\begin{enumerate}
\item 修改版本判断机制,版本3.3以后的版本设置判断标签iftexlivesix为真,采用新的姓名处理机制。
-修改如下:
-\begin{texlist}
-\providetoggle{iftexlivesix}
-%\def\versionstr{3.4}
-%\def\versionstra{3.6}
-%\ifx\abx@version\versionstr
-%\toggletrue{iftexlivesix}
-%\else
-%\ifx\abx@version\versionstra
-%\toggletrue{iftexlivesix}
-%\else
-%\togglefalse{iftexlivesix}
-%\fi
-%\fi
-%改变版本判断机制,根据biblatex更新历史可知,版本3.3开始使用新的姓名处理机制
-%所以当版本大于3.2开始,就用设置\toggletrue{iftexlivesix}
-\def\numparserta#1.#2\relax{#1}%注意relax的重要性
-\def\numparsertb#1.#2\relax{#2}
-\def\numinteger{\expandafter\numparserta\abx@version\relax}
-\def\numdigital{\expandafter\numparsertb\abx@version\relax}
-\ifnumcomp{\numdigital}{>}{2}{\toggletrue{iftexlivesix}}{\togglefalse{iftexlivesix}}
-\end{texlist}
\end{enumerate}
%============================
\updateinfo[2016-10-11]{update}
\begin{enumerate}
-\item 真的是需求推动事物发展,秋平同学提出需要把顺序编码制的参考文献序号标签设为左对齐。
-于是可以做如下修改。需要用的可以把下面这段加进gb7714-2015.bbx中,不需要的就不用任何处理,
-左对齐还是右对齐其实还是看个人喜好,我其实觉得右对齐挺好的。
-\begin{texlist}
- %修改序号标签格式为左对齐,注意各参考文献内容还是对齐的,
- %这样就会使得序号标签与参考文献内容的间隔增大,这个问题是没有办法解决的
- %因为采用list做具有一定宽度的序号标签,\labelwidth只能设置一个,且是最宽的标签的宽度
- %但总的来说参考文献内容对齐是合理和漂亮的,
- %而标签则只能对齐一个方向,要么左对齐要么右对齐,看个人选择了。
- %\DeclareFieldFormat{shorthandwidth}{\mkbibbrackets{#1}} %源来自numeric.BBX
- \DeclareFieldFormat{labelnumberwidth}{\mkbibbrackets{#1}\hfill}
-\end{texlist}
+\item 真的是需求推动事物发展,秋平同学提出需要把顺序编码制的参考文献序号标签设为左对齐。所以增加标签左对齐功能。左对齐还是右对齐其实还是看个人喜好,个人其实觉得右对齐挺好的。
\item 测试了老电脑装的texlive2014,没有问题通过。
\end{enumerate}
@@ -1014,7 +201,7 @@ nopublisher = {[s.n.]}
%============================
\updateinfo[2016-10-04]{update}
\begin{enumerate}
-\item 今天广州的秋平同学使用更新后的biblatex3.6版出错。是因为bbx文件中的版本判断只有3.4和其它,所以应急加了一段对于3.6 的判断。这个问题以后可能还会出现因为biblatex会不断的更新,所以需要设计一个更合理的判断,这个等实现以后再更新。
+\item 广州的秋平同学使用更新后的biblatex3.6版出错。原因在于bbx文件中的版本判断只有3.4和其它,所以增加对于3.6 的判断。这个问题以后可能还会出现因为biblatex会不断的更新,所以需要设计一个更合理的判断,这个等实现以后再更新。
\item 在说明文档中增加了一些说明,修改了一些错别字。
\end{enumerate}