[Kst] branches/work/kst/portto4/kst

[Barth Netterfield]

SVN commit 912105 by netterfield:

Add \odot and \ell to the parser.



 M  +0 -5      devel-docs/Kst2Specs/Bugs  
 M  +4 -1      devel-docs/Kst2Specs/FixedBugs  
 M  +10 -1     src/libkstmath/labelparser.cpp  


--- branches/work/kst/portto4/kst/devel-docs/Kst2Specs/Bugs #912104:912105
@@ -97,11 +97,6 @@
 
 --------
 
-Should add some more latex mode fields
-  \odot
-
---------
-
 Tied zoom behavior oddness:
 Tied zoom has been implemented as a toggle button, setting or unsetting
 all of the zoom ties.  However, when in tied zoom, it is still possible to un-tie
--- branches/work/kst/portto4/kst/devel-docs/Kst2Specs/FixedBugs #912104:912105
@@ -290,4 +290,7 @@
 Export as png with a set width and height shows transparency (blank)
 where extra space is, rather than resizing the view for the export.
 *Mike*
-----------
\ No newline at end of file
+----------
+
+Should add some more latex mode fields
+  \odot
--- branches/work/kst/portto4/kst/src/libkstmath/labelparser.cpp #912104:912105
@@ -28,7 +28,7 @@
 // Debug output for Parsing - 0 Off 1 On
 #define DEBUG_PARSING 0
 
-#if 0
+#if 1
 #define dumpattr(node, text) do { printf("%s: bold:%d italic:%d underline:%d\n", text, (node)->attributes.bold, (node)->attributes.italic, (node)->attributes.underline); } while(0)
 #else
 #define dumpattr(node, text)
@@ -244,6 +244,10 @@
         *skip = 3;
         setNormalChar(QChar(0x397+x), tail);
         return true;
+      } else if (txt.mid(from + 1).startsWith("ll")) {
+        *skip = 3;
+        setNormalChar(QChar(0x2113), tail);
+        return true;
       }
       break;
 
@@ -338,6 +342,10 @@
         *skip = 5;
         setNormalChar(QChar(0x3A9+x), tail);
         return true;
+      } else if (txt.mid(from + 1).startsWith("dot")) {
+        *skip = 4;
+        setNormalChar(QChar(0x2299), tail);
+        return true;
       }
       break;
 
@@ -466,6 +474,7 @@
         parseInternal(working, txt, parseStart, txt.length(), interpretNewLine);
         *skip = parseStart - from + 1;
         dumpattr(working, "end group for underline");
+        working->attributes.underline = false;
         return true;
       } else if (txt.mid(from + 1).startsWith("psilon")) {
         *skip = 7;