1.0i correct some flaws

hushidong · Nov 23, 2017 · bbbaeb8 · bbbaeb8
1 parent c53419e
commit bbbaeb8
Show file tree

Hide file tree

Showing 12 changed files with 1,229 additions and 985 deletions.
diff --git a/README.md b/README.md
@@ -53,9 +53,12 @@ please see the file 'biblatex-gb7714-2015.pdf' for more information!
 ### date of change: 2017-11-21 to version v1.0i
 * Changes to pkg code:
     - "*.bbx": deal compatibility problem of author-year style for biblatex v3.8a, include labeldate->labeldateparts and DeclareSortingScheme -> DeclareSortingTemplate.
-    - "*.bbx": change the version judgement macro,using macro form pkg xstring.
+    - "*.bbx": change the version judgement macro,using macro form pkg xstring. change version switch method, define version's code first then switch depend on the biblatex version.
 	- "*.bbx": replace the \iffieldundef{year} by \iffieldequalstr{year}{} in \newbibmacro*{modifydate}, for the year field is defined with empty string for biblatex version >3.7 after biber dealing with none date info.
-
+	- "*.bbx": change the date format control mechanism for biblatex version >3.7, lower version keep the old fansion.
+	- "*.bbx": rewrite the volume and number parsing macro using xstring pkg.
+* Changes to documentation:
+	- biblatex-gb7714-2015.tex: revise this document 
 
 
 ### date of change: 2017-04-11 to version v1.0h, the last version support texlive2015

diff --git a/biblatex-gb7714-2015-content.tex b/biblatex-gb7714-2015-content.tex
diff --git a/biblatex-gb7714-2015.pdf b/biblatex-gb7714-2015.pdf
diff --git a/biblatex-gb7714-2015ay.pdf b/biblatex-gb7714-2015ay.pdf
diff --git a/egbibenv-gb7714-2015.pdf b/egbibenv-gb7714-2015.pdf
diff --git a/egbibenv-left.pdf b/egbibenv-left.pdf
diff --git a/egbibenv-right.pdf b/egbibenv-right.pdf
diff --git a/egspecialchar.bib b/egspecialchar.bib
@@ -1,6 +1,6 @@
 %% LaTeX2e file `egspecialchar.bib'
 %% generated by the `filecontents' environment
-%% from source `biblatex-gb7714-2015' on 2017/11/21.
+%% from source `biblatex-gb7714-2015ay' on 2017/11/24.
 %%
 @Inproceedings{ref-replace-char,
   Title                    = {Cognitive Radio and Cooperative Strategies for Power Saving in Multi-Standard Wireless Devices},

diff --git a/egtest.tex b/egtest.tex
@@ -18,13 +18,18 @@
 %%%test file for author year style
 
 \section{文献表}
-文献\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--}
+文献
+\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}

diff --git a/gb7714-2015.bbx b/gb7714-2015.bbx
diff --git a/gb7714-2015ay.bbx b/gb7714-2015ay.bbx
diff --git a/gb7714-2015ay.cbx b/gb7714-2015ay.cbx
@@ -17,31 +17,44 @@
 \RequireCitationStyle{authoryear}
 %\RequireCitationStyle{numeric}
 
-\iftoggle{iftexliveeight}{%
-\ExecuteBibliographyOptions{
-  %autocite  = superscript ,
-  %autopunct = true       ,
-  %sorting   = none        ,
-  maxcitenames=1,
-  mincitenames=1,
-  uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
-  labeldateparts=true,
-  %labeldate=true,
-  uniquelist=minyear,
-}}{%
-\ExecuteBibliographyOptions{
-  %autocite  = superscript ,
-  %autopunct = true       ,
-  %sorting   = none        ,
-  maxcitenames=1,
-  mincitenames=1,
-  uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
-  labeldate=true,
-  uniquelist=minyear,
-}}
+\defversion{3.7}{cbxopt}{
+    \ExecuteBibliographyOptions{
+      %autocite  = superscript ,
+      %autopunct = true       ,
+      %sorting   = none        ,
+      maxcitenames=1,
+      mincitenames=1,
+      uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
+      labeldate=true,
+      uniquelist=minyear,
+    }
+}
+
+\defversion{3.8}{cbxopt}{
+    \ExecuteBibliographyOptions{
+      %autocite  = superscript ,
+      %autopunct = true       ,
+      %sorting   = none        ,
+      maxcitenames=1,
+      mincitenames=1,
+      uniquename=init,%因为使用了名字缩写选项，所以需要设置uniquename=init而不是full避免冲突
+      labeldateparts=true,
+      %labeldate=true,
+      uniquelist=minyear,
+    }
+}
+
+\iftoggle{iftlfive}
+    {\switchversion{3.7}{sort}}%%当采用texlive2015以下版本时
+    {\iftoggle{iftlsix}%
+        {\switchversion{3.7}{sort}}%%当采用texlive2016版本时
+        {\iftoggle{iftlseven}%
+            {\switchversion{3.7}{sort}}%%当采用texlive2017版本时
+            {\switchversion{3.8}{sort}}%%当采用biblatex3.8a版本时
+        }%
+    }
 
 %\DeclareCiteCommand{\cite}[\mkbibparens]{⟨precode⟩}{⟨loopcode⟩}{⟨sepcode⟩}{⟨postcode⟩}
-%
 \DeclareCiteCommand{\cite}[\mkbibparens]
   {\usebibmacro{prenote}}
   {\usebibmacro{citeindex}%