From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 26 Nov 2012 12:09:54 +0000 (+0100)
Subject: LaTeXParam and Argument do not necessarily exclude each other
X-Git-Tag: 2.1.0beta1~1188
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4d1b495139439e98a31e9c3f796fa76171a9173a;p=features.git

LaTeXParam and Argument do not necessarily exclude each other
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index c7a39b6ab3..6d19c866c2 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 e680cc7aeb..e211fafb68 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: