Add modifier to jurabib and natbib (author-year) modules.

[lyx.git] / lib / layouts / natbib.module

diff --git a/lib/layouts/natbib.module b/lib/layouts/natbib.module
index 6e3d8c74261b391affacca1dfd69d87185239b86..56c6d002439d21e227dcb6652a6e63330d27d943 100644 (file)
--- a/lib/layouts/natbib.module
+++ b/lib/layouts/natbib.module
@@ -10,7 +10,7 @@
 
 # Author: Julien Rioux <jrioux@lyx.org>
 
-Format 44
+Format 45
 
 Requires natbib
 
@@ -45,11 +45,7 @@ CiteFormat default
        _addtobib Add to bibliography only.
 
        # macros
-       !open [
-       !sep ,
-       !close ]
-
-       !startlink {!<a href='#LyXCite-%key%'>!}
+       !startlink {!<a href='#LyXCite-%clean:key%'>!}
        !endlink {!</a>!}
 
        !nextauthor {%next%[[%!sep% %!startlink%%!abbrvauthor%%!endlink%%!nextauthor%]]}
@@ -59,7 +55,7 @@ CiteFormat default
        !abbrvauthor {%abbrvauthor%[[%abbrvauthor%]][[??]]}
        !textbefore {%textbefore%[[%textbefore% ]]}
        !textafter {%textafter%[[, %textafter%]]}
-       !year {%year%[[%year%]][[??]]}
+       !year {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]}
 
        # cite styles
        citet %!citet%%!textafter%%!close%
@@ -69,6 +65,10 @@ CiteFormat default
 End
 
 CiteFormat authoryear
+       !open (
+       !sep ;
+       !close )
+
        !citet %!startlink%%!abbrvauthor%%!endlink% %!open%%!textbefore%%!year%%!nextcitet%
        !citealt %!startlink%%!abbrvauthor% %!textbefore%%!year%%!endlink%%!nextcitealt%
        !citealp %!startlink%%!abbrvauthor%, %!year%%!endlink%%!nextcitealp%
@@ -85,6 +85,10 @@ CiteFormat authoryear
 End
 
 CiteFormat numerical
+       !open [
+       !sep ,
+       !close ]
+
        !citet %!abbrvauthor% %!open%%!textbefore%{%dialog%[[#ID]][[%!startlink%#%key%%!endlink%]]}%!nextcitet%
        !citealt %!abbrvauthor% %!textbefore%{%dialog%[[#ID]][[%!startlink%#%key%%!endlink%]]}%!nextcitealt%