--- a/.hgtags	Sun Jan 24 22:25:21 2016 +0000
+++ b/.hgtags	Tue Jan 26 20:09:43 2016 +0000
@@ -46,6 +46,7 @@
 a1e60c9000f42ca89dbafb8617c2cfc4fdfb8ee7 expecco_2_5_0
 a59c6adef58fc6f611facc4af12fca93dec4507b expecco_2_1_0
 a8f17c7712d9763f5f518dcfabdaca6678155c4e expecco_2_8_0
+a8f17c7712d9763f5f518dcfabdaca6678155c4e expecco_2_8_0a
 a8f17c7712d9763f5f518dcfabdaca6678155c4e expecco_ALM_1_9_5
 a8f17c7712d9763f5f518dcfabdaca6678155c4e expecco_ALM_1_9_6
 ab7ea489f73140eeb729f67f80f58cd3d6937a4a expecco_1_7_0b1
@@ -70,4 +71,5 @@
 f91f6a0a56d5aa7f6d57984582b865873bd68922 rel4_1_7
 f91f6a0a56d5aa7f6d57984582b865873bd68922 release
 fa5637faa969c6790ca73a304eb9cc2605d117e3 rel3-1-2
+faf0e1db72c7ae85bce45db7c34599027b5c124a expecco_ALM_1_9_7
 ff39051e219f3005e9f78db3f79fa6dd42b10ce9 rel2_10_8_6_last2

--- a/Explainer.st	Sun Jan 24 22:25:21 2016 +0000
+++ b/Explainer.st	Tue Jan 26 20:09:43 2016 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -64,7 +62,7 @@
     expl := literalValue class name "allBold" , '-constant'.
 
     (literalValue isInteger) ifTrue:[
-        (literalValue ~= 0 and:[literalValue ~= 1]) ifTrue:[
+        (literalValue ~~ 0 and:[literalValue ~~ 1]) ifTrue:[
             expl := expl , ' ('.
             #(2 10 16) with:#('binary: ' 'decimal: ' 'hex: ')do:[:base :baseExpl |
                 |bStr|
@@ -1615,10 +1613,10 @@
 !Explainer class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.141 2015-03-03 10:44:58 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.141 2015-03-03 10:44:58 cg Exp $'
+    ^ '$Header$'
 ! !
 

--- a/Scanner.st	Sun Jan 24 22:25:21 2016 +0000
+++ b/Scanner.st	Tue Jan 26 20:09:43 2016 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -145,7 +143,7 @@
 extendedBinarySelectorCharacters
     "return a collection of characters which are optionally allowed in binary selectors"
 
-"/    ^ '±×·÷'.
+"/    ^ '±×·÷'.
     ^ String
         with:(Character value:16rB1)  "/ plus-minus
         with:(Character value:16rD7)  "/ times
@@ -2700,7 +2698,12 @@
             string := string , source nextAlphaNumericWord.
         ]
     ] ifFalse:[
-        string := source nextAlphaNumericWord "self nextId".
+        nextChar := source peekOrNil.
+        (nextChar notNil and:[nextChar isLetterOrDigit]) ifTrue:[
+            string := source nextAlphaNumericWord "self nextId".
+        ] ifFalse:[
+            string := ''
+        ]    
     ].
     nextChar := source peekOrNil.
 
@@ -3719,11 +3722,11 @@
 !Scanner class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.334 2015-06-08 15:51:28 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/Scanner.st,v 1.334 2015-06-08 15:51:28 stefan Exp $'
+    ^ '$Header$'
 ! !