biblatex-gb7714-2015 (15aug18)

git-svn-id: svn://tug.org/texlive/trunk@48406 c570f23f-e606-0410-a88d-b1316a301751

19 files changed, 419 insertions, 262 deletions

diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md
index 9c1dc3129cb..90ae644e994 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/README.md
@@ -1,4 +1,4 @@
-<b>Date of last change: 2018-06-01 to version v1.0i</b>
+<b>Date of last change: 2018-08-14 to version v1.0m</b>
 
 
 # biblatex-gb7714-2015: a biblatex style  package
@@ -26,45 +26,49 @@ The biblatex-gb7714-2015 package provides an implementation of the bibliography
 
     - add an option `gbalign` to control the align style of the numerical label：
 	
-		`gbalign=right`  for the label ragged left in a list environment
+		`gbalign=right`  for the label ragged left in a list environment, this is the default setting.
 		
-		`gbalign=center` for the same width label in a list environment with the number centered in the bracket
+		`gbalign=center` for the same width label in a list environment with the number centered in a wrapper like bracket []
 		
 		`gbalign=left`   for the label ragged right in list environment
 		
-		`gbalign=gb7714-2015` for the label in paragraph with same separator space between label and entry content
+		`gbalign=gb7714-2015` for the label in paragraph with same separation space between label and content of the reference entry 
 
         `\usepackage[backend=biber,style=gb7714-2015,gbalign=gb7714-2015]{biblatex}`
 
-    - add an option `gbpub` for dealing publishing items, option value = `true` for gb7714 style or `false` for standard style. This option is also for author year style.
-
+    - add an option `gbpub` for dealing publishing items (This option is also for author-year style):
+	
+		`gbpub = true` for gb7714 style, to print `[出版者不详]` and the like when publisher or address is absent, this is the default setting.
+		
+		`gbpub = false` for standard style, not to print the additional infomation. 
+		
         `\usepackage[backend=biber,style=gb7714-2015,gbpub=true]{biblatex}`
         
-    - add an option `gbnamefmt` for dealing name's letter case(this option is also for author year style):
+    - add an option `gbnamefmt` for dealing author name's letter case (This option is also for author-year style):
 
-        `gbnamefmt = uppercase` for gb7714 style 
+        `gbnamefmt = uppercase` for gb7714 style, to capitalize all the letters of the name, like: ZHANG M L, this is the default setting.
 		
-        `gbnamefmt = lowercase` for gb7714 style with no case switch of names 
+        `gbnamefmt = lowercase` for gb7714 style, do no case switch of the name, like: Zhang M L
 		
-        `gbnamefmt = givenahead` for standard style, given-family style, like ieee style
+        `gbnamefmt = givenahead` for standard style, given-family style, like: M. L. Zhang  as the ieee style
 		
-		`gbnamefmt = familyahead` for standard style, family-given style, like apa style. 
+		`gbnamefmt = familyahead` for standard style, family-given style, like: Zhang, M. L. as the apa style. 
 		
         `gbnamefmt = pinyin` for a common Chinese style, like: ZHANG Min-li, YI Shi-he and so on. 
 		
-		the name format can be set per-entry using a field：`nameformat`=`pinyin` or others. This option is also for author year style.
+		the name format can be set per-entry using a field `nameformat`, add this field such as `nameformat={pinyin}` to an entry in the bib file to set the entry's name format.
 
         `\usepackage[backend=biber,style=gb7714-2015,gbnamefmt=uppercase]{biblatex}`
 		
 	- add an option `gbbiblabel` to control the format of the numerical label：
 	
-		`gbbiblabel=bracket`  for the numerical number in the label wrapped by bracket
+		`gbbiblabel=bracket`  for the numerical number in the label wrapped by bracket, like: [1], this is the default setting.
 		
-		`gbbiblabel=parens`   for the numerical number in the label wrapped by parenthesis
+		`gbbiblabel=parens`   for the numerical number in the label wrapped by parenthesis, like: (1)
 		
-		`gbbiblabel=plain`    for the numerical number in the label wrapped by nothing
+		`gbbiblabel=plain`    for the numerical number in the label wrapped by nothing, like: 1
 		
