*** empty log message ***

7 files changed, 98 insertions, 50 deletions

diff --git a/etc/ProofGeneral.spec b/etc/ProofGeneral.spec
index a3aae2e9..097cd213 100644
--- a/etc/ProofGeneral.spec
+++ b/etc/ProofGeneral.spec
@@ -1,12 +1,12 @@
 Summary:	Proof General, Emacs interface for Proof Assistants
 Name:		ProofGeneral
-Version:	3.3pre010207
+Version:	3.3pre010208
 Release:	1
 Group:		Applications/Editors/Emacs
 Copyright:	LFCS, University of Edinburgh
 Url:		http://www.proofgeneral.org/
 Packager:	David Aspinall <da@dcs.ed.ac.uk>
-Source:		http://www.proofgeneral.org/ProofGeneral-3.3pre010207.tar.gz
+Source:		http://www.proofgeneral.org/ProofGeneral-3.3pre010208.tar.gz
 BuildRoot:	/tmp/ProofGeneral-root
 Patch:		ProofGeneral.patch
 PreReq:		/sbin/install-info
diff --git a/generic/proof-site.el b/generic/proof-site.el
index d27ecef2..ae23a3be 100644
--- a/generic/proof-site.el
+++ b/generic/proof-site.el
@@ -308,7 +308,7 @@ Note: to change proof assistant, you must start a new Emacs session.")
 ;; WARNING: do not edit below here 
 ;; (the next constant is set automatically, also its form is
 ;;  relied upon in proof-config.el, for proof-splash-contents)
