summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/bibtex/bst/vancouver/vancouver.bst151
-rw-r--r--Master/texmf-dist/doc/bibtex/vancouver/vancouver.bib40
-rw-r--r--Master/texmf-dist/doc/bibtex/vancouver/vancouver.pdfbin120536 -> 120699 bytes
3 files changed, 154 insertions, 37 deletions
diff --git a/Master/texmf-dist/bibtex/bst/vancouver/vancouver.bst b/Master/texmf-dist/bibtex/bst/vancouver/vancouver.bst
index 593e9d47766..0e9b5d0667d 100644
--- a/Master/texmf-dist/bibtex/bst/vancouver/vancouver.bst
+++ b/Master/texmf-dist/bibtex/bst/vancouver/vancouver.bst
@@ -11,7 +11,7 @@
%%-------------------------------------------------------------------
%%
%% Author: Folkert van der Beek <folkertvanderbeek@gmail.com>
-%% Version: 0.8
+%% Version: 0.9
%% URL: https://gitlab.com/fvdbeek/vancouver.bst
%%
%% This work may be distributed and/or modified under the
@@ -927,23 +927,15 @@ FUNCTION {output.bibitem}
before.all 'output.state :=
}
-FUNCTION {n.dashify}
-{
- 't :=
+FUNCTION {hyphenate}
+{ 't :=
""
{ 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 := }
+ while$
}
{ t #1 #1 substring$ *
t #2 global.max$ substring$ 't :=
@@ -1148,12 +1140,136 @@ FUNCTION {multi.page.check}
multiresult
}
+FUNCTION {is.letter}
+{ duplicate$ empty$
+ { pop$ #0 }
+ { chr.to.int$
+ duplicate$ "A" chr.to.int$ <
+ { pop$ #0 }
+ { duplicate$ "Z" chr.to.int$ >
+ { duplicate$ "a" chr.to.int$ <
+ { pop$ #0 }
+ { duplicate$ "z" chr.to.int$ >
+ { pop$ #0 }
+ { pop$ #1 }
+ if$
+ }
+ if$
+ }
+ { pop$ #1 }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {is.digit}
+{ duplicate$ empty$
+ { pop$ #0 }
+ { chr.to.int$
+ duplicate$ "0" chr.to.int$ <
+ { pop$ #0 }
+ { "9" chr.to.int$ >
+ { #0 }
+ { #1 }
+ if$
+ }
+ if$
+ }
+ if$
+}
+
+FUNCTION {is.letter.digit}
+{ duplicate$ is.letter
+ swap$ is.digit or
+}
+
+INTEGERS { charptr len }
+
+STRINGS { start.number end.number range.separator }
+
+FUNCTION {abbreviate.range.numbers}
+{ end.number end.number text.length$ #1 substring$ is.letter
+ { start.number range.separator * end.number * }
+ { end.number text.length$ 'len :=
+ start.number text.length$ len <
+ 'skip$
+ { start.number text.length$ len - #1 + 'charptr :=
+ { end.number text.length$ #1 >
+ start.number charptr #1 substring$
+ end.number #1 #1 substring$ = and
+ }
+ { charptr #1 + 'charptr :=
+ end.number #2 global.max$ substring$ 'end.number :=
+ }
+ while$
+ }
+ if$
+ start.number range.separator * end.number *
+ }
+ if$
+}
+
+% This a helper function for use in format.page.numbers
+FUNCTION {append.pages.part}
+{ duplicate$ duplicate$ text.length$ #1 substring$ "," =
+ { " " * }
+ 'skip$
+ if$
+ end.number empty$
+ { start.number empty$
+ 'skip$
+ { start.number * }
+ if$
+ }
+ { abbreviate.range.numbers * }
+ if$
+ "" 'start.number :=
+ "" 'end.number :=
+ "" 'range.separator :=
+}
+
+FUNCTION {format.page.numbers}
+{ 's :=
+ "" 't :=
+ "" 'start.number :=
+ "" 'end.number :=
+ "" 'range.separator :=
+ ""
+ { s empty$ not }
+ { s #1 #1 substring$ 't :=
+ t is.letter.digit
+ { range.separator empty$
+ { start.number t * 'start.number := }
+ { end.number t * 'end.number := }
+ if$
+ }
+ { s #1 #2 substring$ "--" =
+ { "--" 'range.separator := }
+ { t "-" =
+ { "-" 'range.separator := }
+ { append.pages.part
+ t *
+ }
+ if$
+ }
+ if$
+ }
+ if$
+ s #2 global.max$ substring$ 's :=
+ }
+ while$
+ append.pages.part
+}
+
FUNCTION {format.pages}
{ pages duplicate$ empty$ 'skip$
{ duplicate$ multi.page.check
{
+ format.page.numbers
bbl.pages swap$
- n.dashify
+ hyphenate
}
{
bbl.page swap$
@@ -1172,7 +1288,8 @@ FUNCTION {format.journal.pages}
if$
pages duplicate$ empty$ 'pop$
{
- n.dashify
+ format.page.numbers
+ hyphenate
"pages" bibinfo.check
*
}
diff --git a/Master/texmf-dist/doc/bibtex/vancouver/vancouver.bib b/Master/texmf-dist/doc/bibtex/vancouver/vancouver.bib
index 10ae51efbbb..6a655acb89f 100644
--- a/Master/texmf-dist/doc/bibtex/vancouver/vancouver.bib
+++ b/Master/texmf-dist/doc/bibtex/vancouver/vancouver.bib
@@ -86,7 +86,7 @@
journal = {Hypertension},
volume = {40},
number = {5},
- pages = {679-86},
+ pages = {679--686},
organization = {Diabetes Prevention Program Research Group},
year = 2002
}
@@ -106,7 +106,7 @@
@Article{ outreach,
title = {Outreach: bringing {HIV}-positive individuals into care.},
journal = {HRSA Careaction},
- pages = {1-6},
+ pages = {1--6},
year = 2002
}
@@ -127,7 +127,7 @@
journal = {Int J Psychoanal},
volume = {83},
number = {Pt 2},
- pages = {491-5},
+ pages = {491--495},
year = 2002
}
@@ -154,7 +154,7 @@
journal = {J Vasc Interv Radiol},
volume = {13},
number = {9 Pt 1},
- pages = {923-8},
+ pages = {923--928},
year = 2002
}
@@ -173,7 +173,7 @@
joint arthroplasty.},
journal = {Clin Orthop Relat Res},
number = {401},
- pages = {230-8},
+ pages = {230--238},
year = 2002
}
@@ -225,7 +225,7 @@
2002 {A}pr 3-5; {K}insdale, {I}reland},
editor = {Foster, J.A. and Lutton, E. and Miller, J. and Ryan, C.
and Tettamanzi, A.G.},
- pages = {182-91},
+ pages = {182--191},
address = {Berlin},
publisher = {Springer},
year = 2002
@@ -237,7 +237,7 @@
journal = {Tidsskr Nor Laegeforen},
volume = {122},
number = {8},
- pages = {785-7},
+ pages = {785--787},
year = 2002
}
@@ -248,7 +248,7 @@
journal = {J Clin Psychiatry},
volume = {61},
number = {12},
- pages = {909-11},
+ pages = {909--911},
note = {Retraction in: Feifel D, Moutier CY, Perry W. J Clin
Psychiatry. 2002;63(2):169.},
year = 2000
@@ -285,7 +285,7 @@
with sumatriptan.},
journal = {Headache},
volume = {42 Suppl 2},
- pages = {S93-9},
+ pages = {S93--9},
year = 2002
}
@@ -305,7 +305,7 @@
journal = {Neurology},
volume = {58},
number = {12 Suppl 7},
- pages = {S6-12},
+ pages = {S6--12},
year = 2002
}
@@ -315,7 +315,7 @@
journal = {N Engl J Med},
volume = {347},
number = {4},
- pages = {284-7},
+ pages = {284--287},
year = 2002
}
@@ -325,7 +325,7 @@
journal = {N Engl J Med},
volume = {347},
number = {4},
- pages = {284-7},
+ pages = {284--287},
note = {Cited in PubMed; PMID 12140307.},
year = 2002
}
@@ -336,7 +336,7 @@
journal = {N Engl J Med},
volume = {347},
number = {4},
- pages = {284-7},
+ pages = {284--287},
month = {Jul 25},
year = 2002
}
@@ -383,7 +383,7 @@
journal = {Clin Ther},
volume = {22},
number = {10},
- pages = {1151-68; discussion 1149-50},
+ pages = {1151-68; discussion 1149--50},
note = {Erratum in: Clin Ther 2001;23(2):309.},
year = 2000
}
@@ -394,7 +394,7 @@
journal = {Mol Cell Endocrinol},
volume = {188},
number = {1-2},
- pages = {22-5},
+ pages = {22--25},
note = {Corrected and republished from: Mol Cell Endocrinol.
2001;183(1-2):123-6.},
year = 2002
@@ -406,7 +406,7 @@
journal = {Mol Cell Endocrinol},
volume = {183},
number = {1-2},
- pages = {123-6},
+ pages = {123--126},
year = 2001
}
@@ -415,7 +415,7 @@
editor = {Vogelstein, B. and Kinzler, K.W.},
title = {The genetic basis of human cancer},
chapter = {Chromosome alterations in human solid tumors},
- pages = {93-113},
+ pages = {93--113},
publisher = {McGraw-Hill},
address = {New York},
year = 2002
@@ -440,7 +440,7 @@
journal = {Brain Res},
volume = {935},
number = {1-2},
- pages = {40-6},
+ pages = {40--46},
year = 2002
}
@@ -509,7 +509,7 @@
journal = {J Urol},
volume = {169},
number = {6},
- pages = {2257-61},
+ pages = {2257--2261},
organization = {Alf-One Study Group},
year = 2003
}
@@ -533,7 +533,7 @@
journal = {Blood},
volume = {100},
number = {10},
- pages = {3828-31},
+ pages = {3828--3831},
note = {Epub 2002 Jul 5.},
year = 2002
}
diff --git a/Master/texmf-dist/doc/bibtex/vancouver/vancouver.pdf b/Master/texmf-dist/doc/bibtex/vancouver/vancouver.pdf
index 6a3d2d8fe31..c58ef64454d 100644
--- a/Master/texmf-dist/doc/bibtex/vancouver/vancouver.pdf
+++ b/Master/texmf-dist/doc/bibtex/vancouver/vancouver.pdf
Binary files differ