-		`gbbiblabel=dot`      for the numerical number in the label followed with dot
+		`gbbiblabel=dot`      for the numerical number in the label followed with dot, like: 1.
 		
 		`gbbiblabel=box`      for the numerical number in the label wrapped by box which generated by `\framebox`
 		
@@ -72,31 +76,61 @@ The biblatex-gb7714-2015 package provides an implementation of the bibliography
 
         `\usepackage[backend=biber,style=gb7714-2015,gbbiblabel=bracket]{biblatex}`
 		
-	- add an option `gbtype` to control the output of the reference type and carrier identifier like [J/OL], option value = `true` for gb7714 style, print a title like: `an on-line article [J/OL]`,  option value = `false` for none identifier, print a title like: `an on-line article`. This option is also for author year style.
+	- add an option `gbtype` to control the output of the reference type and carrier identifier like [J/OL] (This option is also for author year style): 
+	
+		`gbtype = true` for gb7714 style, print a title with the identifier, like: `an on-line article [J/OL]`, this is the default setting.
+		
+		`gbtype = false` for none identifier, print a title without identifier, like: `an on-line article`
 
         `\usepackage[backend=biber,style=gb7714-2015,gbtype=true]{biblatex}`
 		
-	- add an option `gbpunctin` to control the output of `//` before bookauthor for entrytypes like inbook/incollection/inproceedings. `gbpunctin=true` to output `//`, `gbpunctin=false` to output a bibstring, for English it is `IN:`, If you want to eliminate it at all, please redefine the bibstring like `\DefineBibliographyStrings{english}{in={}}` in the preamble. This option is also for author year style.
+	- add an option `gbpunctin` to control the output of `//` before bookauthor for entrytypes like inbook/incollection/inproceedings(This option is also for author year style):
+
+		`gbpunctin=true` for gb7714 style, to output `//`, this is the default setting
+		
+		`gbpunctin=false` for standard style, to output a bibstring, for English it is `IN:`, If you want to eliminate it at all, please redefine the bibstring like `\DefineBibliographyStrings{english}{in={}}` in the preamble.
 
         `\usepackage[backend=biber,style=gb7714-2015,gbpunctin=true]{biblatex}`
 		
-	- add an option `gbctexset` to control the bibliography title's setting method. default is `gbctexset=true` with the title can be set by `\bibname` or `\refname` and the printbibliography option `title=title you want`, if `gbpunctin=false`, the title can be set by bibstring like `\DefineBibliographyStrings{english}{bibliography={title you want}}` or `\DefineBibliographyStrings{english}{references={title you want}}` and the printbibliography option `title=title you want`. This option is also for author year style.
+	- add an option `gbctexset` to control the bibliography heading's setting method (This option is also for author year style):
+	
+		`gbctexset=true` , the bibliography heading can be set by `\bibname` or `\refname`, this is the default setting.
+	
+		`gbpunctin=false`, the heading can be set by bibstring like `\DefineBibliographyStrings{english}{bibliography={title you want}}` or `\DefineBibliographyStrings{english}{references={title you want}}` 
+	
+		or alternatively, it can also be set through the printbibliography option `title`, like `printbibliography[title=title you want]`. 
 
         `\usepackage[backend=biber,style=gb7714-2015,gbctexset=true]{biblatex}`
 		
-	- add an option `gbcodegbk` to deal the tex source file encoded with GBK. if you want to compile GBK file with pdflatex or latex，set `gbcodegbk=true` is needed. if compile with xelatex, it should be none or `gbcodegbk=false`. This option is also for author year style.
-
-        `\usepackage[backend=biber,style=gb7714-2015,gbcodegbk=false]{biblatex}`
+	- add an option `gbcodegbk` to deal the tex source file encoded with GBK (This option is also for author year style): 
+	
+		`gbcodegbk=true` , if you want to compile the GBK encoded source file with pdflatex or latex
 		
-	- add an option `gbstrict` to control the output of some unnecessary fields for GB/T7714-2015. If you want to output them as the standard styles, it should be `gbstrict=false`. default is `gbstrict=true`. This option is also for author year style.
+		`gbcodegbk=false`, if you want to compile the utf-8 endcoded source file with xelatex, this is the default setting.
 
