bibexport (3mar16)

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

9 files changed, 54 insertions, 30 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/bibexport/bibexport.sh b/Build/source/texk/texlive/linked_scripts/bibexport/bibexport.sh
index f946a68b539..78d6ee92f21 100755
--- a/Build/source/texk/texlive/linked_scripts/bibexport/bibexport.sh
+++ b/Build/source/texk/texlive/linked_scripts/bibexport/bibexport.sh
@@ -7,7 +7,7 @@
 ##
 ## bibexport.dtx  (with options: `script')
 ## 
-## (c) 2011/11/28 Nicolas Markey <markey at lsv dot ens-cachan dot fr>
+## (c) 2016/03/02 Nicolas Markey <bibexport at markey dot fr>
 ## 
 ## This work may  be distributed and/or modified under  the conditions of
 ## the LaTeX Project  Public License, either version 1.3  of this license
@@ -46,8 +46,7 @@ function checkversion()
 -----------"
   grep -q $VDATE `kpsewhich expkeys.bst` ||
     echo "-----------
---Warning-- the version of the .bst files does not match with that of this
-script.
+--Warning-- the version of the .bst files does not match with that of this script.
 -----------"
 }
 function usage()
@@ -84,9 +83,9 @@ if [ ${TOOLATE} -ne 0 ]; then
 fi
 }
 ## Version number
-VERSION="3.01";
+VERSION="3.02";
 ## Release date
-VDATE="2011/11/28";
+VDATE="2016/03/02";
 
 # ALL is a flag set to 1 when '-a' is given
 ALL="0";
