replace nextToken by more appropriate lex methods.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8031b23dfcaf4f02ab8c5de55476d8faea937db4..23a28c304c6486a138501cc77de2ee81c7cafafb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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):

diff --git a/src/ParagraphParameters.C b/src/ParagraphParameters.C
index 428063f0fd6ac90b0288b72d3b55b040a1c9589f..52c33854611d4a935dff7139ecfb5907e457d739 100644 (file)
--- a/src/ParagraphParameters.C
+++ b/src/ParagraphParameters.C
@@ -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") {

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 3f315997e8773bcd7b9fe943a8f3ed3256887896..4a18c013141af7684b3eb4f265f268c29095d2ec 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -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. 
        

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index cdd1d857af799cabfa24234df407e17a4c5c7ae5..54d5f67a0dc203a8ccc9e3986be76eafd297a0fa 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -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;

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 78424adc990e1328bc87621544afc9865a126f28..3774e4335d82daba7e0a6991df746c8cf7537d51 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -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") {

diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C
index bca145631862e4af3d9099a40c85f1fb0797d62e..11cc7925e14f87bf62556a4b40e53632059deaa0 100644 (file)
--- a/src/insets/insetspace.C
+++ b/src/insets/insetspace.C
@@ -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")

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index fb3f7547a595068a0962b69e8b6ff8f8de95a4a9..c9ea76abe57ac075718fedc1e171cd0802afc1be 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -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 == "\\-")

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index c3e1f898398601bb09ef8a2b7e792a2a01875018..fd5c283bf5ec97c75b41791d0ca0e9d53f7248d0 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -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") {

diff --git a/src/text.C b/src/text.C
index aaa1fbf088a3d9ba674e1a86fe1f920a8ad6979b..05954f6ddc9e5f92ad642019f3c02bb5cff3f8ae 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -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;