STRCONV() all over the place

[lyx.git] / src / tex2lyx / texparser.C

diff --git a/src/tex2lyx/texparser.C b/src/tex2lyx/texparser.C
index aa3bff86397b3c2ee4710a1bbee009de1f0de5f8..d626ebefb439e19da082bd3e1f2b26626133b39e 100644 (file)
--- a/src/tex2lyx/texparser.C
+++ b/src/tex2lyx/texparser.C
@@ -1,7 +1,11 @@
 
+#include <config.h>
+
 #include "texparser.h"
 #include "Lsstream.h"
 
+#include <iostream>
+
 using std::cerr;
 using std::endl;
 using std::fill;
@@ -9,7 +13,6 @@ using std::ios;
 using std::istream;
 using std::istringstream;
 using std::ostream;
-using std::string;
 using std::vector;
 
 
@@ -39,16 +42,19 @@ void catInit()
        theCatcode['}']  = catEnd;
        theCatcode['$']  = catMath;
        theCatcode['&']  = catAlign;
-       theCatcode['\n'] = catNewline;
+       theCatcode[10]   = catNewline;
        theCatcode['#']  = catParameter;
        theCatcode['^']  = catSuper;
        theCatcode['_']  = catSub;
        theCatcode['\7f'] = catIgnore;
        theCatcode[' ']  = catSpace;
        theCatcode['\t'] = catSpace;
-       theCatcode['\r'] = catNewline;
+       theCatcode[13]   = catIgnore;
        theCatcode['~']  = catActive;
        theCatcode['%']  = catComment;
+
+       // This is wrong!
+       theCatcode['@']  = catLetter;
 }
 
 }
@@ -82,7 +88,11 @@ CatCode catcode(unsigned char c)
 ostream & operator<<(ostream & os, Token const & t)
 {
        if (t.cs().size())
-               os << '\\' << t.cs();
+               os << '\\' << t.cs() << ' ';
+       else if (t.cat() == catLetter)
+               os << t.character();
+       else if (t.cat() == catNewline)
+               os << "[\\n," << t.cat() << "]\n";
        else
                os << '[' << t.character() << ',' << t.cat() << ']';
        return os;
@@ -97,7 +107,7 @@ string Token::asString() const
 
 string Token::asInput() const
 {
-       return cs_.size() ? cs_ + ' ' : string(1, char_);
+       return char_ ? string(1, char_) : '\\' + cs_ + ' ';
 }
 
 
@@ -113,6 +123,14 @@ Parser::Parser(istream & is)
 }
 
 
+Parser::Parser(string const & s)
+       : lineno_(0), pos_(0)
+{
+       istringstream is(STRCONV(s));
+       tokenize(is);
+}
+
+
 void Parser::push_back(Token const & t)
 {
        tokens_.push_back(t);
@@ -125,21 +143,21 @@ void Parser::pop_back()
 }
 
 
-Token const & Parser::prevToken() const
+Token const & Parser::prev_token() const
 {
        static const Token dummy;
        return pos_ > 0 ? tokens_[pos_ - 1] : dummy;
 }
 
 
-Token const & Parser::nextToken() const
+Token const & Parser::next_token() const
 {
        static const Token dummy;
        return good() ? tokens_[pos_] : dummy;
 }
 
 
-Token const & Parser::getToken()
+Token const & Parser::get_token()
 {
        static const Token dummy;
        //cerr << "looking at token " << tokens_[pos_] << " pos: " << pos_ << '\n';
@@ -147,10 +165,17 @@ Token const & Parser::getToken()
 }
 
 
-void Parser::skipSpaces()
+void Parser::skip_spaces()
 {
-       while (nextToken().cat() == catSpace || nextToken().cat() == catNewline)
-               getToken();
+       while (1) {
+               if (next_token().cat() == catSpace || next_token().cat() == catNewline)
+                       get_token();
+               else if (next_token().cat() == catComment) 
+                       while (next_token().cat() != catNewline)
+                               get_token();
+               else
+                       break;
+       }
 }
 
 
@@ -176,7 +201,7 @@ char Parser::getChar()
 
 string Parser::getArg(char left, char right)
 {
-       skipSpaces();
+       skip_spaces();
 
        string result;
        char c = getChar();
@@ -191,6 +216,13 @@ string Parser::getArg(char left, char right)
 }
 
 
+string Parser::getOpt()
+{
+       string res = getArg('[', ']');
+       return res.size() ? '[' + res + ']' : string();
+}
+
+
 void Parser::tokenize(istream & is)
 {
        static bool init_done = false;
@@ -208,12 +240,15 @@ void Parser::tokenize(istream & is)
                        case catNewline: {
                                ++lineno_;
                                is.get(c);
-                               if (catcode(c) == catNewline)
+                               if (catcode(c) == catNewline) {
+                                       //do {
+                                               is.get(c);
+                                       //} while (catcode(c) == catNewline);
                                        push_back(Token("par"));
-                               else {
+                               } else {
                                        push_back(Token('\n', catNewline));
-                                       is.putback(c);
                                }
+                               is.putback(c);
                                break;
                        }
 
@@ -252,7 +287,8 @@ void Parser::tokenize(istream & is)
                        }
 
                        case catIgnore: {
-                               cerr << "ignoring a char: " << int(c) << "\n";
+                               if (c != 13)
+                                       cerr << "ignoring a char: " << int(c) << "\n";
                                break;
                        }
 
@@ -286,12 +322,12 @@ void Parser::error(string const & msg)
 string Parser::verbatimOption()
 {
        string res;
-       if (nextToken().character() == '[') {
-               Token t = getToken();
-               for (Token t = getToken(); t.character() != ']' && good(); t = getToken()) {
+       if (next_token().character() == '[') {
+               Token t = get_token();
+               for (Token t = get_token(); t.character() != ']' && good(); t = get_token()) {
                        if (t.cat() == catBegin) {
                                putback();
-                               res += '{' + verbatimItem() + '}';
+                               res += '{' + verbatim_item() + '}';
                        } else
                                res += t.asString();
                }
@@ -300,19 +336,35 @@ string Parser::verbatimOption()
 }
 
 
-string Parser::verbatimItem()
+string Parser::verbatim_item()
 {
-       string res;
-       if (nextToken().cat() == catBegin) {
-               Token t = getToken();
-               for (Token t = getToken(); t.cat() != catEnd && good(); t = getToken()) {
+       if (!good())
+               error("stream bad");
+       skip_spaces();
+       if (next_token().cat() == catBegin) {
+               Token t = get_token(); // skip brace
+               string res;
+               for (Token t = get_token(); t.cat() != catEnd && good(); t = get_token()) {
                        if (t.cat() == catBegin) {
                                putback();
-                               res += '{' + verbatimItem() + '}';
+                               res += '{' + verbatim_item() + '}';
                        }
                        else
-                               res += t.asString();
+                               res += t.asInput();
                }
+               return res;
        }
-       return res;
+       return get_token().asInput();
+}
+
+
+void Parser::setCatCode(char c, CatCode cat)
+{
+       theCatcode[c] = cat;    
+}
+
+
+CatCode Parser::getCatCode(char c) const
+{
+       return theCatcode[c];
 }