Merge branch 'master' into biblatex2

[lyx.git] / lib / citeengines / jurabib.citeengine

diff --git a/lib/citeengines/jurabib.citeengine b/lib/citeengines/jurabib.citeengine
index 50c74bdb050003c6af79572a7511143a66c95fda..f092fa06e2565fb6329c23738c0bd29443518707 100644 (file)
--- a/lib/citeengines/jurabib.citeengine
+++ b/lib/citeengines/jurabib.citeengine
@@ -109,6 +109,7 @@ CiteFormat authoryear
        # MACROS
        #
        # 1. Translatable bits (need to be marked by _ prefix)
+       #    Note that preceding and trailing spaces matter.
        #
        _notcited not cited
        _addtobib Add to bibliography only.
@@ -116,6 +117,11 @@ CiteFormat authoryear
        _bibentry Bibliography entry.
        _before before
        _shorttitle short title
+       # The following are handled by BiblioInfo
+       _etal  et al.
+       _namesep /
+       _lastnamesep /
+       _pairnamesep /
 
        #
        # 2. Macros re-used in the style definitions
@@ -123,16 +129,24 @@ CiteFormat authoryear
        !open (
        !sep ;
        !close )
+       !obracket [
+       !cbracket ]
 
        # A link that lets us jump to the bibliography entry in LyXHTML
        # %clean:key% will be substituted by the cite key to give a unique id
        !startlink {!<a href='#LyXCite-%clean:key%'>!}
        !endlink {!</a>!}
 
-       # "ShortAuthor" or "??"
-       !shortauthor {%shortauthor%[[%shortauthor%]][[??]]}
-       # "... ShortTitle" (button) / "... ShortTitle <short title>" (dialog)
-       !shorttitle {%shorttitle%[[ %shorttitle%]][[{%dialog%[[ <%_shorttitle%>]]}]]}
+       # "ShortAuthor", "Author" or "??"
+       !shortauthor {%shortauthor%[[%shortauthor%]][[{%abbrvauthor%[[%abbrvauthor%]][[??]]}]]}
+       # "... ShortTitle"
+       !shorttitle {%shorttitle%[[ %shorttitle%]][[{%dialog%[[ <%_shorttitle%>]][[%!makejurashorttitle%]]}]]}
+       # Title or "??"
+       !maketitle {%title%[[ %title%]][[ ??]]}
+       # "Journal Volume [Year]"
+       !jurashorttitle {%journal%[[ %journal%]]}{%volume%[[ %volume%]]}{%year%[[ %!obracket%%year%%!cbracket%]]}
+       # Handle short title fallback
+       !makejurashorttitle {%ifentrytype:article%[[%!jurashorttitle%]][[{%ifentrytype:periodical%[[%!jurashorttitle%]][[ %!maketitle%]]}]]}
        # "prenote "
        !textbefore {%textbefore%[[%textbefore% ]]}
        # "/prenote" (button) / "/prenote/<before>" (dialog)