X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fciteengines%2Fjurabib.citeengine;h=881deeef2aa776c944df86f7b2a25b940a3c2f61;hb=d4e30ad88f2967a2e464fd3a54a52feeb25e72f1;hp=220dd640a71ccdf521d074df428b13dce19babc9;hpb=eba2f0479eb5af6b61d9a82e89daea253d9b6bf6;p=lyx.git

diff --git a/lib/citeengines/jurabib.citeengine b/lib/citeengines/jurabib.citeengine
index 220dd640a7..881deeef2a 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 63
+Format 64
 
 Requires jurabib
 
@@ -44,6 +43,8 @@ MaxCiteNames 3
 #
 # 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).
@@ -94,6 +95,7 @@ CiteEngine authoryear
 	citeyearpar [][]
 	fullcite [][]
 	nocite
+	keyonly
 End
 
 #
@@ -104,6 +106,10 @@ 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
@@ -113,6 +119,8 @@ CiteFormat authoryear
 	#
 	_notcited not cited
 	_addtobib Add to bibliography only.
+	_keyonly Key only.
+	_key Key
 	_fullcite bibliography entry
 	_bibentry Bibliography entry.
 	_before before
@@ -129,16 +137,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)
@@ -218,4 +234,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