tex2lyx/text.cpp: cosmetic

[lyx.git] / src / tex2lyx / Parser.cpp

diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 2c826fed4aec579698464544f5876977173c52f9..3ceda050f5eca577349a8b85c1c9242a7e97a78b 100644 (file)
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -273,14 +273,14 @@ Parser::Arg Parser::getFullArg(char left, char right)
        // This is needed if a partial file ends with a command without arguments,
        // e. g. \medskip
        if (! good())
-               return std::make_pair(false, string());
+               return make_pair(false, string());
 
        string result;
        char c = getChar();
 
        if (c != left) {
                putback();
-               return std::make_pair(false, string());
+               return make_pair(false, string());
        } else
                while ((c = getChar()) != right && good()) {
                        // Ignore comments
@@ -292,7 +292,7 @@ Parser::Arg Parser::getFullArg(char left, char right)
                                result += curr_token().asInput();
                }
 
-       return std::make_pair(true, result);
+       return make_pair(true, result);
 }
 
 
@@ -307,7 +307,7 @@ string Parser::getFullOpt()
        Arg arg = getFullArg('[', ']');
        if (arg.first)
                return '[' + arg.second + ']';
-       return arg.second;
+       return string();
 }
 
 
@@ -318,6 +318,15 @@ string Parser::getOpt()
 }
 
 
+string Parser::getFullParentheseArg()
+{
+       Arg arg = getFullArg('(', ')');
+       if (arg.first)
+               return '(' + arg.second + ')';
+       return string();
+}
+
+
 string const Parser::verbatimEnvironment(string const & name)
 {
        if (!good())