X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fciteengines%2Fjurabib.citeengine;h=9a297c4eb754fd6a9df86edb9958d2973e991e71;hb=345eba1049de2cea80f69e33cca6d0db5c1a1231;hp=c0c5b9748a791f7c72bc309831aaa8e83a9e0549;hpb=298730215c21735f16e7278a5d5a4469fb0b9859;p=lyx.git

diff --git a/lib/citeengines/jurabib.citeengine b/lib/citeengines/jurabib.citeengine
index c0c5b9748a..9a297c4eb7 100644
--- a/lib/citeengines/jurabib.citeengine
+++ b/lib/citeengines/jurabib.citeengine
@@ -4,11 +4,10 @@
 #   and the Humanities. It includes localizations for English, German, French, Dutch,
 #   Spanish and Italian.
 # DescriptionEnd
-# Excludes: basic | natbib | biblatex
 
 # Author: Julien Rioux <jrioux@lyx.org>
 
-Format 62
+Format 98
 
 Requires jurabib
 
@@ -22,6 +21,9 @@ CiteEngineType authoryear
 # Default style file
 DefaultBiblio  jurabib
 
+# Maximum number of names before "et al." chimes in
+MaxCiteNames 3
+
 
 # The syntax of the cite command definitions below is:
 # LyXName|alias*<!_stardesc!_stardesctooltip>[][]=latexcmd
@@ -41,6 +43,8 @@ DefaultBiblio  jurabib
 #
 # Note further:
 #
+# * The LyXName "keyonly" has a special meaning: only the citation key,
+#   without any latex command, is output.
 # * Capitalization indicates that the command also has a capitalized
 #   form (\Latexcmd vs. \latexcmd). These usually enforce upcasing of
 #   name prefixes (von Goethe => Von Goethe).
@@ -91,6 +95,7 @@ CiteEngine authoryear
 	citeyearpar [][]
 	fullcite [][]
 	nocite
+	keyonly
 End
 
 #
@@ -101,18 +106,31 @@ End
 # (inset button and citation dialog) as well as in XHTML, docbook and
 # plain text output.
 #
+
+# Input standard format definitions for the bibliography
+Input stdciteformats.inc
+
 CiteFormat authoryear
 	#
 	# MACROS
 	#
-	# 1. Translatable bits (need to be marked by _ prefix)
+	# 1. Translatable bits (need to be marked by _ prefix, if translated to the GUI language,
+	#    or B_, if translated to the buffer language)
+	#    Note that preceding and trailing spaces matter.
 	#
 	_notcited not cited
 	_addtobib Add to bibliography only.
+	_keyonly Key only.
+	_key Key
 	_fullcite bibliography entry
 	_bibentry Bibliography entry.
 	_before before
 	_shorttitle short title
+	# The following are handled by BiblioInfo
+	B_etal  et al.
+	B_namesep /
+	B_lastnamesep /
+	B_pairnamesep /
 
 	#
 	# 2. Macros re-used in the style definitions
@@ -120,16 +138,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%]][[{%abbrvciteauthor%[[%abbrvciteauthor%]][[??]]}]]}
+	# "... 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)
@@ -209,4 +235,6 @@ CiteFormat authoryear
 	fullcite {%dialog%[[%_bibentry%]][[{%label%[[%!fullcite%]][[%key%%!nextkey% (%_fullcite%)]]}]]}
 	# "Add to bibliography only." (dialog) / "Key; Key ... (not cited)" (button)
 	nocite {%dialog%[[%_addtobib%]][[%key%%!nextkey% (%_notcited%)]]}
+	# Output only the key
+	keyonly {%dialog%[[%_keyonly%]][[%_key%: %key%%!nextkey%]]}
 End