diff --git a/Logtalk/QUICK_START b/Logtalk/QUICK_START
index 4c283d93a..0e4aa6780 100644
--- a/Logtalk/QUICK_START
+++ b/Logtalk/QUICK_START
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/README b/Logtalk/README
index 82ea90567..35d8680e7 100644
--- a/Logtalk/README
+++ b/Logtalk/README
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/RELEASE_NOTES b/Logtalk/RELEASE_NOTES
index e93ee06c5..297f6a6fe 100644
--- a/Logtalk/RELEASE_NOTES
+++ b/Logtalk/RELEASE_NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
@@ -10,6 +10,34 @@ RELEASE NOTES
 =============
 
 
+2.15.6 - February 9, 2004
+
+    Added "xmlspec" compiler option in order to specify the extension (dtd 
+    or xsd) of the file describing the XML documenting files specification.
+
+	Renamed compiler option "named_anonymous_vars" to the more appropriated 
+	name "underscore_vars". Changed possible option values to "dont_care" and 
+	"singletons" (default).
+
+    Added XSLT file for converting XML documenting files to XHTML 1.0 Strict 
+    files. Set the default encoding of all XSLT files to UTF-8.
+
+    Added syntax coloring support for the KDE Kate and Kwrite text editors.
+
+    Improved syntax coloring configuration files for VIM, jEdit, NEdit, 
+    SubEthaEdit, and Emacs text editors.
+
+	Removed outdated support for MacOS X Project Builder and added support 
+	for the new MacOS X Xcode developer tool.
+
+	Corrected bug in the built-in predicate current_logtalk_flag/2 that 
+	prevented some flag values from being returned after using the built-in 
+	predicate set_logtalk_flag/2.
+
+	Corrected bug in the shapes example (wrong placement of the declaration 
+	of the predicate side/1).
+
+
 2.15.5 - December 30, 2003
 
 	Make operator ^^/1 right-associative for consistency with remaining 
diff --git a/Logtalk/UPGRADING b/Logtalk/UPGRADING
index 5c8e713f1..7fe522601 100644
--- a/Logtalk/UPGRADING
+++ b/Logtalk/UPGRADING
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
@@ -61,3 +61,7 @@ files.
 
 Logtalk version 2.15.3 changes the format of the runtime entity tables, 
 impliying recompilation of all objects, protocols, and categories.
+
+Logtalk version 2.15.6 renamed the compiler option "named_anonymous_vars" to 
+"underscore_vars" and changed the possible option values form "on/off" to 
+"dont_care/singletons".
diff --git a/Logtalk/examples/NOTES b/Logtalk/examples/NOTES
index 00cc62c28..04f601ace 100644
--- a/Logtalk/examples/NOTES
+++ b/Logtalk/examples/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 This folder contains several examples of Logtalk programs. Most of 
diff --git a/Logtalk/examples/birds/NOTES b/Logtalk/examples/birds/NOTES
index bce30267d..fd68ec9bf 100644
--- a/Logtalk/examples/birds/NOTES
+++ b/Logtalk/examples/birds/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/birds/SCRIPT b/Logtalk/examples/birds/SCRIPT
index 8700d77a1..e4613cc94 100644
--- a/Logtalk/examples/birds/SCRIPT
+++ b/Logtalk/examples/birds/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/bricks/NOTES b/Logtalk/examples/bricks/NOTES
index 5c1fa961e..e82309de2 100644
--- a/Logtalk/examples/bricks/NOTES
+++ b/Logtalk/examples/bricks/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the bricks.loader utility
diff --git a/Logtalk/examples/bricks/SCRIPT b/Logtalk/examples/bricks/SCRIPT
index c7a44ba8f..94e427dac 100644
--- a/Logtalk/examples/bricks/SCRIPT
+++ b/Logtalk/examples/bricks/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/classvars/NOTES b/Logtalk/examples/classvars/NOTES
index d6cbfc35b..97360af24 100644
--- a/Logtalk/examples/classvars/NOTES
+++ b/Logtalk/examples/classvars/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the classvars.loader utility
diff --git a/Logtalk/examples/classvars/SCRIPT b/Logtalk/examples/classvars/SCRIPT
index 9cee883ba..cd5052c52 100644
--- a/Logtalk/examples/classvars/SCRIPT
+++ b/Logtalk/examples/classvars/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/dcgs/NOTES b/Logtalk/examples/dcgs/NOTES
index 3c2ae98f0..5e1f3f8ed 100644
--- a/Logtalk/examples/dcgs/NOTES
+++ b/Logtalk/examples/dcgs/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/dcgs/SCRIPT b/Logtalk/examples/dcgs/SCRIPT
index 65295e7a2..6032f8ac1 100644
--- a/Logtalk/examples/dcgs/SCRIPT
+++ b/Logtalk/examples/dcgs/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/dynpred/NOTES b/Logtalk/examples/dynpred/NOTES
index de81166bd..85bbe27a7 100644
--- a/Logtalk/examples/dynpred/NOTES
+++ b/Logtalk/examples/dynpred/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/dynpred/SCRIPT b/Logtalk/examples/dynpred/SCRIPT
index 03bcef777..689fa8d5a 100644
--- a/Logtalk/examples/dynpred/SCRIPT
+++ b/Logtalk/examples/dynpred/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/errors/NOTES b/Logtalk/examples/errors/NOTES
index d59e8f521..d0a807099 100644
--- a/Logtalk/examples/errors/NOTES
+++ b/Logtalk/examples/errors/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all entities in this example consult the warnings.loader and 
diff --git a/Logtalk/examples/inheritance/NOTES b/Logtalk/examples/inheritance/NOTES
index fdeb17a0a..eaa24d327 100644
--- a/Logtalk/examples/inheritance/NOTES
+++ b/Logtalk/examples/inheritance/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the inheritance.loader utility
diff --git a/Logtalk/examples/inheritance/SCRIPT b/Logtalk/examples/inheritance/SCRIPT
index 5cf63ecad..6721dfe17 100644
--- a/Logtalk/examples/inheritance/SCRIPT
+++ b/Logtalk/examples/inheritance/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/instmethods/NOTES b/Logtalk/examples/instmethods/NOTES
index 1f43bf435..45b28ab80 100644
--- a/Logtalk/examples/instmethods/NOTES
+++ b/Logtalk/examples/instmethods/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the instmethods.loader utility
diff --git a/Logtalk/examples/instmethods/SCRIPT b/Logtalk/examples/instmethods/SCRIPT
index ad6502389..37143357c 100644
--- a/Logtalk/examples/instmethods/SCRIPT
+++ b/Logtalk/examples/instmethods/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/lo/NOTES b/Logtalk/examples/lo/NOTES
index 0da736fe2..27b68e5f1 100644
--- a/Logtalk/examples/lo/NOTES
+++ b/Logtalk/examples/lo/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 The examples in this folder are adopted from the Logic&Objects system
diff --git a/Logtalk/examples/lo/planner/NOTES b/Logtalk/examples/lo/planner/NOTES
index 4bdf26fa6..4fa990018 100644
--- a/Logtalk/examples/lo/planner/NOTES
+++ b/Logtalk/examples/lo/planner/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this library consult the planner.loader utility
diff --git a/Logtalk/examples/lo/planner/SCRIPT b/Logtalk/examples/lo/planner/SCRIPT
index ed4556c72..8e065a500 100644
--- a/Logtalk/examples/lo/planner/SCRIPT
+++ b/Logtalk/examples/lo/planner/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/lo/travellers/NOTES b/Logtalk/examples/lo/travellers/NOTES
index ac7486f54..cba96b784 100644
--- a/Logtalk/examples/lo/travellers/NOTES
+++ b/Logtalk/examples/lo/travellers/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this library consult the travellers.loader utility
diff --git a/Logtalk/examples/lo/travellers/SCRIPT b/Logtalk/examples/lo/travellers/SCRIPT
index 2aec3203b..c3579cb6e 100644
--- a/Logtalk/examples/lo/travellers/SCRIPT
+++ b/Logtalk/examples/lo/travellers/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/lpa/NOTES b/Logtalk/examples/lpa/NOTES
index 3ec24217f..a33f6e5d5 100644
--- a/Logtalk/examples/lpa/NOTES
+++ b/Logtalk/examples/lpa/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 This example is an adaptation of a LPA Prolog++ example that is 
diff --git a/Logtalk/examples/lpa/SCRIPT b/Logtalk/examples/lpa/SCRIPT
index 6da9f87d8..d346b88b9 100644
--- a/Logtalk/examples/lpa/SCRIPT
+++ b/Logtalk/examples/lpa/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/metapredicates/NOTES b/Logtalk/examples/metapredicates/NOTES
index d1d95ddd3..52d0e7fbb 100644
--- a/Logtalk/examples/metapredicates/NOTES
+++ b/Logtalk/examples/metapredicates/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this library consult the metapredicates.loader utility
diff --git a/Logtalk/examples/metapredicates/SCRIPT b/Logtalk/examples/metapredicates/SCRIPT
index 62eeb56cd..034827623 100644
--- a/Logtalk/examples/metapredicates/SCRIPT
+++ b/Logtalk/examples/metapredicates/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/mi/NOTES b/Logtalk/examples/mi/NOTES
index a59b2f585..5ae3e5549 100644
--- a/Logtalk/examples/mi/NOTES
+++ b/Logtalk/examples/mi/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the mi.loader utility
diff --git a/Logtalk/examples/mi/SCRIPT b/Logtalk/examples/mi/SCRIPT
index 922762524..89c5da113 100644
--- a/Logtalk/examples/mi/SCRIPT
+++ b/Logtalk/examples/mi/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/miscellaneous/NOTES b/Logtalk/examples/miscellaneous/NOTES
index 7f3a62c6f..9cac6b072 100644
--- a/Logtalk/examples/miscellaneous/NOTES
+++ b/Logtalk/examples/miscellaneous/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this library consult the miscellaneous.loader utility
diff --git a/Logtalk/examples/miscellaneous/SCRIPT b/Logtalk/examples/miscellaneous/SCRIPT
index 214e8a07e..95ab9855c 100644
--- a/Logtalk/examples/miscellaneous/SCRIPT
+++ b/Logtalk/examples/miscellaneous/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/msglog/NOTES b/Logtalk/examples/msglog/NOTES
index 8f99b4f81..5e10b7569 100644
--- a/Logtalk/examples/msglog/NOTES
+++ b/Logtalk/examples/msglog/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this library consult the msglog.loader utility
diff --git a/Logtalk/examples/msglog/SCRIPT b/Logtalk/examples/msglog/SCRIPT
index 2ab3fd76e..a7e27e6fc 100644
--- a/Logtalk/examples/msglog/SCRIPT
+++ b/Logtalk/examples/msglog/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 % assume that all library entities have been loaded...
diff --git a/Logtalk/examples/parametric/NOTES b/Logtalk/examples/parametric/NOTES
index e64c0dde3..daeacd4ff 100644
--- a/Logtalk/examples/parametric/NOTES
+++ b/Logtalk/examples/parametric/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load most objects in this example consult the parametric.loader 
diff --git a/Logtalk/examples/parametric/SCRIPT b/Logtalk/examples/parametric/SCRIPT
index 834503634..fc8869127 100644
--- a/Logtalk/examples/parametric/SCRIPT
+++ b/Logtalk/examples/parametric/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/points/NOTES b/Logtalk/examples/points/NOTES
index ebf6b65ff..d9c6f9749 100644
--- a/Logtalk/examples/points/NOTES
+++ b/Logtalk/examples/points/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/points/SCRIPT b/Logtalk/examples/points/SCRIPT
index f722cdd32..9d4a017db 100644
--- a/Logtalk/examples/points/SCRIPT
+++ b/Logtalk/examples/points/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/polygons/NOTES b/Logtalk/examples/polygons/NOTES
index c040193b1..6c68632b0 100644
--- a/Logtalk/examples/polygons/NOTES
+++ b/Logtalk/examples/polygons/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the polygons.loader utility
diff --git a/Logtalk/examples/polygons/SCRIPT b/Logtalk/examples/polygons/SCRIPT
index a9103459e..b3a2e6640 100644
--- a/Logtalk/examples/polygons/SCRIPT
+++ b/Logtalk/examples/polygons/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/profiling/NOTES b/Logtalk/examples/profiling/NOTES
index 86f0f3a67..c158194f6 100644
--- a/Logtalk/examples/profiling/NOTES
+++ b/Logtalk/examples/profiling/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/profiling/SCRIPT b/Logtalk/examples/profiling/SCRIPT
index 5a38e0419..9e6fd3e14 100644
--- a/Logtalk/examples/profiling/SCRIPT
+++ b/Logtalk/examples/profiling/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/reflection/NOTES b/Logtalk/examples/reflection/NOTES
index 17134416b..15399f61c 100644
--- a/Logtalk/examples/reflection/NOTES
+++ b/Logtalk/examples/reflection/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the reflection.loader utility
diff --git a/Logtalk/examples/reflection/SCRIPT b/Logtalk/examples/reflection/SCRIPT
index e618979b2..5b837aaaa 100644
--- a/Logtalk/examples/reflection/SCRIPT
+++ b/Logtalk/examples/reflection/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/relations/NOTES b/Logtalk/examples/relations/NOTES
index b0d88a1e0..3a08d9ab0 100644
--- a/Logtalk/examples/relations/NOTES
+++ b/Logtalk/examples/relations/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this library consult the relations.loader utility
diff --git a/Logtalk/examples/relations/SCRIPT b/Logtalk/examples/relations/SCRIPT
index d55bdeeab..92f101074 100644
--- a/Logtalk/examples/relations/SCRIPT
+++ b/Logtalk/examples/relations/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/roots/NOTES b/Logtalk/examples/roots/NOTES
index fec92a48f..992c61fa5 100644
--- a/Logtalk/examples/roots/NOTES
+++ b/Logtalk/examples/roots/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/roots/SCRIPT b/Logtalk/examples/roots/SCRIPT
index fba8028cc..fb89e9f76 100644
--- a/Logtalk/examples/roots/SCRIPT
+++ b/Logtalk/examples/roots/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/searching/NOTES b/Logtalk/examples/searching/NOTES
index 407b17111..f0f7bc113 100644
--- a/Logtalk/examples/searching/NOTES
+++ b/Logtalk/examples/searching/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the searching.loader utility
diff --git a/Logtalk/examples/searching/SCRIPT b/Logtalk/examples/searching/SCRIPT
index 5e30314e5..a81ff37ae 100644
--- a/Logtalk/examples/searching/SCRIPT
+++ b/Logtalk/examples/searching/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/shapes/NOTES b/Logtalk/examples/shapes/NOTES
index c3feb747b..4f17ff3d0 100644
--- a/Logtalk/examples/shapes/NOTES
+++ b/Logtalk/examples/shapes/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/shapes/ch/NOTES b/Logtalk/examples/shapes/ch/NOTES
index b9b0da523..544fd36c3 100644
--- a/Logtalk/examples/shapes/ch/NOTES
+++ b/Logtalk/examples/shapes/ch/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/shapes/ch/SCRIPT b/Logtalk/examples/shapes/ch/SCRIPT
index 628e94046..0a67e6110 100644
--- a/Logtalk/examples/shapes/ch/SCRIPT
+++ b/Logtalk/examples/shapes/ch/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/shapes/ch/polygon.lgt b/Logtalk/examples/shapes/ch/polygon.lgt
index df2c63be3..eca9e5afb 100644
--- a/Logtalk/examples/shapes/ch/polygon.lgt
+++ b/Logtalk/examples/shapes/ch/polygon.lgt
@@ -5,8 +5,8 @@
 
 	:- info([
 		author is 'Paulo Moura',
-		version is 1.0,
-		date is 2003/2/3,
+		version is 1.1,
+		date is 2004/1/8,
 		comment is 'Generic polygon.']).
 
 
@@ -37,16 +37,4 @@
 		argnames is ['Perimeter']]).
 
 
-	:- public(side/1).
-
-	:- mode(side(?atom), zero_or_one).
-
-	:- info(side/1, [
-		comment is 'Polygon side length.',
-		argnames is ['Length']]).
-
-
-	side(1).         % default side length
-
-
 :- end_object.
diff --git a/Logtalk/examples/shapes/ch/regular_polygon.lgt b/Logtalk/examples/shapes/ch/regular_polygon.lgt
index ca0192fdb..0c055677c 100644
--- a/Logtalk/examples/shapes/ch/regular_polygon.lgt
+++ b/Logtalk/examples/shapes/ch/regular_polygon.lgt
@@ -1,3 +1,4 @@
+
 :- object(regular_polygon,
     instantiates(abstract_class),
     specializes(polygon)).
@@ -5,11 +6,23 @@
 
 	:- info([
 		author is 'Paulo Moura',
-		version is 1.0,
-		date is 2003/2/3,
+		version is 1.1,
+		date is 2004/1/8,
 		comment is 'Generic regular polygon.']).
 
 
+	:- public(side/1).
+
+	:- mode(side(?atom), zero_or_one).
+
+	:- info(side/1, [
+		comment is 'Regular polygon side length.',
+		argnames is ['Length']]).
+
+
+	side(1).         % default side length
+
+
 	perimeter(Perimeter) :-
 		::nsides(Number),
 		::side(Side),
diff --git a/Logtalk/examples/shapes/ph/NOTES b/Logtalk/examples/shapes/ph/NOTES
index eb52ca465..83d85fcc0 100644
--- a/Logtalk/examples/shapes/ph/NOTES
+++ b/Logtalk/examples/shapes/ph/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/shapes/ph/SCRIPT b/Logtalk/examples/shapes/ph/SCRIPT
index 76712ec36..5e2318db7 100644
--- a/Logtalk/examples/shapes/ph/SCRIPT
+++ b/Logtalk/examples/shapes/ph/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/shapes/ph/polygon.lgt b/Logtalk/examples/shapes/ph/polygon.lgt
index dd2daab0f..f64e36e92 100644
--- a/Logtalk/examples/shapes/ph/polygon.lgt
+++ b/Logtalk/examples/shapes/ph/polygon.lgt
@@ -4,8 +4,8 @@
 
 	:- info([
 		author is 'Paulo Moura',
-		version is 1.0,
-		date is 2003/2/3,
+		version is 1.1,
+		date is 2004/1/8,
 		comment is 'Generic polygon.']).
 
 
@@ -36,16 +36,4 @@
 		argnames is ['Perimeter']]).
 
 
-	:- public(side/1).
-
-	:- mode(side(?atom), zero_or_one).
-
-	:- info(side/1, [
-		comment is 'Polygon side length.',
-		argnames is ['Length']]).
-
-
-	side(1).         % default side length
-
-
 :- end_object.
diff --git a/Logtalk/examples/shapes/ph/regular_polygon.lgt b/Logtalk/examples/shapes/ph/regular_polygon.lgt
index e08b2cb52..e0433386d 100644
--- a/Logtalk/examples/shapes/ph/regular_polygon.lgt
+++ b/Logtalk/examples/shapes/ph/regular_polygon.lgt
@@ -1,14 +1,27 @@
+
 :- object(regular_polygon,
     extends(polygon)).
 
 
 	:- info([
 		author is 'Paulo Moura',
-		version is 1.0,
-		date is 2003/2/3,
+		version is 1.1,
+		date is 2004/1/8,
 		comment is 'Generic regular polygon.']).
 
 
+	:- public(side/1).
+
+	:- mode(side(?atom), zero_or_one).
+
+	:- info(side/1, [
+		comment is 'Regular polygon side length.',
+		argnames is ['Length']]).
+
+
+	side(1).         % default side length
+
+
 	perimeter(Perimeter) :-
 		::nsides(Number),
 		::side(Side),
diff --git a/Logtalk/examples/shapes/ph/square.lgt b/Logtalk/examples/shapes/ph/square.lgt
index dffd37062..e99f26799 100644
--- a/Logtalk/examples/shapes/ph/square.lgt
+++ b/Logtalk/examples/shapes/ph/square.lgt
@@ -1,3 +1,4 @@
+
 :- object(square,
     extends(regular_polygon)).
 
