anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-25 17:44:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24310 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2008-04-17 00:22:16 +00:00
parent fa804db4ab
commit 7ba6ed2654
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tex2lyx/Parser.cpp
View File

@ -317,7 +317,7 @@ string Parser::getOpt()
return res.empty() ? string() : '[' + res + ']'; return res.empty() ? string() : '[' + res + ']';
} }
string Parser::getFullParentheseOpt() string Parser::getFullParentheseArg()
{ {
Arg arg = getFullArg('(', ')'); Arg arg = getFullArg('(', ')');
if (arg.first) if (arg.first)

2
src/tex2lyx/Parser.h
View File

@ -158,7 +158,7 @@ public:
* <tt>\begin{name}</tt> must be parsed already, <tt>\end{name}</tt> * <tt>\begin{name}</tt> must be parsed already, <tt>\end{name}</tt>
* is parsed but not returned. * is parsed but not returned.
*/ */
std::string getFullParentheseOpt(); std::string getFullParentheseArg();
/// \returns getArg('(', ')') including the parentheses /// \returns getArg('(', ')') including the parentheses
std::string const verbatimEnvironment(std::string const & name); std::string const verbatimEnvironment(std::string const & name);
/// Returns the character of the current token and increments the token position. /// Returns the character of the current token and increments the token position.

4
src/tex2lyx/text.cpp
View File

@ -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() is part of the picture environment and different from \makebox{}
//\makebox{} will be parsed by parse_box when bug 2956 is fixed //\makebox{} will be parsed by parse_box when bug 2956 is fixed
else if (t.cs() == "makebox") { else if (t.cs() == "makebox") {
string arg = "\\makebox"; string arg = t.asInput();
if (p.next_token().character() == '(') if (p.next_token().character() == '(')
//the syntax is: \makebox(x,y)[position]{content} //the syntax is: \makebox(x,y)[position]{content}
arg += p.getFullParentheseOpt(); arg += p.getFullParentheseArg();
else else
//the syntax is: \makebox[width][position]{content} //the syntax is: \makebox[width][position]{content}
arg += p.getFullOpt(); arg += p.getFullOpt();