thuthesis (6jan20)

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

3 files changed, 26 insertions, 37 deletions

diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst
index 350d534aa60..370aa0520fa 100644
--- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst
+++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-author-year.bst
@@ -44,10 +44,8 @@ INTEGERS {
 
 FUNCTION {load.config}
 {
-  #1 'uppercase.name :=
   #0 'uppercase.name :=
   #3 'max.num.authors :=
-  #0 'period.between.author.year :=
   #1 'period.between.author.year :=
   #1 'sentence.case.title :=
   #0 'link.title :=
@@ -56,9 +54,8 @@ FUNCTION {load.config}
   #0 'in.booktitle :=
   #0 'italic.jounal :=
   #0 'bold.journal.volume :=
-  #1 'show.missing.address.publisher :=
+  #0 'show.missing.address.publisher :=
   #1 'show.url :=
-  #1 'show.doi :=
   #0 'show.doi :=
   #0 'show.note :=
   #1 'lang.zh.order :=
@@ -155,7 +152,7 @@ FUNCTION {bbl.colon} { ": " }
 
 FUNCTION {bbl.wide.space} { "\ " }
 
-FUNCTION {bbl.slash} { "//\allowbreak " }
+FUNCTION {bbl.slash} { " // " }
 
 FUNCTION {bbl.sine.loco}
 { entry.lang lang.zh =
@@ -629,19 +626,15 @@ FUNCTION {make.full.names}
 FUNCTION {output.bibitem}
 { newline$
   "\bibitem[" write$
-  label write$
-  ")" make.full.names duplicate$ short.list =
+  label ")" *
+  make.full.names duplicate$ short.list =
      { pop$ }
      { * }
   if$
   's :=
   s text.length$ 'charptr :=
-    { charptr #0 > }
-    { s charptr #1 substring$ "]" =
-        { #0 'charptr := }
-        { charptr #1 - 'charptr := }
-      if$
-    }
+    { charptr #0 > s charptr #1 substring$ "[" = not and }
+    { charptr #1 - 'charptr := }
   while$
   charptr #0 >
     { "{" s * "}" * }
@@ -889,6 +882,9 @@ FUNCTION {set.entry.mark}
 
 FUNCTION {format.mark}
 { show.mark
+  type$ "phdthesis" = type$ "mastersthesis" = or type$ "patent" = or
+  medium empty$ not or entry.is.electronic or
+  and
     { medium empty$ not
         { entry.mark "/" * medium * 'entry.mark := }
         { entry.is.electronic
@@ -897,7 +893,7 @@ FUNCTION {format.mark}
           if$
         }
       if$
-      "\allowbreak[" entry.mark * "]" *
+      " [" entry.mark * "]" *
     }
     { "" }
   if$
diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst
index 1063c962b1d..412acbe2c2f 100644
--- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst
+++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-bachelor.bst
@@ -4,7 +4,7 @@
 %%
 %% The original source files were:
 %%
-%% gbt7714.dtx  (with options: `2015,numerical')
+%% gbt7714.dtx  (with options: `2015,numerical,noslsn')
 %% -------------------------------------------------------------------
 %% GB/T 7714-2015 BibTeX Style
 %% https://github.com/CTeX-org/gbt7714-bibtex-style
@@ -48,7 +48,7 @@ FUNCTION {load.config}
   #0 'in.booktitle :=
   #0 'italic.jounal :=
   #0 'bold.journal.volume :=
-  #1 'show.missing.address.publisher :=
+  #0 'show.missing.address.publisher :=
   #1 'show.url :=
   #1 'show.doi :=
   #0 'show.note :=
@@ -615,19 +615,15 @@ FUNCTION {make.full.names}
 FUNCTION {output.bibitem}
 { newline$
   "\bibitem[" write$
-  label write$
-  ")" make.full.names duplicate$ short.list =
+  label ")" *
+  make.full.names duplicate$ short.list =
      { pop$ }
      { * }
   if$
   's :=
   s text.length$ 'charptr :=
-    { charptr #0 > }
-    { s charptr #1 substring$ "]" =
-        { #0 'charptr := }
-        { charptr #1 - 'charptr := }
-      if$
-    }
+    { charptr #0 > s charptr #1 substring$ "[" = not and }
+    { charptr #1 - 'charptr := }
   while$
   charptr #0 >
     { "{" s * "}" * }
diff --git a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst
index 17f186e6dea..c8cd10f4b87 100644
--- a/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst
+++ b/Master/texmf-dist/bibtex/bst/thuthesis/thuthesis-numeric.bst
@@ -39,7 +39,6 @@ INTEGERS {
 
 FUNCTION {load.config}
 {
-  #1 'uppercase.name :=
   #0 'uppercase.name :=
   #3 'max.num.authors :=
   #1 'sentence.case.title :=
@@ -49,9 +48,8 @@ FUNCTION {load.config}
   #0 'in.booktitle :=
   #0 'italic.jounal :=
   #0 'bold.journal.volume :=
-  #1 'show.missing.address.publisher :=
+  #0 'show.missing.address.publisher :=
   #1 'show.url :=
-  #1 'show.doi :=
   #0 'show.doi :=
   #0 'show.note :=
 }
@@ -143,7 +141,7 @@ FUNCTION {bbl.colon} { ": " }
 
 FUNCTION {bbl.wide.space} { "\ " }
 
-FUNCTION {bbl.slash} { "//\allowbreak " }
+FUNCTION {bbl.slash} { " // " }
 
 FUNCTION {bbl.sine.loco}
 { entry.lang lang.zh =
@@ -617,19 +615,15 @@ FUNCTION {make.full.names}
 FUNCTION {output.bibitem}
 { newline$
   "\bibitem[" write$
-  label write$
-  ")" make.full.names duplicate$ short.list =
+  label ")" *
+  make.full.names duplicate$ short.list =
      { pop$ }
      { * }
   if$
   's :=
   s text.length$ 'charptr :=
-    { charptr #0 > }
-    { s charptr #1 substring$ "]" =
-        { #0 'charptr := }
-        { charptr #1 - 'charptr := }
-      if$
-    }
+    { charptr #0 > s charptr #1 substring$ "[" = not and }
+    { charptr #1 - 'charptr := }
   while$
   charptr #0 >
     { "{" s * "}" * }
@@ -877,6 +871,9 @@ FUNCTION {set.entry.mark}
 
 FUNCTION {format.mark}
 { show.mark
+  type$ "phdthesis" = type$ "mastersthesis" = or type$ "patent" = or
+  medium empty$ not or entry.is.electronic or
+  and
     { medium empty$ not
         { entry.mark "/" * medium * 'entry.mark := }
         { entry.is.electronic
@@ -885,7 +882,7 @@ FUNCTION {format.mark}
           if$
         }
       if$
-      "\allowbreak[" entry.mark * "]" *
+      " [" entry.mark * "]" *
     }
     { "" }
   if$