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

diff --git a/lib/layouts/jurabib.module b/lib/layouts/jurabib.module
index 2b0357d850d0c4c7d1008e14405c3699ee79fabe..86167724e3b9b4498b39cc3f1df3f840e3dcaa11 100644 (file)
--- a/lib/layouts/jurabib.module
+++ b/lib/layouts/jurabib.module
@@ -89,7 +89,7 @@ CiteFormat authoryear
        !textbefore2 {%textbefore%[[/%textbefore%]][[{%dialog%[[/<%_before%>]]}]]}
        !textafter {%textafter%[[, %textafter%]]}
        !textafter2 {%textafter%[[ %textafter%]]}
-       !year {%year%[[%year%]][[??]]}
+       !year {%year%[[%year%]][[??]]}{%modifier%[[%modifier%]]}
 
        # cite styles
        cite %!cite%

diff --git a/lib/layouts/natbib.module b/lib/layouts/natbib.module
index b9195e58e5defce47aa5eac52bcfa4155205fa2c..56c6d002439d21e227dcb6652a6e63330d27d943 100644 (file)
--- a/lib/layouts/natbib.module
+++ b/lib/layouts/natbib.module
@@ -55,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%

diff --git a/src/BiblioInfo.cpp b/src/BiblioInfo.cpp
index db397a4f7df91c0a8ebf87f60de19591783f1ca5..dfc29bb3309e9e4dd04d067f479860842c6587f8 100644 (file)
--- a/src/BiblioInfo.cpp
+++ b/src/BiblioInfo.cpp
@@ -665,7 +665,7 @@ docstring BibTeXInfo::getValueForKey(string const & oldkey, Buffer const & buf,
                key = oldkey.substr(6);
                cleanit = true;
        }
-               
+
        docstring ret = operator[](key);
        if (ret.empty() && xref)
                ret = (*xref)[key];
@@ -680,6 +680,8 @@ docstring BibTeXInfo::getValueForKey(string const & oldkey, Buffer const & buf,
                        ret = bib_key_;
                else if (key == "label")
                        ret = label_;
+               else if (key == "modifier" && modifier_ != 0)
+                       ret = modifier_;
                else if (key == "abbrvauthor")
                        // Special key to provide abbreviated author names.
                        ret = getAbbreviatedAuthor(buf, false);
@@ -714,7 +716,7 @@ docstring BibTeXInfo::getValueForKey(string const & oldkey, Buffer const & buf,
        }
        if (cleanit)
                return html::cleanAttr(ret);
-       
+
        return ret;
 }