diff --git a/Logtalk/examples/sicstus/NOTES b/Logtalk/examples/sicstus/NOTES
index ee7f4bf9c..bbb892e9d 100644
--- a/Logtalk/examples/sicstus/NOTES
+++ b/Logtalk/examples/sicstus/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 The examples in this folder are adopted from the SICStus Prolog manual.
diff --git a/Logtalk/examples/sicstus/SCRIPT b/Logtalk/examples/sicstus/SCRIPT
index 752d263f8..7ac536474 100644
--- a/Logtalk/examples/sicstus/SCRIPT
+++ b/Logtalk/examples/sicstus/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/symdiff/NOTES b/Logtalk/examples/symdiff/NOTES
index 16901a250..958375f98 100644
--- a/Logtalk/examples/symdiff/NOTES
+++ b/Logtalk/examples/symdiff/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the symdiff.loader utility
diff --git a/Logtalk/examples/symdiff/SCRIPT b/Logtalk/examples/symdiff/SCRIPT
index 54f9c441b..9b9f155a6 100644
--- a/Logtalk/examples/symdiff/SCRIPT
+++ b/Logtalk/examples/symdiff/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/examples/viewpoints/NOTES b/Logtalk/examples/viewpoints/NOTES
index 5d647d828..66df39e48 100644
--- a/Logtalk/examples/viewpoints/NOTES
+++ b/Logtalk/examples/viewpoints/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To load all objects in this example consult the viewpoints.loader utility
diff --git a/Logtalk/examples/viewpoints/SCRIPT b/Logtalk/examples/viewpoints/SCRIPT
index 0987d0ccf..cc2bf1c68 100644
--- a/Logtalk/examples/viewpoints/SCRIPT
+++ b/Logtalk/examples/viewpoints/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/NOTES b/Logtalk/library/NOTES
index fe1f88e3c..bc6b1febc 100644
--- a/Logtalk/library/NOTES
+++ b/Logtalk/library/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 This folder contains objects, categories, and protocols that implement
diff --git a/Logtalk/library/SCRIPT b/Logtalk/library/SCRIPT
index e660b84c5..1d5673829 100644
--- a/Logtalk/library/SCRIPT
+++ b/Logtalk/library/SCRIPT
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/all.notes b/Logtalk/library/all.notes
index ab6fe4b8f..b0d9bdf91 100644
--- a/Logtalk/library/all.notes
+++ b/Logtalk/library/all.notes
@@ -1,9 +1,9 @@
 
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/dates.notes b/Logtalk/library/dates.notes
index f8f690ccf..b2fb520a2 100644
--- a/Logtalk/library/dates.notes
+++ b/Logtalk/library/dates.notes
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/debugging.notes b/Logtalk/library/debugging.notes
index a1479ab9d..f07b84194 100644
--- a/Logtalk/library/debugging.notes
+++ b/Logtalk/library/debugging.notes
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/dependents.notes b/Logtalk/library/dependents.notes
index e10079b1d..8b019fc04 100644
--- a/Logtalk/library/dependents.notes
+++ b/Logtalk/library/dependents.notes
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/events.notes b/Logtalk/library/events.notes
index c4fba563f..b945091a9 100644
--- a/Logtalk/library/events.notes
+++ b/Logtalk/library/events.notes
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/hierarchies.notes b/Logtalk/library/hierarchies.notes
index bba059f57..dcf77e371 100644
--- a/Logtalk/library/hierarchies.notes
+++ b/Logtalk/library/hierarchies.notes
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/metapredicates.notes b/Logtalk/library/metapredicates.notes
index f3d103bdb..864a31c14 100644
--- a/Logtalk/library/metapredicates.notes
+++ b/Logtalk/library/metapredicates.notes
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/random.notes b/Logtalk/library/random.notes
index 5a758b445..e42dce35b 100644
--- a/Logtalk/library/random.notes
+++ b/Logtalk/library/random.notes
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/library/types.notes b/Logtalk/library/types.notes
index 725c0cc57..b73ceac29 100644
--- a/Logtalk/library/types.notes
+++ b/Logtalk/library/types.notes
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/manuals/NOTES b/Logtalk/manuals/NOTES
index 8cce68974..f601e5595 100644
--- a/Logtalk/manuals/NOTES
+++ b/Logtalk/manuals/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 To consult the Logtalk documentation open the file index.html with a
diff --git a/Logtalk/manuals/index.html b/Logtalk/manuals/index.html
index c2ca51918..8d48b9c43 100644
--- a/Logtalk/manuals/index.html
+++ b/Logtalk/manuals/index.html
@@ -8,7 +8,7 @@
 
 <head>
 	<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-	<title>Logtalk 2.15.5 Documentation</title>
+	<title>Logtalk 2.15.6 Documentation</title>
 	<link rel="stylesheet" href="styles.css" type="text/css" />
 </head>
 
@@ -18,7 +18,7 @@
 &nbsp;
 </div>
 
-<h1>Logtalk 2.15.5 Documentation</h1>
+<h1>Logtalk 2.15.6 Documentation</h1>
 
 <ul>
 	<li><h2><a href="userman/index.html">User Manual</a></h2></li>
@@ -37,7 +37,7 @@ Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a
 </div>
 
 <div class="footer">
-<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: December 23, 2003</span></p>
+<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: February 5, 2004</span></p>
 </div>
 
 </body>
diff --git a/Logtalk/manuals/userman/index.html b/Logtalk/manuals/userman/index.html
index 5eeb1e8d6..577b3d269 100644
--- a/Logtalk/manuals/userman/index.html
+++ b/Logtalk/manuals/userman/index.html
@@ -226,7 +226,7 @@ Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a
 </div>
 
 <div class="footer">
-<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: December 23, 2003</span></p>
+<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: February 5, 2004</span></p>
 </div>
 </body>
 </html>
diff --git a/Logtalk/manuals/userman/installing.html b/Logtalk/manuals/userman/installing.html
index e45884a01..82c9803c0 100644
--- a/Logtalk/manuals/userman/installing.html
+++ b/Logtalk/manuals/userman/installing.html
@@ -35,7 +35,7 @@ The Macintosh version is included in the file <code>lgt2xx.sea.bin</code>, a <co
 <h4>MacOS X, BSD, Linux, Unix</h4>
 
 <p>
-The Linux/Unix version is included in the file <code>lgt2xx.tar.gz</code>. In order to decompress and install the system we can use the following commands:
+The Linux/Unix version is included in the file <code>lgt2xx.tar.gz</code>. In order to decompress and install the system you may use the following commands:
 </p>
 <pre>
     % gunzip lgt2xx.tar.gz
@@ -235,7 +235,11 @@ You can use the following options:
 </dl>
 <dl>
 	<dt><code>singletons(Option)</code></dt>
-		<dd>Controls the singleton variable warnings. Possible option values are <code>warning</code> (the usual default) and <code>silent</code> (not recommended unless you have already checked your code and want to avoid false singletons warnings like some Prolog compilers report for variables that start with an underscore).</dd>
+		<dd>Controls the singleton variable warnings. Possible option values are <code>warning</code> (the usual default) and <code>silent</code> (not recommended).</dd>
+</dl>
+<dl>
+	<dt><code>underscore_vars(Option)</code></dt>
+		<dd>Controls the interpretation of variables that start with an underscore (excluding the anonymous variable) that occur once in a term as either don't care variables or singleton variables. Possible option values are <code>dont_care</code> and <code>singletons</code> (the usual default). Note that, depending on your Prolog compiler, the <code>read_term/3</code> built-in predicate may report variables that start with an underscore as singleton variables. There is no standard behavior, hence this option.</dd>
 </dl>
 <dl>
 	<dt><code>misspelt(Option)</code></dt>
@@ -257,9 +261,13 @@ You can use the following options:
 	<dt><code>xml(Option)</code></dt>
 		<dd>Controls the automatic generation of documenting files in XML format. Possible option values are <code>on</code> (the usual default) and <code>off</code>.</dd>
 </dl>
+<dl>
+	<dt><code>xmlspec(Option)</code></dt>
+		<dd>Defines the XML documenting files specification format. Possible option values are <code>dtd</code> (for the DTD specification; the usual default) and <code>xsd</code> (for the XML Schema specification).</dd>
+</dl>
 <dl>
 	<dt><code>doctype(Option)</code></dt>