-(defconst proof-general-version "Proof General Version 3.3pre010207. Released by da."
+(defconst proof-general-version "Proof General Version 3.3pre010208. Released by da."
  "Version string identifying Proof General release.")
 
 (provide 'proof-site))
diff --git a/html/devel.html b/html/devel.html
index 73fe96f6..36945192 100644
--- a/html/devel.html
+++ b/html/devel.html
@@ -16,12 +16,12 @@ here.
 <li>
 Download the latest <a href="develdownload.html">development release: 
 <!-- WARNING!  Line below automatically edited by makefile. -->
- <b>ProofGeneral-3.3pre010207</b></a>
+ <b>ProofGeneral-3.3pre010208</b></a>
 <!-- end WARNING -->
  <br>
 Check the 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<?php fileshow("ProofGeneral-3.3pre010207/CHANGES","CHANGES"); ?> file
+<?php fileshow("ProofGeneral-3.3pre010208/CHANGES","CHANGES"); ?> file
 <!-- End Warning. -->
 for a summary of changes since the last stable version.
 </li>
@@ -48,14 +48,14 @@ Take a look at the Proof General <a href="projects.html">project proposals</a>.
 <li>
 Read the 
 developer's 
-<?php fileshow("ProofGeneral-3.3pre010207/README.devel","README file"); ?>, 
+<?php fileshow("ProofGeneral-3.3pre010208/README.devel","README file"); ?>, 
 with development hints and tips.
 </li>
 </ul>
 <ul>
 <li>
 Read the brief list of planned 
-<?php fileshow("ProofGeneral-3.3pre010207/TODO","things to do "); ?> 
+<?php fileshow("ProofGeneral-3.3pre010208/TODO","things to do "); ?> 
 for Proof General.
 </ul>
 <ul>
@@ -63,29 +63,29 @@ for Proof General.
 <a name="lowleveltodo">See our current low-level lists of things to do</a>, 
 for the
 <!-- WARNING!  Lines below automatically edited by makefile. -->
-   <?php fileshow("ProofGeneral-3.3pre010207/todo","generic base"); ?>, 
+   <?php fileshow("ProofGeneral-3.3pre010208/todo","generic base"); ?>, 
   <br>
   and for each prover:
-   <?php fileshow("ProofGeneral-3.3pre010207/lego/todo","lego to do"); ?>,
-   <?php fileshow("ProofGeneral-3.3pre010207/coq/todo","coq to do"); ?>,
-   <?php fileshow("ProofGeneral-3.3pre010207/isa/todo","isa to do"); ?>,
-   <?php fileshow("ProofGeneral-3.3pre010207/isar/todo","isar to do"); ?>,
-   <?php fileshow("ProofGeneral-3.3pre010207/hol98/todo","hol to do"); ?>.
+   <?php fileshow("ProofGeneral-3.3pre010208/lego/todo","lego to do"); ?>,
+   <?php fileshow("ProofGeneral-3.3pre010208/coq/todo","coq to do"); ?>,
+   <?php fileshow("ProofGeneral-3.3pre010208/isa/todo","isa to do"); ?>,
+   <?php fileshow("ProofGeneral-3.3pre010208/isar/todo","isar to do"); ?>,
+   <?php fileshow("ProofGeneral-3.3pre010208/hol98/todo","hol to do"); ?>.
 <!-- end WARNING -->
 </li>
 </ul>
 <!-- <ul> -->
 <!-- <li> -->
 <!-- Browse source files from the current pre-release: -->
-<!-- <?php fileshow("ProofGeneral-3.3pre010207/generic/proof.el") ?>, -->
-<!-- <?php fileshow("ProofGeneral-3.3pre010207/generic/proof-site.el") ?>, -->
-<!-- <?php fileshow("ProofGeneral-3.3pre010207/generic/proof-config.el") ?>, -->
-<!-- <?php fileshow("ProofGeneral-3.3pre010207/generic/proof-script.el") ?>, -->
-<!-- <?php fileshow("ProofGeneral-3.3pre010207/generic/proof-shell.el") ?>, -->
-<!-- <?php fileshow("ProofGeneral-3.3pre010207/generic/proof-toolbar.el") ?>, -->
-<!-- <?php fileshow("ProofGeneral-3.3pre010207/generic/proof-syntax.el") ?>, -->
-<!-- <?php fileshow("ProofGeneral-3.3pre010207/generic/proof-splash.el") ?>, -->
-<!-- <?php fileshow("ProofGeneral-3.3pre010207/generic/proof-easy-config.el") ?>. -->
+<!-- <?php fileshow("ProofGeneral-3.3pre010208/generic/proof.el") ?>, -->
+<!-- <?php fileshow("ProofGeneral-3.3pre010208/generic/proof-site.el") ?>, -->
+<!-- <?php fileshow("ProofGeneral-3.3pre010208/generic/proof-config.el") ?>, -->
+<!-- <?php fileshow("ProofGeneral-3.3pre010208/generic/proof-script.el") ?>, -->
+<!-- <?php fileshow("ProofGeneral-3.3pre010208/generic/proof-shell.el") ?>, -->
+<!-- <?php fileshow("ProofGeneral-3.3pre010208/generic/proof-toolbar.el") ?>, -->
+<!-- <?php fileshow("ProofGeneral-3.3pre010208/generic/proof-syntax.el") ?>, -->
+<!-- <?php fileshow("ProofGeneral-3.3pre010208/generic/proof-splash.el") ?>, -->
+<!-- <?php fileshow("ProofGeneral-3.3pre010208/generic/proof-easy-config.el") ?>. -->
 <!-- </ul> -->
 <ul>
 <li>
diff --git a/html/develdownload.html b/html/develdownload.html
index d95b7d48..d4efbb9b 100644
--- a/html/develdownload.html
+++ b/html/develdownload.html
@@ -26,7 +26,7 @@ Please <a href="register.html">register</a> if you haven't done so already.
 
 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<h2><a name="doc">Manual for ProofGeneral-3.3pre010207</a></h2>
+<h2><a name="doc">Manual for ProofGeneral-3.3pre010208</a></h2>
 <!-- End Warning. -->
 <p>
 The manual included with the pre-release may be
@@ -48,7 +48,7 @@ or
 
 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<h2><a name="prerel">Pre-release: ProofGeneral-3.3pre010207</a></h2>
+<h2><a name="prerel">Pre-release: ProofGeneral-3.3pre010208</a></h2>
 
 <p>
 This version has been tested with XEmacs version 21.1.12 and
@@ -59,7 +59,7 @@ can no longer be supported.
 <p>
 Check the 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<?php fileshow("ProofGeneral-3.3pre010207/CHANGES","CHANGES"); ?> file
+<?php fileshow("ProofGeneral-3.3pre010208/CHANGES","CHANGES"); ?> file
 <!-- End Warning. -->
 for a summary of changes since the last stable version, and
 notes about work-in-progress.
@@ -68,19 +68,19 @@ notes about work-in-progress.
 <tr>
 <td width=150>gzip'ed tar file</td>
 <!-- WARNING!  Lines below automatically edited by makefile. -->
-<td><?php download_link("ProofGeneral-3.3pre010207.tar.gz") ?></td>
+<td><?php download_link("ProofGeneral-3.3pre010208.tar.gz") ?></td>
 </tr>
 <tr>
 <td>zip file</td>
-<td><?php download_link("ProofGeneral-3.3pre010207.zip") ?></td>
+<td><?php download_link("ProofGeneral-3.3pre010208.zip") ?></td>
 </tr>
 <tr>
 <td>RPM package </td>
-<td><?php download_link("ProofGeneral-3.3pre010207-1.noarch.rpm") ?></td>
+<td><?php download_link("ProofGeneral-3.3pre010208-1.noarch.rpm") ?></td>
 </tr>
 <tr>
 <td>SRPM package</td>
-<td><?php download_link("ProofGeneral-3.3pre010207-1.src.rpm","source RPM") ?></td>
+<td><?php download_link("ProofGeneral-3.3pre010208-1.src.rpm","source RPM") ?></td>
 </table>
 <!-- End Warning. -->
 
@@ -96,7 +96,7 @@ the <a href="download#install">stable version download</a>.
 
 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-<h2><a name="devel">Complete Archive of ProofGeneral-3.3pre010207 for Developers</a></h2>
+<h2><a name="devel">Complete Archive of ProofGeneral-3.3pre010208 for Developers</a></h2>
 <!-- End Warning. -->
 
 <p>
@@ -105,7 +105,7 @@ This archive is a snapshot from our CVS repository.
 <ul>
   <li> gzip'ed tar file: 
 <!-- WARNING!  Line below automatically edited by makefile. -->
-      <?php download_link("ProofGeneral-3.3pre010207-devel.tar.gz") ?>
+      <?php download_link("ProofGeneral-3.3pre010208-devel.tar.gz") ?>
 <!-- End Warning. -->
   </li>
 </ul>
@@ -118,7 +118,7 @@ The complete archive also includes:
     (see <a href="devel#lowleveltodo">the developers page</a>)
    and the detailed
    <!-- WARNING!  Line below automatically edited by makefile. -->
-   <?php fileshow("ProofGeneral-3.3pre010207/ChangeLog","ChangeLog"); ?>,
+   <?php fileshow("ProofGeneral-3.3pre010208/ChangeLog","ChangeLog"); ?>,
    <!-- End Warning. -->
  </li>
   <li> developer's Makefile used to generate documentation files 
diff --git a/phox/phox-fun.el b/phox/phox-fun.el
index 649c18ca..6cf8fc4b 100644
--- a/phox/phox-fun.el
+++ b/phox/phox-fun.el
@@ -61,15 +61,16 @@
 )
 
 
-(defun phox-init-syntax-table ()
-  "Set appropriate values for syntax table in current buffer."
+(defun phox-init-syntax-table (&optional TABLE)
+  "Set appropriate values for syntax table in current buffer, 
+or for optional argument TABLE."
 ;; useful for using forward-word
-  (modify-syntax-entry ?_  "w")
-  (modify-syntax-entry ?\. "w")
+  (modify-syntax-entry ?_  "w" TABLE)
+  (modify-syntax-entry ?\. "w" TABLE)
 ;; Configure syntax table for block comments
-  (modify-syntax-entry ?\* ". 23")
-  (modify-syntax-entry ?\( "()1")
-  (modify-syntax-entry ?\) ")(4")
+  (modify-syntax-entry ?\* ". 23" TABLE)
+  (modify-syntax-entry ?\( "()1"  TABLE)
+  (modify-syntax-entry ?\) ")(4"  TABLE)
 ;; à compléter éventuellement
 )
 
@@ -349,16 +350,44 @@ ask for a string and possibly a type and send a search command to PhoX for it.
 stype (nothing for any type, 'a as type parameter) :")
 (proof-shell-invisible-command (concat "search \"" string "\" " type)))
 
+;; The followings are proof commands (doc in cmd_proof.tex) :
+
+(defun phox-constraints()
+"Interactive function : 
+ send a constraints command to PhoX.
+
+  Prints the  constraints which should be fulfilled by unification variables,
+  only works in proofs."
+
+
+(interactive)
+(proof-shell-invisible-command  "constraints"))
+
+(defun phox-goals()
+"Interactive function : 
+ send a goals command to PhoX.
+
+  Prints the list of all remaining goals, only works in proofs."
+
+
+(interactive)
+(proof-shell-invisible-command  "goals"))
+
+;; menu
+
 (defvar phox-state-menu
   '("State"
 ["dependencies of a theorem" phox-depend-theorem t]
-["show en extension list" phox-eshow-extlist t]
+["show an extension list" phox-eshow-extlist t]
 ["value of a flag" phox-flag-name t]
 ["list of all paths" phox-path t]
 ["print expression" phox-print-expression  t]
 ["print expression with sorts" phox-print-sort-expression  t]
 ["priority of symbols (all if arg. empty)" phox-priority-symbols-list t]
 ["search for loaded symbols matching string" phox-search-string t]
+["------------------" nil nil]
+["constraints      (proof command)" phox-constraints t]
+["goals               (proof command)" phox-goals t]
 )
 "Phox menu for informations on state of the system."
 )
diff --git a/phox/phox-tags.el b/phox/phox-tags.el
index c983c347..da91f022 100644
--- a/phox/phox-tags.el
+++ b/phox/phox-tags.el
@@ -14,7 +14,9 @@
 ; Sous xemacs il faut gérer la variable tag-table-alist qui n'existe pas
 ; sous gnu emacs.
 
-(require 'etags) 
+
+(require 'etags)
+
 
 (defun phox-tags-add-table(table)
   "add tags table"
@@ -75,13 +77,19 @@
 (defun phox-complete-tag()
 "Complete symbol using tags table. Works with FSF emacs.
  Problems with xemacs."
-;; xemacs build a table for completion, tag-completion-table
-;; this table donnot contains key words that use ".", probably a
-;; problem with syntax table.
-
+;; xemacs build a table for completion, tag-completion-table this table
+;; donnot contains key words that use ".". There is a problem with
+;; syntax-table. In xemacs you need to redefine
+;; add-to-tag-completion-table, in order to add your file-type and
+;; syntax-table. The modification is very simple, there should be an
+;; hook for that.
+;; 
+(interactive)
 (if proof-running-on-XEmacs
-    (complete-tag)
-  (tag-complete-symbol)))
+     (tag-complete-symbol)
+  (complete-tag)
+  )
+)
 
 ;; menu
 
diff --git a/phox/phox.el b/phox/phox.el
index 42ef5abd..480b3386 100644
--- a/phox/phox.el
+++ b/phox/phox.el
@@ -73,11 +73,12 @@
   :type 'string
   :group 'phox-config)
 
+(require 'phox-fun)
+(require 'phox-font)
 (require 'phox-extraction)
 (require 'phox-tags)
 (require 'phox-outline)
-(require 'phox-font)
-(require 'phox-fun)
+
 
 ;; ----- PhoX specific menu
 
@@ -135,6 +136,8 @@
    font-lock-keywords              phox-font-lock-keywords 
    )
   (phox-init-syntax-table)
+;; the following is only useful for xemacs
+  (define-key phox-mode-map [(meta ?.)] 'phox-complete-tag)
 )
 
 (defun phox-shell-config ()
@@ -220,7 +223,15 @@
   (setq proof-mode-for-response 'phox-response-mode)
   (setq proof-mode-for-goals	'phox-goals-mode))
 
-(set-variable 'phox-completion-table 
+; completions
+; dans completions.el
+;(setq completion-min-length 6)
+;(setq completion-prefix-min-length 3) les mots de moins de 6 caractères
+; ne sont pas pris en compte.  Les prefixes de moins de 3 caractères ne
+; sont pas non plus pris en compte.
+
+; (set-variable 'phox-completion-table 
+(defpgdefault completion-table
 (append phox-top-keywords phox-proof-keywords)
 )