+        `\usepackage[backend=biber,style=gb7714-2015,gbcodegbk=true]{biblatex}`
+		
+	- add an option `gbstrict` to control the output of some unnecessary fields for GB/T7714-2015 (This option is also for author year style). 
+	
+		`gbstrict=true`,  not to print those fields such as language, eprint, this is the default setting.
+	
+		`gbstrict=false`, to output them as the standard style
+	
         `\usepackage[backend=biber,style=gb7714-2015,gbstrict=true]{biblatex}`
 		
-	- add an option `gbfieldstd` to control the format of some fields such as title, url and pages. option value = `false` for gb7714 style or `true` for standard style. This option is also for author year style.
+	- add an option `gbfieldstd` to control the format of some fields such as title, url and pages (This option is also for author year style): 
 	
-        `\usepackage[backend=biber,style=gb7714-2015,gbfieldstd=false]{biblatex}`
+		`gbfieldstd = false` for gb7714 style, format of the fields follows the GB/T7714-2015 standard, this is the default setting.
 		
-	- add an option `gbtitlelink` to control the hyperlink of title field. option value = `false` with none link or `true` to set the hyperlink. This option is also for author year style.
+		`gbfieldstd = true` for standard style. 
+	
+        `\usepackage[backend=biber,style=gb7714-2015,gbfieldstd=true]{biblatex}`
+		
+	- add an option `gbtitlelink` to control the hyperlink of title field (This option is also for author year style):
+	
+		`gbtitlelink = false` not to add hyperlink, this is the default setting.
+		
+		`gbtitlelink = true` to set the title as a hyperlink.
 	
         `\usepackage[backend=biber,style=gb7714-2015,gbtitlelink=true]{biblatex}`
 
@@ -104,7 +138,11 @@ The biblatex-gb7714-2015 package provides an implementation of the bibliography
 
     `\usepackage[backend=biber,style=gb7714-2015ay,gbpub=true]{biblatex}`
 
-    - add an option `gbnoauthor` for dealing undefined author, option value = `true` for gb7714 style or `false` for standard style. 
+    - add an option `gbnoauthor` for dealing undefined author:
+	
+		`gbnoauthor = true` for gb7714 style, to print `佚名` or `Anon` when the author of the entry is absent.
+		
+		`gbnoauthor = false` for standard style, not to pring anything, this is the default setting.
 
         `\usepackage[backend=biber,style=gb7714-2015ay,gbnoauthor=true]{biblatex}`
 	
@@ -169,53 +207,59 @@ citestyle=gb7714-2015%,backref=true%%其中后端backend使用biber
 
 \addbibresource[location=local]{example.bib}%biblatex宏包的参考文献数据源加载方式
 
-
 \begin{document}%正文区开始:
 
 %正文内容，引用参考文献
 
 1. 不带页码的引用(顺序编码制上标，方括号包围；作者年制行内，括号包围):
-\cite{Peebles2001-100-100}\upcite{Peebles2001-100-100}\supercite{Peebles2001-100-100}
+	\cite{Peebles2001-100-100}
+	\upcite{Peebles2001-100-100}
+	\supercite{Peebles2001-100-100}
 
 2. 不带页码的引用(顺序编码制非上标，方括号包围；作者年制行内，括号包围):
-\parencite{Miroslav2004--}
+
+	\parencite{Miroslav2004--}
 
 3. 带页码的引用(标准命令，默认样式; 增加命令，GB/T 7714-2015样式):
-\cite[见][49页]{蔡敏2006--}  \parencite[见][49页]{Miroslav2004--}
-\pagescite{Peebles2001-100-100}  \pagescite[][201-301]{Peebles2001-100-100}
+
+	\cite[见][49页]{蔡敏2006--}  
+	\parencite[见][49页]{Miroslav2004--}
+	\pagescite{Peebles2001-100-100}  
+	\pagescite[201-301]{Peebles2001-100-100}
 
 4. 顺序编码制中同时输出作者和顺序编码标签，比如：
-（一）直接的方法：见\citeauthor{refb}\cite{refb},\citeauthor{refc}\cite{refc}
-（二）定义新的标注命令：见\authornumcite{refb,refc}
-（三）用textcite但没有上标：见\textcite{refb,refc}
+	\citeauthor{蔡敏2006--}\cite{蔡敏2006--}
+	\authornumcite{蔡敏2006--}
+	\textcite{蔡敏2006--} (顺序编码标签不上标)
 
 5. 作者年制文中已有作者还需要年份和页码(顺序编码制与pagescite作用相同，作者年制年份行内页码上标):
