X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fnatbib.module;h=68af0ad76cbfe9142afa12404884870f5a9db449;hb=d6fecb4aa47899ea3fe02d1699e0ffc81f364910;hp=2deba89b79b812d9a09559c0017a01b3c24d968d;hpb=ff42273bb5a4cf3d0501d37420a8d1ec06a7cf4a;p=lyx.git

diff --git a/lib/layouts/natbib.module b/lib/layouts/natbib.module
index 2deba89b79..68af0ad76c 100644
--- a/lib/layouts/natbib.module
+++ b/lib/layouts/natbib.module
@@ -10,7 +10,7 @@
 
 # Author: Julien Rioux <jrioux@lyx.org>
 
-Format 41
+Format 49
 
 Requires natbib
 
@@ -45,30 +45,33 @@ CiteFormat default
 	_addtobib Add to bibliography only.
 
 	# macros
-	!open [
-	!sep ,
-	!close ]
+	!startlink {!<a href='#LyXCite-%clean:key%'>!}
+	!endlink {!</a>!}
 
-	!nextauthor {%next%[[%!sep% %!abbrvauthor%%!nextauthor%]]}
+	!nextauthor {%next%[[%!sep% %!startlink%%!abbrvauthor%%!endlink%%!nextauthor%]]}
 	!nextkey {%next%[[%!sep% %key%%!nextkey%]]}
-	!nextyear {%next%[[%!sep% %!year%%!nextyear%]]}
+	!nextyear {%next%[[%!sep% %!startlink%%!year%%!endlink%%!nextyear%]]}
 
 	!abbrvauthor {%abbrvauthor%[[%abbrvauthor%]][[??]]}
 	!textbefore {%textbefore%[[%textbefore% ]]}
 	!textafter {%textafter%[[, %textafter%]]}
-	!year {%year%[[%year%]][[??]]}
+	!year {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]}
 
 	# cite styles
 	citet %!citet%%!textafter%%!close%
 	citealt %!citealt%%!textafter%
-	citeyearpar %!open%%!textbefore%%!year%%!nextyear%%!textafter%%!close%
+	citeyearpar %!open%%!textbefore%%!startlink%%!year%%!endlink%%!nextyear%%!textafter%%!close%
 	nocite {%dialog%[[%_addtobib%]][[%key%%!nextkey% (%_notcited%)]]}
 End
 
 CiteFormat authoryear
-	!citet %!abbrvauthor% %!open%%!textbefore%%!year%%!nextcitet%
-	!citealt %!abbrvauthor% %!textbefore%%!year%%!nextcitealt%
-	!citealp %!abbrvauthor%, %!year%%!nextcitealp%
+	!open (
+	!sep ;
+	!close )
+
+	!citet %!startlink%%!abbrvauthor%%!endlink% %!open%%!textbefore%%!year%%!nextcitet%
+	!citealt %!startlink%%!abbrvauthor% %!textbefore%%!year%%!endlink%%!nextcitealt%
+	!citealp %!startlink%%!abbrvauthor%, %!year%%!endlink%%!nextcitealp%
 
 	!nextcitet {%next%[[%!close%%!sep% %!citet%]]}
 	!nextcitealt {%next%[[%!sep% %!citealt%]]}
@@ -77,24 +80,28 @@ CiteFormat authoryear
 	cite %!citet%%!textafter%%!close%
 	citep %!open%%!textbefore%%!citealp%%!textafter%%!close%
 	citealp %!textbefore%%!citealp%%!textafter%
-	citeauthor %!abbrvauthor%%!nextauthor%%!textafter%
-	citeyear %!year%%!nextyear%%!textafter%
+	citeauthor %!startlink%%!abbrvauthor%%!endlink%%!nextauthor%%!textafter%
+	citeyear %!startlink%%!year%%!endlink%%!nextyear%%!textafter%
 End
 
 CiteFormat numerical
-	!citet %!abbrvauthor% %!open%%!textbefore%{%dialog%[[#ID]][[#%key%]]}%!nextcitet%
-	!citealt %!abbrvauthor% %!textbefore%{%dialog%[[#ID]][[#%key%]]}%!nextcitealt%
+	!open [
+	!sep ,
+	!close ]
+
+	!citet %!abbrvauthor% %!open%%!textbefore%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!nextcitet%
+	!citealt %!abbrvauthor% %!textbefore%{%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%]]}%!nextcitealt%
 
-	!hashkey {%dialog%[[#ID]][[#%key%%!nexthashkey%]]}
+	!hashkey {%dialog%[[#ID]][[%!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%%!nexthashkey%]]}
 
 	!nextcitet {%next%[[%!close%%!sep% %!citet%]]}
 	!nextcitealt {%next%[[%!sep% %!citealt%]]}
 	!nexthashid {%next%[[%!sep% #ID%!nexthashid%]]}
-	!nexthashkey {%next%[[%!sep% #%key%%!nexthashkey%]]}
+	!nexthashkey {%next%[[%!sep% %!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%%!nexthashkey%]]}
 
 	cite %!open%%!textbefore%%!hashkey%%!textafter%%!close%
 	citep %!open%%!textbefore%%!hashkey%%!textafter%%!close%
 	citealp %!textbefore%%!hashkey%%!textafter%
-	citeauthor %!abbrvauthor%%!nextauthor%
-	citeyear %!year%%!nextyear%
+	citeauthor %!startlink%%!abbrvauthor%%!endlink%%!nextauthor%
+	citeyear %!startlink%%!year%%!endlink%%!nextyear%
 End