X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fjurabib.module;h=75b7d93abd9b7967cd78d7b82c711d4693f9a18d;hb=d8a6e0ab70962134792c5eca585fdcd013204649;hp=e91f90f1aa7078fbe7c7cb881cd69a2c7be596ac;hpb=b0aa0db10aae4a51d48f060e642f05542e89f370;p=lyx.git

diff --git a/lib/layouts/jurabib.module b/lib/layouts/jurabib.module
index e91f90f1aa..75b7d93abd 100644
--- a/lib/layouts/jurabib.module
+++ b/lib/layouts/jurabib.module
@@ -9,7 +9,7 @@
 
 # Author: Julien Rioux <jrioux@lyx.org>
 
-Format 42
+Format 43
 
 Requires jurabib
 
@@ -58,24 +58,29 @@ CiteFormat authoryear
 	!sep ;
 	!close )
 
-	!cite %!shortauthor%%!textbefore2%%!textafter2%%!nextcite%
-	!citetitle %!shortauthor%%!textbefore2%%!shorttitle%%!textafter2%%!nextcitetitle%
-	!citet %!textbefore%%!shortauthor% %!open%%!year%%!textafter%%!close%%!nextcitet%
+	!startlink {!<a href='#LyXCite-%key%'>!}
+	!endlink {!</a>!}
+
+	!cite %!startlink%%!shortauthor%%!endlink%%!textbefore2%%!textafter2%%!nextcite%
+	!citetitle %!startlink%%!shortauthor%%!endlink%%!textbefore2%%!shorttitle%%!textafter2%%!nextcitetitle%
+	!citet %!textbefore%%!startlink%%!shortauthor%%!endlink% %!open%%!year%%!textafter%%!close%%!nextcitet%
 	!citep %!open%%!citealp%%!close%
-	!citealt %!textbefore%%!shortauthor% %!year%%!textafter%%!nextcitealt%
-	!citealp %!textbefore%%!shortauthor%, %!year%%!textafter%%!nextcitealp%
-	!citeauthor %!textbefore%%!shortauthor%%!textafter%%!nextauthor%
-	!citeyear %!textbefore%%!year%%!textafter%%!nextyear%
-	!citeyearpar %!textbefore%%!open%%!year%%!close%%!textafter%%!nextyearpar%
+	!citealt %!textbefore%%!startlink%%!shortauthor% %!year%%!endlink%%!textafter%%!nextcitealt%
+	!citealp %!textbefore%%!startlink%%!shortauthor%, %!year%%!endlink%%!textafter%%!nextcitealp%
+	!citeauthor %!textbefore%%!startlink%%!shortauthor%%!endlink%%!textafter%%!nextauthor%
+	!citeyear %!textbefore%%!startlink%%!year%%!endlink%%!textafter%%!nextyear%
+	!citeyearpar %!textbefore%%!open%%!startlink%%!year%%!endlink%%!close%%!textafter%%!nextyearpar%
+	!fullcite {%textbefore%[[%textbefore% in: ]]}%bibentry%{%textafter%[[ %textafter%]]}%!nextfullcite%
 
-	!nextcite {%next%[[%!sep% %!shortauthor%%!textafter2%%!nextcite%]]}
-	!nextcitetitle {%next%[[%!sep% %!shortauthor%%!shorttitle%%!textafter2%%!nextcitetitle%]]}
+	!nextcite {%next%[[%!sep% %!startlink%%!shortauthor%%!endlink%%!textafter2%%!nextcite%]]}
+	!nextcitetitle {%next%[[%!sep% %!startlink%%!shortauthor%%!endlink%%!shorttitle%%!textafter2%%!nextcitetitle%]]}
 	!nextcitet {%next%[[%!sep% %!citet%]]}
 	!nextcitealt {%next%[[%!sep% %!citealt%]]}
 	!nextcitealp {%next%[[%!sep% %!citealp%]]}
 	!nextauthor {%next%[[%!sep% %!citeauthor%]]}
 	!nextyear {%next%[[%!sep% %!citeyear%]]}
 	!nextyearpar {%next%[[%!sep% %!citeyearpar%]]}
+	!nextfullcite {%next%[[%!sep% %bibentry%{%textafter%[[ %textafter%]]}%!nextfullcite%]]}
 	!nextkey {%next%[[%!sep% %key%%!nextkey%]]}
 
 	!shortauthor {%shortauthor%[[%shortauthor%]][[??]]}
@@ -96,6 +101,6 @@ CiteFormat authoryear
 	citeauthor %!citeauthor%
 	citeyear %!citeyear%
 	citeyearpar %!citeyearpar%
-	fullcite {%dialog%[[%_bibentry%]][[%key%%!nextkey% (%_fullcite%)]]}
+	fullcite {%dialog%[[%_bibentry%]][[{%label%[[%!fullcite%]][[%key%%!nextkey% (%_fullcite%)]]}]]}
 	nocite {%dialog%[[%_addtobib%]][[%key%%!nextkey% (%_notcited%)]]}
 End