--- a/Explainer.st	Fri Dec 14 18:32:27 2001 +0100
+++ b/Explainer.st	Fri Dec 14 18:38:37 2001 +0100
@@ -121,6 +121,7 @@
 
     string := someText string withoutSeparators.
     stringText := string allBold.
+    stringText := '''' , stringText , ''''.
 
     "
      ask parser for variable names
@@ -131,11 +132,11 @@
 
         variables := parser methodVars.
         (variables notNil and:[variables includes:string]) ifTrue:[
-            ^ '''' , stringText , ''' is a method variable.'
+            ^ stringText , ' is a method variable.'
         ].
         variables := parser methodArgs.
         (variables notNil and:[variables includes:string]) ifTrue:[
-            ^ '''' , stringText , ''' is a method argument.'
+            ^ stringText , ' is a method argument.'
         ]
     ].
 
@@ -149,15 +150,16 @@
         c isMeta ifTrue:[
             clsName := c theNonMetaclass name.
             shortText ifTrue:[
-                ^ '''' , stringText , ''': class instVar in ' , clsName , '.'
+                ^ stringText , ' is a class instVar in ' , clsName , '.'
             ].
-            ^ '''' , stringText, ''' is a class instance variable in ' , clsName , '.'
+            ^ stringText, ' is a class instance variable in ' , clsName , '.'
         ].
 
+        clsName := c name.
         shortText ifTrue:[
-            ^ '''' , stringText , ''': instVar in ' , c name , '.'
+            ^ stringText , ' is an instVar in ' , clsName , '.'
         ].
-        ^ '''' , stringText , ''' is an instance variable in ' , c name , '.'
+        ^ stringText , ' is an instance variable in ' , clsName , '.'
     ].
 
 "/    variables := aClass allInstVarNames.
@@ -192,20 +194,19 @@
     "classvars"
     c := parser inWhichClassIsClassVar:string.
     c notNil ifTrue:[
+        clsName := c name.
         shortText ifTrue:[
-            ^ '''' , stringText , ''': classVar in ' , c name , '.'
+            ^ stringText , ' is a classVar in ' , clsName , '.'
         ].
-        ^ '''' , stringText , ''' is a class variable in ' , c name , '.'
+        ^ stringText , ' is a class variable in ' , clsName , '.'
     ].
 
     c := aClass theNonMetaclass.
     c privateClasses do:[:pClass |
         (pClass name = string 
          or:[pClass nameWithoutPrefix = string]) ifTrue:[
-            shortText ifTrue:[
-                string := '''' , stringText , ''': private class in ''' , c name , '''.'.
-            ] ifFalse:[
-                string := '''' , stringText , ''' is a private class in ''' , c name , '''.'.
+            string := stringText , ' is a private class in ''' , c name , '''.'.
+            shortText ifFalse:[
                 string := (string , '\\It is only visible locally.') withCRs
             ].
             ^ string withCRs
@@ -216,7 +217,7 @@
         sym := (spc name , '::' , string) asSymbolIfInterned.
         sym notNil ifTrue:[
             (Smalltalk at:sym) isBehavior ifTrue:[
-                string :=  '''' , stringText , ''' is a class in the ''' , spc name , ''' nameSpace.'.
+                string :=  stringText , ' is a class in the ''' , spc name , ''' nameSpace.'.
                 shortText ifFalse:[
                     string := (string 
                          , '\\It is only visible within this nameSpace.'
@@ -806,5 +807,5 @@
 !Explainer class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.47 2001-12-14 17:32:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Explainer.st,v 1.48 2001-12-14 17:38:37 cg Exp $'
 ! !