projects
/
latex-mlastyle.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed natbib bug
[latex-mlastyle.git]
/
mlastyle.bst
diff --git
a/mlastyle.bst
b/mlastyle.bst
index 15e90d09fa889752d02adc566cd8eedd151b3330..e2b446ac786928c92f6416b22aec299feea2ed74 100644
(file)
--- a/
mlastyle.bst
+++ b/
mlastyle.bst
@@
-41,7
+41,7
@@
ENTRY
{ author.duplicate author.shared }
{ label }
{ author.duplicate author.shared }
{ label }
-INTEGERS { output.state before.all mid.sentence after.sentence after.block after.title author.different author.last author.flast citeal
t
.used url.used }
+INTEGERS { output.state before.all mid.sentence after.sentence after.block after.title author.different author.last author.flast citeal
p
.used url.used }
% Rearranged such that true values require capital letters
FUNCTION {init.consts}
% Rearranged such that true values require capital letters
FUNCTION {init.consts}
@@
-56,7
+56,7
@@
FUNCTION {init.consts}
#2 'author.flast :=
%#3 'author.firstlast :=
#2 'author.flast :=
%#3 'author.firstlast :=
- #0 'citeal
t
.used :=
+ #0 'citeal
p
.used :=
#0 'url.used :=
}
#0 'url.used :=
}
@@
-217,7
+217,7
@@
FUNCTION {field.or.null}
FUNCTION {emphasize}
{ duplicate$ empty$
{ pop$ "" }
FUNCTION {emphasize}
{ duplicate$ empty$
{ pop$ "" }
- { "
{\em
" swap$ * "}" * }
+ { "
\emph{
" swap$ * "}" * }
if$
}
if$
}
@@
-641,7
+641,7
@@
FUNCTION {format.article.crossref}
%}
%{ "In " key * }
%if$
%}
%{ "In " key * }
%if$
- pages empty$ { "
\citealt" } { " \citealt
[" format.chapter.pages * "]" * } if$
+ pages empty$ { "
\citealp" } { "\citealp
[" format.chapter.pages * "]" * } if$
"{" * crossref * "}" *
}
"{" * crossref * "}" *
}
@@
-687,7
+687,7
@@
FUNCTION {format.book.crossref}
% }
% { format.crossref.editor * }
% if$
% }
% { format.crossref.editor * }
% if$
- pages empty$ { "
\citealt" } { " \citealt
[" format.chapter.pages * "]" * } if$
+ pages empty$ { "
\citealp" } { "\citealp
[" format.chapter.pages * "]" * } if$
"{" * crossref * "}" *
}
"{" * crossref * "}" *
}
@@
-709,7
+709,7
@@
FUNCTION {format.incoll.inproc.crossref}
% }
% { "In " format.crossref.editor * }
% if$
% }
% { "In " format.crossref.editor * }
% if$
- pages empty$ { "
\citealt" } { " \citealt
[" format.chapter.pages * "]" * } if$
+ pages empty$ { "
\citealp" } { "\citealp
[" format.chapter.pages * "]" * } if$
"{" * crossref * "}" *
}
"{" * crossref * "}" *
}
@@
-762,21
+762,24
@@
FUNCTION {cite.label}
{ author }
if$
duplicate$ empty$
{ author }
if$
duplicate$ empty$
- {
pop$ cite.title
}
- {
+ {
cite.title * "( \ \ \ \ \unskip\unskip\unskip\unskip\unskip \unskip)" *
}
+ {
duplicate$
author.shared author.different =
author.shared author.different =
- { "{vv~}{ll}" format.names.custom }
+ { "{vv~}{ll}" format.names.custom
's :=
}
{ author.shared author.last =
{ author.shared author.last =
- { "{f.~}{vv~}{ll}{, jj}" format.names.custom }
+ { "{f.~}{vv~}{ll}{, jj}" format.names.custom
's :=
}
{ author.shared author.flast =
{ author.shared author.flast =
- { "{ff~}{vv~}{ll}{, jj}" format.names.custom }
- { "{vv~}{ll}" format.names.custom ", " * cite.title * }
+ { "{ff~}{vv~}{ll}{, jj}" format.names.custom
's :=
}
+ { "{vv~}{ll}" format.names.custom ", " * cite.title *
's := "WTF" warning$
}
if$
}
if$
}
if$
if$
}
if$
}
if$
- author.duplicate { ", " * cite.title * }{} if$
+ s
+ "( \ \ \ \ \unskip\unskip\unskip\unskip\unskip " *
+ author.duplicate { cite.title * }{ "\unskip" * } if$
+ ")" * swap$ "{ff~}{vv~}{ll}{, jj}" format.names.custom *
}
if$
%}
}
if$
%}
@@
-830,9
+833,9
@@
FUNCTION {book}
if$
new.block
format.btitle "title" output.check
if$
new.block
format.btitle "title" output.check
- new.
sentence
+ new.
block
crossref missing$
crossref missing$
- { author empty$ 'skip$ { format.editors.mid output new.
sentence
} if$
+ { author empty$ 'skip$ { format.editors.mid output new.
block
} if$
format.edition output
new.sentence
format.bvolume.or.num.series output
format.edition output
new.sentence
format.bvolume.or.num.series output
@@
-876,7
+879,7
@@
FUNCTION {inbook}
format.btitle "title" output.check
new.block
crossref missing$
format.btitle "title" output.check
new.block
crossref missing$
- { author empty$ 'skip$ { format.editors.mid output new.
sentence
} if$
+ { author empty$ 'skip$ { format.editors.mid output new.
block
} if$
format.edition output
new.sentence
format.bvolume.or.num.series output
format.edition output
new.sentence
format.bvolume.or.num.series output
@@
-946,7
+949,7
@@
FUNCTION {inproceedings}
booktitle "booktitle" output.check
new.sentence
format.editors.mid output
booktitle "booktitle" output.check
new.sentence
format.editors.mid output
- new.
sentence
+ new.
block
format.edition output
new.sentence
format.bvolume.or.num.series output
format.edition output
new.sentence
format.bvolume.or.num.series output
@@
-998,7
+1001,7
@@
FUNCTION {manual}
if$
new.block
format.btitle "title" output.check
if$
new.block
format.btitle "title" output.check
- new.
sentence
+ new.
block
format.edition output
new.sentence
author empty$
format.edition output
new.sentence
author empty$
@@
-1367,7
+1370,7
@@
FUNCTION {init.vars}
FUNCTION {forward.author.dup.check}
{
url empty$ 'skip$ { url.used #1 + 'url.used := } if$
FUNCTION {forward.author.dup.check}
{
url empty$ 'skip$ { url.used #1 + 'url.used := } if$
- crossref empty$ 'skip$ { citeal
t.used #1 + 'citealt
.used := } if$
+ crossref empty$ 'skip$ { citeal
p.used #1 + 'citealp
.used := } if$
author empty$
{ editor empty$ { organization field.or.null 'a := }{ editor 'a :=} if$}
{ author 'a := }
author empty$
{ editor empty$ { organization field.or.null 'a := }{ editor 'a :=} if$}
{ author 'a := }
@@
-1461,12
+1464,14
@@
REVERSE {reverse.author}
FUNCTION {begin.bib}
{
FUNCTION {begin.bib}
{
- citealt.used
- { "\ifx\undefined\citealt\let\citealt\cite\fi" write$ newline$ }
+ citealp.used
+ { "\expandafter\ifx\csname citealp\endcsname\relax\let\citealp\cite\fi"
+ write$ newline$ }
'skip$
if$
url.used
'skip$
if$
url.used
- { "\ifx\undefined\url\let\url\relax\fi" write$ newline$ }
+ { "\expandafter\ifx\csname citealp\endcsname\relax\url\let\url\relax\fi"
+ write$ newline$ }
'skip$
if$
preamble$ empty$
'skip$
if$
preamble$ empty$