diff --git a/Master/texmf-dist/bibtex/bst/bibexport/expcites.bst b/Master/texmf-dist/bibtex/bst/bibexport/expcites.bst
index c471f4bd6d4..7fde8107e34 100644
--- a/Master/texmf-dist/bibtex/bst/bibexport/expcites.bst
+++ b/Master/texmf-dist/bibtex/bst/bibexport/expcites.bst
@@ -6,7 +6,7 @@
 %%
 %% bibexport.dtx  (with options: `expcites')
 %% 
-%% (c) 2011/11/28 Nicolas Markey <markey at lsv dot ens-cachan dot fr>
+%% (c) 2016/03/02 Nicolas Markey <bibexport at markey dot fr>
 %% 
 %% This work may  be distributed and/or modified under  the conditions of
 %% the LaTeX Project  Public License, either version 1.3  of this license
diff --git a/Master/texmf-dist/bibtex/bst/bibexport/expkeys.bst b/Master/texmf-dist/bibtex/bst/bibexport/expkeys.bst
index e6a098d886f..9f7359cc775 100644
--- a/Master/texmf-dist/bibtex/bst/bibexport/expkeys.bst
+++ b/Master/texmf-dist/bibtex/bst/bibexport/expkeys.bst
@@ -6,7 +6,7 @@
 %%
 %% bibexport.dtx  (with options: `expkeys')
 %% 
-%% (c) 2011/11/28 Nicolas Markey <markey at lsv dot ens-cachan dot fr>
+%% (c) 2016/03/02 Nicolas Markey <bibexport at markey dot fr>
 %% 
 %% This work may  be distributed and/or modified under  the conditions of
 %% the LaTeX Project  Public License, either version 1.3  of this license
diff --git a/Master/texmf-dist/bibtex/bst/bibexport/export.bst b/Master/texmf-dist/bibtex/bst/bibexport/export.bst
index 967c87332fc..ad9f3e49d34 100644
--- a/Master/texmf-dist/bibtex/bst/bibexport/export.bst
+++ b/Master/texmf-dist/bibtex/bst/bibexport/export.bst
@@ -6,7 +6,7 @@
 %%
 %% bibexport.dtx  (with options: `export')
 %% 
-%% (c) 2011/11/28 Nicolas Markey <markey at lsv dot ens-cachan dot fr>
+%% (c) 2016/03/02 Nicolas Markey <bibexport at markey dot fr>
 %% 
 %% This work may  be distributed and/or modified under  the conditions of
 %% the LaTeX Project  Public License, either version 1.3  of this license
@@ -68,12 +68,16 @@ ENTRY{
     volume
     year
     abstract
+    acronym
+    annote
+    biburl
     doi
     eid
     isbn
     issn
     language
     url
+    urn
 }{}{}
 FUNCTION{not}
 {
@@ -138,7 +142,12 @@ FUNCTION{split.url}
     {
       's :=
       right.length
-      {duplicate$ duplicate$ s swap$ #1 substring$ "/" = not and}
+      {duplicate$ duplicate$ s swap$ #1 substring$
+        duplicate$ "/" = swap$
+        duplicate$ "&" = swap$
+        duplicate$ "?" = swap$
+        duplicate$ "-" = swap$
+                   ":" = or or or or not and}
         {#1 -}
       while$
       duplicate$ #2 <
@@ -376,12 +385,16 @@ FUNCTION{entry.export.standard}
 FUNCTION{entry.export.extra}
 {
   "abstract" abstract field.export
+  "acronym" acronym field.export
+  "annote" annote field.export
+  "biburl" biburl url.export
   "doi" doi field.export
   "eid" eid field.export
   "isbn" isbn field.export
   "issn" issn field.export
   "language" language field.export
   "url" url url.export
+  "urn" urn url.export
 }
 FUNCTION{entry.export}
 {
diff --git a/Master/texmf-dist/doc/bibtex/bibexport/README b/Master/texmf-dist/doc/bibtex/bibexport/README
index 3769fac1dcb..b5b68f8cb20 100644
--- a/Master/texmf-dist/doc/bibtex/bibexport/README
+++ b/Master/texmf-dist/doc/bibtex/bibexport/README
@@ -1,6 +1,6 @@
 	   bibexport.sh -- extract BibTeX entries out of .bib file(s).
-        	          (N. Markey -- <markey(at)lsv.ens-cachan.fr>)
-             		                    version 3.01 -- 2011/11/28
+        	          (Nicolas Markey -- <bibexport(at)markey.fr>)
+             		                    version 3.02 -- 2016/03/02
 
 This is a  shell script using BibTeX to extract  .bib entries that are
 \cite'd  in a  document.  It also  permits  to expand  a BibTeX  file,
@@ -9,7 +9,7 @@ i.e. to develop abbreviations (except standard ones) and crossrefs.
 
 ----------------------------------------------------------------------
 
-(c) 2011/11/28 Nicolas Markey <markey at lsv dot ens-cachan dot fr>
+(c) 2016/03/02 Nicolas Markey <bibexport at markey dot fr>
 
 This work may  be distributed and/or modified under  the conditions of
 the LaTeX Project  Public License, either version 1.3  of this license
diff --git a/Master/texmf-dist/doc/bibtex/bibexport/bibexport.pdf b/Master/texmf-dist/doc/bibtex/bibexport/bibexport.pdf
index 371c3e7cdcd..0a06c52416d 100644
--- a/Master/texmf-dist/doc/bibtex/bibexport/bibexport.pdf
+++ b/Master/texmf-dist/doc/bibtex/bibexport/bibexport.pdf
diff --git a/Master/texmf-dist/scripts/bibexport/bibexport.sh b/Master/texmf-dist/scripts/bibexport/bibexport.sh
index f946a68b539..78d6ee92f21 100755
--- a/Master/texmf-dist/scripts/bibexport/bibexport.sh
+++ b/Master/texmf-dist/scripts/bibexport/bibexport.sh
@@ -7,7 +7,7 @@
 ##
 ## bibexport.dtx  (with options: `script')
 ## 
-## (c) 2011/11/28 Nicolas Markey <markey at lsv dot ens-cachan dot fr>
+## (c) 2016/03/02 Nicolas Markey <bibexport at markey dot fr>
 ## 
 ## This work may  be distributed and/or modified under  the conditions of
 ## the LaTeX Project  Public License, either version 1.3  of this license
@@ -46,8 +46,7 @@ function checkversion()
 -----------"
   grep -q $VDATE `kpsewhich expkeys.bst` ||
     echo "-----------
---Warning-- the version of the .bst files does not match with that of this
-script.
+--Warning-- the version of the .bst files does not match with that of this script.
 -----------"
 }
 function usage()
@@ -84,9 +83,9 @@ if [ ${TOOLATE} -ne 0 ]; then
 fi
 }
 ## Version number
-VERSION="3.01";
+VERSION="3.02";
 ## Release date
-VDATE="2011/11/28";
+VDATE="2016/03/02";
 
 # ALL is a flag set to 1 when '-a' is given
 ALL="0";
diff --git a/Master/texmf-dist/source/bibtex/bibexport/bibexport.dtx b/Master/texmf-dist/source/bibtex/bibexport/bibexport.dtx
index a1e938b36d7..8a29a06b750 100644
--- a/Master/texmf-dist/source/bibtex/bibexport/bibexport.dtx
+++ b/Master/texmf-dist/source/bibtex/bibexport/bibexport.dtx
@@ -16,16 +16,16 @@
 %%%\AtBeginDocument{\CodelineIndex\EnableCrossrefs}
 %%%\AtEndDocument{\PrintIndex}
 \begin{document} 
- \def\docdate{2011/11/28}
- \def\fileversion{3.01}
+ \def\docdate{2016/03/02}
+ \def\fileversion{3.02}
 %%% Please also change date at the beginning of the script %%%
-%%%\def\filedate{2011/11/28}
+%%% (VERSION and VDATE below)                              %%%
  \DocInput{bibexport.dtx}
 \end{document}
 %</driver>
 % 
 % \fi
-% \CheckSum{45}
+% \CheckSum{41}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -188,8 +188,7 @@ function checkversion()
 -----------"
   grep -q $VDATE `kpsewhich expkeys.bst` || 
     echo "-----------
---Warning-- the version of the .bst files does not match with that of this
-script.
+--Warning-- the version of the .bst files does not match with that of this script.
 -----------"
 }
 %</script>
@@ -289,9 +288,9 @@ fi
 %    \begin{macrocode}
 %<*script>
 ## Version number
-VERSION="3.01";
+VERSION="3.02";
 ## Release date
-VDATE="2011/11/28";
+VDATE="2016/03/02";
 
 # ALL is a flag set to 1 when '-a' is given
 ALL="0";
@@ -1016,12 +1015,16 @@ ENTRY{
     year
 % Special (but still somewhat standard) fields (natbib, germbib, ...):
     abstract
+    acronym
+    annote
+    biburl
     doi
     eid
     isbn
     issn
     language
     url
+    urn
 }{}{}
 %</export>
 %    \end{macrocode}
@@ -1061,7 +1064,8 @@ FUNCTION{or}
 % \subsubsection{Splitting strings}
 %
 % We design functions for splitting strings, so that the final
-% \ext{bib} file will be cleanly indented. 
+% \ext{bib} file will be cleanly indented. This is also crucial
+% to avoid long URLs.
 % \begin{macro}{space.complete}
 % \begin{macro}{split.string}
 % \begin{macro}{split.url}
@@ -1113,7 +1117,12 @@ FUNCTION{split.url}
     {
       's :=
       right.length
-      {duplicate$ duplicate$ s swap$ #1 substring$ "/" = not and}
+      {duplicate$ duplicate$ s swap$ #1 substring$ 
+        duplicate$ "/" = swap$ 
+        duplicate$ "&" = swap$
+        duplicate$ "?" = swap$
+        duplicate$ "-" = swap$ 
+                   ":" = or or or or not and}
         {#1 -}
       while$
       duplicate$ #2 <
@@ -1402,12 +1411,16 @@ FUNCTION{entry.export.standard}
 FUNCTION{entry.export.extra}
 {
   "abstract" abstract field.export
+  "acronym" acronym field.export
+  "annote" annote field.export
+  "biburl" biburl url.export
   "doi" doi field.export
   "eid" eid field.export
   "isbn" isbn field.export
   "issn" issn field.export
   "language" language field.export
   "url" url url.export
+  "urn" urn url.export
 }
 FUNCTION{entry.export}
 {
diff --git a/Master/texmf-dist/source/bibtex/bibexport/bibexport.ins b/Master/texmf-dist/source/bibtex/bibexport/bibexport.ins
index 79ab290e663..a29005d0d10 100644
--- a/Master/texmf-dist/source/bibtex/bibexport/bibexport.ins
+++ b/Master/texmf-dist/source/bibtex/bibexport/bibexport.ins
@@ -1,6 +1,6 @@
 %\NeedsTeXFormat{LaTeX2e}[1996/12/01]
 \input docstrip
-\def\filedate{2011/11/28}
+\def\filedate{2016/03/02}
 
 {\catcode`\#=12
  \gdef\DoubleSharp{##}
@@ -9,7 +9,7 @@
 \let\MetaPrefix\DoubleSharp
 \preamble
 
-(c) \filedate Nicolas Markey <markey at lsv dot ens-cachan dot fr>
+(c) \filedate Nicolas Markey <bibexport at markey dot fr>
 
 This work may  be distributed and/or modified under  the conditions of
 the LaTeX Project  Public License, either version 1.3  of this license
@@ -42,7 +42,7 @@ The Current Maintainer of this work is Nicolas Markey.
 \let\MetaPrefix\DoubleperCent
 \preamble
 
-(c) 2011/11/28 Nicolas Markey <markey at lsv dot ens-cachan dot fr>
+(c) \filedate Nicolas Markey <bibexport at markey dot fr>
 
 This work may  be distributed and/or modified under  the conditions of
 the LaTeX Project  Public License, either version 1.3  of this license