-		<dd>Sets the DOCTYPE reference in the automatically generated XML documenting files. The default value is <code>local</code>, that is, the DOCTYPE reference points to a local DTD file (<code>logtalk.dtd</code>), residing in the same directory as the XML file. Other possible values are <code>web</code> (DOCTYPE reference points to the web location <code>http://www.logtalk.org/xml/1.0/logtalk.dtd</code>) and <code>standalone</code> (no DOCTYPE reference in the XML documenting files).</dd>
+		<dd>Sets the DOCTYPE reference in the automatically generated XML documenting files. The default value is <code>local</code>, that is, the DOCTYPE reference points to a local DTD or XSD file (respectively, <code>logtalk.dtd</code> or <code>logtalk.xsd</code>), residing in the same directory as the XML file. Other possible values are <code>web</code> (DOCTYPE reference points to an web location, either <code>http://www.logtalk.org/xml/1.0/logtalk.dtd</code> or <code>http://www.logtalk.org/xml/1.0/logtalk.xsd</code>) and <code>standalone</code> (no DOCTYPE reference in the XML documenting files).</dd>
 </dl>
 <dl>
 	<dt><code>xsl(File)</code></dt>
@@ -277,10 +285,6 @@ You can use the following options:
 	<dt><code>smart_compilation(Option)</code></dt>
 		<dd>Controls the use of smart compilation of source files to avoid recompiling files that are unchanged since the last time they are compiled. Possible option values are <code>on</code> and <code>off</code> (the usual default).</dd>
 </dl>
-<dl>
-	<dt><code>named_anonymous_vars(Option)</code></dt>
-		<dd>Toggles the interpretation of variables that start with an underscore as named anonymous variables. Possible option values are <code>on</code> and <code>off</code> (the usual default).</dd>
-</dl>
 <dl>
 	<dt><code>code_prefix(Option)</code></dt>
 		<dd>Enables the definition of prefix for all functors of Logtalk generated Prolog code. Option value must be an atom. Default value is ''.</dd>
@@ -338,7 +342,7 @@ Copyright &copy; <a href="mailto:pmoura@logtalk.org">Paulo Moura</a> &mdash; <a
 </div>
 
 <div class="footer">
-<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: December 23, 2003</span></p>
+<p><span class="bleft"><a href="http://validator.w3.org/check/referer">XHTML</a> + <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></span><span class="bright">Last updated on: February 5, 2004</span></p>
 </div>
 </body>
 </html>
diff --git a/Logtalk/wenv/NOTES b/Logtalk/wenv/NOTES
index 6fa683956..829dee928 100644
--- a/Logtalk/wenv/NOTES
+++ b/Logtalk/wenv/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/wenv/emacs/NOTES b/Logtalk/wenv/emacs/NOTES
index 6c0f09930..c04743c94 100644
--- a/Logtalk/wenv/emacs/NOTES
+++ b/Logtalk/wenv/emacs/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/wenv/emacs/logtalk.el b/Logtalk/wenv/emacs/logtalk.el
index c33204624..5625f38ea 100644
--- a/Logtalk/wenv/emacs/logtalk.el
+++ b/Logtalk/wenv/emacs/logtalk.el
@@ -4,31 +4,23 @@
 
 ;; Author: Paulo Moura
 ;; Creation date: November 15, 2003
-;; Last modification date: December 16, 2003
-;; Version: 0.4
+;; Last modification date: February 2, 2004
+;; Version: 0.5
 
 ;; Installation:
 ;;
 ;; Add the following lines in your Emacs init file, for example
-;; your ~/.emacs file.
-;;
-;; (add-hook 'logtalk-mode-hook 'my-logtalk-mode-hook)
-;;
-;; (defun my-logtalk-mode-hook ()
-;;      (cond (window-system
-;;              (require 'logtalk-font-lock)
-;;              (turn-on-font-lock))))
-;;
-;; (setq font-lock-maximum-decoration t)
+;; your ~/.emacs file:
 ;;
 ;; (autoload 'logtalk-mode "logtalk" "Major mode for editing Logtalk programs." t)
 ;; (setq auto-mode-alist (cons '("\\.lgt\\'" . logtalk-mode) auto-mode-alist))
+;; (setq auto-mode-alist (cons '("\\.loader\\'" . logtalk-mode) auto-mode-alist))
 
 
 
 ;; setup 
 
-(defvar logtalk-mode-version "0.2"
+(defvar logtalk-mode-version "0.5"
 	"Logtalk mode version number")
 
 (defvar logtalk-mode-hook nil)
@@ -56,43 +48,35 @@
 		(modify-syntax-entry ?* ". 23b" logtalk-mode-syntax-table)
 		(modify-syntax-entry ?% "<" logtalk-mode-syntax-table)
 		(modify-syntax-entry ?\n ">" logtalk-mode-syntax-table)
+		(modify-syntax-entry ?\' "w" logtalk-mode-syntax-table)
 		logtalk-mode-syntax-table)
 	"Syntax table for logtalk-mode")
 
 
 
-;; create logtalk font-lock-faces
+;; make logtalk font-lock-faces
 
+(make-face 'logtalk-default-face)
 (make-face 'logtalk-directive-face)
-(set-face-foreground 'logtalk-directive-face "brown")
-
 (make-face 'logtalk-built-in-predicate-face)
-(set-face-foreground 'logtalk-built-in-predicate-face "darkmagenta")
-
 (make-face 'logtalk-built-in-method-face)
-(set-face-foreground 'logtalk-built-in-method-face "darkmagenta")
-
 (make-face 'logtalk-message-operator-face)
-(set-face-foreground 'logtalk-message-operator-face "blue")
-
-(make-face 'logtalk-string-face)
-(set-face-foreground 'logtalk-string-face "firebrick")
-
+(make-face 'logtalk-variable-face)
 (make-face 'logtalk-number-face)
-(set-face-foreground 'logtalk-number-face "blue")
-
 (make-face 'logtalk-comment-face)
-(set-face-foreground 'logtalk-comment-face "forest green")
+(make-face 'logtalk-string-face)
 
+;; set logtalk font-lock-faces
 
-;; set the font-lock-comment-face to the logtalk-comment-face
-
-(setq font-lock-comment-face 'logtalk-comment-face)
-
-
-;; set the font-lock-string-face to the logtalk-string-face
-
-(setq font-lock-string-face 'logtalk-string-face)
+(copy-face 'default 'logtalk-default-face)
+(copy-face 'font-lock-keyword-face 'logtalk-directive-face)
+(copy-face 'font-lock-builtin-face 'logtalk-built-in-predicate-face)
+(copy-face 'font-lock-builtin-face 'logtalk-built-in-method-face)
+(copy-face 'font-lock-function-name-face 'logtalk-message-operator-face)
+(copy-face 'font-lock-variable-name-face 'logtalk-variable-face)
+(copy-face 'font-lock-constant-face 'logtalk-number-face)
+(copy-face 'font-lock-comment-face 'logtalk-comment-face)
+(copy-face 'font-lock-string-face 'logtalk-string-face)
 
 
 
@@ -131,7 +115,7 @@
 		("\\(create\\(?:_object\\|e_\\(?:category\\|protocol\\)\\)\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
 		("\\(abolish_\\(?:category\\|object\\|protocol\\)\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
 		("\\(\\(?:category\\|object\\|protocol\\)_property\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
-		("\\(extends_\\(?:object\\|protocol\\)\\|i\\(?:mp\\(?:lements_protocol\\|orts_category\\)\\|nstantiates_object\\)\\|specializes_object\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
+		("\\(extends_\\(?:object\\|protocol\\)\\|i\\(?:mp\\(?:lements_protocol\\|orts_category\\)\\|nstantiates_class\\)\\|specializes_class\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
 		("\\(abolish_events\\|current_event\\|define_events\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
 		("\\(\\(?:curren\\|se\\)t_logtalk_flag\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
 		("\\(logtalk_\\(?:compile\\|load\\|version\\)\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
@@ -141,7 +125,7 @@
 		;; control constructs:
 		;;
 		("\\(ca\\(?:ll\\|tch\\)\\|throw\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
-		("\\(fail\\|true\\|!\\)" . 'logtalk-built-in-predicate-face)
+		("\\(fail\\|true\\|!\\|->\\|;\\)" . 'logtalk-built-in-predicate-face)
 		;;
 		;; logic and control:
 		;;
@@ -172,11 +156,17 @@
 		;;
 		("\\\\?=" . 'logtalk-built-in-predicate-face)
 		;;
+		;; dcgs:
+		;;
+		("-->" . 'logtalk-built-in-predicate-face)
+		;;
 		;; evaluable functors:
 		;;
 		("\\(abs\\|ceiling\\|flo\\(?:at\\(?:_\\(?:\\(?:fractional\\|integer\\)_part\\)\\)?\\|or\\)\\|mod\\|r\\(?:em\\|ound\\)\\|sign\\|truncate\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
-		("//\\|[*+/-]" . 'logtalk-built-in-predicate-face)
-		("\\([[:blank:]]\\)\\(rem\\|mod\\)\\([[:blank:]]\\)" 2 'logtalk-built-in-predicate-face)
+		("//\\|[*/]" . 'logtalk-built-in-predicate-face)
+		("\\([^eE]\\)\\([+]\\)" 2 'logtalk-built-in-predicate-face)
+		("\\([^:eE]\\)\\([-]\\)" 2 'logtalk-built-in-predicate-face)
+		("\\<\\(rem\\|mod\\)\\>" . 'logtalk-built-in-predicate-face)
 		;;
 		;; other arithemtic functors:
 		;;
@@ -186,11 +176,12 @@
 		;; stream selection and control:
 		;;
 		("\\(at_end_of_stream\\|c\\(?:lose\\|urrent_\\(?:\\(?:in\\|out\\)put\\)\\)\\|flush_output\\|open\\|s\\(?:et_\\(?:input\\|output\\|stream_position\\)\\|tream_property\\)\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
-		("\\(at_end_of_stream\\)" . 'logtalk-built-in-predicate-face)
+		("\\<\\(at_end_of_stream\\|flush_output\\)\\>" . 'logtalk-built-in-predicate-face)
 		;;
 		;; character input/output:
 		;;
 		("\\(get_c\\(?:har\\|ode\\)\\|nl\\|p\\(?:eek_c\\(?:har\\|ode\\)\\|ut_c\\(?:har\\|ode\\)\\)\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
+		("\\<nl\\>" . 'logtalk-built-in-predicate-face)
 		;;
 		;; byte input/output:
 		;;
@@ -203,25 +194,51 @@
 		;; implementation defined hooks functions:
 		;;
 		("\\(\\(?:curren\\|se\\)t_prolog_flag\\|halt\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
-		("halt" . 'logtalk-built-in-predicate-face)
+		("\\<halt\\>" . 'logtalk-built-in-predicate-face)
 		;;
 		;; atomic term processing:
 		;;
 		("\\(atom_\\(?:c\\(?:hars\\|o\\(?:des\\|ncat\\)\\)\\|length\\)\\|char_code\\|number_c\\(?:\\(?:har\\|ode\\)s\\)\\|sub_atom\\)\\([(]\\)" 1 'logtalk-built-in-predicate-face)
 		;;
 		;; bitwise functors:
+		;;
 		("/\\\\\\|<<\\|>>\\|\\\\/" . 'logtalk-built-in-predicate-face)
 		("\\\\" . 'logtalk-built-in-predicate-face)
 	))
 
 
-
 (setq logtalk-font-lock-operators
 	'(
+		;;
+		;; clause operator:
+		;;
+		(":-" . 'logtalk-default-face)
+		;;
+		;; message sending operators:
+		;;
 		("::\\|\\^\\^\\|[{}]" . 'logtalk-message-operator-face)
+		;;
+		;; mode operators:
+		;;
+		("[@?]" . 'logtalk-built-in-predicate-face)
 	))
 
 
+(setq logtalk-font-lock-numbers
+	'(
+		("\\<\\(0x[a-fA-F0-9]+\\)\\>" 1 'logtalk-number-face)
+		("\\<\\(0o[0-7]+\\)\\>" 1 'logtalk-number-face)
+		("\\<\\(0b[0-1]+\\)\\>" 1 'logtalk-number-face)
+		("\\<\\(0['][a-zA-Z0-9]\\)\\>" 1 'logtalk-number-face)
+		("\\<\\([0-9]+\\([.][0-9]+\\)?\\([eE][+-][0-9]+\\)?\\)\\>" 1 'logtalk-number-face)
+	))
+
+
+(setq logtalk-font-lock-variables
+	'(
+		("\\<\\([_A-Z][a-zA-Z0-9_]*\\)\\>" 1 'logtalk-variable-face)
+	))
+
 
 (setq logtalk-font-lock-keywords
 	(append
@@ -230,10 +247,11 @@
 		logtalk-font-lock-built-in-methods
 		logtalk-font-lock-built-in-predicates
 		logtalk-font-lock-operators
+		logtalk-font-lock-variables
+		logtalk-font-lock-numbers
 	))
 
 
-
 ;; entry function
 
 (defun logtalk-mode ()
diff --git a/Logtalk/wenv/jedit/NOTES b/Logtalk/wenv/jedit/NOTES
index 8b2d4f0d9..ceec55ee8 100644
--- a/Logtalk/wenv/jedit/NOTES
+++ b/Logtalk/wenv/jedit/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
@@ -19,7 +19,7 @@ To install:
 2.	Open the "catalog" file in the same subdirectory and add (if not 
 	present) the following entry:
 	
-	<MODE NAME="logtalk" FILE="logtalk.xml" FILE_NAME_GLOB="*.lgt" />
+	<MODE NAME="logtalk" FILE="logtalk.xml" FILE_NAME_GLOB="*.{lgt,loader}" />
 
 3.	Install (or update if necessary) the jEdit plug-in Templates 3.0.1
 	or later version.
diff --git a/Logtalk/wenv/jedit/logtalk.xml b/Logtalk/wenv/jedit/logtalk.xml
index eef84f449..5a8ce98e0 100644
--- a/Logtalk/wenv/jedit/logtalk.xml
+++ b/Logtalk/wenv/jedit/logtalk.xml
@@ -4,10 +4,10 @@
 
 <!--	jEdit 4.1 Logtalk syntax file
 
-	written by	Paulo Moura
-	version		1.3
-	created on	2 May 2002
-	last revised	7 July 2003
+	written by		Paulo Moura
+	version			1.4
+	created on		2 May 2002
+	last revised	28 January 2004
 	
 	To install, copy this file to the "modes" subdirectory in jEdit 
 	directory installation.   Next, check the "catalog" file in the 
@@ -25,7 +25,10 @@
 		<PROPERTY NAME="tabSize" VALUE="4" />
 	</PROPS>
 
-	<RULES SET="MAIN" IGNORE_CASE="FALSE">
+	<RULES SET="MAIN"
+		IGNORE_CASE="FALSE"
+		HIGHLIGHT_DIGITS="FALSE"
+		DIGIT_RE="[[:digit:]]+([eE][-+][[:digit:]]+)?">
 	
 		<!-- Comments -->
 		<EOL_SPAN TYPE="COMMENT1">%</EOL_SPAN>
@@ -34,7 +37,12 @@
 			<END>*/</END>
 		</SPAN>
 
+		<!-- Character code constants -->
 		<SEQ_REGEXP TYPE="NULL" HASH_CHAR="0">0'[[:alnum:]]</SEQ_REGEXP>
+		<!-- Binary, octal, and hexadecimal numbers -->
+		<SEQ_REGEXP TYPE="NULL" HASH_CHAR="0">0b[0-1]+</SEQ_REGEXP>
+		<SEQ_REGEXP TYPE="NULL" HASH_CHAR="0">0o[0-7]+</SEQ_REGEXP>
+		<SEQ_REGEXP TYPE="NULL" HASH_CHAR="0">0x[[:xdigit:]]+</SEQ_REGEXP>
 
 		<!-- String literals -->
 		<SPAN TYPE="LITERAL1" NO_LINE_BREAK="TRUE">
@@ -162,8 +170,8 @@
 			<FUNCTION>extends_object</FUNCTION>
 			<FUNCTION>extends_protocol</FUNCTION>
 			<FUNCTION>implements_protocol</FUNCTION>
-			<FUNCTION>instantiates_object</FUNCTION>
-			<FUNCTION>specializes_object</FUNCTION>
+			<FUNCTION>instantiates_class</FUNCTION>
+			<FUNCTION>specializes_class</FUNCTION>
 			<FUNCTION>imports_category</FUNCTION>
 
 			<FUNCTION>abolish_events</FUNCTION>
diff --git a/Logtalk/wenv/kate/NOTES b/Logtalk/wenv/kate/NOTES
new file mode 100644
index 000000000..0b426c100
--- /dev/null
+++ b/Logtalk/wenv/kate/NOTES
@@ -0,0 +1,25 @@
+=================================================================
+Logtalk - Object oriented extension to Prolog
+Release 2.15.6
+
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
+=================================================================
+
+
+This directory contains files that provide syntax highlighting 
+for editing Logtalk source files with the KDE Kate and Kwrite 
+text editors (http://kate.kde.org/).
+
+
+To install copy the file "logtalk.xml" to the directory:
+
+    $(KDEDIR)/share/apps/katepart/syntax/
+
+or:
+    
+    ~/.kde/share/apps/katepart/syntax
+
+and restart Kate and Kwrite.
+
+
+THIS SYNTAX FILE IS UNDER DEVELOPMENT.
diff --git a/Logtalk/wenv/kate/logtalk.xml b/Logtalk/wenv/kate/logtalk.xml
new file mode 100644
index 000000000..5959523be
--- /dev/null
+++ b/Logtalk/wenv/kate/logtalk.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+
+<language name="Logtalk" version="1.0" kateversion="2.2" section="Sources" extensions="*.lgt;*.loader" mimetype="text/x-logtalk">
+
+    <highlighting>
+
+        <contexts>
+
+            <context name="normal" attribute="Normal" lineEndContext="#stay">
+				<!-- Directives -->
+                <RegExpr String = "^[\s]*:-" attribute="Normal" context="directive" />
+				<!-- Event handlers -->
+                <RegExpr String = "\b(after|before)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Method execution context -->
+                <RegExpr String = "\b(parameter|this|self|sender)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Reflection -->
+                <RegExpr String = "\b(current_predicate|predicate_property)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- DCGs -->
+                <RegExpr String = "\bphrase(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Entity -->
+                <RegExpr String = "\b(current_object|current_protocol|current_category)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(create_object|create_protocol|create_category)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(object_property|protocol_property|category_property)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(abolish_object|abolish_protocol|abolish_category)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Event handlers -->
+                <RegExpr String = "\b(extends_object)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(extends_protocol|implements_protocol)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(instantiates_class|specializes_class)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(imports_category)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Events -->
+                <RegExpr String = "\b(abolish_events|current_event|define_events)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Flags and compiler options -->
+                <RegExpr String = "\b(current_logtalk_flag|set_logtalk_flag)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Compiling and loading -->
+                <RegExpr String = "\b(logtalk_compile|logtalk_load)(?=[(])" attribute="Built-in" context="#stay" />
+
+				<!-- Database -->
+                <RegExpr String = "\b(abolish|asserta|assertz|clause|retract|retractall)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Control -->
+                <RegExpr String = "\b(call|catch|throw)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(fail|true)\b" attribute="Built-in" context="#stay" />
+				<!-- All solutions -->
+                <RegExpr String = "\b(bagof|findall|forall|setof)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Term unification -->
+                <RegExpr String = "\bunify_with_occurs_check(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Term creation and decomposition -->
+                <RegExpr String = "\b(functor|arg|copy_term)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Evaluable functors -->
+                <RegExpr String = "\b(rem|mod|abs|sign)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(float_integer_part|float_fractional_part|float)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(floor|truncate|round|ceiling)(?=[(])" attribute="Built-in" context="#stay" />
+                <!-- Other arithemtic functors -->
+                <RegExpr String = "\b(sin|cos|atan|exp|log|sqrt)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Term testing -->
+                <RegExpr String = "\b(var|atom|integer|float|atomic|compound|nonvar|number)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Stream selection and control -->
+                <RegExpr String = "\b(current_input|current_output)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(set_input|set_output)(?=[(])" attribute="Built-in" context="#stay" />
+				<RegExpr String = "\b(open|close)(?=[(])" attribute="Built-in" context="#stay" />
+				<RegExpr String = "\bflush_output\b" attribute="Built-in" context="#stay" />
+				<RegExpr String = "\bflush_output(?=[(])" attribute="Built-in" context="#stay" />
+				<RegExpr String = "\b(stream_property|at_end_of_stream|set_stream_position)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Character input/output -->
+                <RegExpr String = "\b(get_char|get_code|peek_char|peek_code|put_char|put_code|nl)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Byte input/output -->
+                <RegExpr String = "\b(get_byte|peek_byte|put_byte)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Term input/output -->
+                <RegExpr String = "\b(read_term|read)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(write_term|write|writeq|write_canonical)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(op|current_op)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(char_conversion|current_char_conversion)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Atomic term processing -->
+                <RegExpr String = "\b(atom_length|atom_concat|sub_atom)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(atom_chars|atom_codes|char_code)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\b(number_chars|number_codes)(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Implementation defined hooks functions -->
+                <RegExpr String = "\b(set_prolog_flag|current_prolog_flag)(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\bhalt\b" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\bhalt(?=[(])" attribute="Built-in" context="#stay" />
+				<!-- Variables -->
+                <RegExpr String = "\b[A-Z_][A-Za-z0-9_]*" attribute = "Variable" context="#stay"/>
+				<!-- Comments -->
+                <DetectChar attribute="Comment" context="single line comment" char="%"/>
+                <Detect2Chars attribute="Comment" context="multiline comment" char="/" char1="*"/>
+				<!-- Strings and quoted atoms -->
+                <DetectChar attribute="String" context="string" char="&quot;" />
+                <RegExpr String = "'" attribute="String" context="atom" />
+				<!-- Numbers -->
+                <RegExpr String = "0'[A-Za-z0-9]" attribute = "Number" context="#stay"/>
+                <RegExpr String = "0b[0-1]+" attribute = "Number" context="#stay"/>
+                <RegExpr String = "0o[0-7]+" attribute = "Number" context="#stay"/>
+                <RegExpr String = "0x[0-9a-fA-F]+" attribute = "Number" context="#stay"/>
+                <RegExpr String = "[0-9]+(\.[0-9]+)?([eE][-+][0-9]+)?" attribute = "Number" context="#stay"/>
+                <!-- Message sending operators -->
+                <StringDetect String = "::" attribute="Operator" context="#stay" />
+                <StringDetect String = "^^" attribute="Operator" context="#stay" />
+				<!-- External call -->
+                <DetectChar attribute="Operator" context="#stay" char="{" beginRegion="external" />
+                <DetectChar attribute="Operator" context="#stay" char="}" endRegion="external" />
+				<!-- Logic and control -->
+                <RegExpr String = "\bonce(?=[(])" attribute="Built-in" context="#stay" />
+                <RegExpr String = "\brepeat\b" attribute="Built-in" context="#stay" />
+				<!-- Bitwise functors -->
+                <StringDetect String = "&gt;&gt;" attribute="Operator" context="#stay" />
+                <StringDetect String = "&lt;&lt;" attribute="Operator" context="#stay" />
+                <StringDetect String = "/\" attribute="Operator" context="#stay" />
+                <StringDetect String = "\/" attribute="Operator" context="#stay" />
+                <StringDetect String = "\\" attribute="Operator" context="#stay" />
+				<!-- Arithemtic evaluation -->
+                <RegExpr String = "\bis\b" attribute="Operator" context="#stay" />
+				<!-- Arithemtic comparison -->
+                <StringDetect String = "=:=" attribute="Operator" context="#stay" />
+                <StringDetect String = "=\=" attribute="Operator" context="#stay" />
+                <StringDetect String = "&lt;" attribute="Operator" context="#stay" />
+                <StringDetect String = "=&lt;" attribute="Operator" context="#stay" />
+                <StringDetect String = "&gt;" attribute="Operator" context="#stay" />
+                <StringDetect String = "&gt;=" attribute="Operator" context="#stay" />
+				<!-- Term creation and decomposition -->
+                <StringDetect String = "=.." attribute="Operator" context="#stay" />
+				<!-- Term unification -->
+                <StringDetect String = "=" attribute="Operator" context="#stay" />
+                <StringDetect String = "\=" attribute="Operator" context="#stay" />
+				<!-- Term comparison -->
+                <StringDetect String = "==" attribute="Operator" context="#stay" />
+				<StringDetect String = "\==" attribute="Operator" context="#stay" />
+                <StringDetect String = "@=&lt;" attribute="Operator" context="#stay" />
+                <StringDetect String = "@&lt;" attribute="Operator" context="#stay" />
+                <StringDetect String = "@&gt;=" attribute="Operator" context="#stay" />
+                <StringDetect String = "@&gt;" attribute="Operator" context="#stay" />
+				<!-- Evaluable functors -->
+                <StringDetect String = "+" attribute="Operator" context="#stay" />
+                <StringDetect String = "-" attribute="Operator" context="#stay" />
+                <StringDetect String = "*" attribute="Operator" context="#stay" />
+                <StringDetect String = "//" attribute="Operator" context="#stay" />
+                <StringDetect String = "/" attribute="Operator" context="#stay" />
+                <RegExpr String = "\brem\b" attribute="Operator" context="#stay" />
+                <RegExpr String = "\bmod\b" attribute="Operator" context="#stay" />
+				<!-- Other arithemtic functors -->
+                <StringDetect String = "**" attribute="Operator" context="#stay" />
+				<!-- DCG rules -->
+                <StringDetect String = "--&gt;" attribute="Operator" context="#stay" />
+				<!-- Control constructs -->
+                <StringDetect String = "!" attribute="Operator" context="#stay" />
+                <StringDetect String = "-&gt;" attribute="Operator" context="#stay" />
+                <StringDetect String = ";" attribute="Operator" context="#stay" />
+				<!-- Logic and control -->
+                <StringDetect String = "\+" attribute="Operator" context="#stay" />
+				<!-- Mode operators -->
+                <StringDetect String = "?" attribute="Operator" context="#stay" />
+                <StringDetect String = "@" attribute="Operator" context="#stay" />
+				<!-- Clause operator -->
+                <StringDetect String = ":-" attribute="Normal" context="#stay" />
+            </context>
+
+            <context name="directive" attribute="Directive" lineEndContext="#stay">
+        		<!-- Entity directives -->
+                <RegExpr String = "\b(category|object|protocol)(?=[(])" attribute="Directive" context="entityrelations" />
+                <RegExpr String = "\b(end_category|end_object|end_protocol)[.]" attribute="Directive" context="#pop" />
+ 				<!-- Predicate scope directives -->
+                <RegExpr String = "\b(public|protected|private)(?=[(])" attribute="Directive" context="#pop" />
+				<!-- Other directives -->
+                <RegExpr String = "\binitialization(?=[(])" attribute="Directive" context="#pop" />
+                <RegExpr String = "\b(info|mode)(?=[(])" attribute="Directive" context="#pop" />
+                <RegExpr String = "\bdynamic[.]" attribute="Directive" context="#pop" />
+				<RegExpr String = "\b(dynamic|discontiguous|metapredicate)(?=[(])" attribute="Directive" context="#pop" />
+                <RegExpr String = "\bop(?=[(])" attribute="Directive" context="#pop" />
+                <RegExpr String = "\b(calls|uses)(?=[(])" attribute="Directive" context="#pop" />
+            </context>
+
+            <context name="entityrelations" attribute="Normal" lineEndContext="#stay">
+                <RegExpr String = "\b(extends|implements|imports|instantiates|specializes)(?=[(])" attribute="Directive" context="#stay" />
+                <Detect2Chars attribute="Normal" context="normal" char=")" char1="." />
+            </context>
+
+            <context name="single line comment" attribute="Comment" lineEndContext="#pop" />
+
+            <context name="multiline comment" attribute="Comment" lineEndContext="#stay">
+                <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" />
+            </context>
+
+            <context name="string" attribute="String" lineEndContext="#stay" >
+                <DetectChar attribute="String" context="#pop" char="&quot;" />
+            </context>
+
+            <context name="atom" attribute="String" lineEndContext="#stay">
+                <DetectChar attribute="String" context="#pop" char="'" />
+            </context>
+
+        </contexts>
+
+		<itemDatas>
+			<itemData name="Normal" defStyleNum="dsNormal" />
+			<itemData name="Directive" defStyleNum="dsKeyword" />
+			<itemData name="Built-in" defStyleNum="dsKeyword" />
+			<itemData name="Operator" defStyleNum="dsDataType" />
+			<itemData name="Comment" defStyleNum="dsComment" />
+			<itemData name="Number" defStyleNum="dsDecVal" />
+			<itemData name="String"  defStyleNum="dsString"/>
+            <itemData name="Variable" defStyleNum="dsOthers"/>
+		</itemDatas>
+
+	</highlighting>
+
+	<general>
+		<comments>
+			<comment name="singleLine" start="%" />
+			<comment name="multiLine" start="/*" end="*/" />
+		</comments>
+		<keywords casesensitive="true" />
+	</general>
+
+</language>
+
diff --git a/Logtalk/wenv/nedit/NOTES b/Logtalk/wenv/nedit/NOTES
index 17c3b71c2..9cb097664 100644
--- a/Logtalk/wenv/nedit/NOTES
+++ b/Logtalk/wenv/nedit/NOTES
@@ -1,14 +1,14 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
 This directory contains a file that provides syntax highlighting 
 for editing Logtalk source files with the text editor NEdit 5.2 
-(http://www.nedit.org).
+or later version (http://www.nedit.org/).
 
 
 To install:
diff --git a/Logtalk/wenv/nedit/logtalk.pats b/Logtalk/wenv/nedit/logtalk.pats
index b49ade577..7e53fa319 100644
--- a/Logtalk/wenv/nedit/logtalk.pats
+++ b/Logtalk/wenv/nedit/logtalk.pats
@@ -2,7 +2,7 @@
 !
 ! Author: Paulo Moura (pmoura at logtalk.org)
 !
-! Last changed in: July 7, 2003
+! Last changed in: February 2, 2004
 !
 !
 ! To install this patterns file:
@@ -21,33 +21,49 @@
 nedit.fileVersion: 5.2
 
 nedit.highlightPatterns: Logtalk:1:0{\n\
-	Entity directives:":\\-\\sobject|:\\-\\sprotocol|:\\-\\scategory|:\\-\\send_object|:\\-\\send_protocol|:\\-\\send_category":::Keyword::\n\
-	Entity relations:"<(instantiates|specializes|extends|imports|implements)>":::Keyword::\n\
-	Directives:":\\-\\sinitialization|:\\-\\sinfo|:\\-\\smode|:\\-\\sdynamic|:\\-\\sdiscontiguous|:\\-\\spublic|:\\-\\sprotected|:\\-\\sprivate|:\\-\\smetapredicate|:\\-\\sop|:\\-\\scalls|:\\-\\suses":::Keyword::\n\
-	Clause operators:":\\-|\\.":::Keyword::\n\
-	Term testing:"<[^+?@-](var|atom|integer|float|atomic|compound|nonvar|number)>":::Subroutine1::\n\
+	Entity directives:"(?<=:\\-\\s)(object|protocol|category)(?=[(])":::Preprocessor::\n\
+	Entity directives:"(?<=:\\-\\s)(end_object|end_protocol|end_category)(?=[.])":::Preprocessor::\n\
+	Entity relations:"<(instantiates|specializes|extends|imports|implements)(?=[(])":::Preprocessor::\n\
+	Directives:"(?<=:\\-\\s)(initialization|info|mode|dynamic|discontiguous|public|protected|private|metapredicate|op|calls|uses)(?=[(])":::Preprocessor::\n\
+	Directives:"(?<=:\\-\\s)dynamic>":::Preprocessor::\n\
+	Clause operators:":\\-|\\.|,":::Keyword::\n\
+	Term testing:"(?<![+?@-])(var|atom|integer|float|atomic|compound|nonvar|number)(?=[(])":::Subroutine::\n\
 	Message sending operators:"::|\\^\\^":::Keyword::\n\
-	Control constructs:"!|,|;|\\-\\-\\>|\\-\\>|<(true|fail|call|catch|throw)>":::Subroutine::\n\
+	Control constructs:"!|;|\\-\\-\\>|\\-\\>|<(true|fail)>":::Subroutine::\n\
+	Control constructs:"<(call|catch|throw)(?=[(])":::Subroutine::\n\
 	Block comment:"/\\*":"\\*/"::Comment::\n\
 	Line comment:"%":"$"::Comment::\n\
-	Number:"0'":::Plain::\n\
+	Number:"0'[A-Za-z0-9]":::Numeric Const::\n\
+	Number:"0b[0-1]+":::Numeric Const::\n\
+	Number:"0o[0-7]+":::Numeric Const::\n\
+	Number:"0x[A-Fa-f0-9]+":::Numeric Const::\n\
+	Number:"[0-9]+(\.[0-9]+)?([eE][-+][0-9]+)?":::Numeric Const::\n\
+	String:"""":""""::String::\n\
 	String:"'":"'"::String::\n\
-	Built-in methods:"<(parameter|self|sender|this|current_predicate|predicate_property|abolish|asserta|assertz|retractall|retract|bagof|findall|forall|setof|before|after|phrase)>":::Subroutine::\n\
-	Arithmetic operators:"<is>|\\+|\\*|\\-|/|=:=|=\\\\=|=\\<|\\>=|\\<|\\>":::Subroutine1::\n\
-	Built-in predicates:"<(current_object|current_protocol|current_category|create_object|create_protocol|create_category|object_property|protocol_property|category_property|abolish_object|abolish_protocol|abolish_vategory|extends_object|extends_protocol|omplements_protocol|instantiates_object|specializes_object|imports_category|abolish_events|current_events|define_events|current_logtalk_flag|set_logtalk_flag|logtalk_compile|logtalk_load|forall|retractall)>":::Subroutine1::\n\
-	Term unification:"=|<unify_with_occurs_check>|\\\\=":::Subroutine1::\n\
-	Term comparison:"@=\\<|==|\\\\==|@\\>=|@\\<|@\\>":::Subroutine1::\n\
-	Term creation and decomposition:"<(functor|arg|copy_term)>|=\\.\\.":::Subroutine1::\n\
-	Mode operators:"\\?|@":::Subroutine1::\n\
-	Stream selection and control:"<(current_input|current_output|set_input|set_output|open|close|flush_output|stream_property|at_end_of_stream|set_stream_position)>":::Subroutine1::\n\
-	Character input-output:"<(get_char|get_code|peek_char|peek_code|put_char|put_code|nl)>":::Subroutine1::\n\
-	Byte input-output:"<(get_byte|peek_byte|put_byte)>":::Subroutine1::\n\
-	Term input-output:"<(read_term|read|write_canonical|write_term|writeq|write|current_op|op|current_char_conversion|char_conversion)>":::Subroutine1::\n\
-	Logic and control:"\\\\\\+|<(once|repeat)>":::Subroutine::\n\
-	Atomic term processing:"<(atom_length|atom_concat|sub_atom|atom_chars|atom_codes|char_code|number_chars|number_codes)>":::Subroutine1::\n\
-	Implementation defined hooks:"<(set_prolog_flag|current_prolog_flag)>":::Subroutine1::\n\
-	Evaluable functors:"\\+|-|\\*|//|/|<(rem|mod|abs|sign|float_integer_part|float_fractional_part|float|floor|truncate|round|ceiling)>":::Subroutine1::\n\
-	Other arithemtic functors:"\\*\\*|<(sin|cos|atan|exp|log|sqrt)>":::Subroutine1::\n\
-	Bitwise functors:">>|<<|/\\\\|\\\\/|\\\\":::Subroutine1::\n\
+	Built-in methods:"<(parameter|self|sender|this|current_predicate|predicate_property|abolish|asserta|assertz|retractall|retract|bagof|findall|forall|setof|before|after|phrase)(?=[(])":::Subroutine::\n\
+	Arithmetic operators:"<is>|\\+|\\*|\\-|/|=:=|=\\\\=|=\\<|\\>=|\\<|\\>":::Subroutine::\n\
+	Built-in predicates:"<(current_object|current_protocol|current_category|create_object|create_protocol|create_category|object_property|protocol_property|category_property|abolish_object|abolish_protocol|abolish_vategory|extends_object|extends_protocol|omplements_protocol|instantiates_class|specializes_class|imports_category|abolish_events|current_events|define_events|current_logtalk_flag|set_logtalk_flag|logtalk_compile|logtalk_load|forall|retractall)(?=[(])":::Subroutine::\n\
+	Term unification:"=|\\\\=":::Subroutine::\n\
+	Term unification:"<unify_with_occurs_check(?=[(])":::Subroutine::\n\
+	Term comparison:"@=\\<|==|\\\\==|@\\>=|@\\<|@\\>":::Subroutine::\n\
+	Term creation and decomposition:"<(functor|arg|copy_term)(?=[(])":::Subroutine::\n\
+	Term creation and decomposition:"=\\.\\.":::Subroutine::\n\
+	Mode operators:"\\?|@":::Subroutine::\n\
+	Stream selection and control:"<(current_input|current_output|set_input|set_output|open|close|flush_output|stream_property|at_end_of_stream|set_stream_position)(?=[(])":::Subroutine::\n\
+	Stream selection and control:"<(flush_output|at_end_of_stream)>":::Subroutine::\n\
+	Character input-output:"<(get_char|get_code|peek_char|peek_code|put_char|put_code|nl)(?=[(])":::Subroutine::\n\
+	Character input-output:"<nl>":::Subroutine::\n\
+	Byte input-output:"<(get_byte|peek_byte|put_byte)(?=[(])":::Subroutine::\n\
+	Term input-output:"<(read_term|read|write_canonical|write_term|writeq|write|current_op|op|current_char_conversion|char_conversion)(?=[(])":::Subroutine::\n\
+	Logic and control:"<once(?=[(])":::Subroutine::\n\
+	Logic and control:"\\\\\\+|<repeat>":::Subroutine::\n\
+	Atomic term processing:"<(atom_length|atom_concat|sub_atom|atom_chars|atom_codes|char_code|number_chars|number_codes)(?=[(])":::Subroutine::\n\
+	Implementation defined hooks:"<(set_prolog_flag|current_prolog_flag|halt)(?=[(])":::Subroutine::\n\
+	Implementation defined hooks:"<halt>":::Subroutine::\n\
+	Evaluable functors:"<(rem|mod|abs|sign|float_integer_part|float_fractional_part|float|floor|truncate|round|ceiling)(?=[(])":::Subroutine::\n\
+	Evaluable functors:"\\+|-|\\*|//|/":::Subroutine::\n\
+	Other arithemtic functors:"\\*\\*":::Subroutine::\n\
+	Other arithemtic functors:"\\*\\*|<(sin|cos|atan|exp|log|sqrt)(?=[(])":::Subroutine::\n\
+	Bitwise functors:">>|<<|/\\\\|\\\\/|\\\\":::Subroutine::\n\
 }
-nedit.languageModes:	Logtalk:.lgt::::4:4:\n\
+nedit.languageModes:	Logtalk:.lgt .loader::::4:4:\n\
diff --git a/Logtalk/wenv/subethaedit/NOTES b/Logtalk/wenv/subethaedit/NOTES
index 9b354c282..2139050dc 100644
--- a/Logtalk/wenv/subethaedit/NOTES
+++ b/Logtalk/wenv/subethaedit/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
@@ -11,8 +11,12 @@ for editing Logtalk source files with the SubEthaEdit text editor
 (http://www.codingmonkeys.de/subethaedit/).
 
 
-To install copy the file "logtalk.plist" to the folder 
-"~/Library/Application Support/SubEthaEdit/Syntax Definitions/" or to
-"/Library/Application Support/SubEthaEdit/Syntax Definitions/"
-(create the folder if it does not exist).
+To install copy the file "logtalk.plist" either to the folder:
  
+	~/Library/Application Support/SubEthaEdit/Syntax Definitions/
+	
+or to the folder:
+
+	/Library/Application Support/SubEthaEdit/Syntax Definitions/
+	
+(create the folder if it does not exist).
diff --git a/Logtalk/wenv/subethaedit/logtalk.plist b/Logtalk/wenv/subethaedit/logtalk.plist
index c57b161b7..226031e48 100644
--- a/Logtalk/wenv/subethaedit/logtalk.plist
+++ b/Logtalk/wenv/subethaedit/logtalk.plist
@@ -8,7 +8,7 @@
 	    <key>Name</key>
 		<string>Logtalk</string>
 		<key>Extensions</key>
-		<string>lgt</string>
+		<string>lgt,loader</string>
 		<key>Valid Characters for Variables</key>
 		<string>_0987654321abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
 	</dict>
@@ -18,7 +18,24 @@
 
 		<dict>
 			<key>Name</key>
-			<string>Entity Directives</string>
+			<string>Variables</string>
+			<key>Color</key>
+			<array>
+				<real>0.275</real>
+				<real>0.275</real>
+				<real>0.275</real>
+			</array>
+			<key>Multiline</key>
+			<false/>
+			<key>Regular Expressions</key>
+			<array>
+		      	<string>[^[:lower:]]([A-Z_][A-Za-z0-9_]*)[^[:alnum:]]</string>
+			</array>
+		</dict>
+
+		<dict>
+			<key>Name</key>
+			<string>Directives</string>
 			<key>Color</key>
 			<array>
 				<real>0.408</real>
@@ -29,11 +46,11 @@
 			<false/>
 			<key>Regular Expressions</key>
 			<array>
-				<string>\:\-[[:space:]](object)</string>			
+				<string>\:\-[[:space:]](object)\(</string>			
 				<string>\:\-[[:space:]](end_object)\.</string>			
-				<string>\:\-[[:space:]](protocol)</string>			
+				<string>\:\-[[:space:]](protocol)\(</string>			
 				<string>\:\-[[:space:]](end_protocol)\.</string>			
-				<string>\:\-[[:space:]](category)</string>			
+				<string>\:\-[[:space:]](category)\(</string>			
 				<string>\:\-[[:space:]](end_category)\.</string>			
 				<string>\:\-[[:space:]](initialization)\(</string>			
 				<string>\:\-[[:space:]](info)\(</string>			
@@ -124,8 +141,11 @@
 				<string>(call)\(</string>
 				<string>(catch)\(</string>
 				<string>(throw)\(</string>
-				<string>(true)</string>
-				<string>(fail)</string>
+			</array>
+			<key>Plain Strings</key>
+			<array>
+				<string>true</string>
+				<string>fail</string>
 			</array>
 		</dict>
 
@@ -192,8 +212,8 @@
 				<string>(extends_object)\(</string>
 				<string>(extends_protocol)\(</string>
 				<string>(implements_protocol)\(</string>
-				<string>(instantiates_object)\(</string>
-				<string>(specializes_object)\(</string>
+				<string>(instantiates_class)\(</string>
+				<string>(specializes_class)\(</string>
 				<string>(imports_category)\(</string>
 				<string>(abolish_events)\(</string>
 				<string>(current_event)\(</string>
@@ -203,7 +223,6 @@
 				<string>(logtalk_compile)\(</string>
 				<string>(logtalk_load)\(</string>
 				<string>(forall)\(</string>
-				<string>(logtalk_version)\(</string>
 				<string>(retractall)\(</string>
 			</array>
 		</dict>
@@ -295,9 +314,9 @@
 				<string>(set_output)\(</string>
 				<string>(open)\(</string>
 				<string>(close)\(</string>
-				<string>(flush_output)</string>
+				<string>(flush_output)\(</string>
 				<string>(stream_property)\(</string>
-				<string>(at_end_of_stream)</string>
+				<string>(at_end_of_stream)\(</string>
 				<string>(set_stream_position)\(</string>
 				<!-- Character input/output -->
 				<string>(get_char)\(</string>
@@ -306,7 +325,7 @@
 				<string>(peek_code)\(</string>
 				<string>(put_char)\(</string>
 				<string>(put_code)\(</string>
-				<string>(nl)</string>
+				<string>(nl)\(</string>
 				<!-- Byte input/output -->
 				<string>(get_byte)\(</string>
 				<string>(peek_byte)\(</string>
@@ -325,7 +344,6 @@
 				<!-- Logic and control -->
 				<string>(\\\+)[[:space:]]+</string>
 				<string>(once)\(</string>
-				<string>(repeat)</string>
 				<!-- Atomic term processing -->
 				<string>(atom_length)\(</string>
 				<string>(atom_concat)\(</string>
@@ -338,7 +356,19 @@
 				<!-- Implementation defined hooks functions -->
 				<string>(set_prolog_flag)\(</string>
 				<string>(current_prolog_flag)\(</string>
-				<string>(halt)</string>
+				<string>(halt)\(</string>
+			</array>
+			<key>Plain Strings</key>
+			<array>
+				<!-- Stream selection and control -->
+				<string>flush_output</string>
+				<string>at_end_of_stream</string>
+				<!-- Character input/output -->
+				<string>nl</string>
+				<!-- Logic and control -->
+				<string>repeat</string>
+				<!-- Implementation defined hooks functions -->
+				<string>halt</string>
 			</array>
 		</dict>
 
@@ -355,10 +385,11 @@
 			<false/>
 			<key>Plain Strings</key>
 			<array>
-				<string>[0-9]+\.*[0-9]+([eE][-+][1-9][0-9]*)?</string>
+				<string>[0-9]+((\.[0-9]+)?([eE][-+][0-9]+)?)?</string>
 				<string>0b[0-1]+</string>
-				<string>0o[0-8]+</string>
+				<string>0o[0-7]+</string>
 				<string>0x[0-9a-fA-F]+</string>
+				<string>0'[0-9a-zA-Z]</string>
 			</array>
 		</dict>
 
@@ -380,23 +411,6 @@
 			</array>
 		</dict>
 
-		<dict>
-			<key>Name</key>
-			<string>Character Code Constants</string>
-			<key>Color</key>
-			<array>
-				<real>0.000</real>
-				<real>0.000</real>
-				<real>0.404</real>
-			</array>
-			<key>Multiline</key>
-			<false/>
-			<key>Regular Expressions</key>
-			<array>
-				<string>(0'[[:alnum:]])</string>
-			</array>
-		</dict>
-
 		<dict>
 			<key>Name</key>
 			<string>Single Line Comment</string>
diff --git a/Logtalk/wenv/tests/NOTES b/Logtalk/wenv/tests/NOTES
index 514fdb8f9..21cd718ad 100644
--- a/Logtalk/wenv/tests/NOTES
+++ b/Logtalk/wenv/tests/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/wenv/tests/protocol.lgt b/Logtalk/wenv/tests/protocol.lgt
index 0bc48efce..3ca214630 100644
--- a/Logtalk/wenv/tests/protocol.lgt
+++ b/Logtalk/wenv/tests/protocol.lgt
@@ -18,4 +18,33 @@ comment
 
 	:- dynamic.
 
+
+	:- public(aaa/2).
+
+	:- mode(aaa(?integer, ?integer), zero_or_one).
+
+	:- info(position/2, [
+		comment is 'Predicate brief description.',
+		argnames is ['Arg1', 'Arg2']]).
+
+
+	:- protected(bbb/2).
+
+	:- mode(bbb(+integer, -float), one).
+
+	:- info(bbb/2, [
+		comment is 'Predicate brief description.',
+		argnames is ['Arg1', 'Arg2']]).
+
+
+	:- private(ccc/2).
+	:- dynamic(ccc/2).
+
+	:- mode(ccc(@atom, ?atom), one_or_more).
+
+	:- info(ccc/2, [
+		comment is 'Predicate brief description.',
+		argnames is ['Arg1', 'Arg2']]).
+
+
 :- end_protocol.
diff --git a/Logtalk/wenv/textpad/NOTES b/Logtalk/wenv/textpad/NOTES
index df63fc4bd..25592485d 100644
--- a/Logtalk/wenv/textpad/NOTES
+++ b/Logtalk/wenv/textpad/NOTES
@@ -1,8 +1,8 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
diff --git a/Logtalk/wenv/textpad/logtalk.syn b/Logtalk/wenv/textpad/logtalk.syn
index 6da7356f3..8ef6bbeef 100644
--- a/Logtalk/wenv/textpad/logtalk.syn
+++ b/Logtalk/wenv/textpad/logtalk.syn
@@ -117,8 +117,8 @@ abolish_category
 extends_object
 extends_protocol
 implements_protocol
-instantiates_object
-specializes_object
+instantiates_class
+specializes_class
 imports_category
 abolish_events
 current_event
diff --git a/Logtalk/wenv/vim/NOTES b/Logtalk/wenv/vim/NOTES
index 22b1e6ebe..50ec418ea 100644
--- a/Logtalk/wenv/vim/NOTES
+++ b/Logtalk/wenv/vim/NOTES
@@ -1,23 +1,27 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
 This directory contains a file that provides syntax highlighting 
-for editing Logtalk source files with the text editor Vim 6.1
-(http://www.vim.org).
+for editing Logtalk source files with the text editor VIM 6.1 or 
+later version (http://www.vim.org).
 
-
-To install:
+Recent versions of VIM already contain support for Logtalk. However, 
+this directory may contain an updated syntax file. If that is the 
+case, install the syntax file by performing the following steps:
 
 1.	Copy the file logtalk.vim to the "syntax" sub-directory in your 
 	VIM installation directory.
 
-2.	Add the following entry to the "filetype.vim" configuration 
-	file (if not present):
+2.	Add the following entries to the "filetype.vim" configuration 
+	file (only if not already present):
 
-" Logtalk
+" Logtalk source files
 au BufNewFile,BufRead *.lgt                     setf logtalk
+
+" Logtalk source file loader
+au BufNewFile,BufRead *.loader                  setf logtalk
diff --git a/Logtalk/wenv/vim/logtalk.vim b/Logtalk/wenv/vim/logtalk.vim
index 2e183be0e..c795e8ecf 100644
--- a/Logtalk/wenv/vim/logtalk.vim
+++ b/Logtalk/wenv/vim/logtalk.vim
@@ -2,7 +2,7 @@
 "
 " Language:	Logtalk
 " Maintainer:	Paulo Moura <pmoura@logtalk.org>
-" Last Change:	2003 July 7
+" Last Change:	2004 February 2
 
 
 " Quit when a syntax file was already loaded:
@@ -19,6 +19,11 @@ endif
 syn case match
 
 
+" Logtalk variables
+
+syn match   logtalkVariable		"\<\(\u\|_\)\(\w\)*\>"
+
+
 " Logtalk clause functor
 
 syn match	logtalkOperator		":-"
@@ -27,12 +32,7 @@ syn match	logtalkOperator		":-"
 " Logtalk quoted atoms and strings
 
 syn region	logtalkString		start=+"+	skip=+\\"+	end=+"+
-syn region	logtalkAtom			start=+'+	skip=+\\'+	end=+'+
-
-
-" Logtalk character code constants
-
-syn match	logtalkNumber		"0'"
+syn region	logtalkAtom		start=+'+	skip=+\\'+	end=+'+
 
 
 " Logtalk message sending operators
@@ -43,7 +43,7 @@ syn match	logtalkOperator		"\^\^"
 
 " Logtalk external call
 
-syn region	logtalkExtCall			matchgroup=logtalkExtCallTag		start="{"		matchgroup=logtalkExtCallTag		end="}"		contains=ALL
+syn region	logtalkExtCall		matchgroup=logtalkExtCallTag		start="{"		matchgroup=logtalkExtCallTag		end="}"		contains=ALL
 
 
 " Logtalk opening entity directives
@@ -65,8 +65,8 @@ syn match	logtalkCloseEntityDir	":- end_category\."
 syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="instantiates("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity		contained
 syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="specializes("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity		contained
 syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="extends("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity		contained
-syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="imports("		matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity		contained
-syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="implements("		matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity		contained
+syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="imports("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity		contained
+syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="implements("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity		contained
 
 
 " Logtalk directives
@@ -88,69 +88,69 @@ syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- uses("		matchgroup=log
 
 " Logtalk built-in predicates
 
-syn keyword	logtalkBuiltIn		current_object
-syn keyword	logtalkBuiltIn		current_protocol
-syn keyword	logtalkBuiltIn		current_category
+syn match	logtalkBuiltIn		"\<current_object\ze("
+syn match	logtalkBuiltIn		"\<current_protocol\ze("
+syn match	logtalkBuiltIn		"\<current_category\ze("
 
-syn keyword	logtalkBuiltIn		create_object
-syn keyword	logtalkBuiltIn		create_protocol
-syn keyword	logtalkBuiltIn		create_category
+syn match	logtalkBuiltIn		"\<create_object\ze("
+syn match	logtalkBuiltIn		"\<create_protocol\ze("
+syn match	logtalkBuiltIn		"\<create_category\ze("
 
-syn keyword	logtalkBuiltIn		object_property
-syn keyword	logtalkBuiltIn		protocol_property
-syn keyword	logtalkBuiltIn		category_property
+syn match	logtalkBuiltIn		"\<object_property\ze("
+syn match	logtalkBuiltIn		"\<protocol_property\ze("
+syn match	logtalkBuiltIn		"\<category_property\ze("
 
-syn keyword	logtalkBuiltIn		abolish_object
-syn keyword	logtalkBuiltIn		abolish_protocol
-syn keyword	logtalkBuiltIn		abolish_category
+syn match	logtalkBuiltIn		"\<abolish_object\ze("
+syn match	logtalkBuiltIn		"\<abolish_protocol\ze("
+syn match	logtalkBuiltIn		"\<abolish_category\ze("
 
-syn keyword	logtalkBuiltIn		extends_object
-syn keyword	logtalkBuiltIn		extends_protocol
-syn keyword	logtalkBuiltIn		implements_protocol
-syn keyword	logtalkBuiltIn		instantiates_object
-syn keyword	logtalkBuiltIn		specializes_object
-syn keyword	logtalkBuiltIn		imports_category
+syn match	logtalkBuiltIn		"\<extends_object\ze("
+syn match	logtalkBuiltIn		"\<extends_protocol\ze("
+syn match	logtalkBuiltIn		"\<implements_protocol\ze("
+syn match	logtalkBuiltIn		"\<instantiates_class\ze("
+syn match	logtalkBuiltIn		"\<specializes_class\ze("
+syn match	logtalkBuiltIn		"\<imports_category\ze("
 
-syn keyword	logtalkBuiltIn		abolish_events
-syn keyword	logtalkBuiltIn		current_event
-syn keyword	logtalkBuiltIn		define_events
+syn match	logtalkBuiltIn		"\<abolish_events\ze("
+syn match	logtalkBuiltIn		"\<current_event\ze("
+syn match	logtalkBuiltIn		"\<define_events\ze("
 
-syn keyword	logtalkBuiltIn		current_logtalk_flag
-syn keyword	logtalkBuiltIn		set_logtalk_flag
+syn match	logtalkBuiltIn		"\<current_logtalk_flag\ze("
+syn match	logtalkBuiltIn		"\<set_logtalk_flag\ze("
 
-syn keyword	logtalkBuiltIn		logtalk_compile
-syn keyword	logtalkBuiltIn		logtalk_load
+syn match	logtalkBuiltIn		"\<logtalk_compile\ze("
+syn match	logtalkBuiltIn		"\<logtalk_load\ze("
 
-syn keyword	logtalkBuiltIn		forall
-syn keyword	logtalkBuiltIn		retractall
+syn match	logtalkBuiltIn		"\<forall\ze("
+syn match	logtalkBuiltIn		"\<retractall\ze("
 
 
 " Logtalk built-in methods
 
-syn keyword	logtalkBuiltInMethod	parameter
-syn keyword	logtalkBuiltInMethod	self
-syn keyword	logtalkBuiltInMethod	sender
-syn keyword	logtalkBuiltInMethod	this
+syn match	logtalkBuiltInMethod	"\<parameter\ze("
+syn match	logtalkBuiltInMethod	"\<self\ze("
+syn match	logtalkBuiltInMethod	"\<sender\ze("
+syn match	logtalkBuiltInMethod	"\<this\ze("
 
-syn keyword	logtalkBuiltInMethod	current_predicate
-syn keyword	logtalkBuiltInMethod	predicate_property
+syn match	logtalkBuiltInMethod	"\<current_predicate\ze("
+syn match	logtalkBuiltInMethod	"\<predicate_property\ze("
 
-syn keyword	logtalkBuiltInMethod	abolish
-syn keyword	logtalkBuiltInMethod	asserta
-syn keyword	logtalkBuiltInMethod	assertz
-syn keyword	logtalkBuiltInMethod	clause
-syn keyword	logtalkBuiltInMethod	retract
-syn keyword	logtalkBuiltInMethod	retractall
+syn match	logtalkBuiltInMethod	"\<abolish\ze("
+syn match	logtalkBuiltInMethod	"\<asserta\ze("
+syn match	logtalkBuiltInMethod	"\<assertz\ze("
+syn match	logtalkBuiltInMethod	"\<clause\ze("
+syn match	logtalkBuiltInMethod	"\<retract\ze("
+syn match	logtalkBuiltInMethod	"\<retractall\ze("
 
-syn keyword	logtalkBuiltInMethod	bagof
-syn keyword	logtalkBuiltInMethod	findall
-syn keyword	logtalkBuiltInMethod	forall
-syn keyword	logtalkBuiltInMethod	setof
+syn match	logtalkBuiltInMethod	"\<bagof\ze("
+syn match	logtalkBuiltInMethod	"\<findall\ze("
+syn match	logtalkBuiltInMethod	"\<forall\ze("
+syn match	logtalkBuiltInMethod	"\<setof\ze("
 
-syn keyword	logtalkBuiltInMethod	before
-syn keyword	logtalkBuiltInMethod	after
+syn match	logtalkBuiltInMethod	"\<before\ze("
+syn match	logtalkBuiltInMethod	"\<after\ze("
 
-syn keyword	logtalkBuiltInMethod	phrase
+syn match	logtalkBuiltInMethod	"\<phrase\ze("
 
 
 " Mode operators
@@ -161,35 +161,35 @@ syn match	logtalkOperator		"@"
 
 " Control constructs
 
-syn keyword	logtalkKeyword		true
-syn keyword	logtalkKeyword		fail
-syn keyword	logtalkKeyword		call
+syn match	logtalkKeyword		"\<true\>"
+syn match	logtalkKeyword		"\<fail\>"
+syn match	logtalkKeyword		"\<call\ze("
 syn match	logtalkOperator		"!"
 syn match	logtalkOperator		","
 syn match	logtalkOperator		";"
 syn match	logtalkOperator		"-->"
 syn match	logtalkOperator		"->"
-syn keyword	logtalkKeyword		catch
-syn keyword	logtalkKeyword		throw
+syn match	logtalkKeyword		"\<catch\ze("
+syn match	logtalkKeyword		"\<throw\ze("
 
 
 " Term unification
 
 syn match	logtalkOperator		"="
-syn keyword	logtalkKeyword		unify_with_occurs_check
+syn match	logtalkKeyword		"\<unify_with_occurs_check\ze("
 syn match	logtalkOperator		"\\="
 
 
 " Term testing
 
-syn keyword	logtalkKeyword		var
-syn keyword	logtalkKeyword		atom
-syn keyword	logtalkKeyword		integer
-syn keyword	logtalkKeyword		float
-syn keyword	logtalkKeyword		atomic
-syn keyword	logtalkKeyword		compound
-syn keyword	logtalkKeyword		nonvar
-syn keyword	logtalkKeyword		number
+syn match	logtalkKeyword		"\<var\ze("
+syn match	logtalkKeyword		"\<atom\ze("
+syn match	logtalkKeyword		"\<integer\ze("
+syn match	logtalkKeyword		"\<float\ze("
+syn match	logtalkKeyword		"\<atomic\ze("
+syn match	logtalkKeyword		"\<compound\ze("
+syn match	logtalkKeyword		"\<nonvar\ze("
+syn match	logtalkKeyword		"\<number\ze("
 
 
 " Term comparison
@@ -204,10 +204,10 @@ syn match	logtalkOperator		"@>="
 
 " Term creation and decomposition
 
-syn keyword	logtalkKeyword		functor
-syn keyword	logtalkKeyword		arg
+syn match	logtalkKeyword		"\<functor\ze("
+syn match	logtalkKeyword		"\<arg\ze("
 syn match	logtalkOperator		"=\.\."
-syn keyword	logtalkKeyword		copy_term
+syn match	logtalkKeyword		"\<copy_term\ze("
 
 
 " Arithemtic evaluation
@@ -227,74 +227,78 @@ syn match	logtalkOperator		">="
 
 " Stream selection and control
 
-syn keyword	logtalkKeyword		current_input
-syn keyword	logtalkKeyword		current_output
-syn keyword	logtalkKeyword		set_input
-syn keyword	logtalkKeyword		set_output
-syn keyword	logtalkKeyword		open
-syn keyword	logtalkKeyword		close
-syn keyword	logtalkKeyword		flush_output
-syn keyword	logtalkKeyword		stream_property
-syn keyword	logtalkKeyword		at_end_of_stream
-syn keyword	logtalkKeyword		set_stream_position
+syn match	logtalkKeyword		"\<current_input\ze("
+syn match	logtalkKeyword		"\<current_output\ze("
+syn match	logtalkKeyword		"\<set_input\ze("
+syn match	logtalkKeyword		"\<set_output\ze("
+syn match	logtalkKeyword		"\<open\ze("
+syn match	logtalkKeyword		"\<close\ze("
+syn match	logtalkKeyword		"\<flush_output\ze("
+syn match	logtalkKeyword		"\<flush_output\>"
+syn match	logtalkKeyword		"\<stream_property\ze("
+syn match	logtalkKeyword		"\<at_end_of_stream\ze("
+syn match	logtalkKeyword		"\<at_end_of_stream\>"
+syn match	logtalkKeyword		"\<set_stream_position\ze("
 
 
 " Character input/output
 
-syn keyword	logtalkKeyword		get_char
-syn keyword	logtalkKeyword		get_code
-syn keyword	logtalkKeyword		peek_char
-syn keyword	logtalkKeyword		peek_code
-syn keyword	logtalkKeyword		put_char
-syn keyword	logtalkKeyword		put_code
-syn keyword	logtalkKeyword		nl
+syn match	logtalkKeyword		"\<get_char\ze("
+syn match	logtalkKeyword		"\<get_code\ze("
+syn match	logtalkKeyword		"\<peek_char\ze("
+syn match	logtalkKeyword		"\<peek_code\ze("
+syn match	logtalkKeyword		"\<put_char\ze("
+syn match	logtalkKeyword		"\<put_code\ze("
+syn match	logtalkKeyword		"\<nl\ze("
+syn match	logtalkKeyword		"\<nl\>"
 
 
 " Byte input/output
 
-syn keyword	logtalkKeyword		get_byte
-syn keyword	logtalkKeyword		peek_byte
-syn keyword	logtalkKeyword		put_byte
+syn match	logtalkKeyword		"\<get_byte\ze("
+syn match	logtalkKeyword		"\<peek_byte\ze("
+syn match	logtalkKeyword		"\<put_byte\ze("
 
 
 " Term input/output
 
-syn keyword	logtalkKeyword		read_term
-syn keyword	logtalkKeyword		read
-syn keyword	logtalkKeyword		write_term
-syn keyword	logtalkKeyword		write
-syn keyword	logtalkKeyword		writeq
-syn keyword	logtalkKeyword		write_canonical
-syn keyword	logtalkKeyword		op
-syn keyword	logtalkKeyword		current_op
-syn keyword	logtalkKeyword		char_conversion
-syn keyword	logtalkKeyword		current_char_conversion
+syn match	logtalkKeyword		"\<read_term\ze("
+syn match	logtalkKeyword		"\<read\ze("
+syn match	logtalkKeyword		"\<write_term\ze("
+syn match	logtalkKeyword		"\<write\ze("
+syn match	logtalkKeyword		"\<writeq\ze("
+syn match	logtalkKeyword		"\<write_canonical\ze("
+syn match	logtalkKeyword		"\<op\ze("
+syn match	logtalkKeyword		"\<current_op\ze("
+syn match	logtalkKeyword		"\<char_conversion\ze("
+syn match	logtalkKeyword		"\<current_char_conversion\ze("
 
 
 " Logic and control
 
 syn match	logtalkOperator		"\\+"
-syn keyword	logtalkKeyword		once
-syn keyword	logtalkKeyword		repeat
+syn match	logtalkKeyword		"\<once\ze("
+syn match	logtalkKeyword		"\<repeat\>"
 
 
 " Atomic term processing
 
-syn keyword	logtalkKeyword		atom_length
-syn keyword	logtalkKeyword		atom_concat
-syn keyword	logtalkKeyword		sub_atom
-syn keyword	logtalkKeyword		atom_chars
-syn keyword	logtalkKeyword		atom_codes
-syn keyword	logtalkKeyword		char_code
-syn keyword	logtalkKeyword		number_chars
-syn keyword	logtalkKeyword		number_codes
+syn match	logtalkKeyword		"\<atom_length\ze("
+syn match	logtalkKeyword		"\<atom_concat\ze("
+syn match	logtalkKeyword		"\<sub_atom\ze("
+syn match	logtalkKeyword		"\<atom_chars\ze("
+syn match	logtalkKeyword		"\<atom_codes\ze("
+syn match	logtalkKeyword		"\<char_code\ze("
+syn match	logtalkKeyword		"\<number_chars\ze("
+syn match	logtalkKeyword		"\<number_codes\ze("
 
 
 " Implementation defined hooks functions
 
-syn keyword	logtalkKeyword		set_prolog_flag
-syn keyword	logtalkKeyword		current_prolog_flag
-syn keyword	logtalkKeyword		halt
+syn match	logtalkKeyword		"\<set_prolog_flag\ze("
+syn match	logtalkKeyword		"\<current_prolog_flag\ze("
+syn match	logtalkKeyword		"\<halt\ze("
+syn match	logtalkKeyword		"\<halt\>"
 
 
 " Evaluable functors
@@ -304,28 +308,30 @@ syn match	logtalkOperator		"-"
 syn match	logtalkOperator		"\*"
 syn match	logtalkOperator		"//"
 syn match	logtalkOperator		"/"
-syn keyword	logtalkKeyword		rem
-syn keyword	logtalkKeyword		mod
-syn keyword	logtalkKeyword		abs
-syn keyword	logtalkKeyword		sign
-syn keyword	logtalkKeyword		float_integer_part
-syn keyword	logtalkKeyword		float_fractional_part
-syn keyword	logtalkKeyword		float
-syn keyword	logtalkKeyword		floor
-syn keyword	logtalkKeyword		truncate
-syn keyword	logtalkKeyword		round
-syn keyword	logtalkKeyword		ceiling
+syn match	logtalkKeyword		"\<rem(?=[(])"
+syn match	logtalkKeyword		"\<rem\>"
+syn match	logtalkKeyword		"\<mod\ze("
+syn match	logtalkKeyword		"\<mod\>"
+syn match	logtalkKeyword		"\<abs\ze("
+syn match	logtalkKeyword		"\<sign\ze("
+syn match	logtalkKeyword		"\<float_integer_part\ze("
+syn match	logtalkKeyword		"\<float_fractional_part\ze("
+syn match	logtalkKeyword		"\<float\ze("
+syn match	logtalkKeyword		"\<floor\ze("
+syn match	logtalkKeyword		"\<truncate\ze("
+syn match	logtalkKeyword		"\<round\ze("
+syn match	logtalkKeyword		"\<ceiling\ze("
 
 
 " Other arithemtic functors
 
 syn match	logtalkOperator		"\*\*"
-syn keyword	logtalkKeyword		sin
-syn keyword	logtalkKeyword		cos
-syn keyword	logtalkKeyword		atan
-syn keyword	logtalkKeyword		exp
-syn keyword	logtalkKeyword		log
-syn keyword	logtalkKeyword		sqrt
+syn match	logtalkKeyword		"\<sin\ze("
+syn match	logtalkKeyword		"\<cos\ze("
+syn match	logtalkKeyword		"\<atan\ze("
+syn match	logtalkKeyword		"\<exp\ze("
+syn match	logtalkKeyword		"\<log\ze("
+syn match	logtalkKeyword		"\<sqrt\ze("
 
 
 " Bitwise functors
@@ -353,6 +359,17 @@ syn region	logtalkBlockComment	start="/\*"	end="\*/"
 syn match	logtalkLineComment	"%.*"
 
 
+" Logtalk numbers 
+
+syn match	logtalkNumber		"\<[0-9]\+\>"
+syn match	logtalkNumber		"\<[0-9]\+\.[0-9]\+\>"
+syn match	logtalkNumber		"\<[0-9]\+\.[0-9]\+[eE][-+][0-9]+\>"
+syn match	logtalkNumber		"\<0'[0-9a-zA-Z]\>"
+syn match	logtalkNumber		"\<0b[0-1]\+\>"
+syn match	logtalkNumber		"\<0o[0-7]\+\>"
+syn match	logtalkNumber		"\<0x[0-9a-fA-F]\+\>"
+
+
 syn sync ccomment maxlines=50
 
 
@@ -368,36 +385,38 @@ if version >= 508 || !exists("did_logtalk_syn_inits")
 		command -nargs=+ HiLink hi def link <args>
 	endif
 	
-	HiLink	logtalkBlockComment		Comment
-	HiLink	logtalkLineComment		Comment
+	HiLink	logtalkBlockComment	Comment
+	HiLink	logtalkLineComment	Comment
 
 	HiLink	logtalkOpenEntityDir	Normal
-	HiLink	logtalkOpenEntityDirTag	Statement
+	HiLink	logtalkOpenEntityDirTag	PreProc
 
-	HiLink	logtalkEntity			Normal
+	HiLink	logtalkEntity		Normal
 
-	HiLink	logtalkEntityRel		Normal
-	HiLink	logtalkEntityRelTag		Statement
+	HiLink	logtalkEntityRel	Normal
+	HiLink	logtalkEntityRelTag	PreProc
 
-	HiLink	logtalkCloseEntityDir	Statement
+	HiLink	logtalkCloseEntityDir	PreProc
 
-	HiLink	logtalkDir				Normal
-	HiLink	logtalkDirTag			Statement
+	HiLink	logtalkDir		Normal
+	HiLink	logtalkDirTag		PreProc
 
-	HiLink	logtalkAtom				String
-	HiLink	logtalkString			String
+	HiLink	logtalkAtom		String
+	HiLink	logtalkString		String
 
-	HiLink	logtalkNumber			Normal
+	HiLink	logtalkNumber		Number
 
-	HiLink	logtalkKeyword			Keyword
+	HiLink	logtalkKeyword		Keyword
 
-	HiLink	logtalkBuiltIn			Keyword
+	HiLink	logtalkBuiltIn		Keyword
 	HiLink	logtalkBuiltInMethod	Keyword
 
-	HiLink	logtalkOperator			Operator
+	HiLink	logtalkOperator		Operator
 
-	HiLink	logtalkExtCall			Normal
-	HiLink	logtalkExtCallTag		Operator
+	HiLink	logtalkExtCall		Normal
+	HiLink	logtalkExtCallTag	Operator
+
+	HiLink	logtalkVariable		Identifier
 
 	delcommand HiLink
 
@@ -406,4 +425,4 @@ endif
 
 let b:current_syntax = "logtalk"
 
-set ts=4
+setlocal ts=4
diff --git a/Logtalk/wenv/xcode/Logtalk Application/NOTES b/Logtalk/wenv/xcode/Logtalk Application/NOTES
new file mode 100644
index 000000000..ec840bbd7
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk Application/NOTES	
@@ -0,0 +1,8 @@
+=================================================================
+ÇPROJECTNAMEÈ
+Release 1.0
+
+Copyright (c) ÇYEARÈ ÇORGANIZATIONNAMEÈ.  All Rights Reserved.
+=================================================================
+
+Description of ÇPROJECTNAMEÈ Logtalk application
\ No newline at end of file
diff --git a/Logtalk/wenv/xcode/Logtalk Application/SCRIPT b/Logtalk/wenv/xcode/Logtalk Application/SCRIPT
new file mode 100644
index 000000000..3774a1a27
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk Application/SCRIPT	
@@ -0,0 +1,8 @@
+=================================================================
+ÇPROJECTNAMEÈ
+Release 1.0
+
+Copyright (c) ÇYEARÈ ÇORGANIZATIONNAMEÈ.  All Rights Reserved.
+=================================================================
+
+% sample script for testing/running ÇPROJECTNAMEÈ Logtalk application
diff --git a/Logtalk/wenv/xcode/Logtalk Application/logtalk.loader b/Logtalk/wenv/xcode/Logtalk Application/logtalk.loader
new file mode 100644
index 000000000..c14b8fd3c
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk Application/logtalk.loader	
@@ -0,0 +1,6 @@
+
+:- initialization(
+	logtalk_load([
+		your file,                % description
+		another file              % description
+		])).
diff --git a/Logtalk/wenv/xcode/Logtalk Application/logtalk.xcode/TemplateInfo.plist b/Logtalk/wenv/xcode/Logtalk Application/logtalk.xcode/TemplateInfo.plist
new file mode 100644
index 000000000..3df9e8921
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk Application/logtalk.xcode/TemplateInfo.plist	
@@ -0,0 +1,10 @@
+{
+	FilesToRename = {
+		"logtalk.loader" = "«PROJECTNAMEASIDENTIFIER».loader";
+	};
+    FilesToMacroExpand = (
+		NOTES,
+		SCRIPT
+	);
+	Description = "This project defines a Logtalk application.";
+}
diff --git a/Logtalk/wenv/xcode/Logtalk Application/logtalk.xcode/pmoura.pbxuser b/Logtalk/wenv/xcode/Logtalk Application/logtalk.xcode/pmoura.pbxuser
new file mode 100644
index 000000000..442d4902a
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk Application/logtalk.xcode/pmoura.pbxuser	
@@ -0,0 +1,442 @@
+// !$*UTF8*$!
+{
+	AD25192405ACEA45001855A0 = {
+		activeBuildStyle = AD25192205ACEA45001855A0;
+		addToTargets = (
+		);
+		codeSenseManager = AD25192605ACEA45001855A0;
+		perUserDictionary = {
+			PBXConfiguration.PBXFileTableDataSource3.PBXErrorsWarningsDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXErrorsWarningsDataSource_LocationID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					20,
+					301.8799,
+					173.2085,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXErrorsWarningsDataSource_TypeID,
+					PBXErrorsWarningsDataSource_MessageID,
+					PBXErrorsWarningsDataSource_LocationID,
+				);
+			};
+			PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					22,
+					476.7974,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXExecutablesDataSource_ActiveFlagID,
+					PBXExecutablesDataSource_NameID,
+				);
+			};
+			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					20,
+					279,
+					20,
+					54,
+					43,
+					43,
+					20,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXFileDataSource_FiletypeID,
+					PBXFileDataSource_Filename_ColumnID,
+					PBXFileDataSource_Built_ColumnID,
+					PBXFileDataSource_ObjectSize_ColumnID,
+					PBXFileDataSource_Errors_ColumnID,
+					PBXFileDataSource_Warnings_ColumnID,
+					PBXFileDataSource_Target_ColumnID,
+				);
+			};
+			PBXConfiguration.PBXFileTableDataSource3.PBXSymbolsDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXSymbolsDataSource_SymbolNameID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					16,
+					147.8008,
+					175.0356,
+					152.2085,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXSymbolsDataSource_SymbolTypeIconID,
+					PBXSymbolsDataSource_SymbolNameID,
+					PBXSymbolsDataSource_SymbolTypeID,
+					PBXSymbolsDataSource_ReferenceNameID,
+				);
+			};
+			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
+				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
+				PBXFileTableDataSourceColumnWidthsKey = (
+					20,
+					241,
+					56,
+					20,
+					56,
+					43,
+					43,
+				);
+				PBXFileTableDataSourceColumnsKey = (
+					PBXFileDataSource_FiletypeID,
+					PBXFileDataSource_Filename_ColumnID,
+					PBXTargetDataSource_PrimaryAttribute,
+					PBXFileDataSource_Built_ColumnID,
+					PBXFileDataSource_ObjectSize_ColumnID,
+					PBXFileDataSource_Errors_ColumnID,
+					PBXFileDataSource_Warnings_ColumnID,
+				);
+			};
+			PBXPerProjectTemplateStateSaveDate = 95385188;
+			PBXPrepackagedSmartGroups_v2 = (
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					activationKey = OldTargetSmartGroup;
+					clz = PBXTargetSmartGroup;
+					description = "Displays all targets of the project.";
+					globalID = 1C37FABC04509CD000000102;
+					name = Targets;
+					preferences = {
+						image = Targets;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXTargetSmartGroup2;
+					description = "Displays all targets of the project as well as nested build phases.";
+					globalID = 1C37FBAC04509CD000000102;
+					name = Targets;
+					preferences = {
+						image = Targets;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXExecutablesSmartGroup;
+					description = "Displays all executables of the project.";
+					globalID = 1C37FAAC04509CD000000102;
+					name = Executables;
+					preferences = {
+						image = Executable;
+					};
+				},
+				{
+					" PBXTransientLocationAtTop " = bottom;
+					absolutePathToBundle = "";
+					clz = PBXErrorsWarningsSmartGroup;
+					description = "Displays files with errors or warnings.";
+					globalID = 1C08E77C0454961000C914BD;
+					name = "Errors and Warnings";
+					preferences = {
+						fnmatch = "";
+						image = WarningsErrors;
+						recursive = 1;
+						regex = "";
+						root = "<PROJECT>";
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+					globalID = 1CC0EA4004350EF90044410B;
+					name = "Implementation Files";
+					preferences = {
+						canSave = 1;
+						fnmatch = "";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "?*\\.[mcMC]";
+						root = "<PROJECT>";
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "This group displays Interface Builder NIB Files.";
+					globalID = 1CC0EA4004350EF90041110B;
+					name = "NIB Files";
+					preferences = {
+						canSave = 1;
+						fnmatch = "*.nib";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "";
+						root = "<PROJECT>";
+					};
+				},
+				{
+					PBXTransientLocationAtTop = no;
+					absolutePathToBundle = "";
+					clz = PBXFindSmartGroup;
+					description = "Displays Find Results.";
+					globalID = 1C37FABC05509CD000000102;
+					name = "Find Results";
+					preferences = {
+						image = spyglass;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = no;
+					absolutePathToBundle = "";
+					clz = PBXBookmarksSmartGroup;
+					description = "Displays Project Bookmarks.";
+					globalID = 1C37FABC05539CD112110102;
+					name = Bookmarks;
+					preferences = {
+						image = Bookmarks;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = XCSCMSmartGroup;
+					description = "Displays files with interesting SCM status.";
+					globalID = E2644B35053B69B200211256;
+					name = SCM;
+					preferences = {
+						image = PBXRepository;
+						isLeaf = 0;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXSymbolsSmartGroup;
+					description = "Displays all symbols for the project.";
+					globalID = 1C37FABC04509CD000100104;
+					name = "Project Symbols";
+					preferences = {
+						image = ProjectSymbols;
+						isLeaf = 1;
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+					globalID = PBXTemplateMarker;
+					name = "Simple Filter SmartGroup";
+					preferences = {
+						canSave = 1;
+						fnmatch = "*.nib";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "";
+						root = "<PROJECT>";
+					};
+				},
+				{
+					PBXTransientLocationAtTop = bottom;
+					absolutePathToBundle = "";
+					clz = PBXFilenameSmartGroup;
+					description = "Filters items in a given group (potentially recursively) based on matching the name with the regular expression of the filter.";
+					globalID = PBXTemplateMarker;
+					name = "Simple Regular Expression SmartGroup";
+					preferences = {
+						canSave = 1;
+						fnmatch = "";
+						image = SmartFolder;
+						isLeaf = 0;
+						recursive = 1;
+						regex = "?*\\.[mcMC]";
+						root = "<PROJECT>";
+					};
+				},
+			);
+			PBXWorkspaceContents = (
+				{
+					PBXProjectWorkspaceModule_StateKey_Rev39 = {
+						PBXProjectWorkspaceModule_DataSourceSelectionKey_Rev6 = {
+							BoundsStr = "{{0, 0}, {507, 458}}";
+							Rows = (
+								0,
+							);
+							VisibleRectStr = "{{0, 0}, {507, 458}}";
+						};
+						PBXProjectWorkspaceModule_EditorOpen = false;
+						PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
+							PBXSplitModuleInNavigatorKey = {
+								SplitCount = 1;
+							};
+						};
+						PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+							PBXProjectWorkspaceModule_SGTM_Geometry = {
+								_collapsingFrameDimension = 0;
+								_indexOfCollapsedView = 0;
+								_percentageOfCollapsedView = 0;
+								sizes = (
+									"{{0, 0}, {290, 475}}",
+									"{{290, 0}, {522, 475}}",
+								);
+							};
+						};
+						PBXProjectWorkspaceModule_OldDetailFrame = "{{0, 0}, {522, 475}}";
+						PBXProjectWorkspaceModule_OldEditorFrame = "{{0, 0}, {750, 480}}";
+						PBXProjectWorkspaceModule_OldSuperviewFrame = "{{290, 0}, {522, 475}}";
+						PBXProjectWorkspaceModule_SGTM = {
+							PBXBottomSmartGroupGIDs = (
+								1C37FBAC04509CD000000102,
+								1C37FAAC04509CD000000102,
+								1C08E77C0454961000C914BD,
+								1C37FABC05509CD000000102,
+								1C37FABC05539CD112110102,
+								E2644B35053B69B200211256,
+								1C37FABC04509CD000100104,
+								1CC0EA4004350EF90044410B,
+								1CC0EA4004350EF90041110B,
+							);
+							PBXSmartGroupTreeModuleColumnData = {
+								PBXSmartGroupTreeModuleColumnWidthsKey = (
+									273,
+								);
+								PBXSmartGroupTreeModuleColumnsKey_v4 = (
+									MainColumn,
+								);
+							};
+							PBXSmartGroupTreeModuleOutlineStateKey_v7 = {
+								PBXSmartGroupTreeModuleOutlineStateExpansionKey = (
+									AD25192005ACEA45001855A0,
+								);
+								PBXSmartGroupTreeModuleOutlineStateSelectionKey = (
+									(
+										0,
+									),
+								);
+								PBXSmartGroupTreeModuleOutlineStateVisibleRectKey = "{{0, 0}, {273, 457}}";
+							};
+							PBXTopSmartGroupGIDs = (
+							);
+						};
+					};
+				},
+			);
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXBuildResultsModule" = {
+			};
+			"PBXWorkspaceContents:PBXConfiguration.PBXModule.PBXProjectWorkspaceModule" = {
+				PBXProjectWorkspaceModule_StateKey_Rev39 = {
+					PBXProjectWorkspaceModule_DataSourceSelectionKey_Rev6 = {
+						BoundsStr = "{{0, 0}, {615, 458}}";
+						Rows = (
+							0,
+						);
+						VisibleRectStr = "{{0, 0}, {615, 458}}";
+					};
+					PBXProjectWorkspaceModule_EditorOpen = false;
+					PBXProjectWorkspaceModule_EmbeddedNavigatorGroup = {
+						PBXSplitModuleInNavigatorKey = {
+							SplitCount = 1;
+						};
+					};
+					PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+						PBXProjectWorkspaceModule_SGTM_Geometry = {
+							_collapsingFrameDimension = 0;
+							_indexOfCollapsedView = 0;
+							_percentageOfCollapsedView = 0;
+							sizes = (
+								"{{0, 0}, {182, 475}}",
+								"{{182, 0}, {630, 475}}",
+							);
+						};
+					};
+					PBXProjectWorkspaceModule_OldDetailFrame = "{{0, 0}, {630, 475}}";
+					PBXProjectWorkspaceModule_OldEditorFrame = "{{0, 0}, {750, 480}}";
+					PBXProjectWorkspaceModule_OldSuperviewFrame = "{{182, 0}, {630, 475}}";
+					PBXProjectWorkspaceModule_SGTM = {
+						PBXBottomSmartGroupGIDs = (
+							1C37FBAC04509CD000000102,
+							1C37FAAC04509CD000000102,
+							1C08E77C0454961000C914BD,
+							1CC0EA4004350EF90044410B,
+							1CC0EA4004350EF90041110B,
+							1C37FABC05509CD000000102,
+							1C37FABC05539CD112110102,
+							E2644B35053B69B200211256,
+							1C37FABC04509CD000100104,
+						);
+						PBXSmartGroupTreeModuleColumnData = {
+							PBXSmartGroupTreeModuleColumnWidthsKey = (
+								165,
+							);
+							PBXSmartGroupTreeModuleColumnsKey_v4 = (
+								MainColumn,
+							);
+						};
+						PBXSmartGroupTreeModuleOutlineStateKey_v7 = {
+							PBXSmartGroupTreeModuleOutlineStateExpansionKey = (
+								AD25192005ACEA45001855A0,
+							);
+							PBXSmartGroupTreeModuleOutlineStateSelectionKey = (
+								(
+									1,
+									0,
+								),
+							);
+							PBXSmartGroupTreeModuleOutlineStateVisibleRectKey = "{{0, 0}, {165, 457}}";
+						};
+						PBXTopSmartGroupGIDs = (
+						);
+					};
+				};
+			};
+			PBXWorkspaceGeometries = (
+				{
+					Frame = "{{0, 0}, {812, 475}}";
+					PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+					};
+					RubberWindowFrame = "50 229 812 517 0 0 1024 746 ";
+				},
+			);
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXBuildResultsModule" = {
+				Frame = "{{0, 0}, {480, 217}}";
+				PBXModuleWindowStatusBarHidden = YES;
+				RubberWindowFrame = "272 422 480 238 0 0 1024 746 ";
+			};
+			"PBXWorkspaceGeometries:PBXConfiguration.PBXModule.PBXProjectWorkspaceModule" = {
+				Frame = "{{0, 0}, {812, 475}}";
+				PBXProjectWorkspaceModule_GeometryKey_Rev15 = {
+				};
+				RubberWindowFrame = "50 229 812 517 0 0 1024 746 ";
+			};
+			PBXWorkspaceStateSaveDate = 95385188;
+			com.apple.ide.smrt.PBXUserSmartGroupsKey.Rev10 = <040b747970656473747265616d8103e88401408484840e4e534d757461626c654172726179008484074e534172726179008484084e534f626a65637400858401690086>;
+		};
+		sourceControlManager = AD25192505ACEA45001855A0;
+		userBuildSettings = {
+		};
+	};
+	AD25192505ACEA45001855A0 = {
+		isa = PBXSourceControlManager;
+		scmConfiguration = {
+		};
+		scmType = "";
+	};
+	AD25192605ACEA45001855A0 = {
+		indexTemplatePath = "";
+		isa = PBXCodeSenseManager;
+		usesDefaults = 1;
+		wantsCodeCompletion = 1;
+		wantsCodeCompletionAutoPopup = 0;
+		wantsCodeCompletionAutoSuggestions = 0;
+		wantsCodeCompletionCaseSensitivity = 1;
+		wantsCodeCompletionOnlyMatchingItems = 1;
+		wantsCodeCompletionParametersIncluded = 1;
+		wantsCodeCompletionPlaceholdersInserted = 1;
+		wantsCodeCompletionTabCompletes = 1;
+		wantsIndex = 1;
+	};
+}
diff --git a/Logtalk/wenv/xcode/Logtalk Application/logtalk.xcode/project.pbxproj b/Logtalk/wenv/xcode/Logtalk Application/logtalk.xcode/project.pbxproj
new file mode 100644
index 000000000..8ef206de1
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk Application/logtalk.xcode/project.pbxproj	
@@ -0,0 +1,76 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 39;
+	objects = {
+		AD25192005ACEA45001855A0 = {
+			children = (
+				ADA6FF7305AF767B0016869E,
+				ADA6FF7405AF767B0016869E,
+				AD4A3DF605ACEB7500DB6C8F,
+			);
+			isa = PBXGroup;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AD25192205ACEA45001855A0 = {
+			buildRules = (
+			);
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+			};
+			isa = PBXBuildStyle;
+			name = Development;
+		};
+		AD25192305ACEA45001855A0 = {
+			buildRules = (
+			);
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+			};
+			isa = PBXBuildStyle;
+			name = Deployment;
+		};
+		AD25192405ACEA45001855A0 = {
+			buildSettings = {
+			};
+			buildStyles = (
+				AD25192205ACEA45001855A0,
+				AD25192305ACEA45001855A0,
+			);
+			hasScannedForEncodings = 1;
+			isa = PBXProject;
+			mainGroup = AD25192005ACEA45001855A0;
+			projectDirPath = "";
+			targets = (
+			);
+		};
+		AD4A3DF605ACEB7500DB6C8F = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.logtalk.loader;
+			path = "«PROJECTNAMEASIDENTIFIER».loader";
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADA6FF7305AF767B0016869E = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = text;
+			path = NOTES;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ADA6FF7405AF767B0016869E = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = text;
+			path = SCRIPT;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+	};
+	rootObject = AD25192405ACEA45001855A0;
+}
diff --git a/Logtalk/wenv/xcode/Logtalk/Category.lgt b/Logtalk/wenv/xcode/Logtalk/Category.lgt
new file mode 100644
index 000000000..1983cc76a
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Category.lgt
@@ -0,0 +1,13 @@
+
+:- category(Category,
+	implements(Protocol)).
+
+	:- info([
+		version is 1.0,
+		author is 'ÇFULLUSERNAMEÈ',
+		date is ÇYEARÈ/02/01,
+		comment is '']).
+
+
+
+:- end_category.
diff --git a/Logtalk/wenv/xcode/Logtalk/Class.lgt b/Logtalk/wenv/xcode/Logtalk/Class.lgt
new file mode 100644
index 000000000..baea5c6fc
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Class.lgt
@@ -0,0 +1,16 @@
+
+:- object(Class,
+	implements(Protocol),
+	imports(Category),
+	instantiates(Metaclass),
+	specializes(Superclass)).
+
+	:- info([
+		version is 1.0,
+		author is 'ÇFULLUSERNAMEÈ',
+		date is ÇYEARÈ/02/01,
+		comment is '']).
+
+
+
+:- end_object.
diff --git a/Logtalk/wenv/xcode/Logtalk/Instance.lgt b/Logtalk/wenv/xcode/Logtalk/Instance.lgt
new file mode 100644
index 000000000..d368a117d
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Instance.lgt
@@ -0,0 +1,13 @@
+
+:- object(Instance,
+	instantiates(Class)).
+
+	:- info([
+		version is 1.0,
+		author is 'ÇFULLUSERNAMEÈ',
+		date is ÇYEARÈ/02/01,
+		comment is '']).
+
+
+
+:- end_object.
diff --git a/Logtalk/wenv/xcode/Logtalk/Parametric class.lgt b/Logtalk/wenv/xcode/Logtalk/Parametric class.lgt
new file mode 100644
index 000000000..7a881667f
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Parametric class.lgt	
@@ -0,0 +1,17 @@
+
+:- object(Class(),
+	implements(Protocol),
+	imports(Category),
+	instantiates(Metaclass()),
+	specializes(Superclass())).
+
+	:- info([
+		version is 1.0,
+		author is 'ÇFULLUSERNAMEÈ',
+		date is ÇYEARÈ/02/01,
+		comment is '',
+		parnames is []]).
+
+
+
+:- end_object.
diff --git a/Logtalk/wenv/xcode/Logtalk/Parametric instance.lgt b/Logtalk/wenv/xcode/Logtalk/Parametric instance.lgt
new file mode 100644
index 000000000..71b0783a9
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Parametric instance.lgt	
@@ -0,0 +1,14 @@
+
+:- object(Instance(),
+	instantiates(Class())).
+
+	:- info([
+		version is 1.0,
+		author is 'ÇFULLUSERNAMEÈ',
+		date is ÇYEARÈ/02/01,
+		comment is '',
+		parnames is []]).
+
+
+
+:- end_object.
diff --git a/Logtalk/wenv/xcode/Logtalk/Parametric prototype.lgt b/Logtalk/wenv/xcode/Logtalk/Parametric prototype.lgt
new file mode 100644
index 000000000..2eaf61e2d
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Parametric prototype.lgt	
@@ -0,0 +1,16 @@
+
+:- object(Object(),
+	implements(Protocol),
+	imports(Category),
+	extends(Parent())).
+
+	:- info([
+		version is 1.0,
+		author is 'ÇFULLUSERNAMEÈ',
+		date is ÇYEARÈ/02/01,
+		comment is '',
+		parnames is []]).
+
+
+
+:- end_object.
diff --git a/Logtalk/wenv/xcode/Logtalk/Private predicate templates.lgt b/Logtalk/wenv/xcode/Logtalk/Private predicate templates.lgt
new file mode 100644
index 000000000..343cb71ec
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Private predicate templates.lgt	
@@ -0,0 +1,35 @@
+
+	:- private(Functor/0).
+	:- mode(Functor, Solutions).
+	:- info(Functor/0, [
+		comment is '']).
+
+	:- private(Functor/1).
+	:- mode(Functor(), Solutions).
+	:- info(Functor/1, [
+		comment is '',
+		argnames is ['Arg']]).
+
+	:- private(Functor/2).
+	:- mode(Functor(, ), Solutions).
+	:- info(Functor/2, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2']]).
+
+	:- private(Functor/3).
+	:- mode(Functor(, , ), Solutions).
+	:- info(Functor/3, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2', 'Arg3']]).
+
+	:- private(Functor/4).
+	:- mode(Functor(, , , ), Solutions).
+	:- info(Functor/4, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4']]).
+
+	:- private(Functor/5).
+	:- mode(Functor(, , , , ), Solutions).
+	:- info(Functor/5, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4', 'Arg5']]).
diff --git a/Logtalk/wenv/xcode/Logtalk/Protected predicate templates.lgt b/Logtalk/wenv/xcode/Logtalk/Protected predicate templates.lgt
new file mode 100644
index 000000000..7edae6526
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Protected predicate templates.lgt	
@@ -0,0 +1,35 @@
+
+	:- protected(Functor/0).
+	:- mode(Functor, Solutions).
+	:- info(Functor/0, [
+		comment is '']).
+
+	:- protected(Functor/1).
+	:- mode(Functor(), Solutions).
+	:- info(Functor/1, [
+		comment is '',
+		argnames is ['Arg']]).
+
+	:- protected(Functor/2).
+	:- mode(Functor(, ), Solutions).
+	:- info(Functor/2, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2']]).
+
+	:- protected(Functor/3).
+	:- mode(Functor(, , ), Solutions).
+	:- info(Functor/3, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2', 'Arg3']]).
+
+	:- protected(Functor/4).
+	:- mode(Functor(, , , ), Solutions).
+	:- info(Functor/4, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4']]).
+
+	:- protected(Functor/5).
+	:- mode(Functor(, , , , ), Solutions).
+	:- info(Functor/5, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4', 'Arg5']]).
diff --git a/Logtalk/wenv/xcode/Logtalk/Protocol.lgt b/Logtalk/wenv/xcode/Logtalk/Protocol.lgt
new file mode 100644
index 000000000..3de52dec9
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Protocol.lgt
@@ -0,0 +1,12 @@
+
+:- protocol(Protocol).
+
+	:- info([
+		version is 1.0,
+		author is 'ÇFULLUSERNAMEÈ',
+		date is ÇYEARÈ/02/01,
+		comment is '']).
+
+
+
+:- end_protocol.
diff --git a/Logtalk/wenv/xcode/Logtalk/Prototype.lgt b/Logtalk/wenv/xcode/Logtalk/Prototype.lgt
new file mode 100644
index 000000000..09e5a08bb
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Prototype.lgt
@@ -0,0 +1,15 @@
+
+:- object(Object,
+	implements(Protocol),
+	imports(Category),
+	extends(Parent)).
+
+	:- info([
+		version is 1.0,
+		author is 'ÇFULLUSERNAMEÈ',
+		date is ÇYEARÈ/02/01,
+		comment is '']).
+
+
+
+:- end_object.
diff --git a/Logtalk/wenv/xcode/Logtalk/Public predicate templates.lgt b/Logtalk/wenv/xcode/Logtalk/Public predicate templates.lgt
new file mode 100644
index 000000000..adc1dd1ce
--- /dev/null
+++ b/Logtalk/wenv/xcode/Logtalk/Public predicate templates.lgt	
@@ -0,0 +1,35 @@
+
+	:- public(Functor/0).
+	:- mode(Functor, Solutions).
+	:- info(Functor/0, [
+		comment is '']).
+
+	:- public(Functor/1).
+	:- mode(Functor(), Solutions).
+	:- info(Functor/1, [
+		comment is '',
+		argnames is ['Arg']]).
+
+	:- public(Functor/2).
+	:- mode(Functor(, ), Solutions).
+	:- info(Functor/2, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2']]).
+
+	:- public(Functor/3).
+	:- mode(Functor(, , ), Solutions).
+	:- info(Functor/3, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2', 'Arg3']]).
+
+	:- public(Functor/4).
+	:- mode(Functor(, , , ), Solutions).
+	:- info(Functor/4, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4']]).
+
+	:- public(Functor/5).
+	:- mode(Functor(, , , , ), Solutions).
+	:- info(Functor/5, [
+		comment is '',
+		argnames is ['Arg1', 'Arg2', 'Arg3', 'Arg4', 'Arg5']]).
diff --git a/Logtalk/wenv/xcode/NOTES b/Logtalk/wenv/xcode/NOTES
new file mode 100644
index 000000000..f0546db2a
--- /dev/null
+++ b/Logtalk/wenv/xcode/NOTES
@@ -0,0 +1,38 @@
+=================================================================
+Logtalk - Object oriented extension to Prolog
+Release 2.15.6
+
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
+=================================================================
+
+
+This directory contains some files that provide syntax highlighting and 
+project and template files for editing Logtalk source files with MacOS X 
+Xcode 1.1 or later version.
+
+
+To install:
+
+1. Copy the files "logtalk.pbfilespec" and "logtalk.pblangspec" to the 
+directory:
+
+	~/Library/Application Support/Apple/Developer Tools/Specifications 
+
+2. Copy the directory "Logtalk" to the directory:
+ 
+	~/Library/Application Support/Apple/Developer Tools/File Templates 
+
+3. Create (if it does not exist) the directory:
+
+	~/Library/Application Support/Apple/Developer Tools/Project Templates/Logtalk
+
+and copy to it the directory Logtalk Application
+
+
+Altough the file logtalk.pblangspec provides simple syntax coloring for the 
+Logtalk language, it is recommended that you configure Xcode to use the 
+text editor SubEthaEdit as an external editor for editing Logtalk source 
+files.
+
+
+SUPPORT FOR THIS IDE IS A WORK IN PROGRESS.
diff --git a/Logtalk/wenv/xcode/logtalk.pbfilespec b/Logtalk/wenv/xcode/logtalk.pbfilespec
new file mode 100644
index 000000000..5fbd7902f
--- /dev/null
+++ b/Logtalk/wenv/xcode/logtalk.pbfilespec
@@ -0,0 +1,24 @@
+/**
+    Logtalk file type specifications
+
+    Copyright (c) 2004 Paulo Moura
+    All rights reserved.
+*/
+(
+    {
+        Identifier = sourcecode.logtalk;
+        BasedOn = sourcecode;
+        Name = "Logtalk source files";
+        Extensions = (lgt);
+        ComputerLanguage = logtalk;
+        AppliesToBuildRules = no;
+    },
+    {
+        Identifier = sourcecode.logtalk.loader;
+        BasedOn = sourcecode.logtalk;
+        Name = "Logtalk source file loader";
+        Extensions = (loader);
+        ComputerLanguage = prolog;
+        AppliesToBuildRules = no;
+    }
+)
diff --git a/Logtalk/wenv/xcode/logtalk.pblangspec b/Logtalk/wenv/xcode/logtalk.pblangspec
new file mode 100644
index 000000000..a78b853f8
--- /dev/null
+++ b/Logtalk/wenv/xcode/logtalk.pblangspec
@@ -0,0 +1,54 @@
+/**
+   Logtalk language specification.
+*/
+
+(
+{
+	Identifier = logtalk;
+  	Name = "Logtalk";
+  	Description = "Logtalk";
+  	BasedOn = c;
+  	SyntaxColoring = {
+    	CaseSensitive = YES;
+		IdentifierStartChars = "_";
+    	IdentifierChars = "_";
+    	MultiLineComment = (
+     	    ( "/*", "*/" )
+        );
+        CommentsCanBeNested = YES;
+    	SingleLineComment = ("%");
+		String = (
+	   	   	("'", "'")
+		);
+		Character = (
+                ( "'", "'" )
+         );
+    	EscapeCharacter = "\\";
+    	Keywords = (
+      		"category",
+			"end_category",
+			"end_object",
+			"end_protocol",
+			"object",
+			"protocol",
+		);
+		AltKeywords = (
+			"initialization",
+			"info",
+			"mode",
+			"dynamic",
+			"discontiguous",
+			"public",
+			"protected",
+			"private",
+			"metapredicate",
+			"op",
+			"calls",
+			"uses",					
+		);
+		PreprocessorKeywordStart = "";
+		PreprocessorKeywords = (
+		);
+  	};
+}
+)
diff --git a/Logtalk/xml/NOTES b/Logtalk/xml/NOTES
index fd2b51775..36c1273a3 100644
--- a/Logtalk/xml/NOTES
+++ b/Logtalk/xml/NOTES
@@ -1,22 +1,23 @@
 =================================================================
 Logtalk - Object oriented extension to Prolog
-Release 2.15.5
+Release 2.15.6
 
-Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 =================================================================
 
 
 This folder contains several files that enables .xml documentation files 
 created when compiling objects, categories, or protocols, to be converted 
 to PDF files, to be viewed in a web browser that supports the W3C standards 
-XML, XSLT, CSS and HTML 4, or to be converted to LateX for printing.
+XML, XSLT, CSS, and HTML 4 or XHTML 1.0, or to be converted to LateX for 
+printing.
 
 You will need to either copy your .xml files to this directory or copy
 these files to the directory where the .xml files reside.
 
-Regarding conversion to HTML, the links to the .xsl files on the .xml 
-files and the links to the .css files in the generated .html files assume 
-that all files reside in the same directory.
+Regarding conversion to HTML/XHTML, the links to the .xsl files on the 
+.xml files and the links to the .css files in the generated .html files 
+assume that all files reside in the same directory.
 
 The choice of the default .xsl file to use is made in the config files by 
 the '$lgt_default_flag'/2 predicate. You can also choose a different 
@@ -24,12 +25,14 @@ the '$lgt_default_flag'/2 predicate. You can also choose a different
 logtalk_load/2 calls. The default file is lgtxml.xsl (described below).
 
 The .xml documenting files can be either generated as standalone XML files 
-or contain a reference to the Logtalk DTD file, logtalk.dtd. The reference 
-to the logtalk.dtd file can be either a local reference or a URI reference.
-By default, all .xml documenting files contain a local reference but that 
+or contain a reference to either the Logtalk DTD file, logtalk.dtd, or to 
+the Logtalk XML Schema file, logtalk.xsd. The reference to the XML 
+specification file can be either a local reference or a URI reference. By 
+default, all .xml documenting files contain a local reference but that 
 can be changed either in the config files, by setting a Logtalk compiler 
 flag, or by using the doctype/1 compiler option. Choose the option value 
-that works best for your XSLT tools.
+that works best for your XSLT tools. To choose between the .dtd or .xsd 
+specifications use the xmlspec/1 compiler option.
 
 
 Brief description of each file in this folder:
@@ -38,8 +41,9 @@ Brief description of each file in this folder:
 lgthtml.xsl
 
 	XSLT file to output HTML files from the .xml files. The links in the
-	generated HTML files point to related HTML files. It can be used
-	to batch convert XML files to HTML files.
+	generated HTML files point to related HTML files. It can be used to 
+	batch convert XML files to HTML files. UTF-8 encoding is assumed. Edit 
+	the file if you use a different encoding.
 
 
 lgtxml.xsl
@@ -48,7 +52,16 @@ lgtxml.xsl
 	(version 0.9.2 or later) or Microsoft Internet Explorer 5.5 for Windows 
 	(after installing the latest Microsoft XML Parser Release that is needed 
 	for XSL standard compliance). The links in the (internally generated) 
-	HTML files point to related XML files.
+	HTML files point to related XML files. UTF-8 encoding is assumed. Edit 
+	the file if you use a different encoding.
+
+
+lgtxhtml.xsl
+
+	XSLT file to output XHTML 1.0 files from the .xml files. The links in 
+	the generated XHTML files point to related XHTML files. It can be used 
+	to batch convert XML files to XHTML files. UTF-8 encoding is assumed. 
+	Edit the file if you use a different encoding.
 
 
 lgtpdfa4.xsl
@@ -91,8 +104,8 @@ logtalk.xsd
 
 logtalk.css
 
-	Cascade style sheet file to render the HTML output of the .xsl files
-	in a web browser.
+	Cascade style sheet file to render the HTML/XHTML output of the .xsl 
+	files in a web browser.
 
 
 html.sh
@@ -100,9 +113,9 @@ html.sh
 	Sample Unix shell script to batch convert .xml files to .html files.
 	The script also generates an index.html file that contains links to all 
 	converted files. The title of the index.html can be given as a parameter 
-	to the script.
-	Edit the script to match your environment before running it.
-	Requires James Clarck XT processor (http://www.jclark.com/xml/xt.html).
+	to the script. Edit the script to match your environment before running 
+	it and to chose between HTML or XHTML output. Requires James Clarck XT 
+	processor (http://www.jclark.com/xml/xt.html).
 
 
 htmlnt.cmd
@@ -110,16 +123,17 @@ htmlnt.cmd
 	Sample Windows NT batch script to convert .xml files to .html files.
 	The script also generates an index.html file that contains links to all 
 	converted files. The title of the index.html can be given as a parameter 
-	to the script.
-	Edit the script to match your environment before running it.
-	Requires James Clarck XT processor (http://www.jclark.com/xml/xt.html).
+	to the script. Edit the script to match your environment before running 
+	it and to chose between HTML or XHTML output. Requires James Clarck XT 
+	processor (http://www.jclark.com/xml/xt.html).
 
 
 htmldos.bat
 
-	Sample DOS batch script to convert .xml files to .html files.
-	Edit the script to match your environment before running it.
-	Requires James Clarck XT processor (http://www.jclark.com/xml/xt.html).
+	Sample DOS batch script to convert .xml files to .html files. Edit the 
+	script to match your environment before running it and to chose between 
+	HTML or XHTML output. Requires James Clarck XT processor 
+	(http://www.jclark.com/xml/xt.html).
 
 
 pdf.sh
diff --git a/Logtalk/xml/html.sh b/Logtalk/xml/html.sh
index 2c298ac3f..5b0abd78e 100644
--- a/Logtalk/xml/html.sh
+++ b/Logtalk/xml/html.sh
@@ -3,9 +3,12 @@
 XT_PATH="/Applications/XML/XT"
 SAX_PATH="/Applications/XML/XT"
 XP_PATH="/Applications/XML/XP"
+# XT_PATH="/usr/local/XT"
+# SAX_PATH="/usr/local/XT"
+# XP_PATH="/usr/local/XP"
 
 XSLT="lgthtml.xsl"
-
+# XSLT="lgtxhtml.xsl"
 
 if [ -z "$1" ]; then
 	title="Entity documentation index"
diff --git a/Logtalk/xml/htmldos.bat b/Logtalk/xml/htmldos.bat
index 46e636981..2b19d680d 100644
--- a/Logtalk/xml/htmldos.bat
+++ b/Logtalk/xml/htmldos.bat
@@ -7,6 +7,7 @@ SET SAX_PATH=c:\xt
 SET XP_PATH=c:\xt
 
 SET XSLT="lgthtml.xsl"
+REM SET XSLT="lgtxhtml.xsl"
 
 ECHO This script converts all .xml files in the current directory to .html
 ECHO files applying the XSLT transformation defined in the $XSLT file
diff --git a/Logtalk/xml/htmlnt.cmd b/Logtalk/xml/htmlnt.cmd
index 617cd0bbb..c32eedc3e 100755
--- a/Logtalk/xml/htmlnt.cmd
+++ b/Logtalk/xml/htmlnt.cmd
@@ -7,6 +7,7 @@ SET SAX_PATH=c:\xt
 SET XP_PATH=c:\xt
 
 SET XSLT=lgthtml.xsl
+REM SET XSLT=lgtxhtml.xsl
 
 IF "%1" == "" SET INDEX_TITLE=Entity documentation index
 IF NOT "%1" == "" SET INDEX_TITLE=%1%
diff --git a/Logtalk/xml/ie50.xsl b/Logtalk/xml/ie50.xsl
index b34fb211d..c56dd6bc2 100644
--- a/Logtalk/xml/ie50.xsl
+++ b/Logtalk/xml/ie50.xsl
@@ -8,9 +8,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
-%  Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -->
diff --git a/Logtalk/xml/lgthtml.xsl b/Logtalk/xml/lgthtml.xsl
index eafecffb3..fa02978c1 100644
--- a/Logtalk/xml/lgthtml.xsl
+++ b/Logtalk/xml/lgthtml.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet
 	version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -6,6 +6,7 @@
 
 <xsl:output
 	method="html"
+    indent="yes"
 	doctype-public="-//W3C//DTD HTML 4.01//EN"
 	doctype-system="http://www.w3.org/TR/html4/strict.dtd"/>
 
@@ -14,9 +15,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
-%  Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -->
@@ -25,6 +26,7 @@
 <xsl:template match="/">
 	<html>
 	<head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		<title><xsl:value-of select="logtalk/entity/name" /></title>
 		<link rel="stylesheet" href="logtalk.css" type="text/css" />
 	</head>
diff --git a/Logtalk/xml/lgtpdfa4.xsl b/Logtalk/xml/lgtpdfa4.xsl
index 9a8643d8d..52e23a961 100644
--- a/Logtalk/xml/lgtpdfa4.xsl
+++ b/Logtalk/xml/lgtpdfa4.xsl
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet
 	version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -9,9 +9,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
-%  Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -->
diff --git a/Logtalk/xml/lgtpdfus.xsl b/Logtalk/xml/lgtpdfus.xsl
index 5b3d02851..c1910a5ac 100644
--- a/Logtalk/xml/lgtpdfus.xsl
+++ b/Logtalk/xml/lgtpdfus.xsl
@@ -1,4 +1,4 @@
-
+<?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet
 	version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -9,9 +9,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
-%  Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -->
diff --git a/Logtalk/xml/lgtxhtml.xsl b/Logtalk/xml/lgtxhtml.xsl
new file mode 100644
index 000000000..146686abc
--- /dev/null
+++ b/Logtalk/xml/lgtxhtml.xsl
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+	version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+
+<xsl:output
+	method="xml"
+    indent="yes"
+	doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+	doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+
+
+<!-- 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  Logtalk - Object oriented extension to Prolog
+%  Release 2.15.6
+%
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-->
+
+
+<xsl:template match="/">
+	<xsl:processing-instruction name="xml-stylesheet">type="text/css" href="styles.css"</xsl:processing-instruction>
+	<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+	<head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+		<title><xsl:value-of select="logtalk/entity/name" /></title>
+		<link rel="stylesheet" href="logtalk.css" type="text/css" />
+	</head>
+	<body>
+		<hr />
+		<h4 class="type"><xsl:value-of select="logtalk/entity/type" /></h4>
+		<h1 class="code"><xsl:value-of select="logtalk/entity/name" /></h1>
+		<xsl:apply-templates select="logtalk/entity" />
+		<hr />
+		<xsl:apply-templates select="logtalk/relations" />
+		<hr />
+		<xsl:apply-templates select="logtalk/predicates" />
+		<hr />
+	</body>
+	</html>
+</xsl:template>
+
+
+<xsl:template match="logtalk/entity">
+	<xsl:if test="comment">
+		<blockquote><p class="blockquote"><xsl:value-of select="comment" /></p></blockquote>
+	</xsl:if>
+	<dl>
+	<xsl:if test="author">
+		<dt>author:</dt>
+			<dd><code><xsl:value-of select="author" /></code></dd>
+	</xsl:if>
+	<xsl:if test="version">
+		<dt>version:</dt>
+			<dd><code><xsl:value-of select="version" /></code></dd>
+	</xsl:if>
+	<xsl:if test="date">
+		<dt>date:</dt>
+			<dd><code><xsl:value-of select="date" /></code></dd>
+	</xsl:if>
+	</dl>
+	<dl>
+		<dt>compilation:</dt>
+			<dd><code><xsl:value-of select="compilation" /></code></dd>
+	</dl>
+	<xsl:if test="info">
+		<dl>
+		<xsl:for-each select="info">
+			<dt><xsl:value-of select="key" />:</dt>
+				<dd><code><xsl:value-of select="value" /></code></dd>
+		</xsl:for-each>
+		</dl>
+	</xsl:if>
+</xsl:template>
+
+
+<xsl:template match="logtalk/relations">
+	<xsl:choose>
+		<xsl:when test="*">
+			<xsl:if test="implements">
+			<dl>
+			<dt>implements:</dt>
+				<xsl:apply-templates select="implements" />
+			</dl>
+			</xsl:if>
+			<xsl:if test="imports">
+			<dl>
+			<dt>imports:</dt>
+				<xsl:apply-templates select="imports" />
+			</dl>
+			</xsl:if>
+			<xsl:if test="extends">
+			<dl>
+			<dt>extends:</dt>
+				<xsl:apply-templates select="extends" />
+			</dl>
+			</xsl:if>
+			<xsl:if test="instantiates">
+			<dl>
+			<dt>instantiates:</dt>
+				<xsl:apply-templates select="instantiates" />
+			</dl>
+			</xsl:if>
+			<xsl:if test="specializes">
+			<dl>
+			<dt>specializes:</dt>
+				<xsl:apply-templates select="specializes" />
+			</dl>
+			</xsl:if>
+			<xsl:if test="uses">
+			<dl>
+			<dt>uses:</dt>
+				<xsl:apply-templates select="uses" />
+			</dl>
+			</xsl:if>
+			<xsl:if test="calls">
+			<dl>
+			<dt>calls:</dt>
+				<xsl:apply-templates select="calls" />
+			</dl>
+			</xsl:if>
+		</xsl:when>
+		<xsl:otherwise>	
+			<h4 class="code">(no dependencies on other files)</h4>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+
+<xsl:template match="logtalk/relations/uses">
+	<dd><code><a href="{file}.html"><xsl:value-of select="name" /></a></code></dd>
+</xsl:template>
+
+
+<xsl:template match="logtalk/relations/calls">
+	<dd><code><a href="{file}.html"><xsl:value-of select="name" /></a></code></dd>
+</xsl:template>
+
+
+<xsl:template match="logtalk/relations/*">
+	<dd><code><xsl:value-of select="scope" /><xsl:text> </xsl:text><a href="{file}.html"><xsl:value-of select="name" /></a></code></dd>
+</xsl:template>
+
+
+<xsl:template match="logtalk/predicates">
+	<h1>Public interface</h1>
+	<xsl:choose>
+		<xsl:when test="public/predicate">
+			<xsl:apply-templates select="public/predicate" />
+		</xsl:when>
+		<xsl:when test="/logtalk/relations/*">		
+			<h4 class="code">(see related entities)</h4>
+		</xsl:when>
+		<xsl:otherwise>
+			<h4 class="code">(none)</h4>
+		</xsl:otherwise>
+	</xsl:choose>
+	<h1>Protected interface</h1>
+	<xsl:choose>
+		<xsl:when test="protected/predicate">
+			<xsl:apply-templates select="protected/predicate" />
+		</xsl:when>
+		<xsl:when test="/logtalk/relations/*">		
+			<h4 class="code">(see related entities)</h4>
+		</xsl:when>
+		<xsl:otherwise>
+			<h4 class="code">(none)</h4>
+		</xsl:otherwise>
+	</xsl:choose>
+	<h1>Private predicates</h1>
+	<xsl:choose>
+		<xsl:when test="private/predicate">
+			<xsl:apply-templates select="private/predicate" />
+		</xsl:when>
+		<xsl:when test="/logtalk/relations/*">		
+			<h4 class="code">(see related entities)</h4>
+		</xsl:when>
+		<xsl:otherwise>
+			<h4 class="code">(none)</h4>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
+
+<xsl:template match="*/predicate">
+	<h4 class="code"><xsl:value-of select="name" /></h4>
+	<xsl:if test="comment">
+		<blockquote><p class="blockquote"><xsl:value-of select="comment" /></p></blockquote>
+	</xsl:if>
+	<dl class="predicate">
+		<dt>compilation:</dt>
+			<dd><code><xsl:value-of select="compilation" /></code></dd>
+		<xsl:if test="template">
+		<dt>template:</dt>
+			<dd><code><xsl:value-of select="template" /></code></dd>
+		</xsl:if>
+		<xsl:if test="meta">
+		<dt>metapredicate template:</dt>
+			<dd><code><xsl:value-of select="meta" /></code></dd>
+		</xsl:if>
+		<xsl:if test="mode">
+		<dt>mode - number of solutions:</dt>
+		<xsl:for-each select="mode">
+			<dd><code><xsl:value-of select="template" /><xsl:text> - </xsl:text><xsl:value-of select="solutions" /></code></dd>
+		</xsl:for-each>
+		</xsl:if>
+	</dl>
+	<xsl:if test="info">
+		<dl class="predicate">
+			<xsl:for-each select="info">
+			<dt><xsl:value-of select="key" />:</dt>
+				<dd><code><xsl:value-of select="value" /></code></dd>
+			</xsl:for-each>
+		</dl>
+	</xsl:if>
+</xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/Logtalk/xml/lgtxml.xsl b/Logtalk/xml/lgtxml.xsl
index 079c00fce..830143900 100644
--- a/Logtalk/xml/lgtxml.xsl
+++ b/Logtalk/xml/lgtxml.xsl
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet
 	version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -6,6 +6,7 @@
 
 <xsl:output
 	method="html"
+    indent="yes"
 	doctype-public="-//W3C//DTD HTML 4.01//EN"
 	doctype-system="http://www.w3.org/TR/html4/strict.dtd"/>
 
@@ -14,9 +15,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
-%  Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -->
@@ -25,6 +26,7 @@
 <xsl:template match="/">
 	<html>
 	<head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 		<title><xsl:value-of select="logtalk/entity/name" /></title>
 		<link rel="stylesheet" href="logtalk.css" type="text/css" />
 	</head>
diff --git a/Logtalk/xml/logtalk.dtd b/Logtalk/xml/logtalk.dtd
index 805009c13..ec836e31a 100644
--- a/Logtalk/xml/logtalk.dtd
+++ b/Logtalk/xml/logtalk.dtd
@@ -3,9 +3,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
-%  Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -->
diff --git a/Logtalk/xml/logtalk.xsd b/Logtalk/xml/logtalk.xsd
index 361ac2610..b098bce6a 100644
--- a/Logtalk/xml/logtalk.xsd
+++ b/Logtalk/xml/logtalk.xsd
@@ -15,9 +15,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
-%  Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -->
diff --git a/Logtalk/xml/pdf.bat b/Logtalk/xml/pdf.bat
index 94ce7d0ce..554276a11 100644
--- a/Logtalk/xml/pdf.bat
+++ b/Logtalk/xml/pdf.bat
@@ -3,6 +3,7 @@
 SET FOP_PATH=c:\Fop-0.20.5
 
 SET XSLT="lgtpdfa4.xsl"
+REM SET XSLT="lgtpdfus.xsl"
 
 ECHO This script converts all .xml files in the current directory to .pdf
 ECHO files applying the XSLT transformation defined in the $XSLT file
diff --git a/Logtalk/xml/pdf.sh b/Logtalk/xml/pdf.sh
index 27a4b9c9a..e9fe6d0ab 100644
--- a/Logtalk/xml/pdf.sh
+++ b/Logtalk/xml/pdf.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 FOP_PATH="/Applications/XML/fop-0.20.5"
+# FOP_PATH="/usr/local/fop-0.20.5"
 
 XSLT="lgtpdfa4.xsl"
 # XSLT="lgtpdfus.xsl"
diff --git a/Logtalk/xml/texml.xsl b/Logtalk/xml/texml.xsl
index c60898155..75841a7d6 100644
--- a/Logtalk/xml/texml.xsl
+++ b/Logtalk/xml/texml.xsl
@@ -12,9 +12,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
-%  Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -->
diff --git a/library/logtalk/logtalk.pl b/library/logtalk/logtalk.pl
index 0aa34704b..e99ae51de 100644
--- a/library/logtalk/logtalk.pl
+++ b/library/logtalk/logtalk.pl
@@ -2,9 +2,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
-%  Copyright (c) 1998-2003 Paulo Moura.  All Rights Reserved.
+%  Copyright (c) 1998-2004 Paulo Moura.  All Rights Reserved.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1070,10 +1070,10 @@ current_logtalk_flag(Flag, Value) :-
 	'$lgt_flag_'(Flag, Value).
 
 current_logtalk_flag(Flag, Value) :-
-	\+ '$lgt_flag_'(Flag, _),
-	'$lgt_default_flag'(Flag, Value).
+	'$lgt_default_flag'(Flag, Value),
+	\+ '$lgt_flag_'(Flag, _).
 
-current_logtalk_flag(version, version(2, 15, 5)).
+current_logtalk_flag(version, version(2, 15, 6)).
 
 
 
@@ -2113,7 +2113,7 @@ user0__def(Pred, _, _, _, Pred, user).
 		'$lgt_compiler_error_handler'(Stream, Error)),
 	catch(
 		(read_term(Stream, Term, [singletons(Singletons1)]),
-		 '$lgt_filter_named_anonymous_vars'(Singletons1, Singletons2),
+		 '$lgt_filter_dont_care_vars'(Singletons1, Singletons2),
 		 '$lgt_report_singletons'(Singletons2, Term),
 		 '$lgt_tr_file'(Stream, Term)),
 		Error,
@@ -2135,31 +2135,32 @@ user0__def(Pred, _, _, _, Pred, user).
 '$lgt_tr_file'(Stream, Term) :-
 	'$lgt_tr_term'(Term),
 	read_term(Stream, Next, [singletons(Singletons1)]),
-	'$lgt_filter_named_anonymous_vars'(Singletons1, Singletons2),
+	'$lgt_filter_dont_care_vars'(Singletons1, Singletons2),
 	'$lgt_report_singletons'(Singletons2, Next),
 	'$lgt_tr_file'(Stream, Next).
 
 
 
-% '$lgt_filter_named_anonymous_vars'(+list, -list)
+% '$lgt_filter_dont_care_vars'(+list, -list)
 %
-% filter named anonymous varaibles from a singletons list
-% if the corresponding compiler option is enabled
+% filter variables whose name start with an underscore from a
+% singletons list if the corresponding compiler option sets their
+% interpretation to don't care variables
 
-'$lgt_filter_named_anonymous_vars'(List, Result) :-
-	'$lgt_compiler_option'(named_anonymous_vars, on) ->
-		'$lgt_filter_named_anonymous_vars'(List, [], Result)
+'$lgt_filter_dont_care_vars'(List, Result) :-
+	'$lgt_compiler_option'(underscore_vars, dont_care) ->
+		'$lgt_filter_dont_care_vars'(List, [], Result)
 		;
 		List = Result.
 
 
-'$lgt_filter_named_anonymous_vars'([], Result, Result).
+'$lgt_filter_dont_care_vars'([], Result, Result).
 
-'$lgt_filter_named_anonymous_vars'([Atom = Var| List], Sofar, Result) :-
+'$lgt_filter_dont_care_vars'([Atom = Var| List], Sofar, Result) :-
 	sub_atom(Atom, 0, 1, _, '_') ->
-		'$lgt_filter_named_anonymous_vars'(List, Sofar, Result)
+		'$lgt_filter_dont_care_vars'(List, Sofar, Result)
 		;
-		'$lgt_filter_named_anonymous_vars'(List, [Atom = Var| Sofar], Result).
+		'$lgt_filter_dont_care_vars'(List, [Atom = Var| Sofar], Result).
 
 
 
@@ -5460,8 +5461,8 @@ user0__def(Pred, _, _, _, Pred, user).
 '$lgt_valid_compiler_option'(smart_compilation(Option)) :-
 	once((Option == on; Option == off)).
 
-'$lgt_valid_compiler_option'(named_anonymous_vars(Option)) :-
-	once((Option == on; Option == off)).
+'$lgt_valid_compiler_option'(underscore_vars(Option)) :-
+	once((Option == dont_care; Option == singletons)).
 
 '$lgt_valid_compiler_option'(code_prefix(Prefix)) :-
 	atom(Prefix).
@@ -5469,6 +5470,9 @@ user0__def(Pred, _, _, _, Pred, user).
 '$lgt_valid_compiler_option'(doctype(Option)) :-
 	once((Option == standalone; Option == (local); Option == web)).
 
+'$lgt_valid_compiler_option'(xmlspec(Option)) :-
+	once((Option == dtd; Option == xsd)).
+
 
 
 % '$lgt_valid_flag'(@nonvar)
@@ -5478,6 +5482,8 @@ user0__def(Pred, _, _, _, Pred, user).
 '$lgt_valid_flag'(iso_initialization_dir).
 '$lgt_valid_flag'(xml).
 '$lgt_valid_flag'(xsl).
+'$lgt_valid_flag'(xmlspec).
+'$lgt_valid_flag'(doctype).
 '$lgt_valid_flag'(unknown).
 '$lgt_valid_flag'(singletons).
 '$lgt_valid_flag'(misspelt).
@@ -5488,9 +5494,8 @@ user0__def(Pred, _, _, _, Pred, user).
 '$lgt_valid_flag'(smart_compilation).
 '$lgt_valid_flag'(startup_message).
 '$lgt_valid_flag'(version).
-'$lgt_valid_flag'(named_anonymous_vars).
+'$lgt_valid_flag'(underscore_vars).
 '$lgt_valid_flag'(code_prefix).
-'$lgt_valid_flag'(doctype).
 
 
 
@@ -5801,30 +5806,33 @@ user0__def(Pred, _, _, _, Pred, user).
 
 
 '$lgt_write_xml_header'(Stream) :-
+	'$lgt_compiler_option'(xmlspec, XMLSpec),
 	'$lgt_compiler_option'(doctype, Doctype),
-	'$lgt_write_xml_header'(Doctype, Stream).
+	'$lgt_write_xml_header'(Doctype, XMLSpec, Stream).
 
 
 
-'$lgt_write_xml_header'(local, Stream) :-
-	'$lgt_write_xml_open_tag'(Stream, '?xml version="1.0"?', []),
-	write(Stream, '<!DOCTYPE logtalk SYSTEM "logtalk.dtd">'), nl(Stream),
+'$lgt_write_xml_header'(local, XMLSpec, Stream) :-
+	'$lgt_write_xml_open_tag'(Stream, '?xml version="1.0" standalone="no"?', []),
+	write(Stream, '<!DOCTYPE logtalk SYSTEM "logtalk.'),
+	write(Stream, XMLSpec), write(Stream, '">'), nl(Stream),
 	'$lgt_compiler_option'(xsl, XSL),
 	write(Stream, '<?xml-stylesheet type="text/xsl" href="'),
 	write(Stream, XSL),
 	write(Stream, '"?>'), nl(Stream),
 	'$lgt_write_xml_open_tag'(Stream, logtalk, []).
 
-'$lgt_write_xml_header'(web, Stream) :-
-	'$lgt_write_xml_open_tag'(Stream, '?xml version="1.0"?', []),
-	write(Stream, '<!DOCTYPE logtalk SYSTEM "http://www.logtalk.org/xml/1.0/logtalk.dtd">'), nl(Stream),
+'$lgt_write_xml_header'(web, XMLSpec, Stream) :-
+	'$lgt_write_xml_open_tag'(Stream, '?xml version="1.0" standalone="no"?', []),
+	write(Stream, '<!DOCTYPE logtalk SYSTEM "http://www.logtalk.org/xml/1.0/logtalk.'),
+	write(Stream, XMLSpec), write(Stream, '">'), nl(Stream),
 	'$lgt_compiler_option'(xsl, XSL),
 	write(Stream, '<?xml-stylesheet type="text/xsl" href="'),
 	write(Stream, XSL),
 	write(Stream, '"?>'), nl(Stream),
 	'$lgt_write_xml_open_tag'(Stream, logtalk, []).
 
-'$lgt_write_xml_header'(standalone, Stream) :-
+'$lgt_write_xml_header'(standalone, _, Stream) :-
 	'$lgt_write_xml_open_tag'(Stream, '?xml version="1.0" standalone="yes"?', []),
 	'$lgt_compiler_option'(xsl, XSL),
 	write(Stream, '<?xml-stylesheet type="text/xsl" href="'),
@@ -6342,7 +6350,7 @@ user0__def(Pred, _, _, _, Pred, user).
 '$lgt_banner' :-
 	current_logtalk_flag(version, version(Major, Minor, Patch)),
 	nl, write('Logtalk '), write(Major), write('.'), write(Minor), write('.'), write(Patch), nl,
-	write('Copyright (c) 1998-2003 Paulo Moura'), nl, nl.
+	write('Copyright (c) 1998-2004 Paulo Moura'), nl, nl.
 
 
 
@@ -6352,8 +6360,10 @@ user0__def(Pred, _, _, _, Pred, user).
 	write('  ISO initialization/1 directive (iso_initialization_dir): '), write(ISO), nl,
 	'$lgt_default_flag'(xml, XML),
 	write('  XML documenting files (xml):                             '), write(XML), nl,
+	'$lgt_default_flag'(xmlspec, XMLSpec),
+	write('  XML specification file extension (xmlspec):              '), write(XMLSpec), nl,
 	'$lgt_default_flag'(doctype, Doctype),
-	write('  XML doctype reference (doctype):                         '), write(Doctype), nl,
+	write('  XML specification file location (doctype):               '), write(Doctype), nl,
 	'$lgt_default_flag'(xsl, XSL),
 	write('  XSL stylesheet (xsl):                                    '), write(XSL), nl,
 	'$lgt_default_flag'(unknown, Unknown),
@@ -6370,8 +6380,8 @@ user0__def(Pred, _, _, _, Pred, user).
 	write('  Non portable calls (portability):                        '), write(Portability), nl,
 	'$lgt_default_flag'(report, Report),
 	write('  Compilation report (report):                             '), write(Report), nl,
-	'$lgt_default_flag'(named_anonymous_vars, Named),
-	write('  Named anonymous variables (named_anonymous_vars):        '), write(Named), nl,
+	'$lgt_default_flag'(underscore_vars, Underscore),
+	write('  Underscore variables (underscore_vars):                  '), write(Underscore), nl,
 	'$lgt_default_flag'(code_prefix, Code),
 	write('  Compiled code functors prefix (code_prefix):             '), writeq(Code), nl,
 	'$lgt_default_flag'(smart_compilation, Smart),
diff --git a/library/logtalk/yap430.config b/library/logtalk/yap430.config
index 30dd83140..4f9d5c5b7 100644
--- a/library/logtalk/yap430.config
+++ b/library/logtalk/yap430.config
@@ -1,11 +1,11 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  Logtalk - Object oriented extension to Prolog
-%  Release 2.15.5
+%  Release 2.15.6
 %
 %  configuration file for YAP Prolog 4.3.23 or later
 %
-%  last updated: March 20, 2003
+%  last updated: February 5, 2004
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -196,6 +196,7 @@ forall(Generate, Test) :-
 
 '$lgt_default_flag'(xml, on).
 '$lgt_default_flag'(xsl, 'lgtxml.xsl').
+'$lgt_default_flag'(xmlspec, dtd).
 '$lgt_default_flag'(doctype, local).
 
 '$lgt_default_flag'(unknown, warning).
@@ -211,7 +212,7 @@ forall(Generate, Test) :-
 
 '$lgt_default_flag'(startup_message, on).
 
-'$lgt_default_flag'(named_anonymous_vars, off).
+'$lgt_default_flag'(underscore_vars, singletons).
 
 '$lgt_default_flag'(code_prefix, '').