The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 66f44f46c26b97963356fba9a7821c46d6e4921a Author: Julien Rioux <[email protected]> Date: Mon May 13 20:58:12 2013 +0200 Add modifier to jurabib and natbib (author-year) modules. diff --git a/lib/layouts/jurabib.module b/lib/layouts/jurabib.module index 2b0357d..8616772 100644 --- 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 b9195e5..56c6d00 100644 --- 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 db397a4..dfc29bb 100644 --- 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; } ----------------------------------------------------------------------- Summary of changes: lib/layouts/jurabib.module | 2 +- lib/layouts/natbib.module | 2 +- src/BiblioInfo.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) hooks/post-receive -- The LyX Source Repository
