anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

replace nextToken by more appropriate lex methods.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9049 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2004-10-05 12:56:22 +00:00
parent de19376118
commit 4acce5c117
9 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-05 José Matos <jamatos@lyx.org>
* ParagraphParameters.C (read):
* text.C (readParToken): replace nexToken by more appropriate lex
methods.
2004-10-05 Hartmut Haase <hha4491@atomstromfrei.de>
* LaTeX.C (runMakeIndex):

2
src/ParagraphParameters.C
View File

@ -206,7 +206,7 @@ void ParagraphParameters::read(LyXLex & lex)
if (token == "\\noindent") {
noindent(true);
} else if (token == "\\leftindent") {
lex.nextToken();
lex.next();
LyXLength value(lex.getString());
leftIndent(value);
} else if (token == "\\start_of_appendix") {

12
src/insets/ChangeLog
View File

@ -1,4 +1,12 @@
2004-09-29 Andreas Vox <vox@isp.uni-luebeck.de>
2004-10-05 José Matos <jamatos@lyx.org>
* insetfloatlist.C (read):
* insetquotes.C (read):
* insetspace.C (read):
* insetspecialchar.C (read):
* insettabular.C (read): replace nextToken by more appropriate lex
methods.
2004-09-29 Andreas Vox <vox@isp.uni-luebeck.de>
* insetgraphics.C (createDocBookAttribute, docbook) :
convert scale, width, height and keepaspectratio to Docbook standards)
@ -6,7 +14,7 @@
* insetgraphics.[hC] (toDocbookLength): new method to convert TeX units
to Docbook units where possible.
2004-09-29 Andreas Vox <vox@isp.uni-luebeck.de>
2004-09-29 Andreas Vox <vox@isp.uni-luebeck.de>
* insetgraphics.C (docbook): create inlinegraphic instead of graphic.

2
src/insets/insetfloatlist.C
View File

@ -82,7 +82,7 @@ void InsetFloatList::read(Buffer const & buf, LyXLex & lex)
} else
lex.printError("InsetFloatList: Parse error: `$$Token'");
while (lex.isOK()) {
lex.nextToken();
lex.next();
token = lex.getString();
if (token == "\\end_inset")
break;

2
src/insets/insetquotes.C
View File

@ -254,7 +254,7 @@ void InsetQuotes::write(Buffer const &, ostream & os) const
void InsetQuotes::read(Buffer const &, LyXLex & lex)
{
lex.nextToken();
lex.next();
parseString(lex.getString());
lex.next();
if (lex.getString() != "\\end_inset") {

2
src/insets/insetspace.C
View File

@ -137,7 +137,7 @@ void InsetSpace::write(Buffer const &, ostream & os) const
// This function will not be necessary when lyx3
void InsetSpace::read(Buffer const &, LyXLex & lex)
{
lex.nextToken();
lex.next();
string const command = lex.getString();
if (command == "\\space")

2
src/insets/insetspecialchar.C
View File

@ -138,7 +138,7 @@ void InsetSpecialChar::write(Buffer const &, ostream & os) const
// This function will not be necessary when lyx3
void InsetSpecialChar::read(Buffer const &, LyXLex & lex)
{
lex.nextToken();
lex.next();
string const command = lex.getString();
if (command == "\\-")

4
src/insets/insettabular.C
View File

@ -204,10 +204,10 @@ void InsetTabular::read(Buffer const & buf, LyXLex & lex)
if (old_format)
return;
lex.nextToken();
lex.next();
string token = lex.getString();
while (lex.isOK() && (token != "\\end_inset")) {
lex.nextToken();
lex.next();
token = lex.getString();
}
if (token != "\\end_inset") {

4
src/text.C
View File

@ -324,14 +324,14 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
par.cleanChanges();
change = Change(Change::UNCHANGED);
} else if (token == "\\change_inserted") {
lex.nextToken();
lex.eatLine();
std::istringstream is(lex.getString());
int aid;
lyx::time_type ct;
is >> aid >> ct;
change = Change(Change::INSERTED, bp.author_map[aid], ct);
} else if (token == "\\change_deleted") {
lex.nextToken();
lex.eatLine();
std::istringstream is(lex.getString());
int aid;
lyx::time_type ct;