The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit aa475ea70c11f14fc0bb302ab6396e8b8c61c039 Author: Julien Rioux <jri...@lyx.org> Date: Mon May 13 20:26:46 2013 +0200 Initialize BibTeXInfo modifier to zero, always. diff --git a/src/BiblioInfo.h b/src/BiblioInfo.h index 53ac254..759d253 100644 --- a/src/BiblioInfo.h +++ b/src/BiblioInfo.h @@ -47,10 +47,10 @@ public: /// and the values are the associated field values. typedef std::map<docstring, docstring>::const_iterator const_iterator; /// - BibTeXInfo() : is_bibtex_(true) {} + BibTeXInfo() : is_bibtex_(true), modifier_(0) {} /// argument sets isBibTeX_, so should be false only if it's coming /// from a bibliography environment - BibTeXInfo(bool ib) : is_bibtex_(ib) {} + BibTeXInfo(bool ib) : is_bibtex_(ib), modifier_(0) {} /// constructor that sets the entryType BibTeXInfo(docstring const & key, docstring const & type); /// \return the short form of an authorlist, used for sorting diff --git a/status.20x b/status.20x index d434c55..aceb016 100644 --- a/status.20x +++ b/status.20x @@ -89,6 +89,8 @@ What's new - Add missing space before the edition in the bibliography (part of bug 8488). +- Fix random character inserted as year modifier in author-year citations. + * TEX2LYX commit 626a38a6009bf58b81a43418ec5f3e42524735fa Author: Julien Rioux <jri...@lyx.org> Date: Mon May 13 21:07:04 2013 +0200 Add missing space in front of edition in generated bibentry. diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc index 2055e1c..a7b8fc8 100644 --- a/lib/layouts/stdciteformats.inc +++ b/lib/layouts/stdciteformats.inc @@ -20,11 +20,11 @@ CiteFormat !emphtitle {!<i>!}%title%{!</i>!} !emphjournal {!<i>!}%journal%{!</i>!} - !insomething %author%, %!quotetitle%, %_in%{%editor%[[ %editor%, %_edtext%,]]} {!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[%edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%)%!pages%.{%note%[[ %note%]]} + !insomething %author%, %!quotetitle%, %_in%{%editor%[[ %editor%, %_edtext%,]]} {!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[ %edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%)%!pages%.{%note%[[ %note%]]} article %author%, %!quotetitle%, %!emphjournal% {%volume%[[ %volume%{%number%[[, %number%]]}]]} (%year%)%!pages%.{%note%[[ %note%]]} - book %!authoredit%%!emphtitle%%!volnum%{%edition%[[%edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%).{%note%[[ %note%]]} + book %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%).{%note%[[ %note%]]} incollection %!insomething% inproceedings %!insomething% diff --git a/status.20x b/status.20x index 7528f7a..d434c55 100644 --- a/status.20x +++ b/status.20x @@ -87,6 +87,8 @@ What's new - Fix problem with size of superscripts and such inside footnotes (bug 8610). +- Add missing space before the edition in the bibliography (part of bug 8488). + * TEX2LYX ----------------------------------------------------------------------- Summary of changes: lib/layouts/stdciteformats.inc | 4 ++-- src/BiblioInfo.h | 4 ++-- status.20x | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- The LyX Source Repository