Fix table rotate conversion to 2.0 format

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

diff --git a/lib/layouts/natbib.module b/lib/layouts/natbib.module
index 65d6b39ff1b373d592dd413831152ac4e7befd5b..68af0ad76cbfe9142afa12404884870f5a9db449 100644 (file)
--- a/lib/layouts/natbib.module
+++ b/lib/layouts/natbib.module
@@ -10,7 +10,7 @@
 
 # Author: Julien Rioux <jrioux@lyx.org>
 
-Format 43
+Format 49
 
 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,15 +85,19 @@ CiteFormat authoryear
 End
 
 CiteFormat numerical
-       !citet %!abbrvauthor% %!open%%!textbefore%{%dialog%[[#ID]][[%!startlink%#%key%%!endlink%]]}%!nextcitet%
-       !citealt %!abbrvauthor% %!textbefore%{%dialog%[[#ID]][[%!startlink%#%key%%!endlink%]]}%!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]][[%!startlink%#%key%%!endlink%%!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% %!startlink%#%key%%!endlink%%!nexthashkey%]]}
+       !nexthashkey {%next%[[%!sep% %!startlink%{%numericallabel%[[%numericallabel%]][[#%key%]]}%!endlink%%!nexthashkey%]]}
 
        cite %!open%%!textbefore%%!hashkey%%!textafter%%!close%
        citep %!open%%!textbefore%%!hashkey%%!textafter%%!close%