The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 4d1b495139439e98a31e9c3f796fa76171a9173a Author: Juergen Spitzmueller <[email protected]> Date: Mon Nov 26 13:09:54 2012 +0100 LaTeXParam and Argument do not necessarily exclude each other diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index c7a39b6..6d19c86 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -1464,8 +1464,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const if (!layout_->latexargs().empty()) latexArgInsets(*owner_, os, features.runparams(), layout_->latexargs()); - else - os << from_ascii(layout_->latexparam()); + os << from_ascii(layout_->latexparam()); } docstring::size_type const length = ods.str().length(); // this will output "{" at the beginning, but not at the end diff --git a/src/output_latex.cpp b/src/output_latex.cpp index e680cc7..e211faf 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -409,8 +409,7 @@ void parStartCommand(Paragraph const & par, otexstream & os, // Separate handling of optional argument inset. if (!style.latexargs().empty()) latexArgInsets(par, os, runparams, style.latexargs()); - else - os << from_ascii(style.latexparam()); + os << from_ascii(style.latexparam()); break; case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: ----------------------------------------------------------------------- Summary of changes: src/Paragraph.cpp | 3 +-- src/output_latex.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) hooks/post-receive -- The LyX Source Repository
