X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fnatbib.module;h=ba028c012d291ca858001ede8a292e751bdc99e3;hb=9c8955ffd9df1a38a617bcbdf011c7b890ea23d1;hp=cf2c0d8cd82dc39d43c25025090c498514455c42;hpb=2a62a2c3957b89489580f59150c20e45a66e4b43;p=lyx.git diff --git a/lib/layouts/natbib.module b/lib/layouts/natbib.module index cf2c0d8cd8..ba028c012d 100644 --- a/lib/layouts/natbib.module +++ b/lib/layouts/natbib.module @@ -10,7 +10,7 @@ # Author: Julien Rioux -Format 43 +Format 45 Requires natbib @@ -49,9 +49,12 @@ CiteFormat default !sep , !close ] - !nextauthor {%next%[[%!sep% %!abbrvauthor%%!nextauthor%]]} + !startlink {!!} + !endlink {!!} + + !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% ]]} @@ -61,14 +64,14 @@ CiteFormat default # 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% + !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,24 @@ 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% + !citet %!abbrvauthor% %!open%%!textbefore%{%dialog%[[#ID]][[%!startlink%#%key%%!endlink%]]}%!nextcitet% + !citealt %!abbrvauthor% %!textbefore%{%dialog%[[#ID]][[%!startlink%#%key%%!endlink%]]}%!nextcitealt% - !hashkey {%dialog%[[#ID]][[#%key%%!nexthashkey%]]} + !hashkey {%dialog%[[#ID]][[%!startlink%#%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%#%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