From: Uwe Stöhr <uwestoehr@web.de>
Date: Thu, 17 Apr 2008 00:22:16 +0000 (+0000)
Subject: tex2lyx/Parser.cpp: rename a function since it returns a mandatory argument
X-Git-Tag: 1.6.10~5151
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7ba6ed2654ac2676e04e47bf51370d9b804bf549;p=features.git

tex2lyx/Parser.cpp: rename a function since it returns a mandatory argument

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24310 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 5ff1eb80d7..f1b3514316 100644
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -317,7 +317,7 @@ string Parser::getOpt()
 	return res.empty() ? string() : '[' + res + ']';
 }
 
-string Parser::getFullParentheseOpt()
+string Parser::getFullParentheseArg()
 {
 	Arg arg = getFullArg('(', ')');
 	if (arg.first)
diff --git a/src/tex2lyx/Parser.h b/src/tex2lyx/Parser.h
index 0a360fef97..5dcbc56aaa 100644
--- a/src/tex2lyx/Parser.h
+++ b/src/tex2lyx/Parser.h
@@ -158,7 +158,7 @@ public:
 	 * <tt>\begin{name}</tt> must be parsed already, <tt>\end{name}</tt>
 	 * is parsed but not returned.
 	 */
-	std::string getFullParentheseOpt();
+	std::string getFullParentheseArg();
 	/// \returns getArg('(', ')') including the parentheses
 	std::string const verbatimEnvironment(std::string const & name);
 	/// Returns the character of the current token and increments the token position.
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index d6daec69ee..5a22ecf614 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2349,10 +2349,10 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 		//\makebox() is part of the picture environment and different from \makebox{}
 		//\makebox{} will be parsed by parse_box when bug 2956 is fixed
 		else if (t.cs() == "makebox") {
-			string arg = "\\makebox";
+			string arg = t.asInput();
 			if (p.next_token().character() == '(')
 				//the syntax is: \makebox(x,y)[position]{content}
-				arg += p.getFullParentheseOpt();
+				arg += p.getFullParentheseArg();
 			else
 				//the syntax is: \makebox[width][position]{content}
 				arg += p.getFullOpt();