texlive[51530] trunk: urlbst (2jul19)
commits+karl at tug.org
commits+karl at tug.org
Tue Jul 2 22:58:10 CEST 2019
Revision: 51530
http://tug.org/svn/texlive?view=revision&revision=51530
Author: karl
Date: 2019-07-02 22:58:10 +0200 (Tue, 02 Jul 2019)
Log Message:
-----------
urlbst (2jul19)
Modified Paths:
--------------
trunk/Build/source/texk/texlive/linked_scripts/urlbst/urlbst
trunk/Master/texmf-dist/bibtex/bst/urlbst/abbrvurl.bst
trunk/Master/texmf-dist/bibtex/bst/urlbst/alphaurl.bst
trunk/Master/texmf-dist/bibtex/bst/urlbst/plainurl.bst
trunk/Master/texmf-dist/bibtex/bst/urlbst/unsrturl.bst
trunk/Master/texmf-dist/doc/bibtex/urlbst/README
trunk/Master/texmf-dist/doc/bibtex/urlbst/VERSION
trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.bib
trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.html
trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.in
trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.pdf
trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.tex
trunk/Master/texmf-dist/scripts/urlbst/urlbst
trunk/Master/texmf-dist/source/bibtex/urlbst/configure
trunk/Master/texmf-dist/source/bibtex/urlbst/configure.ac
Added Paths:
-----------
trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-gpl-2.0.txt
trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-lppl.txt
trunk/Master/texmf-dist/source/bibtex/urlbst/Makefile.in
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/bibtex/urlbst/Makefile.in
trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.html.in
trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.tex.in
Modified: trunk/Build/source/texk/texlive/linked_scripts/urlbst/urlbst
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/urlbst/urlbst 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Build/source/texk/texlive/linked_scripts/urlbst/urlbst 2019-07-02 20:58:10 UTC (rev 51530)
@@ -8,9 +8,15 @@
#
# See http://purl.org/nxg/dist/urlbst for documentation
#
-# $Id$
+# Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray <http://nxg.me.uk>
+#
+# This program is distributed under the terms of the
+# GNU General Public Licence, v2.0.
+# The modifications to the input .bst files are asserted as Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray,
+# and distributed under the terms of the LaTeX Project Public Licence.
+# See the package README for further dicussion of licences.
-$version = '0.7';
+$version = '0.8';
($progname = $0) =~ s/.*\///;
$mymarker = "% $progname";
$mymarkerend = "% ...$progname to here";
@@ -26,7 +32,7 @@
$adddoiresolver = 1;
$literals{doiprefix} = 'doi:';
-$doiurl = 'http://dx.doi.org/';
+$doiurl = 'https://doi.org/';
$addpubmedresolver = 1;
$literals{pubmedprefix} = 'PMID:';
@@ -195,6 +201,9 @@
print OUT "%%% Modification of BibTeX style file ", ($infile eq '-' ? '<stdin>' : $infile), "\n";
print OUT "%%% ... by $progname, version $version (marked with \"$mymarker\")\n%%% See <$myurl>\n";
+print OUT "%%% Modifications Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray,\n";
+print OUT "%%% and distributed under the terms of the LPPL; see README for discussion.\n";
+print OUT "%%%\n";
print OUT "%%% Added webpage entry type, and url and lastchecked fields.\n";
print OUT "%%% Added eprint support.\n" if ($addeprints);
print OUT "%%% Added DOI support.\n" if ($adddoiresolver);
@@ -211,6 +220,11 @@
$found{formatdate} = 0;
$found{formattitle} = 0;
$found{newblock} = 0;
+# The following are initialised negative, which Perl treats as true,
+# so the simple test 'if ($found{formateprint}) ...' will be true.
+$found{formateprint} = -1;
+$found{formatdoi} = -1;
+$found{formatpubmed} = -1;
while (<IN>) {
/^ *%/ && do {
@@ -331,6 +345,24 @@
$found{newblock} = 1;
};
+ /^ *FUNCTION *\{format.doi\}/ && do {
+ #print STDERR "$progname: style file $infile already supports DOIs; urlbst format.doi disabled\n(see generated .bst style: you may need to make edits near \$adddoiresolver)\n";
+ $found{formatdoi} = 1;
+ $adddoiresolver = 0;
+ };
+
+ /^ *FUNCTION *\{format.eprint\}/ && do {
+ #print STDERR "$progname: style file $infile already supports eprints; urlbst format.eprint disabled\n(see generated .bst style: you may need to make edits near \$addeprints)\n";
+ $found{formateprint} = 1;
+ $addeprints = 0;
+ };
+
+ /^ *FUNCTION *\{format.pubmed\}/ && do {
+ #print STDERR "$progname: style file $infile already supports Pubmed; urlbst format.pubmed disabled\n(see generated .bst style: you may need to make edits near \$addpubmedresolver)\n";
+ $found{formatpubmed} = 1;
+ $addpubmedresolver = 0;
+ };
+
/^ *FUNCTION *{output\.nonnull}/ && do {
print OUT "$mymarker\n";
print OUT "FUNCTION {output.nonnull.original}\n";
@@ -585,7 +617,9 @@
}
if$
}
+EOD
+ $formateprintfunction = <<'EOD';
FUNCTION {format.eprint}
{ eprint empty$
{ "" }
@@ -592,7 +626,13 @@
{ eprintprefix eprint * eprinturl eprint * make.href }
if$
}
+EOD
+ output_replacement_function($found{formateprint},
+ 'format.eprint',
+ 'addeprints',
+ $formateprintfunction);
+ $formatdoifunction = <<'EOD';
FUNCTION {format.doi}
{ doi empty$
{ "" }
@@ -599,7 +639,13 @@
{ doiprefix doi * doiurl doi * make.href }
if$
}
+EOD
+ output_replacement_function($found{formatdoi},
+ 'format.doi',
+ 'adddoiresolver',
+ $formatdoifunction);
+ $formatpubmedfunction = <<'EOD';
FUNCTION {format.pubmed}
{ pubmed empty$
{ "" }
@@ -606,7 +652,13 @@
{ pubmedprefix pubmed * pubmedurl pubmed * make.href }
if$
}
+EOD
+ output_replacement_function($found{formatpubmed},
+ 'format.pubmed',
+ 'addpubmedresolver',
+ $formatpubmedfunction);
+ print OUT <<'EOD';
% Output a URL. We can't use the more normal idiom (something like
% `format.url output'), because the `inbrackets' within
% format.lastchecked applies to everything between calls to `output',
@@ -627,8 +679,17 @@
new.block
inlinelinks
'skip$ % links were inline -- don't repeat them
- {
- output.url
+ { % If the generated DOI will be the same as the URL,
+ % then don't print the URL (thanks to Joseph Wright for this code,
+ % at http://tex.stackexchange.com/questions/5660)
+ adddoiresolver
+ doiurl doi empty$ { "X" } { doi } if$ * % DOI URL to be generated
+ url empty$ { "Y" } { url } if$ % the URL, or "Y" if empty
+ = % are the strings equal?
+ and
+ 'skip$
+ { output.url }
+ if$
addeprints eprint empty$ not and
{ format.eprint output.nonnull }
'skip$
@@ -718,6 +779,30 @@
}
+sub output_replacement_function {
+ my $emit_function = $_[0];
+ my $function_name = $_[1];
+ my $disabling_variable = $_[2];
+ my $function_definition_string = $_[3];
+
+ if ($emit_function > 0) {
+ print OUT <<"EOD";
+%%% The style file $infile already supports $function_name,
+%%% but it might not do so in the same way as urlbst expects.
+%%% I've therefore left $infile 's function unchanged,
+%%% and disabled urlbst's version; proceed with some caution.
+EOD
+
+ print STDERR "$progname: WARNING: style file $infile already includes a $function_name function;\nyou may need to disable the urlbst version by setting \$$disabling_variable to zero.\nYou might want to edit the output file (search for $function_name).\n";
+
+ ($t = $function_definition_string) =~ s/\n/\n%%% /g;
+ print OUT "%%% " . $t . "$mymarker\n";
+ } else {
+ print OUT $function_definition_string;
+ }
+ print OUT "\n";
+}
+
sub print_missing_functions {
# We've got to the bit of the file which handles the entry
# types, so write out the webpage entry handler. This uses
Modified: trunk/Master/texmf-dist/bibtex/bst/urlbst/abbrvurl.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/urlbst/abbrvurl.bst 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/bibtex/bst/urlbst/abbrvurl.bst 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,6 +1,9 @@
-%%% Modification of BibTeX style file /usr/local/texlive/2009/texmf-dist/bibtex/bst/base/abbrv.bst
-%%% ... by urlbst, version 0.7 (marked with "% urlbst")
+%%% Modification of BibTeX style file /usr/local/texlive/2019/texmf-dist/bibtex/bst/base/abbrv.bst
+%%% ... by urlbst, version 0.8 (marked with "% urlbst")
%%% See <http://purl.org/nxg/dist/urlbst>
+%%% Modifications Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray,
+%%% and distributed under the terms of the LPPL; see README for discussion.
+%%%
%%% Added webpage entry type, and url and lastchecked fields.
%%% Added eprint support.
%%% Added DOI support.
@@ -9,14 +12,14 @@
%%% Original headers follow...
% BibTeX standard bibliography style `abbrv'
- % version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
- % Copyright (C) 1985, all rights reserved.
- % Copying of this file is authorized only if either
- % (1) you make absolutely no changes to your copy, including name, or
- % (2) if you do make changes, you name it something other than
- % btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
- % This restriction helps ensure that all standard styles are identical.
- % The file btxbst.doc has the documentation for this style.
+ % Version 0.99b (8-Dec-10 release) for BibTeX versions 0.99a or later.
+ % Copyright (C) 1984, 1985, 1988, 2010 Howard Trickey and Oren Patashnik.
+ % Unlimited copying and redistribution of this file are permitted as long as
+ % it is unmodified. Modifications (and redistribution of modified versions)
+ % are also permitted, but only if the resulting file is renamed to something
+ % besides btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
+ % This restriction helps ensure that all standard styles are identical.
+ % The file btxbst.doc has the documentation for this style.
ENTRY
{ address
@@ -78,7 +81,7 @@
"[link]" 'linktextstring := % dummy link text; typically "[link]"
"http://arxiv.org/abs/" 'eprinturl := % prefix to make URL from eprint ref
"arXiv:" 'eprintprefix := % text prefix printed before eprint ref; typically "arXiv:"
- "http://dx.doi.org/" 'doiurl := % prefix to make URL from DOI
+ "https://doi.org/" 'doiurl := % prefix to make URL from DOI
"doi:" 'doiprefix := % text prefix printed before DOI ref; typically "doi:"
"http://www.ncbi.nlm.nih.gov/pubmed/" 'pubmedurl := % prefix to make URL from PUBMED
"PMID:" 'pubmedprefix := % text prefix printed before PUBMED ref; typically "PMID:"
@@ -747,7 +750,6 @@
}
if$
}
-
FUNCTION {format.eprint}
{ eprint empty$
{ "" }
@@ -789,8 +791,17 @@
new.block
inlinelinks
'skip$ % links were inline -- don't repeat them
- {
- output.url
+ { % If the generated DOI will be the same as the URL,
+ % then don't print the URL (thanks to Joseph Wright for this code,
+ % at http://tex.stackexchange.com/questions/5660)
+ adddoiresolver
+ doiurl doi empty$ { "X" } { doi } if$ * % DOI URL to be generated
+ url empty$ { "Y" } { url } if$ % the URL, or "Y" if empty
+ = % are the strings equal?
+ and
+ 'skip$
+ { output.url }
+ if$
addeprints eprint empty$ not and
{ format.eprint output.nonnull }
'skip$
Modified: trunk/Master/texmf-dist/bibtex/bst/urlbst/alphaurl.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/urlbst/alphaurl.bst 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/bibtex/bst/urlbst/alphaurl.bst 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,6 +1,9 @@
-%%% Modification of BibTeX style file /usr/local/texlive/2009/texmf-dist/bibtex/bst/base/alpha.bst
-%%% ... by urlbst, version 0.7 (marked with "% urlbst")
+%%% Modification of BibTeX style file /usr/local/texlive/2019/texmf-dist/bibtex/bst/base/alpha.bst
+%%% ... by urlbst, version 0.8 (marked with "% urlbst")
%%% See <http://purl.org/nxg/dist/urlbst>
+%%% Modifications Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray,
+%%% and distributed under the terms of the LPPL; see README for discussion.
+%%%
%%% Added webpage entry type, and url and lastchecked fields.
%%% Added eprint support.
%%% Added DOI support.
@@ -9,14 +12,14 @@
%%% Original headers follow...
% BibTeX standard bibliography style `alpha'
- % version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
- % Copyright (C) 1985, all rights reserved.
- % Copying of this file is authorized only if either
- % (1) you make absolutely no changes to your copy, including name, or
- % (2) if you do make changes, you name it something other than
- % btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
- % This restriction helps ensure that all standard styles are identical.
- % The file btxbst.doc has the documentation for this style.
+ % Version 0.99b (8-Dec-10 release) for BibTeX versions 0.99a or later.
+ % Copyright (C) 1984, 1985, 1988, 2010 Howard Trickey and Oren Patashnik.
+ % Unlimited copying and redistribution of this file are permitted as long as
+ % it is unmodified. Modifications (and redistribution of modified versions)
+ % are also permitted, but only if the resulting file is renamed to something
+ % besides btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
+ % This restriction helps ensure that all standard styles are identical.
+ % The file btxbst.doc has the documentation for this style.
ENTRY
{ address
@@ -78,7 +81,7 @@
"[link]" 'linktextstring := % dummy link text; typically "[link]"
"http://arxiv.org/abs/" 'eprinturl := % prefix to make URL from eprint ref
"arXiv:" 'eprintprefix := % text prefix printed before eprint ref; typically "arXiv:"
- "http://dx.doi.org/" 'doiurl := % prefix to make URL from DOI
+ "https://doi.org/" 'doiurl := % prefix to make URL from DOI
"doi:" 'doiprefix := % text prefix printed before DOI ref; typically "doi:"
"http://www.ncbi.nlm.nih.gov/pubmed/" 'pubmedurl := % prefix to make URL from PUBMED
"PMID:" 'pubmedprefix := % text prefix printed before PUBMED ref; typically "PMID:"
@@ -117,15 +120,15 @@
output.state mid.sentence =
{ ", " * write$ }
{ output.state after.block =
- { add.period$ write$
- newline$
- "\newblock " write$
- }
- { output.state before.all =
- 'write$
- { add.period$ " " * write$ }
- if$
- }
+ { add.period$ write$
+ newline$
+ "\newblock " write$
+ }
+ { output.state before.all =
+ 'write$
+ { add.period$ " " * write$ }
+ if$
+ }
if$
mid.sentence 'output.state :=
}
@@ -278,8 +281,8 @@
{ output.state after.block =
'skip$
{ output.state before.all =
- 'skip$
- { after.sentence 'output.state := }
+ 'skip$
+ { after.sentence 'output.state := }
if$
}
if$
@@ -359,20 +362,20 @@
{ namesleft #0 > }
{ s nameptr "{ff~}{vv~}{ll}{, jj}" format.name$ 't :=
nameptr #1 >
- { namesleft #1 >
- { ", " * t * }
- { numnames #2 >
- { "," * }
- 'skip$
- if$
- t "others" =
- { " et~al." * }
- { " and " * t * }
- if$
- }
- if$
- }
- 't
+ { namesleft #1 >
+ { ", " * t * }
+ { numnames #2 >
+ { "," * }
+ 'skip$
+ if$
+ t "others" =
+ { " et~al." * }
+ { " and " * t * }
+ if$
+ }
+ if$
+ }
+ 't
if$
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
@@ -392,8 +395,8 @@
{ "" }
{ editor format.names
editor num.names$ #1 >
- { ", editors" * }
- { ", editor" * }
+ { ", editors" * }
+ { ", editor" * }
if$
}
if$
@@ -411,21 +414,21 @@
""
{ t empty$ not }
{ t #1 #1 substring$ "-" =
- { t #1 #2 substring$ "--" = not
- { "--" *
- t #2 global.max$ substring$ 't :=
- }
- { { t #1 #1 substring$ "-" = }
- { "-" *
- t #2 global.max$ substring$ 't :=
- }
- while$
- }
- if$
- }
- { t #1 #1 substring$ *
- t #2 global.max$ substring$ 't :=
- }
+ { t #1 #2 substring$ "--" = not
+ { "--" *
+ t #2 global.max$ substring$ 't :=
+ }
+ { { t #1 #1 substring$ "-" = }
+ { "-" *
+ t #2 global.max$ substring$ 't :=
+ }
+ while$
+ }
+ if$
+ }
+ { t #1 #1 substring$ *
+ t #2 global.max$ substring$ 't :=
+ }
if$
}
while$
@@ -434,15 +437,15 @@
FUNCTION {format.date}
{ year empty$
{ month empty$
- { "" }
- { "there's a month but no year in " cite$ * warning$
- month
- }
+ { "" }
+ { "there's a month but no year in " cite$ * warning$
+ month
+ }
if$
}
{ month empty$
- 'year
- { month " " * year * }
+ 'year
+ { month " " * year * }
if$
}
if$
@@ -472,8 +475,8 @@
{ "" }
{ "volume" volume tie.or.space.connect
series empty$
- 'skip$
- { " of " * series emphasize * }
+ 'skip$
+ { " of " * series emphasize * }
if$
"volume and number" number either.or.check
}
@@ -483,17 +486,17 @@
FUNCTION {format.number.series}
{ volume empty$
{ number empty$
- { series field.or.null }
- { output.state mid.sentence =
- { "number" }
- { "Number" }
- if$
- number tie.or.space.connect
- series empty$
- { "there's a number but no series in " cite$ * warning$ }
- { " in " * series * }
- if$
- }
+ { series field.or.null }
+ { output.state mid.sentence =
+ { "number" }
+ { "Number" }
+ if$
+ number tie.or.space.connect
+ series empty$
+ { "there's a number but no series in " cite$ * warning$ }
+ { " in " * series * }
+ if$
+ }
if$
}
{ "" }
@@ -504,8 +507,8 @@
{ edition empty$
{ "" }
{ output.state mid.sentence =
- { edition "l" change.case$ " edition" * }
- { edition "t" change.case$ " edition" * }
+ { edition "l" change.case$ " edition" * }
+ { edition "t" change.case$ " edition" * }
if$
}
if$
@@ -525,8 +528,8 @@
swap$ duplicate$ "," =
swap$ "+" =
or or
- { #1 'multiresult := }
- { t #2 global.max$ substring$ 't := }
+ { #1 'multiresult := }
+ { t #2 global.max$ substring$ 't := }
if$
}
while$
@@ -537,8 +540,8 @@
{ pages empty$
{ "" }
{ pages multi.page.check
- { "pages" pages n.dashify tie.or.space.connect }
- { "page" pages tie.or.space.connect }
+ { "pages" pages n.dashify tie.or.space.connect }
+ { "page" pages tie.or.space.connect }
if$
}
if$
@@ -550,8 +553,8 @@
'skip$
{ "(" number * ")" * *
volume empty$
- { "there's a number but no volume in " cite$ * warning$ }
- 'skip$
+ { "there's a number but no volume in " cite$ * warning$ }
+ 'skip$
if$
}
if$
@@ -558,8 +561,8 @@
pages empty$
'skip$
{ duplicate$ empty$
- { pop$ format.pages }
- { ":" * pages n.dashify * }
+ { pop$ format.pages }
+ { ":" * pages n.dashify * }
if$
}
if$
@@ -569,13 +572,13 @@
{ chapter empty$
'format.pages
{ type empty$
- { "chapter" }
- { type "l" change.case$ }
+ { "chapter" }
+ { type "l" change.case$ }
if$
chapter tie.or.space.connect
pages empty$
- 'skip$
- { ", " * format.pages * }
+ 'skip$
+ { ", " * format.pages * }
if$
}
if$
@@ -585,8 +588,8 @@
{ booktitle empty$
{ "" }
{ editor empty$
- { "In " booktitle emphasize * }
- { "In " format.editors * ", " * booktitle emphasize * }
+ { "In " booktitle emphasize * }
+ { "In " format.editors * ", " * booktitle emphasize * }
if$
}
if$
@@ -625,11 +628,11 @@
FUNCTION {format.article.crossref}
{ key empty$
{ journal empty$
- { "need key or journal for " cite$ * " to crossref " * crossref *
- warning$
- ""
- }
- { "In {\em " journal * "\/}" * }
+ { "need key or journal for " cite$ * " to crossref " * crossref *
+ warning$
+ ""
+ }
+ { "In {\em " journal * "\/}" * }
if$
}
{ "In " key * }
@@ -643,12 +646,12 @@
#2 >
{ pop$ " et~al." * }
{ #2 <
- 'skip$
- { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
- { " et~al." * }
- { " and " * editor #2 "{vv~}{ll}" format.name$ * }
- if$
- }
+ 'skip$
+ { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ { " et~al." * }
+ { " and " * editor #2 "{vv~}{ll}" format.name$ * }
+ if$
+ }
if$
}
if$
@@ -667,15 +670,15 @@
editor field.or.null author field.or.null =
or
{ key empty$
- { series empty$
- { "need editor, key, or series for " cite$ * " to crossref " *
- crossref * warning$
- "" *
- }
- { "{\em " * series * "\/}" * }
- if$
- }
- { key * }
+ { series empty$
+ { "need editor, key, or series for " cite$ * " to crossref " *
+ crossref * warning$
+ "" *
+ }
+ { "{\em " * series * "\/}" * }
+ if$
+ }
+ { key * }
if$
}
{ format.crossref.editor * }
@@ -688,15 +691,15 @@
editor field.or.null author field.or.null =
or
{ key empty$
- { booktitle empty$
- { "need editor, key, or booktitle for " cite$ * " to crossref " *
- crossref * warning$
- ""
- }
- { "In {\em " booktitle * "\/}" * }
- if$
- }
- { "In " key * }
+ { booktitle empty$
+ { "need editor, key, or booktitle for " cite$ * " to crossref " *
+ crossref * warning$
+ ""
+ }
+ { "In {\em " booktitle * "\/}" * }
+ if$
+ }
+ { "In " key * }
if$
}
{ "In " format.crossref.editor * }
@@ -749,7 +752,6 @@
}
if$
}
-
FUNCTION {format.eprint}
{ eprint empty$
{ "" }
@@ -791,8 +793,17 @@
new.block
inlinelinks
'skip$ % links were inline -- don't repeat them
- {
- output.url
+ { % If the generated DOI will be the same as the URL,
+ % then don't print the URL (thanks to Joseph Wright for this code,
+ % at http://tex.stackexchange.com/questions/5660)
+ adddoiresolver
+ doiurl doi empty$ { "X" } { doi } if$ * % DOI URL to be generated
+ url empty$ { "Y" } { url } if$ % the URL, or "Y" if empty
+ = % are the strings equal?
+ and
+ 'skip$
+ { output.url }
+ if$
addeprints eprint empty$ not and
{ format.eprint output.nonnull }
'skip$
@@ -906,8 +917,8 @@
{ format.editors "author and editor" output.check }
{ format.authors output.nonnull
crossref missing$
- { "author and editor" editor either.or.check }
- 'skip$
+ { "author and editor" editor either.or.check }
+ 'skip$
if$
}
if$
@@ -954,8 +965,8 @@
{ format.editors "author and editor" output.check }
{ format.authors output.nonnull
crossref missing$
- { "author and editor" editor either.or.check }
- 'skip$
+ { "author and editor" editor either.or.check }
+ 'skip$
if$
}
if$
@@ -1023,17 +1034,17 @@
format.number.series output
format.pages output
address empty$
- { organization publisher new.sentence.checkb
- organization output
- publisher output
- format.date "year" output.check
- }
- { address output.nonnull
- format.date "year" output.check
- new.sentence
- organization output
- publisher output
- }
+ { organization publisher new.sentence.checkb
+ organization output
+ publisher output
+ format.date "year" output.check
+ }
+ { address output.nonnull
+ format.date "year" output.check
+ new.sentence
+ organization output
+ publisher output
+ }
if$
}
{ format.incoll.inproc.crossref output.nonnull
@@ -1051,10 +1062,10 @@
{ output.bibitem
author empty$
{ organization empty$
- 'skip$
- { organization output.nonnull
- address output
- }
+ 'skip$
+ { organization output.nonnull
+ address output
+ }
if$
}
{ format.authors output.nonnull }
@@ -1064,10 +1075,10 @@
format.btitle "title" output.check
author empty$
{ organization empty$
- { address new.block.checka
- address output
- }
- 'skip$
+ { address new.block.checka
+ address output
+ }
+ 'skip$
if$
}
{ organization address new.block.checkb
@@ -1142,10 +1153,10 @@
format.number.series output
address empty$
{ editor empty$
- { publisher new.sentence.checka }
- { organization publisher new.sentence.checkb
- organization output
- }
+ { publisher new.sentence.checka }
+ { organization publisher new.sentence.checkb
+ organization output
+ }
if$
publisher output
format.date "year" output.check
@@ -1154,8 +1165,8 @@
format.date "year" output.check
new.sentence
editor empty$
- 'skip$
- { organization output }
+ 'skip$
+ { organization output }
if$
publisher output
}
@@ -1291,37 +1302,37 @@
s num.names$ 'numnames :=
numnames #1 >
{ numnames #4 >
- { #3 'namesleft := }
- { numnames 'namesleft := }
+ { #3 'namesleft := }
+ { numnames 'namesleft := }
if$
#1 'nameptr :=
""
- { namesleft #0 > }
- { nameptr numnames =
- { s nameptr "{ff }{vv }{ll}{ jj}" format.name$ "others" =
- { "{\etalchar{+}}" *
- #1 'et.al.char.used :=
- }
- { s nameptr "{v{}}{l{}}" format.name$ * }
- if$
- }
- { s nameptr "{v{}}{l{}}" format.name$ * }
- if$
- nameptr #1 + 'nameptr :=
- namesleft #1 - 'namesleft :=
- }
+ { namesleft #0 > }
+ { nameptr numnames =
+ { s nameptr "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ { "{\etalchar{+}}" *
+ #1 'et.al.char.used :=
+ }
+ { s nameptr "{v{}}{l{}}" format.name$ * }
+ if$
+ }
+ { s nameptr "{v{}}{l{}}" format.name$ * }
+ if$
+ nameptr #1 + 'nameptr :=
+ namesleft #1 - 'namesleft :=
+ }
while$
numnames #4 >
- { "{\etalchar{+}}" *
- #1 'et.al.char.used :=
- }
- 'skip$
+ { "{\etalchar{+}}" *
+ #1 'et.al.char.used :=
+ }
+ 'skip$
if$
}
{ s #1 "{v{}}{l{}}" format.name$
duplicate$ text.length$ #2 <
- { pop$ s #1 "{ll}" format.name$ #3 text.prefix$ }
- 'skip$
+ { pop$ s #1 "{ll}" format.name$ #3 text.prefix$ }
+ 'skip$
if$
}
if$
@@ -1330,8 +1341,8 @@
FUNCTION {author.key.label}
{ author empty$
{ key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
if$
}
{ author format.lab.names }
@@ -1341,12 +1352,12 @@
FUNCTION {author.editor.key.label}
{ author empty$
{ editor empty$
- { key empty$
- { cite$ #1 #3 substring$ }
- { key #3 text.prefix$ }
- if$
- }
- { editor format.lab.names }
+ { key empty$
+ { cite$ #1 #3 substring$ }
+ { key #3 text.prefix$ }
+ if$
+ }
+ { editor format.lab.names }
if$
}
{ author format.lab.names }
@@ -1356,12 +1367,12 @@
FUNCTION {author.key.organization.label}
{ author empty$
{ key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
- if$
- }
- { key #3 text.prefix$ }
+ { organization empty$
+ { cite$ #1 #3 substring$ }
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ if$
+ }
+ { key #3 text.prefix$ }
if$
}
{ author format.lab.names }
@@ -1371,12 +1382,12 @@
FUNCTION {editor.key.organization.label}
{ editor empty$
{ key empty$
- { organization empty$
- { cite$ #1 #3 substring$ }
- { "The " #4 organization chop.word #3 text.prefix$ }
- if$
- }
- { key #3 text.prefix$ }
+ { organization empty$
+ { cite$ #1 #3 substring$ }
+ { "The " #4 organization chop.word #3 text.prefix$ }
+ if$
+ }
+ { key #3 text.prefix$ }
if$
}
{ editor format.lab.names }
@@ -1389,12 +1400,12 @@
or
'author.editor.key.label
{ type$ "proceedings" =
- 'editor.key.organization.label
- { type$ "manual" =
- 'author.key.organization.label
- 'author.key.label
- if$
- }
+ 'editor.key.organization.label
+ { type$ "manual" =
+ 'author.key.organization.label
+ 'author.key.label
+ if$
+ }
if$
}
if$
@@ -1415,13 +1426,13 @@
numnames 'namesleft :=
{ namesleft #0 > }
{ nameptr #1 >
- { " " * }
- 'skip$
+ { " " * }
+ 'skip$
if$
s nameptr "{vv{ } }{ll{ }}{ ff{ }}{ jj{ }}" format.name$ 't :=
nameptr numnames = t "others" = and
- { "et al" * }
- { t sortify * }
+ { "et al" * }
+ { t sortify * }
if$
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
@@ -1443,10 +1454,10 @@
FUNCTION {author.sort}
{ author empty$
{ key empty$
- { "to sort, need author or key in " cite$ * warning$
- ""
- }
- { key sortify }
+ { "to sort, need author or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
if$
}
{ author sort.format.names }
@@ -1456,14 +1467,14 @@
FUNCTION {author.editor.sort}
{ author empty$
{ editor empty$
- { key empty$
- { "to sort, need author, editor, or key in " cite$ * warning$
- ""
- }
- { key sortify }
- if$
- }
- { editor sort.format.names }
+ { key empty$
+ { "to sort, need author, editor, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { editor sort.format.names }
if$
}
{ author sort.format.names }
@@ -1473,14 +1484,14 @@
FUNCTION {author.organization.sort}
{ author empty$
{ organization empty$
- { key empty$
- { "to sort, need author, organization, or key in " cite$ * warning$
- ""
- }
- { key sortify }
- if$
- }
- { "The " #4 organization chop.word sortify }
+ { key empty$
+ { "to sort, need author, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
if$
}
{ author sort.format.names }
@@ -1490,14 +1501,14 @@
FUNCTION {editor.organization.sort}
{ editor empty$
{ organization empty$
- { key empty$
- { "to sort, need editor, organization, or key in " cite$ * warning$
- ""
- }
- { key sortify }
- if$
- }
- { "The " #4 organization chop.word sortify }
+ { key empty$
+ { "to sort, need editor, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
if$
}
{ editor sort.format.names }
@@ -1514,12 +1525,12 @@
or
'author.editor.sort
{ type$ "proceedings" =
- 'editor.organization.sort
- { type$ "manual" =
- 'author.organization.sort
- 'author.sort
- if$
- }
+ 'editor.organization.sort
+ { type$ "manual" =
+ 'author.organization.sort
+ 'author.sort
+ if$
+ }
if$
}
if$
Modified: trunk/Master/texmf-dist/bibtex/bst/urlbst/plainurl.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/urlbst/plainurl.bst 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/bibtex/bst/urlbst/plainurl.bst 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,6 +1,9 @@
-%%% Modification of BibTeX style file /usr/local/texlive/2009/texmf-dist/bibtex/bst/base/plain.bst
-%%% ... by urlbst, version 0.7 (marked with "% urlbst")
+%%% Modification of BibTeX style file /usr/local/texlive/2019/texmf-dist/bibtex/bst/base/plain.bst
+%%% ... by urlbst, version 0.8 (marked with "% urlbst")
%%% See <http://purl.org/nxg/dist/urlbst>
+%%% Modifications Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray,
+%%% and distributed under the terms of the LPPL; see README for discussion.
+%%%
%%% Added webpage entry type, and url and lastchecked fields.
%%% Added eprint support.
%%% Added DOI support.
@@ -9,14 +12,14 @@
%%% Original headers follow...
% BibTeX standard bibliography style `plain'
- % version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
- % Copyright (C) 1985, all rights reserved.
- % Copying of this file is authorized only if either
- % (1) you make absolutely no changes to your copy, including name, or
- % (2) if you do make changes, you name it something other than
- % btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
- % This restriction helps ensure that all standard styles are identical.
- % The file btxbst.doc has the documentation for this style.
+ % Version 0.99b (8-Dec-10 release) for BibTeX versions 0.99a or later.
+ % Copyright (C) 1984, 1985, 1988, 2010 Howard Trickey and Oren Patashnik.
+ % Unlimited copying and redistribution of this file are permitted as long as
+ % it is unmodified. Modifications (and redistribution of modified versions)
+ % are also permitted, but only if the resulting file is renamed to something
+ % besides btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
+ % This restriction helps ensure that all standard styles are identical.
+ % The file btxbst.doc has the documentation for this style.
ENTRY
{ address
@@ -78,7 +81,7 @@
"[link]" 'linktextstring := % dummy link text; typically "[link]"
"http://arxiv.org/abs/" 'eprinturl := % prefix to make URL from eprint ref
"arXiv:" 'eprintprefix := % text prefix printed before eprint ref; typically "arXiv:"
- "http://dx.doi.org/" 'doiurl := % prefix to make URL from DOI
+ "https://doi.org/" 'doiurl := % prefix to make URL from DOI
"doi:" 'doiprefix := % text prefix printed before DOI ref; typically "doi:"
"http://www.ncbi.nlm.nih.gov/pubmed/" 'pubmedurl := % prefix to make URL from PUBMED
"PMID:" 'pubmedprefix := % text prefix printed before PUBMED ref; typically "PMID:"
@@ -117,15 +120,15 @@
output.state mid.sentence =
{ ", " * write$ }
{ output.state after.block =
- { add.period$ write$
- newline$
- "\newblock " write$
- }
- { output.state before.all =
- 'write$
- { add.period$ " " * write$ }
- if$
- }
+ { add.period$ write$
+ newline$
+ "\newblock " write$
+ }
+ { output.state before.all =
+ 'write$
+ { add.period$ " " * write$ }
+ if$
+ }
if$
mid.sentence 'output.state :=
}
@@ -276,8 +279,8 @@
{ output.state after.block =
'skip$
{ output.state before.all =
- 'skip$
- { after.sentence 'output.state := }
+ 'skip$
+ { after.sentence 'output.state := }
if$
}
if$
@@ -357,20 +360,20 @@
{ namesleft #0 > }
{ s nameptr "{ff~}{vv~}{ll}{, jj}" format.name$ 't :=
nameptr #1 >
- { namesleft #1 >
- { ", " * t * }
- { numnames #2 >
- { "," * }
- 'skip$
- if$
- t "others" =
- { " et~al." * }
- { " and " * t * }
- if$
- }
- if$
- }
- 't
+ { namesleft #1 >
+ { ", " * t * }
+ { numnames #2 >
+ { "," * }
+ 'skip$
+ if$
+ t "others" =
+ { " et~al." * }
+ { " and " * t * }
+ if$
+ }
+ if$
+ }
+ 't
if$
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
@@ -390,8 +393,8 @@
{ "" }
{ editor format.names
editor num.names$ #1 >
- { ", editors" * }
- { ", editor" * }
+ { ", editors" * }
+ { ", editor" * }
if$
}
if$
@@ -409,21 +412,21 @@
""
{ t empty$ not }
{ t #1 #1 substring$ "-" =
- { t #1 #2 substring$ "--" = not
- { "--" *
- t #2 global.max$ substring$ 't :=
- }
- { { t #1 #1 substring$ "-" = }
- { "-" *
- t #2 global.max$ substring$ 't :=
- }
- while$
- }
- if$
- }
- { t #1 #1 substring$ *
- t #2 global.max$ substring$ 't :=
- }
+ { t #1 #2 substring$ "--" = not
+ { "--" *
+ t #2 global.max$ substring$ 't :=
+ }
+ { { t #1 #1 substring$ "-" = }
+ { "-" *
+ t #2 global.max$ substring$ 't :=
+ }
+ while$
+ }
+ if$
+ }
+ { t #1 #1 substring$ *
+ t #2 global.max$ substring$ 't :=
+ }
if$
}
while$
@@ -432,15 +435,15 @@
FUNCTION {format.date}
{ year empty$
{ month empty$
- { "" }
- { "there's a month but no year in " cite$ * warning$
- month
- }
+ { "" }
+ { "there's a month but no year in " cite$ * warning$
+ month
+ }
if$
}
{ month empty$
- 'year
- { month " " * year * }
+ 'year
+ { month " " * year * }
if$
}
if$
@@ -470,8 +473,8 @@
{ "" }
{ "volume" volume tie.or.space.connect
series empty$
- 'skip$
- { " of " * series emphasize * }
+ 'skip$
+ { " of " * series emphasize * }
if$
"volume and number" number either.or.check
}
@@ -481,17 +484,17 @@
FUNCTION {format.number.series}
{ volume empty$
{ number empty$
- { series field.or.null }
- { output.state mid.sentence =
- { "number" }
- { "Number" }
- if$
- number tie.or.space.connect
- series empty$
- { "there's a number but no series in " cite$ * warning$ }
- { " in " * series * }
- if$
- }
+ { series field.or.null }
+ { output.state mid.sentence =
+ { "number" }
+ { "Number" }
+ if$
+ number tie.or.space.connect
+ series empty$
+ { "there's a number but no series in " cite$ * warning$ }
+ { " in " * series * }
+ if$
+ }
if$
}
{ "" }
@@ -502,8 +505,8 @@
{ edition empty$
{ "" }
{ output.state mid.sentence =
- { edition "l" change.case$ " edition" * }
- { edition "t" change.case$ " edition" * }
+ { edition "l" change.case$ " edition" * }
+ { edition "t" change.case$ " edition" * }
if$
}
if$
@@ -523,8 +526,8 @@
swap$ duplicate$ "," =
swap$ "+" =
or or
- { #1 'multiresult := }
- { t #2 global.max$ substring$ 't := }
+ { #1 'multiresult := }
+ { t #2 global.max$ substring$ 't := }
if$
}
while$
@@ -535,8 +538,8 @@
{ pages empty$
{ "" }
{ pages multi.page.check
- { "pages" pages n.dashify tie.or.space.connect }
- { "page" pages tie.or.space.connect }
+ { "pages" pages n.dashify tie.or.space.connect }
+ { "page" pages tie.or.space.connect }
if$
}
if$
@@ -548,8 +551,8 @@
'skip$
{ "(" number * ")" * *
volume empty$
- { "there's a number but no volume in " cite$ * warning$ }
- 'skip$
+ { "there's a number but no volume in " cite$ * warning$ }
+ 'skip$
if$
}
if$
@@ -556,8 +559,8 @@
pages empty$
'skip$
{ duplicate$ empty$
- { pop$ format.pages }
- { ":" * pages n.dashify * }
+ { pop$ format.pages }
+ { ":" * pages n.dashify * }
if$
}
if$
@@ -567,13 +570,13 @@
{ chapter empty$
'format.pages
{ type empty$
- { "chapter" }
- { type "l" change.case$ }
+ { "chapter" }
+ { type "l" change.case$ }
if$
chapter tie.or.space.connect
pages empty$
- 'skip$
- { ", " * format.pages * }
+ 'skip$
+ { ", " * format.pages * }
if$
}
if$
@@ -583,8 +586,8 @@
{ booktitle empty$
{ "" }
{ editor empty$
- { "In " booktitle emphasize * }
- { "In " format.editors * ", " * booktitle emphasize * }
+ { "In " booktitle emphasize * }
+ { "In " format.editors * ", " * booktitle emphasize * }
if$
}
if$
@@ -623,11 +626,11 @@
FUNCTION {format.article.crossref}
{ key empty$
{ journal empty$
- { "need key or journal for " cite$ * " to crossref " * crossref *
- warning$
- ""
- }
- { "In {\em " journal * "\/}" * }
+ { "need key or journal for " cite$ * " to crossref " * crossref *
+ warning$
+ ""
+ }
+ { "In {\em " journal * "\/}" * }
if$
}
{ "In " key * }
@@ -641,12 +644,12 @@
#2 >
{ pop$ " et~al." * }
{ #2 <
- 'skip$
- { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
- { " et~al." * }
- { " and " * editor #2 "{vv~}{ll}" format.name$ * }
- if$
- }
+ 'skip$
+ { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ { " et~al." * }
+ { " and " * editor #2 "{vv~}{ll}" format.name$ * }
+ if$
+ }
if$
}
if$
@@ -665,15 +668,15 @@
editor field.or.null author field.or.null =
or
{ key empty$
- { series empty$
- { "need editor, key, or series for " cite$ * " to crossref " *
- crossref * warning$
- "" *
- }
- { "{\em " * series * "\/}" * }
- if$
- }
- { key * }
+ { series empty$
+ { "need editor, key, or series for " cite$ * " to crossref " *
+ crossref * warning$
+ "" *
+ }
+ { "{\em " * series * "\/}" * }
+ if$
+ }
+ { key * }
if$
}
{ format.crossref.editor * }
@@ -686,15 +689,15 @@
editor field.or.null author field.or.null =
or
{ key empty$
- { booktitle empty$
- { "need editor, key, or booktitle for " cite$ * " to crossref " *
- crossref * warning$
- ""
- }
- { "In {\em " booktitle * "\/}" * }
- if$
- }
- { "In " key * }
+ { booktitle empty$
+ { "need editor, key, or booktitle for " cite$ * " to crossref " *
+ crossref * warning$
+ ""
+ }
+ { "In {\em " booktitle * "\/}" * }
+ if$
+ }
+ { "In " key * }
if$
}
{ "In " format.crossref.editor * }
@@ -747,7 +750,6 @@
}
if$
}
-
FUNCTION {format.eprint}
{ eprint empty$
{ "" }
@@ -789,8 +791,17 @@
new.block
inlinelinks
'skip$ % links were inline -- don't repeat them
- {
- output.url
+ { % If the generated DOI will be the same as the URL,
+ % then don't print the URL (thanks to Joseph Wright for this code,
+ % at http://tex.stackexchange.com/questions/5660)
+ adddoiresolver
+ doiurl doi empty$ { "X" } { doi } if$ * % DOI URL to be generated
+ url empty$ { "Y" } { url } if$ % the URL, or "Y" if empty
+ = % are the strings equal?
+ and
+ 'skip$
+ { output.url }
+ if$
addeprints eprint empty$ not and
{ format.eprint output.nonnull }
'skip$
@@ -904,8 +915,8 @@
{ format.editors "author and editor" output.check }
{ format.authors output.nonnull
crossref missing$
- { "author and editor" editor either.or.check }
- 'skip$
+ { "author and editor" editor either.or.check }
+ 'skip$
if$
}
if$
@@ -952,8 +963,8 @@
{ format.editors "author and editor" output.check }
{ format.authors output.nonnull
crossref missing$
- { "author and editor" editor either.or.check }
- 'skip$
+ { "author and editor" editor either.or.check }
+ 'skip$
if$
}
if$
@@ -1021,17 +1032,17 @@
format.number.series output
format.pages output
address empty$
- { organization publisher new.sentence.checkb
- organization output
- publisher output
- format.date "year" output.check
- }
- { address output.nonnull
- format.date "year" output.check
- new.sentence
- organization output
- publisher output
- }
+ { organization publisher new.sentence.checkb
+ organization output
+ publisher output
+ format.date "year" output.check
+ }
+ { address output.nonnull
+ format.date "year" output.check
+ new.sentence
+ organization output
+ publisher output
+ }
if$
}
{ format.incoll.inproc.crossref output.nonnull
@@ -1049,10 +1060,10 @@
{ output.bibitem
author empty$
{ organization empty$
- 'skip$
- { organization output.nonnull
- address output
- }
+ 'skip$
+ { organization output.nonnull
+ address output
+ }
if$
}
{ format.authors output.nonnull }
@@ -1062,10 +1073,10 @@
format.btitle "title" output.check
author empty$
{ organization empty$
- { address new.block.checka
- address output
- }
- 'skip$
+ { address new.block.checka
+ address output
+ }
+ 'skip$
if$
}
{ organization address new.block.checkb
@@ -1140,10 +1151,10 @@
format.number.series output
address empty$
{ editor empty$
- { publisher new.sentence.checka }
- { organization publisher new.sentence.checkb
- organization output
- }
+ { publisher new.sentence.checka }
+ { organization publisher new.sentence.checkb
+ organization output
+ }
if$
publisher output
format.date "year" output.check
@@ -1152,8 +1163,8 @@
format.date "year" output.check
new.sentence
editor empty$
- 'skip$
- { organization output }
+ 'skip$
+ { organization output }
if$
publisher output
}
@@ -1284,13 +1295,13 @@
numnames 'namesleft :=
{ namesleft #0 > }
{ nameptr #1 >
- { " " * }
- 'skip$
+ { " " * }
+ 'skip$
if$
s nameptr "{vv{ } }{ll{ }}{ ff{ }}{ jj{ }}" format.name$ 't :=
nameptr numnames = t "others" = and
- { "et al" * }
- { t sortify * }
+ { "et al" * }
+ { t sortify * }
if$
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
@@ -1312,10 +1323,10 @@
FUNCTION {author.sort}
{ author empty$
{ key empty$
- { "to sort, need author or key in " cite$ * warning$
- ""
- }
- { key sortify }
+ { "to sort, need author or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
if$
}
{ author sort.format.names }
@@ -1325,14 +1336,14 @@
FUNCTION {author.editor.sort}
{ author empty$
{ editor empty$
- { key empty$
- { "to sort, need author, editor, or key in " cite$ * warning$
- ""
- }
- { key sortify }
- if$
- }
- { editor sort.format.names }
+ { key empty$
+ { "to sort, need author, editor, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { editor sort.format.names }
if$
}
{ author sort.format.names }
@@ -1342,14 +1353,14 @@
FUNCTION {author.organization.sort}
{ author empty$
{ organization empty$
- { key empty$
- { "to sort, need author, organization, or key in " cite$ * warning$
- ""
- }
- { key sortify }
- if$
- }
- { "The " #4 organization chop.word sortify }
+ { key empty$
+ { "to sort, need author, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
if$
}
{ author sort.format.names }
@@ -1359,14 +1370,14 @@
FUNCTION {editor.organization.sort}
{ editor empty$
{ organization empty$
- { key empty$
- { "to sort, need editor, organization, or key in " cite$ * warning$
- ""
- }
- { key sortify }
- if$
- }
- { "The " #4 organization chop.word sortify }
+ { key empty$
+ { "to sort, need editor, organization, or key in " cite$ * warning$
+ ""
+ }
+ { key sortify }
+ if$
+ }
+ { "The " #4 organization chop.word sortify }
if$
}
{ editor sort.format.names }
@@ -1379,12 +1390,12 @@
or
'author.editor.sort
{ type$ "proceedings" =
- 'editor.organization.sort
- { type$ "manual" =
- 'author.organization.sort
- 'author.sort
- if$
- }
+ 'editor.organization.sort
+ { type$ "manual" =
+ 'author.organization.sort
+ 'author.sort
+ if$
+ }
if$
}
if$
Modified: trunk/Master/texmf-dist/bibtex/bst/urlbst/unsrturl.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/urlbst/unsrturl.bst 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/bibtex/bst/urlbst/unsrturl.bst 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,6 +1,9 @@
-%%% Modification of BibTeX style file /usr/local/texlive/2009/texmf-dist/bibtex/bst/base/unsrt.bst
-%%% ... by urlbst, version 0.7 (marked with "% urlbst")
+%%% Modification of BibTeX style file /usr/local/texlive/2019/texmf-dist/bibtex/bst/base/unsrt.bst
+%%% ... by urlbst, version 0.8 (marked with "% urlbst")
%%% See <http://purl.org/nxg/dist/urlbst>
+%%% Modifications Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray,
+%%% and distributed under the terms of the LPPL; see README for discussion.
+%%%
%%% Added webpage entry type, and url and lastchecked fields.
%%% Added eprint support.
%%% Added DOI support.
@@ -9,14 +12,14 @@
%%% Original headers follow...
% BibTeX standard bibliography style `unsrt'
- % version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
- % Copyright (C) 1985, all rights reserved.
- % Copying of this file is authorized only if either
- % (1) you make absolutely no changes to your copy, including name, or
- % (2) if you do make changes, you name it something other than
- % btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
- % This restriction helps ensure that all standard styles are identical.
- % The file btxbst.doc has the documentation for this style.
+ % Version 0.99b (8-Dec-10 release) for BibTeX versions 0.99a or later.
+ % Copyright (C) 1984, 1985, 1988, 2010 Howard Trickey and Oren Patashnik.
+ % Unlimited copying and redistribution of this file are permitted as long as
+ % it is unmodified. Modifications (and redistribution of modified versions)
+ % are also permitted, but only if the resulting file is renamed to something
+ % besides btxbst.doc, plain.bst, unsrt.bst, alpha.bst, and abbrv.bst.
+ % This restriction helps ensure that all standard styles are identical.
+ % The file btxbst.doc has the documentation for this style.
ENTRY
{ address
@@ -78,7 +81,7 @@
"[link]" 'linktextstring := % dummy link text; typically "[link]"
"http://arxiv.org/abs/" 'eprinturl := % prefix to make URL from eprint ref
"arXiv:" 'eprintprefix := % text prefix printed before eprint ref; typically "arXiv:"
- "http://dx.doi.org/" 'doiurl := % prefix to make URL from DOI
+ "https://doi.org/" 'doiurl := % prefix to make URL from DOI
"doi:" 'doiprefix := % text prefix printed before DOI ref; typically "doi:"
"http://www.ncbi.nlm.nih.gov/pubmed/" 'pubmedurl := % prefix to make URL from PUBMED
"PMID:" 'pubmedprefix := % text prefix printed before PUBMED ref; typically "PMID:"
@@ -117,15 +120,15 @@
output.state mid.sentence =
{ ", " * write$ }
{ output.state after.block =
- { add.period$ write$
- newline$
- "\newblock " write$
- }
- { output.state before.all =
- 'write$
- { add.period$ " " * write$ }
- if$
- }
+ { add.period$ write$
+ newline$
+ "\newblock " write$
+ }
+ { output.state before.all =
+ 'write$
+ { add.period$ " " * write$ }
+ if$
+ }
if$
mid.sentence 'output.state :=
}
@@ -276,8 +279,8 @@
{ output.state after.block =
'skip$
{ output.state before.all =
- 'skip$
- { after.sentence 'output.state := }
+ 'skip$
+ { after.sentence 'output.state := }
if$
}
if$
@@ -357,20 +360,20 @@
{ namesleft #0 > }
{ s nameptr "{ff~}{vv~}{ll}{, jj}" format.name$ 't :=
nameptr #1 >
- { namesleft #1 >
- { ", " * t * }
- { numnames #2 >
- { "," * }
- 'skip$
- if$
- t "others" =
- { " et~al." * }
- { " and " * t * }
- if$
- }
- if$
- }
- 't
+ { namesleft #1 >
+ { ", " * t * }
+ { numnames #2 >
+ { "," * }
+ 'skip$
+ if$
+ t "others" =
+ { " et~al." * }
+ { " and " * t * }
+ if$
+ }
+ if$
+ }
+ 't
if$
nameptr #1 + 'nameptr :=
namesleft #1 - 'namesleft :=
@@ -390,8 +393,8 @@
{ "" }
{ editor format.names
editor num.names$ #1 >
- { ", editors" * }
- { ", editor" * }
+ { ", editors" * }
+ { ", editor" * }
if$
}
if$
@@ -409,21 +412,21 @@
""
{ t empty$ not }
{ t #1 #1 substring$ "-" =
- { t #1 #2 substring$ "--" = not
- { "--" *
- t #2 global.max$ substring$ 't :=
- }
- { { t #1 #1 substring$ "-" = }
- { "-" *
- t #2 global.max$ substring$ 't :=
- }
- while$
- }
- if$
- }
- { t #1 #1 substring$ *
- t #2 global.max$ substring$ 't :=
- }
+ { t #1 #2 substring$ "--" = not
+ { "--" *
+ t #2 global.max$ substring$ 't :=
+ }
+ { { t #1 #1 substring$ "-" = }
+ { "-" *
+ t #2 global.max$ substring$ 't :=
+ }
+ while$
+ }
+ if$
+ }
+ { t #1 #1 substring$ *
+ t #2 global.max$ substring$ 't :=
+ }
if$
}
while$
@@ -432,15 +435,15 @@
FUNCTION {format.date}
{ year empty$
{ month empty$
- { "" }
- { "there's a month but no year in " cite$ * warning$
- month
- }
+ { "" }
+ { "there's a month but no year in " cite$ * warning$
+ month
+ }
if$
}
{ month empty$
- 'year
- { month " " * year * }
+ 'year
+ { month " " * year * }
if$
}
if$
@@ -470,8 +473,8 @@
{ "" }
{ "volume" volume tie.or.space.connect
series empty$
- 'skip$
- { " of " * series emphasize * }
+ 'skip$
+ { " of " * series emphasize * }
if$
"volume and number" number either.or.check
}
@@ -481,17 +484,17 @@
FUNCTION {format.number.series}
{ volume empty$
{ number empty$
- { series field.or.null }
- { output.state mid.sentence =
- { "number" }
- { "Number" }
- if$
- number tie.or.space.connect
- series empty$
- { "there's a number but no series in " cite$ * warning$ }
- { " in " * series * }
- if$
- }
+ { series field.or.null }
+ { output.state mid.sentence =
+ { "number" }
+ { "Number" }
+ if$
+ number tie.or.space.connect
+ series empty$
+ { "there's a number but no series in " cite$ * warning$ }
+ { " in " * series * }
+ if$
+ }
if$
}
{ "" }
@@ -502,8 +505,8 @@
{ edition empty$
{ "" }
{ output.state mid.sentence =
- { edition "l" change.case$ " edition" * }
- { edition "t" change.case$ " edition" * }
+ { edition "l" change.case$ " edition" * }
+ { edition "t" change.case$ " edition" * }
if$
}
if$
@@ -523,8 +526,8 @@
swap$ duplicate$ "," =
swap$ "+" =
or or
- { #1 'multiresult := }
- { t #2 global.max$ substring$ 't := }
+ { #1 'multiresult := }
+ { t #2 global.max$ substring$ 't := }
if$
}
while$
@@ -535,8 +538,8 @@
{ pages empty$
{ "" }
{ pages multi.page.check
- { "pages" pages n.dashify tie.or.space.connect }
- { "page" pages tie.or.space.connect }
+ { "pages" pages n.dashify tie.or.space.connect }
+ { "page" pages tie.or.space.connect }
if$
}
if$
@@ -548,8 +551,8 @@
'skip$
{ "(" number * ")" * *
volume empty$
- { "there's a number but no volume in " cite$ * warning$ }
- 'skip$
+ { "there's a number but no volume in " cite$ * warning$ }
+ 'skip$
if$
}
if$
@@ -556,8 +559,8 @@
pages empty$
'skip$
{ duplicate$ empty$
- { pop$ format.pages }
- { ":" * pages n.dashify * }
+ { pop$ format.pages }
+ { ":" * pages n.dashify * }
if$
}
if$
@@ -567,13 +570,13 @@
{ chapter empty$
'format.pages
{ type empty$
- { "chapter" }
- { type "l" change.case$ }
+ { "chapter" }
+ { type "l" change.case$ }
if$
chapter tie.or.space.connect
pages empty$
- 'skip$
- { ", " * format.pages * }
+ 'skip$
+ { ", " * format.pages * }
if$
}
if$
@@ -583,8 +586,8 @@
{ booktitle empty$
{ "" }
{ editor empty$
- { "In " booktitle emphasize * }
- { "In " format.editors * ", " * booktitle emphasize * }
+ { "In " booktitle emphasize * }
+ { "In " format.editors * ", " * booktitle emphasize * }
if$
}
if$
@@ -622,11 +625,11 @@
FUNCTION {format.article.crossref}
{ key empty$
{ journal empty$
- { "need key or journal for " cite$ * " to crossref " * crossref *
- warning$
- ""
- }
- { "In {\em " journal * "\/}" * }
+ { "need key or journal for " cite$ * " to crossref " * crossref *
+ warning$
+ ""
+ }
+ { "In {\em " journal * "\/}" * }
if$
}
{ "In " key * }
@@ -640,12 +643,12 @@
#2 >
{ pop$ " et~al." * }
{ #2 <
- 'skip$
- { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
- { " et~al." * }
- { " and " * editor #2 "{vv~}{ll}" format.name$ * }
- if$
- }
+ 'skip$
+ { editor #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
+ { " et~al." * }
+ { " and " * editor #2 "{vv~}{ll}" format.name$ * }
+ if$
+ }
if$
}
if$
@@ -664,15 +667,15 @@
editor field.or.null author field.or.null =
or
{ key empty$
- { series empty$
- { "need editor, key, or series for " cite$ * " to crossref " *
- crossref * warning$
- "" *
- }
- { "{\em " * series * "\/}" * }
- if$
- }
- { key * }
+ { series empty$
+ { "need editor, key, or series for " cite$ * " to crossref " *
+ crossref * warning$
+ "" *
+ }
+ { "{\em " * series * "\/}" * }
+ if$
+ }
+ { key * }
if$
}
{ format.crossref.editor * }
@@ -685,15 +688,15 @@
editor field.or.null author field.or.null =
or
{ key empty$
- { booktitle empty$
- { "need editor, key, or booktitle for " cite$ * " to crossref " *
- crossref * warning$
- ""
- }
- { "In {\em " booktitle * "\/}" * }
- if$
- }
- { "In " key * }
+ { booktitle empty$
+ { "need editor, key, or booktitle for " cite$ * " to crossref " *
+ crossref * warning$
+ ""
+ }
+ { "In {\em " booktitle * "\/}" * }
+ if$
+ }
+ { "In " key * }
if$
}
{ "In " format.crossref.editor * }
@@ -746,7 +749,6 @@
}
if$
}
-
FUNCTION {format.eprint}
{ eprint empty$
{ "" }
@@ -788,8 +790,17 @@
new.block
inlinelinks
'skip$ % links were inline -- don't repeat them
- {
- output.url
+ { % If the generated DOI will be the same as the URL,
+ % then don't print the URL (thanks to Joseph Wright for this code,
+ % at http://tex.stackexchange.com/questions/5660)
+ adddoiresolver
+ doiurl doi empty$ { "X" } { doi } if$ * % DOI URL to be generated
+ url empty$ { "Y" } { url } if$ % the URL, or "Y" if empty
+ = % are the strings equal?
+ and
+ 'skip$
+ { output.url }
+ if$
addeprints eprint empty$ not and
{ format.eprint output.nonnull }
'skip$
@@ -903,8 +914,8 @@
{ format.editors "author and editor" output.check }
{ format.authors output.nonnull
crossref missing$
- { "author and editor" editor either.or.check }
- 'skip$
+ { "author and editor" editor either.or.check }
+ 'skip$
if$
}
if$
@@ -951,8 +962,8 @@
{ format.editors "author and editor" output.check }
{ format.authors output.nonnull
crossref missing$
- { "author and editor" editor either.or.check }
- 'skip$
+ { "author and editor" editor either.or.check }
+ 'skip$
if$
}
if$
@@ -1020,17 +1031,17 @@
format.number.series output
format.pages output
address empty$
- { organization publisher new.sentence.checkb
- organization output
- publisher output
- format.date "year" output.check
- }
- { address output.nonnull
- format.date "year" output.check
- new.sentence
- organization output
- publisher output
- }
+ { organization publisher new.sentence.checkb
+ organization output
+ publisher output
+ format.date "year" output.check
+ }
+ { address output.nonnull
+ format.date "year" output.check
+ new.sentence
+ organization output
+ publisher output
+ }
if$
}
{ format.incoll.inproc.crossref output.nonnull
@@ -1048,10 +1059,10 @@
{ output.bibitem
author empty$
{ organization empty$
- 'skip$
- { organization output.nonnull
- address output
- }
+ 'skip$
+ { organization output.nonnull
+ address output
+ }
if$
}
{ format.authors output.nonnull }
@@ -1061,10 +1072,10 @@
format.btitle "title" output.check
author empty$
{ organization empty$
- { address new.block.checka
- address output
- }
- 'skip$
+ { address new.block.checka
+ address output
+ }
+ 'skip$
if$
}
{ organization address new.block.checkb
@@ -1139,10 +1150,10 @@
format.number.series output
address empty$
{ editor empty$
- { publisher new.sentence.checka }
- { organization publisher new.sentence.checkb
- organization output
- }
+ { publisher new.sentence.checka }
+ { organization publisher new.sentence.checkb
+ organization output
+ }
if$
publisher output
format.date "year" output.check
@@ -1151,8 +1162,8 @@
format.date "year" output.check
new.sentence
editor empty$
- 'skip$
- { organization output }
+ 'skip$
+ { organization output }
if$
publisher output
}
Added: trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-gpl-2.0.txt
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-gpl-2.0.txt (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-gpl-2.0.txt 2019-07-02 20:58:10 UTC (rev 51530)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Property changes on: trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-gpl-2.0.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-lppl.txt
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-lppl.txt (rev 0)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-lppl.txt 2019-07-02 20:58:10 UTC (rev 51530)
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % This work may be distributed and/or modified under the
+ % conditions of the LaTeX Project Public License, either version 1.3
+ % of this license or (at your option) any later version.
+ % The latest version of this license is in
+ % http://www.latex-project.org/lppl.txt
+ % and version 1.3 or later is part of all distributions of LaTeX
+ % version 2005/12/01 or later.
+ %
+ % This work has the LPPL maintenance status `maintained'.
+ %
+ % The Current Maintainer of this work is M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
+
Property changes on: trunk/Master/texmf-dist/doc/bibtex/urlbst/LICENCE-lppl.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/bibtex/urlbst/Makefile.in
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/Makefile.in 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/Makefile.in 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,189 +0,0 @@
-# BSTSTYLES are the standard styles that we distribute
-BSTSTYLES=plainurl.bst unsrturl.bst alphaurl.bst abbrvurl.bst
-# TESTSTYLES are a couple of extra ones that we explicitly test
-TESTSTYLES=mlaurl.bst
-
-MAINTAINER_FILES= Makefile configure
-GENERATED=urlbst urlbst.tex urlbst.pdf urlbst.html README VERSION $(BSTSTYLES)
-# distribute generated files
-# ...plus the configure files
-# ...plus the configured files
-DISTRIBS=$(GENERATED) \
- configure configure.ac \
- urlbst.in urlbst.bib urlbst.tex.in urlbst.html.in Makefile.in
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-DIST=urlbst- at PACKAGE_VERSION@
-
-# On OS X, the following avoids extended attributes being included
-TAR=COPYFILE_DISABLE=1 tar
-#TAR=tar
-
-### Implicit rules
-
-# Don't include --inlinelinks when generating %url.bst here, as we
-# do want the links visible when generating the documentation, and it's
-# probably abetter default in any case.
-%url.bst: urlbst
- export BSTINPUTS=test: ; \
- if test -z "`kpsewhich ${@:url.bst=.bst}`"; then \
- echo "Can't locate ${@:url.bst=.bst}"; \
- else \
- ./urlbst --eprint --doi --pubmed --hyperref `kpsewhich ${@:url.bst=.bst}` $@; \
- fi
-
-# Incomplete TeX support
-%.ps: %.dvi
- dvips -o $@ $<
-%.bbl: %.tex plainurl.bst
- pdflatex $<
- if ! test -f $@ || grep -q 'Citation.*undefined' ${<:.tex=.log}; then \
- bibtex ${<:.tex=}; \
- pdflatex $<; \
- rm ${<:.tex=.pdf}; \
- fi
-%.pdf: %.tex %.bbl
- pdflatex $<
-%.dvi: %.tex %.bbl
- latex $<
-%.gz: %
- gzip --best -f $<
-
-.PRECIOUS: .bbl
-
-### Targets start here
-
-all: urlbst
-
-dist: $(DIST).tar.gz $(DIST).zip
-
-$(DIST).tar: $(DIST)/urlbst.in
- $(TAR) cf $@ $(DIST)
-
-$(DIST).zip: $(DIST)/urlbst.in
- zip -r $@ $(DIST)
-
-$(DIST)/urlbst.in: $(DISTRIBS)
- if test -d $(DIST); then rm -Rf $(DIST); fi && mkdir $(DIST)
- cp $(DISTRIBS) $(DIST)
-
-# The following appears not to work.
-# Perhaps it has to be installed, rather than run from the .app bundle
-# (but it doesn't give you any choice about where you install it,
-# and I'm not going to put it in a system location)
-#PLATYPUS=/Data/LocalApplications/Platypus-4.0/Platypus.app/Contents/Resources/platypus
-PLATYPUS=/usr/local/bin/platypus
-urlbst.app: urlbst
- rm -Rf urlbst.app
- $(PLATYPUS) -a urlbst -c "$$PWD/urlbst" -o 'Progress Bar' \
- -p /usr/bin/perl -V @PACKAGE_VERSION@ -u Norman\ Gray -I uk.me.nxg.urlbst \
- -D -R -N CALLED_FROM_PLATYPUS=1 $$PWD/urlbst.app
-urlbst-app.zip: urlbst.app
- zip -r urlbst-app.zip urlbst.app
-
-#$(DIST).tar: $(DISTRIBS)
-# sed '1s,.*,#! /usr/bin/env perl,' urlbst >tmp && mv tmp urlbst \
-# && chmod +x urlbst
-# rm -Rf $(DIST) $(DIST).tar
-# mkdir $(DIST)
-# cp $(DISTRIBS) $(DIST)
-# tar cf $@ $(DIST)
-# rm -Rf $(DIST)
-
-urlbst: urlbst.in config.status
- ./config.status urlbst
-
-urlbst.tex: urlbst.tex.in config.status
- ./config.status urlbst.tex
-
-urlbst.html: urlbst.html.in config.status
- ./config.status urlbst.html
-
-Makefile: Makefile.in config.status
- ./config.status Makefile
-
-configure: configure.ac
- autoconf
-
-config.status: configure
- ./configure
-
-# Version stamp file, included in the distribution for convenience,
-# so it's easy to see which version it is has been unpacked at CTAN.
-VERSION:
- echo $(DIST) >VERSION
-
-# The README is just a plain-text version of urlbst.html
-README: urlbst.html prepare-roff.sed
- xsltproc html2roff.xslt urlbst.html \
- | sed -f prepare-roff.sed \
- | nroff -Tutf8 -ms \
- | sed '/XXXEND/,$$d' >README
-
-# Write a roff file -- there comes a point where a string of -e ''
-# commands is more confusing than is safe
-# (plus trying to get '$a\' into that is mind-bending).
-prepare-roff.sed:
- rm -f $@
- { echo '$$a\'; echo '\'; echo 'XXXEND'; echo '/^ *$$/d'; echo 's/^ *//'; echo 's/^\.$$/\&./'; echo 's/^\. /\&. /'; } >$@
-
-# Very simple install target -- hardly worth bothering, really....
-install: urlbst
- cp urlbst $(bindir)
-
-# Very simple test target -- just check that we don't bomb converting
-# the standard styles
-test: $(BSTSTYLES) $(TESTSTYLES)
- for f in $(BSTSTYLES) $(TESTSTYLES); do \
- ROOT=`echo $$f|sed s/\.bst$$//`; \
- printf '\\relax\n' > test-$$ROOT.aux; \
- printf '\\citation{*}\n' >> test-$$ROOT.aux; \
- printf '\\bibdata{urlbst}\n' >> test-$$ROOT.aux; \
- printf '\\bibstyle{'"$$ROOT"'}\n' >> test-$$ROOT.aux; \
- bibtex test-$$ROOT; \
- done
-
-# Brute-force test target, which finds all the system .bst files,
-# converts them, and runs BibTeX on them. It doesn't test the results
-# in any way -- you have to do that by eye.
-#
-# No, this is a hopelessly blunderbus approach. And in any case the
-# 'locate *.bst' doesn't work. At least the following would find only things
-# on the .bst search path.
-# BSTPATH=`kpsepath bst`
-# for d in `IFS=:; echo $BSTPATH`; do
-# dd=`expr "$d" : '!*\(.*[^/]\)/*$'`
-# echo dd=$dd
-# test -d "$dd" && find $dd -name \*.bst
-# done
-test-all:
- printf '\\relax\n'>test-all.mainaux
- sed -n 's/^.*{\(test:.*\),/\\citation{\1}/p' urlbst.bib>>test-all.mainaux
- for f in `locate '*.bst' | grep -v norman`; do T=`echo $$f|sed 's+.*/\(.*\)\.bst+\1url+'`;perl urlbst $$f $$T.bst; if test $$? = 0; then TF=test-$$T.aux; cp test-all.mainaux $$TF;printf '\\bibdata{urlbst}\n'>>$$TF; printf '\\bibstyle{$$T}\n'>>$$TF; else rm $$T.bst; fi done
- for f in `ls test-*.aux|sed s+.aux++`;do bibtex $$f;done
- rm test-all.mainaux
-
-# Tarball for unpacking in the webpage distribution directory
-webpage-tarball.tar: urlbst.pdf urlbst.html $(DIST).tar.gz $(DIST).zip
- mkdir webpage-tarball
- cp urlbst.pdf $(DIST).tar.gz $(DIST).zip webpage-tarball
- cp urlbst.html webpage-tarball/index.html
- cd webpage-tarball; $(TAR) cf ../webpage-tarball.tar *
- rm -Rf webpage-tarball
-
-tidy:
- rm -f webpage-tarball.tar
- rm -f *~ test-*
- rm -f *.aux *.bbl *.log *.blg *.dvi *.pdf
- rm -Rf urlbst.app
-
-clean: tidy
- rm -f *.bst
- rm -Rf config.status autom4te.cache prepare-roff.sed
- rm -Rf $(DIST).tar $(DIST).tar.gz $(DIST).zip $(DIST)
- rm -f $(GENERATED)
-
-maintainer-clean: clean
- rm -f $(MAINTAINER_FILES)
Modified: trunk/Master/texmf-dist/doc/bibtex/urlbst/README
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/README 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/README 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,383 +1,53 @@
+urlbst -- add @webpage entry and url/doi/eprint/pubmed fields to BibTeX
+=======================================================================
+Version 0.8, 2019 July 1.
+The urlbst package consists of a Perl script which edits BibTeX style
+files (.bst) to add a `@webpage` entry type, and which adds a few new
+fields -- notably including 'url' -- to all other entry types. The
+distribution includes preconverted versions of the four standard
+BibTeX .bst style files.
+It has a different goal from Patrick Daly's 'custom-bib' package --
+that is intended to create a BibTeX style .bst file from scratch, and
+supports 'url' and 'eprint' fields. This package, on the other hand,
+is intended for the case where you already have a style file that
+works (or at least, which you cannot or will not change), and edits it
+to add the new `@webpage` entry type, plus the new fields.
+The added fields are:
+ * 'url' and 'lastchecked', to associate a URL with a reference,
+ along with the date at which the URL was last checked to exist;
+ * 'doi', for a reference's DOI (see https://doi.org);
+ * 'eprint', for an arXiv eprint reference (see http://arxiv.org); and
+ * 'pubmed' for a reference's PubMed identifier (PMID, see http://pubmed.gov).
+Licences
+--------
+The copyright and licence position for the modified `.bst` files seems
+slightly muddy to me. On the grounds that any licence is better than
+no licence, I therefore assert that the _modifications_ which the
+`urlbst` program makes to these files are copyright 2002-03, 2005-12, 2014, 2019,
+Norman Gray, and that these modifications are available for
+distribution under the terms of the LaTeX Project Public Licence.
+The original `.bst` files are copyright Howard Trickey and Oren
+Patashnik, with a set of permissions, in text at the top of the files,
+which state that "Unlimited copying and redistribution of this file
+are permitted as long as it is unmodified" (see the files for the
+complete text). The distribution terms above therefore appear to be
+compatible with -- in the sense of being morally equivalent to --
+these terms in the `.bst` file. If anyone disagrees with the logic
+here, I'd be very happy to discuss that.
- UUrrllbbsstt
+The `urlbst` script itself is distributed under the GPL, version 2.0.
+See the files `LICENCE-lppl.txt` and `LICENCE-gpl-2.0.txt` in the
+distribution, for the relevant licence text.
- _A_B_S_T_R_A_C_T
-
- A script to add a wweebbppaaggee BibTeX entry type,
- and add support for general uurrll and llaassttcchheecckkeedd
- fields, to (most) BibTeX ..bbsstt files. Optionally
- adds basic support for eepprriinntt , ddooii and ppuubbmmeedd
- fields, and hypertex/hyperref support.
-
- The Persistent URL for this page is
- hhttttpp::////ppuurrll..oorrgg//nnxxgg//ddiisstt//uurrllbbsstt &.
-
- Version 0.7, 2011 July 20.
-
-
- Contents
-
-* Usage
-
-* For example...
-
-* Download and installation
-
-* Further Information
-
-* Version history
-
- The standard BibTeX styles have no explicit support for
-the web, in that they include no ‘webpage’ type, and have no
-support for adding URLs to references. There are rumours
-that such support might appear in BibTeX 1.0, but there is
-no estimate of when that is likely to arrive.
-
- The Perl script uurrllbbsstt can be used to add this support
-to an arbitrary ..bbsstt file which has a reasonably ‘conven‐
-tional’ structure. The result is meant to be robust rather
-than pretty.
-
- It has a different goal from Patrick Daly’s ‘custom‐
-bib’ package ‐‐ that is intended to create a BibTeX style
-.bst file from scratch, and supports ‘url’ and ‘eprint’
-fields. This package, on the other hand, is intended for
-the case where you already have a style file that works (or
-at least, which you cannot or will not change), and edits it
-to add the new webpage entry type, plus the url, lastchecked
-and eprint fields. Fuller details are in the manual.
-
-11.. UUssaaggee
-
- uurrllbbsstt [[‐‐‐‐[[nnoo]]eepprriinntt]] [[‐‐‐‐[[nnoo]]ddooii]] [[‐‐‐‐[[nnoo]]ppuubbmmeedd]]
- [[‐‐‐‐iinnlliinneelliinnkkss]] [[‐‐‐‐nnoohhyyppeerrlliinnkkss]] [[‐‐‐‐hhyyppeerrtteexx]] [[‐‐‐‐hhyyppeerr‐‐
- rreeff]] [[‐‐‐‐lliitteerraall kkeeyy==vvaalluuee]] [[iinnppuutt‐‐ffiillee [[oouuttppuutt‐‐ffiillee]]]]
-
- If either the input‐file or the output‐file is omitted,
-they default to stdin and stdout respectively. If the input
-file already has a URL entry type, then the script objects.
-By default (in the current version), the output includes
-support for eprint, doi and pubmed, but these can be dis‐
-abled by ‐‐‐‐nnooeepprriinntt , ‐‐‐‐nnooddooii and ‐‐‐‐nnooppuubbmmeedd , respectively.
-
- The added fields are:
-
-* uurrll and llaassttcchheecckkeedd , to associate a URL with a refer‐
- ence, along with the date at which the URL was last
- checked to exist;
-
-* ddooii , for a reference’s DOI;
-
-* eepprriinntt , for an arXiv eprint reference; and
-
-* ppuubbmmeedd for a reference’s PubMed identifier (PMID).
-
- If either of the ‐‐‐‐hhyyppeerrtteexx or ‐‐‐‐hhyyppeerrrreeff options is
-present, then the generated ..bbsstt file includes support for
-hyperlinks in the generated eprint entries in the bibliogra‐
-phy, with the format being either HyperTeX (see arXiv,
-again), supported by xdvi, dvips and others, or using the
-support available from the hyperref package. These options
-have no effect unless one of the ‐‐‐‐eepprriinntt or ‐‐‐‐ddooii options
-is given: when URLs are included in the bibliography, they
-are written out using the rrll{{......}} command, and hyperref
-automatically processes that in the correct way to include a
-hyperlink.
-
- The ‐‐‐‐iinnlliinneelliinnkkss option tells urlbst not to write out
-the URL as text within the bibliography entry. Instead,
-urlbst will produce a more conventional‐looking and compact
-bibliography entry, but the entry’s title will now be a
-hyperlink to that URL. This hyperlink may be useful to any‐
-one who reads your document online (this option can only be
-used with ‐‐‐‐hhyyppeerrrreeff or ‐‐‐‐hhyyppeerrtteexx ). Any DOI or eprint
-text which would be produced as a result of the appropriate
-option will still appear in this mode.
-
- You may adjust various literal strings, either for the
-purposes of internationalisation, or simply because you pre‐
-fer different text. To do this, give the ‐‐‐‐lliitteerraall option,
-followed by a kkeeyy==vvaalluuee pair, for example ‐‐‐‐lliitteerraall
-oonnlliinnee==""oonn tthh’’iinntteerrtt0000bbss"" , to replace the default UURRLL::
-text. The possible values, and their defaults, are below
-(say ‐‐‐‐lliitteerraall hheellpp to get this list printed out): keyword‐
-defaultmeaning citedcitedindicator of citation, or "last
-checked", date doiprefixdoi:text printed before DOI eprint‐
-prefixarXiv:text printed before eprint ref link‐
-text[link]fallback link text pubmedprefixPMID:text printed
-before PUBMED reference onlineonlineindication that resource
-is online urlintroURL:location of online resource (an alter‐
-native is "Available from:")
-
- The distribution includes preconverted versions of the
-four standard BibTeX .bst style files.
-
- Only the style files which result from conversion of
-the standard styles are checked in the regression tests.
-Other style files which are known to work include acm.bst,
-amsalpha.bst, amsplain.bst, apalike.bst, gerabbrv.bst, ger‐
-alpha.bst, gerapali.bst, gerplain.bst, gerunsrt.bst,
-ieeetr.bst, siam.bst, mla.bst
-
- Style files which are known to fail:
-
-* Currently (as of at least v0.5), there exists a style
- aacchhiiccaaggoo..bbsstt which seems to fox uurrllbbsstt ; it turns out
- that there’s a simpler but almost equivalent style
- cchhiiccaaggoo..bbsstt which works.
-
-* Some APA‐like styles, including at least aappaaggeerr..bbsstt ,
- seem to be sufficiently different from the most common
- styles, that they confuse uurrllbbsstt completely.
-
-* The _k_o_m_a_‐_s_c_r_i_p_t styles and the _r_e_f_e_r styles are not
- designed to produce conventional ..bbbbll files, and uurrllbbsstt
- does not aim to produce anything useful from these.
-
- This might be a good time for me to revisit the rather
-convoluted logic within the script, to make it a little more
-robust in the face of variants like these, but don’t hold
-your breath. The logic within the script is pretty hideous
-(it essentially works by spotting patterns in the input
-style file, and replacing or extending bits of BibTeX style‐
-file code. This is a fragile technique, and is probably at
-the limits of its usefulness, therefore I’d take some per‐
-suading to add significant extra functionality to the
-script.
-
- The natbib and revtex style files already have URL
-fields. If you have a BibTeX style file which you think
-ought to work, but with which the script fails, send it to
-me, and I’ll try to work out what I’ve missed (no promises,
-though).
-
- Note that the command to invoke the script changed from
-‘urlbst.pl’ to plain ‘urlbst’ between versions 0.3 and 0.4.
-
-22.. FFoorr eexxaammppllee......
-
- To add URL support to the standard ssiiaamm..bbsstt file, you
-can give the command
-
- %% uurrllbbsstt //ppaatthh//ttoo//oorriiggiinnaall//ssiiaamm..bbsstt ssiiaammuurrll..bbsstt
-
- Your TeX installation will likely have some way of
-helping you find where the original ..bbsstt files are. On
-teTeX‐based systems, for example, the command kkppsseewwhhiicchh
-ssiiaamm..bbsstt returns the full path of the ssiiaamm..bbsstt file which
-BibTeX would find.
-
- The distributed files aabbbbrrvvuurrll..bbsstt , aallpphhaauurrll..bbsstt ,
-ppllaaiinnuurrll..bbsstt and uunnssrrttuurrll..bbsstt are versions of the standard
-style files which have been pre‐converted.
-
- There is more general discussion of including URLs in
-bibliographies in the UK TeX FAQ.
-
-33.. DDoowwnnllooaadd aanndd iinnssttaallllaattiioonn
-
- Download the file as a tarball or zip file and unpack
-it. Or you can clone the source repository at bit‐
-bucket.org.
-
- To install, you should simply copy the distributed
-uurrllbbsstt script to someplace on the path (such as
-//uussrr//llooccaall//bbiinn , or ~~//llooccaall//bbiinn , depending on your privi‐
-leges and tastes).
-
- If you (might) want to use the pre‐converted standard
-..bbsstt files, then you’ll need to copy these to somewhere in
-the BibTeX search path. Type kpsepath bst on Unix to find
-out the list of places BibTeX searches, and pick either one
-of the user‐local locations, or a system‐wide one. If
-you’re installing in a system‐wide location, you’ll need
-admin privileges, obviously, and you will probably need to
-use tteexxhhaasshh , mmkktteexxllssrr or its equivalent, to update LaTeX’s
-filename cache. For further hints here, see the TeX FAQ
-entries on installing a package and where LaTeX puts files.
-
- That should be all you have to do.
-
- The urlbst script is distributed with a path which
-should just work, as long as the Perl binary is in your
-path, but if you have problems here, then you might want to
-change the first line to something like
-
- ##!! //uussrr//llooccaall//bbiinn//ppeerrll
-
- if that’s where your Perl binary is.
-
- You can also use the conventional ..//ccoonnffiigguurree;; mmaakkee;;
-mmaakkee iinnssttaallll to configure and install the package (as root,
-or using ssuuddoo if you’re installing it in a system location),
-though you still have to install the ..bbsstt files by hand.
-This is rather heavyweight for the trivial amount of config‐
-uration required, so it’s almost always simpler just to do
-things by hand.
-
- If you need to change some of the uurrllbbsstt defaults, how‐
-ever, or if your fingers type ..//ccoonnffiigguurree spontaneously,
-then you can be reassured that the configure script supports
-the standard ‐‐‐‐pprreeffiixx option, plus the following options
-setting defaults:
-
- ‐‐‐‐wwiitthh‐‐eepprriinnttss==uurrll , ‐‐‐‐wwiitthhoouutt‐‐eepprriinnttss This makes the
- ‐‐‐‐eepprriinnttss option to urlbst available by default, and
- allows you to optionally specify a prefix for creating
- URLs from eprint numbers. The default for this URL is
- hhttttpp::////aarrxxiivv..oorrgg//aabbss// ‐‐ this is appropriate for arXiv,
- obviously, but there are now a variety of other pre‐
- print archives appearing, for which this might be inap‐
- propriate. If you have comments on this default, or
- alternatives, please let me know. This option is
- enabled by default; if you have some reason for dis‐
- abling the ‐‐‐‐eepprriinnttss option for urlbst, the give the
- configure option ‐‐‐‐wwiitthhoouutt‐‐eepprriinnttss
-
- ‐‐‐‐wwiitthh‐‐ddooii==uurrll , ‐‐‐‐wwiitthhoouutt‐‐ddooii This makes available the
- ‐‐‐‐ddooii option to urlbst and, as with the ‐‐‐‐wwiitthh‐‐eepprriinnttss
- option, allows you to customise the DOI resolver URL.
- The ‐‐‐‐ddooii option to urlbst is on by default.
-
- ‐‐‐‐wwiitthh‐‐hhrreeff==00//11//22 This allows you to specify the type
- of hyperlinks which are inserted in the bibliography.
- Values 0, 1 and 2, indicating no hyperlinks, hypertex‐
- style links, and hyperref‐style links, respectively.
- The default is ‐‐‐‐wwiitthh‐‐hhrreeff==00 &. The hhyyppeerrrreeff ‐style
- option is intended to complement the increasingly stan‐
- dard hhyyppeerrrreeff package.
-
- The first two options simply change defaults, and if
-you never use the new eepprriinnttss or ddooii fields, then the
-defaults don’t matter to you.
-
- Since the modified style generates URLs wrapped in the
-rrll{{}} macro, it is useful to use the resulting bibliography
-style alongside the uurrll package. Since this tends to work
-with hhyyppeerrrreeff anyway, where possible, you don’t get any
-extra goodness by changing the ‐‐‐‐wwiitthh‐‐hhrreeff default at con‐
-figuration time.
-
-33..11.. DDooccuummeennttaattiioonn
-
- Basic documentation is in the file uurrllbbsstt..tteexx &. This
-is distributed as a PDF file, but if you want to regenerate
-it, use
-
- %% llaatteexx uurrllbbsstt %% bbiibbtteexx uurrllbbsstt %% llaatteexx uurrllbbsstt %% llaatteexx
- uurrllbbsstt
-
-44.. FFuurrtthheerr IInnffoorrmmaattiioonn aanndd aacckknnoowwlleeddggeemmeennttss
-
- uurrllbbsstt is archived on CTAN at bbiibblliioo//bbiibbtteexx//ccoonn‐‐
-ttrriibb//uurrllbbsstt// , and discussed in the TeX FAQ.
-
- The source code for the package is maintained at bit‐
-bucket.org, which also includes an issue tracker, where you
-can report bugs (or just mail me).
-
- The home page of urlbst might possibly have more recent
-versions than the one you’re looking at now.
-
- Thanks are due to many people for suggestions and
-requests, and to ’ijvm’ for code contributions.
-
- Copyright 2002‐11, Norman Gray. Released under the
-terms of the GNU General Public Licence.
-
-55.. VVeerrssiioonn hhiissttoorryy
-
- _0_._7_, Add ‐‐nodoi, ‐‐noeprints and ‐‐nopubmed options
- (which defaulted on, and couldn’t otherwise be turned
- off)
-
- 00..77bb11,, 22001111 MMaarrcchh 1177 Allow parameterisation of literal
- strings, with option ‐‐‐‐lliitteerraall &.
-
- 00..66‐‐55,, 22001111 MMaarrcchh 88 Adjust support for inline links
- (should now work for arXiv, DOI and Pubmed)
-
- 00..66‐‐44,, 22000099 AApprriill 2288 Work around BibTeX linebreaking
- bug (thanks to Andras Salamon for the bug report).
-
- 00..66‐‐33,, 22000099 AApprriill 1199 Fix inline link generation (thanks
- to Eric Chamberland for the bug report).
-
- 00..66‐‐22,, 22000088 NNoovveemmbbeerr 1177 We now turn on inlinelinks when
- we spot format.vol.num.pages, which means we include
- links for those styles which don’t include a title in
- the citation (common for articles in physical science
- styles, such as aip.sty).
-
- 00..66‐‐11,, 22000088 JJuunnee 1166 Fixed some broken links to the var‐
- ious citation standards (I think in this context this
- should probably _n_o_t be happening, yes?). The distrib‐
- uted **uurrll..bbsstt no longer have the ‐‐‐‐iinnlliinneelliinnkkss option
- turned on by default.
-
- _0_._6_, _2_0_0_7 _M_a_r_c_h _2_6
-
- Added the option ‐‐‐‐iinnlliinneelliinnkkss , which adds inline
-hyperlinks to any bibliography entries which have URLs, but
-does so inline, rather than printing the URL explicitly in
-the bibliography. This is (primarily) useful if you’re pre‐
-paring a version of a document which will be read on‐screen.
-Thanks to Jason Eisner for the suggestion, and much testing.
-
- Incorporate hyperref bugfixes from PaweÅ Widera.
-
- 00..66bb33 Further reworkings of the inlinelinks support, so
- that it’s now fired by a format.title (or format.bti‐
- tle) line, with a fallback in fin.entry. This should
- be more robust, and allows me to delete some of the
- previous version’s gymnastics.
-
- 00..66bb22 Reworked iinnlliinneelliinnkkss support; should now be more
- robust. Incorporate hyperref bugfixes from PaweÅ
- Widera.
-
- 00..66bb11 Added the option iinnlliinneelliinnkkss , which adds inline
- hyperlinks to any bibliography entries which have URLs,
- but does so inline, rather than printing the URL
- explicitly in the bibliography. This is (only) useful
- if you’re preparing a version of a document which will
- be read on‐screen.
-
- 00..55..22,, 22000066 SSeepptteemmbbeerr 66 Another set of documentation‐
- only changes, hopefully clarifying installation.
-
- 00..55..11,, 22000066 JJaannuuaarryy 1100 No functionality changes. Docu‐
- mentation and webpage changes only, hopefully clarify‐
- ing usage and configuration
-
- _0_._5_, _2_0_0_5 _J_u_n_e _3 Added support for Digital Object Iden‐
- tifiers (DOI) fields in bibliographies.
-
- 00..44‐‐11,, 22000055 AApprriill 1122 Documentation improvements ‐‐
- there are now examples in the help text!
-
- _0_._4_, _2_0_0_4 _D_e_c_e_m_b_e_r _1 Bug fixes: now compatible with
- mla.bst and friends. Now uses ..//ccoonnffiigguurree (option‐
- ally). Assorted reorganisation.
-
- _0_._3_, _2_0_0_3 _J_u_n_e _4 Added ‐‐eprint, ‐‐hypertex and
- ‐‐hyperref options.
-
- _0_._2_, _2_0_0_2 _O_c_t_o_b_e_r _2_3 The ‘editor’ field is now sup‐
- ported in the webpage entry type. Basic documentation
- added.
-
- _0_._1_, _2_0_0_2 _A_p_r_i_l Initial version
-
- Norman Gray 2011 July 20
-
+Norman Gray
+http://nxg.me.uk
Modified: trunk/Master/texmf-dist/doc/bibtex/urlbst/VERSION
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/VERSION 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/VERSION 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1 +1 @@
-urlbst-0.7
+urlbst-0.8
Modified: trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.bib
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.bib 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.bib 2019-07-02 20:58:10 UTC (rev 51530)
@@ -11,6 +11,7 @@
@Manual{apastyle,
title = {Publication Manual of the American Psychological Association},
organization = {{American Psychological Association}},
+ key = "APA",
edition = {6th},
year = 2009,
lastchecked = {17 March 2011},
@@ -24,17 +25,7 @@
lastchecked = {17 March 2011}
}
-% This one appears to be dead
- at Webpage{gone:classroom96,
- title = {Citing Internet Addresses: how students should
- reference online sources in their bibliographies},
- year = 1996,
- month = mar,
- key = {Classroom},
- url = "http://www.classroom.net/classroom/CitingNetResources.html"
-}
-
- at XXXWebpage{emory95,
+Webpage{emory95,
author = {{Goizueta Business Library}},
title = "Citation Formats",
date = {1997},
@@ -161,7 +152,6 @@
}
% Article with a DOI
-% an underscore
@article{test:gray00c,
author = "Norman Gray",
title = "Automatic Reduction of Elliptic Integrals using
@@ -172,6 +162,17 @@
year = 2002,
doi = {10.1090/S0025-5718-01-01333-3}
}
+
+% Article with a DOI and a URL which refers to the same resource as the DOI
+% (we shouldn't get both in the output)
+ at Article{test:doi2,
+ author = {A N Other},
+ title = {Fun with {DOIs}},
+ journal = {Journal of Indirection},
+ year = 1999,
+ doi = {10.1234/5678},
+ url = {https://doi.org/10.1234/5678}
+}
% Article with a PUBMED reference
Modified: trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.html
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.html 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.html 2019-07-02 20:58:10 UTC (rev 51530)
@@ -4,8 +4,7 @@
<head>
<title>Urlbst</title>
<link href="http://nxg.me.uk/" rev="author"/>
-<link type="text/css" rel="stylesheet"
- href="http://nxg.me.uk/style/base.css"/>
+<link type="text/css" rel="stylesheet" href="/style/base.css"/>
</head>
<body>
@@ -18,9 +17,11 @@
hypertex/hyperref support.</p>
<p>The Persistent URL for this page is
-<code>http://purl.org/nxg/dist/urlbst</code>.</p>
+<code>http://purl.org/nxg/dist/urlbst</code>.
+The code (and bugparade) is on
+<a href='https://bitbucket.org/nxg/urlbst/'>bitbucket.org</a>.</p>
-<p>Version 0.7, 2011 July 20.</p>
+<p>Version 0.8, 2019 July 1.</p>
</div>
<p>Contents</p>
@@ -28,8 +29,9 @@
<li><a href='#usage'>Usage</a></li>
<li><a href='#example'>For example...</a></li>
<li><a href='#download'>Download and installation</a></li>
+<li><a href='#licences'>Licences</a></li>
<li><a href='#information'>Further Information</a></li>
-<li><a href='#history'>Version history</a></li>
+<li><a href='#history'>Version history, and release notes</a></li>
</ul>
<p>The standard BibTeX styles have no explicit support for the web, in
@@ -70,9 +72,9 @@
<li><code>url</code> and <code>lastchecked</code>, to associate a URL with
a reference, along with the date at which the URL was last checked
to exist;</li>
-<li><code>doi</code>, for a reference's <a href='http://doi.org'>DOI</a>;</li>
+<li><code>doi</code>, for a reference's <a href='https://doi.org'>DOI</a>;</li>
<li><code>eprint</code>, for an <a href='http://arxiv.org'>arXiv</a> eprint reference; and</li>
-<li><code>pubmed</code> for a reference's
+<li><code>pubmed</code> for a reference's
<a href='http://pubmed.gov'>PubMed</a> identifier (PMID).</li>
</ul>
@@ -186,10 +188,10 @@
<h2><a name='download'>Download and installation</a></h2>
<p>Download the file as a
-<a href="urlbst-0.7.tar.gz" >tarball</a>
+<a href="urlbst-0.8.tar.gz" >tarball</a>
or
-<a href="urlbst-0.7.zip" >zip file</a>
-and unpack it. Or you can clone the source repository at
+<a href="urlbst-0.8.zip" >zip file</a>
+and unpack it. Or you can clone the source repository at
<a href='http://bitbucket.org/nxg/urlbst/'>bitbucket.org</a>.</p>
<p>To install, you should simply copy the distributed
@@ -201,11 +203,11 @@
<code>.bst</code> files, then you'll need to copy these to somewhere
in the BibTeX search path. Type <kbd>kpsepath bst</kbd> on Unix to
find out the list of places BibTeX searches, and pick either one of
-the user-local locations, or a system-wide one. If you're installing
+the user-local locations, or a system-wide one. If you're installing
in a system-wide location, you'll need admin privileges, obviously,
and you will probably need to use <code>texhash</code>,
<code>mktexlsr</code> or its equivalent, to update LaTeX's filename
-cache. For further hints here, see
+cache. For further hints here, see
the TeX FAQ entries on <a
href='http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages'
>installing a package</a> and <a
@@ -289,16 +291,41 @@
% latex urlbst
</pre>
+<h2><a name='licences'>Licences</a></h2>
+
+<!-- this text copied from the README.md -->
+<p>The copyright and licence position for the modified <code>.bst</code> files seems
+slightly muddy to me. On the grounds that any licence is better than
+no licence, I therefore assert that the <em>modifications</em> which the
+<code>urlbst</code> program makes to these files are copyright 2002-03, 2005-12, 2014, 2019,
+Norman Gray, and that these modifications are available for
+distribution under the terms of the LaTeX Project Public Licence.</p>
+
+<p>The original <code>.bst</code> files are copyright Howard Trickey and Oren
+Patashnik, with a set of permissions, in text at the top of the files,
+which state that "Unlimited copying and redistribution of this file
+are permitted as long as it is unmodified" (see the files for the
+complete text). The distribution terms above therefore appear to be
+compatible with -- in the sense of being morally equivalent to --
+these terms in the <code>.bst</code> file. If anyone disagrees with
+the logic here, I'd be very happy to discuss that.</p>
+
+<p>The <code>urlbst</code> script itself is distributed under the GPL, version 2.0.</p>
+
+<p>See the files <code>LICENCE-lppl.txt</code> and <code>LICENCE-gpl-2.0.txt</code> in the
+distribution, for the relevant licence text.</p>
+
+
<h2><a name='information'>Further Information and acknowledgements</a></h2>
-<p><code>urlbst</code> is archived on CTAN at <a
-href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/urlbst/"
-><code>biblio/bibtex/contrib/urlbst/</code></a>, and discussed in the
+<p><code>urlbst</code> is archived <a
+href='https://ctan.org/pkg/urlbst'
+>on CTAN</a>, and discussed in the
<a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=citeURL" >TeX
FAQ</a>.</p>
-<p>The source code for the package is maintained at
-<a href='http://bitbucket.org/nxg/urlbst/'>bitbucket.org</a>,
+<p>The source code for the package is maintained at
+<a href='http://bitbucket.org/nxg/urlbst/'>bitbucket.org</a>,
which also includes an issue tracker, where you can report bugs (or
just mail me).</p>
@@ -306,16 +333,39 @@
>home page of urlbst</a> might possibly have more recent versions than the
one you're looking at now.</p>
-<p>Thanks are due to many people for suggestions and requests,
-and to 'ijvm' for code contributions.</p>
-<p>Copyright 2002-11, Norman Gray. Released under the terms of the GNU
-General Public Licence.</p>
+<h2><a name='history'>Acknowledgements, and release notes</a></h2>
-<h2><a name='history'>Version history</a></h2>
+<!-- include:release-notes.html -->
+<div xmlns='http://www.w3.org/1999/xhtml'>
+
+<p>Thanks are due to many people for suggestions and requests:
+to Jason Eisner for suggesting the <code>--inlinelinks</code> option;
+to ‘ijvm’ for code contributions in the <code>urlbst</code> script;
+to Paweł Widera for the suggestion to use <code>\path</code> when formatting DOIs;
+to Michael Giffin for the suggestion to include PubMed URLs;
+to Katrin Leinweber for the pull request which fixed the format of DOI
+references.</p>
+
<dl>
-<dt><strong>0.7, </strong></dt>
-<dd>Add --nodoi, --noeprints and --nopubmed options (which defaulted
+<dt><strong>0.8, 2019 July 1</strong></dt>
+<dd><ul>
+<li>The presence of a preexisting <code>format.doi</code>,
+<code>format.eprint</code> or <code>format.pubmed</code> function is
+now detected, and warned about. The resulting <code>.bst</code> file
+might still require some manual editing.
+Resolves <a href='https://bitbucket.org/nxg/urlbst/issue/8'>issue 8</a>.</li>
+<li>Clarified licences (I hope).</li>
+<li>Adjust format of DOI resolver.
+Resolves <a href='https://bitbucket.org/nxg/urlbst/issue/11'>issue 11</a>,
+thanks to
+<a href='https://bitbucket.org/nxg/urlbst/pull-requests/1/'
+>code contributed by Katrin Leinweber</a>.</li>
+</ul>
+</dd>
+
+<dt>0.7, 2011 July 20</dt>
+<dd>Add <code>--nodoi</code>, <code>--noeprints</code> and <code>--nopubmed</code> options (which defaulted
on, and couldn't otherwise be turned off)</dd>
<dt>0.7b1, 2011 March 17</dt>
@@ -338,35 +388,34 @@
<dt>0.6-1, 2008 June 16</dt>
<dd>Fixed some broken links to the various citation standards
-(I think in this context this should probably <em>not</em> be happening, yes?).
+(I think in this context this should probably <em>not</em> be happening, yes?).
The distributed <code>*url.bst</code> no longer have the
<code>--inlinelinks</code> option turned on by default.</dd>
<dt><strong>0.6, 2007 March 26</strong></dt>
-<dd><p>Added the option <code>--inlinelinks</code>, which adds inline hyperlinks
+<dd><ul>
+<li>Added the option <code>--inlinelinks</code>, which adds inline hyperlinks
to any bibliography entries which have URLs, but does so inline, rather
than printing the URL explicitly in the bibliography. This is (primarily)
useful if you're preparing a version of a document which will be read
-on-screen. Thanks to Jason Eisner for the suggestion, and much testing.</p>
-<p>Incorporate hyperref bugfixes from Paweł Widera.</p>
-<dl>
-<dt>0.6b3</dt>
-<dd>Further reworkings of the inlinelinks support, so that it's now
-fired by a format.title (or format.btitle) line, with a fallback in
-fin.entry. This should be more robust, and allows me to delete some
-of the previous version's gymnastics.</dd>
+on-screen. Thanks to Jason Eisner for the suggestion, and much testing.</li>
-<dt>0.6b2</dt>
-<dd>Reworked <code>inlinelinks</code> support; should now be more
-robust. Incorporate hyperref bugfixes from Paweł Widera.</dd>
+<li>Incorporate hyperref bugfixes from Paweł Widera.</li>
-<dt>0.6b1</dt>
-<dd>Added the option <code>inlinelinks</code>, which adds inline hyperlinks
+<li>Further reworkings of the inlinelinks support, so that it's now
+fired by a <code>format.title</code> (or <code>format.btitle</code>) line, with a fallback in
+<code>fin.entry</code>. This should be more robust, and allows me to delete some
+of the previous version's gymnastics.</li>
+
+<li>Reworked <code>inlinelinks</code> support; should now be more
+robust. Incorporate hyperref bugfixes from Paweł Widera.</li>
+
+<li>Added the option <code>inlinelinks</code>, which adds inline hyperlinks
to any bibliography entries which have URLs, but does so inline, rather
than printing the URL explicitly in the bibliography. This is (only)
useful if you're preparing a version of a document which will be read
-on-screen.</dd>
-</dl>
+on-screen.</li>
+</ul>
</dd>
<dt>0.5.2, 2006 September 6</dt>
@@ -389,7 +438,7 @@
Now uses <code>./configure</code> (optionally). Assorted reorganisation.</dd>
<dt><strong>0.3, 2003 June 4</strong></dt>
-<dd>Added --eprint, --hypertex and --hyperref options.</dd>
+<dd>Added <code>--eprint</code>, <code>--hypertex</code> and <code>--hyperref</code> options.</dd>
<dt><strong>0.2, 2002 October 23</strong></dt>
<dd>The `editor' field is now supported in the webpage entry type. Basic
@@ -397,14 +446,16 @@
<dt><strong>0.1, 2002 April</strong></dt>
<dd>Initial version</dd>
-
</dl>
+</div>
+<p>Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray. Released under the terms of the GNU
+General Public Licence.</p>
<div class="signature">
<a href="http://nxg.me.uk"
>Norman Gray</a><br/>
-2011 July 20
+2019 July 1
</div>
</body>
Deleted: trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.html.in
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.html.in 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.html.in 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,411 +0,0 @@
-<?xml version="1.0"?>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Urlbst</title>
-<link href="http://nxg.me.uk/" rev="author"/>
-<link type="text/css" rel="stylesheet"
- href="http://nxg.me.uk/style/base.css"/>
-</head>
-
-<body>
-<h1>Urlbst</h1>
-<div class="abstract">
-<p>A script to add a <code>webpage</code> BibTeX entry type, and add
-support for general <code>url</code> and <code>lastchecked</code>
-fields, to (most) BibTeX <code>.bst</code> files. Optionally adds
-basic support for <code>eprint</code>, <code>doi</code> and <code>pubmed</code> fields, and
-hypertex/hyperref support.</p>
-
-<p>The Persistent URL for this page is
-<code>http://purl.org/nxg/dist/urlbst</code>.</p>
-
-<p>Version @PACKAGE_VERSION@, @RELEASEDATE at .</p>
-</div>
-
-<p>Contents</p>
-<ul>
-<li><a href='#usage'>Usage</a></li>
-<li><a href='#example'>For example...</a></li>
-<li><a href='#download'>Download and installation</a></li>
-<li><a href='#information'>Further Information</a></li>
-<li><a href='#history'>Version history</a></li>
-</ul>
-
-<p>The standard BibTeX styles have no explicit support for the web, in
-that they include no `webpage' type, and have no support for adding
-URLs to references. There are rumours that such support might appear
-in BibTeX 1.0, but there is no estimate of when that is likely to arrive.</p>
-
-<p>The Perl script <code>urlbst</code> can be used to add this support to an
-arbitrary <code>.bst</code> file which has a reasonably `conventional'
-structure. The result is meant to be robust rather than pretty.</p>
-
-<p>It has a different goal from Patrick Daly's `custom-bib' package --
-that is intended to create a BibTeX style .bst file from scratch, and
-supports `url' and `eprint' fields. This package, on the other hand,
-is intended for the case where you already have a style file that
-works (or at least, which you cannot or will not change), and edits it
-to add the new webpage entry type, plus the url, lastchecked and
-eprint fields. Fuller details are in the <a href="urlbst.pdf"
->manual</a>.</p>
-
-<h2><a name='usage'>Usage</a></h2>
-<pre>
-urlbst [--[no]eprint] [--[no]doi] [--[no]pubmed]
- [--inlinelinks] [--nohyperlinks] [--hypertex] [--hyperref]
- [--literal key=value]
- [input-file [output-file]]
-</pre>
-<p>If either the input-file or the output-file is omitted, they
-default to stdin and stdout respectively. If the input file already
-has a URL entry type, then the script objects.
-By default (in the current version), the output
-includes support for eprint, doi and pubmed, but these can be disabled
-by <code>--noeprint</code>, <code>--nodoi</code> and
-<code>--nopubmed</code>, respectively.</p>
-
-<p>The added fields are:</p>
-<ul>
-<li><code>url</code> and <code>lastchecked</code>, to associate a URL with
- a reference, along with the date at which the URL was last checked
- to exist;</li>
-<li><code>doi</code>, for a reference's <a href='http://doi.org'>DOI</a>;</li>
-<li><code>eprint</code>, for an <a href='http://arxiv.org'>arXiv</a> eprint reference; and</li>
-<li><code>pubmed</code> for a reference's
- <a href='http://pubmed.gov'>PubMed</a> identifier (PMID).</li>
-</ul>
-
-<p>If either of the <code>--hypertex</code> or <code>--hyperref</code>
-options is present, then the generated <code>.bst</code> file includes
-support for hyperlinks in the generated eprint entries in the
-bibliography, with the format being either HyperTeX (see <a
-href="http://arxiv.org/hypertex/#implementation" >arXiv, again</a>),
-supported by xdvi, dvips and others, or using the support available
-from the hyperref package. These options have no effect unless one of
-the <code>--eprint</code> or <code>--doi</code> options is given: when
-URLs are included in the bibliography, they are written out using the
-<code>\url{...}</code> command, and hyperref automatically processes
-that in the correct way to include a hyperlink.</p>
-
-<p>The <code>--inlinelinks</code> option tells urlbst not to write out
-the URL as text within the bibliography entry. Instead, urlbst will
-produce a more conventional-looking and compact bibliography entry,
-but the entry's title will now be a hyperlink to that URL. This
-hyperlink may be useful to anyone who reads your document online
-(this option can only be used with <code>--hyperref</code> or
-<code>--hypertex</code>). Any DOI or eprint text which would be
-produced as a result of the appropriate option will still appear in
-this mode.</p>
-
-<p>You may adjust various literal strings, either for the purposes of
-internationalisation, or simply because you prefer different text. To
-do this, give the <code>--literal</code> option, followed by a
-<code>key=value</code> pair, for example <code>--literal online="on
-th'intert00bs"</code>, to replace the default <code>URL:</code> text.
-The possible values, and their defaults, are below (say
-<code>--literal help</code> to get this list printed out):</p>
-<table>
-<tr><th>keyword</th><th>default</th><th>meaning</th></tr>
-<tr><td>cited</td><td>cited</td><td>indicator of citation, or "last checked", date</td></tr>
-<tr><td>doiprefix</td><td>doi:</td><td>text printed before DOI</td></tr>
-<tr><td>eprintprefix</td><td>arXiv:</td><td>text printed before eprint
-ref</td></tr>
-<tr><td>linktext</td><td>[link]</td><td>fallback link text</td></tr>
-<tr><td>pubmedprefix</td><td>PMID:</td><td>text printed before PUBMED reference</td></tr>
-<tr><td>online</td><td>online</td><td>indication that resource is online</td></tr>
-<tr><td>urlintro</td><td>URL:</td><td>location of online resource (an
-alternative is "Available from:")</td></tr>
-</table>
-
-<p>The distribution includes preconverted versions of the four
-standard BibTeX .bst style files.</p>
-
-<p>Only the style files which result from conversion of the standard
-styles are checked in the regression tests. Other style files which
-are known to work include</p>
-<blockquote>
-acm.bst, amsalpha.bst, amsplain.bst, apalike.bst, gerabbrv.bst,
-geralpha.bst, gerapali.bst, gerplain.bst, gerunsrt.bst, ieeetr.bst,
-siam.bst, mla.bst
-</blockquote>
-
-<p>Style files which are known to fail:</p>
-<ul>
-<li>Currently (as of at least v0.5), there exists a style <code>achicago.bst</code>
-which seems to fox <code>urlbst</code>; it turns out that there's a
-simpler but almost equivalent style <code>chicago.bst</code> which
-works.</li>
-
-<li>Some APA-like styles, including at least <code>apager.bst</code>,
-seem to be sufficiently different from the most common styles, that
-they confuse <code>urlbst</code> completely.</li>
-
-<li>The <em>koma-script</em> styles and the <em>refer</em> styles are
-not designed to produce conventional <code>.bbl</code> files, and
-<code>urlbst</code> does not aim to produce anything useful from these.</li>
-</ul>
-<p>This might be a good time for me to revisit the rather
-convoluted logic within the script, to make it a little more robust in
-the face of variants like these, but don't hold your breath. The
-logic within the script is pretty hideous (it essentially works by
-spotting patterns in the input style file, and replacing or extending
-bits of BibTeX style-file code. This is a fragile technique, and is
-probably at the limits of its usefulness, therefore I'd take some
-persuading to add significant extra functionality to the script.</p>
-
-<p>The natbib and revtex style files already have URL fields. If you have a
-BibTeX style file which you think ought to work, but with which the
-script fails, send it to me, and I'll try to work out what I've
-missed (no promises, though).</p>
-
-<p>Note that the command to invoke the script changed from `urlbst.pl'
-to plain `urlbst' between versions 0.3 and 0.4.</p>
-
-<h2><a name='example'>For example...</a></h2>
-<p>To add URL support to the standard <code>siam.bst</code> file, you
-can give the command</p>
-<pre>
-% urlbst /path/to/original/siam.bst siamurl.bst
-</pre>
-<p>Your TeX installation will likely have some way of helping you find where
-the original <code>.bst</code> files are. On teTeX-based systems, for
-example, the command <code>kpsewhich siam.bst</code> returns the full
-path of the <code>siam.bst</code> file which BibTeX would find.</p>
-
-<p>The distributed files <code>abbrvurl.bst</code>,
-<code>alphaurl.bst</code>, <code>plainurl.bst</code> and
-<code>unsrturl.bst</code> are versions of the standard style files
-which have been pre-converted.</p>
-
-<p>There is more general discussion of including URLs in
-bibliographies in the <a
-href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=citeURL" >UK TeX
-FAQ</a>.</p>
-
-<h2><a name='download'>Download and installation</a></h2>
-
-<p>Download the file as a
-<a href="urlbst- at PACKAGE_VERSION@.tar.gz" >tarball</a>
-or
-<a href="urlbst- at PACKAGE_VERSION@.zip" >zip file</a>
-and unpack it. Or you can clone the source repository at
-<a href='http://bitbucket.org/nxg/urlbst/'>bitbucket.org</a>.</p>
-
-<p>To install, you should simply copy the distributed
-<code>urlbst</code> script to someplace on the path (such as
-<code>/usr/local/bin</code>, or <code>~/local/bin</code>, depending on
-your privileges and tastes).</p>
-
-<p>If you (might) want to use the pre-converted standard
-<code>.bst</code> files, then you'll need to copy these to somewhere
-in the BibTeX search path. Type <kbd>kpsepath bst</kbd> on Unix to
-find out the list of places BibTeX searches, and pick either one of
-the user-local locations, or a system-wide one. If you're installing
-in a system-wide location, you'll need admin privileges, obviously,
-and you will probably need to use <code>texhash</code>,
-<code>mktexlsr</code> or its equivalent, to update LaTeX's filename
-cache. For further hints here, see
-the TeX FAQ entries on <a
-href='http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages'
->installing a package</a> and <a
-href='http://www.tex.ac.uk/cgi-bin/texfaq2html?label=wherefiles'
->where LaTeX puts files</a>.</p>
-
-<p>That should be all you have to do.</p>
-
-<p>The urlbst script is distributed with a path which should just work,
-as long as the Perl binary is in your path, but if you have problems
-here, then you might want to change the first line to something like</p>
-<pre>
-#! /usr/local/bin/perl
-</pre>
-<p>if that's where your Perl binary is.</p>
-
-<p>You can also use the conventional <code>./configure; make; make
-install</code> to configure and install the package (as root, or using
-<code>sudo</code> if you're installing it in a system location),
-though you still have to install the <code>.bst</code> files by hand.
-This is rather heavyweight for the trivial amount of configuration
-required, so it's almost always simpler just to do things by hand.</p>
-
-<p>If you need to change some of the <code>urlbst</code> defaults,
-however, or if your fingers type <code>./configure</code>
-spontaneously, then you can be reassured that the configure script
-supports the standard <code>--prefix</code> option, plus the following
-options setting defaults:</p>
-<dl>
-
-<dt><code>--with-eprints=url</code>, <code>--without-eprints</code></dt>
-
-<dd>This makes the <code>--eprints</code> option to urlbst available
-by default, and allows you to optionally specify a prefix for creating
-URLs from eprint numbers. The default for this URL is
-<code>http://arxiv.org/abs/</code> -- this is appropriate for arXiv,
-obviously, but there are now a variety of other preprint archives
-appearing, for which this might be inappropriate. If you have
-comments on this default, or alternatives, please let me know. This
-option is enabled by default; if you have some reason for disabling
-the <code>--eprints</code> option for urlbst, the give the configure
-option <code>--without-eprints</code></dd>
-
-<dt><code>--with-doi=url</code>, <code>--without-doi</code></dt>
-
-<dd>This makes available the <code>--doi</code> option to urlbst and,
-as with the <code>--with-eprints</code> option, allows you to
-customise the DOI resolver URL. The <code>--doi</code> option to
-urlbst is on by default.</dd>
-
-<dt><code>--with-href=0/1/2</code></dt>
-
-<dd>This allows you to specify the type of hyperlinks which are
-inserted in the bibliography. Values 0, 1 and 2, indicating no
-hyperlinks, hypertex-style links, and hyperref-style links,
-respectively. The default is <code>--with-href=0</code>. The
-<code>hyperref</code>-style option is intended to complement the
-increasingly standard <code>hyperref</code> package.</dd>
-
-</dl>
-
-<p>The first two options simply change defaults, and if you never use
-the new <code>eprints</code> or <code>doi</code> fields, then the
-defaults don't matter to you. </p>
-
-<p>Since the modified style generates URLs wrapped in the
-<code>\url{}</code> macro, it is useful to use the resulting
-bibliography style alongside the <code>url</code> package. Since this
-tends to work with <code>hyperref</code> anyway, where possible, you
-don't get any extra goodness by changing the <code>--with-href</code>
-default at configuration time.</p>
-
-<h3>Documentation</h3>
-
-<p>Basic documentation is in the file <code>urlbst.tex</code>. This
-is distributed as a PDF file, but if you want to regenerate it, use</p>
-<pre>
-% latex urlbst
-% bibtex urlbst
-% latex urlbst
-% latex urlbst
-</pre>
-
-<h2><a name='information'>Further Information and acknowledgements</a></h2>
-
-<p><code>urlbst</code> is archived on CTAN at <a
-href="http://www.tex.ac.uk/tex-archive/biblio/bibtex/contrib/urlbst/"
-><code>biblio/bibtex/contrib/urlbst/</code></a>, and discussed in the
-<a href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=citeURL" >TeX
-FAQ</a>.</p>
-
-<p>The source code for the package is maintained at
-<a href='http://bitbucket.org/nxg/urlbst/'>bitbucket.org</a>,
-which also includes an issue tracker, where you can report bugs (or
-just mail me).</p>
-
-<p>The <a href="http://purl.org/nxg/dist/urlbst"
->home page of urlbst</a> might possibly have more recent versions than the
-one you're looking at now.</p>
-
-<p>Thanks are due to many people for suggestions and requests,
-and to 'ijvm' for code contributions.</p>
-
-<p>Copyright 2002-11, Norman Gray. Released under the terms of the GNU
-General Public Licence.</p>
-
-<h2><a name='history'>Version history</a></h2>
-<dl>
-<dt><strong>0.7, </strong></dt>
-<dd>Add --nodoi, --noeprints and --nopubmed options (which defaulted
-on, and couldn't otherwise be turned off)</dd>
-
-<dt>0.7b1, 2011 March 17</dt>
-<dd>Allow parameterisation of literal strings, with option <code>--literal</code>.</dd>
-
-<dt>0.6-5, 2011 March 8</dt>
-<dd>Adjust support for inline links (should now work for arXiv, DOI and Pubmed)</dd>
-
-<dt>0.6-4, 2009 April 28</dt>
-<dd>Work around BibTeX linebreaking bug (thanks to Andras Salamon for the bug report).</dd>
-
-<dt>0.6-3, 2009 April 19</dt>
-<dd>Fix inline link generation (thanks to Eric Chamberland for the bug report).</dd>
-
-<dt>0.6-2, 2008 November 17</dt>
-<dd>We now turn on inlinelinks when we spot format.vol.num.pages,
-which means we include links for those styles which don't include a
-title in the citation (common for articles in physical science styles,
-such as aip.sty).</dd>
-
-<dt>0.6-1, 2008 June 16</dt>
-<dd>Fixed some broken links to the various citation standards
-(I think in this context this should probably <em>not</em> be happening, yes?).
-The distributed <code>*url.bst</code> no longer have the
-<code>--inlinelinks</code> option turned on by default.</dd>
-
-<dt><strong>0.6, 2007 March 26</strong></dt>
-<dd><p>Added the option <code>--inlinelinks</code>, which adds inline hyperlinks
-to any bibliography entries which have URLs, but does so inline, rather
-than printing the URL explicitly in the bibliography. This is (primarily)
-useful if you're preparing a version of a document which will be read
-on-screen. Thanks to Jason Eisner for the suggestion, and much testing.</p>
-<p>Incorporate hyperref bugfixes from Paweł Widera.</p>
-<dl>
-<dt>0.6b3</dt>
-<dd>Further reworkings of the inlinelinks support, so that it's now
-fired by a format.title (or format.btitle) line, with a fallback in
-fin.entry. This should be more robust, and allows me to delete some
-of the previous version's gymnastics.</dd>
-
-<dt>0.6b2</dt>
-<dd>Reworked <code>inlinelinks</code> support; should now be more
-robust. Incorporate hyperref bugfixes from Paweł Widera.</dd>
-
-<dt>0.6b1</dt>
-<dd>Added the option <code>inlinelinks</code>, which adds inline hyperlinks
-to any bibliography entries which have URLs, but does so inline, rather
-than printing the URL explicitly in the bibliography. This is (only)
-useful if you're preparing a version of a document which will be read
-on-screen.</dd>
-</dl>
-</dd>
-
-<dt>0.5.2, 2006 September 6</dt>
-<dd>Another set of documentation-only changes, hopefully clarifying
-installation.</dd>
-
-<dt>0.5.1, 2006 January 10</dt>
-<dd>No functionality changes. Documentation and webpage changes only,
-hopefully clarifying usage and configuration</dd>
-
-<dt><strong>0.5, 2005 June 3</strong></dt>
-<dd>Added support for Digital Object Identifiers (DOI) fields in
-bibliographies.</dd>
-
-<dt>0.4-1, 2005 April 12</dt>
-<dd>Documentation improvements -- there are now examples in the help text!</dd>
-
-<dt><strong>0.4, 2004 December 1</strong></dt>
-<dd>Bug fixes: now compatible with mla.bst and friends.
-Now uses <code>./configure</code> (optionally). Assorted reorganisation.</dd>
-
-<dt><strong>0.3, 2003 June 4</strong></dt>
-<dd>Added --eprint, --hypertex and --hyperref options.</dd>
-
-<dt><strong>0.2, 2002 October 23</strong></dt>
-<dd>The `editor' field is now supported in the webpage entry type. Basic
-documentation added.</dd>
-
-<dt><strong>0.1, 2002 April</strong></dt>
-<dd>Initial version</dd>
-
-</dl>
-
-
-<div class="signature">
-<a href="http://nxg.me.uk"
- >Norman Gray</a><br/>
- at RELEASEDATE@
-</div>
-
-</body>
-</html>
Modified: trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.in
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.in 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.in 2019-07-02 20:58:10 UTC (rev 51530)
@@ -8,7 +8,13 @@
#
# See http://purl.org/nxg/dist/urlbst for documentation
#
-# $Id$
+# Copyright @COPYRIGHTYEARS@, Norman Gray <http://nxg.me.uk>
+#
+# This program is distributed under the terms of the
+# GNU General Public Licence, v2.0.
+# The modifications to the input .bst files are asserted as Copyright @COPYRIGHTYEARS@, Norman Gray,
+# and distributed under the terms of the LaTeX Project Public Licence.
+# See the package README for further dicussion of licences.
$version = '@PACKAGE_VERSION@';
($progname = $0) =~ s/.*\///;
@@ -195,6 +201,9 @@
print OUT "%%% Modification of BibTeX style file ", ($infile eq '-' ? '<stdin>' : $infile), "\n";
print OUT "%%% ... by $progname, version $version (marked with \"$mymarker\")\n%%% See <$myurl>\n";
+print OUT "%%% Modifications Copyright @COPYRIGHTYEARS@, Norman Gray,\n";
+print OUT "%%% and distributed under the terms of the LPPL; see README for discussion.\n";
+print OUT "%%%\n";
print OUT "%%% Added webpage entry type, and url and lastchecked fields.\n";
print OUT "%%% Added eprint support.\n" if ($addeprints);
print OUT "%%% Added DOI support.\n" if ($adddoiresolver);
@@ -211,6 +220,11 @@
$found{formatdate} = 0;
$found{formattitle} = 0;
$found{newblock} = 0;
+# The following are initialised negative, which Perl treats as true,
+# so the simple test 'if ($found{formateprint}) ...' will be true.
+$found{formateprint} = -1;
+$found{formatdoi} = -1;
+$found{formatpubmed} = -1;
while (<IN>) {
/^ *%/ && do {
@@ -331,6 +345,24 @@
$found{newblock} = 1;
};
+ /^ *FUNCTION *\{format.doi\}/ && do {
+ #print STDERR "$progname: style file $infile already supports DOIs; urlbst format.doi disabled\n(see generated .bst style: you may need to make edits near \$adddoiresolver)\n";
+ $found{formatdoi} = 1;
+ $adddoiresolver = 0;
+ };
+
+ /^ *FUNCTION *\{format.eprint\}/ && do {
+ #print STDERR "$progname: style file $infile already supports eprints; urlbst format.eprint disabled\n(see generated .bst style: you may need to make edits near \$addeprints)\n";
+ $found{formateprint} = 1;
+ $addeprints = 0;
+ };
+
+ /^ *FUNCTION *\{format.pubmed\}/ && do {
+ #print STDERR "$progname: style file $infile already supports Pubmed; urlbst format.pubmed disabled\n(see generated .bst style: you may need to make edits near \$addpubmedresolver)\n";
+ $found{formatpubmed} = 1;
+ $addpubmedresolver = 0;
+ };
+
/^ *FUNCTION *{output\.nonnull}/ && do {
print OUT "$mymarker\n";
print OUT "FUNCTION {output.nonnull.original}\n";
@@ -585,7 +617,9 @@
}
if$
}
+EOD
+ $formateprintfunction = <<'EOD';
FUNCTION {format.eprint}
{ eprint empty$
{ "" }
@@ -592,7 +626,13 @@
{ eprintprefix eprint * eprinturl eprint * make.href }
if$
}
+EOD
+ output_replacement_function($found{formateprint},
+ 'format.eprint',
+ 'addeprints',
+ $formateprintfunction);
+ $formatdoifunction = <<'EOD';
FUNCTION {format.doi}
{ doi empty$
{ "" }
@@ -599,7 +639,13 @@
{ doiprefix doi * doiurl doi * make.href }
if$
}
+EOD
+ output_replacement_function($found{formatdoi},
+ 'format.doi',
+ 'adddoiresolver',
+ $formatdoifunction);
+ $formatpubmedfunction = <<'EOD';
FUNCTION {format.pubmed}
{ pubmed empty$
{ "" }
@@ -606,7 +652,13 @@
{ pubmedprefix pubmed * pubmedurl pubmed * make.href }
if$
}
+EOD
+ output_replacement_function($found{formatpubmed},
+ 'format.pubmed',
+ 'addpubmedresolver',
+ $formatpubmedfunction);
+ print OUT <<'EOD';
% Output a URL. We can't use the more normal idiom (something like
% `format.url output'), because the `inbrackets' within
% format.lastchecked applies to everything between calls to `output',
@@ -627,8 +679,17 @@
new.block
inlinelinks
'skip$ % links were inline -- don't repeat them
- {
- output.url
+ { % If the generated DOI will be the same as the URL,
+ % then don't print the URL (thanks to Joseph Wright for this code,
+ % at http://tex.stackexchange.com/questions/5660)
+ adddoiresolver
+ doiurl doi empty$ { "X" } { doi } if$ * % DOI URL to be generated
+ url empty$ { "Y" } { url } if$ % the URL, or "Y" if empty
+ = % are the strings equal?
+ and
+ 'skip$
+ { output.url }
+ if$
addeprints eprint empty$ not and
{ format.eprint output.nonnull }
'skip$
@@ -718,6 +779,30 @@
}
+sub output_replacement_function {
+ my $emit_function = $_[0];
+ my $function_name = $_[1];
+ my $disabling_variable = $_[2];
+ my $function_definition_string = $_[3];
+
+ if ($emit_function > 0) {
+ print OUT <<"EOD";
+%%% The style file $infile already supports $function_name,
+%%% but it might not do so in the same way as urlbst expects.
+%%% I've therefore left $infile 's function unchanged,
+%%% and disabled urlbst's version; proceed with some caution.
+EOD
+
+ print STDERR "$progname: WARNING: style file $infile already includes a $function_name function;\nyou may need to disable the urlbst version by setting \$$disabling_variable to zero.\nYou might want to edit the output file (search for $function_name).\n";
+
+ ($t = $function_definition_string) =~ s/\n/\n%%% /g;
+ print OUT "%%% " . $t . "$mymarker\n";
+ } else {
+ print OUT $function_definition_string;
+ }
+ print OUT "\n";
+}
+
sub print_missing_functions {
# We've got to the bit of the file which handles the entry
# types, so write out the webpage entry handler. This uses
Modified: trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.tex
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.tex 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.tex 2019-07-02 20:58:10 UTC (rev 51530)
@@ -2,7 +2,7 @@
\title{The \texttt{urlbst} package}
\author{Norman Gray\\\texttt{<http://nxg.me.uk>}}
-\date{Version 0.7, 2011 July 20}
+\date{Version 0.8, 2019 July 1}
%\usepackage{times}
\usepackage{url}
@@ -52,7 +52,7 @@
a reference, along with the date at which the URL was last checked
to exist;
\item \btfield{doi}, for a reference's DOI
- (see \url{http://doi.org});
+ (see \url{https://doi.org});
\item \btfield{eprint}, for an arXiv eprint reference
(see \url{http://arxiv.org}); and
\item \btfield{pubmed} for a reference's PubMed identifier
@@ -62,7 +62,7 @@
Usage is simple:
\begin{verbatim}
% urlbst [--eprint] [--doi] [--pubmed]
- [--nohyperlinks] [--inlinelinks] [--hypertex] [--hyperref]
+ [--nohyperlinks] [--inlinelinks] [--hypertex] [--hyperref]
[input-file [output-file]]
\end{verbatim}
where the |input-file| is an existing |.bst| file, and
@@ -134,7 +134,7 @@
appropriate Hyper\TeX\ special.
When the style file generates a link for DOIs, it does so by
-prepending the string \texttt{http://dx.doi.org/} to the DOI. This is
+prepending the string \texttt{https://doi.org/} to the DOI. This is
generally reasonable, but some DOIs have characters in them which are
illegal in URLs, with the result that the resulting
\texttt{dx.doi.org} URL doesn't work. The only real way of resolving
@@ -228,7 +228,7 @@
ISO-690~\cite{url:iso690} is a formal standard for this stuff. Walker
and Taylor's \emph{Columbia Guide to Online Style}~\cite{walker06}
provides extensive coverage (but is only available on dead trees).
-There are two style guides associated with the APA, namely
+There are two style guides associated with the APA, namely
the published APA style
guide~\cite{apastyle} (a paper-only publication, so should be
ignored by all, if there's any justice in the world), and what appears
@@ -271,11 +271,127 @@
See also the URL entry in the UK \TeX\ FAQ~\cite{texfaq}, and
references therein.
-\textbf{Acknowledgements:} Thanks to Jason Eisner for suggesting
-the |--inlinelinks| option, to Pawe\l{} Widera for the
-suggestion to use |\path| when formatting DOIs and to Michael Giffin
-for the suggestion to include PubMed URLs.
+%% \textbf{Acknowledgements:} Thanks
+%% to Jason Eisner for suggesting the |--inlinelinks| option;
+%% to `ijvm' for code contributions in the |urlbst| script;
+%% to Pawe\l{} Widera for the suggestion to use |\path| when formatting DOIs;
+%% to Michael Giffin for the suggestion to include PubMed URLs;
+%% to Katrin Leinweber for the pull request which fixed the format of DOI
+%% references.
+\section{Acknowledgements, and release notes}
+
+%%% include:release-notes.tex
+
+
+Thanks are due to many people for suggestions and requests:
+to Jason Eisner for suggesting the |--inlinelinks| option;
+to ‘ijvm’ for code contributions in the |urlbst| script;
+to Paweł Widera for the suggestion to use |\path| when formatting DOIs;
+to Michael Giffin for the suggestion to include PubMed URLs;
+to Katrin Leinweber for the pull request which fixed the format of DOI
+references.
+
+\begin{description}
+\item[\textbf{0.8, 2019 July 1}]\relax
+\begin{itemize}
+\item The presence of a preexisting |format.doi|,
+|format.eprint| or |format.pubmed| function is
+now detected, and warned about. The resulting |.bst| file
+might still require some manual editing.
+Resolves issue 8\footnote{\url{https://bitbucket.org/nxg/urlbst/issue/8}}.
+\item Clarified licences (I hope).
+\item Adjust format of DOI resolver.
+Resolves issue 11\footnote{\url{https://bitbucket.org/nxg/urlbst/issue/11}},
+thanks to
+code contributed by Katrin Leinweber\footnote{\url{https://bitbucket.org/nxg/urlbst/pull-requests/1/}}.
+\end{itemize}
+
+
+\item[0.7, 2011 July 20]\relax
+Add |--nodoi|, |--noeprints| and |--nopubmed| options (which defaulted
+on, and couldn't otherwise be turned off)
+
+\item[0.7b1, 2011 March 17]\relax
+Allow parameterisation of literal strings, with option |--literal|.
+
+\item[0.6-5, 2011 March 8]\relax
+Adjust support for inline links (should now work for arXiv, DOI and Pubmed)
+
+\item[0.6-4, 2009 April 28]\relax
+Work around BibTeX linebreaking bug (thanks to Andras Salamon for the bug report).
+
+\item[0.6-3, 2009 April 19]\relax
+Fix inline link generation (thanks to Eric Chamberland for the bug report).
+
+\item[0.6-2, 2008 November 17]\relax
+We now turn on inlinelinks when we spot format.vol.num.pages,
+which means we include links for those styles which don't include a
+title in the citation (common for articles in physical science styles,
+such as aip.sty).
+
+\item[0.6-1, 2008 June 16]\relax
+Fixed some broken links to the various citation standards
+(I think in this context this should probably \emph{not} be happening, yes?).
+The distributed |*url.bst| no longer have the
+|--inlinelinks| option turned on by default.
+
+\item[\textbf{0.6, 2007 March 26}]\relax
+\begin{itemize}
+\item Added the option |--inlinelinks|, which adds inline hyperlinks
+to any bibliography entries which have URLs, but does so inline, rather
+than printing the URL explicitly in the bibliography. This is (primarily)
+useful if you're preparing a version of a document which will be read
+on-screen. Thanks to Jason Eisner for the suggestion, and much testing.
+
+\item Incorporate hyperref bugfixes from Paweł Widera.
+
+\item Further reworkings of the inlinelinks support, so that it's now
+fired by a |format.title| (or |format.btitle|) line, with a fallback in
+|fin.entry|. This should be more robust, and allows me to delete some
+of the previous version's gymnastics.
+
+\item Reworked |inlinelinks| support; should now be more
+robust. Incorporate hyperref bugfixes from Paweł Widera.
+
+\item Added the option |inlinelinks|, which adds inline hyperlinks
+to any bibliography entries which have URLs, but does so inline, rather
+than printing the URL explicitly in the bibliography. This is (only)
+useful if you're preparing a version of a document which will be read
+on-screen.
+\end{itemize}
+
+
+\item[0.5.2, 2006 September 6]\relax
+Another set of documentation-only changes, hopefully clarifying
+installation.
+
+\item[0.5.1, 2006 January 10]\relax
+No functionality changes. Documentation and webpage changes only,
+hopefully clarifying usage and configuration
+
+\item[\textbf{0.5, 2005 June 3}]\relax
+Added support for Digital Object Identifiers (DOI) fields in
+bibliographies.
+
+\item[0.4-1, 2005 April 12]\relax
+Documentation improvements -- there are now examples in the help text!
+
+\item[\textbf{0.4, 2004 December 1}]\relax
+Bug fixes: now compatible with mla.bst and friends.
+Now uses |./configure| (optionally). Assorted reorganisation.
+
+\item[\textbf{0.3, 2003 June 4}]\relax
+Added |--eprint|, |--hypertex| and |--hyperref| options.
+
+\item[\textbf{0.2, 2002 October 23}]\relax
+The `editor' field is now supported in the webpage entry type. Basic
+documentation added.
+
+\item[\textbf{0.1, 2002 April}]\relax
+Initial version
+\end{description}
+
\bibliography{urlbst}
\bibliographystyle{plainurl}
Deleted: trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.tex.in
===================================================================
--- trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.tex.in 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/doc/bibtex/urlbst/urlbst.tex.in 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,282 +0,0 @@
-\documentclass[a4paper]{article}
-
-\title{The \texttt{urlbst} package}
-\author{Norman Gray\\\texttt{<http://nxg.me.uk>}}
-\date{Version @PACKAGE_VERSION@, @RELEASEDATE@}
-
-%\usepackage{times}
-\usepackage{url}
-\usepackage{hyperref}
-
-% Not long enough to make it useful to number sections
-\setcounter{secnumdepth}{0}
-
-% Squeeze a bit more on to the page
-%\addtolength\textwidth{1cm}
-%\addtolength\oddsidemargin{-0.5cm}
-
-\makeatletter
-% Easy verbatim mode
-\catcode`\|=\active
-\def|{\begingroup \let\do\@makeother \dospecials \verbatim at font \doverb}
-\def\doverb#1|{#1\endgroup}
-
-\renewcommand{\verbatim at font}{\normalfont\small\ttfamily}
-\makeatother
-
-\newcommand{\ub}{\package{urlbst}}
-\newcommand{\BibTeX}{Bib\TeX}
-\newcommand{\package}[1]{\texttt{#1}}
-\newcommand{\btfield}[1]{\textsf{#1}}
-
-\begin{document}
-\maketitle
-
-The \ub\ package consists of a Perl script which edits \BibTeX\ style
-files (|.bst|) to add a \btfield{webpage} entry type, and which adds a
-few new fields -- notably including \btfield{url} --
-to all other entry types. The distribution includes preconverted
-versions of the four standard \BibTeX\ |.bst| style files.
-
-It has a different goal from Patrick Daly's \package{custom-bib}
-package~\cite{url:daly} -- that is intended to create a \BibTeX\ style
-|.bst| file from scratch, and supports \btfield{url} and
-\btfield{eprint} fields. This package, on the other hand, is intended
-for the case where you already have a style file that works (or at
-least, which you cannot or will not change), and edits it to add the
-new \btfield{webpage} entry type, plus the new fields.
-
-The added fields are:
-\begin{itemize}
-\item \btfield{url} and \btfield{lastchecked}, to associate a URL with
- a reference, along with the date at which the URL was last checked
- to exist;
-\item \btfield{doi}, for a reference's DOI
- (see \url{http://doi.org});
-\item \btfield{eprint}, for an arXiv eprint reference
- (see \url{http://arxiv.org}); and
-\item \btfield{pubmed} for a reference's PubMed identifier
- (\textsc{PMID}, see \url{http://pubmed.gov}).
-\end{itemize}
-
-Usage is simple:
-\begin{verbatim}
-% urlbst [--eprint] [--doi] [--pubmed]
- [--nohyperlinks] [--inlinelinks] [--hypertex] [--hyperref]
- [input-file [output-file]]
-\end{verbatim}
-where the |input-file| is an existing |.bst| file, and
-the |output-file| is the name of the new style file to be
-created. If either file name is missing, the default is the
-standard input or standard output respectively.
-For example:
-\begin{verbatim}
-% urlbst --eprint bibstyle.bst
-\end{verbatim}
-would convert the style file \texttt{bibstyle.bst}, including support
-for e-prints, and sending the result to the standard output (ie, the
-screen, so it would more useful if you were to either redirect this to
-a file or supply the output-file argument).
-
-If the option |--eprint| is present, then we switch on support for
-\texttt{eprint} fields in the modified .bst file, with a citation
-format matching that recommended in
-\url{http://arxiv.org/help/faq/references}. If the option
-|--doi| is present, we include support for a |doi| field, referring
-to a Digital Object Identifier (DOI) as standardised by
-\url{http://www.doi.org/}. And if |--pubmed| is present, we include
-support for a |pubmed| field, referring to a PubMed identifier as
-supported at \url{http://www.pubmed.gov}.
-
-If either of the |--hypertex| or |--hyperref| options is present, then
-the generated .bst file includes support for hyperlinks in the
-generated eprint entries in the bibliography, with the format being
-either Hyper\TeX\ (see
-\url{http://arxiv.org/hypertex/#implementation}), supported by xdvi,
-dvips and others, or using the support available from the
-\package{hyperref} package. These options have no effect unless one
-of the |--eprint|, |--doi|, |--pubmed| or |--inlinelinks| options is given:
-when URLs are included
-in the bibliography, they are written out using the |\url{...}|
-command. The \package{hyperref} support is more generic, and more
-generally supported, and so you should choose this unless you have a
-particular need for the Hyper\TeX\ support. The |--nohyperlinks|
-option, which is present by default, suppresses all hyperlinking.
-
-By default, any URL field is displayed as part of the bibliography
-entry, linked to the corresponding URL via the mechanism managed by
-the |--hypertex| and |--hyperref| options. If the |--inlinelinks|
-option is present, however, then the URL is not displayed in the
-printed entry, but instead a hyperlink is created, linked to suitable
-text within the bibliography entry, such as the citation title. This
-option does not affect the display of eprints, DOI or PubMed fields. It makes
-no sense to specify |--inlinelinks| with |--nohyperlinks|, and the
-script warns you if you do that, for example by failing to specify one
-of the link-style options. This option is (primarily) useful if
-you're preparing a version of a document which will be read on-screen;
-the point of it is that the resulting bibliography is substantially
-more compact than it would otherwise be.
-
-The support for all the above behaviours is always included in the
-output file. The options instead control only whether the various
-behaviours are enabled or disabled, and if you need to alter these,
-you may do so by editing the generated |.bst| file and adjusting
-values in the |{init.urlbst.variables}| function, where indicated.
-
-The generated references have URLs inside |\url{...}|. The best
-way to format this this is with the \package{url} package
-(see~\cite{texfaq} for pointers), but as a poor alternative, you can
-try |\newcommand{\url}[1]{\texttt{#1}}|. The \package{hyperref}
-package automatically processes |\url{...}| in the correct way to
-include a hyperlink, and if you have selected \package{hyperref}
-output, then nothing more need be done. If you selected Hyper\TeX\
-output, however, then the script encloses the |\url| command in an
-appropriate Hyper\TeX\ special.
-
-When the style file generates a link for DOIs, it does so by
-prepending the string \texttt{http://dx.doi.org/} to the DOI. This is
-generally reasonable, but some DOIs have characters in them which are
-illegal in URLs, with the result that the resulting
-\texttt{dx.doi.org} URL doesn't work. The only real way of resolving
-this is to write a URL-encoding function in the style-file
-implementation language, but while that would doubtless be feasible in
-principle, it would be hard and very, very, ugly. The only advice I
-can offer in this case is to rely on the fact that the DOI will still
-appear in the typeset bibliography, and that users who would want to
-take advantage of the DOI will frequently (or usually?) know how to
-resolve the DOI when then need to. As a workaround, you could include
-a URL-encoded DOI URL in the \btfield{url} field of the entry (thanks
-to Eric Chamberland for this suggestion).
-
-The \ub\ script works by spotting patterns and characteristic function
-names in the input |.bst| file. It works as-is in the case of the
-four standard \BibTeX\ style files |plain.bst|, |unsrt.bst|,
-|alpha.bst| and |abbrv.bst|. It also works straightforwardly for
-many other style files -- since many of these are derived from, or at
-least closely inspired by, the standard ones -- but it does not
-pretend that it can do so for all of them. In some cases, such as the
-style files for the \package{refer} or \package{koma-script} packages,
-the style files are not intended to be used for formatting; others are
-sufficiently different from the standard files that a meaningful edit
-becomes impossible. For the large remainder, however, the result of
-this script should need only relatively minor edits before being
-perfectly usable.
-
-\section{New \texttt{.bib} entry and field types}
-
-The new entry type \btfield{webpage} has required fields
-\btfield{title} and \btfield{url}, and optional fields
-\btfield{author}, \btfield{editor}, \btfield{note}, \btfield{year},
-\btfield{month} and \btfield{lastchecked}. The \btfield{url} and
-\btfield{lastchecked} fields are new, and are
-valid in other entry types as well: the first, obviously, is the URL
-which is being cited, or which is being quoted as an auxiliary source
-for an article perhaps; the second is the date when you last checked
-that the URL was there, in the state you quoted it; this is necessary
-since some people, heedless of the archival importance of preserving
-the validity of URLs, indulge in the vicious practice of reorganising
-web pages and destroying links. For the case of the \btfield{webpage} entry
-type, the \btfield{editor} field should be used for the `maintainer'
-of a web page.
-
-For example, in Figure~\ref{f:ex} we illustrate two potential |.bib|
-file entries. The \texttt{@webpage} entry type is the new type
-provided by this package, and provides reference information for a
-webpage; it includes the new \texttt{url} and \texttt{lastchecked}
-fields. There is also an example of the standard \texttt{@book} entry
-type, which now includes the \texttt{url} and \texttt{lastchecked}
-fields as well. The difference between the two references is that in
-the \texttt{@book} case it is the book being cited, so that the
-\texttt{url} provides extra information; in the \texttt{@webpage} case
-it is the page itself which is of interest. You use the new |eprint|,
-|doi| and |pubmed| fields similarly, if the bibliographic item in
-question has an e-print, DOI or PubMed reference.
-\begin{figure}
-\begin{verbatim}
- at Manual{w3chome,
- url = {http://www.w3.org},
- title = {The World Wide Web Consortium},
- year = 2009,
- lastchecked = {26 August 2009}}
-
- at Book{schutz,
- author = {Bernard Schutz},
- title = {Gravity from the GroundUp},
- publisher = {Cambridge University Press},
- year = {2003},
- url = {http://www.gravityfromthegroundup.org/},
- lastchecked = {2008 June 16}}
-\end{verbatim}
-\caption{\label{f:ex}The new \texttt{@webpage} entry type, and the \texttt{url}
- field in action}
-\end{figure}
-
-How do you use this in a document? To use the the
-\texttt{alphaurl.bst} style -- which is a pre-converted version of the
-standard \texttt{alpha.bst} style, included in the \texttt{urlbst}
-distribution -- you simply make sure that \texttt{alphaurl.bst} is in
-your BibTeX search path (use the command \texttt{kpsepath bst} to find
-this path and \texttt{kpsewhich alphaurl.bst} to confirm that BibTeX
-can find it) and add |\bibliographystyle{alphaurl}| to your \LaTeX\ document.
-
-\section{Sources}
-
-There are various sources which suggest how to format references to
-web pages. I have followed none specifically, but fortunately they do
-not appear to materially disagree.
-
-ISO-690~\cite{url:iso690} is a formal standard for this stuff. Walker
-and Taylor's \emph{Columbia Guide to Online Style}~\cite{walker06}
-provides extensive coverage (but is only available on dead trees).
-There are two style guides associated with the APA, namely
-the published APA style
-guide~\cite{apastyle} (a paper-only publication, so should be
-ignored by all, if there's any justice in the world), and what appears
-to be the 1998 web-citation proposal for that~\cite{url:weapas}, which
-also includes some useful links.
-The TeX FAQ~\cite{texfaq} has both practical advice and pointers to other sources.%
-\footnote{Emory University's Goizueta Business Library once had a collection of
-useful links on this topic, but they've whimsically changed the URL at least twice
-since I first distributed \ub, and I've got fed up fixing their broken link.}
-
-\section{Hints}
-
-If you use Emacs' \BibTeX\ mode, you can insert the following in your
-|.emacs| file to add knowledge of the new \btfield{webpage} entry:
-\begin{verbatim}
-(defun my-bibtex-hook ()
- (setq bibtex-mode-user-optional-fields '("location" "issn")) ; e.g.
- (setq bibtex-entry-field-alist
- (cons
- '("Webpage"
- ((("url" "The URL of the page")
- ("title" "The title of the resource"))
- (("author" "The author of the webpage")
- ("editor" "The editor/maintainer of the webpage")
- ("year" "Year of publication of the page")
- ("month" "Month of publication of the page")
- ("lastchecked" "Date when you last verified the page was there")
- ("note" "Remarks to be put at the end of the entry"))))
- bibtex-entry-field-alist)))
-(add-hook 'bibtex-mode-hook 'my-bibtex-hook)
-\end{verbatim}
-After that, you can add a \btfield{webpage} entry by typing |C-c C-b webpage|
-(or |M-x bibtex-entry|).
-
-It is a \emph{very} good idea to use the \package{url} package: it deals with
-the problem of line-breaking long URLs, and with the problem that
-\BibTeX{} creates, of occasionally inserting \%-signs into URLs in
-generated bibliographies.
-
-See also the URL entry in the UK \TeX\ FAQ~\cite{texfaq}, and
-references therein.
-
-\textbf{Acknowledgements:} Thanks to Jason Eisner for suggesting
-the |--inlinelinks| option, to Pawe\l{} Widera for the
-suggestion to use |\path| when formatting DOIs and to Michael Giffin
-for the suggestion to include PubMed URLs.
-
-\bibliography{urlbst}
-\bibliographystyle{plainurl}
-
-\end{document}
Modified: trunk/Master/texmf-dist/scripts/urlbst/urlbst
===================================================================
--- trunk/Master/texmf-dist/scripts/urlbst/urlbst 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/scripts/urlbst/urlbst 2019-07-02 20:58:10 UTC (rev 51530)
@@ -8,9 +8,15 @@
#
# See http://purl.org/nxg/dist/urlbst for documentation
#
-# $Id$
+# Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray <http://nxg.me.uk>
+#
+# This program is distributed under the terms of the
+# GNU General Public Licence, v2.0.
+# The modifications to the input .bst files are asserted as Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray,
+# and distributed under the terms of the LaTeX Project Public Licence.
+# See the package README for further dicussion of licences.
-$version = '0.7';
+$version = '0.8';
($progname = $0) =~ s/.*\///;
$mymarker = "% $progname";
$mymarkerend = "% ...$progname to here";
@@ -26,7 +32,7 @@
$adddoiresolver = 1;
$literals{doiprefix} = 'doi:';
-$doiurl = 'http://dx.doi.org/';
+$doiurl = 'https://doi.org/';
$addpubmedresolver = 1;
$literals{pubmedprefix} = 'PMID:';
@@ -195,6 +201,9 @@
print OUT "%%% Modification of BibTeX style file ", ($infile eq '-' ? '<stdin>' : $infile), "\n";
print OUT "%%% ... by $progname, version $version (marked with \"$mymarker\")\n%%% See <$myurl>\n";
+print OUT "%%% Modifications Copyright 2002-03, 2005-12, 2014, 2019, Norman Gray,\n";
+print OUT "%%% and distributed under the terms of the LPPL; see README for discussion.\n";
+print OUT "%%%\n";
print OUT "%%% Added webpage entry type, and url and lastchecked fields.\n";
print OUT "%%% Added eprint support.\n" if ($addeprints);
print OUT "%%% Added DOI support.\n" if ($adddoiresolver);
@@ -211,6 +220,11 @@
$found{formatdate} = 0;
$found{formattitle} = 0;
$found{newblock} = 0;
+# The following are initialised negative, which Perl treats as true,
+# so the simple test 'if ($found{formateprint}) ...' will be true.
+$found{formateprint} = -1;
+$found{formatdoi} = -1;
+$found{formatpubmed} = -1;
while (<IN>) {
/^ *%/ && do {
@@ -331,6 +345,24 @@
$found{newblock} = 1;
};
+ /^ *FUNCTION *\{format.doi\}/ && do {
+ #print STDERR "$progname: style file $infile already supports DOIs; urlbst format.doi disabled\n(see generated .bst style: you may need to make edits near \$adddoiresolver)\n";
+ $found{formatdoi} = 1;
+ $adddoiresolver = 0;
+ };
+
+ /^ *FUNCTION *\{format.eprint\}/ && do {
+ #print STDERR "$progname: style file $infile already supports eprints; urlbst format.eprint disabled\n(see generated .bst style: you may need to make edits near \$addeprints)\n";
+ $found{formateprint} = 1;
+ $addeprints = 0;
+ };
+
+ /^ *FUNCTION *\{format.pubmed\}/ && do {
+ #print STDERR "$progname: style file $infile already supports Pubmed; urlbst format.pubmed disabled\n(see generated .bst style: you may need to make edits near \$addpubmedresolver)\n";
+ $found{formatpubmed} = 1;
+ $addpubmedresolver = 0;
+ };
+
/^ *FUNCTION *{output\.nonnull}/ && do {
print OUT "$mymarker\n";
print OUT "FUNCTION {output.nonnull.original}\n";
@@ -585,7 +617,9 @@
}
if$
}
+EOD
+ $formateprintfunction = <<'EOD';
FUNCTION {format.eprint}
{ eprint empty$
{ "" }
@@ -592,7 +626,13 @@
{ eprintprefix eprint * eprinturl eprint * make.href }
if$
}
+EOD
+ output_replacement_function($found{formateprint},
+ 'format.eprint',
+ 'addeprints',
+ $formateprintfunction);
+ $formatdoifunction = <<'EOD';
FUNCTION {format.doi}
{ doi empty$
{ "" }
@@ -599,7 +639,13 @@
{ doiprefix doi * doiurl doi * make.href }
if$
}
+EOD
+ output_replacement_function($found{formatdoi},
+ 'format.doi',
+ 'adddoiresolver',
+ $formatdoifunction);
+ $formatpubmedfunction = <<'EOD';
FUNCTION {format.pubmed}
{ pubmed empty$
{ "" }
@@ -606,7 +652,13 @@
{ pubmedprefix pubmed * pubmedurl pubmed * make.href }
if$
}
+EOD
+ output_replacement_function($found{formatpubmed},
+ 'format.pubmed',
+ 'addpubmedresolver',
+ $formatpubmedfunction);
+ print OUT <<'EOD';
% Output a URL. We can't use the more normal idiom (something like
% `format.url output'), because the `inbrackets' within
% format.lastchecked applies to everything between calls to `output',
@@ -627,8 +679,17 @@
new.block
inlinelinks
'skip$ % links were inline -- don't repeat them
- {
- output.url
+ { % If the generated DOI will be the same as the URL,
+ % then don't print the URL (thanks to Joseph Wright for this code,
+ % at http://tex.stackexchange.com/questions/5660)
+ adddoiresolver
+ doiurl doi empty$ { "X" } { doi } if$ * % DOI URL to be generated
+ url empty$ { "Y" } { url } if$ % the URL, or "Y" if empty
+ = % are the strings equal?
+ and
+ 'skip$
+ { output.url }
+ if$
addeprints eprint empty$ not and
{ format.eprint output.nonnull }
'skip$
@@ -718,6 +779,30 @@
}
+sub output_replacement_function {
+ my $emit_function = $_[0];
+ my $function_name = $_[1];
+ my $disabling_variable = $_[2];
+ my $function_definition_string = $_[3];
+
+ if ($emit_function > 0) {
+ print OUT <<"EOD";
+%%% The style file $infile already supports $function_name,
+%%% but it might not do so in the same way as urlbst expects.
+%%% I've therefore left $infile 's function unchanged,
+%%% and disabled urlbst's version; proceed with some caution.
+EOD
+
+ print STDERR "$progname: WARNING: style file $infile already includes a $function_name function;\nyou may need to disable the urlbst version by setting \$$disabling_variable to zero.\nYou might want to edit the output file (search for $function_name).\n";
+
+ ($t = $function_definition_string) =~ s/\n/\n%%% /g;
+ print OUT "%%% " . $t . "$mymarker\n";
+ } else {
+ print OUT $function_definition_string;
+ }
+ print OUT "\n";
+}
+
sub print_missing_functions {
# We've got to the bit of the file which handles the entry
# types, so write out the webpage entry handler. This uses
Added: trunk/Master/texmf-dist/source/bibtex/urlbst/Makefile.in
===================================================================
--- trunk/Master/texmf-dist/source/bibtex/urlbst/Makefile.in (rev 0)
+++ trunk/Master/texmf-dist/source/bibtex/urlbst/Makefile.in 2019-07-02 20:58:10 UTC (rev 51530)
@@ -0,0 +1,173 @@
+# Makefile for urlbst
+
+# BSTSTYLES are the standard styles that we distribute
+BSTSTYLES=plainurl.bst unsrturl.bst alphaurl.bst abbrvurl.bst
+# TESTSTYLES are a couple of extra ones that we explicitly test
+TESTSTYLES=mlaurl.bst amsalphaurl.bst
+
+MAINTAINER_FILES= Makefile configure
+GENERATED=urlbst urlbst.tex urlbst.pdf urlbst.html README VERSION $(BSTSTYLES)
+# distribute generated files
+# ...plus the configure files
+# ...plus the configured files
+DISTRIBS=$(GENERATED) \
+ configure configure.ac \
+ urlbst.in urlbst.bib Makefile.in \
+ LICENCE-gpl-2.0.txt LICENCE-lppl.txt
+
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+DIST=urlbst- at PACKAGE_VERSION@
+
+# On OS X, the following avoids extended attributes being included
+TAR=COPYFILE_DISABLE=1 tar
+#TAR=tar
+
+### Implicit rules
+
+# Don't include --inlinelinks when generating %url.bst here, as we
+# do want the links visible when generating the documentation, and it's
+# probably abetter default in any case.
+%url.bst: urlbst
+ export BSTINPUTS=test: ; \
+ if test -z "`kpsewhich ${@:url.bst=.bst}`"; then \
+ echo "Can't locate ${@:url.bst=.bst}"; \
+ else \
+ ./urlbst --eprint --doi --pubmed --hyperref `kpsewhich ${@:url.bst=.bst}` $@; \
+ fi
+
+# Incomplete TeX support
+%.ps: %.dvi
+ dvips -o $@ $<
+%.bbl: %.tex plainurl.bst
+ pdflatex $<
+ if ! test -f $@ || grep -q 'Citation.*undefined' ${<:.tex=.log}; then \
+ bibtex ${<:.tex=}; \
+ pdflatex $<; \
+ rm ${<:.tex=.pdf}; \
+ fi
+%.pdf: %.tex %.bbl
+ pdflatex $<
+%.dvi: %.tex %.bbl
+ latex $<
+%.gz: %
+ gzip --best -f $<
+
+.PRECIOUS: .bbl
+
+### Targets start here
+
+all: urlbst
+
+dist: $(DIST).tar.gz $(DIST).zip
+
+$(DIST).tar: $(DIST)/urlbst.in
+ $(TAR) cf $@ $(DIST)
+
+$(DIST).zip: $(DIST)/urlbst.in
+ zip -r $@ $(DIST)
+
+$(DIST)/urlbst.in: $(DISTRIBS)
+ if test -d $(DIST); then rm -Rf $(DIST); fi && mkdir $(DIST)
+ cp $(DISTRIBS) $(DIST)
+
+urlbst: urlbst.in config.status
+ ./config.status urlbst
+
+urlbst.tex: urlbst.tex.in hg.sed release-notes.tex
+ sed -f hg.sed -e '/include:release-notes/r release-notes.tex' urlbst.tex.in >$@
+
+urlbst.html: urlbst.html.in release-notes.html hg.sed
+ sed -f hg.sed -e '/include:release-notes/r release-notes.html' urlbst.html.in >$@
+
+Makefile: Makefile.in config.status
+ ./config.status Makefile
+
+README: README.md hg.sed
+ rm -f $@
+ sed -f hg.sed README.md >$@
+
+configure: configure.ac
+ autoconf
+
+config.status: configure
+ ./configure
+
+hg.sed: Makefile .hg
+ rm -f $@
+ { echo 's, at PACKAGE_VERSION\@, at PACKAGE_VERSION@,g'; \
+ echo 's, at RELEASEDATE\@, at RELEASEDATE@,g'; \
+ echo 's/@COPYRIGHTYEARS\@/@COPYRIGHTYEARS@/'; \
+ hg parent --template 's/@HGIDENT\@/{node|short} ({latesttag}+{latesttagdistance}), {date|isodate}/\n'; \
+ } >hg.sed
+
+release-notes.tex: release-notes.html
+ rm -f $@
+ xsltproc tools/release-notes-to-latex.xslt release-notes.html >$@.tmp && mv $@.tmp $@
+
+# Version stamp file, included in the distribution for convenience,
+# so it's easy to see which version it is has been unpacked at CTAN.
+VERSION: Makefile.in
+ echo $(DIST) >VERSION
+
+# Very simple install target -- hardly worth bothering, really....
+install: urlbst
+ cp urlbst $(bindir)
+
+# Very simple test target -- just check that we don't bomb converting
+# the standard styles
+check: $(BSTSTYLES) $(TESTSTYLES)
+ for f in $(BSTSTYLES) $(TESTSTYLES); do \
+ ROOT=`echo $$f|sed s/\.bst$$//`; \
+ printf '\\relax\n' > test-$$ROOT.aux; \
+ printf '\\citation{*}\n' >> test-$$ROOT.aux; \
+ printf '\\bibdata{urlbst}\n' >> test-$$ROOT.aux; \
+ printf '\\bibstyle{'"$$ROOT"'}\n' >> test-$$ROOT.aux; \
+ echo "*** testing $$f"; \
+ bibtex test-$$ROOT; \
+ done
+
+# Brute-force test target, which finds all the system .bst files,
+# converts them, and runs BibTeX on them. It doesn't test the results
+# in any way -- you have to do that by eye.
+#
+# No, this is a hopelessly blunderbus approach. And in any case the
+# 'locate *.bst' doesn't work. At least the following would find only things
+# on the .bst search path.
+# BSTPATH=`kpsepath bst`
+# for d in `IFS=:; echo $BSTPATH`; do
+# dd=`expr "$d" : '!*\(.*[^/]\)/*$'`
+# echo dd=$dd
+# test -d "$dd" && find $dd -name \*.bst
+# done
+check-all:
+ printf '\\relax\n'>check-all.mainaux
+ sed -n 's/^.*{\(test:.*\),/\\citation{\1}/p' urlbst.bib>>check-all.mainaux
+ for f in `locate '*.bst' | grep -v norman`; do T=`echo $$f|sed 's+.*/\(.*\)\.bst+\1url+'`;perl urlbst $$f $$T.bst; if test $$? = 0; then TF=test-$$T.aux; cp check-all.mainaux $$TF;printf '\\bibdata{urlbst}\n'>>$$TF; printf '\\bibstyle{$$T}\n'>>$$TF; else rm $$T.bst; fi done
+ for f in `ls test-*.aux|sed s+.aux++`;do bibtex $$f;done
+ rm check-all.mainaux
+
+# Tarball for unpacking in the webpage distribution directory
+webpage-tarball.tar: urlbst.pdf urlbst.html $(DIST).tar.gz $(DIST).zip
+ mkdir webpage-tarball
+ cp urlbst.pdf $(DIST).tar.gz $(DIST).zip webpage-tarball
+ cp urlbst.html webpage-tarball/index.html
+ cd webpage-tarball; $(TAR) cf ../webpage-tarball.tar *
+ rm -Rf webpage-tarball
+
+tidy:
+ rm -f webpage-tarball.tar
+ rm -f *~ test-*
+ rm -f *.aux *.bbl *.log *.blg *.dvi *.pdf
+ rm -Rf urlbst.app
+
+clean: tidy
+ rm -f *.bst
+ rm -Rf config.status autom4te.cache prepare-roff.sed
+ rm -Rf $(DIST).tar $(DIST).tar.gz $(DIST).zip $(DIST)
+ rm -f $(GENERATED)
+
+maintainer-clean: clean
+ rm -f $(MAINTAINER_FILES)
Property changes on: trunk/Master/texmf-dist/source/bibtex/urlbst/Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/Master/texmf-dist/source/bibtex/urlbst/configure
===================================================================
--- trunk/Master/texmf-dist/source/bibtex/urlbst/configure 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/source/bibtex/urlbst/configure 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,63 +1,84 @@
#! /bin/sh
-# From configure.ac Revision.
+# From configure.ac @PACKAGE_VERSION at .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for urlbst 0.7.
+# Generated by GNU Autoconf 2.69 for urlbst 0.8.
#
# Report bugs to <norman at astro.gla.ac.uk>.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
@@ -66,12 +87,11 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -78,8 +98,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -90,13 +110,17 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -103,341 +127,349 @@
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
else
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
else
- exitcode=1
- echo as_func_ret_success failed.
+ exitcode=1; echo positional parameters were not saved.
fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ if test "x$CONFIG_SHELL" != x; then :
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
esac
-
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug-autoconf at gnu.org and
+$0: norman at astro.gla.ac.uk about your system, including any
+$0: error possibly output before this message. Then install
+$0: a modern shell, or manually run the script under such a
+$0: shell if you do have one."
+ fi
+ exit 1
fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
-test $exitcode = 0) || { (exit 1); exit 1; }
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-_ASEOF
-}; then
- break
-fi
-fi
+} # as_fn_mkdir_p
- done
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
+ as_expr=false
fi
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_basename=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell autoconf at gnu.org about your system,
- echo including any error possibly output before this
- echo message
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -454,9 +486,12 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -465,84 +500,55 @@
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
+ fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -551,11 +557,11 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
-exec 7<&0 </dev/null 6>&1
-
# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -570,65 +576,74 @@
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='urlbst'
PACKAGE_TARNAME='urlbst'
-PACKAGE_VERSION='0.7'
-PACKAGE_STRING='urlbst 0.7'
+PACKAGE_VERSION='0.8'
+PACKAGE_STRING='urlbst 0.8'
PACKAGE_BUGREPORT='norman at astro.gla.ac.uk'
+PACKAGE_URL=''
ac_unique_file="urlbst.in"
-ac_subst_vars='SHELL
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+WITHHREF
+PUBMEDURL
+WITHPUBMEDRESOLVER
+DOIURL
+WITHDOIRESOLVER
+EPRINTURL
+WITHEPRINTS
+PERL
+COPYRIGHTYEARS
+RELEASEDATE
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-RELEASEDATE
-PERL
-WITHEPRINTS
-EPRINTURL
-WITHDOIRESOLVER
-DOIURL
-WITHPUBMEDRESOLVER
-PUBMEDURL
-WITHHREF
-LIBOBJS
-LTLIBOBJS'
+SHELL'
ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_eprints
+with_doi
+with_pubmed
+with_href
+'
ac_precious_vars='build_alias
host_alias
target_alias'
@@ -637,6 +652,8 @@
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -692,8 +709,9 @@
fi
case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *=) ac_optarg= ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -735,13 +753,20 @@
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -754,13 +779,20 @@
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -951,22 +983,36 @@
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error $? "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -986,26 +1032,26 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
;;
esac
@@ -1013,11 +1059,18 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "missing argument to $ac_option"
fi
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+fi
+
+# Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
@@ -1024,12 +1077,18 @@
libdir localedir mandir
do
eval ac_val=\$$ac_var
+ # Remove trailing slashes.
case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
+ case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1043,8 +1102,6 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1059,11 +1116,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1070,12 +1125,12 @@
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1102,13 +1157,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1134,7 +1187,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures urlbst 0.7 to adapt to many kinds of systems.
+\`configure' configures urlbst 0.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1148,7 +1201,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
+ -q, --quiet, --silent do not print \`checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1156,9 +1209,9 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1168,25 +1221,25 @@
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/urlbst]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/urlbst]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1195,7 +1248,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of urlbst 0.7:";;
+ short | recursive ) echo "Configuration of urlbst 0.8:";;
esac
cat <<\_ACEOF
@@ -1215,15 +1268,17 @@
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1259,7 +1314,7 @@
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1268,22 +1323,25 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-urlbst configure 0.7
-generated by GNU Autoconf 2.61
+urlbst configure 0.8
+generated by GNU Autoconf 2.69
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
exit
fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by urlbst $as_me 0.7, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+It was created by urlbst $as_me 0.8, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1319,8 +1377,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
} >&5
@@ -1354,12 +1412,12 @@
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1375,13 +1433,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -1393,11 +1451,9 @@
{
echo
- cat <<\_ASBOX
-## ---------------- ##
+ $as_echo "## ---------------- ##
## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -1406,12 +1462,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -1430,53 +1487,47 @@
)
echo
- cat <<\_ASBOX
-## ----------------- ##
+ $as_echo "## ----------------- ##
## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
echo
for ac_var in $ac_subst_vars
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------------- ##
+ $as_echo "## ------------------- ##
## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
echo
for ac_var in $ac_subst_files
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
+ $as_echo "## ----------- ##
## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
echo
cat confdefs.h
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1483,7 +1534,7 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
@@ -1490,6 +1541,8 @@
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
+
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
@@ -1496,54 +1549,66 @@
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
+ # We do not want a PATH search for config.site.
+ case $CONFIG_SITE in #((
+ -*) ac_site_file1=./$CONFIG_SITE;;
+ */*) ac_site_file1=$CONFIG_SITE;;
+ *) ac_site_file1=./$CONFIG_SITE;;
+ esac
elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+ test "x$ac_site_file" = xNONE && continue
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
+ . "$ac_site_file" \
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
fi
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
@@ -1550,8 +1615,8 @@
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1565,69 +1630,57 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1635,19 +1688,24 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-RELEASEDATE="2011 July 20"
+RELEASEDATE="2019 July 1"
+COPYRIGHTYEARS="2002-03, 2005-12, 2014, 2019"
+
+
+
+
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PERL+:} false; then :
+ $as_echo_n "(cached) " >&6
else
case $PERL in
[\\/]* | ?:[\\/]*)
@@ -1659,14 +1717,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
IFS=$as_save_IFS
;;
@@ -1674,11 +1732,11 @@
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
- { echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -1691,7 +1749,7 @@
WITHDOIRESOLVER=1
-DOIURL=http://dx.doi.org/
+DOIURL=https://doi.org/
WITHPUBMEDRESOLVER=1
@@ -1701,7 +1759,7 @@
# Check whether --with-eprints was given.
-if test "${with_eprints+set}" = set; then
+if test "${with_eprints+set}" = set; then :
withval=$with_eprints; if test "$withval" = "yes"; then
WITHEPRINTS=1
elif test "$withval" = "no"; then
@@ -1715,7 +1773,7 @@
# Check whether --with-doi was given.
-if test "${with_doi+set}" = set; then
+if test "${with_doi+set}" = set; then :
withval=$with_doi; if test "$withval" = yes; then
WITHDOIRESOLVER=1
elif test "$withval" = no; then
@@ -1729,7 +1787,7 @@
# Check whether --with-pubmed was given.
-if test "${with_pubmed+set}" = set; then
+if test "${with_pubmed+set}" = set; then :
withval=$with_pubmed; if test "$withval" = yes; then
WITHPUBMEDRESOLVER=1
elif test "$withval" = no; then
@@ -1747,7 +1805,7 @@
# Check whether --with-href was given.
-if test "${with_href+set}" = set; then
+if test "${with_href+set}" = set; then :
withval=$with_href; if test "$withval" = yes; then
WITHHREF=2
elif test "$withval" = no; then
@@ -1759,7 +1817,7 @@
-ac_config_files="$ac_config_files Makefile urlbst.tex urlbst.html"
+ac_config_files="$ac_config_files Makefile"
ac_config_files="$ac_config_files urlbst"
@@ -1791,12 +1849,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -1804,8 +1863,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -1827,13 +1886,24 @@
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
+ if test "x$cache_file" != "x/dev/null"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+ if test ! -f "$cache_file" || test -h "$cache_file"; then
+ cat confcache >"$cache_file"
+ else
+ case $cache_file in #(
+ */* | ?:*)
+ mv -f confcache "$cache_file"$$ &&
+ mv -f "$cache_file"$$ "$cache_file" ;; #(
+ *)
+ mv -f confcache "$cache_file" ;;
+ esac
+ fi
+ fi
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -1850,6 +1920,12 @@
# take arguments), then branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
t clear
:clear
s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
@@ -1876,14 +1952,15 @@
ac_libobjs=
ac_ltlibobjs=
+U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`echo "$ac_i" | sed "$ac_script"`
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
@@ -1891,12 +1968,14 @@
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -1906,59 +1985,79 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
+
SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
@@ -1967,12 +2066,11 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+as_myself=
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -1979,8 +2077,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -1991,13 +2089,17 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -2004,19 +2106,94 @@
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$1; test $as_status -eq 0 && as_status=1
+ if test "$4"; then
+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
fi
-done
+ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
-# Required to use basename.
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -2030,13 +2207,17 @@
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -2051,132 +2232,119 @@
}
s/.*/./; q'`
-# CDPATH.
-$as_unset CDPATH
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
- sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
- N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
- s/-\n.*//
- ' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pR'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -pR'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -pR'
+ fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -2185,13 +2353,19 @@
exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by urlbst $as_me 0.7, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+This file was extended by urlbst $as_me 0.8, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -2204,59 +2378,74 @@
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
+ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
Configuration files:
$config_files
-Report bugs to <bug-autoconf at gnu.org>."
+Report bugs to <norman at astro.gla.ac.uk>."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-urlbst config.status 0.7
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+urlbst config.status 0.8
+configured by $0, generated by GNU Autoconf 2.69,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
case $1 in
- --*=*)
+ --*=?*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
+ --*=)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=
+ ac_shift=:
+ ;;
*)
ac_option=$1
ac_optarg=$2
@@ -2269,25 +2458,30 @@
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
+ $as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ '') as_fn_error $? "missing file argument" ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
- echo "$ac_cs_usage"; exit ;;
+ $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1"
+ *) as_fn_append ac_config_targets " $1"
ac_need_defaults=false ;;
esac
@@ -2302,16 +2496,18 @@
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- CONFIG_SHELL=$SHELL
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ exec "\$@"
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
exec 5>>config.log
{
echo
@@ -2318,14 +2514,14 @@
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- echo "$ac_log"
+ $as_echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -2332,13 +2528,9 @@
do
case $ac_config_target in
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "urlbst.tex") CONFIG_FILES="$CONFIG_FILES urlbst.tex" ;;
- "urlbst.html") CONFIG_FILES="$CONFIG_FILES urlbst.html" ;;
"urlbst") CONFIG_FILES="$CONFIG_FILES urlbst" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -2359,150 +2551,187 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp=
+ tmp= ac_tmp=
trap 'exit_status=$?
- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ : "${ac_tmp:=$tmp}"
+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ trap 'as_fn_exit 1' 1 2 13 15
}
# Create a (secure) tmp directory for tmp files.
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
+ test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} ||
-{
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
if test -n "$CONFIG_FILES"; then
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
_ACEOF
-
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-RELEASEDATE!$RELEASEDATE$ac_delim
-PERL!$PERL$ac_delim
-WITHEPRINTS!$WITHEPRINTS$ac_delim
-EPRINTURL!$EPRINTURL$ac_delim
-WITHDOIRESOLVER!$WITHDOIRESOLVER$ac_delim
-DOIURL!$DOIURL$ac_delim
-WITHPUBMEDRESOLVER!$WITHPUBMEDRESOLVER$ac_delim
-PUBMEDURL!$PUBMEDURL$ac_delim
-WITHHREF!$WITHHREF$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+ . ./conf$$subs.sh ||
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
+rm -f conf$$subs.sh
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
+}
+
+_ACAWK
_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[ ]*\):*/\1/
+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+h
+s///
+s/^/:/
+s/[ ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
s/:*$//
+x
+s/\(=[ ]*\).*/\1/
+G
+s/\n//
s/^[^=]*=[ ]*$//
}'
fi
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES"
-for ac_tag in :F $CONFIG_FILES
+eval set X " :F $CONFIG_FILES "
+shift
+for ac_tag
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
@@ -2509,9 +2738,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
- { (exit 1); exit 1; }; };;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -2530,7 +2757,7 @@
for ac_f
do
case $ac_f in
- -) ac_f="$tmp/stdin";;
+ -) ac_f="$ac_tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
@@ -2539,26 +2766,34 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
- ac_file_inputs="$ac_file_inputs $ac_f"
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input="Generated from "`IFS=:
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin";;
+ *:-:* | *:-) cat >"$ac_tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -2568,7 +2803,7 @@
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -2586,55 +2821,15 @@
q
}
s/.*/./; q'`
- { as_dir="$ac_dir"
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
- while :; do
- case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
- *) as_qdir=$as_dir;;
- esac
- as_dirs="'$as_qdir' $as_dirs"
- as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2670,12 +2865,12 @@
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
p
q
}
@@ -2683,14 +2878,14 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
@@ -2697,7 +2892,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
- s&\\\${datarootdir}&$datarootdir&g' ;;
+ s&\\\${datarootdir}&$datarootdir&g' ;;
esac
_ACEOF
@@ -2704,15 +2899,16 @@
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -2721,21 +2917,25 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined." >&2;}
+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$tmp/stdin"
+ rm -f "$ac_tmp/stdin"
case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
@@ -2750,12 +2950,14 @@
done # for ac_tag
-{ (exit 0); exit 0; }
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
# Unfortunately, on DOS this fails, as config.log is still kept open
@@ -2774,6 +2976,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit 1
fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
Modified: trunk/Master/texmf-dist/source/bibtex/urlbst/configure.ac
===================================================================
--- trunk/Master/texmf-dist/source/bibtex/urlbst/configure.ac 2019-07-02 04:44:43 UTC (rev 51529)
+++ trunk/Master/texmf-dist/source/bibtex/urlbst/configure.ac 2019-07-02 20:58:10 UTC (rev 51530)
@@ -1,10 +1,13 @@
dnl Process this file with autoconf to produce a configure script
-AC_REVISION($Revision$)
-
-AC_INIT(urlbst, 0.7, norman at astro.gla.ac.uk)
-RELEASEDATE="2011 July 20"
+AC_INIT(urlbst, 0.8, norman at astro.gla.ac.uk)
+RELEASEDATE="2019 July 1"
AC_SUBST(RELEASEDATE)
+AC_REVISION(@PACKAGE_VERSION@)
+
+COPYRIGHTYEARS="2002-03, 2005-12, 2014, 2019"
+AC_SUBST(COPYRIGHTYEARS)
+
AC_PREREQ(2.50)
AC_CONFIG_SRCDIR([urlbst.in])
@@ -21,7 +24,7 @@
dnl Add --with-doi: tune default support for DOI fields
WITHDOIRESOLVER=1
AC_SUBST(WITHDOIRESOLVER)
-DOIURL=http://dx.doi.org/
+DOIURL=https://doi.org/
AC_SUBST(DOIURL)
dnl Add --with-pubmed
@@ -80,7 +83,7 @@
fi)
-AC_CONFIG_FILES(Makefile urlbst.tex urlbst.html)
+AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(urlbst, [chmod +x urlbst])
AC_OUTPUT
More information about the tex-live-commits
mailing list