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 5ff1eb80d73273daa6a751dab2d35a17597dfa53..f1b3514316573c6d8304c579c933820e3ab3f948 100644 (file)
--- 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 0a360fef974803bdf0a9f33a471b756f72a3ffaf..5dcbc56aaa3485836dd6909bd8a923c703231251 100644 (file)
--- 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 d6daec69ee2693d082418d25b7e3eac9c85834f8..5a22ecf614b2a473c58ea5e6d48ed124564769c6 100644 (file)
--- 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();