-见赵耀东\yearpagescite[][205]{赵耀东1998--}和Simon\yearpagescite[][15]{Simon2001--}
+	见赵耀东\yearpagescite[][205]{赵耀东1998--}和Simon\yearpagescite[][15]{Simon2001--}
 
 6. 作者年制文中已有作者只需要年份(顺序编码制与pagescite作用相同，作者年制年份行内):
-见赵耀东\yearcite{赵耀东1998--}
-见赵耀东(\cite*{赵耀东1998--})
-见赵耀东(\citeyear{赵耀东1998--})
+	见赵耀东\yearcite{赵耀东1998--}
+	见赵耀东(\cite*{赵耀东1998--})
+	见赵耀东(\citeyear{赵耀东1998--})
 
 7. 作者年制中由标注命令给出作者年份信息，作者以主语方式作为正文内容：
-\textcite{赵耀东1998--}
+	\textcite{赵耀东1998--}
 
 8. 在页脚中引用和打印文献表:
-\footnote{在脚注中引用\footcite{赵学功2001--}}  \footfullcite{赵学功2001--}
+	\footnote{在脚注中引用\footcite{赵学功2001--}}  
+	\footfullcite{赵学功2001--}
 
 
 %打印参考文献表
-\printbibliography[heading=bibliography,title=参考文献]
+	\printbibliography[heading=bibliography,title=参考文献]
 \end{document}
 ```
 
 ### 2. Compile method/文档编译方式
 
 ```
-xelatex jobname.tex
-biber jobname
-xelatex jobname.tex
-xelatex jobname.tex
+	xelatex jobname.tex
+	biber jobname
+	xelatex jobname.tex
+	xelatex jobname.tex
 ```
 
 ### 3. Recommended environment/推荐使用环境
@@ -600,6 +644,7 @@ biber -l zh__stroke jobname
 ---------------------------------------------------------
 
 ## Need to do:
+    * different style for references of different languages，like：gb7714-2015 for chinese refs and trad-unsrt for english refs。
     * special characters in all fields?
     * entry without author: the delimiter between title and year?
 	* TEST FOR texlive 2015,2016
@@ -621,12 +666,25 @@ biber -l zh__stroke jobname
 * 2018/01/20 v1.0j 
 * 2018/04/03 v1.0k
 * 2018/06/01 v1.0l
+* 2018/08/14 v1.0m,CTAN
 
 ---------------------------------------------------------
 ## Update history:
 
+
+date of update: 2018-08-14 to version v1.0m
+
+* 更正由于更新cbx文件引入的标注中的空格。
+
+correct a bug which add an extra space in citations after the previous update.
+
+
 date of update: 2018-06-01 to version v1.0l
 
+* 根据的 Minyi Han 的建议，调整了issue域的输出，以及标注中作者和等之间的间隙。(20180704)
+
+adjust output of the field issue，and the separation space between author and 等 in citations which was suggested by Minyi Han.
+
 
 * 增加gbctexset选项控制参考文献标题内容的设置方式，即，除了相同的printbibliography选项方式外，选择是通过 bibname 或 refname 控制还是通过定义本地化字符串 bibliography 或 references 控制。 (20180702)
 
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
index 12fad2ee8b6..597e5f83434 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015.pdf
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 28357202d7c..542287465ba 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,6 +1,6 @@
 %% LaTeX2e file `example/egspecialchar.bib'
 %% generated by the `filecontents' environment
-%% from source `biblatex-gb7714-2015' on 2018/07/02.
+%% from source `biblatex-gb7714-2015' on 2018/08/06.
 %%
 @Inproceedings{ref-replace-char,
   Title                    = {Cognitive Radio and Cooperative Strategies for Power Saving in Multi-Standard Wireless Devices},
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 bb8a8d821fc..1eba9cd4efe 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
@@ -1,5 +1,5 @@
-@echo off
-
-
-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 *.fls *.xdv *.fdb_latexmk
+@echo off

+

+

+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 *.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 89a92c90198..9251a339f8e 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,7 +1,8 @@
-compiled files info: 

-egbeamer.tex 

-egbeameray.tex 

-egtest.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 
+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 e7c6b485711..b8ffd0fdf09 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
@@ -1,41 +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 ( eg*.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
+@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 ( eg*.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/makefilegbk.bat b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefilegbk.bat
index ae868cb5e58..abe5c2b9db7 100755
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefilegbk.bat
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefilegbk.bat
@@ -1,44 +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
+@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
index 987fc5ff5b1..d67b625d4c3 100755
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefiletest.bat
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/makefiletest.bat
@@ -1,41 +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
+@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/testcitenum.tex b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcitenum.tex
index a5c2df1371e..53df4f7fb22 100644
--- a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcitenum.tex
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testcitenum.tex
@@ -177,24 +177,25 @@ 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}
+（b）定义新的标注命令：见\authornumcite{FOURNEY1971-17-38,wang2006another}，
+\authornumcite{易仕和2013--,张2007-500-503}
 
 （c）用textcite但没有上标：见\textcite{FOURNEY1971-17-38,wang2006another}
 
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.bib b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.bib
new file mode 100644
index 00000000000..0ba8ededc4d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.bib
@@ -0,0 +1,61 @@
+%% LaTeX2e file `testmultilanay.bib'
+%% generated by the `filecontents' environment
+%% from source `testmultilanay' on 2018/07/23.
+%%
+
+@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 = {해저 저질과 환경 하중을 고려한 침몰 선체 인양 시뮬레이션},
+}
+
diff --git a/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.pdf b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.pdf
new file mode 100644
index 00000000000..caeeccce846
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/biblatex-gb7714-2015/example/testmultilanay.pdf
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 0f4f78f6f08..dc722cfb4c0 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
@@ -5,6 +5,11 @@
 \updateinfo[2018-06-01]{date of update: 2018-06-01 to version v1.0l}\label{up:180601}
 \begin{enumerate}
 
+\item 根据的 Minyi Han 的建议，调整了issue域的输出，以及标注中作者和等之间的间隙。(20180704)
+
+adjust output of the field issue，and the separation space between author and 等 in citations which was suggested by Minyi Han.
+
+
 \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.
diff --git a/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makeall.bat b/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makeall.bat
index 2482f9a2af2..328d856e6a2 100755
--- a/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makeall.bat
+++ b/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makeall.bat
@@ -1,35 +1,35 @@
-:: Copyright (c) 2012-2016 hzz
-
-@echo off
-
-if exist *.userbak (
-    del *.userbak /Q
-)
-FOR %%c IN (*.pdf) DO (
-    copy /Y "%%c" "%%c.userbak"
-)
-if exist *.pdf (
-    del *.pdf /Q
-)
-
-::pause
-
-cd example
-
-call makefileeg
-
-::call makefiletest
-
-::call makefilegbk
-
-cd ..
-
-call makeclear
-
-call makefile
-
-::call makeclear
-
-if exist *.userbak (
-    del *.userbak /Q
+:: Copyright (c) 2012-2016 hzz

+

+@echo off

+

+if exist *.userbak (

+    del *.userbak /Q

+)

+FOR %%c IN (*.pdf) DO (

+    copy /Y "%%c" "%%c.userbak"

+)

+if exist *.pdf (

+    del *.pdf /Q

+)

+

+::pause

+

+cd example

+

+call makefileeg

+

+::call makefiletest

+

+::call makefilegbk

+

+cd ..

+

+call makeclear

+

+call makefile

+

+::call makeclear

+

+if exist *.userbak (

+    del *.userbak /Q

 )
\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makeclear.bat b/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makeclear.bat
index bb8a8d821fc..63658760f3e 100644
--- a/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makeclear.bat
+++ b/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makeclear.bat
@@ -1,5 +1,20 @@
-@echo off
-
-
-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 *.fls *.xdv *.fdb_latexmk
+@echo off

+

+

+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 *.fls *.xdv *.fdb_latexmk

+

+

+cd example

+

+call makeclear

+

+

+

+del *.bbx /Q

+

+

+del *.cbx /Q

+

+

+del *.def /Q
\ No newline at end of file
diff --git a/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makefile.bat b/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makefile.bat
index 85ef28da90b..4496d31a805 100755
--- a/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makefile.bat
+++ b/Master/texmf-dist/source/latex/biblatex-gb7714-2015/makefile.bat
@@ -20,6 +20,21 @@ xelatex.exe --synctex=-1 biblatex-gb7714-2015.tex
 ::to do it again for backref 

 xelatex.exe --synctex=-1 biblatex-gb7714-2015.tex

 

+cd example

+

+call makeclear

+

+

+

+del *.bbx /Q

+

+

+del *.cbx /Q

+

+

+del *.def /Q

+

+

 :: clear aux files

 

 ::call makeclear

diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx
index ae4afff4c54..15a9d96596d 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx
@@ -11,8 +11,8 @@
 %
 %   版本和时间信息
 %
-\ProvidesFile{gb7714-2015.bbx}[2018/06/01 v1.0l biblatex bibliography style]
-\def\versionofgbtstyle{2018/06/01 v1.0l}
+\ProvidesFile{gb7714-2015.bbx}[2018/08/14 v1.0m biblatex bibliography style]
+\def\versionofgbtstyle{2018/08/14 v1.0m}
 \def\versionofbiblatex{\abx@version}
 \RequireBiber[3]%显式指定用biber后端
 
@@ -197,6 +197,7 @@
     %为单个条目的姓名格式控制增加nameformat和namefmtid两个域
     \DeclareDatamodelFields[type=field,datatype=literal]{mark,medium,nameformat}
     \DeclareDatamodelFields[type=field,datatype=integer]{namefmtid}
+    \DeclareDatamodelFields[type=field,datatype=literal]{shortbooktitle}
 
 
 
@@ -1754,7 +1755,7 @@ test{\iftoggle{iftlnine}}
   \bibrangedash%
   \iffieldundef{endyear}{}{\printfield{endyear}}%
   \newunit}%
