       "end-step"
       "end-while"
       "end-with"
+      "espec"
+      "espec-refinement"
       "final"
       "guard"
       "initial"
+      "interpretation"
+      "ip-scheme"
+      "ip-scheme-morphism"
+      "mode"
+      "module"
+      "morphism"
+      "spec"
       "nodes"
       "prog"
       "progmap"
       "specmap"
+      "stad"
       "step"
       "when"
       "while"
-      "with"
       ))
 
 (defconst specware-keywords-regexp


(defconst symbol-sep "[^-_?a-z0-9A-Z]")

;; reserved symbols that introduce names:
(defconst specware-definition-introducing-words
  (regexp-opt '(
             ;; core specware:
                "axiom"
                "conjecture"
                "def"
                "diagram"
		"morphism"
                "op"
                "spec"
                "theorem"
                "type"
                "where"
             ;; accord extension:
                "espec"
                "espec-refinement"
		"interpretation"
		"ip-scheme"
                "ip-scheme-morphism"
                "mode"
                "module"
                "stad"
		)))

(defconst specware-definition-regexp
    (concat "\\(^\\|" symbol-sep "\\)\\("

	    "\\)"
	    "[^-_?a-z0-9A-Z,:\"}`\n]+") )

;; reserved symbols:
(defconst specware-keywords
    '(
   ;; core specware:
      "as"
      "axiom"
      "by"
      "case"
      "choose"
      "colimit"
      "conjecture"
      "def"
      "diagram"
      "else"
      "embed"
      "embed?"
