projects
/
latex-mlastyle.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched to csname for macro redefinition detection
[latex-mlastyle.git]
/
mlastyle.bst
diff --git
a/mlastyle.bst
b/mlastyle.bst
index aedb136b362637b1805de6b10f6536865158633c..e2b446ac786928c92f6416b22aec299feea2ed74 100644
(file)
--- a/
mlastyle.bst
+++ b/
mlastyle.bst
@@
-641,7
+641,7
@@
FUNCTION {format.article.crossref}
%}
%{ "In " key * }
%if$
%}
%{ "In " key * }
%if$
- pages empty$ { "
\citealp" } { "
\citealp[" 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$ { "
\citealp" } { "
\citealp[" 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$ { "
\citealp" } { "
\citealp[" format.chapter.pages * "]" * } if$
+ pages empty$ { "
\citealp" } { "
\citealp[" format.chapter.pages * "]" * } if$
"{" * crossref * "}" *
}
"{" * crossref * "}" *
}
@@
-763,7
+763,7
@@
FUNCTION {cite.label}
if$
duplicate$ empty$
{ cite.title * "( \ \ \ \ \unskip\unskip\unskip\unskip\unskip \unskip)" * }
if$
duplicate$ empty$
{ cite.title * "( \ \ \ \ \unskip\unskip\unskip\unskip\unskip \unskip)" * }
- {
+ {
duplicate$
author.shared author.different =
{ "{vv~}{ll}" format.names.custom 's := }
{ author.shared author.last =
author.shared author.different =
{ "{vv~}{ll}" format.names.custom 's := }
{ author.shared author.last =
@@
-779,7
+779,7
@@
FUNCTION {cite.label}
s
"( \ \ \ \ \unskip\unskip\unskip\unskip\unskip " *
author.duplicate { cite.title * }{ "\unskip" * } if$
s
"( \ \ \ \ \unskip\unskip\unskip\unskip\unskip " *
author.duplicate { cite.title * }{ "\unskip" * } if$
- ")" * s *
+ ")" * s
wap$ "{ff~}{vv~}{ll}{, jj}" format.names.custom
*
}
if$
%}
}
if$
%}
@@
-833,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
@@
-879,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
@@
-949,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
@@
-1001,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$
@@
-1465,11
+1465,13
@@
REVERSE {reverse.author}
FUNCTION {begin.bib}
{
citealp.used
FUNCTION {begin.bib}
{
citealp.used
- { "\ifx\undefined\citealp\let\citealp\cite\fi" write$ newline$ }
+ { "\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$