X-Git-Url: http://git.tpope.net/?p=latex-mlastyle.git;a=blobdiff_plain;f=mlastyle.bst;h=aedb136b362637b1805de6b10f6536865158633c;hp=d0c322d49057ad05f1f59b2a7928f5e9e8f6785e;hb=57a9b3a1169fcca83e2e33c902021272bc02b499;hpb=4bc6748190e5ece5a05f969febf7f3ec2468c337

diff --git a/mlastyle.bst b/mlastyle.bst
index d0c322d..aedb136 100644
--- a/mlastyle.bst
+++ b/mlastyle.bst
@@ -41,7 +41,7 @@ ENTRY
   { author.duplicate author.shared }
   { label }
 
-INTEGERS { output.state before.all mid.sentence after.sentence after.block after.title author.different author.last author.flast citealt.used url.used }
+INTEGERS { output.state before.all mid.sentence after.sentence after.block after.title author.different author.last author.flast citealp.used url.used }
 
 % Rearranged such that true values require capital letters
 FUNCTION {init.consts}
@@ -56,7 +56,7 @@ FUNCTION {init.consts}
   #2 'author.flast :=
   %#3 'author.firstlast :=
 
-  #0 'citealt.used :=
+  #0 'citealp.used :=
   #0 'url.used :=
 }
 
@@ -217,7 +217,7 @@ FUNCTION {field.or.null}
 FUNCTION {emphasize}
 { duplicate$ empty$
     { pop$ "" }
-    { "{\em " swap$ * "}" * }
+    { "\emph{" swap$ * "}" * }
   if$
 }
 
@@ -641,7 +641,7 @@ FUNCTION {format.article.crossref}
     %}
     %{ "In " key * }
   %if$
-  pages empty$ { " \citealt" } { " \citealt[" format.chapter.pages * "]" * } if$
+  pages empty$ { " \citealp" } { " \citealp[" format.chapter.pages * "]" * } if$
   "{" * crossref * "}" *
 }
 
@@ -687,7 +687,7 @@ FUNCTION {format.book.crossref}
 %    }
 %    { format.crossref.editor * }
 %  if$
-  pages empty$ { " \citealt" } { " \citealt[" format.chapter.pages * "]" * } if$
+  pages empty$ { " \citealp" } { " \citealp[" format.chapter.pages * "]" * } if$
   "{" * crossref * "}" *
 }
 
@@ -709,7 +709,7 @@ FUNCTION {format.incoll.inproc.crossref}
 %    }
 %    { "In " format.crossref.editor * }
 %  if$
-  pages empty$ { " \citealt" } { " \citealt[" format.chapter.pages * "]" * } if$
+  pages empty$ { " \citealp" } { " \citealp[" format.chapter.pages * "]" * } if$
   "{" * crossref * "}" *
 }
 
@@ -762,21 +762,24 @@ FUNCTION {cite.label}
     { author }
   if$
   duplicate$ empty$
-    { pop$ cite.title }
+    { cite.title * "( \ \ \ \ \unskip\unskip\unskip\unskip\unskip \unskip)" * }
     {
       author.shared author.different =
-	{ "{vv~}{ll}" format.names.custom }
+	{ "{vv~}{ll}" format.names.custom 's := }
 	{ author.shared author.last =
-	    { "{f.~}{vv~}{ll}{, jj}" format.names.custom }
+	    { "{f.~}{vv~}{ll}{, jj}" format.names.custom 's := }
 	    { 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$
-      author.duplicate { "(" * cite.title * ")" }{ "( )" * } if$
+      s
+      "( \ \ \ \ \unskip\unskip\unskip\unskip\unskip " *
+      author.duplicate { cite.title * }{ "\unskip" * } if$
+      ")" * s *
     }
   if$
       %}
@@ -1367,7 +1370,7 @@ FUNCTION {init.vars}
 FUNCTION {forward.author.dup.check}
 {
   url empty$ 'skip$ { url.used #1 + 'url.used := } if$
-  crossref empty$ 'skip$ { citealt.used #1 + 'citealt.used := } if$
+  crossref empty$ 'skip$ { citealp.used #1 + 'citealp.used := } if$
   author empty$
     { editor empty$ { organization field.or.null 'a := }{ editor 'a :=} if$}
     { author 'a := }
@@ -1461,8 +1464,8 @@ REVERSE {reverse.author}
 
 FUNCTION {begin.bib}
 {
-  citealt.used
-    { "\ifx\undefined\citealt\let\citealt\cite\fi" write$ newline$ }
+  citealp.used
+    { "\ifx\undefined\citealp\let\citealp\cite\fi" write$ newline$ }
     'skip$
   if$
   url.used