-{  \printlist{location}%
+{\printlist{location}%
   \iflistundef{institution}%
     {\setunit*{\addcomma\space}}
     {\setunit*{\addcolon\space}}%
@@ -1892,8 +1893,8 @@ test{\iftoggle{iftlnine}}
         {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸
                                      {\usebibmacro{date}}%
       }}%
-      {\printfield{issue}%
-       \setunit*{\addspace}%
+      {\iftoggle{bbx:gbstrict}{}{\printfield{issue}%
+       \setunit*{\addspace}}%
        %\usebibmacro{date}
          \iffieldundef{note}{\usebibmacro{date}}%判断一下，是否是报纸
         {\iffieldequalstr{note}{news}{\usebibmacro{newsdate}}%判断是否为报纸
diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx
index e72c3a26607..bea61d82369 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx
@@ -7,7 +7,7 @@
 %% Released under the LaTeX Project Public License v1.3c or later
 %% ---------------------------------------------------------------
 %%
-\ProvidesFile{gb7714-2015.cbx}[2018/06/01 v1.0l biblatex citation style]
+\ProvidesFile{gb7714-2015.cbx}[2018/08/14 v1.0m biblatex citation style]
 
 %
 %   加载标准样式
@@ -42,7 +42,7 @@
 %
 %   方法:\DeclareCiteCommand{\cite}[\mkbibparens]{precode}{loopcode}{sepcode}{postcode}
 \DeclareCiteCommand{\cite}[\mkbibsuperbracket]%利用mkbibsuperbracket添加方括号
-  {\usebibmacro{cite:init}
+  {\usebibmacro{cite:init}%
    \usebibmacro{prenote}}
   {\usebibmacro{citeindex}%
    \usebibmacro{cite:comp}}
@@ -132,7 +132,8 @@
 %见numeric.CBX，\DeclareCiteCommand{\cite},
 \DeclareCiteCommand{\authornumcite}%[\mkbibsuperscript]
   {\usebibmacro{prenote}}
-  {\renewcommand*{\andothersdelim}{\addspace}%
+  {\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
+  {\renewcommand*{\andothersdelim}{\addspace}}%
   \printnames{labelname}\mkbibsuperscript{\mkbibbrackets{\usebibmacro{citeindex}%
    \usebibmacro{cite}}}}
   {\multicitedelim}
diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx
index b9ba24c564f..016ce792e52 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx
@@ -10,8 +10,8 @@
 %
 %   版本和时间信息
 %
-\ProvidesFile{gb7714-2015ay.bbx}[2018/06/01 v1.0l biblatex bibliography style]
-\def\versionofgbtstyle{2018/06/01 v1.0l}
+\ProvidesFile{gb7714-2015ay.bbx}[2018/08/14 v1.0m biblatex bibliography style]
+\def\versionofgbtstyle{2018/08/14 v1.0m}
 \def\versionofbiblatex{\abx@version}
 \RequireBiber[3]%显式指定用biber后端
 
@@ -200,6 +200,7 @@
     %为单个条目的姓名格式控制增加nameformat和namefmtid两个域
     \DeclareDatamodelFields[type=field,datatype=literal]{mark,medium,nameformat}
     \DeclareDatamodelFields[type=field,datatype=integer]{namefmtid}
+    \DeclareDatamodelFields[type=field,datatype=literal]{shortbooktitle}
 
 
 
@@ -1966,7 +1967,7 @@ test{\iftoggle{iftlnine}}
   \renewbibmacro*{issue+date}{%
     \iffieldundef{issue}%
       {}%
-      {\printtext[parens]{\printfield{issue}}\newunit}}
+      {\iftoggle{bbx:gbstrict}{}{\printtext[parens]{\printfield{issue}}\newunit}}}
 
 
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx
index 5cae654152b..d79c16ac524 100644
--- a/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx
@@ -7,29 +7,31 @@
 %% Released under the LaTeX Project Public License v1.3c or later
 %% ---------------------------------------------------------------
 %%
-\ProvidesFile{gb7714-2015ay.cbx}[2018/06/01 v1.0l biblatex citation style]
+\ProvidesFile{gb7714-2015ay.cbx}[2018/08/14 v1.0m biblatex citation style]
 
 %
 %   加载标准样式
 %
 \RequireCitationStyle{authoryear}
-%\RequireCitationStyle{numeric}
 
 
+
+\ExecuteBibliographyOptions{
+  %autocite  = superscript ,
+  %autopunct = true       ,
+  %sorting   = none        ,
+  maxcitenames=1,
+  mincitenames=1,
+  uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
+  uniquelist=minyear
+}
 %
 %   选项设置，针对3.7以下版本
 %
 %   原理方法:labeldate用于控制是否给引用标签提供日期的成分
 \defversion{3.4}{cbxopt}{
     \ExecuteBibliographyOptions{
-      %autocite  = superscript ,
-      %autopunct = true       ,
-      %sorting   = none        ,
-      maxcitenames=1,
-      mincitenames=1,
-      uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
-      labeldate=true,
-      uniquelist=minyear
+      labeldate=true
     }
 }
 
@@ -39,15 +41,7 @@
 %   原理方法:labeldateparts用于控制是否给引用标签提供日期的成分
 \defversion{3.7}{cbxopt}{
     \ExecuteBibliographyOptions{
-      %autocite  = superscript ,
-      %autopunct = true       ,
-      %sorting   = none        ,
-      maxcitenames=1,
-      mincitenames=1,
-      uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
-      labeldateparts=true,
-      %labeldate=true,
-      uniquelist=minyear %minyear,
+      labeldateparts=true
     }
 }
 
@@ -66,9 +60,13 @@ or
 test {\iftoggle{iftlseven}}%3.7=biblatex
 }{\newbibmacro{cite:labeldate+extradate}{\usebibmacro{cite:labelyear+extrayear}}}{}%else: biblatex>3.7
 
-%textcite标注命令中的标点设置
+%textcite标注命令中的标点设置，注意只针对textcite命令。
 \DeclareDelimFormat[textcite]{nameyeardelim}{}%\addcomma\space
-\DeclareDelimFormat[textcite]{andothersdelim}{\addspace}%
+\DeclareDelimFormat[textcite]{andothersdelim}{\iffieldequalstr{userf}{cn}{\addthinspace}{\addspace}}%
+\AtEveryCitekey{%
+\iffieldequalstr{userf}{cn}{\renewcommand*{\andothersdelim}{\addthinspace}}%\addthinspace
+  {\renewcommand*{\andothersdelim}{\addspace}}%
+}