fixes

Author: rochus-keller

LispHighlighter.cpp

@@ -161,13 +161,15 @@ void Highlighter::highlightBlock(const QString& text)
     {
         t = lex.readString();
         setFormat( 0, t.len, formatForCategory(C_Str) );
-        if( !t.val.endsWith('"') )
+        if( t.val.endsWith('"') && ((t.pos.col + t.len) < 2 || text[t.pos.col + t.len - 2] != '%') ) // ": -1, %: -2
+            inString = false;
+        else
         {
             // the whole line is in the string
             // lexer state remains the same
+            setCurrentBlockState(previousBlockState_);
             return;
-        }else
-            inString = false;
+        }
     }
 
     t = lex.nextToken();

LispLexer.cpp

@@ -510,7 +510,7 @@ Token Lexer::string()
     while( true )
     {
         c = readc();
-        if( c == '%' )
+        if( c == '%' ) // QUOTE has no influence here, see MACHINEINDEPENDENT line 1327
         {
             extra++;
             c = readc(); // escape

LispNavigator.cpp

@@ -1026,7 +1026,7 @@ int main(int argc, char *argv[])
     a.setOrganizationName("[email protected]");
     a.setOrganizationDomain("github.com/rochus-keller/Interlisp");
     a.setApplicationName("InterlispNavigator");
-    a.setApplicationVersion("0.3.5");
+    a.setApplicationVersion("0.3.6");
     a.setStyle("Fusion");
 
     QFontDatabase::addApplicationFont(":/fonts/DejaVuSansMono.ttf");

LispReader.cpp

@@ -43,6 +43,7 @@ static const char* DEFINEQ;
 static const char* QUOTE;
 static const char* PUTPROPS;
 static const char* PUTPROP;
+static const char* SET;
 static const char* SETQ;
 static const char* SETQQ;
 static const char* RPAQ;
@@ -66,6 +67,7 @@ bool Reader::read(QIODevice* in, const QString& path)
     QUOTE = Token::getSymbol("QUOTE").constData();
     PUTPROPS = Token::getSymbol("PUTPROPS").constData();
     PUTPROP = Token::getSymbol("PUTPROP").constData();
+    SET = Token::getSymbol("SET").constData();
     SETQ = Token::getSymbol("SETQ").constData();
     SETQQ = Token::getSymbol("SETQQ").constData();
     RPAQ = Token::getSymbol("RPAQ").constData();
@@ -204,7 +206,8 @@ Reader::Object Reader::list(Lexer& in, bool brack, List* outer)
                     r = Ref::Decl;
             }else if( l->list.size() == 2 &&
                       (l->list.first().getAtom() == PUTPROP ||
-                       l->list.first().getAtom() == PUTPROPS || l->list.first().getAtom() == SETQ ||
+                       l->list.first().getAtom() == PUTPROPS ||
+                       l->list.first().getAtom() == SET || l->list.first().getAtom() == SETQ ||
                        l->list.first().getAtom() == SETQQ || l->list.first().getAtom() == RPAQ ||
                        l->list.first().getAtom() == RPAQQ ) )
             {

Readme.md

@@ -25,7 +25,7 @@ The following precompiled versions are available at this time:
 
 Just download and unpack the compressed file to a directory. Start the application by double clicking on the InterlispNavigator executable. 
 
-Here is a copy of the [Fugue.2 sources](http://software.rochus-keller.ch/interlisp-fugue-2-sources.zip) for convenience.
+Here is a copy of the (fixed) [Fugue.2 sources](http://software.rochus-keller.ch/interlisp-fugue-2-sources.zip) for convenience.
 
 ### Build Steps