Changed the name 'guid seed' to 'master guid' which sounds a bit better to me. Added preliminary documentation.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-jezabek@10754 626c5289-ae23-0410-ae9c-e8d60b6d4f22
author: Jan Jezabek <jezabek@poczta.onet.pl> 2008-08-12 14:51:58 +0000
committer: Jan Jezabek <jezabek@poczta.onet.pl> 2008-08-12 14:51:58 +0000
commit: e7e337ed1302dca96279c1449cbe568820511c07 (patch)
tree: eddd5dea5a30a3635dd3b6dfc928a033aac6e80a
parent: a85254e3476e2de7f1ec6e45d6bbf49bd609cf9c (diff)
download: swig-e7e337ed1302dca96279c1449cbe568820511c07.tar.gz
22 files changed, 1959 insertions, 661 deletions
diff --git a/Doc/Manual/COM.html b/Doc/Manual/COM.html
new file mode 100644
index 000000000..c48fe36a1
--- /dev/null
+++ b/Doc/Manual/COM.html
@@ -0,0 +1,1243 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>SWIG and COM</title>
+<link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body bgcolor="#FFFFFF">
+<H1><a name="COM"></a>17 SWIG and COM</H1>
+<!-- INDEX -->
+<div class="sectiontoc">
+<ul>
+<li><a href="#com_overview">Overview</a>
+<li><a href="#com_preliminaries">Preliminaries</a>
+<ul>
+<li><a href="#running_swig">Running SWIG</a>
+<li><a href="#com_commandline">Additional Commandline Options</a>
+<li><a href="#compiling_dynamic">Compiling a dynamic module</a>
+<li><a href="#using_module">Using your module</a>
+</ul>
+<li><a href="#com_basic_tour">A tour of basic C/C++ wrapping</a>
+<ul>
+<li><a href="#functions">Global functions</a>
+<li><a href="#global_variables">Global variables</a>
+<li><a href="#constants">Constants</a>
+<li><a href="#enumerations">Enumerations</a>
+<li><a href="#pointers">Pointers</a>
+<li><a href="#structures">Structures</a>
+<li><a href="#classes">C++ classes</a>
+<li><a href="#inheritance">C++ inheritance</a>
+<li><a href="#pointers_refs_arrays">Pointers, references, arrays and pass by value</a>
+<ul>
+<li><a href="#null_pointers">Null pointers</a>
+</ul>
+<li><a href="#overloaded_functions">C++ overloaded functions</a>
+<li><a href="#com_default_arguments">C++ default arguments</a>
+<li><a href="#namespaces">C++ namespaces</a>
+<li><a href="#templates">Constructors</a>
+<li><a href="#templates">C++ templates</a>
+<li><a href="#smart_pointers">C++ Smart Pointers</a>
+</ul>
+<li><a href="#further_details">Further details on COM wrapping</a>
+<ul>
+<li><a href="#com_classes_and_interfaces">Classes and interfaces</a>
+<li><a href="#com_module_class">Module class and class objects</a>
+<li><a href="#com_guids">GUID handling</a>
+<li><a href="#com_class_factories">Class factories and aggregation</a>
+<li><a href="#com_hresult">IDispatch and HRESULT as return value</a>
+<li><a href="#com_iswigwrappedobject">ISWIGWrappedObject interface</a>
+<li><a href="#com_memory">Memory management</a>
+<li><a href="#com_memory">Exceptions</a>
+</ul>
+<li><a href="#com_customization">Customization features</a>
+<ul>
+<li><a href="#com_typemaps">Typemaps</a>
+<li><a href="#com_typemaps">Exception handling</a>
+</ul>
+</ul>
+</div>
+<!-- INDEX -->
+
+
+
+<p>
+This chapter describes SWIG's support of Java. 
+It covers most SWIG features, but certain low-level details are covered in less depth than in earlier chapters. 
+</p>
+
+
+<H2><a name="com_overview"></a>17.1 Overview</H2>
+
+
+<p>
+COM is a component technology included in the Windows operating system. It is supported by a wide range of tools - scripting languages
+(VBScript, Perl, Python), compiled languages (Delphi, Visual Basic, C#) and even complex applications (MS Office, OpenOffice.org). Thus
+writing a COM component is a good way to extend all of these applications at one time. Unfortunately writing COM components is C/C++
+is a non-trivial task which is even harder if you do not use Microsoft's tools (especially if you use some form of GCC).
+</p>
+
+<p>
+SWIG's COM extension allows you to easily make your C/C++ code accessible to COM-aware tools using the compiler of your choice. It takes care
+of many low-level tasks like component registration, memory management, object layout, etc. It preserves the class hierarchy contained in
+the C++ code with some limitations - notably only single inheritance is supported. You should try using the COM extension if you have
+a large code base using a custom programming interface. On the other hand if you need to implement a fixed COM interface (e.g. a 'visual component'
+or a DirectShow filter) then SWIG will probably not be the right tool for you.
+</p>
+
+<p>
+This chapter is focused mostly on COM-aware scripting languages. The examples - unless noted otherwise - are provided in a subset of Basic
+which should work in Visual Basic (including VBA), VBScript and OpenOffice.org Basic. This should not discourage you if you plan to use another language -
+the code should be very similar, if not identical, in other scripting languages. The code generated by the COM extension has also been verified to work well in
+Delphi and C#.
+</p>
+
+
+<H2><a name="com_preliminaries"></a>17.2 Preliminaries</H2>
+
+
+<p>
+To compile the generated code you will need a compiler that supports generating DLLs and understands the __stdcall calling convention.
+The compilers that have been tested extensively are MS Visual C++ and MinGW. OpenWatcom, Digital Mars C++, Borland C++ and Cygwin are
+tested occasionally and should have no problems. Winegcc can be used on Unix systems but has some limitations. Please note that the
+code has only been tested on 32-bit x86 processors. You will also need an IDL compiler - most probably this will
+be MIDL (shipped with the Windows SDK, previously known as Platform SDK) but WIDL (shipped with WINE) can be used
+too.
+</p>
+
+
+<H3><a name="running_swig"></a>17.2.1 Running SWIG</H3>
+
+
+<p>
+Suppose that you defined a SWIG module such as the following:
+</p>
+
+<div class="code">
+<pre>
+/* File: example.i */
+%module test
+%{
+#include "stuff.h"
+%}
+int fact(int n);
+</pre>
+</div>
+
+
+<p>
+To build a COM module, run SWIG using the <tt>-com</tt> option :</p>
+
+<div class="code"><pre>
+%swig -com example.i
+</pre></div>
+
+<p>
+If building C++, add the <tt>-c++</tt> option:
+</p>
+
+<div class="code"><pre>
+$ swig -c++ -com example.i
+</pre></div>
+
+<p>
+This will generate four files: <tt>example_wrap.c</tt> (or <tt>example_wrap.cxx</tt>),
+<tt>example.idl</tt>, <tt>example.def</tt> and <tt>example_rc.rc</tt>. The first file
+contains code responsible for object layout, reference counting, etc. The <tt>example.idl</tt>
+file contains a description of the interface exposed to the client applications. The remaining
+two files are used during compilation. All these files need to be linked with the rest of
+your C/C++ application.
+</p>
+
+<p>
+The name of the wrapper file is derived from the name of the input file.  For example, if the
+input file is <tt>example.i</tt>, the name of the wrapper file is <tt>example_wrap.c</tt>.
+To change this, you can use the <tt>-o</tt> option. 
+It is also possible to change the <a href="SWIG.html#output">output directory </a> that the COM files are generated into using <tt>-outdir</tt>.
+</p>
+
+<p>
+The following sections have further practical examples and details on how you might go about
+compiling and using the generated files.
+</p>
+
+<H3><a name="com_commandline"></a>17.2.2 Additional Commandline Options</H3>
+
+
+<p>
+The following table list the additional commandline options available for the COM module. They can also be seen by using: 
+</p>
+
+<div class="code"><pre>
+swig -com -help 
+</pre></div>
+
+<table summary="COM specific options">
+<tr>
+<th>COM specific options</th>
+</tr>
+
+<tr>
+<td>-nopgcpp</td>
+<td>suppress the premature garbage collection prevention parameter</td>
+</tr>
+
+<tr>
+<td>-noproxy</td>
+<td>generate the low-level functional interface instead of proxy classes </td>
+</tr>
+
+<tr>
+<td>-package &lt;name&gt;</td>
+<td>set name of the Java package to &lt;name&gt;</td>
+</tr>
+
+</table>
+
+<p>
+Their use will become clearer by the time you have finished reading this section on SWIG and Java.
+</p>
+
+<H3><a name="compiling_dynamic"></a>17.2.3 Compiling a dynamic module</H3>
+
+
+<p>
+Before your module can be used by COM clients it needs to be built as a dynamically linked library (DLL).
+This process is compiler specific. Examples are provided below for Visual C++:
+</p>
+
+<div class="code"><pre>
+$ # MS Visual Studio 2008
+$ midl example.idl
+$ rc example_rc.rc
+$ cl /LD /Feexample.dll example_wrap.c example.def example_rc.res ole32.lib uuid.lib advapi32.lib oleaut32.lib
+</pre></div>
+
+<p>
+and for MinGW under Linux (using WIDL):
+</p>
+
+<div class="code"><pre>
+$ # MinGW and WIDL
+$ widl -t -I /usr/include/wine/windows example.idl
+$ i586-mingw32msvc-windres example_rc.rc example_rc.o
+$ i586-mingw32msvc-gcc -shared -o example.dll example_wrap.c example.def example_rc.o -lole32 -luuid -ladvapi32 -loleaut32
+</pre></div>
+
+<p>
+On a Windows installation of MinGW the names of the executables will most probably simply be <tt>windres</tt> and
+<tt>gcc</tt>, and <tt>midl</tt> can be used in place of <tt>widl</tt>.
+</p>
+
+<p>
+<b>Warning</b> <br>
+A common source of mistakes is the omission of <tt>example_rc.[res|o]</tt> during compilation. This produces no
+errors or warnings but results in a non-working module.
+</p>
+
+<p>
+Before you can use your module you need to register it (on the machine where it will be used):
+</p>
+
+<div class="code"><pre>
+$ regsvr32 example.dll
+</pre></div>
+
+<p>
+This will create entries in the registry needed to locate your module. Please note that this will store
+the filesystem path to <tt>example.dll</tt> so you should not move this file to another location. If
+you wish to unregister your module simply type:
+</p>
+
+<div class="code"><pre>
+$ regsvr32 /u example.dll
+</pre></div>
+
+<H3><a name="using_module"></a>17.2.4 Using your module</H3>
+
+
+<p>
+The precise way how you can load your module depends on the target language. In Basic you can use the
+<tt>CreateObject</tt> subroutine:
+</p>
+
+<div class="code"><pre>
+Dim example
+Set example = CreateObject("example.example")
+</pre</div>
+
+<p>
+The variable <tt>example</tt> now contains a reference to an object of the <i>module class</i> which
+allows you to call global functions and access global variables defined in your module. It also
+allows you to create instances of C++ classes and to call static member functions.
+</p>
+
+<H2><a name="com_basic_tour"></a>17.3 A tour of basic C/C++ wrapping</H2>
+
+
+<p>
+SWIG will try to create an interface as similar to the C/C++ code as possible. However because
+of differences between C/C++ and COM there are some aspects that need
+special attention. They are described in this section
+</p>
+
+<H3><a name="functions"></a>17.3.1 Global functions</H3>
+
+
+<p>
+In COM there are no global functions and therefore SWIG uses a workaround. It defines a class known as
+the <i>module class</i> which contains the global functions and variables from your C/C++ module.
+The example below shows how you can call a global function from a COM client:
+</p>
+
+<div class="code"><pre>
+%module example
+int fact(int n);
+</pre></div>
+
+<p>
+From VB (and most other languages derived from Basic) you can invoke it as follows:
+</p>
+
+<div class="code"><pre>
+Dim example
+Set example = CreateObject("example.example")
+Print example.fact(4)
+</pre></div>
+
+
+<H3><a name="global_variables"></a>17.3.2 Global variables</H3>
+
+
+<p>
+Global variables are wrapped as COM properties. This allows you to use them just as you would use them in
+C/C++. For example this module:
+</p>
+
+<div class="code"><pre>
+// SWIG interface file with global variables
+%module example
+...
+%inline %{
+extern int My_variable;
+extern double density;
+%}
+...
+</pre></div>
+
+<p>
+Can be used in the following way:
+</p>
+
+<div class="code"><pre>
+Dim example
+Set example = CreateObject("example.example")
+
+Rem Print out the value of a C global variable
+Print example.My_variable
+
+Rem Set the value of a C global variable
+example.density = 0.8442
+</pre></div>
+
+<p>
+If a variable is declared as <tt>const</tt>, it is wrapped as a read-only property.
+This means that its value can be read, but cannot be modified. To make ordinary variables read-only,
+you can use the <tt>%immutable</tt> directive. For example:
+</p>
+
+<div class="code">
+<pre>
+%{
+extern char *path;
+%}
+%immutable;
+extern char *path;
+%mutable;
+</pre>
+</div>
+
+<p>
+The <tt>%immutable</tt> directive stays in effect until it is explicitly disabled or cleared using
+<tt>%mutable</tt>.
+See the <a href="SWIG.html#SWIG_readonly_variables">Creating read-only variables</a> section for further details.
+</p>
+
+<p>
+If you just want to make a specific variable immutable, supply a declaration name.  For example:
+</p>
+
+<div class="code">
+<pre>
+%{
+extern char *path;
+%}
+%immutable path;
+...
+extern char *path;      // Read-only (due to %immutable)
+</pre>
+</div>
+
+
+<H3><a name="constants"></a>17.3.3 Constants</H3>
+
+
+<p>
+C/C++ constants are wrapped as immutable properties. This applies both to constants
+created using <tt>#define</tt> preprocessor directive and the SWIG <tt>%constant</tt>
+directive. Examples are provided below:
+</p>
+
+<div class="code">
+<pre>
+#define PI 3.14159
+#define VERSION "1.0"
+%constant int FOO = 42;
+%constant const char *path = "/usr/local";
+</pre>
+</div>
+
+<p>
+Please note that SWIG can infer the C type from the <tt>#define</tt> directive - <tt>PI</tt>
+is wrapped as a floating point value while <tt>VERSION</tt> is wrapped as a string.
+</p>
+
+<H3><a name="enumerations"></a>17.3.4 Enumerations</H3>
+
+
+<p>
+TODO
+</p>
+
+<H3><a name="pointers"></a>17.3.5 Pointers</H3>
+
+
+<p>
+C/C++ pointers are fully supported by SWIG.  Furthermore, SWIG has no problem working with
+incomplete type information.  Here is a rather simple interface:
+</p>
+
+<div class="code">
+<pre>
+%module example
+
+FILE *fopen(const char *filename, const char *mode);
+int fputs(const char *, FILE *);
+int fclose(FILE *);
+</pre>
+</div>
+
+<p>
+When wrapped, you will be able to use the functions in a natural way from a COM client. For example:
+</p>
+
+<div class="code">
+<pre>
+Dim example
+Dim f
+
+Set example = CreateObject("example.example")
+Set f = example.fopen("junk","w")
+example.fputs("Hello World", f)
+example.fclose(f)
+</pre>
+</div>
+
+<p>
+Since the <tt>FILE</tt> structure is not known to SWIG the pointer is stored as a <tt>void *</tt> pointer. You
+can pass this pointer to other functions that expect to receive a pointer to <tt>FILE</tt>. You cannot dereference
+the pointer or manipulate it in any other way.
+</p>
+
+<p>
+To allow for static type checking a class is generated for each unknown type. In this case the <tt>FILE *</tt>
+pointer is wrapped as an object implementing interface <tt>ISWIGTYPE_p_FILE</tt>.
+</p>
+
+<p>
+If you need to perform any complex operations (like casting, dereferencing, etc. ) on the pointer consider creating some
+helper functions. For example:
+</p>
+
+<div class="code">
+<pre>
+%inline %{
+/* C-style cast */
+Bar *FooToBar(Foo *f) {
+   return (Bar *) f;
+}
+
+/* C++-style cast */
+Foo *BarToFoo(Bar *b) {
+   return dynamic_cast&lt;Foo*&gt;(b);
+}
+
+Foo *IncrFoo(Foo *f, int i) {
+    return f+i;
+}
+%}
+</pre>
+</div>
+
+<p>
+When working with C++ classes you should use the C++ style casts (<tt>static_cast</tt>, <tt>dynamic_cast</tt>).
+This is especially important when you use a cast from a supertype to a subtype; in this
+case only <tt>dynamic_cast</tt> is guaranteed to work reliably.
+</p>
+
+<H3><a name="structures"></a>17.3.6 Structures</H3>
+
+
+<p>
+A C structure will in most cases work as you would expect. For example,
+</p>
+
+<div class="code"><pre>
+struct Vector {
+	double x,y,z;
+};
+
+</pre></div>
+
+<p>
+is used as follows:
+</p>
+
+<div class="code"><pre>
+Dim v
+v = CreateObject("example.Vector")
+v.x = 3.5
+v.y = 7.2
+Dim x, y
+x = v.x
+y = v.y
+</pre></div>
+
+<p>
+Similar access is provided for unions and the public data members of C++ classes.
+In fact structures are handled in exactly the same way as C++ classes. More details
+about how SWIG handles C++ classes is provided in the next section.
+</p>
+
+
+<H3><a name="classes"></a>17.3.7 C++ classes</H3>
+
+
+<p>
+C++ classes are wrapped as COM interfaces. Additionally if a class is not abstract and has
+a default (possibly implicit) constructor then a class definition and a class factory
+are also generated. For example, if you have this class,
+</p>
+
+<div class="code"><pre>
+class List {
+public:
+  List();
+  ~List();
+  int  search(char *item);
+  void insert(char *item);
+  void remove(char *item);
+  char *get(int n);
+  int  length;
+};
+</pre></div>
+
+<p>
+you can use it in Basic like this:
+</p>
+
+<div class="code"><pre>
+Dim l
+Set l = CreateObject("example.List")
+l.insert("Ale")
+l.insert("Stout")
+l.insert("Lager")
+Dim item
+item = l.get(2)
+Dim length
+length = l.length
+</pre></div>
+
+<p>
+Class data members are accessed in the same manner as C structures.  
+</p>
+
+<p>
+Static class members can be accessed in two ways. Let us consider the following
+class:
+</p>
+
+<div class="code">
+<pre>
+class Spam {
+public:
+   static void foo();
+   static int bar;
+};
+</pre>
+</div>
+
+<p>
+You can access <tt>Spam</tt>'s static members just like you would access any non-static members:
+</p>
+
+<div class="code">
+<pre>
+Dim Spam
+Set Spam = CreateObject("example.Spam")
+Spam.foo()
+Dim bar
+bar = Spam.bar
+</pre>
+</div>
+
+<p>
+In some circumstances it might be necessary to access <tt>Spam</tt>'s static members without
+having an instance of <tt>Spam</tt>. This could be because <tt>Spam</tt> is an abstract class
+or because creating it has some side effects. In this case you can use <tt>Spam</tt>'s static
+members in the following way:
+</p>
+
+<div class="code">
+<pre>
+Dim example
+Set example = CreateObject("example.example")
+example.Spam.foo()
+Dim bar
+bar = example.Spam.bar
+</pre>
+</div>
+
+<p>
+The code above uses the module class object <tt>example</tt> and the class object <tt>example.Spam</tt>.
+As was shown in the previous sections the module class object can serve for accessing global
+functions and variables. The class object serves the same purpose but for static functions and
+static variables of the class <tt>Spam</tt>. Please note that neither creating the module class object
+nor creating the class object has any side effects. You should also note that SWIG does not provide any
+synchronization of access for static functions and variables (or in fact for any other global/member
+functions/variable). If you plan to create a multi-threaded program you should ensure synchronization
+either within the wrapped C/C++ code or in the target language.
+</p>
+
+<H3><a name="inheritance"></a>17.3.8 C++ inheritance</H3>
+
+
+<p>
+SWIG's COM module currently only supports single inheritance. While it might be possible
+to support multiple inheritance it would greatly increase the complexity of the code
+generator and also of the generated code. If your C++ class has more than one superclass
+then all but the first one will be ignored. If this is not what you want you can use
+<tt>%feature("ignore")</tt> for the unwanted base classes.
+</p>
+
+<p>
+SWIG generates a class hierarchy which mirrors that of the C++ code. Therefore,
+if you have code like this
+</p>
+
+<div class="code">
+<pre>
+class Foo {
+...
+};
+
+class Bar : public Foo {
+...
+};
+
+void spam(Foo *f);
+</pre>
+</div>
+
+<p>
+you can use an instance of <tt>Bar</tt> as argument to <tt>spam</tt>:
+</p>
+
+<div class="code">
+<pre>
+Dim example, b
+Set example = CreateInstance("example.example")
+Set b = CreateInstance("example.bar")
+example.spam(b)
+</pre>
+</div>
+
+
+<H3><a name="pointers_refs_arrays"></a>17.3.9 Pointers, references, arrays and pass by value</H3>
+
+
+<p>
+COM expects all complex objects to be passed by pointer. Therefore if you define
+your function in any of these ways:
+</p>
+
+<div class="code">
+<pre>
+void spam1(Foo *x);      // Pass by pointer
+void spam2(Foo &amp;x);      // Pass by reference
+void spam3(Foo x);       // Pass by value
+void spam4(Foo x[]);     // Array of objects
+</pre>
+</div>
+
+<p>
+COM will wrap the functions as if they would accept pointers to <tt>Foo</tt>.
+Naturally in the case of <tt>spam3</tt> there is a difference in semantics
+i.e. all changes made by the function will be done on a copy of the passed
+object, just as you would expect in C++.
+</p>
+
+<p>
+All of these functions are called in the same way:
+</p>
+
+<div class="code">
+<pre>
+Dim example, f
+
+Set example = CreateObject("example.example")
+Set f = CreateObject("example.Foo")
+example.spam1(f)
+example.spam2(f)
+example.spam3(f)
+example.spam4(f)
+</pre>
+</div>
+
+<p>
+Similar behavior occurs for return values.  For example, if you had
+functions like this,
+</p>
+
+<div class="code">
+<pre>
+Foo *spam5();
+Foo &amp;spam6();
+Foo  spam7();
+</pre>
+</div>
+
+<p>
+then all three functions will return a pointer to some <tt>Foo</tt> object.
+Since the third function (spam7) returns a value, newly allocated memory is used 
+to hold the result and a pointer is returned (the generated COM code will free this
+memory when the object is no longer needed, that is when its reference count reaches 0).
+</p>
+
+<H4><a name="null_pointers"></a>17.3.9.1 Null pointers</H4>
+
+
+<p>
+TODO
+</p>
+
+<div class="code">
+<pre>
+example.spam1(null);   // Pointer - ok
+example.spam2(null);   // Reference - NullPointerException
+example.spam3(null);   // Value - NullPointerException
+example.spam4(null);   // Array - ok
+</pre>
+</div>
+
+<p>
+For <tt>spam1</tt> and <tt>spam4</tt> above the Java <tt>null</tt> gets translated into a NULL pointer for passing to the C/C++ function. 
+The converse also occurs, that is, NULL pointers are translated into <tt>null</tt> Java objects when returned from a C/C++ function.
+</p>
+
+<H3><a name="overloaded_functions"></a>17.3.10 C++ overloaded functions</H3>
+
+
+<p>
+Unfortunately COM does not support overloading functions (including constructors). Thus all
+functions with the same name except for the first one will be ignored. If this is not what
+you want you will need to either <a href="SWIG.html#SWIG_rename_ignore">rename or ignore</a>
+some of the methods. For example:
+</p>
+
+<div class="code">
+<pre>
+%rename(spam_ushort) spam(unsigned short);
+...
+void spam(int);    
+void spam(unsigned short);   // Now renamed to spam_ushort
+</pre>
+</div>
+
+<p>
+or
+</p>
+
+<div class="code">
+<pre>
+%ignore spam(unsigned short);
+...
+void spam(int);    
+void spam(unsigned short);   // Ignored
+</pre>
+</div>
+
+
+<H3><a name="com_default_arguments"></a>17.3.11 C++ default arguments</H3>
+
+
+<p>
+In SWIG function with a default argument is wrapped by generating an additional function for each argument
+that is defaulted. However since COM does not support function overloading the additional functions
+will be ignored. You can change this behavior using the <tt>%rename</tt> directive:
+</p>
+
+<div class="code">
+<pre>
+%module example
+
+%rename(defaults2) defaults(double);
+%rename(defaults3) defaults();
+void defaults(double d=10.0, int i=0);
+</pre>
+</div>
+
+
+<H3><a name="namespaces"></a>17.3.12 C++ namespaces</H3>
+
+
+<p>
+SWIG is aware of C++ namespaces, but namespace names do not appear in
+the module nor do namespaces result in a module that is broken up into
+submodules or packages.  For example, if you have a file like this,
+</p>
+
+<div class="code">
+<pre>
+%module example
+
+namespace foo {
+   int fact(int n);
+   struct Vector {
+       double x,y,z;
+   };
+};
+</pre>
+</div>
+
+<p>
+it works in Basic as follows:
+</p>
+
+<div class="code">
+<pre>
+Dim example, f, v, y
+
+Set example = CreateObject("example.example")
+f = example.fact(3)
+Set v = CreateObject("example.Vector")
+v.x = 3.4
+y = v.y
+</pre>
+</div>
+
+<p>
+If your program has more than one namespace, name conflicts (if any) can be resolved using <tt>%rename</tt>
+For example:
+</p>
+
+<div class="code">
+<pre>
+%rename(Bar_spam) Bar::spam;
+
+namespace Foo {
+    int spam();
+}
+
+namespace Bar {
+    int spam();
+}
+</pre>
+</div>
+
+<p>
+If you have more than one namespace and you want to keep their
+symbols separate, consider wrapping them as separate SWIG modules.
+</p>
+
+<H3><a name="templates"></a>17.3.13 Constructors</H3>
+
+
+<p>
+COM has no specific support for constructors. Thus constructors are wrapped by SWIG's COM
+module as methods inside of the class object. For example if you have the following definition:
+</p>
+
+<div class="code">
+<pre>
+class Vector {
+public:
+  double x, y;
+  Vector(double a_x, double a_y): x(a_x), y(a_y) {}
+};
+</pre>
+</div>
+
+<p>
+you can use the constructor in the following way:
+</p>
+
+<div class="code">
+<pre>
+Dim example, v
+
+example = CreateObject("example.example")
+v = example.Vector.new_Vector(1.42, 10)
+</pre>
+</div>
+
+<p>
+Remember that COM does not support method overloading and therefore if there are multiple
+constructors that you would like to use then you will need to rename some of them.
+</p>
+
+<p>
+If your class has a default constructor then you can also use an alternate way of creating
+objects. In this case you can use the following code:
+</p>
+
+<div class="code">
+<pre>
+Dim v
+
+v = CreateObject("example.Vector")
+</pre>
+</div>
+
+<p>
+Obviously there is no way to use this syntax for calling a constructor that expects to
+receive parameters.
+</p>
+
+<H3><a name="templates"></a>17.3.14 C++ templates</H3>
+
+
+<p>
+C++ templates don't present a huge problem for SWIG.  However, in order
+to create wrappers, you have to tell SWIG to create wrappers for a particular
+template instantiation.  To do this, you use the <tt>%template</tt> directive.
+For example:
+</p>
+
+<div class="code">
+<pre>
+%module example
+%{
+#include &lt;utility&gt;
+%}
+
+template&lt;class T1, class T2&gt;
+struct pair {
+   typedef T1 first_type;
+   typedef T2 second_type;
+   T1 first;
+   T2 second;
+   pair();
+   pair(const T1&amp;, const T2&amp;);
+  ~pair();
+};
+
+%template(pairii) pair&lt;int,int&gt;;
+</pre>
+</div>
+
+<p>
+In Basic:
+</p>
+
+<div class="code">
+<pre>
+Dim example, p, first, second
+
+Set example = CreateObject("example.example")
+Set p = example.pairii.new_pairii(3, 4)
+first = p.first
+second = p.second
+</pre>
+</div>
+
+<p>
+Obviously, there is more to template wrapping than shown in this example.
+More details can be found in the <a href="SWIGPlus.html#SWIGPlus">SWIG and C++</a> chapter.   
+</p>
+
+<H3><a name="smart_pointers"></a>17.3.15 C++ Smart Pointers</H3>
+
+
+<p>
+TODO
+</p>
+
+
+<H2><a name="further_details"></a>17.4 Further details on COM wrapping</H2>
+
+
+<p>
+The previous sections were meant as a quick start guide for wrapping C/C++ code as
+COM objects. For users wanting to have a better understanding of how things work
+beneath the surface this section provides some mor details.
+</p>
+
+<H3><a name="com_classes_and_interfaces"></a>17.4.1 Classes and interfaces</H3>
+
+
+<p>
+There is no direct COM counterpart to a C++ class. COM defines two entities - the
+interface which is comparable to a 'pure virtual' class, and the COM class which
+is an implementation of one or more interfaces. There is no hierarchy of COM classes
+but there is a hierarchy of interfaces. For each C++ class SWIG creates an interface
+containing declarations of public functions and property getters and setters. If the
+C++ class derives from a superclass then this relationship is preserved for their
+corresponding interfaces (but as was stated before only single inheritance is supported).
+The definition of a COM class serves the purpose of providing a way to locate a class's
+factory object. Therefore the COM class in defined only when the class is not abstract
+and has a default constructor. The following example shows two C++ classes
+</p>
+
+<div class="code">
+<pre>
+class A {
+public:
+  virtual int foo(A *) = 0;
+};
+
+class B : public A {
+public:
+  int foo(A *) { return 0; }
+  int bar() { return 0; }
+};
+</pre>
+</div>
+
+<p>
+and their corresponding definitions in the generated IDL file:
+</p>
+
+<div class="code">
+<pre>
+[ ... ]
+interface IA : IDispatch {
+  HRESULT foo(A *arg1, [ retval, out ] int *SWIG_result);
+};
+
+[ ... ]
+interface IB : IA {
+  HRESULT bar([ retval, out ] int *SWIG_result);
+};
+
+[ ... ]
+coclass BImpl {
+  interface IB;
+  interface ISWIGWrappedObject;
+};
+</pre>
+</div>
+
+<p>
+Some notable things above are the use of <tt>IDispatch</tt> as the base interface,
+the use of <tt>HRESULT</tt> as return value along with the wrapping of the real return
+value as an <tt>out</tt> parameter, and the <tt>ISWIGWrappedObject</tt> interface.
+They will be described in later subsections.
+</p>
+
+<H3><a name="com_module_class"></a>17.4.2 Module class and class objects</H3>
+
+
+<p>
+Since COM does not support global functions and variables the module class is used as
+a workaround. The name of the module class is the same as the name of the module itself.
+There may be multiple objects of the module class but all of them will work on the
+same data - your module's global variables. SWIG does not provide any synchronization
+and therefore if you plan to use global variables from multiple threads you will need
+to take care of multithreading issues either in the C/C++ code or in the target language.
+</p>
+
+<p>
+Class objects serve a very similar purpose as the module class with regard to static
+member functions and variables. Note: They should not be confused with what COM calls
+'class objects' which is just another name for class factories.
+Technically static functions and variables could be
+a part of the module class and the class objects created by SWIG serve only the purpose of creating
+a logical namespace layout. Class objects can be accessed as read-only properties
+of the module class, e.g. if you have the following class:
+</p>
+
+<div class="code">
+<pre>
+%module example
+
+class A {
+public:
+  static int func(void) { return 15; }
+};
+</pre>
+</div>
+
+<p>
+then SWIG will define definitions in the IDL file similar to these:
+</p>
+
+<div class="code">
+<pre>
+[ ... ]
+interface IAStatic : IDispatch {
+  HRESULT func([ retval, out ] int *SWIG_result);
+};
+
+[ ... ]
+interface Iexample : IDispatch {
+  [ propget ]
+  HRESULT A([ retval, out ] IAStatic **SWIG_result);
+}
+</pre>
+</div>
+
+<p>
+The code can then be used in the following way:
+</p>
+
+<div class="code">
+<pre>
+Dim example
+
+Set example = CreateObject("example.example")
+Print example.A.func()
+</pre>
+</div>
+
+<p>
+The same considerations apply for class objects as for the module class object. Even though
+there might be several objects for the class <tt>A</tt> defined above they will all be
+accessing the same static variables. Please note that currently you cannot directly create
+a class object (e.g. using <tt>CreateObject</tt> in Basic) and need to use the module
+class. There is no good reason for it other than that it has not yet been implemented.
+</p>
+
+<H3><a name="com_guids"></a>17.4.3 GUID handling</H3>
+
+
+<p>
+COM uses 128-bit identifiers called GUIDs (or UUIDs) for uniquely identifying classes, interfaces
+and type libraries. Ideally you should generate CLSIDs (class GUIDs) and IIDs (interface GUIDs)
+for each wrapped class and change them each time that you make an incompatible change to a
+class's public interface. Since this is a time consuming process you can delegate some of this
+work to SWIG.
+</p>
+
+<p>
+You can specify a CLSID and an IID for each class using the <tt>%feature</tt> directive:
+</p>
+
+<div class="code">
+<pre>
+%feature("iid"="12345678-1234-1234-1234-000000000000") A;
+%feature("clsid"="12345678-1234-1234-1234-000000000001") A;
+</pre>
+</div>
+
+<p>
+For the module class you can define the CLSID and IID as part of the module directive:
+</p>
+
+<div class="code">
+<pre>
+%module(moduleiid="12345678-1234-1234-1234-000000000002", moduleclsid="12345678-1234-1234-1234-000000000003") example
+</pre>
+</div>
+
+<p>
+Finally there is also a GUID (called TLBID) for the type library which is the COM description of your
+whole module. You can customize it in this way:
+</p>
+
+<div class="code">
+<pre>
+%module(tlbid="12345678-1234-1234-1234-000000000004") example
+</pre>
+</div>
+
+<p>
+If you do not want to provide all of the above GUIDs you can offload some work to SWIG. To do this
+you can define a 'master' GUID which will serve as a seed value for automatically generating GUIDs:
+</p>
+
+<div class="code">
+<pre>
+%module(master_guid="12345678-1234-1234-1234-000000000005") example
+</pre>
+</div>
+
+<p>
+When SWIG wraps a class for which no IID or CLSID has been specified it will concatenate the
+binary representation of master_guid, the module name, the class name and a suffix
+specifying whether the GUID is generated for a class, interface or type library. Then it
+will compute the SHA-1 hash of this string and use the resulting bits for generating a GUID
+(this process has been described in RFC 4122 as variant 5 of the generation algorithm).
+</p>
+
+<p>
+This process reduces the number of GUIDs you need to generate to only one - the master GUID.
+You can generate it in various ways, e.g. by using guidgen from Microsoft's SDK or
+one of many GUID/UUID generators available on the web. The procedure described above ensures
+that your GUIDs will remain the same when you re-run SWIG. If for some reason you need to
+change the public interface of some of your wrapped classes you can do this either by
+manually specifying their new CLSIDs and IIDs, or by changing the master GUID.
+</p>
+
+<H3><a name="com_class_factories"></a>17.4.4 Class factories and aggregation</H3>
+
+
+<p>
+SWIG creates class factories for all defined COM classes. This means that class factories
+are created for proxies of non-abstract classes with a default destructor and also for the
+module class.
+</p>
+
+<p>
+SWIG supports COM aggregation for proxy classes. The module class currently cannot be
+aggregated.
+</p>
+
+<H3><a name="com_hresult"></a>17.4.5 IDispatch and HRESULT as return value</H3>
+
+
+<p>
+All interfaces generated by SWIG are dual interfaces - this means that they support
+both early binding (sometimes called VTBL binding - used mostly by compiled languages)
+and late binding (sometimes called 'name binding' - used in scripting languages) by
+implementing the IDispatch interface. As a result the return values of all interface
+functions need to be instances of HRESULT. This is used for reporting whether the
+function call succeeded or failed (e.g. when the call is made remotely using DCOM).
+The 'real' return value, if any, needs to be therefore transformed to an <tt>out</tt> parameter
+of the function. If you use the generated COM object from a scripting language then most
+likely you will not see any difference - you will be able to use the function just as
+it would be returning a value. However if you use a compiled language (like C, C++ or Delphi)
+then you will need to explicitly provide a pointer to the address where the return value
+is to be stored.
+</p>
+
+<H3><a name="com_iswigwrappedobject"></a>17.4.6 ISWIGWrappedObject interface</H3>
+
+
+<H3><a name="com_memory"></a>17.4.7 Memory management</H3>
+
+
+<H3><a name="com_memory"></a>17.4.8 Exceptions</H3>
+
+
+<H2><a name="com_customization"></a>17.5 Customization features</H2>
+
+
+<H3><a name="com_typemaps"></a>17.5.1 Typemaps</H3>
+
+
+<H3><a name="com_typemaps"></a>17.5.2 Exception handling</H3>
+
+
+</body>
+</html>
+
diff --git a/Doc/Manual/CSharp.html b/Doc/Manual/CSharp.html
index 97cb75409..94e3eca79 100644
--- a/Doc/Manual/CSharp.html
+++ b/Doc/Manual/CSharp.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body bgcolor="#FFFFFF">
-<H1><a name="CSharp"></a>17 SWIG and C#</H1>
+<H1><a name="CSharp"></a>18 SWIG and C#</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -39,7 +39,7 @@
 
 
 
-<H2><a name="csharp_introduction"></a>17.1 Introduction</H2>
+<H2><a name="csharp_introduction"></a>18.1 Introduction</H2>
 
 
 <p>
@@ -59,7 +59,7 @@ The <a href="http://msdn.microsoft.com">Microsoft Developer Network (MSDN)</a> h
 Monodoc, available from the Mono project, has a very useful section titled <a href="http://www.mono-project.com/Interop_with_Native_Libraries">Interop with native libraries</a>.
 </p>
 
-<H2><a name="csharp_differences_java"></a>17.2 Differences to the Java module</H2>
+<H2><a name="csharp_differences_java"></a>18.2 Differences to the Java module</H2>
 
 
 <p>
@@ -397,7 +397,7 @@ Windows users can also get the examples working using a
 <a href="http://www.cygwin.com">Cygwin</a> or <a href="http://www.mingw.org">MinGW</a> environment for automatic configuration of the example makefiles.
 Any one of the three C# compilers (Portable.NET, Mono or Microsoft) can be detected from within a Cygwin or Mingw environment if installed in your path. 
 
-<H2><a name="csharp_exceptions"></a>17.3 C# Exceptions</H2>
+<H2><a name="csharp_exceptions"></a>18.3 C# Exceptions</H2>
 
 
 <p>
@@ -494,7 +494,7 @@ set so should only be used when a C# exception is not created.
 </p>
 
 
-<H3><a name="csharp_exception_example_check_typemap"></a>17.3.1 C# exception example using "check" typemap</H3>
+<H3><a name="csharp_exception_example_check_typemap"></a>18.3.1 C# exception example using "check" typemap</H3>
 
 
 <p>
@@ -676,7 +676,7 @@ method and C# code does not handle pending exceptions via the canthrow attribute
 Actually it will issue this warning for any function beginning with <tt>SWIG_CSharpSetPendingException</tt>.
 </P>
 
-<H3><a name="csharp_exception_example_percent_exception"></a>17.3.2 C# exception example using %exception</H3>
+<H3><a name="csharp_exception_example_percent_exception"></a>18.3.2 C# exception example using %exception</H3>
 
 
 <p>
@@ -741,7 +741,7 @@ The managed code generated does check for the pending exception as mentioned ear
 </pre>
 </div>
 
-<H3><a name="csharp_exception_example_exception_specifications"></a>17.3.3 C# exception example using exception specifications</H3>
+<H3><a name="csharp_exception_example_exception_specifications"></a>18.3.3 C# exception example using exception specifications</H3>
 
 
 <p>
@@ -798,7 +798,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_evensonly(int jarg1) {
 Multiple catch handlers are generated should there be more than one exception specifications declared.
 </p>
 
-<H3><a name="csharp_custom_application_exception"></a>17.3.4 Custom C# ApplicationException example</H3>
+<H3><a name="csharp_custom_application_exception"></a>18.3.4 Custom C# ApplicationException example</H3>
 
 
 <p>
@@ -932,7 +932,7 @@ try {
 </pre>
 </div>
 
-<H2><a name="csharp_directors"></a>17.4 C# Directors</H2>
+<H2><a name="csharp_directors"></a>18.4 C# Directors</H2>
 
 
 <p>
@@ -945,7 +945,7 @@ The following sections provide information on the C# director implementation and
 However, the <a href="Java.html#java_directors">Java directors</a> section should also be read in order to gain more insight into directors.
 </p>
 
-<H3><a name="csharp_directors_example"></a>17.4.1 Directors example</H3>
+<H3><a name="csharp_directors_example"></a>18.4.1 Directors example</H3>
 
 
 <p>
@@ -1066,7 +1066,7 @@ CSharpDerived - UIntMethod(123)
 </pre>
 </div>
 
-<H3><a name="csharp_directors_implementation"></a>17.4.2 Directors implementation</H3>
+<H3><a name="csharp_directors_implementation"></a>18.4.2 Directors implementation</H3>
 
 
 <p>
@@ -1252,7 +1252,7 @@ void SwigDirector_Base::BaseBoolMethod(Base const &amp;b, bool flag) {
 </pre>
 </div>
 
-<H3><a name="csharp_director_caveats"></a>17.4.3 Director caveats</H3>
+<H3><a name="csharp_director_caveats"></a>18.4.3 Director caveats</H3>
 
 
 <p>
@@ -1300,7 +1300,7 @@ However, a call from C# to <tt>CSharpDefaults.DefaultMethod()</tt> will of cours
 should pass the call on to <tt>CSharpDefaults.DefaultMethod(int)</tt>using the C++ default value, as shown above.
 </p>
 
-<H2><a name="csharp_typemap_examples"></a>17.5 C# Typemap examples</H2>
+<H2><a name="csharp_typemap_examples"></a>18.5 C# Typemap examples</H2>
 
 
 This section includes a few examples of typemaps.  For more examples, you
@@ -1308,7 +1308,7 @@ might look at the files "<tt>csharp.swg</tt>" and "<tt>typemaps.i</tt>" in
 the SWIG library.
 
 
-<H3><a name="csharp_memory_management_member_variables"></a>17.5.1 Memory management when returning references to member variables</H3>
+<H3><a name="csharp_memory_management_member_variables"></a>18.5.1 Memory management when returning references to member variables</H3>
 
 
 <p>
@@ -1432,7 +1432,7 @@ public class Bike : IDisposable {
 Note the <tt>addReference</tt> call.
 </p>
 
-<H3><a name="csharp_memory_management_objects"></a>17.5.2 Memory management for objects passed to the C++ layer</H3>
+<H3><a name="csharp_memory_management_objects"></a>18.5.2 Memory management for objects passed to the C++ layer</H3>
 
 
 <p>
@@ -1551,7 +1551,7 @@ The 'cscode' typemap simply adds in the specified code into the C# proxy class.
 </div>
 
 
-<H3><a name="csharp_date_marshalling"></a>17.5.3 Date marshalling using the csin typemap and associated attributes</H3>
+<H3><a name="csharp_date_marshalling"></a>18.5.3 Date marshalling using the csin typemap and associated attributes</H3>
 
 
 <p>
@@ -1788,7 +1788,7 @@ public class example {
 </pre>
 </div>
 
-<H3><a name="csharp_date_properties"></a>17.5.4 A date example demonstrating marshalling of C# properties</H3>
+<H3><a name="csharp_date_properties"></a>18.5.4 A date example demonstrating marshalling of C# properties</H3>
 
 
 <p>
@@ -1888,7 +1888,7 @@ Some points to note:
 </ul>
 
 
-<H3><a name="csharp_partial_classes"></a>17.5.5 Turning wrapped classes into partial classes</H3>
+<H3><a name="csharp_partial_classes"></a>18.5.5 Turning wrapped classes into partial classes</H3>
 
 
 <p>
@@ -1988,7 +1988,7 @@ demonstrating that the class contains methods calling both unmanaged code - <tt>
 The following example is an alternative approach to adding managed code to the generated proxy class.
 </p>
 
-<H3><a name="csharp_extending_proxy_class"></a>17.5.6 Extending proxy classes with additional C# code</H3>
+<H3><a name="csharp_extending_proxy_class"></a>18.5.6 Extending proxy classes with additional C# code</H3>
 
 
 <p>
diff --git a/Doc/Manual/Chicken.html b/Doc/Manual/Chicken.html
index bd1b3d94b..98372a0f7 100644
--- a/Doc/Manual/Chicken.html
+++ b/Doc/Manual/Chicken.html
@@ -8,7 +8,7 @@
 
 <body bgcolor="#ffffff">
 
-<H1><a name="Chicken"></a>18 SWIG and Chicken</H1>
+<H1><a name="Chicken"></a>19 SWIG and Chicken</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -72,7 +72,7 @@
 
     </p>
 
-<H2><a name="Chicken_nn2"></a>18.1 Preliminaries</H2>
+<H2><a name="Chicken_nn2"></a>19.1 Preliminaries</H2>
 
 
     <p>
@@ -90,7 +90,7 @@
       CHICKEN.
       </p>
 
-<H3><a name="Chicken_nn3"></a>18.1.1 Running SWIG in C mode</H3>
+<H3><a name="Chicken_nn3"></a>19.1.1 Running SWIG in C mode</H3>
 
 
       <p>
@@ -123,7 +123,7 @@
       object files and linked into your project.
       </p>
 
-<H3><a name="Chicken_nn4"></a>18.1.2 Running SWIG in C++ mode</H3>
+<H3><a name="Chicken_nn4"></a>19.1.2 Running SWIG in C++ mode</H3>
 
 
       <p>
@@ -152,10 +152,10 @@
       object files and linked into your project.
       </p>
 
-<H2><a name="Chicken_nn5"></a>18.2 Code Generation</H2>
+<H2><a name="Chicken_nn5"></a>19.2 Code Generation</H2>
 
 
-<H3><a name="Chicken_nn6"></a>18.2.1 Naming Conventions</H3>
+<H3><a name="Chicken_nn6"></a>19.2.1 Naming Conventions</H3>
 
 
     <p>
@@ -171,7 +171,7 @@
       <tt>%rename</tt> SWIG directive in the SWIG interface file.
     </p>
 
-<H3><a name="Chicken_nn7"></a>18.2.2 Modules</H3>
+<H3><a name="Chicken_nn7"></a>19.2.2 Modules</H3>
 
 
       <p>
@@ -193,7 +193,7 @@
 	(uses <i>modulename</i>))</code> CHICKEN Scheme form.
     </p>
 
-<H3><a name="Chicken_nn8"></a>18.2.3 Constants and Variables</H3>
+<H3><a name="Chicken_nn8"></a>19.2.3 Constants and Variables</H3>
 
 
     <p>
@@ -230,7 +230,7 @@
       for info on how to apply the %feature.
     </p>
 
-<H3><a name="Chicken_nn9"></a>18.2.4 Functions</H3>
+<H3><a name="Chicken_nn9"></a>19.2.4 Functions</H3>
 
 
     <p>
@@ -249,7 +249,7 @@
       parameters).  The return values can then be accessed with <code>(call-with-values)</code>.
     </p>
 
-<H3><a name="Chicken_nn10"></a>18.2.5 Exceptions</H3>
+<H3><a name="Chicken_nn10"></a>19.2.5 Exceptions</H3>
 
 
      <p>The SWIG chicken module has support for exceptions thrown from
@@ -291,7 +291,7 @@
 </pre></div>
 
 
-<H2><a name="Chicken_nn11"></a>18.3 TinyCLOS</H2>
+<H2><a name="Chicken_nn11"></a>19.3 TinyCLOS</H2>
 
 
       <p>
@@ -334,7 +334,7 @@
       
       </p>
 
-<H2><a name="Chicken_nn12"></a>18.4 Linkage</H2>
+<H2><a name="Chicken_nn12"></a>19.4 Linkage</H2>
 
 
     <p>
@@ -355,7 +355,7 @@
    </p>
 
 
-<H3><a name="Chicken_nn13"></a>18.4.1 Static binary or shared library linked at compile time</H3>
+<H3><a name="Chicken_nn13"></a>19.4.1 Static binary or shared library linked at compile time</H3>
 
 
    <p>We can easily use csc to build a static binary.</p>
@@ -396,7 +396,7 @@ in which case the test script does not need to be linked with example.so.  The t
 be run with <tt>csi</tt>.
 </p>
 
-<H3><a name="Chicken_nn14"></a>18.4.2 Building chicken extension libraries</H3>
+<H3><a name="Chicken_nn14"></a>19.4.2 Building chicken extension libraries</H3>
 
 
 <p>Building a shared library like in the above section only works if the library
@@ -454,7 +454,7 @@ distributed and used by anyone, even if SWIG is not installed.</p>
 <p>See the <tt>Examples/chicken/egg</tt> directory in the SWIG source for an example that builds
 two eggs, one using the first method and one using the second method.</p>
 
-<H3><a name="Chicken_nn15"></a>18.4.3 Linking multiple SWIG modules with TinyCLOS</H3>
+<H3><a name="Chicken_nn15"></a>19.4.3 Linking multiple SWIG modules with TinyCLOS</H3>
 
 
 <p>Linking together multiple modules that share type information using the <code>%import</code>
@@ -478,7 +478,7 @@ with <code>(declare (uses ...))</code>.
 To create an extension library or an egg, just create a <tt>module_load.scm</tt> file that <code>(declare (uses ...))</code>
 all the modules.</p>
 
-<H2><a name="Chicken_nn16"></a>18.5 Typemaps</H2>
+<H2><a name="Chicken_nn16"></a>19.5 Typemaps</H2>
 
 
     <p>
@@ -487,7 +487,7 @@ all the modules.</p>
       <code>Lib/chicken/chicken.swg</code>.
     </p>
 
-<H2><a name="Chicken_nn17"></a>18.6 Pointers</H2>
+<H2><a name="Chicken_nn17"></a>19.6 Pointers</H2>
 
 
     <p>
@@ -520,7 +520,7 @@ all the modules.</p>
       type. flags is either zero or SWIG_POINTER_DISOWN (see below).
     </p>
 
-<H3><a name="collection"></a>18.6.1 Garbage collection</H3>
+<H3><a name="collection"></a>19.6.1 Garbage collection</H3>
 
 
   <p>If the owner flag passed to <code>SWIG_NewPointerObj</code> is 1, <code>NewPointerObj</code> will add a
@@ -551,7 +551,7 @@ all the modules.</p>
   must be called manually.
   </p>
 
-<H2><a name="Chicken_nn18"></a>18.7 Unsupported features and known problems</H2>
+<H2><a name="Chicken_nn18"></a>19.7 Unsupported features and known problems</H2>
 
 
     <ul>
@@ -561,7 +561,7 @@ all the modules.</p>
           <a href="SWIGPlus.html#SWIGPlus_default_args">%feature(compactdefaultargs)</a>.</li>
     </ul>
 
-<H3><a name="Chicken_nn19"></a>18.7.1 TinyCLOS problems with Chicken version &lt;= 1.92</H3>
+<H3><a name="Chicken_nn19"></a>19.7.1 TinyCLOS problems with Chicken version &lt;= 1.92</H3>
 
 
     <p>In Chicken versions equal to or below 1.92, TinyCLOS has a limitation such that generic methods do not properly work on methods
diff --git a/Doc/Manual/Contents.html b/Doc/Manual/Contents.html
index c3197b9dc..ce7636732 100644
--- a/Doc/Manual/Contents.html
+++ b/Doc/Manual/Contents.html
@@ -162,7 +162,7 @@
 <li><a href="SWIG.html#SWIG_nn33">Character strings and structures</a>
 <li><a href="SWIG.html#SWIG_nn34">Array members</a>
 <li><a href="SWIG.html#SWIG_structure_data_members">Structure data members</a>
-<li><a href="SWIG.html#SWIG_nn36">C constructors and destructors </a>
+<li><a href="SWIG.html#SWIG_nn36">C constructors and destructors</a>
 <li><a href="SWIG.html#SWIG_adding_member_functions">Adding member functions to C structures</a>
 <li><a href="SWIG.html#SWIG_nested_structs">Nested structures</a>
 <li><a href="SWIG.html#SWIG_nn39">Other things to note about structure wrapping</a>
@@ -581,7 +581,61 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="CSharp.html#CSharp">17 SWIG and C#</a></h3>
+<h3><a href="COM.html#COM">17 SWIG and COM</a></h3>
+
+<!-- INDEX -->
+<div class="sectiontoc">
+<ul>
+<li><a href="COM.html#com_overview">Overview</a>
+<li><a href="COM.html#com_preliminaries">Preliminaries</a>
+<ul>
+<li><a href="COM.html#running_swig">Running SWIG</a>
+<li><a href="COM.html#com_commandline">Additional Commandline Options</a>
+<li><a href="COM.html#compiling_dynamic">Compiling a dynamic module</a>
+<li><a href="COM.html#using_module">Using your module</a>
+</ul>
+<li><a href="COM.html#com_basic_tour">A tour of basic C/C++ wrapping</a>
+<ul>
+<li><a href="COM.html#functions">Global functions</a>
+<li><a href="COM.html#global_variables">Global variables</a>
+<li><a href="COM.html#constants">Constants</a>
+<li><a href="COM.html#enumerations">Enumerations</a>
+<li><a href="COM.html#pointers">Pointers</a>
+<li><a href="COM.html#structures">Structures</a>
+<li><a href="COM.html#classes">C++ classes</a>
+<li><a href="COM.html#inheritance">C++ inheritance</a>
+<li><a href="COM.html#pointers_refs_arrays">Pointers, references, arrays and pass by value</a>
+<ul>
+<li><a href="COM.html#null_pointers">Null pointers</a>
+</ul>
+<li><a href="COM.html#overloaded_functions">C++ overloaded functions</a>
+<li><a href="COM.html#com_default_arguments">C++ default arguments</a>
+<li><a href="COM.html#namespaces">C++ namespaces</a>
+<li><a href="COM.html#templates">Constructors</a>
+<li><a href="COM.html#templates">C++ templates</a>
+<li><a href="COM.html#smart_pointers">C++ Smart Pointers</a>
+</ul>
+<li><a href="COM.html#further_details">Further details on COM wrapping</a>
+<ul>
+<li><a href="COM.html#com_classes_and_interfaces">Classes and interfaces</a>
+<li><a href="COM.html#com_module_class">Module class and class objects</a>
+<li><a href="COM.html#com_guids">GUID handling</a>
+<li><a href="COM.html#com_class_factories">Class factories and aggregation</a>
+<li><a href="COM.html#com_hresult">IDispatch and HRESULT as return value</a>
+<li><a href="COM.html#com_iswigwrappedobject">ISWIGWrappedObject interface</a>
+<li><a href="COM.html#com_memory">Memory management</a>
+<li><a href="COM.html#com_memory">Exceptions</a>
+</ul>
+<li><a href="COM.html#com_customization">Customization features</a>
+<ul>
+<li><a href="COM.html#com_typemaps">Typemaps</a>
+<li><a href="COM.html#com_typemaps">Exception handling</a>
+</ul>
+</ul>
+</div>
+<!-- INDEX -->
+
+<h3><a href="CSharp.html#CSharp">18 SWIG and C#</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -614,7 +668,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Chicken.html#Chicken">18 SWIG and Chicken</a></h3>
+<h3><a href="Chicken.html#Chicken">19 SWIG and Chicken</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -652,7 +706,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Guile.html#Guile">19 SWIG and Guile</a></h3>
+<h3><a href="Guile.html#Guile">20 SWIG and Guile</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -687,7 +741,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Java.html#Java">20 SWIG and Java</a></h3>
+<h3><a href="Java.html#Java">21 SWIG and Java</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -829,7 +883,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Lisp.html#Lisp">21 SWIG and Common Lisp</a></h3>
+<h3><a href="Lisp.html#Lisp">22 SWIG and Common Lisp</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -852,7 +906,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Lua.html#Lua">22 SWIG and Lua</a></h3>
+<h3><a href="Lua.html#Lua">23 SWIG and Lua</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -894,7 +948,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Modula3.html#Modula3">23 SWIG and Modula-3</a></h3>
+<h3><a href="Modula3.html#Modula3">24 SWIG and Modula-3</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -935,7 +989,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Mzscheme.html#Mzscheme">24 SWIG and MzScheme</a></h3>
+<h3><a href="Mzscheme.html#Mzscheme">25 SWIG and MzScheme</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -945,7 +999,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Ocaml.html#Ocaml">25 SWIG and Ocaml</a></h3>
+<h3><a href="Ocaml.html#Ocaml">26 SWIG and Ocaml</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -996,7 +1050,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Octave.html#Octave">26 SWIG and Octave</a></h3>
+<h3><a href="Octave.html#Octave">27 SWIG and Octave</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1031,7 +1085,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Perl5.html#Perl5">27 SWIG and Perl5</a></h3>
+<h3><a href="Perl5.html#Perl5">28 SWIG and Perl5</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1098,7 +1152,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Php.html#Php">28 SWIG and PHP</a></h3>
+<h3><a href="Php.html#Php">29 SWIG and PHP</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1106,7 +1160,6 @@
 <li><a href="Php.html#Php_nn1">Generating PHP Extensions</a>
 <ul>
 <li><a href="Php.html#Php_nn1_1">Building a loadable extension</a>
-<li><a href="Php.html#Php_nn1_2">Building extensions into PHP</a>
 <li><a href="Php.html#Php_nn1_3">Using PHP Extensions</a>
 </ul>
 <li><a href="Php.html#Php_nn2">Basic PHP interface</a>
@@ -1129,7 +1182,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Pike.html#Pike">29 SWIG and Pike</a></h3>
+<h3><a href="Pike.html#Pike">30 SWIG and Pike</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1153,7 +1206,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Python.html#Python">30 SWIG and Python</a></h3>
+<h3><a href="Python.html#Python">31 SWIG and Python</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1253,7 +1306,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Ruby.html#Ruby">31 SWIG and Ruby</a></h3>
+<h3><a href="Ruby.html#Ruby">32 SWIG and Ruby</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1387,7 +1440,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Tcl.html#Tcl">32 SWIG and Tcl</a></h3>
+<h3><a href="Tcl.html#Tcl">33 SWIG and Tcl</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1452,7 +1505,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="R.html#R">33 SWIG and R</a></h3>
+<h3><a href="R.html#R">34 SWIG and R</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
@@ -1468,7 +1521,7 @@
 </div>
 <!-- INDEX -->
 
-<h3><a href="Extending.html#Extending">34 Extending SWIG to support new languages</a></h3>
+<h3><a href="Extending.html#Extending">35 Extending SWIG to support new languages</a></h3>
 
 <!-- INDEX -->
 <div class="sectiontoc">
diff --git a/Doc/Manual/Extending.html b/Doc/Manual/Extending.html
index 5639663a1..617327c9f 100644
--- a/Doc/Manual/Extending.html
+++ b/Doc/Manual/Extending.html
@@ -6,7 +6,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Extending"></a>34 Extending SWIG to support new languages</H1>
+<H1><a name="Extending"></a>35 Extending SWIG to support new languages</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -73,7 +73,7 @@
 
 
 
-<H2><a name="Extending_nn2"></a>34.1 Introduction</H2>
+<H2><a name="Extending_nn2"></a>35.1 Introduction</H2>
 
 
 <p>
@@ -89,7 +89,7 @@ Also, this chapter is not meant to be a hand-holding tutorial.  As a starting po
 you should probably look at one of SWIG's existing modules.
 </p>
 
-<H2><a name="Extending_nn3"></a>34.2 Prerequisites</H2>
+<H2><a name="Extending_nn3"></a>35.2 Prerequisites</H2>
 
 
 <p>
@@ -119,7 +119,7 @@ obvious, but almost all SWIG directives as well as the low-level generation of
 wrapper code are driven by C++ datatypes.
 </p>
 
-<H2><a name="Extending_nn4"></a>34.3 The Big Picture</H2>
+<H2><a name="Extending_nn4"></a>35.3 The Big Picture</H2>
 
 
 <p>
@@ -156,7 +156,7 @@ role in making the system work.  For example, both typemaps and declaration anno
 based on pattern matching and interact heavily with the underlying type system.
 </p>
 
-<H2><a name="Extending_nn5"></a>34.4 Execution Model</H2>
+<H2><a name="Extending_nn5"></a>35.4 Execution Model</H2>
 
 
 <p>
@@ -201,7 +201,7 @@ latter stage of compilation.
 The next few sections briefly describe some of these stages.
 </p>
 
-<H3><a name="Extending_nn6"></a>34.4.1 Preprocessing</H3>
+<H3><a name="Extending_nn6"></a>35.4.1 Preprocessing</H3>
 
 
 <p>
@@ -281,7 +281,7 @@ been expanded as well as everything else that goes into the low-level
 construction of the wrapper code.
 </p>
 
-<H3><a name="Extending_nn7"></a>34.4.2 Parsing</H3>
+<H3><a name="Extending_nn7"></a>35.4.2 Parsing</H3>
 
 
 <p>
@@ -382,7 +382,7 @@ returning a <tt>foo</tt> and taking types <tt>a</tt> and <tt>b</tt> as
 arguments).
 </p>
 
-<H3><a name="Extending_nn8"></a>34.4.3 Parse Trees</H3>
+<H3><a name="Extending_nn8"></a>35.4.3 Parse Trees</H3>
 
 
 <p>
@@ -637,7 +637,7 @@ $ swig -c++ -python -debug-module 4 example.i
 </pre>
 </div>
 
-<H3><a name="Extending_nn9"></a>34.4.4 Attribute namespaces</H3>
+<H3><a name="Extending_nn9"></a>35.4.4 Attribute namespaces</H3>
 
 
 <p>
@@ -656,7 +656,7 @@ that matches the name of the target language.  For example, <tt>python:foo</tt>
 <tt>perl:foo</tt>.
 </p>
 
-<H3><a name="Extending_nn10"></a>34.4.5 Symbol Tables</H3>
+<H3><a name="Extending_nn10"></a>35.4.5 Symbol Tables</H3>
 
 
 <p>
@@ -747,7 +747,7 @@ example.i:5. Previous declaration is foo_i(int )
 </pre>
 </div>
 
-<H3><a name="Extending_nn11"></a>34.4.6 The %feature directive</H3>
+<H3><a name="Extending_nn11"></a>35.4.6 The %feature directive</H3>
 
 
 <p>
@@ -803,7 +803,7 @@ For example, the exception code above is simply
 stored without any modifications.
 </p>
 
-<H3><a name="Extending_nn12"></a>34.4.7 Code Generation</H3>
+<H3><a name="Extending_nn12"></a>35.4.7 Code Generation</H3>
 
 
 <p>
@@ -925,7 +925,7 @@ public :
 The role of these functions is described shortly.
 </p>
 
-<H3><a name="Extending_nn13"></a>34.4.8 SWIG and XML</H3>
+<H3><a name="Extending_nn13"></a>35.4.8 SWIG and XML</H3>
 
 
 <p>
@@ -938,7 +938,7 @@ internal data structures, it may be useful to keep XML in the back of
 your mind as a model.
 </p>
 
-<H2><a name="Extending_nn14"></a>34.5 Primitive Data Structures</H2>
+<H2><a name="Extending_nn14"></a>35.5 Primitive Data Structures</H2>
 
 
 <p>
@@ -984,7 +984,7 @@ typedef Hash   Typetab;
 </pre>
 </div>
 
-<H3><a name="Extending_nn15"></a>34.5.1 Strings</H3>
+<H3><a name="Extending_nn15"></a>35.5.1 Strings</H3>
 
 
 <p>
@@ -1125,7 +1125,7 @@ Returns the number of replacements made (if any).
 
 </div>
 
-<H3><a name="Extending_nn16"></a>34.5.2 Hashes</H3>
+<H3><a name="Extending_nn16"></a>35.5.2 Hashes</H3>
 
 
 <p>
@@ -1202,7 +1202,7 @@ Returns the list of hash table keys.
 </div>
 
 
-<H3><a name="Extending_nn17"></a>34.5.3 Lists</H3>
+<H3><a name="Extending_nn17"></a>35.5.3 Lists</H3>
 
 
 <p>
@@ -1291,7 +1291,7 @@ If <tt>t</tt> is not a standard object, it is assumed to be a <tt>char *</tt>
 and is used to create a String object.
 </div>
 
-<H3><a name="Extending_nn18"></a>34.5.4 Common operations</H3>
+<H3><a name="Extending_nn18"></a>35.5.4 Common operations</H3>
 
 
 The following operations are applicable to all datatypes.
@@ -1346,7 +1346,7 @@ objects and report errors.
 Gets the line number associated with <tt>x</tt>.
 </div>
 
-<H3><a name="Extending_nn19"></a>34.5.5 Iterating over Lists and Hashes</H3>
+<H3><a name="Extending_nn19"></a>35.5.5 Iterating over Lists and Hashes</H3>
 
 
 To iterate over the elements of a list or a hash table, the following functions are used:
@@ -1391,7 +1391,7 @@ for (j = First(j); j.item; j= Next(j)) {
 
 </div>
 
-<H3><a name="Extending_nn20"></a>34.5.6 I/O</H3>
+<H3><a name="Extending_nn20"></a>35.5.6 I/O</H3>
 
 
 Special I/O functions are used for all internal I/O.  These operations
@@ -1527,7 +1527,7 @@ Similarly, the preprocessor and parser all operate on string-files.
 
 </div>
 
-<H2><a name="Extending_nn21"></a>34.6 Navigating and manipulating parse trees</H2>
+<H2><a name="Extending_nn21"></a>35.6 Navigating and manipulating parse trees</H2>
 
 
 Parse trees are built as collections of hash tables.   Each node is a hash table in which
@@ -1661,7 +1661,7 @@ Deletes a node from the parse tree.  Deletion reconnects siblings and properly u
 the parent so that sibling nodes are unaffected.
 </div>
 
-<H2><a name="Extending_nn22"></a>34.7 Working with attributes</H2>
+<H2><a name="Extending_nn22"></a>35.7 Working with attributes</H2>
 
 
 <p>
@@ -1778,7 +1778,7 @@ the attribute is optional.   <tt>Swig_restore()</tt> must always be called after
 function.
 </div>
 
-<H2><a name="Extending_nn23"></a>34.8 Type system</H2>
+<H2><a name="Extending_nn23"></a>35.8 Type system</H2>
 
 
 <p>
@@ -1787,7 +1787,7 @@ pointers, references, and pointers to members.   A detailed discussion of
 type theory is impossible here.   However, let's cover the highlights.
 </p>
 
-<H3><a name="Extending_nn24"></a>34.8.1 String encoding of types</H3>
+<H3><a name="Extending_nn24"></a>35.8.1 String encoding of types</H3>
 
 
 <p>
@@ -1888,7 +1888,7 @@ make the final type, the two parts are just joined together using
 string concatenation.
 </p>
 
-<H3><a name="Extending_nn25"></a>34.8.2 Type construction</H3>
+<H3><a name="Extending_nn25"></a>35.8.2 Type construction</H3>
 
 
 <p>
@@ -2057,7 +2057,7 @@ Returns the prefix of a type. For example, if <tt>ty</tt> is
 <tt>ty</tt> is unmodified.
 </div>
 
-<H3><a name="Extending_nn26"></a>34.8.3 Type tests</H3>
+<H3><a name="Extending_nn26"></a>35.8.3 Type tests</H3>
 
 
 <p>
@@ -2144,7 +2144,7 @@ Checks if <tt>ty</tt> is a varargs type.
 Checks if <tt>ty</tt> is a templatized type.
 </div>
 
-<H3><a name="Extending_nn27"></a>34.8.4 Typedef and inheritance</H3>
+<H3><a name="Extending_nn27"></a>35.8.4 Typedef and inheritance</H3>
 
 
 <p>
@@ -2246,7 +2246,7 @@ Fully reduces <tt>ty</tt> according to typedef rules.  Resulting datatype
 will consist only of primitive typenames.
 </div>
 
-<H3><a name="Extending_nn28"></a>34.8.5 Lvalues</H3>
+<H3><a name="Extending_nn28"></a>35.8.5 Lvalues</H3>
 
 
 <p>
@@ -2283,7 +2283,7 @@ Literal y;    // type = 'Literal', ltype='p.char'
 </pre>
 </div>
 
-<H3><a name="Extending_nn29"></a>34.8.6 Output functions</H3>
+<H3><a name="Extending_nn29"></a>35.8.6 Output functions</H3>
 
 
 <p>
@@ -2345,7 +2345,7 @@ SWIG, but is most commonly associated with type-descriptor objects
 that appear in wrappers (e.g., <tt>SWIGTYPE_p_double</tt>).
 </div>
 
-<H2><a name="Extending_nn30"></a>34.9 Parameters</H2>
+<H2><a name="Extending_nn30"></a>35.9 Parameters</H2>
 
 
 <p>
@@ -2444,7 +2444,7 @@ included.  Used to emit prototypes.
 Returns the number of required (non-optional) arguments in <tt>p</tt>.
 </div>
 
-<H2><a name="Extending_nn31"></a>34.10 Writing a Language Module</H2>
+<H2><a name="Extending_nn31"></a>35.10 Writing a Language Module</H2>
 
 
 <p>
@@ -2459,7 +2459,7 @@ describes the creation of a minimal Python module.   You should be able to extra
 this to other languages.
 </p>
 
-<H3><a name="Extending_nn32"></a>34.10.1 Execution model</H3>
+<H3><a name="Extending_nn32"></a>35.10.1 Execution model</H3>
 
 
 <p>
@@ -2469,7 +2469,7 @@ the parsing of command line options, all aspects of code generation are controll
 different methods of the <tt>Language</tt> that must be defined by your module.
 </p>
 
-<H3><a name="Extending_nn33"></a>34.10.2 Starting out</H3>
+<H3><a name="Extending_nn33"></a>35.10.2 Starting out</H3>
 
 
 <p>
@@ -2577,7 +2577,7 @@ that activates your module. For example, <tt>swig -python foo.i</tt>. The
 messages from your new module should appear.
 </p>
 
-<H3><a name="Extending_nn34"></a>34.10.3 Command line options</H3>
+<H3><a name="Extending_nn34"></a>35.10.3 Command line options</H3>
 
 
 <p>
@@ -2636,7 +2636,7 @@ to mark the option as valid.   If you forget to do this, SWIG will terminate wit
 unrecognized command line option error.
 </p>
 
-<H3><a name="Extending_nn35"></a>34.10.4 Configuration and preprocessing</H3>
+<H3><a name="Extending_nn35"></a>35.10.4 Configuration and preprocessing</H3>
 
 
 <p>
@@ -2685,7 +2685,7 @@ an implementation file <tt>python.cxx</tt> and a configuration file
 <tt>python.swg</tt>.
 </p>
 
-<H3><a name="Extending_nn36"></a>34.10.5 Entry point to code generation</H3>
+<H3><a name="Extending_nn36"></a>35.10.5 Entry point to code generation</H3>
 
 
 <p>
@@ -2743,7 +2743,7 @@ int Python::top(Node *n) {
 </pre>
 </div>
 
-<H3><a name="Extending_nn37"></a>34.10.6 Module I/O and wrapper skeleton</H3>
+<H3><a name="Extending_nn37"></a>35.10.6 Module I/O and wrapper skeleton</H3>
 
 
 <!-- please report bugs in this section to mgossage -->
@@ -2885,7 +2885,7 @@ functionWrapper   : void Shape_y_set(Shape *self,double y)
 </pre>
 </div>
 
-<H3><a name="Extending_nn38"></a>34.10.7 Low-level code generators</H3>
+<H3><a name="Extending_nn38"></a>35.10.7 Low-level code generators</H3>
 
 
 <!-- please report bugs in this section to mgossage -->
@@ -3039,7 +3039,7 @@ but without the typemaps, there is still work to do.
 </p>
 
 
-<H3><a name="Extending_nn39"></a>34.10.8 Configuration files</H3>
+<H3><a name="Extending_nn39"></a>35.10.8 Configuration files</H3>
 
 
 <!-- please report bugs in this section to ttn -->
@@ -3189,7 +3189,7 @@ politely displays the ignoring language message.
 </dl>
 
 
-<H3><a name="Extending_nn40"></a>34.10.9 Runtime support</H3>
+<H3><a name="Extending_nn40"></a>35.10.9 Runtime support</H3>
 
 
 <p>
@@ -3198,7 +3198,7 @@ Discuss the kinds of functions typically needed for SWIG runtime support (e.g.
 the SWIG files that implement those functions.
 </p>
 
-<H3><a name="Extending_nn41"></a>34.10.10 Standard library files</H3>
+<H3><a name="Extending_nn41"></a>35.10.10 Standard library files</H3>
 
 
 <p>
@@ -3217,7 +3217,7 @@ The following are the minimum that are usually supported:
 Please copy these and modify for any new language.
 </p>
 
-<H3><a name="Extending_nn42"></a>34.10.11 Examples and test cases</H3>
+<H3><a name="Extending_nn42"></a>35.10.11 Examples and test cases</H3>
 
 
 <p>
@@ -3246,7 +3246,7 @@ during this process, see the section on <a href="#n37a">configuration
 files</a>.
 </p>
 
-<H3><a name="Extending_nn43"></a>34.10.12 Documentation</H3>
+<H3><a name="Extending_nn43"></a>35.10.12 Documentation</H3>
 
 
 <p>
@@ -3278,7 +3278,7 @@ Some topics that you'll want to be sure to address include:
      if available.
 </ul>
 
-<H3><a name="Extending_prerequisites"></a>34.10.13 Prerequisites for adding a new language module to the SWIG distribution</H3>
+<H3><a name="Extending_prerequisites"></a>35.10.13 Prerequisites for adding a new language module to the SWIG distribution</H3>
 
 
 <p>
@@ -3335,7 +3335,7 @@ should be added should there be an area not already covered by
 the existing tests.
 </p>
 
-<H3><a name="Extending_coding_style_guidelines"></a>34.10.14 Coding style guidelines</H3>
+<H3><a name="Extending_coding_style_guidelines"></a>35.10.14 Coding style guidelines</H3>
 
 
 <p>
@@ -3359,13 +3359,13 @@ The generated C/C++ code should also follow this style as close as possible. How
 should be avoided as unlike the SWIG developers, users will never have consistent tab settings.
 </p>
 
-<H2><a name="Extending_nn44"></a>34.11 Typemaps</H2>
+<H2><a name="Extending_nn44"></a>35.11 Typemaps</H2>
 
 
-<H3><a name="Extending_nn45"></a>34.11.1 Proxy classes</H3>
+<H3><a name="Extending_nn45"></a>35.11.1 Proxy classes</H3>
 
 
-<H2><a name="Extending_nn46"></a>34.12 Guide to parse tree nodes</H2>
+<H2><a name="Extending_nn46"></a>35.12 Guide to parse tree nodes</H2>
 
 
 <p>
diff --git a/Doc/Manual/Guile.html b/Doc/Manual/Guile.html
index 20ab716e4..cf7e8da2c 100644
--- a/Doc/Manual/Guile.html
+++ b/Doc/Manual/Guile.html
@@ -8,7 +8,7 @@
 
 <body bgcolor="#ffffff">
 
-<H1><a name="Guile"></a>19 SWIG and Guile</H1>
+<H1><a name="Guile"></a>20 SWIG and Guile</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -47,7 +47,7 @@
 <p>
 This section details guile-specific support in SWIG.
 
-<H2><a name="Guile_nn2"></a>19.1 Meaning of "Module"</H2>
+<H2><a name="Guile_nn2"></a>20.1 Meaning of "Module"</H2>
 
 
 <p>
@@ -55,7 +55,7 @@ There are three different concepts of "module" involved, defined
 separately for SWIG, Guile, and Libtool.  To avoid horrible confusion,
 we explicitly prefix the context, e.g., "guile-module".
 
-<H2><a name="Guile_nn3"></a>19.2 Using the SCM or GH Guile API</H2>
+<H2><a name="Guile_nn3"></a>20.2 Using the SCM or GH Guile API</H2>
 
 
 <p>The guile module can currently export wrapper files that use the guile GH interface or the
@@ -103,7 +103,7 @@ for the specific API.  Currently only the guile language module has created a ma
 but there is no reason other languages (like mzscheme or chicken) couldn't also use this.  
 If that happens, there is A LOT less code duplication in the standard typemaps.</p>
 
-<H2><a name="Guile_nn4"></a>19.3 Linkage</H2>
+<H2><a name="Guile_nn4"></a>20.3 Linkage</H2>
 
 
 <p>
@@ -111,7 +111,7 @@ Guile support is complicated by a lack of user community cohesiveness,
 which manifests in multiple shared-library usage conventions.  A set of
 policies implementing a usage convention is called a <b>linkage</b>.
 
-<H3><a name="Guile_nn5"></a>19.3.1 Simple Linkage</H3>
+<H3><a name="Guile_nn5"></a>20.3.1 Simple Linkage</H3>
 
 
 <p>
@@ -206,7 +206,7 @@ placed between the <code>define-module</code> form and the
 <code>SWIG_init</code> via a preprocessor define to avoid symbol
 clashes. For this case, however, passive linkage is available.
 
-<H3><a name="Guile_nn6"></a>19.3.2 Passive Linkage</H3>
+<H3><a name="Guile_nn6"></a>20.3.2 Passive Linkage</H3>
 
 
 <p>Passive linkage is just like simple linkage, but it generates an
@@ -216,7 +216,7 @@ package name (see below).
 <p>You should use passive linkage rather than simple linkage when you
 are using multiple modules.
 
-<H3><a name="Guile_nn7"></a>19.3.3 Native Guile Module Linkage</H3>
+<H3><a name="Guile_nn7"></a>20.3.3 Native Guile Module Linkage</H3>
 
 
 <p>SWIG can also generate wrapper code that does all the Guile module
@@ -257,7 +257,7 @@ Newer Guile versions have a shorthand procedure for this:
 </div>
 </ul>
 
-<H3><a name="Guile_nn8"></a>19.3.4 Old Auto-Loading Guile Module Linkage</H3>
+<H3><a name="Guile_nn8"></a>20.3.4 Old Auto-Loading Guile Module Linkage</H3>
 
 
 <p>Guile used to support an autoloading facility for object-code
@@ -283,7 +283,7 @@ option, SWIG generates an exported module initialization function with
 an appropriate name. 
 
 
-<H3><a name="Guile_nn9"></a>19.3.5 Hobbit4D Linkage</H3>
+<H3><a name="Guile_nn9"></a>20.3.5 Hobbit4D Linkage</H3>
 
 
 <p>
@@ -308,7 +308,7 @@ my/lib/libfoo.so.X.Y.Z and friends.  This scheme is still very
 experimental; the (hobbit4d link) conventions are not well understood.
 </p>
 
-<H2><a name="Guile_nn10"></a>19.4 Underscore Folding</H2>
+<H2><a name="Guile_nn10"></a>20.4 Underscore Folding</H2>
 
 
 <p>
@@ -320,7 +320,7 @@ complained so far.
 <code>%rename</code> to specify the Guile name of the wrapped
 functions and variables (see CHANGES).
 
-<H2><a name="Guile_nn11"></a>19.5 Typemaps</H2>
+<H2><a name="Guile_nn11"></a>20.5 Typemaps</H2>
 
 
 <p>
@@ -412,7 +412,7 @@ constant will appear as a scheme variable. See
 <a href="Customization.html#features">Features and the %feature directive</a>
 for info on how to apply the %feature.</p>
 
-<H2><a name="Guile_nn12"></a>19.6 Representation of pointers as smobs</H2>
+<H2><a name="Guile_nn12"></a>20.6 Representation of pointers as smobs</H2>
 
 
 <p>
@@ -433,7 +433,7 @@ representing the expected pointer type.  See also
 If the Scheme object passed was not a SWIG smob representing a compatible
 pointer, a <code>wrong-type-arg</code> exception is raised.
 
-<H3><a name="Guile_nn13"></a>19.6.1 GH Smobs</H3>
+<H3><a name="Guile_nn13"></a>20.6.1 GH Smobs</H3>
 
 
 <p>
@@ -462,7 +462,7 @@ that created them, so the first module we check will most likely be correct.
 Once we have a swig_type_info structure, we loop through the linked list of
 casts, using pointer comparisons.</p>
 
-<H3><a name="Guile_nn14"></a>19.6.2 SCM Smobs</H3>
+<H3><a name="Guile_nn14"></a>20.6.2 SCM Smobs</H3>
 
 
 <p>The SCM interface (using the "-scm" argument to swig) uses swigrun.swg.
@@ -477,7 +477,7 @@ in the smob tag.  If a generated GOOPS module has been loaded, smobs will be wra
 GOOPS class.</p>
 
 
-<H3><a name="Guile_nn15"></a>19.6.3 Garbage Collection</H3>
+<H3><a name="Guile_nn15"></a>20.6.3 Garbage Collection</H3>
 
 
 <p>Garbage collection is a feature of the new SCM interface, and it is automatically included
@@ -491,7 +491,7 @@ is exactly like described in <a href="Customization.html#ownership">
 Object ownership and %newobject</a> in the SWIG manual.  All typemaps use an $owner var, and
 the guile module replaces $owner with 0 or 1 depending on feature:new.</p>
 
-<H2><a name="Guile_nn16"></a>19.7 Exception Handling</H2>
+<H2><a name="Guile_nn16"></a>20.7 Exception Handling</H2>
 
 
 <p>
@@ -517,7 +517,7 @@ mapping:
 The default when not specified here is to use "swig-error".
 See Lib/exception.i for details.
 
-<H2><a name="Guile_nn17"></a>19.8 Procedure documentation</H2>
+<H2><a name="Guile_nn17"></a>20.8 Procedure documentation</H2>
 
 
 <p>If invoked with the command-line option <code>-procdoc
@@ -553,7 +553,7 @@ like this:
 typemap argument <code>doc</code>. See <code>Lib/guile/typemaps.i</code> for
 details.
 
-<H2><a name="Guile_nn18"></a>19.9 Procedures with setters</H2>
+<H2><a name="Guile_nn18"></a>20.9 Procedures with setters</H2>
 
 
 <p>For global variables, SWIG creates a single wrapper procedure
@@ -581,7 +581,7 @@ struct members, the procedures <code>(<var>struct</var>-<var>member</var>-get
 pointer)</code> and <code>(<var>struct-member</var>-set pointer
 value)</code> are <em>not</em> generated.
 
-<H2><a name="Guile_nn19"></a>19.10 GOOPS Proxy Classes</H2>
+<H2><a name="Guile_nn19"></a>20.10 GOOPS Proxy Classes</H2>
 
 
 <p>SWIG can also generate classes and generic functions for use with
@@ -730,7 +730,7 @@ Notice that &lt;Foo&gt; is used before it is defined.  The fix is to just put th
 <code>%import "foo.h"</code> before the <code>%inline</code> block.
 </p>
 
-<H3><a name="Guile_nn20"></a>19.10.1 Naming Issues</H3>
+<H3><a name="Guile_nn20"></a>20.10.1 Naming Issues</H3>
 
 
 <p>As you can see in the example above, there are potential naming conflicts.  The default exported
@@ -769,7 +769,7 @@ guile-modules.  For example,</p>
 
 <p>TODO: Renaming class name prefixes?</p>
 
-<H3><a name="Guile_nn21"></a>19.10.2 Linking</H3>
+<H3><a name="Guile_nn21"></a>20.10.2 Linking</H3>
 
 
 <p>The guile-modules generated above all need to be linked together.  GOOPS support requires
diff --git a/Doc/Manual/Java.html b/Doc/Manual/Java.html
index 518426f5a..21085c803 100644
--- a/Doc/Manual/Java.html
+++ b/Doc/Manual/Java.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body bgcolor="#FFFFFF">
-<H1><a name="Java"></a>20 SWIG and Java</H1>
+<H1><a name="Java"></a>21 SWIG and Java</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -154,7 +154,7 @@ It covers most SWIG features, but certain low-level details are covered in less
 </p>
 
 
-<H2><a name="java_overview"></a>20.1 Overview</H2>
+<H2><a name="java_overview"></a>21.1 Overview</H2>
 
 
 <p>
@@ -189,7 +189,7 @@ Various customisation tips and techniques using SWIG directives are covered.
 The latter sections cover the advanced techniques of using typemaps for complete control of the wrapping process.
 </p>
 
-<H2><a name="java_preliminaries"></a>20.2 Preliminaries</H2>
+<H2><a name="java_preliminaries"></a>21.2 Preliminaries</H2>
 
 
 <p>
@@ -205,7 +205,7 @@ Run <tt>make -k check</tt> from the SWIG root directory after installing SWIG on
 The Java module requires your system to support shared libraries and dynamic loading. 
 This is the commonly used method to load JNI code so your system will more than likely support this.</p>
 
-<H3><a name="running_swig"></a>20.2.1 Running SWIG</H3>
+<H3><a name="running_swig"></a>21.2.1 Running SWIG</H3>
 
 
 <p>
@@ -258,7 +258,7 @@ The following sections have further practical examples and details on how you mi
 compiling and using the generated files.
 </p>
 
-<H3><a name="java_commandline"></a>20.2.2 Additional Commandline Options</H3>
+<H3><a name="java_commandline"></a>21.2.2 Additional Commandline Options</H3>
 
 
 <p>
@@ -295,7 +295,7 @@ swig -java -help
 Their use will become clearer by the time you have finished reading this section on SWIG and Java.
 </p>
 
-<H3><a name="getting_right_headers"></a>20.2.3 Getting the right header files</H3>
+<H3><a name="getting_right_headers"></a>21.2.3 Getting the right header files</H3>
 
 
 <p>
@@ -310,7 +310,7 @@ They are usually in directories like this:</p>
 <p>
 The exact location may vary on your machine, but the above locations are typical. </p>
 
-<H3><a name="compiling_dynamic"></a>20.2.4 Compiling a dynamic module</H3>
+<H3><a name="compiling_dynamic"></a>21.2.4 Compiling a dynamic module</H3>
 
 
 <p>
@@ -346,7 +346,7 @@ The name of the shared library output file is important.
 If the name of your SWIG module is "<tt>example</tt>", the name of the corresponding shared library file should be "<tt>libexample.so</tt>" (or equivalent depending on your machine, see <a href="#dynamic_linking_problems">Dynamic linking problems</a> for more information). 
 The name of the module is specified using the <tt>%module</tt> directive or<tt> -module</tt> command line option.</p>
 
-<H3><a name="using_module"></a>20.2.5 Using your module</H3>
+<H3><a name="using_module"></a>21.2.5 Using your module</H3>
 
 
 <p>
@@ -381,7 +381,7 @@ $
 If it doesn't work have a look at the following section which discusses problems loading the shared library.
 </p>
 
-<H3><a name="dynamic_linking_problems"></a>20.2.6 Dynamic linking problems</H3>
+<H3><a name="dynamic_linking_problems"></a>21.2.6 Dynamic linking problems</H3>
 
 
 <p>
@@ -455,7 +455,7 @@ The following section also contains some C++ specific linking problems and solut
 </p>
 
 
-<H3><a name="compilation_problems_cpp"></a>20.2.7 Compilation problems and compiling with C++</H3>
+<H3><a name="compilation_problems_cpp"></a>21.2.7 Compilation problems and compiling with C++</H3>
 
 
 <p>
@@ -508,7 +508,7 @@ Finally make sure the version of JDK header files matches the version of Java th
 </p>
 
 
-<H3><a name="building_windows"></a>20.2.8 Building on Windows</H3>
+<H3><a name="building_windows"></a>21.2.8 Building on Windows</H3>
 
 
 <p>
@@ -517,7 +517,7 @@ You will want to produce a DLL that can be loaded by the Java Virtual Machine.
 This section covers the process of using SWIG with Microsoft Visual C++ 6 although the procedure may be similar with other compilers.  
 In order for everything to work, you will need to have a JDK installed on your machine in order to read the JNI header files.</p>
 
-<H4><a name="visual_studio"></a>20.2.8.1 Running SWIG from Visual Studio</H4>
+<H4><a name="visual_studio"></a>21.2.8.1 Running SWIG from Visual Studio</H4>
 
 
 <p>
@@ -556,7 +556,7 @@ To run the native code in the DLL (example.dll), make sure that it is in your pa
 If the library fails to load have a look at <a href="#dynamic_linking_problems">Dynamic linking problems</a>.
 </p>
 
-<H4><a name="nmake"></a>20.2.8.2 Using NMAKE</H4>
+<H4><a name="nmake"></a>21.2.8.2 Using NMAKE</H4>
 
 
 <p>
@@ -615,7 +615,7 @@ Of course you may want to make changes for it to work for C++ by adding in the -
 </p>
 
 
-<H2><a name="java_basic_tour"></a>20.3 A tour of basic C/C++ wrapping</H2>
+<H2><a name="java_basic_tour"></a>21.3 A tour of basic C/C++ wrapping</H2>
 
 
 <p>
@@ -625,7 +625,7 @@ variables are wrapped with JavaBean type getters and setters and so forth.
 This section briefly covers the essential aspects of this wrapping.
 </p>
 
-<H3><a name="module_packages_classes"></a>20.3.1 Modules, packages and generated Java classes</H3>
+<H3><a name="module_packages_classes"></a>21.3.1 Modules, packages and generated Java classes</H3>
 
 
 <p>
@@ -659,7 +659,7 @@ swig -java -package com.bloggs.swig -outdir com/bloggs/swig example.i
 
 SWIG won't create the directory, so make sure it exists beforehand.
 
-<H3><a name="functions"></a>20.3.2 Functions</H3>
+<H3><a name="functions"></a>21.3.2 Functions</H3>
 
 
 <p>
@@ -693,7 +693,7 @@ System.out.println(example.fact(4));
 </pre></div>
 
 
-<H3><a name="global_variables"></a>20.3.3 Global variables</H3>
+<H3><a name="global_variables"></a>21.3.3 Global variables</H3>
 
 
 <p>
@@ -780,7 +780,7 @@ extern char *path;      // Read-only (due to %immutable)
 </div>
 
 
-<H3><a name="constants"></a>20.3.4 Constants</H3>
+<H3><a name="constants"></a>21.3.4 Constants</H3>
 
 
 <p>
@@ -920,7 +920,7 @@ Or if you decide this practice isn't so bad and your own class implements <tt>ex
 </p>
 
 
-<H3><a name="enumerations"></a>20.3.5 Enumerations</H3>
+<H3><a name="enumerations"></a>21.3.5 Enumerations</H3>
 
 
 <p>
@@ -934,7 +934,7 @@ The final two approaches use simple integers for each enum item.
 Before looking at the various approaches for wrapping named C/C++ enums, anonymous enums are considered.
 </p>
 
-<H4><a name="anonymous_enums"></a>20.3.5.1 Anonymous enums</H4>
+<H4><a name="anonymous_enums"></a>21.3.5.1 Anonymous enums</H4>
 
 
 <p>
@@ -997,7 +997,7 @@ As in the case of constants, you can access them through either the module class
 </p>
 
 
-<H4><a name="typesafe_enums"></a>20.3.5.2 Typesafe enums</H4>
+<H4><a name="typesafe_enums"></a>21.3.5.2 Typesafe enums</H4>
 
 
 <p>
@@ -1090,7 +1090,7 @@ When upgrading to JDK 1.5 or later, proper Java enums could be used instead, wit
 The following section details proper Java enum generation.
 </p>
 
-<H4><a name="proper_enums"></a>20.3.5.3 Proper Java enums</H4>
+<H4><a name="proper_enums"></a>21.3.5.3 Proper Java enums</H4>
 
 
 <p>
@@ -1143,7 +1143,7 @@ The additional support methods need not be generated if none of the enum items h
 <a href="#simpler_enum_classes">Simpler Java enums for enums without initializers</a> section.
 </p>
 
-<H4><a name="typeunsafe_enums"></a>20.3.5.4 Type unsafe enums</H4>
+<H4><a name="typeunsafe_enums"></a>21.3.5.4 Type unsafe enums</H4>
 
 
 <p>
@@ -1191,7 +1191,7 @@ Note that unlike typesafe enums, this approach requires users to mostly use diff
 Thus the upgrade path to proper enums provided in JDK 1.5 is more painful.
 </p>
 
-<H4><a name="simple_enums"></a>20.3.5.5 Simple enums</H4>
+<H4><a name="simple_enums"></a>21.3.5.5 Simple enums</H4>
 
 
 <p>
@@ -1210,7 +1210,7 @@ SWIG-1.3.21 and earlier versions wrapped all enums using this approach.
 The type unsafe approach is preferable to this one and this simple approach is only included for backwards compatibility with these earlier versions of SWIG.
 </p>
 
-<H3><a name="pointers"></a>20.3.6 Pointers</H3>
+<H3><a name="pointers"></a>21.3.6 Pointers</H3>
 
 
 <p>
@@ -1298,7 +1298,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return
 a NULL pointer if the conversion can't be performed.
 </p>
 
-<H3><a name="structures"></a>20.3.7 Structures</H3>
+<H3><a name="structures"></a>21.3.7 Structures</H3>
 
 
 <p>
@@ -1466,7 +1466,7 @@ x.setA(3);          // Modify x.a - this is the same as b.f.a
 </div>
 
 
-<H3><a name="classes"></a>20.3.8 C++ classes</H3>
+<H3><a name="classes"></a>21.3.8 C++ classes</H3>
 
 
 <p>
@@ -1529,7 +1529,7 @@ int bar = Spam.getBar();
 </div>
 
 
-<H3><a name="inheritance"></a>20.3.9 C++ inheritance</H3>
+<H3><a name="inheritance"></a>21.3.9 C++ inheritance</H3>
 
 
 <p>
@@ -1590,7 +1590,7 @@ Note that Java does not support multiple inheritance so any multiple inheritance
 A warning is given when multiple inheritance is detected and only the first base class is used. 
 </p>
 
-<H3><a name="pointers_refs_arrays"></a>20.3.10 Pointers, references, arrays and pass by value</H3>
+<H3><a name="pointers_refs_arrays"></a>21.3.10 Pointers, references, arrays and pass by value</H3>
 
 
 <p>
@@ -1645,7 +1645,7 @@ to hold the result and a pointer is returned (Java will release this memory
 when the returned object's finalizer is run by the garbage collector).
 </p>
 
-<H4><a name="null_pointers"></a>20.3.10.1 Null pointers</H4>
+<H4><a name="null_pointers"></a>21.3.10.1 Null pointers</H4>
 
 
 <p>
@@ -1669,7 +1669,7 @@ For <tt>spam1</tt> and <tt>spam4</tt> above the Java <tt>null</tt> gets translat
 The converse also occurs, that is, NULL pointers are translated into <tt>null</tt> Java objects when returned from a C/C++ function.
 </p>
 
-<H3><a name="overloaded_functions"></a>20.3.11 C++ overloaded functions</H3>
+<H3><a name="overloaded_functions"></a>21.3.11 C++ overloaded functions</H3>
 
 
 <p>
@@ -1784,7 +1784,7 @@ void spam(unsigned short);   // Ignored
 </pre>
 </div>
 
-<H3><a name="java_default_arguments"></a>20.3.12 C++ default arguments</H3>
+<H3><a name="java_default_arguments"></a>21.3.12 C++ default arguments</H3>
 
 
 <p>
@@ -1827,7 +1827,7 @@ Further details on default arguments and how to restore this approach are given
 </p>
 
 
-<H3><a name="namespaces"></a>20.3.13 C++ namespaces</H3>
+<H3><a name="namespaces"></a>21.3.13 C++ namespaces</H3>
 
 
 <p>
@@ -1887,7 +1887,7 @@ symbols separate, consider wrapping them as separate SWIG modules.
 Each SWIG module can be placed into a separate package.
 </p>
 
-<H3><a name="templates"></a>20.3.14 C++ templates</H3>
+<H3><a name="templates"></a>21.3.14 C++ templates</H3>
 
 
 <p>
@@ -1936,7 +1936,7 @@ Obviously, there is more to template wrapping than shown in this example.
 More details can be found in the <a href="SWIGPlus.html#SWIGPlus">SWIG and C++</a> chapter.   
 </p>
 
-<H3><a name="smart_pointers"></a>20.3.15 C++ Smart Pointers</H3>
+<H3><a name="smart_pointers"></a>21.3.15 C++ Smart Pointers</H3>
 
 
 <p>
@@ -2020,7 +2020,7 @@ Foo f = p.__deref__();               // Returns underlying Foo *
 </pre>
 </div>
 
-<H2><a name="further_details"></a>20.4 Further details on the generated Java classes</H2>
+<H2><a name="further_details"></a>21.4 Further details on the generated Java classes</H2>
 
 
 <p>
@@ -2035,7 +2035,7 @@ Finally enum classes are covered.
 First, the crucial intermediary JNI class is considered.
 </p>
 
-<H3><a name="imclass"></a>20.4.1 The intermediary JNI class</H3>
+<H3><a name="imclass"></a>21.4.1 The intermediary JNI class</H3>
 
 
 <p>
@@ -2155,7 +2155,7 @@ If <tt>name</tt> is the same as <tt>modulename</tt> then the module class name g
 from <tt>modulename</tt> to <tt>modulenameModule</tt>.
 </p>
 
-<H4><a name="imclass_pragmas"></a>20.4.1.1 The intermediary JNI class pragmas</H4>
+<H4><a name="imclass_pragmas"></a>21.4.1.1 The intermediary JNI class pragmas</H4>
 
 
 <p>
@@ -2234,7 +2234,7 @@ For example, let's change the intermediary JNI class access to public.
 All the methods in the intermediary JNI class will then be callable outside of the package as the method modifiers are public by default.
 </p>
 
-<H3><a name="java_module_class"></a>20.4.2 The Java module class</H3>
+<H3><a name="java_module_class"></a>21.4.2 The Java module class</H3>
 
 
 <p>
@@ -2265,7 +2265,7 @@ example.egg(new Foo());
 The primary reason for having the module class wrapping the calls in the intermediary JNI class is to implement static type checking. In this case only a <tt>Foo</tt> can be passed to the <tt>egg</tt> function, whereas any <tt>long</tt> can be passed to the <tt>egg</tt> function in the intermediary JNI class.
 </p>
 
-<H4><a name="module_class_pragmas"></a>20.4.2.1 The Java module class pragmas</H4>
+<H4><a name="module_class_pragmas"></a>21.4.2.1 The Java module class pragmas</H4>
 
 
 <p>
@@ -2316,7 +2316,7 @@ See <a href="#imclass_pragmas">The intermediary JNI class pragmas</a> section fo
 </p>
 
 
-<H3><a name="java_proxy_classes"></a>20.4.3 Java proxy classes</H3>
+<H3><a name="java_proxy_classes"></a>21.4.3 Java proxy classes</H3>
 
 
 <p>
@@ -2392,7 +2392,7 @@ int y = f.spam(5, new Foo());
 </pre>
 </div>
 
-<H4><a name="memory_management"></a>20.4.3.1 Memory management</H4>
+<H4><a name="memory_management"></a>21.4.3.1 Memory management</H4>
 
 
 <p>
@@ -2554,7 +2554,7 @@ and
 </p>
 
 
-<H4><a name="inheritance_mirroring"></a>20.4.3.2 Inheritance</H4>
+<H4><a name="inheritance_mirroring"></a>21.4.3.2 Inheritance</H4>
 
 
 <p>
@@ -2670,7 +2670,7 @@ However, true cross language polymorphism can be achieved using the <a href="#ja
 </p>
 
 
-<H4><a name="proxy_classes_gc"></a>20.4.3.3 Proxy classes and garbage collection</H4>
+<H4><a name="proxy_classes_gc"></a>21.4.3.3 Proxy classes and garbage collection</H4>
 
 
 <p>
@@ -2753,7 +2753,7 @@ The section on <a href="#java_typemaps">Java typemaps</a> details how to specify
 See the <a href="http://www.devx.com/Java/Article/30192">How to Handle Java Finalization's Memory-Retention Issues</a> article for alternative approaches to managing memory by avoiding finalizers altogether.
 </p>
 
-<H4><a name="java_pgcpp"></a>20.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling</H4>
+<H4><a name="java_pgcpp"></a>21.4.3.4 The premature garbage collection prevention parameter for proxy class marshalling</H4>
 
 
 <p>
@@ -2875,7 +2875,7 @@ For example:
 <b>Compatibility note:</b> The generation of this additional parameter did not occur in versions prior to SWIG-1.3.30.
 </p>
 
-<H4><a name="java_multithread_libraries"></a>20.4.3.5 Single threaded applications and thread safety</H4>
+<H4><a name="java_multithread_libraries"></a>21.4.3.5 Single threaded applications and thread safety</H4>
 
 
 <p>
@@ -2963,7 +2963,7 @@ for (int i=0; i&lt;100000; i++) {
 </pre></div>
  
 
-<H3><a name="type_wrapper_classes"></a>20.4.4 Type wrapper classes</H3>
+<H3><a name="type_wrapper_classes"></a>21.4.4 Type wrapper classes</H3>
 
 
 <p>
@@ -3050,7 +3050,7 @@ public static void spam(SWIGTYPE_p_int x, SWIGTYPE_p_int y, int z) { ... }
 </div>
 
 
-<H3><a name="enum_classes"></a>20.4.5 Enum classes</H3>
+<H3><a name="enum_classes"></a>21.4.5 Enum classes</H3>
 
 
 <p>
@@ -3059,7 +3059,7 @@ The <a href="#enumerations">Enumerations</a> section discussed these but omitted
 The following sub-sections detail the various types of enum classes that can be generated.
 </p>
 
-<H4><a name="typesafe_enums_classes"></a>20.4.5.1 Typesafe enum classes</H4>
+<H4><a name="typesafe_enums_classes"></a>21.4.5.1 Typesafe enum classes</H4>
 
 
 <p>
@@ -3143,7 +3143,7 @@ The <tt>swigValue</tt> method is used for marshalling in the other direction.
 The <tt>toString</tt> method is overridden so that the enum name is available.
 </p>
 
-<H4><a name="proper_enums_classes"></a>20.4.5.2 Proper Java enum classes</H4>
+<H4><a name="proper_enums_classes"></a>21.4.5.2 Proper Java enum classes</H4>
 
 
 <p>
@@ -3221,7 +3221,7 @@ These needn't be generated if the enum being wrapped does not have any initializ
 <a href="#simpler_enum_classes">Simpler Java enums for enums without initializers</a> section describes how typemaps can be used to achieve this.
 </p>
 
-<H4><a name="typeunsafe_enums_classes"></a>20.4.5.3 Type unsafe enum classes</H4>
+<H4><a name="typeunsafe_enums_classes"></a>21.4.5.3 Type unsafe enum classes</H4>
 
 
 <p>
@@ -3252,7 +3252,7 @@ public final class Beverage {
 </pre>
 </div>
 
-<H2><a name="java_directors"></a>20.5 Cross language polymorphism using directors</H2>
+<H2><a name="java_directors"></a>21.5 Cross language polymorphism using directors</H2>
 
 
 <p>
@@ -3274,7 +3274,7 @@ The upshot is that C++ classes can be extended in Java and from C++ these extens
 Neither C++ code nor Java code needs to know where a particular method is implemented: the combination of proxy classes, director classes, and C wrapper functions transparently takes care of all the cross-language method routing.
 </p>
 
-<H3><a name="java_enabling_directors"></a>20.5.1 Enabling directors</H3>
+<H3><a name="java_enabling_directors"></a>21.5.1 Enabling directors</H3>
 
 
 <p>
@@ -3345,7 +3345,7 @@ public:
 </pre>
 </div>
 
-<H3><a name="java_directors_classes"></a>20.5.2 Director classes</H3>
+<H3><a name="java_directors_classes"></a>21.5.2 Director classes</H3>
 
 
 <p>
@@ -3372,7 +3372,7 @@ If the correct implementation is in Java, the Java API is used to call the metho
 </p>
 
 
-<H3><a name="java_directors_overhead"></a>20.5.3 Overhead and code bloat</H3>
+<H3><a name="java_directors_overhead"></a>21.5.3 Overhead and code bloat</H3>
 
 
 <p>
@@ -3390,7 +3390,7 @@ This situation can be optimized by selectively enabling director methods (using
 </p>
 
 
-<H3><a name="java_directors_example"></a>20.5.4 Simple directors example</H3>
+<H3><a name="java_directors_example"></a>21.5.4 Simple directors example</H3>
 
 
 <p>
@@ -3455,7 +3455,7 @@ DirectorDerived::upcall_method() invoked.
 </pre>
 </div>
 
-<H3><a name="java_directors_threading"></a>20.5.5 Director threading issues</H3>
+<H3><a name="java_directors_threading"></a>21.5.5 Director threading issues</H3>
 
 
 <p>
@@ -3475,7 +3475,7 @@ Macros can be defined on the commandline when compiling your C++ code, or altern
 </pre>
 </div>
 
-<H2><a name="java_allprotected"></a>20.6 Accessing protected members</H2>
+<H2><a name="java_allprotected"></a>21.6 Accessing protected members</H2>
 
 
 <p>
@@ -3571,7 +3571,7 @@ class MyProtectedBase extends ProtectedBase
 
 
 
-<H2><a name="common_customization"></a>20.7 Common customization features</H2>
+<H2><a name="common_customization"></a>21.7 Common customization features</H2>
 
 
 <p>
@@ -3583,7 +3583,7 @@ be awkward.  This section describes some common SWIG features that are used
 to improve the interface to existing C/C++ code.
 </p>
 
-<H3><a name="helper_functions"></a>20.7.1 C/C++ helper functions</H3>
+<H3><a name="helper_functions"></a>21.7.1 C/C++ helper functions</H3>
 
 
 <p>
@@ -3649,7 +3649,7 @@ hard to implement.  It is possible to improve on this using Java code, typemaps,
 customization features as covered in later sections, but sometimes helper functions are a quick and easy solution to difficult cases.  
 </p>
 
-<H3><a name="class_extension"></a>20.7.2 Class extension with %extend</H3>
+<H3><a name="class_extension"></a>21.7.2 Class extension with %extend</H3>
 
 
 <p>
@@ -3712,7 +3712,7 @@ Vector(2,3,4)
 in any way---the extensions only show up in the Java interface.
 </p>
 
-<H3><a name="exception_handling"></a>20.7.3 Exception handling with %exception and %javaexception</H3>
+<H3><a name="exception_handling"></a>21.7.3 Exception handling with %exception and %javaexception</H3>
 
 
 <p>
@@ -3869,7 +3869,7 @@ to raise exceptions.  See the <a href="Library.html#Library">SWIG Library</a> ch
 The typemap example <a href="#exception_typemap">Handling C++ exception specifications as Java exceptions</a> provides further exception handling capabilities.
 </p>
 
-<H3><a name="method_access"></a>20.7.4 Method access with %javamethodmodifiers</H3>
+<H3><a name="method_access"></a>21.7.4 Method access with %javamethodmodifiers</H3>
 
 
 <p>
@@ -3895,7 +3895,7 @@ protected static void protect_me() {
 </pre>
 </div>
 
-<H2><a name="tips_techniques"></a>20.8 Tips and techniques</H2>
+<H2><a name="tips_techniques"></a>21.8 Tips and techniques</H2>
 
 
 <p>
@@ -3905,7 +3905,7 @@ strings and arrays.   This chapter discusses the common techniques for
 solving these problems.
 </p>
 
-<H3><a name="input_output_parameters"></a>20.8.1 Input and output parameters using primitive pointers and references</H3>
+<H3><a name="input_output_parameters"></a>21.8.1 Input and output parameters using primitive pointers and references</H3>
 
 
 <p>
@@ -4079,7 +4079,7 @@ void foo(Bar *OUTPUT);
 will not have the intended effect since <tt>typemaps.i</tt> does not define an OUTPUT rule for <tt>Bar</tt>.
 </p>
 
-<H3><a name="simple_pointers"></a>20.8.2 Simple pointers</H3>
+<H3><a name="simple_pointers"></a>21.8.2 Simple pointers</H3>
 
 
 <p>
@@ -4145,7 +4145,7 @@ System.out.println("3 + 4 = " + result);
 See the <a href="Library.html#Library">SWIG Library</a> chapter for further details.
 </p>
 
-<H3><a name="c_arrays"></a>20.8.3 Wrapping C arrays with Java arrays</H3>
+<H3><a name="c_arrays"></a>21.8.3 Wrapping C arrays with Java arrays</H3>
 
 
 <p>
@@ -4212,7 +4212,7 @@ Please be aware that the typemaps in this library are not efficient as all the e
 There is an alternative approach using the SWIG array library and this is covered in the next section.
 </p>
 
-<H3><a name="unbounded_c_arrays"></a>20.8.4 Unbounded C Arrays</H3>
+<H3><a name="unbounded_c_arrays"></a>21.8.4 Unbounded C Arrays</H3>
 
 
 <p>
@@ -4357,7 +4357,7 @@ well suited for applications in which you need to create buffers,
 package binary data, etc.
 </p>
 
-<H3><a name="java_heap_allocations"></a>20.8.5 Overriding new and delete to allocate from Java heap</H3>
+<H3><a name="java_heap_allocations"></a>21.8.5 Overriding new and delete to allocate from Java heap</H3>
 
 
 <p>
@@ -4474,7 +4474,7 @@ model and use these functions in place of malloc and free in your own
 code.
 </p>
 
-<H2><a name="java_typemaps"></a>20.9 Java typemaps</H2>
+<H2><a name="java_typemaps"></a>21.9 Java typemaps</H2>
 
 
 <p>
@@ -4495,7 +4495,7 @@ Before proceeding, it should be stressed that typemaps are not a required
 part of using SWIG---the default wrapping behavior is enough in most cases.
 Typemaps are only used if you want to change some aspect of the generated code.
 
-<H3><a name="default_primitive_type_mappings"></a>20.9.1 Default primitive type mappings</H3>
+<H3><a name="default_primitive_type_mappings"></a>21.9.1 Default primitive type mappings</H3>
 
 
 <p>
@@ -4647,7 +4647,7 @@ However, the mappings allow the full range of values for each C type from Java.
 </p>
 
 
-<H3><a name="Java_default_non_primitive_typemaps"></a>20.9.2 Default typemaps for non-primitive types</H3>
+<H3><a name="Java_default_non_primitive_typemaps"></a>21.9.2 Default typemaps for non-primitive types</H3>
 
 
 <p>
@@ -4662,7 +4662,7 @@ So in summary, the C/C++ pointer to non-primitive types is cast into the 64 bit
 The Java type is either the proxy class or type wrapper class.
 </p>
 
-<H3><a name="jvm64"></a>20.9.3 Sixty four bit JVMs</H3>
+<H3><a name="jvm64"></a>21.9.3 Sixty four bit JVMs</H3>
 
 
 <p>
@@ -4675,7 +4675,7 @@ Unfortunately it won't of course hold true for JNI code.
 </p>
 
 
-<H3><a name="what_is_typemap"></a>20.9.4 What is a typemap?</H3>
+<H3><a name="what_is_typemap"></a>21.9.4 What is a typemap?</H3>
 
 
 <p>
@@ -4798,7 +4798,7 @@ int c = example.count('e',"Hello World");
 </pre>
 </div>
 
-<H3><a name="typemaps_c_to_java_types"></a>20.9.5 Typemaps for mapping C/C++ types to Java types</H3>
+<H3><a name="typemaps_c_to_java_types"></a>21.9.5 Typemaps for mapping C/C++ types to Java types</H3>
 
 
 <p>
@@ -5058,7 +5058,7 @@ These are listed below:
 
 </table>
 
-<H3><a name="typemap_attributes"></a>20.9.6 Java typemap attributes</H3>
+<H3><a name="typemap_attributes"></a>21.9.6 Java typemap attributes</H3>
 
 
 <p>
@@ -5104,7 +5104,7 @@ The "javain" typemap has the optional 'pre', 'post' and 'pgcppname' attributes.
 Note that when the 'pre' or 'post' attributes are specified and the associated type is used in a constructor, a constructor helper function is generated. This is necessary as the Java proxy constructor wrapper makes a call to a support constructor using a <i>this</i> call. In Java the <i>this</i> call must be the first statement in the constructor body. The constructor body thus calls the helper function and the helper function instead makes the JNI call, ensuring the 'pre' code is called before the JNI call is made. There is a <a href="#java_date_marshalling">Date marshalling</a> example showing 'pre', 'post' and 'pgcppname' attributes in action.
 </p>
 
-<H3><a name="special_variables"></a>20.9.7 Java special variables</H3>
+<H3><a name="special_variables"></a>21.9.7 Java special variables</H3>
 
 
 <p>
@@ -5247,7 +5247,7 @@ This special variable expands to the intermediary class name. Usually this is th
 unless the jniclassname attribute is specified in the <a href="Java.html#java_module_directive">%module directive</a>.
 </p>
 
-<H3><a name="typemaps_for_c_and_cpp"></a>20.9.8 Typemaps for both C and C++ compilation</H3>
+<H3><a name="typemaps_for_c_and_cpp"></a>21.9.8 Typemaps for both C and C++ compilation</H3>
 
 
 <p>
@@ -5284,7 +5284,7 @@ If you do not intend your code to be targeting both C and C++ then your typemaps
 </p>
 
 
-<H3><a name="java_code_typemaps"></a>20.9.9 Java code typemaps</H3>
+<H3><a name="java_code_typemaps"></a>21.9.9 Java code typemaps</H3>
 
 
 <p>
@@ -5480,7 +5480,7 @@ For the typemap to be used in all type wrapper classes, all the different types
 Again this is the same that is in "<tt>java.swg</tt>", barring the method modifier for <tt>getCPtr</tt>.
 </p>
 
-<H3><a name="java_directors_typemaps"></a>20.9.10 Director specific typemaps</H3>
+<H3><a name="java_directors_typemaps"></a>21.9.10 Director specific typemaps</H3>
 
 
 <p>
@@ -5705,7 +5705,7 @@ The basic strategy here is to provide a default package typemap for the majority
 
 </div>
 
-<H2><a name="typemap_examples"></a>20.10 Typemap Examples</H2>
+<H2><a name="typemap_examples"></a>21.10 Typemap Examples</H2>
 
 
 <p>
@@ -5715,7 +5715,7 @@ the SWIG library.
 </p>
 
 
-<H3><a name="simpler_enum_classes"></a>20.10.1 Simpler Java enums for enums without initializers</H3>
+<H3><a name="simpler_enum_classes"></a>21.10.1 Simpler Java enums for enums without initializers</H3>
 
 
 <p>
@@ -5794,7 +5794,7 @@ This would be done by using the original versions of these typemaps in "enums.sw
 </p>
 
 
-<H3><a name="exception_typemap"></a>20.10.2 Handling C++ exception specifications as Java exceptions</H3>
+<H3><a name="exception_typemap"></a>21.10.2 Handling C++ exception specifications as Java exceptions</H3>
 
 
 <p>
@@ -5919,7 +5919,7 @@ We could alternatively have used <tt>%rename</tt> to rename <tt>what()</tt> into
 </p>
 
 
-<H3><a name="nan_exception_typemap"></a>20.10.3 NaN Exception - exception handling for a particular type</H3>
+<H3><a name="nan_exception_typemap"></a>21.10.3 NaN Exception - exception handling for a particular type</H3>
 
 
 <p>
@@ -6074,7 +6074,7 @@ If we were a martyr to the JNI cause, we could replace the succinct code within
 If we had, we would have put it in the "in" typemap which, like all JNI and Java typemaps, also supports the 'throws' attribute.
 </p>
 
-<H3><a name="converting_java_string_arrays"></a>20.10.4 Converting Java String arrays to char ** </H3>
+<H3><a name="converting_java_string_arrays"></a>21.10.4 Converting Java String arrays to char ** </H3>
 
 
 <p>
@@ -6218,7 +6218,7 @@ Lastly the "jni", "jtype" and "jstype" typemaps are also required to specify
 what Java types to use.
 </p>
 
-<H3><a name="expanding_java_object"></a>20.10.5 Expanding a Java object to multiple arguments</H3>
+<H3><a name="expanding_java_object"></a>21.10.5 Expanding a Java object to multiple arguments</H3>
 
 
 <p>
@@ -6300,7 +6300,7 @@ example.foo(new String[]{"red", "green", "blue", "white"});
 </div>
 
 
-<H3><a name="using_typemaps_return_arguments"></a>20.10.6 Using typemaps to return arguments</H3>
+<H3><a name="using_typemaps_return_arguments"></a>21.10.6 Using typemaps to return arguments</H3>
 
 
 <p>
@@ -6418,7 +6418,7 @@ $ java main
 1 12.0  340.0
 </pre></div>
 
-<H3><a name="adding_downcasts"></a>20.10.7 Adding Java downcasts to polymorphic return types</H3>
+<H3><a name="adding_downcasts"></a>21.10.7 Adding Java downcasts to polymorphic return types</H3>
 
 
 <p>
@@ -6624,7 +6624,7 @@ SWIG usually generates code which constructs the proxy classes using Java code a
 Note that the JNI code above uses a number of string lookups to call a constructor, whereas this would not occur using byte compiled Java code.
 </p>
 
-<H3><a name="adding_equals_method"></a>20.10.8 Adding an equals method to the Java classes</H3>
+<H3><a name="adding_equals_method"></a>21.10.8 Adding an equals method to the Java classes</H3>
 
 
 <p>
@@ -6668,7 +6668,7 @@ System.out.println("foo1? " + foo1.equals(foo2));
 </div>
 
 
-<H3><a name="void_pointers"></a>20.10.9 Void pointers and a common Java base class</H3>
+<H3><a name="void_pointers"></a>21.10.9 Void pointers and a common Java base class</H3>
 
 
 <p>
@@ -6727,7 +6727,7 @@ This example contains some useful functionality which you may want in your code.
     <li> It also has a function which effectively implements a cast from the type of the proxy/type wrapper class to a void pointer. This is necessary for passing a proxy class or a type wrapper class to a function that takes a void pointer.
 </ul>
 
-<H3><a name="struct_pointer_pointer"></a>20.10.10 Struct pointer to pointer</H3>
+<H3><a name="struct_pointer_pointer"></a>21.10.10 Struct pointer to pointer</H3>
 
 
 <p>
@@ -6907,7 +6907,7 @@ The C functional interface has been completely morphed into an object-oriented i
 the Butler class would behave much like any pure Java class and feel more natural to Java users.
 </p>
 
-<H3><a name="java_memory_management_member_variables"></a>20.10.11 Memory management when returning references to member variables</H3>
+<H3><a name="java_memory_management_member_variables"></a>21.10.11 Memory management when returning references to member variables</H3>
 
 
 <p>
@@ -7030,7 +7030,7 @@ public class Bike {
 Note the <tt>addReference</tt> call.
 </p>
 
-<H3><a name="java_memory_management_objects"></a>20.10.12 Memory management for objects passed to the C++ layer</H3>
+<H3><a name="java_memory_management_objects"></a>21.10.12 Memory management for objects passed to the C++ layer</H3>
 
 
 <p>
@@ -7146,7 +7146,7 @@ The 'javacode' typemap simply adds in the specified code into the Java proxy cla
 </div>
 
 
-<H3><a name="java_date_marshalling"></a>20.10.13 Date marshalling using the javain typemap and associated attributes</H3>
+<H3><a name="java_date_marshalling"></a>21.10.13 Date marshalling using the javain typemap and associated attributes</H3>
 
 
 <p>
@@ -7323,7 +7323,7 @@ A few things to note:
 
 
 
-<H2><a name="java_directors_faq"></a>20.11 Living with Java Directors</H2>
+<H2><a name="java_directors_faq"></a>21.11 Living with Java Directors</H2>
 
 
 <p>
@@ -7504,10 +7504,10 @@ public abstract class UserVisibleFoo extends Foo {
   </li>
 </ol>
 
-<H2><a name="odds_ends"></a>20.12 Odds and ends</H2>
+<H2><a name="odds_ends"></a>21.12 Odds and ends</H2>
 
 
-<H3><a name="javadoc_comments"></a>20.12.1 JavaDoc comments</H3>
+<H3><a name="javadoc_comments"></a>21.12.1 JavaDoc comments</H3>
 
 
 <p>
@@ -7563,7 +7563,7 @@ public class Barmy {
 
 
 
-<H3><a name="functional_interface"></a>20.12.2 Functional interface without proxy classes</H3>
+<H3><a name="functional_interface"></a>21.12.2 Functional interface without proxy classes</H3>
 
 
 <p>
@@ -7624,7 +7624,7 @@ All destructors have to be called manually for example the <tt>delete_Foo(foo)</
 </p>
 
 
-<H3><a name="using_own_jni_functions"></a>20.12.3 Using your own JNI functions</H3>
+<H3><a name="using_own_jni_functions"></a>21.12.3 Using your own JNI functions</H3>
 
 
 <p>
@@ -7674,7 +7674,7 @@ This directive is only really useful if you want to mix your own hand crafted JN
 </p>
 
 
-<H3><a name="performance"></a>20.12.4 Performance concerns and hints</H3>
+<H3><a name="performance"></a>21.12.4 Performance concerns and hints</H3>
 
 
 <p>
@@ -7695,7 +7695,7 @@ However, you will have to be careful about memory management and make sure that
 This method normally calls the C++ destructor or <tt>free()</tt> for C code.
 </p>
 
-<H3><a name="java_debugging"></a>20.12.5 Debugging</H3>
+<H3><a name="java_debugging"></a>21.12.5 Debugging</H3>
 
 
 <p>
@@ -7717,7 +7717,7 @@ The -verbose:jni and -verbose:gc are also useful options for monitoring code beh
 </p>
 
 
-<H2><a name="java_examples"></a>20.13 Examples</H2>
+<H2><a name="java_examples"></a>21.13 Examples</H2>
 
 
 <p>
diff --git a/Doc/Manual/Lisp.html b/Doc/Manual/Lisp.html
index ca2d0414e..14abead00 100644
--- a/Doc/Manual/Lisp.html
+++ b/Doc/Manual/Lisp.html
@@ -6,7 +6,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Lisp_nn1"></a>21 SWIG and Common Lisp</H1>
+<H1><a name="Lisp_nn1"></a>22 SWIG and Common Lisp</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -41,7 +41,7 @@
       Lisp, Common Foreign Function Interface(CFFI), CLisp and UFFI
       foreign function interfaces.  
 </p>
-<H2><a name="Lisp_nn2"></a>21.1 Allegro Common Lisp</H2>
+<H2><a name="Lisp_nn2"></a>22.1 Allegro Common Lisp</H2>
 
 
 <p>
@@ -50,7 +50,7 @@
   <a href="Allegrocl.html#Allegrocl_nn1">here</a>
 </p>
 
-<H2><a name="Lisp_nn3"></a>21.2 Common Foreign Function Interface(CFFI)</H2>
+<H2><a name="Lisp_nn3"></a>22.2 Common Foreign Function Interface(CFFI)</H2>
 
 
 <p>
@@ -77,7 +77,7 @@ swig -cffi -module <i>module-name</i>   <i>file-name</i>
       files and the various things which you can do with them.
 </p>
 
-<H3><a name="Lisp_nn4"></a>21.2.1 Additional Commandline Options </H3>
+<H3><a name="Lisp_nn4"></a>22.2.1 Additional Commandline Options </H3>
 
 
 <p>
@@ -118,7 +118,7 @@ swig -cffi -help
 
 </table>
 
-<H3><a name="Lisp_nn5"></a>21.2.2 Generating CFFI bindings</H3>
+<H3><a name="Lisp_nn5"></a>22.2.2 Generating CFFI bindings</H3>
 
 
 As we mentioned earlier the ideal way to use SWIG is to use interface
@@ -392,7 +392,7 @@ The feature <i>intern_function</i> ensures that all C names are
 
 </pre></div>
 
-<H3><a name="Lisp_nn6"></a>21.2.3 Generating CFFI bindings for C++ code</H3>
+<H3><a name="Lisp_nn6"></a>22.2.3 Generating CFFI bindings for C++ code</H3>
 
 
 <p>This feature to SWIG (for CFFI) is very new and still far from
@@ -568,7 +568,7 @@ If you have any questions, suggestions, patches, etc., related to CFFI
       module feel free to contact us on the SWIG mailing list, and
       also please add a "[CFFI]" tag in the subject line.
 
-<H3><a name="Lisp_nn7"></a>21.2.4 Inserting user code into generated files</H3>
+<H3><a name="Lisp_nn7"></a>22.2.4 Inserting user code into generated files</H3>
 
 
 <p>
@@ -608,7 +608,7 @@ Note that the block <tt>%{ ... %}</tt> is effectively a shortcut for
 </p>
 
 
-<H2><a name="Lisp_nn8"></a>21.3 CLISP</H2>
+<H2><a name="Lisp_nn8"></a>22.3 CLISP</H2>
 
 
 <p>
@@ -638,7 +638,7 @@ swig -clisp -module <i>module-name</i>   <i>file-name</i>
     interface file for the CLISP module. The CLISP module tries to
     produce code which is both human readable and easily modifyable.
 </p>
-<H3><a name="Lisp_nn9"></a>21.3.1 Additional Commandline Options </H3>
+<H3><a name="Lisp_nn9"></a>22.3.1 Additional Commandline Options </H3>
 
 
 <p>
@@ -671,7 +671,7 @@ and global variables will be created otherwise only definitions for<br/>
 
 </table>
 
-<H3><a name="Lisp_nn10"></a>21.3.2 Details on CLISP bindings</H3>
+<H3><a name="Lisp_nn10"></a>22.3.2 Details on CLISP bindings</H3>
 
 
 <p>
@@ -795,7 +795,7 @@ struct bar {
 
 </pre></div>
 
-<H2><a name="Lisp_nn11"></a>21.4 UFFI </H2>
+<H2><a name="Lisp_nn11"></a>22.4 UFFI </H2>
 
 
 </body>
diff --git a/Doc/Manual/Lua.html b/Doc/Manual/Lua.html
index 4ebf02349..99c7c9a3c 100644
--- a/Doc/Manual/Lua.html
+++ b/Doc/Manual/Lua.html
@@ -6,7 +6,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Lua_nn1"></a>22 SWIG and Lua</H1>
+<H1><a name="Lua_nn1"></a>23 SWIG and Lua</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -52,13 +52,13 @@
 <p>
 Lua is an extension programming language designed to support general procedural programming with data description facilities. It also offers good support for object-oriented programming, functional programming, and data-driven programming. Lua is intended to be used as a powerful, light-weight configuration language for any program that needs one. Lua is implemented as a library, written in clean C (that is, in the common subset of ANSI C and C++). Its also a <em>really</em> tiny language, less than 6000 lines of code, which compiles to &lt;100 kilobytes of binary code. It can be found at <a href="http://www.lua.org">http://www.lua.org</a>
 </p>
-<H2><a name="Lua_nn2"></a>22.1 Preliminaries</H2>
+<H2><a name="Lua_nn2"></a>23.1 Preliminaries</H2>
 
 
 <p>
 The current SWIG implementation is designed to work with Lua 5.0.x and Lua 5.1.x. It should work with later versions of Lua, but certainly not with Lua 4.0 due to substantial API changes. ((Currently SWIG generated code has only been tested on Windows with MingW, though given the nature of Lua, is should not have problems on other OS's)). It is possible to either static link or dynamic link a Lua module into the interpreter (normally Lua static links its libraries, as dynamic linking is not available on all platforms).
 </p>
-<H2><a name="Lua_nn3"></a>22.2 Running SWIG</H2>
+<H2><a name="Lua_nn3"></a>23.2 Running SWIG</H2>
 
 
 <p>
@@ -90,7 +90,7 @@ This creates a C/C++ source file <tt>example_wrap.c</tt> or <tt>example_wrap.cxx
 <p>
 The name of the wrapper file is derived from the name of the input file. For example, if the input file is <tt>example.i</tt>, the name of the wrapper file is <tt>example_wrap.c</tt>. To change this, you can use the -o option. The wrappered module will export one function <tt>"int luaopen_example(lua_State* L)"</tt> which must be called to register the module with the Lua interpreter. The name "luaopen_example" depends upon the name of the module.
 </p>
-<H3><a name="Lua_nn4"></a>22.2.1 Compiling and Linking and Interpreter</H3>
+<H3><a name="Lua_nn4"></a>23.2.1 Compiling and Linking and Interpreter</H3>
 
 
 <p>
@@ -137,7 +137,7 @@ $ gcc -c example.c -o example.o
 $ gcc -I/usr/include/lua -L/usr/lib/lua min.o example_wrap.o example.o -o my_lua
 </pre></div>
 
-<H3><a name="Lua_nn5"></a>22.2.2 Compiling a dynamic module</H3>
+<H3><a name="Lua_nn5"></a>23.2.2 Compiling a dynamic module</H3>
 
 
 <p>
@@ -205,7 +205,7 @@ Is quite obvious (Go back and consult the Lua documents on how to enable loadlib
 
 
 
-<H3><a name="Lua_nn6"></a>22.2.3 Using your module</H3>
+<H3><a name="Lua_nn6"></a>23.2.3 Using your module</H3>
 
 
 <p>
@@ -223,19 +223,19 @@ $ ./my_lua
 &gt;
 </pre></div>
 
-<H2><a name="Lua_nn7"></a>22.3 A tour of basic C/C++ wrapping</H2>
+<H2><a name="Lua_nn7"></a>23.3 A tour of basic C/C++ wrapping</H2>
 
 
 <p>
 By default, SWIG tries to build a very natural Lua interface to your C/C++ code. This section briefly covers the essential aspects of this wrapping.
 </p>
-<H3><a name="Lua_nn8"></a>22.3.1 Modules</H3>
+<H3><a name="Lua_nn8"></a>23.3.1 Modules</H3>
 
 
 <p>
 The SWIG module directive specifies the name of the Lua module. If you specify `module example', then everything is wrapped into a Lua table 'example' containing all the functions and variables. When choosing a module name, make sure you don't use the same name as a built-in Lua command or standard module name.
 </p>
-<H3><a name="Lua_nn9"></a>22.3.2 Functions</H3>
+<H3><a name="Lua_nn9"></a>23.3.2 Functions</H3>
 
 
 <p>
@@ -273,7 +273,7 @@ It is also possible to rename the module with an assignment.
 24
 </pre></div>
 
-<H3><a name="Lua_nn10"></a>22.3.3 Global variables</H3>
+<H3><a name="Lua_nn10"></a>23.3.3 Global variables</H3>
 
 
 <p>
@@ -347,7 +347,7 @@ nil
 3.142
 </pre></div>
 
-<H3><a name="Lua_nn11"></a>22.3.4 Constants and enums</H3>
+<H3><a name="Lua_nn11"></a>23.3.4 Constants and enums</H3>
 
 
 <p>
@@ -370,7 +370,7 @@ example.SUNDAY=0
 <p>
 Constants are not guaranteed to remain constant in Lua. The name of the constant could be accidentally reassigned to refer to some other object. Unfortunately, there is no easy way for SWIG to generate code that prevents this. You will just have to be careful.
 </p>
-<H3><a name="Lua_nn12"></a>22.3.5 Pointers</H3>
+<H3><a name="Lua_nn12"></a>23.3.5 Pointers</H3>
 
 
 <p>
@@ -408,7 +408,7 @@ Lua enforces the integrity of its userdata, so it is virtually impossible to cor
 nil
 </pre></div>
 
-<H3><a name="Lua_nn13"></a>22.3.6 Structures</H3>
+<H3><a name="Lua_nn13"></a>23.3.6 Structures</H3>
 
 
 <p>
@@ -494,7 +494,7 @@ Because the pointer points inside the structure, you can modify the contents and
 &gt; x.a = 3                 -- Modifies the same structure
 </pre></div>
 
-<H3><a name="Lua_nn14"></a>22.3.7 C++ classes</H3>
+<H3><a name="Lua_nn14"></a>23.3.7 C++ classes</H3>
 
 
 <p>
@@ -555,7 +555,7 @@ It is not (currently) possible to access static members of an instance:
                                 -- does NOT work
 </pre></div>
 
-<H3><a name="Lua_nn15"></a>22.3.8 C++ inheritance</H3>
+<H3><a name="Lua_nn15"></a>23.3.8 C++ inheritance</H3>
 
 
 <p>
@@ -580,7 +580,7 @@ then the function <tt>spam()</tt> accepts a Foo pointer or a pointer to any clas
 <p>
 It is safe to use multiple inheritance with SWIG.
 </p>
-<H3><a name="Lua_nn16"></a>22.3.9 Pointers, references, values, and arrays</H3>
+<H3><a name="Lua_nn16"></a>23.3.9 Pointers, references, values, and arrays</H3>
 
 
 <p>
@@ -611,7 +611,7 @@ Foo  spam7();
 <p>
 then all three functions will return a pointer to some Foo object. Since the third function (spam7) returns a value, newly allocated memory is used to hold the result and a pointer is returned (Lua will release this memory when the return value is garbage collected). The other two are pointers which are assumed to be managed by the C code and so will not be garbage collected.
 </p>
-<H3><a name="Lua_nn17"></a>22.3.10 C++ overloaded functions</H3>
+<H3><a name="Lua_nn17"></a>23.3.10 C++ overloaded functions</H3>
 
 
 <p>
@@ -697,7 +697,7 @@ Please refer to the "SWIG and C++" chapter for more information about overloadin
 <p>
 Dealing with the Lua coercion mechanism, the priority is roughly (integers, floats, strings, userdata). But it is better to rename the functions rather than rely upon the ordering.
 </p>
-<H3><a name="Lua_nn18"></a>22.3.11 C++ operators</H3>
+<H3><a name="Lua_nn18"></a>23.3.11 C++ operators</H3>
 
 
 <p>
@@ -809,7 +809,7 @@ It is also possible to overload the operator<tt>[]</tt>, but currently this cann
 };
 </pre></div>
 
-<H3><a name="Lua_nn19"></a>22.3.12 Class extension with %extend</H3>
+<H3><a name="Lua_nn19"></a>23.3.12 Class extension with %extend</H3>
 
 
 <p>
@@ -864,7 +864,7 @@ true
 <p>
 Extend works with both C and C++ code, on classes and structs. It does not modify the underlying object in any way---the extensions only show up in the Lua interface. The only item to take note of is the code has to use the '$self' instead of 'this', and that you cannot access protected/private members of the code (as you are not officially part of the class).
 </p>
-<H3><a name="Lua_nn20"></a>22.3.13 C++ templates</H3>
+<H3><a name="Lua_nn20"></a>23.3.13 C++ templates</H3>
 
 
 <p>
@@ -899,7 +899,7 @@ In Lua:
 <p>
 Obviously, there is more to template wrapping than shown in this example. More details can be found in the SWIG and C++ chapter. Some more complicated examples will appear later.
 </p>
-<H3><a name="Lua_nn21"></a>22.3.14 C++ Smart Pointers</H3>
+<H3><a name="Lua_nn21"></a>23.3.14 C++ Smart Pointers</H3>
 
 
 <p>
@@ -951,7 +951,7 @@ If you ever need to access the underlying pointer returned by <tt>operator-&gt;(
 &gt; f = p:__deref__()     -- Returns underlying Foo *
 </pre></div>
 
-<H3><a name="Lua_nn22"></a>22.3.15 C++ Exceptions</H3>
+<H3><a name="Lua_nn22"></a>23.3.15 C++ Exceptions</H3>
 
 
 <p>
@@ -1098,7 +1098,7 @@ add exception specification to functions or globally (respectively).
 </p>
 
 
-<H3><a name="Lua_nn23"></a>22.3.16 Writing your own custom wrappers</H3>
+<H3><a name="Lua_nn23"></a>23.3.16 Writing your own custom wrappers</H3>
 
 
 <p>
@@ -1117,7 +1117,7 @@ int native_function(lua_State*L) // my native code
 The <tt>%native</tt> directive in the above example, tells SWIG that there is a function <tt>int native_function(lua_State*L);</tt> which is to be added into the module under the name '<tt>my_func</tt>'. SWIG will not add any wrappering for this function, beyond adding it into the function table. How you write your code is entirely up to you.
 </p>
 
-<H3><a name="Lua_nn24"></a>22.3.17 Adding additional Lua code</H3>
+<H3><a name="Lua_nn24"></a>23.3.17 Adding additional Lua code</H3>
 
 
 <p>
@@ -1155,7 +1155,7 @@ Good uses for this feature is adding of new code, or writing helper functions to
 See Examples/lua/arrays for an example of this code.
 </p>
 
-<H2><a name="Lua_nn25"></a>22.4 Details on the Lua binding</H2>
+<H2><a name="Lua_nn25"></a>23.4 Details on the Lua binding</H2>
 
 
 <p>
@@ -1166,7 +1166,7 @@ See Examples/lua/arrays for an example of this code.
  </i>
 </p>
 
-<H3><a name="Lua_nn26"></a>22.4.1 Binding global data into the module.</H3>
+<H3><a name="Lua_nn26"></a>23.4.1 Binding global data into the module.</H3>
 
 
 <p>
@@ -1226,7 +1226,7 @@ end
 <p>
 That way when you call '<tt>a=example.Foo</tt>', the interpreter looks at the table 'example' sees that there is no field 'Foo' and calls __index. This will in turn check in '.get' table and find the existence of 'Foo' and then return the value of the C function call 'Foo_get()'. Similarly for the code '<tt>example.Foo=10</tt>', the interpreter will check the table, then call the __newindex which will then check the '.set' table and call the C function 'Foo_set(10)'.
 </p>
-<H3><a name="Lua_nn27"></a>22.4.2 Userdata and Metatables</H3>
+<H3><a name="Lua_nn27"></a>23.4.2 Userdata and Metatables</H3>
 
 
 <p>
@@ -1306,7 +1306,7 @@ Note: Both the opaque structures (like the FILE*) and normal wrappered classes/s
 <p>
 Note: Operator overloads are basically done in the same way, by adding functions such as '__add' &amp; '__call' to the classes metatable. The current implementation is a bit rough as it will add any member function beginning with '__' into the metatable too, assuming its an operator overload.
 </p>
-<H3><a name="Lua_nn28"></a>22.4.3 Memory management</H3>
+<H3><a name="Lua_nn28"></a>23.4.3 Memory management</H3>
 
 
 <p>
diff --git a/Doc/Manual/Modula3.html b/Doc/Manual/Modula3.html
index ff70fc143..7a6bacd34 100644
--- a/Doc/Manual/Modula3.html
+++ b/Doc/Manual/Modula3.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body bgcolor="#FFFFFF">
-<H1><a name="Modula3"></a>23 SWIG and Modula-3</H1>
+<H1><a name="Modula3"></a>24 SWIG and Modula-3</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -57,7 +57,7 @@ especially
 <a href="Typemaps.html">typemaps</a>.
 </p>
 
-<H2><a name="modula3_overview"></a>23.1 Overview</H2>
+<H2><a name="modula3_overview"></a>24.1 Overview</H2>
 
 
 <p>
@@ -90,7 +90,7 @@ So the introduction got a bit longer than it should ...  ;-)
 </p>
 
 
-<H3><a name="whyscripting"></a>23.1.1 Why not scripting ?</H3>
+<H3><a name="whyscripting"></a>24.1.1 Why not scripting ?</H3>
 
 
 <p>
@@ -126,7 +126,7 @@ are not advantages of the language itself
 but can be provided by function libraries.
 </p>
 
-<H3><a name="whymodula3"></a>23.1.2 Why Modula-3 ?</H3>
+<H3><a name="whymodula3"></a>24.1.2 Why Modula-3 ?</H3>
 
 
 <p>
@@ -166,7 +166,7 @@ it's statically typed, too.
 </p>
 
 
-<H3><a name="whycpp"></a>23.1.3 Why C / C++ ?</H3>
+<H3><a name="whycpp"></a>24.1.3 Why C / C++ ?</H3>
 
 
 <p>
@@ -179,7 +179,7 @@ Even more fortunately even non-C libraries may provide C header files.
 This is where SWIG becomes helpful.
 </p>
 
-<H3><a name="whyswig"></a>23.1.4 Why SWIG ?</H3>
+<H3><a name="whyswig"></a>24.1.4 Why SWIG ?</H3>
 
 
 <p>
@@ -252,10 +252,10 @@ integrate Modula-3 code into a C / C++ project.
 </p>
 
 
-<H2><a name="conception"></a>23.2 Conception</H2>
+<H2><a name="conception"></a>24.2 Conception</H2>
 
 
-<H3><a name="cinterface"></a>23.2.1 Interfaces to C libraries</H3>
+<H3><a name="cinterface"></a>24.2.1 Interfaces to C libraries</H3>
 
 
 <p>
@@ -404,7 +404,7 @@ and the principal type must be renamed (<tt>%typemap</tt>).
 </p>
 
 
-<H3><a name="cppinterface"></a>23.2.2 Interfaces to C++ libraries</H3>
+<H3><a name="cppinterface"></a>24.2.2 Interfaces to C++ libraries</H3>
 
 
 <p>
@@ -505,10 +505,10 @@ There is no C++ library I wrote a SWIG interface for,
 so I'm not sure if this is possible or sensible, yet.
 </p>
 
-<H2><a name="preliminaries"></a>23.3 Preliminaries</H2>
+<H2><a name="preliminaries"></a>24.3 Preliminaries</H2>
 
 
-<H3><a name="compilers"></a>23.3.1 Compilers</H3>
+<H3><a name="compilers"></a>24.3.1 Compilers</H3>
 
 
 <p>
@@ -522,7 +522,7 @@ For testing examples I use Critical Mass cm3.
 </p>
 
 
-<H3><a name="commandline"></a>23.3.2 Additional Commandline Options</H3>
+<H3><a name="commandline"></a>24.3.2 Additional Commandline Options</H3>
 
 
 <p>
@@ -599,10 +599,10 @@ Instead generate templates for some basic typemaps.
 </tr>
 </table>
 
-<H2><a name="modula3_typemaps"></a>23.4 Modula-3 typemaps</H2>
+<H2><a name="modula3_typemaps"></a>24.4 Modula-3 typemaps</H2>
 
 
-<H3><a name="inoutparam"></a>23.4.1 Inputs and outputs</H3>
+<H3><a name="inoutparam"></a>24.4.1 Inputs and outputs</H3>
 
 
 <p>
@@ -818,7 +818,7 @@ consist of the following parts:
 </table>
 
 
-<H3><a name="ordinals"></a>23.4.2 Subranges, Enumerations, Sets</H3>
+<H3><a name="ordinals"></a>24.4.2 Subranges, Enumerations, Sets</H3>
 
 
 <p>
@@ -870,7 +870,7 @@ that I'd like to automate.
 </p>
 
 
-<H3><a name="class"></a>23.4.3 Objects</H3>
+<H3><a name="class"></a>24.4.3 Objects</H3>
 
 
 <p>
@@ -883,7 +883,7 @@ is not really useful, yet.
 </p>
 
 
-<H3><a name="imports"></a>23.4.4 Imports</H3>
+<H3><a name="imports"></a>24.4.4 Imports</H3>
 
 
 <p>
@@ -918,7 +918,7 @@ IMPORT M3toC;
 </pre></div>
 
 
-<H3><a name="exceptions"></a>23.4.5 Exceptions</H3>
+<H3><a name="exceptions"></a>24.4.5 Exceptions</H3>
 
 
 <p>
@@ -942,7 +942,7 @@ you should declare
 <tt>%typemap("m3wrapinconv:throws") blah * %{OSError.E%}</tt>.
 </p>
 
-<H3><a name="typemap_example"></a>23.4.6 Example</H3>
+<H3><a name="typemap_example"></a>24.4.6 Example</H3>
 
 
 <p>
@@ -989,10 +989,10 @@ where almost everything is generated by a typemap:
 </pre></div>
 
 
-<H2><a name="hints"></a>23.5 More hints to the generator</H2>
+<H2><a name="hints"></a>24.5 More hints to the generator</H2>
 
 
-<H3><a name="features"></a>23.5.1 Features</H3>
+<H3><a name="features"></a>24.5.1 Features</H3>
 
 
 <table border summary="Modula-3 features">
@@ -1029,7 +1029,7 @@ where almost everything is generated by a typemap:
 </tr>
 </table>
 
-<H3><a name="pragmas"></a>23.5.2 Pragmas</H3>
+<H3><a name="pragmas"></a>24.5.2 Pragmas</H3>
 
 
 <table border summary="Modula-3 pragmas">
@@ -1052,7 +1052,7 @@ where almost everything is generated by a typemap:
 </tr>
 </table>
 
-<H2><a name="remarks"></a>23.6 Remarks</H2>
+<H2><a name="remarks"></a>24.6 Remarks</H2>
 
 
 <ul>
diff --git a/Doc/Manual/Mzscheme.html b/Doc/Manual/Mzscheme.html
index 699168322..9413bb010 100644
--- a/Doc/Manual/Mzscheme.html
+++ b/Doc/Manual/Mzscheme.html
@@ -8,7 +8,7 @@
 
 <body bgcolor="#ffffff">
 
-<H1><a name="MzScheme"></a>24 SWIG and MzScheme</H1>
+<H1><a name="MzScheme"></a>25 SWIG and MzScheme</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -22,7 +22,7 @@
 <p>
 This section contains information on SWIG's support of MzScheme.
 
-<H2><a name="MzScheme_nn2"></a>24.1 Creating native MzScheme structures</H2>
+<H2><a name="MzScheme_nn2"></a>25.1 Creating native MzScheme structures</H2>
 
 
 <p>
diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html
index 79ede443f..6dbf24c11 100644
--- a/Doc/Manual/Ocaml.html
+++ b/Doc/Manual/Ocaml.html
@@ -6,7 +6,7 @@
 </head>
   <body bgcolor="#ffffff">
           <a name="n1"></a>         
-<H1><a name="Ocaml"></a>25 SWIG and Ocaml</H1>
+<H1><a name="Ocaml"></a>26 SWIG and Ocaml</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -80,7 +80,7 @@ If you're not familiar with the Objective Caml language, you can visit
 <a href="http://www.ocaml.org/">The Ocaml Website</a>.
 </p>
 
-<H2><a name="Ocaml_nn2"></a>25.1 Preliminaries</H2>
+<H2><a name="Ocaml_nn2"></a>26.1 Preliminaries</H2>
 
 
 <p>
@@ -99,7 +99,7 @@ file Examples/Makefile illustrate how to compile and link SWIG modules that
 will be loaded dynamically.  This has only been tested on Linux so far.
 </p>
 
-<H3><a name="Ocaml_nn3"></a>25.1.1 Running SWIG</H3>
+<H3><a name="Ocaml_nn3"></a>26.1.1 Running SWIG</H3>
 
 
 <p>
@@ -122,7 +122,7 @@ you will compile the file  <tt>example_wrap.c</tt> with <tt>ocamlc</tt> or
 the resulting .ml and .mli files as well, and do the final link with -custom
 (not needed for native link). </p>
                
-<H3><a name="Ocaml_nn4"></a>25.1.2 Compiling the code</H3>
+<H3><a name="Ocaml_nn4"></a>26.1.2 Compiling the code</H3>
 
 
 <p>
@@ -158,7 +158,7 @@ the user more freedom with respect to custom typing.
   </pre>
 </div>
 
-<H3><a name="Ocaml_nn5"></a>25.1.3 The camlp4 module</H3>
+<H3><a name="Ocaml_nn5"></a>26.1.3 The camlp4 module</H3>
 
 
 <p>
@@ -234,7 +234,7 @@ let b = C_string (getenv "PATH")
 </td></tr>
 </table>
 
-<H3><a name="Ocaml_nn6"></a>25.1.4 Using your module</H3>
+<H3><a name="Ocaml_nn6"></a>26.1.4 Using your module</H3>
 
 
 <p>
@@ -248,7 +248,7 @@ When linking any ocaml bytecode with your module, use the -custom
       option is not needed when you build native code.
 </p>
 
-<H3><a name="Ocaml_nn7"></a>25.1.5 Compilation problems and compiling with C++</H3>
+<H3><a name="Ocaml_nn7"></a>26.1.5 Compilation problems and compiling with C++</H3>
 
 
 <p>
@@ -259,7 +259,7 @@ liberal with pointer types may not compile under the C++ compiler.
 Most code meant to be compiled as C++ will not have problems.
 </p>
 
-<H2><a name="Ocaml_nn8"></a>25.2 The low-level Ocaml/C interface</H2>
+<H2><a name="Ocaml_nn8"></a>26.2 The low-level Ocaml/C interface</H2>
 
 
 <p>
@@ -360,7 +360,7 @@ is that  you  must append them to the return list with swig_result = caml_list_a
     signature for a function that uses value in this way.
     </p>
 
-<H3><a name="Ocaml_nn9"></a>25.2.1 The generated module</H3>
+<H3><a name="Ocaml_nn9"></a>26.2.1 The generated module</H3>
 
 
 <p>
@@ -394,7 +394,7 @@ it describes the output SWIG will generate for class definitions.
 </td></tr>
 </table>
                
-<H3><a name="Ocaml_nn10"></a>25.2.2 Enums</H3>
+<H3><a name="Ocaml_nn10"></a>26.2.2 Enums</H3>
 
 
 <p>
@@ -457,7 +457,7 @@ val x : Enum_test.c_obj = C_enum `a
 </pre>
   </div>
 
-<H4><a name="Ocaml_nn11"></a>25.2.2.1 Enum typing in Ocaml</H4>
+<H4><a name="Ocaml_nn11"></a>26.2.2.1 Enum typing in Ocaml</H4>
 
 
 <p>
@@ -470,10 +470,10 @@ functions imported from different modules.  You must convert values to master
 values using the swig_val function before sharing them with another module.
 </p>
 
-<H3><a name="Ocaml_nn12"></a>25.2.3 Arrays</H3>
+<H3><a name="Ocaml_nn12"></a>26.2.3 Arrays</H3>
 
 
-<H4><a name="Ocaml_nn13"></a>25.2.3.1 Simple types of bounded arrays</H4>
+<H4><a name="Ocaml_nn13"></a>26.2.3.1 Simple types of bounded arrays</H4>
 
 
 <p>
@@ -494,7 +494,7 @@ arrays of simple types with known bounds in your code, but this only works
 for arrays whose bounds are completely specified.
 </p>
 
-<H4><a name="Ocaml_nn14"></a>25.2.3.2 Complex and unbounded arrays</H4>
+<H4><a name="Ocaml_nn14"></a>26.2.3.2 Complex and unbounded arrays</H4>
 
 
 <p>
@@ -507,7 +507,7 @@ SWIG can't predict which of these methods will be used in the array,
 so you have to specify it for yourself in the form of a typemap.
 </p>
 
-<H4><a name="Ocaml_nn15"></a>25.2.3.3 Using an object</H4>
+<H4><a name="Ocaml_nn15"></a>26.2.3.3 Using an object</H4>
 
 
 <p>
@@ -521,7 +521,7 @@ Consider writing an object when the ending condition of your array is complex,
 such as using a required sentinel, etc.
 </p>
 
-<H4><a name="Ocaml_nn16"></a>25.2.3.4 Example typemap for a function taking float * and int</H4>
+<H4><a name="Ocaml_nn16"></a>26.2.3.4 Example typemap for a function taking float * and int</H4>
 
 
 <p>
@@ -572,7 +572,7 @@ void printfloats( float *tab, int len );
 </pre></td></tr></table>
 
 
-<H3><a name="Ocaml_nn17"></a>25.2.4 C++ Classes</H3>
+<H3><a name="Ocaml_nn17"></a>26.2.4 C++ Classes</H3>
 
 
 <p>
@@ -615,7 +615,7 @@ the underlying pointer, so using create_[x]_from_ptr alters the
 returned value for the same object.
 </p>
 
-<H4><a name="Ocaml_nn18"></a>25.2.4.1 STL vector and string Example</H4>
+<H4><a name="Ocaml_nn18"></a>26.2.4.1 STL vector and string Example</H4>
 
 
 <p>
@@ -695,7 +695,7 @@ baz
 # 
 </pre></div>
 
-<H4><a name="Ocaml_nn19"></a>25.2.4.2 C++ Class Example</H4>
+<H4><a name="Ocaml_nn19"></a>26.2.4.2 C++ Class Example</H4>
 
 
 <p>
@@ -725,7 +725,7 @@ public:
 };
 </pre></td></tr></table>
 
-<H4><a name="Ocaml_nn20"></a>25.2.4.3 Compiling the example</H4>
+<H4><a name="Ocaml_nn20"></a>26.2.4.3 Compiling the example</H4>
 
 
 <div class="code"><pre>
@@ -743,7 +743,7 @@ bash-2.05a$ ocamlmktop -custom swig.cmo -I `camlp4 -where` \
   -L$QTPATH/lib -cclib -lqt
 </pre></div>
 
-<H4><a name="Ocaml_nn21"></a>25.2.4.4 Sample Session</H4>
+<H4><a name="Ocaml_nn21"></a>26.2.4.4 Sample Session</H4>
 
 
 <div class="code"><pre>
@@ -770,10 +770,10 @@ Assuming you have a working installation of QT, you will see a window
 containing the string "hi" in a button.  
 </p>
 
-<H3><a name="Ocaml_nn22"></a>25.2.5 Director Classes</H3>
+<H3><a name="Ocaml_nn22"></a>26.2.5 Director Classes</H3>
 
 
-<H4><a name="Ocaml_nn23"></a>25.2.5.1 Director Introduction</H4>
+<H4><a name="Ocaml_nn23"></a>26.2.5.1 Director Introduction</H4>
 
 
 <p>
@@ -800,7 +800,7 @@ class foo {
 };
 </pre></div>
 
-<H4><a name="Ocaml_nn24"></a>25.2.5.2 Overriding Methods in Ocaml</H4>
+<H4><a name="Ocaml_nn24"></a>26.2.5.2 Overriding Methods in Ocaml</H4>
 
 
 <p>
@@ -828,7 +828,7 @@ In this example, I'll examine the objective caml code involved in providing
 an overloaded class.  This example is contained in Examples/ocaml/shapes.
 </p>
 
-<H4><a name="Ocaml_nn25"></a>25.2.5.3 Director Usage Example</H4>
+<H4><a name="Ocaml_nn25"></a>26.2.5.3 Director Usage Example</H4>
 
 
 <table border="1" bgcolor="#dddddd" summary="Director usage example">
@@ -887,7 +887,7 @@ in a more effortless style in ocaml, while leaving the "engine" part of the
 program in C++.
 </p>
 
-<H4><a name="Ocaml_nn26"></a>25.2.5.4 Creating director objects</H4>
+<H4><a name="Ocaml_nn26"></a>26.2.5.4 Creating director objects</H4>
 
 
 <p>
@@ -928,7 +928,7 @@ object from causing a core dump, as long as the object is destroyed
 properly.
 </p>
 
-<H4><a name="Ocaml_nn27"></a>25.2.5.5 Typemaps for directors, <tt>directorin, directorout, directorargout</tt></H4>
+<H4><a name="Ocaml_nn27"></a>26.2.5.5 Typemaps for directors, <tt>directorin, directorout, directorargout</tt></H4>
 
 
 <p>
@@ -939,7 +939,7 @@ well as a function return value in the same way you provide function arguments,
 and to receive arguments the same way you normally receive function returns.
 </p>
 
-<H4><a name="Ocaml_nn28"></a>25.2.5.6 <tt>directorin</tt> typemap</H4>
+<H4><a name="Ocaml_nn28"></a>26.2.5.6 <tt>directorin</tt> typemap</H4>
 
 
 <p>
@@ -950,7 +950,7 @@ code receives when you are called.  In general, a simple <tt>directorin</tt> typ
 can use the same body as a simple <tt>out</tt> typemap.
 </p>
 
-<H4><a name="Ocaml_nn29"></a>25.2.5.7 <tt>directorout</tt> typemap</H4>
+<H4><a name="Ocaml_nn29"></a>26.2.5.7 <tt>directorout</tt> typemap</H4>
 
 
 <p>
@@ -961,7 +961,7 @@ for the same type, except when there are special requirements for object
 ownership, etc.
 </p>
 
-<H4><a name="Ocaml_nn30"></a>25.2.5.8 <tt>directorargout</tt> typemap</H4>
+<H4><a name="Ocaml_nn30"></a>26.2.5.8 <tt>directorargout</tt> typemap</H4>
 
 
 <p>
@@ -978,7 +978,7 @@ In the event that you don't specify all of the necessary values, integral
 values will read zero, and struct or object returns have undefined results.
 </p>
 
-<H3><a name="Ocaml_nn31"></a>25.2.6 Exceptions</H3>
+<H3><a name="Ocaml_nn31"></a>26.2.6 Exceptions</H3>
 
 
 <p>
diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html
index 97e1be17c..7409d78f1 100644
--- a/Doc/Manual/Octave.html
+++ b/Doc/Manual/Octave.html
@@ -8,7 +8,7 @@
 
 <body bgcolor="#ffffff">
 
-<H1><a name="Octave"></a>26 SWIG and Octave</H1>
+<H1><a name="Octave"></a>27 SWIG and Octave</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -54,14 +54,14 @@ More information can be found at <a href="http://www.octave.org">www.octave.org<
 Also, there are a dozen or so examples in the Examples/octave directory, and hundreds in the test suite (Examples/test-suite and Examples/test-suite/octave).
 </p>
 
-<H2><a name="Octave_nn2"></a>26.1 Preliminaries</H2>
+<H2><a name="Octave_nn2"></a>27.1 Preliminaries</H2>
 
 
 <p>
 The current SWIG implemention is based on Octave 2.9.12. Support for other versions (in particular the recent 3.0) has not been tested, nor has support for any OS other than Linux.
 </p>
 
-<H2><a name="Octave_nn3"></a>26.2 Running SWIG</H2>
+<H2><a name="Octave_nn3"></a>27.2 Running SWIG</H2>
 
 
 <p>
@@ -89,7 +89,7 @@ This creates a C/C++ source file <tt>example_wrap.cxx</tt>. The generated C++ so
 The swig command line has a number of options you can use, like to redirect it's output. Use <tt>swig --help</tt> to learn about these.
 </p>
 
-<H3><a name="Octave_nn5"></a>26.2.1 Compiling a dynamic module</H3>
+<H3><a name="Octave_nn5"></a>27.2.1 Compiling a dynamic module</H3>
 
 
 <p>
@@ -116,7 +116,7 @@ $ mkoctfile example_wrap.cxx example.c
 
           <div class="targetlang"><pre>octave:1&gt; example</pre></div>
 
-<H3><a name="Octave_nn6"></a>26.2.2 Using your module</H3>
+<H3><a name="Octave_nn6"></a>27.2.2 Using your module</H3>
 
 
 <p>
@@ -134,10 +134,10 @@ octave:4&gt; example.cvar.Foo=4;
 octave:5&gt; example.cvar.Foo
 ans =  4 </pre></div>
 
-<H2><a name="Octave_nn7"></a>26.3 A tour of basic C/C++ wrapping</H2>
+<H2><a name="Octave_nn7"></a>27.3 A tour of basic C/C++ wrapping</H2>
 
 
-<H3><a name="Octave_nn8"></a>26.3.1 Modules</H3>
+<H3><a name="Octave_nn8"></a>27.3.1 Modules</H3>
 
 
 <p>
@@ -179,7 +179,7 @@ One can also rename it by simple assignment, e.g.,
 octave:1&gt; some_vars = cvar;
 </pre></div>
 
-<H3><a name="Octave_nn9"></a>26.3.2 Functions</H3>
+<H3><a name="Octave_nn9"></a>27.3.2 Functions</H3>
 
 
 <p>
@@ -196,7 +196,7 @@ int fact(int n); </pre></div>
     <div class="targetlang"><pre>octave:1&gt; example.fact(4)
 24 </pre></div>
 
-<H3><a name="Octave_nn10"></a>26.3.3 Global variables</H3>
+<H3><a name="Octave_nn10"></a>27.3.3 Global variables</H3>
 
 
 <p>
@@ -249,7 +249,7 @@ octave:2&gt; example.PI=3.142;
 octave:3&gt; example.PI
 ans =  3.1420 </pre></div>
 
-<H3><a name="Octave_nn11"></a>26.3.4 Constants and enums</H3>
+<H3><a name="Octave_nn11"></a>27.3.4 Constants and enums</H3>
 
 
 <p>
@@ -271,7 +271,7 @@ example.SCONST="Hello World"
 example.SUNDAY=0
 .... </pre></div>
 
-<H3><a name="Octave_nn12"></a>26.3.5 Pointers</H3>
+<H3><a name="Octave_nn12"></a>27.3.5 Pointers</H3>
 
 
 <p>
@@ -318,7 +318,7 @@ octave:2&gt; f=example.fopen("not there","r");
 error: value on right hand side of assignment is undefined
 error: evaluating assignment expression near line 2, column 2 </pre></div>
 
-<H3><a name="Octave_nn13"></a>26.3.6 Structures and C++ classes</H3>
+<H3><a name="Octave_nn13"></a>27.3.6 Structures and C++ classes</H3>
 
 
 <p>
@@ -453,7 +453,7 @@ ans =  1
 Depending on the ownership setting of a <tt>swig_ref</tt>, it may call C++ destructors when its reference count goes to zero. See the section on memory management below for details.
 </p>
 
-<H3><a name="Octave_nn15"></a>26.3.7 C++ inheritance</H3>
+<H3><a name="Octave_nn15"></a>27.3.7 C++ inheritance</H3>
 
 
 <p>
@@ -462,7 +462,7 @@ This information contains the full class hierarchy. When an indexing operation (
 the tree is walked to find a match in the current class as well as any of its bases. The lookup is then cached in the <tt>swig_ref</tt>.
 </p>
 
-<H3><a name="Octave_nn17"></a>26.3.8 C++ overloaded functions</H3>
+<H3><a name="Octave_nn17"></a>27.3.8 C++ overloaded functions</H3>
 
 
 <p>
@@ -472,7 +472,7 @@ The dispatch function selects which overload to call (if any) based on the passe
 <tt>typecheck</tt> typemaps are used to analyze each argument, as well as assign precedence. See the chapter on typemaps for details.
 </p>
 
-<H3><a name="Octave_nn18"></a>26.3.9 C++ operators</H3>
+<H3><a name="Octave_nn18"></a>27.3.9 C++ operators</H3>
 
 
 <p>
@@ -572,7 +572,7 @@ On the C++ side, the default mappings are as follows:
 %rename(__brace)     *::operator[];
 </pre></div>
 
-<H3><a name="Octave_nn19"></a>26.3.10 Class extension with %extend</H3>
+<H3><a name="Octave_nn19"></a>27.3.10 Class extension with %extend</H3>
 
 
 <p>
@@ -602,7 +602,7 @@ octave:3&gt; printf("%s\n",a);
 octave:4&gt; a.__str()
 4
 </pre></div>
-<H3><a name="Octave_nn20"></a>26.3.11 C++ templates</H3>
+<H3><a name="Octave_nn20"></a>27.3.11 C++ templates</H3>
 
 
 <p>
@@ -679,14 +679,14 @@ ans =
 </pre></div>
 
 
-<H3><a name="Octave_nn21"></a>26.3.12 C++ Smart Pointers</H3>
+<H3><a name="Octave_nn21"></a>27.3.12 C++ Smart Pointers</H3>
 
 
 <p>
 C++ smart pointers are fully supported as in other modules.
 </p>
 
-<H3><a name="Octave_nn22"></a>26.3.13 Directors (calling Octave from C++ code)</H3>
+<H3><a name="Octave_nn22"></a>27.3.13 Directors (calling Octave from C++ code)</H3>
 
 
 <p>
@@ -766,14 +766,14 @@ c-side routine called
 octave-side routine called
 </pre></div>
 
-<H3><a name="Octave_nn23"></a>26.3.14 Threads</H3>
+<H3><a name="Octave_nn23"></a>27.3.14 Threads</H3>
 
 
 <p>
 The use of threads in wrapped Director code is not supported; i.e., an Octave-side implementation of a C++ class must be called from the Octave interpreter's thread. Anything fancier (apartment/queue model, whatever) is left to the user. Without anything fancier, this amounts to the limitation that Octave must drive the module... like, for example, an optimization package that calls Octave to evaluate an objective function.
 </p>
 
-<H3><a name="Octave_nn24"></a>26.3.15 Memory management</H3>
+<H3><a name="Octave_nn24"></a>27.3.15 Memory management</H3>
 
 
 <p>
@@ -807,14 +807,14 @@ The %newobject directive may be used to control this behavior for pointers retur
 In the case where one wishes for the C++ side to own an object that was created in Octave (especially a Director object), one can use the __disown() method to invert this logic. Then letting the Octave reference count go to zero will not destroy the object, but destroying the object will invalidate the Octave-side object if it still exists (and call destructors of other C++ bases in the case of multiple inheritance/<tt>subclass()</tt>'ing).
 </p>
 
-<H3><a name="Octave_nn25"></a>26.3.16 STL support</H3>
+<H3><a name="Octave_nn25"></a>27.3.16 STL support</H3>
 
 
 <p>
 This is some skeleton support for various STL containers.
 </p>
 
-<H3><a name="Octave_nn26"></a>26.3.17 Matrix typemaps</H3>
+<H3><a name="Octave_nn26"></a>27.3.17 Matrix typemaps</H3>
 
 
 <p>
diff --git a/Doc/Manual/Perl5.html b/Doc/Manual/Perl5.html
index b7cdaf0e5..1dc8e7d2f 100644
--- a/Doc/Manual/Perl5.html
+++ b/Doc/Manual/Perl5.html
@@ -6,7 +6,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Perl5"></a>27 SWIG and Perl5</H1>
+<H1><a name="Perl5"></a>28 SWIG and Perl5</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -87,7 +87,7 @@ later. Earlier versions are problematic and SWIG generated extensions
 may not compile or run correctly.
 </p>
 
-<H2><a name="Perl5_nn2"></a>27.1 Overview</H2>
+<H2><a name="Perl5_nn2"></a>28.1 Overview</H2>
 
 
 <p>
@@ -108,7 +108,7 @@ described.  Advanced customization features, typemaps, and other
 options are found near the end of the chapter.
 </p>
 
-<H2><a name="Perl5_nn3"></a>27.2 Preliminaries</H2>
+<H2><a name="Perl5_nn3"></a>28.2 Preliminaries</H2>
 
 
 <p>
@@ -133,7 +133,7 @@ To build the module, you will need to compile the file
 <tt>example_wrap.c</tt> and link it with the rest of your program.
 </p>
 
-<H3><a name="Perl5_nn4"></a>27.2.1 Getting the right header files</H3>
+<H3><a name="Perl5_nn4"></a>28.2.1 Getting the right header files</H3>
 
 
 <p>
@@ -165,7 +165,7 @@ loaded, an easy way to find out is to run Perl itself.
 </pre>
 </div>
 
-<H3><a name="Perl5_nn5"></a>27.2.2 Compiling a dynamic module</H3>
+<H3><a name="Perl5_nn5"></a>28.2.2 Compiling a dynamic module</H3>
 
 
 <p>
@@ -198,7 +198,7 @@ the target should be named `<tt>example.so</tt>',
 `<tt>example.sl</tt>', or the appropriate dynamic module name on your system.
 </p>
 
-<H3><a name="Perl5_nn6"></a>27.2.3 Building a dynamic module with MakeMaker</H3>
+<H3><a name="Perl5_nn6"></a>28.2.3 Building a dynamic module with MakeMaker</H3>
 
 
 <p>
@@ -232,7 +232,7 @@ the preferred approach to compilation.  More information about MakeMaker can be
 found in "Programming Perl, 2nd ed." by Larry Wall, Tom Christiansen,
 and Randal Schwartz.</p>
 
-<H3><a name="Perl5_nn7"></a>27.2.4 Building a static version of Perl</H3>
+<H3><a name="Perl5_nn7"></a>28.2.4 Building a static version of Perl</H3>
 
 
 <p>
@@ -301,7 +301,7 @@ added to it.  Depending on your machine, you may need to link with
 additional libraries such as <tt>-lsocket, -lnsl, -ldl</tt>, etc.
 </p>
 
-<H3><a name="Perl5_nn8"></a>27.2.5 Using the module</H3>
+<H3><a name="Perl5_nn8"></a>28.2.5 Using the module</H3>
 
 
 <p>
@@ -456,7 +456,7 @@ system configuration (this requires root access and you will need to
 read the man pages).
 </p>
 
-<H3><a name="Perl5_nn9"></a>27.2.6 Compilation problems and compiling with C++</H3>
+<H3><a name="Perl5_nn9"></a>28.2.6 Compilation problems and compiling with C++</H3>
 
 
 <p>
@@ -599,7 +599,7 @@ have to find the macro that conflicts and add an #undef into the .i file.  Pleas
 any conflicting macros you find to <a href="http://www.swig.org/mail.html">swig-user mailing list</a>.
 </p>
 
-<H3><a name="Perl5_nn10"></a>27.2.7 Compiling for 64-bit platforms</H3>
+<H3><a name="Perl5_nn10"></a>28.2.7 Compiling for 64-bit platforms</H3>
 
 
 <p>
@@ -626,7 +626,7 @@ also introduce problems on platforms that support more than one
 linking standard (e.g., -o32 and -n32 on Irix).
 </p>
 
-<H2><a name="Perl5_nn11"></a>27.3 Building Perl Extensions under Windows</H2>
+<H2><a name="Perl5_nn11"></a>28.3 Building Perl Extensions under Windows</H2>
 
 
 <p>
@@ -637,7 +637,7 @@ section assumes you are using SWIG with Microsoft Visual C++
 although the procedure may be similar with other compilers.  
 </p>
 
-<H3><a name="Perl5_nn12"></a>27.3.1 Running SWIG from Developer Studio</H3>
+<H3><a name="Perl5_nn12"></a>28.3.1 Running SWIG from Developer Studio</H3>
 
 
 <p>
@@ -700,7 +700,7 @@ print "$a\n";
 
 </pre></div>
 
-<H3><a name="Perl5_nn13"></a>27.3.2 Using other compilers</H3>
+<H3><a name="Perl5_nn13"></a>28.3.2 Using other compilers</H3>
 
 
 <p>
@@ -708,7 +708,7 @@ SWIG is known to work with Cygwin and may work with other compilers on Windows.
 For general hints and suggestions refer to the <a href="Windows.html#Windows">Windows</a> chapter.
 </p>
 
-<H2><a name="Perl5_nn14"></a>27.4 The low-level interface</H2>
+<H2><a name="Perl5_nn14"></a>28.4 The low-level interface</H2>
 
 
 <p>
@@ -718,7 +718,7 @@ can be used to control your application.  However, it is also used to
 construct more user-friendly proxy classes as described in the next section.
 </p>
 
-<H3><a name="Perl5_nn15"></a>27.4.1 Functions</H3>
+<H3><a name="Perl5_nn15"></a>28.4.1 Functions</H3>
 
 
 <p>
@@ -741,7 +741,7 @@ use example;
 $a = &amp;example::fact(2);
 </pre></div>
 
-<H3><a name="Perl5_nn16"></a>27.4.2 Global variables</H3>
+<H3><a name="Perl5_nn16"></a>28.4.2 Global variables</H3>
 
 
 <p>
@@ -811,7 +811,7 @@ extern char *path;       // Declared later in the input
 </pre>
 </div>
 
-<H3><a name="Perl5_nn17"></a>27.4.3 Constants</H3>
+<H3><a name="Perl5_nn17"></a>28.4.3 Constants</H3>
 
 
 <p>
@@ -838,7 +838,7 @@ $example::FOO = 2;           # Error
 </pre>
 </div>
 
-<H3><a name="Perl5_nn18"></a>27.4.4 Pointers</H3>
+<H3><a name="Perl5_nn18"></a>28.4.4 Pointers</H3>
 
 
 <p>
@@ -947,7 +947,7 @@ as XS and <tt>xsubpp</tt>.  Given the advancement of the SWIG typesystem and the
 SWIG and XS, this is no longer supported.
 </p>
 
-<H3><a name="Perl5_nn19"></a>27.4.5 Structures</H3>
+<H3><a name="Perl5_nn19"></a>28.4.5 Structures</H3>
 
 
 <p>
@@ -1081,7 +1081,7 @@ void Bar_f_set(Bar *b, Foo *val) {
 </div>
 
 
-<H3><a name="Perl5_nn20"></a>27.4.6 C++ classes</H3>
+<H3><a name="Perl5_nn20"></a>28.4.6 C++ classes</H3>
 
 
 <p>
@@ -1146,7 +1146,7 @@ provides direct access to C++ objects.  A higher level interface using Perl prox
 can be built using these low-level accessors.  This is described shortly.
 </p>
 
-<H3><a name="Perl5_nn21"></a>27.4.7 C++ classes and type-checking</H3>
+<H3><a name="Perl5_nn21"></a>28.4.7 C++ classes and type-checking</H3>
 
 
 <p>
@@ -1182,7 +1182,7 @@ If necessary, the type-checker also adjusts the value of the pointer (as is nece
 multiple inheritance is used).
 </p>
 
-<H3><a name="Perl5_nn22"></a>27.4.8 C++ overloaded functions</H3>
+<H3><a name="Perl5_nn22"></a>28.4.8 C++ overloaded functions</H3>
 
 
 <p>
@@ -1226,7 +1226,7 @@ example::Spam_foo_d($s,3.14);
 Please refer to the "SWIG Basics" chapter for more information. 
 </p>
 
-<H3><a name="Perl5_nn23"></a>27.4.9 Operators</H3>
+<H3><a name="Perl5_nn23"></a>28.4.9 Operators</H3>
 
 
     <p>
@@ -1253,7 +1253,7 @@ The following C++ operators are currently supported by the Perl module:
 <li>operator or  </li>
     </ul>
 
-<H3><a name="Perl5_nn24"></a>27.4.10 Modules and packages</H3>
+<H3><a name="Perl5_nn24"></a>28.4.10 Modules and packages</H3>
 
 
 <p>
@@ -1348,7 +1348,7 @@ print Foo::fact(4),"\n";        # Call a function in package FooBar
 </pre></div>
 -->
 
-<H2><a name="Perl5_nn25"></a>27.5 Input and output parameters</H2>
+<H2><a name="Perl5_nn25"></a>28.5 Input and output parameters</H2>
 
 
 <p>
@@ -1567,7 +1567,7 @@ print "$c\n";
 <b>Note:</b> The <tt>REFERENCE</tt> feature is only currently supported for numeric types (integers and floating point).
 </p>
 
-<H2><a name="Perl5_nn26"></a>27.6 Exception handling </H2>
+<H2><a name="Perl5_nn26"></a>28.6 Exception handling </H2>
 
 
 <p>
@@ -1732,7 +1732,7 @@ This is still supported, but it is deprecated.  The newer <tt>%exception</tt> di
 functionality, but it has additional capabilities that make it more powerful.
 </p>
 
-<H2><a name="Perl5_nn27"></a>27.7 Remapping datatypes with typemaps</H2>
+<H2><a name="Perl5_nn27"></a>28.7 Remapping datatypes with typemaps</H2>
 
 
 <p>
@@ -1749,7 +1749,7 @@ Typemaps are only used if you want to change some aspect of the primitive
 C-Perl interface.
 </p>
 
-<H3><a name="Perl5_nn28"></a>27.7.1 A simple typemap example</H3>
+<H3><a name="Perl5_nn28"></a>28.7.1 A simple typemap example</H3>
 
 
 <p>
@@ -1853,7 +1853,7 @@ example::count("e","Hello World");
 </div>
 
 
-<H3><a name="Perl5_nn29"></a>27.7.2 Perl5 typemaps</H3>
+<H3><a name="Perl5_nn29"></a>28.7.2 Perl5 typemaps</H3>
 
 
 <p>
@@ -1958,7 +1958,7 @@ Return of C++ member data (all languages).
 Check value of input parameter.
 </div>
 
-<H3><a name="Perl5_nn30"></a>27.7.3 Typemap variables</H3>
+<H3><a name="Perl5_nn30"></a>28.7.3 Typemap variables</H3>
 
 
 <p>
@@ -2029,7 +2029,7 @@ properly assigned.
 The Perl name of the wrapper function being created.
 </div>
 
-<H3><a name="Perl5_nn31"></a>27.7.4 Useful functions</H3>
+<H3><a name="Perl5_nn31"></a>28.7.4 Useful functions</H3>
 
 
 <p>
@@ -2098,7 +2098,7 @@ int       sv_isa(SV *, char *0;
 </div>
 
 
-<H2><a name="Perl5_nn32"></a>27.8 Typemap Examples</H2>
+<H2><a name="Perl5_nn32"></a>28.8 Typemap Examples</H2>
 
 
 <p>
@@ -2107,7 +2107,7 @@ might look at the files "<tt>perl5.swg</tt>" and "<tt>typemaps.i</tt>" in
 the SWIG library.
 </p>
 
-<H3><a name="Perl5_nn33"></a>27.8.1 Converting a Perl5 array to a char ** </H3>
+<H3><a name="Perl5_nn33"></a>28.8.1 Converting a Perl5 array to a char ** </H3>
 
 
 <p>
@@ -2199,7 +2199,7 @@ print @$b,"\n";                                  # Print it out
 </pre></div>
 
 
-<H3><a name="Perl5_nn34"></a>27.8.2 Return values </H3>
+<H3><a name="Perl5_nn34"></a>28.8.2 Return values </H3>
 
 
 <p>
@@ -2228,7 +2228,7 @@ can be done using the <tt>EXTEND()</tt> macro as in :
 }
 </pre></div>
 
-<H3><a name="Perl5_nn35"></a>27.8.3 Returning values from arguments</H3>
+<H3><a name="Perl5_nn35"></a>28.8.3 Returning values from arguments</H3>
 
 
 <p>
@@ -2282,7 +2282,7 @@ print "multout(7,13) = @r\n";
 ($x,$y) = multout(7,13);
 </pre></div>
 
-<H3><a name="Perl5_nn36"></a>27.8.4 Accessing array structure members</H3>
+<H3><a name="Perl5_nn36"></a>28.8.4 Accessing array structure members</H3>
 
 
 <p>
@@ -2345,7 +2345,7 @@ the "in" typemap in the previous section would be used to convert an
 to copy the converted array into a C data structure.
 </p>
 
-<H3><a name="Perl5_nn37"></a>27.8.5 Turning Perl references into C pointers</H3>
+<H3><a name="Perl5_nn37"></a>28.8.5 Turning Perl references into C pointers</H3>
 
 
 <p>
@@ -2410,7 +2410,7 @@ print "$c\n";
 
 </pre></div>
 
-<H3><a name="Perl5_nn38"></a>27.8.6 Pointer handling</H3>
+<H3><a name="Perl5_nn38"></a>28.8.6 Pointer handling</H3>
 
 
 <p>
@@ -2489,7 +2489,7 @@ For example:
 </pre>
 </div>
 
-<H2><a name="Perl5_nn39"></a>27.9 Proxy classes</H2>
+<H2><a name="Perl5_nn39"></a>28.9 Proxy classes</H2>
 
 
 <p>
@@ -2505,7 +2505,7 @@ to the underlying code.  This section describes the implementation
 details of the proxy interface.
 </p>
 
-<H3><a name="Perl5_nn40"></a>27.9.1 Preliminaries</H3>
+<H3><a name="Perl5_nn40"></a>28.9.1 Preliminaries</H3>
 
 
 <p>
@@ -2527,7 +2527,7 @@ SWIG creates a collection of high-level Perl wrappers.  In your scripts, you wil
 high level wrappers.  The wrappers, in turn, interact with the low-level procedural module.
 </p>
 
-<H3><a name="Perl5_nn41"></a>27.9.2 Structure and class wrappers</H3>
+<H3><a name="Perl5_nn41"></a>28.9.2 Structure and class wrappers</H3>
 
 
 <p>
@@ -2653,7 +2653,7 @@ $v-&gt;DESTROY();
 
 </pre></div>
 
-<H3><a name="Perl5_nn42"></a>27.9.3 Object Ownership</H3>
+<H3><a name="Perl5_nn42"></a>28.9.3 Object Ownership</H3>
 
 
 <p>
@@ -2740,7 +2740,7 @@ counting, garbage collection, or advanced features one might find in
 sophisticated languages.
 </p>
 
-<H3><a name="Perl5_nn43"></a>27.9.4 Nested Objects</H3>
+<H3><a name="Perl5_nn43"></a>28.9.4 Nested Objects</H3>
 
 
 <p>
@@ -2793,7 +2793,7 @@ $p-&gt;{f}-&gt;{x} = 0.0;
 %${$p-&gt;{v}} = ( x=&gt;0, y=&gt;0, z=&gt;0);         
 </pre></div>
 
-<H3><a name="Perl5_nn44"></a>27.9.5 Proxy Functions</H3>
+<H3><a name="Perl5_nn44"></a>28.9.5 Proxy Functions</H3>
 
 
 <p>
@@ -2827,7 +2827,7 @@ This function replaces the original function, but operates in an
 identical manner.
 </p>
 
-<H3><a name="Perl5_nn45"></a>27.9.6 Inheritance</H3>
+<H3><a name="Perl5_nn45"></a>28.9.6 Inheritance</H3>
 
 
 <p>
@@ -2903,7 +2903,7 @@ particular, inheritance of data members is extremely tricky (and I'm
 not even sure if it really works).
 </p>
 
-<H3><a name="Perl5_nn46"></a>27.9.7 Modifying the proxy methods</H3>
+<H3><a name="Perl5_nn46"></a>28.9.7 Modifying the proxy methods</H3>
 
 
 <p>
@@ -2931,7 +2931,7 @@ public:
 };
 </pre></div>
 
-<H2><a name="Perl5_nn47"></a>27.10 Adding additional Perl code</H2>
+<H2><a name="Perl5_nn47"></a>28.10 Adding additional Perl code</H2>
 
 
 <p>
diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index 8adbc36b1..e0f1e200a 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -7,14 +7,13 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Php"></a>28 SWIG and PHP</H1>
+<H1><a name="Php"></a>29 SWIG and PHP</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
 <li><a href="#Php_nn1">Generating PHP Extensions</a>
 <ul>
 <li><a href="#Php_nn1_1">Building a loadable extension</a>
-<li><a href="#Php_nn1_2">Building extensions into PHP</a>
 <li><a href="#Php_nn1_3">Using PHP Extensions</a>
 </ul>
 <li><a href="#Php_nn2">Basic PHP interface</a>
@@ -70,7 +69,7 @@ your extension into php directly, you will need the complete PHP source tree
 available.
 </p>
 
-<H2><a name="Php_nn1"></a>28.1 Generating PHP Extensions</H2>
+<H2><a name="Php_nn1"></a>29.1 Generating PHP Extensions</H2>
 
 
 <p>
@@ -117,7 +116,8 @@ and it doesn't play nicely with package system.  We don't recommend
 this approach, or provide explicit support for it.
 </p>
 
-<H3><a name="Php_nn1_1"></a>28.1.1 Building a loadable extension</H3>
+<H3><a name="Php_nn1_1"></a>29.1.1 Building a loadable extension</H3>
+
 
 <p>
 To build your module as a dynamically loadable extension, use compilation
@@ -131,7 +131,8 @@ least work for Linux though):
 	gcc -shared example_wrap.o -o example.so
 </pre></div>
 
-<H3><a name="Php_nn1_3"></a>28.1.3 Using PHP Extensions</H3>
+<H3><a name="Php_nn1_3"></a>29.1.2 Using PHP Extensions</H3>
+
 
 <p>
 To test the extension from a PHP script, you need to load it first. You
@@ -161,7 +162,7 @@ attempts to do the <tt>dl()</tt> call for you:
 	include("example.php");
 </pre></div>
 
-<H2><a name="Php_nn2"></a>28.2 Basic PHP interface</H2>
+<H2><a name="Php_nn2"></a>29.2 Basic PHP interface</H2>
 
 
 <p>
@@ -171,7 +172,7 @@ possible for names of symbols in one extension module to clash with
 other symbols unless care is taken to <tt>%rename</tt> them.
 </p>
 
-<H3><a name="Php_nn2_1"></a>28.2.1 Constants</H3>
+<H3><a name="Php_nn2_1"></a>29.2.1 Constants</H3>
 
 
 <p>
@@ -296,7 +297,7 @@ both point to the same value, without the case test taking place.  (
 Apologies, this paragraph needs rewriting to make some sense. )
 </p>
 
-<H3><a name="Php_nn2_2"></a>28.2.2 Global Variables</H3>
+<H3><a name="Php_nn2_2"></a>29.2.2 Global Variables</H3>
 
 
 <p>
@@ -345,7 +346,7 @@ undefined.
 At this time SWIG does not support custom accessor methods.
 </p>
 
-<H3><a name="Php_nn2_3"></a>28.2.3 Functions</H3>
+<H3><a name="Php_nn2_3"></a>29.2.3 Functions</H3>
 
 
 <p>
@@ -398,7 +399,7 @@ print $s;      # The value of $s was not changed.
 -->
 
 
-<H3><a name="Php_nn2_4"></a>28.2.4 Overloading</H3>
+<H3><a name="Php_nn2_4"></a>29.2.4 Overloading</H3>
 
 
 <p>
@@ -454,7 +455,7 @@ taking the integer argument.
 </p>
 -->
 
-<H3><a name="Php_nn2_5"></a>28.2.5 Pointers and References</H3>
+<H3><a name="Php_nn2_5"></a>29.2.5 Pointers and References</H3>
 
 
 <p>
@@ -586,7 +587,7 @@ PHP in a number of ways: by using <tt>unset</tt> on an existing
 variable, or assigning <tt>NULL</tt> to a variable.
 </p>
 
-<H3><a name="Php_nn2_6"></a>28.2.6 Structures and C++ classes</H3>
+<H3><a name="Php_nn2_6"></a>29.2.6 Structures and C++ classes</H3>
 
 
 <p>
@@ -645,7 +646,7 @@ Would be used in the following way from PHP5:
 Member variables and methods are accessed using the <tt>-&gt;</tt> operator.
 </p>
 
-<H4><a name="Php_nn2_6_1"></a>28.2.6.1 Using <tt>-noproxy</tt></H4>
+<H4><a name="Php_nn2_6_1"></a>29.2.6.1 Using <tt>-noproxy</tt></H4>
 
 
 <p>
@@ -671,7 +672,7 @@ Complex_im_set($obj,$d);
 Complex_im_get($obj);
 </pre></div>
 
-<H4><a name="Php_nn2_6_2"></a>28.2.6.2 Constructors and Destructors</H4>
+<H4><a name="Php_nn2_6_2"></a>29.2.6.2 Constructors and Destructors</H4>
 
 
 <p>
@@ -712,7 +713,7 @@ the programmer can either reassign the variable or call
 <tt>unset($v)</tt>
 </p>
 
-<H4><a name="Php_nn2_6_3"></a>28.2.6.3 Static Member Variables</H4>
+<H4><a name="Php_nn2_6_3"></a>29.2.6.3 Static Member Variables</H4>
 
 
 <p>
@@ -755,7 +756,7 @@ Ko::threats(10);
 echo "There has now been " . Ko::threats() . " threats\n";
 
 </pre></div>
-<H4><a name="Php_nn2_6_4"></a>28.2.6.4 Static Member Functions</H4>
+<H4><a name="Php_nn2_6_4"></a>29.2.6.4 Static Member Functions</H4>
 
 
 <p>
@@ -777,7 +778,7 @@ Ko::threats();
 </pre></div>
 
 
-<H3><a name="Php_nn2_7"></a>28.2.7 PHP Pragmas, Startup and Shutdown code</H3>
+<H3><a name="Php_nn2_7"></a>29.2.7 PHP Pragmas, Startup and Shutdown code</H3>
 
 
 <p>
diff --git a/Doc/Manual/Pike.html b/Doc/Manual/Pike.html
index 3e39d4062..a47d07865 100644
--- a/Doc/Manual/Pike.html
+++ b/Doc/Manual/Pike.html
@@ -6,7 +6,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Pike"></a>29 SWIG and Pike</H1>
+<H1><a name="Pike"></a>30 SWIG and Pike</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -46,10 +46,10 @@ least, make sure you read the "<a href="SWIG.html#SWIG">SWIG Basics</a>"
 chapter.<br>
 </p>
 
-<H2><a name="Pike_nn2"></a>29.1 Preliminaries</H2>
+<H2><a name="Pike_nn2"></a>30.1 Preliminaries</H2>
 
 
-<H3><a name="Pike_nn3"></a>29.1.1 Running SWIG</H3>
+<H3><a name="Pike_nn3"></a>30.1.1 Running SWIG</H3>
 
 
 <p>
@@ -94,7 +94,7 @@ can use the <tt>-o</tt> option:
 <div class="code">
   <pre>$ <b>swig -pike -o pseudonym.c example.i</b><br></pre>
 </div>
-<H3><a name="Pike_nn4"></a>29.1.2 Getting the right header files</H3>
+<H3><a name="Pike_nn4"></a>30.1.2 Getting the right header files</H3>
 
 
 <p>
@@ -114,7 +114,7 @@ You're looking for files with the names <tt>global.h</tt>, <tt>program.h</tt>
 and so on.
 </p>
 
-<H3><a name="Pike_nn5"></a>29.1.3 Using your module</H3>
+<H3><a name="Pike_nn5"></a>30.1.3 Using your module</H3>
 
 
 <p>
@@ -129,10 +129,10 @@ Pike v7.4 release 10 running Hilfe v3.5 (Incremental Pike Frontend)
 (1) Result: 24
 </pre></div>
 
-<H2><a name="Pike_nn6"></a>29.2 Basic C/C++ Mapping</H2>
+<H2><a name="Pike_nn6"></a>30.2 Basic C/C++ Mapping</H2>
 
 
-<H3><a name="Pike_nn7"></a>29.2.1 Modules</H3>
+<H3><a name="Pike_nn7"></a>30.2.1 Modules</H3>
 
 
 <p>
@@ -143,7 +143,7 @@ concerned), SWIG's <tt>%module</tt> directive doesn't really have any
 significance.
 </p>
 
-<H3><a name="Pike_nn8"></a>29.2.2 Functions</H3>
+<H3><a name="Pike_nn8"></a>30.2.2 Functions</H3>
 
 
 <p>
@@ -168,7 +168,7 @@ exactly as you'd expect it to:
 (1) Result: 24
 </pre></div>
 
-<H3><a name="Pike_nn9"></a>29.2.3 Global variables</H3>
+<H3><a name="Pike_nn9"></a>30.2.3 Global variables</H3>
 
 
 <p>
@@ -197,7 +197,7 @@ will result in two functions, <tt>Foo_get()</tt> and <tt>Foo_set()</tt>:
 (3) Result: 3.141590
 </pre></div>
 
-<H3><a name="Pike_nn10"></a>29.2.4 Constants and enumerated types</H3>
+<H3><a name="Pike_nn10"></a>30.2.4 Constants and enumerated types</H3>
 
 
 <p>
@@ -205,7 +205,7 @@ Enumerated types in C/C++ declarations are wrapped as Pike constants,
 not as Pike enums.
 </p>
 
-<H3><a name="Pike_nn11"></a>29.2.5 Constructors and Destructors</H3>
+<H3><a name="Pike_nn11"></a>30.2.5 Constructors and Destructors</H3>
 
 
 <p>
@@ -213,7 +213,7 @@ Constructors are wrapped as <tt>create()</tt> methods, and destructors are
 wrapped as <tt>destroy()</tt> methods, for Pike classes.
 </p>
 
-<H3><a name="Pike_nn12"></a>29.2.6 Static Members</H3>
+<H3><a name="Pike_nn12"></a>30.2.6 Static Members</H3>
 
 
 <p>
diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
index 62b72fabf..5a8653597 100644
--- a/Doc/Manual/Python.html
+++ b/Doc/Manual/Python.html
@@ -6,7 +6,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Python"></a>30 SWIG and Python</H1>
+<H1><a name="Python"></a>31 SWIG and Python</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -125,7 +125,7 @@ very least, make sure you read the "<a href="SWIG.html#SWIG">SWIG
 Basics</a>" chapter.
 </p>
 
-<H2><a name="Python_nn2"></a>30.1 Overview</H2>
+<H2><a name="Python_nn2"></a>31.1 Overview</H2>
 
 
 <p>
@@ -152,10 +152,10 @@ described followed by a discussion of low-level implementation
 details.
 </p>
 
-<H2><a name="Python_nn3"></a>30.2 Preliminaries</H2>
+<H2><a name="Python_nn3"></a>31.2 Preliminaries</H2>
 
 
-<H3><a name="Python_nn4"></a>30.2.1 Running SWIG</H3>
+<H3><a name="Python_nn4"></a>31.2.1 Running SWIG</H3>
 
 
 <p>
@@ -253,7 +253,7 @@ The following sections have further practical examples and details on
 how you might go about compiling and using the generated files.
 </p>
 
-<H3><a name="Python_nn6"></a>30.2.2 Using distutils</H3>
+<H3><a name="Python_nn6"></a>31.2.2 Using distutils</H3>
 
 
 <p>
@@ -345,7 +345,7 @@ This same approach works on all platforms if the appropriate compiler is install
 can even build extensions to the standard Windows Python using MingGW)
 </p>
 
-<H3><a name="Python_nn7"></a>30.2.3 Hand compiling a dynamic module</H3>
+<H3><a name="Python_nn7"></a>31.2.3 Hand compiling a dynamic module</H3>
 
 
 <p>
@@ -393,7 +393,7 @@ module actually consists of two files; <tt>socket.py</tt> and
 </p>
 
 
-<H3><a name="Python_nn8"></a>30.2.4 Static linking</H3>
+<H3><a name="Python_nn8"></a>31.2.4 Static linking</H3>
 
 
 <p>
@@ -472,7 +472,7 @@ If using static linking, you might want to rely on a different approach
 (perhaps using distutils).
 </p>
 
-<H3><a name="Python_nn9"></a>30.2.5 Using your module</H3>
+<H3><a name="Python_nn9"></a>31.2.5 Using your module</H3>
 
 
 <p>
@@ -629,7 +629,7 @@ system configuration (this requires root access and you will need to
 read the man pages).
 </p>
 
-<H3><a name="Python_nn10"></a>30.2.6 Compilation of C++ extensions</H3>
+<H3><a name="Python_nn10"></a>31.2.6 Compilation of C++ extensions</H3>
 
 
 <p>
@@ -728,7 +728,7 @@ erratic program behavior.   If working with lots of software components, you
 might want to investigate using a more formal standard such as COM.
 </p>
 
-<H3><a name="Python_nn11"></a>30.2.7 Compiling for 64-bit platforms</H3>
+<H3><a name="Python_nn11"></a>31.2.7 Compiling for 64-bit platforms</H3>
 
 
 <p>
@@ -765,7 +765,7 @@ and -m64 allow you to choose the desired binary format for your python
 extension.
 </p>
 
-<H3><a name="Python_nn12"></a>30.2.8 Building Python Extensions under Windows</H3>
+<H3><a name="Python_nn12"></a>31.2.8 Building Python Extensions under Windows</H3>
 
 
 <p>
@@ -874,7 +874,7 @@ SWIG Wiki</a>.
 </p>
 
 
-<H2><a name="Python_nn13"></a>30.3 A tour of basic C/C++ wrapping</H2>
+<H2><a name="Python_nn13"></a>31.3 A tour of basic C/C++ wrapping</H2>
 
 
 <p>
@@ -883,7 +883,7 @@ to your C/C++ code.  Functions are wrapped as functions, classes are wrapped as
 This section briefly covers the essential aspects of this wrapping.
 </p>
 
-<H3><a name="Python_nn14"></a>30.3.1 Modules</H3>
+<H3><a name="Python_nn14"></a>31.3.1 Modules</H3>
 
 
 <p>
@@ -896,7 +896,7 @@ module name, make sure you don't use the same name as a built-in
 Python command or standard module name.  
 </p>
 
-<H3><a name="Python_nn15"></a>30.3.2 Functions</H3>
+<H3><a name="Python_nn15"></a>31.3.2 Functions</H3>
 
 
 <p>
@@ -920,7 +920,7 @@ like you think it does:
 &gt;&gt;&gt;
 </pre></div>
 
-<H3><a name="Python_nn16"></a>30.3.3 Global variables</H3>
+<H3><a name="Python_nn16"></a>31.3.3 Global variables</H3>
 
 
 <p>
@@ -1058,7 +1058,7 @@ that starts with a leading underscore. SWIG does not create <tt>cvar</tt>
 if there are no global variables in a module.
 </p>
 
-<H3><a name="Python_nn17"></a>30.3.4 Constants and enums</H3>
+<H3><a name="Python_nn17"></a>31.3.4 Constants and enums</H3>
 
 
 <p>
@@ -1098,7 +1098,7 @@ other object.  Unfortunately, there is no easy way for SWIG to
 generate code that prevents this.  You will just have to be careful.
 </p>
 
-<H3><a name="Python_nn18"></a>30.3.5 Pointers</H3>
+<H3><a name="Python_nn18"></a>31.3.5 Pointers</H3>
 
 
 <p>
@@ -1239,7 +1239,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return
 <tt>None</tt> if the conversion can't be performed.
 </p>
 
-<H3><a name="Python_nn19"></a>30.3.6 Structures</H3>
+<H3><a name="Python_nn19"></a>31.3.6 Structures</H3>
 
 
 <p>
@@ -1428,7 +1428,7 @@ everything works just like you would expect. For example:
 </pre>
 </div>
 
-<H3><a name="Python_nn20"></a>30.3.7 C++ classes</H3>
+<H3><a name="Python_nn20"></a>31.3.7 C++ classes</H3>
 
 
 <p>
@@ -1517,7 +1517,7 @@ they are accessed through <tt>cvar</tt> like this:
 </pre>
 </div>
 
-<H3><a name="Python_nn21"></a>30.3.8 C++ inheritance</H3>
+<H3><a name="Python_nn21"></a>31.3.8 C++ inheritance</H3>
 
 
 <p>
@@ -1572,7 +1572,7 @@ then the function <tt>spam()</tt> accepts <tt>Foo *</tt> or a pointer to any cla
 It is safe to use multiple inheritance with SWIG.
 </p>
 
-<H3><a name="Python_nn22"></a>30.3.9 Pointers, references, values, and arrays</H3>
+<H3><a name="Python_nn22"></a>31.3.9 Pointers, references, values, and arrays</H3>
 
 
 <p>
@@ -1633,7 +1633,7 @@ treated as a returning value, and it will follow the same
 allocation/deallocation process.
 </p>
 
-<H3><a name="Python_nn23"></a>30.3.10 C++ overloaded functions</H3>
+<H3><a name="Python_nn23"></a>31.3.10 C++ overloaded functions</H3>
 
 
 <p>
@@ -1756,7 +1756,7 @@ first declaration takes precedence.
 Please refer to the "SWIG and C++" chapter for more information about overloading. 
 </p>
 
-<H3><a name="Python_nn24"></a>30.3.11 C++ operators</H3>
+<H3><a name="Python_nn24"></a>31.3.11 C++ operators</H3>
 
 
 <p>
@@ -1845,7 +1845,7 @@ Also, be aware that certain operators don't map cleanly to Python.  For instance
 overloaded assignment operators don't map to Python semantics and will be ignored.
 </p>
 
-<H3><a name="Python_nn25"></a>30.3.12 C++ namespaces</H3>
+<H3><a name="Python_nn25"></a>31.3.12 C++ namespaces</H3>
 
 
 <p>
@@ -1912,7 +1912,7 @@ utilizes thousands of small deeply nested namespaces each with
 identical symbol names, well, then you get what you deserve.
 </p>
 
-<H3><a name="Python_nn26"></a>30.3.13 C++ templates</H3>
+<H3><a name="Python_nn26"></a>31.3.13 C++ templates</H3>
 
 
 <p>
@@ -1966,7 +1966,7 @@ Some more complicated
 examples will appear later.
 </p>
 
-<H3><a name="Python_nn27"></a>30.3.14 C++ Smart Pointers</H3>
+<H3><a name="Python_nn27"></a>31.3.14 C++ Smart Pointers</H3>
 
 
 <p>
@@ -2051,7 +2051,7 @@ simply use the <tt>__deref__()</tt> method.  For example:
 </div>
 
 
-<H3><a name="Python_nn27a"></a>30.3.15 C++ Reference Counted Objects (ref/unref)</H3>
+<H3><a name="Python_nn27a"></a>31.3.15 C++ Reference Counted Objects (ref/unref)</H3>
 
 
 <p>
@@ -2213,7 +2213,7 @@ python releases the proxy instance.
 </p>
 
 
-<H2><a name="Python_nn28"></a>30.4 Further details on the Python class interface</H2>
+<H2><a name="Python_nn28"></a>31.4 Further details on the Python class interface</H2>
 
 
 <p>
@@ -2226,7 +2226,7 @@ of low-level details were omitted.  This section provides a brief overview
 of how the proxy classes work.
 </p>
 
-<H3><a name="Python_nn29"></a>30.4.1 Proxy classes</H3>
+<H3><a name="Python_nn29"></a>31.4.1 Proxy classes</H3>
 
 
 <p>
@@ -2315,7 +2315,7 @@ you can attach new Python methods to the class and you can even inherit from it
 by Python built-in types until Python 2.2).
 </p>
 
-<H3><a name="Python_nn30"></a>30.4.2 Memory management</H3>
+<H3><a name="Python_nn30"></a>31.4.2 Memory management</H3>
 
 
 <p>
@@ -2507,7 +2507,7 @@ It is also possible to deal with situations like this using
 typemaps--an advanced topic discussed later.
 </p>
 
-<H3><a name="Python_nn31"></a>30.4.3 Python 2.2 and classic classes</H3>
+<H3><a name="Python_nn31"></a>31.4.3 Python 2.2 and classic classes</H3>
 
 
 <p>
@@ -2544,7 +2544,7 @@ class itself.  In Python-2.1 and earlier, they have to be accessed as a global
 function or through an instance (see the earlier section).
 </p>
 
-<H2><a name="directors"></a>30.5 Cross language polymorphism</H2>
+<H2><a name="directors"></a>31.5 Cross language polymorphism</H2>
 
 
 <p>
@@ -2578,7 +2578,7 @@ proxy classes, director classes, and C wrapper functions takes care of
 all the cross-language method routing transparently.
 </p>
 
-<H3><a name="Python_nn33"></a>30.5.1 Enabling directors</H3>
+<H3><a name="Python_nn33"></a>31.5.1 Enabling directors</H3>
 
 
 <p>
@@ -2671,7 +2671,7 @@ class MyFoo(mymodule.Foo):
 </div>
 
 
-<H3><a name="Python_nn34"></a>30.5.2 Director classes</H3>
+<H3><a name="Python_nn34"></a>31.5.2 Director classes</H3>
 
 
  
@@ -2753,7 +2753,7 @@ so there is no need for the extra overhead involved with routing the
 calls through Python.
 </p>
 
-<H3><a name="Python_nn35"></a>30.5.3 Ownership and object destruction</H3>
+<H3><a name="Python_nn35"></a>31.5.3 Ownership and object destruction</H3>
 
 
 <p>
@@ -2820,7 +2820,7 @@ deleting all the Foo pointers it contains at some point.  Note that no hard
 references to the Foo objects remain in Python.
 </p>
 
-<H3><a name="Python_nn36"></a>30.5.4 Exception unrolling</H3>
+<H3><a name="Python_nn36"></a>31.5.4 Exception unrolling</H3>
 
 
 <p>
@@ -2879,7 +2879,7 @@ Swig::DirectorMethodException is thrown, Python will register the
 exception as soon as the C wrapper function returns.
 </p>
 
-<H3><a name="Python_nn37"></a>30.5.5 Overhead and code bloat</H3>
+<H3><a name="Python_nn37"></a>31.5.5 Overhead and code bloat</H3>
 
 
 <p>
@@ -2913,7 +2913,7 @@ directive) for only those methods that are likely to be extended in
 Python.
 </p>
 
-<H3><a name="Python_nn38"></a>30.5.6 Typemaps</H3>
+<H3><a name="Python_nn38"></a>31.5.6 Typemaps</H3>
 
 
 <p>
@@ -2927,7 +2927,7 @@ need to be supported.
 </p>
 
 
-<H3><a name="Python_nn39"></a>30.5.7 Miscellaneous</H3>
+<H3><a name="Python_nn39"></a>31.5.7 Miscellaneous</H3>
 
 
 <p>
@@ -2974,7 +2974,7 @@ methods that return const references.
 </p>
 
 
-<H2><a name="Python_nn40"></a>30.6 Common customization features</H2>
+<H2><a name="Python_nn40"></a>31.6 Common customization features</H2>
 
 
 <p>
@@ -2987,7 +2987,7 @@ This section describes some common SWIG features that are used to
 improve your the interface to an extension module.
 </p>
 
-<H3><a name="Python_nn41"></a>30.6.1 C/C++ helper functions</H3>
+<H3><a name="Python_nn41"></a>31.6.1 C/C++ helper functions</H3>
 
 
 <p>
@@ -3068,7 +3068,7 @@ hard to implement.  It is possible to clean this up using Python code, typemaps,
 customization features as covered in later sections.
 </p>
 
-<H3><a name="Python_nn42"></a>30.6.2 Adding additional Python code</H3>
+<H3><a name="Python_nn42"></a>31.6.2 Adding additional Python code</H3>
 
 
 <p>
@@ -3217,7 +3217,7 @@ public:
 
 
 
-<H3><a name="Python_nn43"></a>30.6.3 Class extension with %extend</H3>
+<H3><a name="Python_nn43"></a>31.6.3 Class extension with %extend</H3>
 
 
 <p>
@@ -3306,7 +3306,7 @@ Vector(12,14,16)
 in any way---the extensions only show up in the Python interface.
 </p>
 
-<H3><a name="Python_nn44"></a>30.6.4 Exception handling with %exception</H3>
+<H3><a name="Python_nn44"></a>31.6.4 Exception handling with %exception</H3>
 
 
 <p>
@@ -3432,7 +3432,7 @@ The language-independent <tt>exception.i</tt> library file can also be used
 to raise exceptions.  See the <a href="Library.html#Library">SWIG Library</a> chapter.
 </p>
 
-<H2><a name="Python_nn45"></a>30.7 Tips and techniques</H2>
+<H2><a name="Python_nn45"></a>31.7 Tips and techniques</H2>
 
 
 <p>
@@ -3442,7 +3442,7 @@ strings, binary data, and arrays.   This chapter discusses the common techniques
 solving these problems.
 </p>
 
-<H3><a name="Python_nn46"></a>30.7.1 Input and output parameters</H3>
+<H3><a name="Python_nn46"></a>31.7.1 Input and output parameters</H3>
 
 
 <p>
@@ -3655,7 +3655,7 @@ void foo(Bar *OUTPUT);
 may not have the intended effect since <tt>typemaps.i</tt> does not define an OUTPUT rule for <tt>Bar</tt>.
 </p>
 
-<H3><a name="Python_nn47"></a>30.7.2 Simple pointers</H3>
+<H3><a name="Python_nn47"></a>31.7.2 Simple pointers</H3>
 
 
 <p>
@@ -3724,7 +3724,7 @@ If you replace <tt>%pointer_functions()</tt> by <tt>%pointer_class(type,name)</t
 See the <a href="Library.html#Library">SWIG Library</a> chapter for further details.
 </p>
 
-<H3><a name="Python_nn48"></a>30.7.3 Unbounded C Arrays</H3>
+<H3><a name="Python_nn48"></a>31.7.3 Unbounded C Arrays</H3>
 
 
 <p>
@@ -3786,7 +3786,7 @@ well suited for applications in which you need to create buffers,
 package binary data, etc.
 </p>
 
-<H3><a name="Python_nn49"></a>30.7.4 String handling</H3>
+<H3><a name="Python_nn49"></a>31.7.4 String handling</H3>
 
 
 <p>
@@ -3855,16 +3855,16 @@ If you need to return binary data, you might use the
 also be used to extra binary data from arbitrary pointers.
 </p>
 
-<H3><a name="Python_nn50"></a>30.7.5 Arrays</H3>
+<H3><a name="Python_nn50"></a>31.7.5 Arrays</H3>
 
 
-<H3><a name="Python_nn51"></a>30.7.6 String arrays</H3>
+<H3><a name="Python_nn51"></a>31.7.6 String arrays</H3>
 
 
-<H3><a name="Python_nn52"></a>30.7.7 STL wrappers</H3>
+<H3><a name="Python_nn52"></a>31.7.7 STL wrappers</H3>
 
 
-<H2><a name="Python_nn53"></a>30.8 Typemaps</H2>
+<H2><a name="Python_nn53"></a>31.8 Typemaps</H2>
 
 
 <p>
@@ -3881,7 +3881,7 @@ Typemaps are only used if you want to change some aspect of the primitive
 C-Python interface or if you want to elevate your guru status.
 </p>
 
-<H3><a name="Python_nn54"></a>30.8.1 What is a typemap?</H3>
+<H3><a name="Python_nn54"></a>31.8.1 What is a typemap?</H3>
 
 
 <p>
@@ -3997,7 +3997,7 @@ parameter is omitted):
 </pre>
 </div>
 
-<H3><a name="Python_nn55"></a>30.8.2 Python typemaps</H3>
+<H3><a name="Python_nn55"></a>31.8.2 Python typemaps</H3>
 
 
 <p>
@@ -4038,7 +4038,7 @@ a look at the SWIG library version 1.3.20 or so.
 </p>
 
 
-<H3><a name="Python_nn56"></a>30.8.3 Typemap variables</H3>
+<H3><a name="Python_nn56"></a>31.8.3 Typemap variables</H3>
 
 
 <p>
@@ -4109,7 +4109,7 @@ properly assigned.
 The Python name of the wrapper function being created.
 </div>
 
-<H3><a name="Python_nn57"></a>30.8.4 Useful Python Functions</H3>
+<H3><a name="Python_nn57"></a>31.8.4 Useful Python Functions</H3>
 
 
 <p>
@@ -4237,7 +4237,7 @@ write me
 </pre>
 </div>
 
-<H2><a name="Python_nn58"></a>30.9 Typemap Examples</H2>
+<H2><a name="Python_nn58"></a>31.9 Typemap Examples</H2>
 
 
 <p>
@@ -4246,7 +4246,7 @@ might look at the files "<tt>python.swg</tt>" and "<tt>typemaps.i</tt>" in
 the SWIG library.
 </p>
 
-<H3><a name="Python_nn59"></a>30.9.1 Converting  Python list to a char ** </H3>
+<H3><a name="Python_nn59"></a>31.9.1 Converting  Python list to a char ** </H3>
 
 
 <p>
@@ -4326,7 +4326,7 @@ memory allocation is used to allocate memory for the array, the
 the C function. 
 </p>
 
-<H3><a name="Python_nn60"></a>30.9.2 Expanding a Python object into multiple arguments</H3>
+<H3><a name="Python_nn60"></a>31.9.2 Expanding a Python object into multiple arguments</H3>
 
 
 <p>
@@ -4405,7 +4405,7 @@ to supply the argument count.  This is automatically set by the typemap code.  F
 </pre>
 </div>
 
-<H3><a name="Python_nn61"></a>30.9.3 Using typemaps to return arguments</H3>
+<H3><a name="Python_nn61"></a>31.9.3 Using typemaps to return arguments</H3>
 
 
 <p>
@@ -4494,7 +4494,7 @@ function can now be used as follows:
 &gt;&gt;&gt;
 </pre></div>
 
-<H3><a name="Python_nn62"></a>30.9.4 Mapping Python tuples into small arrays</H3>
+<H3><a name="Python_nn62"></a>31.9.4 Mapping Python tuples into small arrays</H3>
 
 
 <p>
@@ -4543,7 +4543,7 @@ array, such an approach would not be recommended for huge arrays, but
 for small structures, this approach works fine.
 </p>
 
-<H3><a name="Python_nn63"></a>30.9.5 Mapping sequences to C arrays</H3>
+<H3><a name="Python_nn63"></a>31.9.5 Mapping sequences to C arrays</H3>
 
 
 <p>
@@ -4632,7 +4632,7 @@ static int convert_darray(PyObject *input, double *ptr, int size) {
 </pre>
 </div>
 
-<H3><a name="Python_nn64"></a>30.9.6 Pointer handling</H3>
+<H3><a name="Python_nn64"></a>31.9.6 Pointer handling</H3>
 
 
 <p>
@@ -4729,7 +4729,7 @@ class object (if applicable).
 
 
 
-<H2><a name="Python_nn65"></a>30.10 Docstring Features</H2>
+<H2><a name="Python_nn65"></a>31.10 Docstring Features</H2>
 
 
 <p>
@@ -4757,7 +4757,7 @@ of your users much simpler.
 </p>
 
 
-<H3><a name="Python_nn66"></a>30.10.1 Module docstring</H3>
+<H3><a name="Python_nn66"></a>31.10.1 Module docstring</H3>
 
 
 <p>
@@ -4791,7 +4791,7 @@ layout of controls on a panel, etc. to be loaded from an XML file."
 </div>
 
 
-<H3><a name="Python_nn67"></a>30.10.2 %feature("autodoc")</H3>
+<H3><a name="Python_nn67"></a>31.10.2 %feature("autodoc")</H3>
 
 
 <p>
@@ -4818,7 +4818,7 @@ names, default values if any, and return type if any. There are also
 three options for autodoc controlled by the value given to the
 feature, described below.
 
-<H4><a name="Python_nn68"></a>30.10.2.1 %feature("autodoc", "0")</H4>
+<H4><a name="Python_nn68"></a>31.10.2.1 %feature("autodoc", "0")</H4>
 
 
 <p>
@@ -4847,7 +4847,7 @@ def function_name(*args, **kwargs):
 </div>
 
 
-<H4><a name="Python_nn69"></a>30.10.2.2 %feature("autodoc", "1")</H4>
+<H4><a name="Python_nn69"></a>31.10.2.2 %feature("autodoc", "1")</H4>
 
 
 <p>
@@ -4872,7 +4872,7 @@ def function_name(*args, **kwargs):
 
 
 
-<H4><a name="Python_nn70"></a>30.10.2.3 %feature("autodoc", "docstring")</H4>
+<H4><a name="Python_nn70"></a>31.10.2.3 %feature("autodoc", "docstring")</H4>
 
 
 <p>
@@ -4891,7 +4891,7 @@ void GetPosition(int* OUTPUT, int* OUTPUT);
 </div>
 
 
-<H3><a name="Python_nn71"></a>30.10.3 %feature("docstring")</H3>
+<H3><a name="Python_nn71"></a>31.10.3 %feature("docstring")</H3>
 
 
 <p>
@@ -4923,7 +4923,7 @@ with more than one line.
 </pre>
 </div>
 
-<H2><a name="Python_nn72"></a>30.11 Python Packages</H2>
+<H2><a name="Python_nn72"></a>31.11 Python Packages</H2>
 
 
 <p>
diff --git a/Doc/Manual/R.html b/Doc/Manual/R.html
index 3b37d53a0..0ed43fc52 100644
--- a/Doc/Manual/R.html
+++ b/Doc/Manual/R.html
@@ -6,7 +6,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="R"></a>33 SWIG and R</H1>
+<H1><a name="R"></a>34 SWIG and R</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -33,7 +33,7 @@ compile and run an R interface to QuantLib running on Mandriva Linux
 with gcc. The R bindings also work on Microsoft Windows using Visual C++.
 </p>
 
-<H2><a name="R_nn2"></a>33.1 Bugs</H2>
+<H2><a name="R_nn2"></a>34.1 Bugs</H2>
 
 
 <p>
@@ -45,7 +45,7 @@ Currently the following features are not implemented or broken:
 <li>C Array wrappings
 </ul>
 
-<H2><a name="R_nn3"></a>33.2 Using R and SWIG</H2>
+<H2><a name="R_nn3"></a>34.2 Using R and SWIG</H2>
 
 
 <p>
@@ -99,7 +99,7 @@ Without it, inheritance of wrapped objects may fail.
 These two files can be loaded in any order
 </p>
 
-<H2><a name="R_nn4"></a>33.3 Precompiling large R files</H2>
+<H2><a name="R_nn4"></a>34.3 Precompiling large R files</H2>
 
 
 In cases where the R file is large, one make save a lot of loading
@@ -117,7 +117,7 @@ will save a large amount of loading time.
 
 
 
-<H2><a name="R_nn5"></a>33.4 General policy</H2>
+<H2><a name="R_nn5"></a>34.4 General policy</H2>
 
 
 <p>
@@ -126,7 +126,7 @@ wrapping over the underlying functions and rely on the R type system
 to provide R syntax.
 </p>
 
-<H2><a name="R_language_conventions"></a>33.5 Language conventions</H2>
+<H2><a name="R_language_conventions"></a>34.5 Language conventions</H2>
 
 
 <p>
@@ -135,7 +135,7 @@ and [ are overloaded to allow for R syntax (one based indices and
 slices)
 </p>
 
-<H2><a name="R_nn6"></a>33.6 C++ classes</H2>
+<H2><a name="R_nn6"></a>34.6 C++ classes</H2>
 
 
 <p>
@@ -147,7 +147,7 @@ keep track of the pointer object which removes the necessity for a lot
 of the proxy class baggage you see in other languages.
 </p>
 
-<H2><a name="R_nn7"></a>33.7 Enumerations</H2>
+<H2><a name="R_nn7"></a>34.7 Enumerations</H2>
 
 
 <p>
diff --git a/Doc/Manual/Ruby.html b/Doc/Manual/Ruby.html
index 9cd83d494..7360f732d 100644
--- a/Doc/Manual/Ruby.html
+++ b/Doc/Manual/Ruby.html
@@ -26,7 +26,7 @@
 
 
 
-<H1><a name="Ruby"></a>31 SWIG and Ruby</H1>
+<H1><a name="Ruby"></a>32 SWIG and Ruby</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -167,7 +167,7 @@
 
 
 
-<H2><a name="Ruby_nn2"></a>31.1 Preliminaries</H2>
+<H2><a name="Ruby_nn2"></a>32.1 Preliminaries</H2>
 
 
 <p> SWIG 1.3 is known to work with Ruby versions 1.6 and later.
@@ -190,7 +190,7 @@ of Ruby. </p>
 
 
 
-<H3><a name="Ruby_nn3"></a>31.1.1 Running SWIG</H3>
+<H3><a name="Ruby_nn3"></a>32.1.1 Running SWIG</H3>
 
 
 <p> To build a Ruby module, run SWIG using the <tt>-ruby</tt>
@@ -244,7 +244,7 @@ to compile this file and link it with the rest of your program. </p>
 
 
 
-<H3><a name="Ruby_nn4"></a>31.1.2 Getting the right header files</H3>
+<H3><a name="Ruby_nn4"></a>32.1.2 Getting the right header files</H3>
 
 
 <p> In order to compile the wrapper code, the compiler needs the <tt>ruby.h</tt>
@@ -288,7 +288,7 @@ installed, you can run Ruby to find out. For example: </p>
 
 
 
-<H3><a name="Ruby_nn5"></a>31.1.3 Compiling a dynamic module</H3>
+<H3><a name="Ruby_nn5"></a>32.1.3 Compiling a dynamic module</H3>
 
 
 <p> Ruby extension modules are typically compiled into shared
@@ -443,7 +443,7 @@ manual pages for your compiler and linker to determine the correct set
 of options. You might also check the <a href="http://www.dabeaz.com/cgi-bin/wiki.pl">SWIG Wiki</a>
 for additional information. </p>
 
-<H3><a name="Ruby_nn6"></a>31.1.4 Using your module</H3>
+<H3><a name="Ruby_nn6"></a>32.1.4 Using your module</H3>
 
 
 <p> Ruby <i>module</i> names must be capitalized,
@@ -498,7 +498,7 @@ begins with: </p>
 
 
 
-<H3><a name="Ruby_nn7"></a>31.1.5 Static linking</H3>
+<H3><a name="Ruby_nn7"></a>32.1.5 Static linking</H3>
 
 
 <p> An alternative approach to dynamic linking is to rebuild the
@@ -519,7 +519,7 @@ finally rebuilding Ruby. </p>
 
 
 
-<H3><a name="Ruby_nn8"></a>31.1.6 Compilation of C++ extensions</H3>
+<H3><a name="Ruby_nn8"></a>32.1.6 Compilation of C++ extensions</H3>
 
 
 <p> On most machines, C++ extension modules should be linked
@@ -571,7 +571,7 @@ extension, e.g. </p>
 
 
 
-<H2><a name="Ruby_nn9"></a>31.2 Building Ruby Extensions under Windows 95/NT</H2>
+<H2><a name="Ruby_nn9"></a>32.2 Building Ruby Extensions under Windows 95/NT</H2>
 
 
 <p> Building a SWIG extension to Ruby under Windows 95/NT is
@@ -610,7 +610,7 @@ files. </p>
 
 
 
-<H3><a name="Ruby_nn10"></a>31.2.1 Running SWIG from Developer Studio</H3>
+<H3><a name="Ruby_nn10"></a>32.2.1 Running SWIG from Developer Studio</H3>
 
 
 <p> If you are developing your application within Microsoft
@@ -752,7 +752,7 @@ directory, then run the Ruby script from the DOS/Command prompt: </p>
 
 
 
-<H2><a name="Ruby_nn11"></a>31.3 The Ruby-to-C/C++ Mapping</H2>
+<H2><a name="Ruby_nn11"></a>32.3 The Ruby-to-C/C++ Mapping</H2>
 
 
 <p> This section describes the basics of how SWIG maps C or C++
@@ -762,7 +762,7 @@ declarations in your SWIG interface files to Ruby constructs. </p>
 
 
 
-<H3><a name="Ruby_nn12"></a>31.3.1 Modules</H3>
+<H3><a name="Ruby_nn12"></a>32.3.1 Modules</H3>
 
 
 <p> The SWIG <tt>%module</tt> directive specifies
@@ -931,7 +931,7 @@ Ruby's built-in names. </p>
 
 
 
-<H3><a name="Ruby_nn13"></a>31.3.2 Functions</H3>
+<H3><a name="Ruby_nn13"></a>32.3.2 Functions</H3>
 
 
 <p> Global functions are wrapped as Ruby module methods. For
@@ -994,7 +994,7 @@ module that can be used like so: </p>
 
 
 
-<H3><a name="Ruby_nn14"></a>31.3.3 Variable Linking</H3>
+<H3><a name="Ruby_nn14"></a>32.3.3 Variable Linking</H3>
 
 
 <p> C/C++ global variables are wrapped as a pair of singleton
@@ -1094,7 +1094,7 @@ effect until it is explicitly disabled using <tt>%mutable</tt>.
 
 
 
-<H3><a name="Ruby_nn15"></a>31.3.4 Constants</H3>
+<H3><a name="Ruby_nn15"></a>32.3.4 Constants</H3>
 
 
 <p> C/C++ constants are wrapped as module constants initialized
@@ -1138,7 +1138,7 @@ constant values, e.g. </p>
 
 
 
-<H3><a name="Ruby_nn16"></a>31.3.5 Pointers</H3>
+<H3><a name="Ruby_nn16"></a>32.3.5 Pointers</H3>
 
 
 <p> "Opaque" pointers to arbitrary C/C++ types (i.e. types that
@@ -1190,7 +1190,7 @@ the Ruby <tt>nil</tt> object. </p>
 
 
 
-<H3><a name="Ruby_nn17"></a>31.3.6 Structures</H3>
+<H3><a name="Ruby_nn17"></a>32.3.6 Structures</H3>
 
 
 <p> C/C++ structs are wrapped as Ruby classes, with accessor
@@ -1365,7 +1365,7 @@ pointers. For example, </p>
 
 
 
-<H3><a name="Ruby_nn18"></a>31.3.7 C++ classes</H3>
+<H3><a name="Ruby_nn18"></a>32.3.7 C++ classes</H3>
 
 
 <p> Like structs, C++ classes are wrapped by creating a new Ruby
@@ -1451,7 +1451,7 @@ class. </li>
 
 
 
-<H3><a name="Ruby_nn19"></a>31.3.8 C++ Inheritance</H3>
+<H3><a name="Ruby_nn19"></a>32.3.8 C++ Inheritance</H3>
 
 
 <p> The SWIG type-checker is fully aware of C++ inheritance.
@@ -1682,7 +1682,7 @@ Typing"</a>). </p>
 
 
 
-<H3><a name="Ruby_nn20"></a>31.3.9 C++ Overloaded Functions</H3>
+<H3><a name="Ruby_nn20"></a>32.3.9 C++ Overloaded Functions</H3>
 
 
 <p> C++ overloaded functions, methods, and constructors are
@@ -1878,7 +1878,7 @@ and C++"</a> chapter for more information about overloading. </p>
 
 
 
-<H3><a name="Ruby_nn21"></a>31.3.10 C++ Operators</H3>
+<H3><a name="Ruby_nn21"></a>32.3.10 C++ Operators</H3>
 
 
 <p> For the most part, overloaded operators are handled
@@ -1959,7 +1959,7 @@ on operator overloading</a>. </p>
 
 
 
-<H3><a name="Ruby_nn22"></a>31.3.11 C++ namespaces</H3>
+<H3><a name="Ruby_nn22"></a>32.3.11 C++ namespaces</H3>
 
 
 <p> SWIG is aware of C++ namespaces, but namespace names do not
@@ -2035,7 +2035,7 @@ identical symbol names, well, then you get what you deserve. </p>
 
 
 
-<H3><a name="Ruby_nn23"></a>31.3.12 C++ templates</H3>
+<H3><a name="Ruby_nn23"></a>32.3.12 C++ templates</H3>
 
 
 <p> C++ templates don't present a huge problem for SWIG. However,
@@ -2079,7 +2079,7 @@ directive. For example: </p>
 
 
 
-<H3><a name="Ruby_nn23_1"></a>31.3.13 C++ Standard Template Library (STL)</H3>
+<H3><a name="Ruby_nn23_1"></a>32.3.13 C++ Standard Template Library (STL)</H3>
 
 
 <p> On a related note, the standard SWIG library contains a
@@ -2332,7 +2332,7 @@ chapter.</p>
 
 
 
-<H3><a name="C_STL_Functors"></a>31.3.14 C++ STL Functors</H3>
+<H3><a name="C_STL_Functors"></a>32.3.14 C++ STL Functors</H3>
 
 
 <p>Some containers in the STL allow you to modify their default
@@ -2532,7 +2532,7 @@ b<br style="font-weight: bold;">
 
 
 
-<H3><a name="Ruby_C_Iterators"></a>31.3.15 C++ STL Iterators</H3>
+<H3><a name="Ruby_C_Iterators"></a>32.3.15 C++ STL Iterators</H3>
 
 
 <p>The STL is well known for the use of iterators. &nbsp;There
@@ -2743,7 +2743,7 @@ i<br>
 
 
 
-<H3><a name="Ruby_nn24"></a>31.3.16 C++ Smart Pointers</H3>
+<H3><a name="Ruby_nn24"></a>32.3.16 C++ Smart Pointers</H3>
 
 
 <p> In certain C++ programs, it is common to use classes that
@@ -2868,7 +2868,7 @@ method. For example: </p>
 
 
 
-<H3><a name="Ruby_nn25"></a>31.3.17 Cross-Language Polymorphism</H3>
+<H3><a name="Ruby_nn25"></a>32.3.17 Cross-Language Polymorphism</H3>
 
 
 <p> SWIG's Ruby module supports cross-language polymorphism
@@ -2881,7 +2881,7 @@ using this feature with Ruby. </p>
 
 
 
-<H4><a name="Ruby_nn26"></a>31.3.17.1 Exception Unrolling</H4>
+<H4><a name="Ruby_nn26"></a>32.3.17.1 Exception Unrolling</H4>
 
 
 <p> Whenever a C++ director class routes one of its virtual
@@ -2919,7 +2919,7 @@ caught here and a C++ exception is raised in its place. </p>
 
 
 
-<H2><a name="Ruby_nn27"></a>31.4 Naming</H2>
+<H2><a name="Ruby_nn27"></a>32.4 Naming</H2>
 
 
 <p>Ruby has several common naming conventions. Constants are
@@ -3015,7 +3015,7 @@ planned to become the default option in future releases.</p>
 
 
 
-<H3><a name="Ruby_nn28"></a>31.4.1 Defining Aliases</H3>
+<H3><a name="Ruby_nn28"></a>32.4.1 Defining Aliases</H3>
 
 
 <p> It's a fairly common practice in the Ruby built-ins and
@@ -3107,7 +3107,7 @@ Features"</a>) for more details).</p>
 
 
 
-<H3><a name="Ruby_nn29"></a>31.4.2 Predicate Methods</H3>
+<H3><a name="Ruby_nn29"></a>32.4.2 Predicate Methods</H3>
 
 
 <p> Ruby methods that return a boolean value and end in a
@@ -3196,7 +3196,7 @@ Features"</a>) for more details). </p>
 
 
 
-<H3><a name="Ruby_nn30"></a>31.4.3 Bang Methods</H3>
+<H3><a name="Ruby_nn30"></a>32.4.3 Bang Methods</H3>
 
 
 <p> Ruby methods that modify an object in-place and end in an
@@ -3260,7 +3260,7 @@ Features"</a>) for more details). </p>
 
 
 
-<H3><a name="Ruby_nn31"></a>31.4.4 Getters and Setters</H3>
+<H3><a name="Ruby_nn31"></a>32.4.4 Getters and Setters</H3>
 
 
 <p> Often times a C++ library will expose properties through
@@ -3330,7 +3330,7 @@ methods to be exposed in Ruby as <tt>value</tt> and <tt>value=.
 
 
 
-<H2><a name="Ruby_nn32"></a>31.5 Input and output parameters</H2>
+<H2><a name="Ruby_nn32"></a>32.5 Input and output parameters</H2>
 
 
 <p> A common problem in some C programs is handling parameters
@@ -3581,10 +3581,10 @@ of <tt>%apply</tt> </p>
 
 
 
-<H2><a name="Ruby_nn33"></a>31.6 Exception handling </H2>
+<H2><a name="Ruby_nn33"></a>32.6 Exception handling </H2>
 
 
-<H3><a name="Ruby_nn34"></a>31.6.1 Using the %exception directive </H3>
+<H3><a name="Ruby_nn34"></a>32.6.1 Using the %exception directive </H3>
 
 
 <p>The SWIG <tt>%exception</tt> directive can be
@@ -3679,7 +3679,7 @@ Features</a> for more examples.</p>
 
 
 
-<H3><a name="Ruby_nn34_2"></a>31.6.2 Handling Ruby Blocks </H3>
+<H3><a name="Ruby_nn34_2"></a>32.6.2 Handling Ruby Blocks </H3>
 
 
 <p>One of the highlights of Ruby and most of its standard library
@@ -3860,7 +3860,7 @@ RUBY_YIELD_SELF );<br>
 <p>For more information on typemaps, see <a href="#Ruby_nn37">Typemaps</a>.</p>
 
 
-<H3><a name="Ruby_nn35"></a>31.6.3 Raising exceptions </H3>
+<H3><a name="Ruby_nn35"></a>32.6.3 Raising exceptions </H3>
 
 
 <p>There are three ways to raise exceptions from C++ code to
@@ -4621,7 +4621,7 @@ the built-in Ruby exception types.</p>
 
 
 
-<H3><a name="Ruby_nn36"></a>31.6.4 Exception classes </H3>
+<H3><a name="Ruby_nn36"></a>32.6.4 Exception classes </H3>
 
 
 <p>Starting with SWIG 1.3.28, the Ruby module supports the <tt>%exceptionclass</tt>
@@ -4679,7 +4679,7 @@ providing for a more natural integration between C++ code and Ruby code.</p>
 
 
 
-<H2><a name="Ruby_nn37"></a>31.7 Typemaps</H2>
+<H2><a name="Ruby_nn37"></a>32.7 Typemaps</H2>
 
 
 <p> This section describes how you can modify SWIG's default
@@ -4702,7 +4702,7 @@ of the primitive C-Ruby interface.</p>
 
 
 
-<H3><a name="Ruby_nn38"></a>31.7.1 What is a typemap?</H3>
+<H3><a name="Ruby_nn38"></a>32.7.1 What is a typemap?</H3>
 
 
 <p> A typemap is nothing more than a code generation rule that is
@@ -4964,7 +4964,7 @@ to be used as follows (notice how the length parameter is omitted): </p>
 
 
 
-<H3><a name="Ruby_Typemap_scope"></a>31.7.2 Typemap scope</H3>
+<H3><a name="Ruby_Typemap_scope"></a>32.7.2 Typemap scope</H3>
 
 
 <p> Once defined, a typemap remains in effect for all of the
@@ -5012,7 +5012,7 @@ where the class itself is defined. For example:</p>
 
 
 
-<H3><a name="Ruby_Copying_a_typemap"></a>31.7.3 Copying a typemap</H3>
+<H3><a name="Ruby_Copying_a_typemap"></a>32.7.3 Copying a typemap</H3>
 
 
 <p> A typemap is copied by using assignment. For example:</p>
@@ -5114,7 +5114,7 @@ rules as for <tt>
 
 
 
-<H3><a name="Ruby_Deleting_a_typemap"></a>31.7.4 Deleting a typemap</H3>
+<H3><a name="Ruby_Deleting_a_typemap"></a>32.7.4 Deleting a typemap</H3>
 
 
 <p> A typemap can be deleted by simply defining no code. For
@@ -5166,7 +5166,7 @@ typemaps immediately after the clear operation.</p>
 
 
 
-<H3><a name="Ruby_Placement_of_typemaps"></a>31.7.5 Placement of typemaps</H3>
+<H3><a name="Ruby_Placement_of_typemaps"></a>32.7.5 Placement of typemaps</H3>
 
 
 <p> Typemap declarations can be declared in the global scope,
@@ -5250,7 +5250,7 @@ string</tt>
 
 
 
-<H3><a name="Ruby_nn39"></a>31.7.6 Ruby typemaps</H3>
+<H3><a name="Ruby_nn39"></a>32.7.6 Ruby typemaps</H3>
 
 
 <p>The following list details all of the typemap methods that
@@ -5260,7 +5260,7 @@ can be used by the Ruby module: </p>
 
 
 
-<H4><a name="Ruby_in_typemap"></a>31.7.6.1 &nbsp;"in" typemap</H4>
+<H4><a name="Ruby_in_typemap"></a>32.7.6.1 &nbsp;"in" typemap</H4>
 
 
 <p>Converts Ruby objects to input
@@ -5503,7 +5503,7 @@ arguments to be specified. For example:</p>
 
 
 
-<H4><a name="Ruby_typecheck_typemap"></a>31.7.6.2 "typecheck" typemap</H4>
+<H4><a name="Ruby_typecheck_typemap"></a>32.7.6.2 "typecheck" typemap</H4>
 
 
 <p> The "typecheck" typemap is used to support overloaded
@@ -5544,7 +5544,7 @@ on "Typemaps and Overloading."</p>
 
 
 
-<H4><a name="Ruby_out_typemap"></a>31.7.6.3 &nbsp;"out" typemap</H4>
+<H4><a name="Ruby_out_typemap"></a>32.7.6.3 &nbsp;"out" typemap</H4>
 
 
 <p>Converts return value of a C function
@@ -5776,7 +5776,7 @@ version of the C datatype matched by the typemap.</td>
 
 
 
-<H4><a name="Ruby_arginit_typemap"></a>31.7.6.4 "arginit" typemap</H4>
+<H4><a name="Ruby_arginit_typemap"></a>32.7.6.4 "arginit" typemap</H4>
 
 
 <p> The "arginit" typemap is used to set the initial value of a
@@ -5801,7 +5801,7 @@ applications. For example:</p>
 
 
 
-<H4><a name="Ruby_default_typemap"></a>31.7.6.5 "default" typemap</H4>
+<H4><a name="Ruby_default_typemap"></a>32.7.6.5 "default" typemap</H4>
 
 
 <p> The "default" typemap is used to turn an argument into a
@@ -5843,7 +5843,7 @@ default argument wrapping.</p>
 
 
 
-<H4><a name="Ruby_check_typemap"></a>31.7.6.6 "check" typemap</H4>
+<H4><a name="Ruby_check_typemap"></a>32.7.6.6 "check" typemap</H4>
 
 
 <p> The "check" typemap is used to supply value checking code
@@ -5867,7 +5867,7 @@ arguments have been converted. For example:</p>
 
 
 
-<H4><a name="Ruby_argout_typemap_"></a>31.7.6.7 "argout" typemap</H4>
+<H4><a name="Ruby_argout_typemap_"></a>32.7.6.7 "argout" typemap</H4>
 
 
 <p> The "argout" typemap is used to return values from arguments.
@@ -6025,7 +6025,7 @@ some function like SWIG_Ruby_AppendOutput.</p>
 
 
 
-<H4><a name="Ruby_freearg_typemap_"></a>31.7.6.8 "freearg" typemap</H4>
+<H4><a name="Ruby_freearg_typemap_"></a>32.7.6.8 "freearg" typemap</H4>
 
 
 <p> The "freearg" typemap is used to cleanup argument data. It is
@@ -6061,7 +6061,7 @@ abort prematurely.</p>
 
 
 
-<H4><a name="Ruby_newfree_typemap"></a>31.7.6.9 "newfree" typemap</H4>
+<H4><a name="Ruby_newfree_typemap"></a>32.7.6.9 "newfree" typemap</H4>
 
 
 <p> The "newfree" typemap is used in conjunction with the <tt>%newobject</tt>
@@ -6092,7 +6092,7 @@ ownership and %newobject</a> for further details.</p>
 
 
 
-<H4><a name="Ruby_memberin_typemap"></a>31.7.6.10 "memberin" typemap</H4>
+<H4><a name="Ruby_memberin_typemap"></a>32.7.6.10 "memberin" typemap</H4>
 
 
 <p> The "memberin" typemap is used to copy data from<em> an
@@ -6125,7 +6125,7 @@ other objects.</p>
 
 
 
-<H4><a name="Ruby_varin_typemap"></a>31.7.6.11 "varin" typemap</H4>
+<H4><a name="Ruby_varin_typemap"></a>32.7.6.11 "varin" typemap</H4>
 
 
 <p> The "varin" typemap is used to convert objects in the target
@@ -6136,7 +6136,7 @@ This is implementation specific.</p>
 
 
 
-<H4><a name="Ruby_varout_typemap_"></a>31.7.6.12 "varout" typemap</H4>
+<H4><a name="Ruby_varout_typemap_"></a>32.7.6.12 "varout" typemap</H4>
 
 
 <p> The "varout" typemap is used to convert a C/C++ object to an
@@ -6147,7 +6147,7 @@ This is implementation specific.</p>
 
 
 
-<H4><a name="Ruby_throws_typemap"></a>31.7.6.13 "throws" typemap</H4>
+<H4><a name="Ruby_throws_typemap"></a>32.7.6.13 "throws" typemap</H4>
 
 
 <p> The "throws" typemap is only used when SWIG parses a C++
@@ -6206,7 +6206,7 @@ handling with %exception</a> section.</p>
 
 
 
-<H4><a name="Ruby_directorin_typemap"></a>31.7.6.14 directorin typemap</H4>
+<H4><a name="Ruby_directorin_typemap"></a>32.7.6.14 directorin typemap</H4>
 
 
 <p>Converts C++ objects in director
@@ -6460,7 +6460,7 @@ referring to the class itself.</td>
 
 
 
-<H4><a name="Ruby_directorout_typemap"></a>31.7.6.15 directorout typemap</H4>
+<H4><a name="Ruby_directorout_typemap"></a>32.7.6.15 directorout typemap</H4>
 
 
 <p>Converts Ruby objects in director
@@ -6720,7 +6720,7 @@ exception.<br>
 
 
 
-<H4><a name="Ruby_directorargout_typemap"></a>31.7.6.16 directorargout typemap</H4>
+<H4><a name="Ruby_directorargout_typemap"></a>32.7.6.16 directorargout typemap</H4>
 
 
 <p>Output argument processing in director
@@ -6960,7 +6960,7 @@ referring to the instance of the class itself</td>
 
 
 
-<H4><a name="Ruby_ret_typemap"></a>31.7.6.17 ret typemap</H4>
+<H4><a name="Ruby_ret_typemap"></a>32.7.6.17 ret typemap</H4>
 
 
 <p>Cleanup of function return values
@@ -6970,7 +6970,7 @@ referring to the instance of the class itself</td>
 
 
 
-<H4><a name="Ruby_globalin_typemap"></a>31.7.6.18 globalin typemap</H4>
+<H4><a name="Ruby_globalin_typemap"></a>32.7.6.18 globalin typemap</H4>
 
 
 <p>Setting of C global variables
@@ -6980,7 +6980,7 @@ referring to the instance of the class itself</td>
 
 
 
-<H3><a name="Ruby_nn40"></a>31.7.7 Typemap variables</H3>
+<H3><a name="Ruby_nn40"></a>32.7.7 Typemap variables</H3>
 
 
 <p>
@@ -7090,7 +7090,7 @@ being created. </div>
 
 
 
-<H3><a name="Ruby_nn41"></a>31.7.8 Useful Functions</H3>
+<H3><a name="Ruby_nn41"></a>32.7.8 Useful Functions</H3>
 
 
 <p> When you write a typemap, you usually have to work directly
@@ -7114,7 +7114,7 @@ across multiple languages.</p>
 
 
 
-<H4><a name="Ruby_nn42"></a>31.7.8.1 C Datatypes to Ruby Objects</H4>
+<H4><a name="Ruby_nn42"></a>32.7.8.1 C Datatypes to Ruby Objects</H4>
 
 
 <div class="diagram">
@@ -7170,7 +7170,7 @@ SWIG_From_float(float)</td>
 
 
 
-<H4><a name="Ruby_nn43"></a>31.7.8.2 Ruby Objects to C Datatypes</H4>
+<H4><a name="Ruby_nn43"></a>32.7.8.2 Ruby Objects to C Datatypes</H4>
 
 
 <p>Here, while the Ruby versions return the value directly, the SWIG
@@ -7259,7 +7259,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input
 
 
 
-<H4><a name="Ruby_nn44"></a>31.7.8.3 Macros for VALUE</H4>
+<H4><a name="Ruby_nn44"></a>32.7.8.3 Macros for VALUE</H4>
 
 
 <p> <tt>RSTRING_LEN(str)</tt> </p>
@@ -7322,7 +7322,7 @@ Ruby_Format_TypeError( "$1_name", "$1_type","$symname", $argnum, $input
 
 
 
-<H4><a name="Ruby_nn45"></a>31.7.8.4 Exceptions</H4>
+<H4><a name="Ruby_nn45"></a>32.7.8.4 Exceptions</H4>
 
 
 <p> <tt>void rb_raise(VALUE exception, const char *fmt,
@@ -7489,7 +7489,7 @@ arguments are interpreted as with <tt>printf()</tt>. </div>
 
 
 
-<H4><a name="Ruby_nn46"></a>31.7.8.5 Iterators</H4>
+<H4><a name="Ruby_nn46"></a>32.7.8.5 Iterators</H4>
 
 
 <p> <tt>void rb_iter_break()</tt> </p>
@@ -7591,7 +7591,7 @@ VALUE), VALUE value)</tt></p>
 
 
 
-<H3><a name="Ruby_nn47"></a>31.7.9 Typemap Examples</H3>
+<H3><a name="Ruby_nn47"></a>32.7.9 Typemap Examples</H3>
 
 
 <p> This section includes a few examples of typemaps. For more
@@ -7602,7 +7602,7 @@ directory. </p>
 
 
 
-<H3><a name="Ruby_nn48"></a>31.7.10 Converting a Ruby array to a char **</H3>
+<H3><a name="Ruby_nn48"></a>32.7.10 Converting a Ruby array to a char **</H3>
 
 
 <p> A common problem in many C programs is the processing of
@@ -7657,7 +7657,7 @@ after the execution of the C function. </p>
 
 
 
-<H3><a name="Ruby_nn49"></a>31.7.11 Collecting arguments in a hash</H3>
+<H3><a name="Ruby_nn49"></a>32.7.11 Collecting arguments in a hash</H3>
 
 
 <p> Ruby's solution to the "keyword arguments" capability of some
@@ -7936,7 +7936,7 @@ directory of the SWIG distribution. </p>
 
 
 
-<H3><a name="Ruby_nn50"></a>31.7.12 Pointer handling</H3>
+<H3><a name="Ruby_nn50"></a>32.7.12 Pointer handling</H3>
 
 
 <p> Occasionally, it might be necessary to convert pointer values
@@ -8035,7 +8035,7 @@ For example: </p>
 
 
 
-<H4><a name="Ruby_nn51"></a>31.7.12.1 Ruby Datatype Wrapping</H4>
+<H4><a name="Ruby_nn51"></a>32.7.12.1 Ruby Datatype Wrapping</H4>
 
 
 <p> <tt>VALUE Data_Wrap_Struct(VALUE class, void
@@ -8086,7 +8086,7 @@ and assigns that pointer to <i>ptr</i>. </div>
 
 
 
-<H3><a name="Ruby_nn52"></a>31.7.13 Example: STL Vector to Ruby Array</H3>
+<H3><a name="Ruby_nn52"></a>32.7.13 Example: STL Vector to Ruby Array</H3>
 
 
 <p>Another use for macros and type maps is to create a Ruby array
@@ -8195,7 +8195,7 @@ the<a href="#Ruby_nn23_1"> C++ Standard Template Library</a>.<br>
 
 
 
-<H2><a name="Ruby_nn65"></a>31.8 Docstring Features</H2>
+<H2><a name="Ruby_nn65"></a>32.8 Docstring Features</H2>
 
 
 <p>
@@ -8256,7 +8256,7 @@ generate ri documentation from a c wrap file, you could do:</p>
 
 
 
-<H3><a name="Ruby_nn66"></a>31.8.1 Module docstring</H3>
+<H3><a name="Ruby_nn66"></a>32.8.1 Module docstring</H3>
 
 
 <p>
@@ -8307,7 +8307,7 @@ macro. For example:
 
 
 
-<H3><a name="Ruby_nn67"></a>31.8.2 %feature("autodoc")</H3>
+<H3><a name="Ruby_nn67"></a>32.8.2 %feature("autodoc")</H3>
 
 
 <p>Since SWIG does know everything about the function it wraps,
@@ -8336,7 +8336,7 @@ feature, described below.
 
 
 
-<H4><a name="Ruby_nn68"></a>31.8.2.1 %feature("autodoc", "0")</H4>
+<H4><a name="Ruby_nn68"></a>32.8.2.1 %feature("autodoc", "0")</H4>
 
 
 <p>
@@ -8384,7 +8384,7 @@ Then Ruby code like this will be generated:
 
 
 
-<H4><a name="Ruby_autodoc1"></a>31.8.2.2 %feature("autodoc", "1")</H4>
+<H4><a name="Ruby_autodoc1"></a>32.8.2.2 %feature("autodoc", "1")</H4>
 
 
 <p>
@@ -8416,7 +8416,7 @@ this:
 
 
 
-<H4><a name="Ruby_autodoc2"></a>31.8.2.3 %feature("autodoc", "2")</H4>
+<H4><a name="Ruby_autodoc2"></a>32.8.2.3 %feature("autodoc", "2")</H4>
 
 
 <p>
@@ -8432,7 +8432,7 @@ this:
 
 
 
-<H4><a name="Ruby_feature_autodoc3"></a>31.8.2.4 %feature("autodoc", "3")</H4>
+<H4><a name="Ruby_feature_autodoc3"></a>32.8.2.4 %feature("autodoc", "3")</H4>
 
 
 <p>
@@ -8460,7 +8460,7 @@ this:
 
 
 
-<H4><a name="Ruby_nn70"></a>31.8.2.5 %feature("autodoc", "docstring")</H4>
+<H4><a name="Ruby_nn70"></a>32.8.2.5 %feature("autodoc", "docstring")</H4>
 
 
 <p>
@@ -8488,7 +8488,7 @@ generated string. For example:
 
 
 
-<H3><a name="Ruby_nn71"></a>31.8.3 %feature("docstring")</H3>
+<H3><a name="Ruby_nn71"></a>32.8.3 %feature("docstring")</H3>
 
 
 <p>
@@ -8503,10 +8503,10 @@ docstring and they are output together. </p>
 
 
 
-<H2><a name="Ruby_nn53"></a>31.9 Advanced Topics</H2>
+<H2><a name="Ruby_nn53"></a>32.9 Advanced Topics</H2>
 
 
-<H3><a name="Ruby_nn54"></a>31.9.1 Operator overloading</H3>
+<H3><a name="Ruby_nn54"></a>32.9.1 Operator overloading</H3>
 
 
 <p> SWIG allows operator overloading with, by using the <tt>%extend</tt>
@@ -9523,7 +9523,7 @@ parses the expression <i>a != b</i> as <i>!(a == b)</i>.
 
 
 
-<H3><a name="Ruby_nn55"></a>31.9.2 Creating Multi-Module Packages</H3>
+<H3><a name="Ruby_nn55"></a>32.9.2 Creating Multi-Module Packages</H3>
 
 
 <p> The chapter on <a href="Modules.html">Working
@@ -9704,7 +9704,7 @@ initialized: </p>
 
 
 
-<H3><a name="Ruby_nn56"></a>31.9.3 Specifying Mixin Modules</H3>
+<H3><a name="Ruby_nn56"></a>32.9.3 Specifying Mixin Modules</H3>
 
 
 <p> The Ruby language doesn't support multiple inheritance, but
@@ -9802,7 +9802,7 @@ Features"</a>) for more details). </p>
 
 
 
-<H2><a name="Ruby_nn57"></a>31.10 Memory Management</H2>
+<H2><a name="Ruby_nn57"></a>32.10 Memory Management</H2>
 
 
 <p>One of the most common issues in generating SWIG bindings for
@@ -9849,7 +9849,7 @@ understanding of how the underlying library manages memory.</p>
 
 
 
-<H3><a name="Ruby_nn58"></a>31.10.1 Mark and Sweep Garbage Collector </H3>
+<H3><a name="Ruby_nn58"></a>32.10.1 Mark and Sweep Garbage Collector </H3>
 
 
 <p>Ruby uses a mark and sweep garbage collector. When the garbage
@@ -9897,7 +9897,7 @@ this memory. </p>
 
 
 
-<H3><a name="Ruby_nn59"></a>31.10.2 Object Ownership</H3>
+<H3><a name="Ruby_nn59"></a>32.10.2 Object Ownership</H3>
 
 
 <p>As described above, memory management depends on clearly
@@ -10124,7 +10124,7 @@ classes is:</p>
 
 
 
-<H3><a name="Ruby_nn60"></a>31.10.3 Object Tracking</H3>
+<H3><a name="Ruby_nn60"></a>32.10.3 Object Tracking</H3>
 
 
 <p>The remaining parts of this section will use the class library
@@ -10338,7 +10338,7 @@ methods.</p>
 
 
 
-<H3><a name="Ruby_nn61"></a>31.10.4 Mark Functions</H3>
+<H3><a name="Ruby_nn61"></a>32.10.4 Mark Functions</H3>
 
 
 <p>With a bit more testing, we see that our class library still
@@ -10456,7 +10456,7 @@ test suite.</p>
 
 
 
-<H3><a name="Ruby_nn62"></a>31.10.5 Free Functions</H3>
+<H3><a name="Ruby_nn62"></a>32.10.5 Free Functions</H3>
 
 
 <p>By default, SWIG creates a "free" function that is called when
@@ -10611,7 +10611,7 @@ been freed, and thus raises a runtime exception.</p>
 
 
 
-<H3><a name="Ruby_nn63"></a>31.10.6 Embedded Ruby and the C++ Stack</H3>
+<H3><a name="Ruby_nn63"></a>32.10.6 Embedded Ruby and the C++ Stack</H3>
 
 
 <p>As has been said, the Ruby GC runs and marks objects before
diff --git a/Doc/Manual/Tcl.html b/Doc/Manual/Tcl.html
index e837a5b17..b36395cab 100644
--- a/Doc/Manual/Tcl.html
+++ b/Doc/Manual/Tcl.html
@@ -6,7 +6,7 @@
 </head>
 
 <body bgcolor="#ffffff">
-<H1><a name="Tcl"></a>32 SWIG and Tcl</H1>
+<H1><a name="Tcl"></a>33 SWIG and Tcl</H1>
 <!-- INDEX -->
 <div class="sectiontoc">
 <ul>
@@ -82,7 +82,7 @@ Tcl 8.0 or a later release.   Earlier releases of SWIG supported Tcl 7.x, but
 this is no longer supported.
 </p>
 
-<H2><a name="Tcl_nn2"></a>32.1 Preliminaries</H2>
+<H2><a name="Tcl_nn2"></a>33.1 Preliminaries</H2>
 
 
 <p>
@@ -108,7 +108,7 @@ build a Tcl extension module.  To finish building the module, you
 need to compile this file and link it with the rest of your program.
 </p>
 
-<H3><a name="Tcl_nn3"></a>32.1.1 Getting the right header files</H3>
+<H3><a name="Tcl_nn3"></a>33.1.1 Getting the right header files</H3>
 
 
 <p>
@@ -126,7 +126,7 @@ this is the case, you should probably make a symbolic link so that <tt>tcl.h</tt
 header file.
 </p>
 
-<H3><a name="Tcl_nn4"></a>32.1.2 Compiling a dynamic module</H3>
+<H3><a name="Tcl_nn4"></a>33.1.2 Compiling a dynamic module</H3>
 
 
 <p>
@@ -161,7 +161,7 @@ The name of the module is specified using the <tt>%module</tt> directive or the
 <tt> -module</tt> command line option.
 </p>
 
-<H3><a name="Tcl_nn5"></a>32.1.3 Static linking</H3>
+<H3><a name="Tcl_nn5"></a>33.1.3 Static linking</H3>
 
 
 <p>
@@ -227,7 +227,7 @@ minimal in most situations (and quite frankly not worth the extra
 hassle in the opinion of this author). 
 </p>
 
-<H3><a name="Tcl_nn6"></a>32.1.4 Using your module</H3>
+<H3><a name="Tcl_nn6"></a>33.1.4 Using your module</H3>
 
 
 <p>
@@ -355,7 +355,7 @@ to the default system configuration (this requires root access and you will need
 the man pages). 
 </p>
 
-<H3><a name="Tcl_nn7"></a>32.1.5 Compilation of C++ extensions</H3>
+<H3><a name="Tcl_nn7"></a>33.1.5 Compilation of C++ extensions</H3>
 
 
 <p>
@@ -438,7 +438,7 @@ erratic program behavior.   If working with lots of software components, you
 might want to investigate using a more formal standard such as COM.
 </p>
 
-<H3><a name="Tcl_nn8"></a>32.1.6 Compiling for 64-bit platforms</H3>
+<H3><a name="Tcl_nn8"></a>33.1.6 Compiling for 64-bit platforms</H3>
 
 
 <p>
@@ -465,7 +465,7 @@ also introduce problems on platforms that support more than one
 linking standard (e.g., -o32 and -n32 on Irix).
 </p>
 
-<H3><a name="Tcl_nn9"></a>32.1.7 Setting a package prefix</H3>
+<H3><a name="Tcl_nn9"></a>33.1.7 Setting a package prefix</H3>
 
 
 <p>
@@ -484,7 +484,7 @@ option will append the prefix to the name when creating a command and
 call it "<tt>Foo_bar</tt>".
 </p>
 
-<H3><a name="Tcl_nn10"></a>32.1.8 Using namespaces</H3>
+<H3><a name="Tcl_nn10"></a>33.1.8 Using namespaces</H3>
 
 
 <p>
@@ -506,7 +506,7 @@ When the<tt> -namespace</tt> option is used, objects in the module
 are always accessed with the namespace name such as <tt>Foo::bar</tt>.
 </p>
 
-<H2><a name="Tcl_nn11"></a>32.2 Building Tcl/Tk Extensions under Windows 95/NT</H2>
+<H2><a name="Tcl_nn11"></a>33.2 Building Tcl/Tk Extensions under Windows 95/NT</H2>
 
 
 <p>
@@ -517,7 +517,7 @@ covers the process of using SWIG with Microsoft Visual C++.
 although the procedure may be similar with other compilers.
 </p>
 
-<H3><a name="Tcl_nn12"></a>32.2.1 Running SWIG from Developer Studio</H3>
+<H3><a name="Tcl_nn12"></a>33.2.1 Running SWIG from Developer Studio</H3>
 
 
 <p>
@@ -575,7 +575,7 @@ MSDOS &gt; tclsh80
 %
 </pre></div>
 
-<H3><a name="Tcl_nn13"></a>32.2.2 Using NMAKE</H3>
+<H3><a name="Tcl_nn13"></a>33.2.2 Using NMAKE</H3>
 
 
 <p>
@@ -638,7 +638,7 @@ to get you started.  With a little practice, you'll be making lots of
 Tcl extensions.
 </p>
 
-<H2><a name="Tcl_nn14"></a>32.3 A tour of basic C/C++ wrapping</H2>
+<H2><a name="Tcl_nn14"></a>33.3 A tour of basic C/C++ wrapping</H2>
 
 
 <p>
@@ -649,7 +649,7 @@ classes.  This section briefly covers the essential aspects of this
 wrapping.
 </p>
 
-<H3><a name="Tcl_nn15"></a>32.3.1 Modules</H3>
+<H3><a name="Tcl_nn15"></a>33.3.1 Modules</H3>
 
 
 <p>
@@ -683,7 +683,7 @@ To fix this, supply an extra argument to <tt>load</tt> like this:
 </pre>
 </div>
 
-<H3><a name="Tcl_nn16"></a>32.3.2 Functions</H3>
+<H3><a name="Tcl_nn16"></a>33.3.2 Functions</H3>
 
 
 <p>
@@ -708,7 +708,7 @@ like you think it does:
 %
 </pre></div>
 
-<H3><a name="Tcl_nn17"></a>32.3.3 Global variables</H3>
+<H3><a name="Tcl_nn17"></a>33.3.3 Global variables</H3>
 
 
 <p>
@@ -788,7 +788,7 @@ extern char *path;      // Read-only (due to %immutable)
 </pre>
 </div>
 
-<H3><a name="Tcl_nn18"></a>32.3.4 Constants and enums</H3>
+<H3><a name="Tcl_nn18"></a>33.3.4 Constants and enums</H3>
 
 
 <p>
@@ -872,7 +872,7 @@ When an identifier name is given, it is used to perform an implicit hash-table l
 conversion.  This allows the <tt>global</tt> statement to be omitted.
 </p>
 
-<H3><a name="Tcl_nn19"></a>32.3.5 Pointers</H3>
+<H3><a name="Tcl_nn19"></a>33.3.5 Pointers</H3>
 
 
 <p>
@@ -968,7 +968,7 @@ C-style cast may return a bogus result whereas as the C++-style cast will return
 <tt>None</tt> if the conversion can't be performed.
 </p>
 
-<H3><a name="Tcl_nn20"></a>32.3.6 Structures</H3>
+<H3><a name="Tcl_nn20"></a>33.3.6 Structures</H3>
 
 
 <p>
@@ -1250,7 +1250,7 @@ Note: Tcl only destroys the underlying object if it has ownership.  See the
 memory management section that appears shortly.
 </p>
 
-<H3><a name="Tcl_nn21"></a>32.3.7 C++ classes</H3>
+<H3><a name="Tcl_nn21"></a>33.3.7 C++ classes</H3>
 
 
 <p>
@@ -1317,7 +1317,7 @@ In Tcl, the static member is accessed as follows:
 </pre>
 </div>
 
-<H3><a name="Tcl_nn22"></a>32.3.8 C++ inheritance</H3>
+<H3><a name="Tcl_nn22"></a>33.3.8 C++ inheritance</H3>
 
 
 <p>
@@ -1366,7 +1366,7 @@ For instance:
 It is safe to use multiple inheritance with SWIG.
 </p>
 
-<H3><a name="Tcl_nn23"></a>32.3.9 Pointers, references, values, and arrays</H3>
+<H3><a name="Tcl_nn23"></a>33.3.9 Pointers, references, values, and arrays</H3>
 
 
 <p>
@@ -1420,7 +1420,7 @@ to hold the result and a pointer is returned (Tcl will release this memory
 when the return value is garbage collected).
 </p>
 
-<H3><a name="Tcl_nn24"></a>32.3.10 C++ overloaded functions</H3>
+<H3><a name="Tcl_nn24"></a>33.3.10 C++ overloaded functions</H3>
 
 
 <p>
@@ -1543,7 +1543,7 @@ first declaration takes precedence.
 Please refer to the "SWIG and C++" chapter for more information about overloading. 
 </p>
 
-<H3><a name="Tcl_nn25"></a>32.3.11 C++ operators</H3>
+<H3><a name="Tcl_nn25"></a>33.3.11 C++ operators</H3>
 
 
 <p>
@@ -1645,7 +1645,7 @@ There are ways to make this operator appear as part of the class using the <tt>%
 Keep reading.
 </p>
 
-<H3><a name="Tcl_nn26"></a>32.3.12 C++ namespaces</H3>
+<H3><a name="Tcl_nn26"></a>33.3.12 C++ namespaces</H3>
 
 
 <p>
@@ -1709,7 +1709,7 @@ utilizes thousands of small deeply nested namespaces each with
 identical symbol names, well, then you get what you deserve.
 </p>
 
-<H3><a name="Tcl_nn27"></a>32.3.13 C++ templates</H3>
+<H3><a name="Tcl_nn27"></a>33.3.13 C++ templates</H3>
 
 
 <p>
@@ -1761,7 +1761,7 @@ More details can be found in the <a href="SWIGPlus.html#SWIGPlus">SWIG and C++</
 examples will appear later.
 </p>
 
-<H3><a name="Tcl_nn28"></a>32.3.14 C++ Smart Pointers</H3>
+<H3><a name="Tcl_nn28"></a>33.3.14 C++ Smart Pointers</H3>
 
 
 <p>
@@ -1845,7 +1845,7 @@ simply use the <tt>__deref__()</tt> method.  For example:
 </pre>
 </div>
 
-<H2><a name="Tcl_nn29"></a>32.4 Further details on the Tcl class interface</H2>
+<H2><a name="Tcl_nn29"></a>33.4 Further details on the Tcl class interface</H2>
 
 
 <p>
@@ -1858,7 +1858,7 @@ of low-level details were omitted.  This section provides a brief overview
 of how the proxy classes work.
 </p>
 
-<H3><a name="Tcl_nn30"></a>32.4.1 Proxy classes</H3>
+<H3><a name="Tcl_nn30"></a>33.4.1 Proxy classes</H3>
 
 
 <p>
@@ -1923,7 +1923,7 @@ function.   This allows objects to be encapsulated objects that look a lot like
 as shown in the last section.
 </p>
 
-<H3><a name="Tcl_nn31"></a>32.4.2 Memory management</H3>
+<H3><a name="Tcl_nn31"></a>33.4.2 Memory management</H3>
 
 
 <p>
@@ -2111,7 +2111,7 @@ typemaps--an advanced topic discussed later.
 </p>
 
 
-<H2><a name="Tcl_nn32"></a>32.5 Input and output parameters</H2>
+<H2><a name="Tcl_nn32"></a>33.5 Input and output parameters</H2>
 
 
 <p>
@@ -2299,7 +2299,7 @@ set c  [lindex $dim 1]
 </pre>
 </div>
 
-<H2><a name="Tcl_nn33"></a>32.6 Exception handling </H2>
+<H2><a name="Tcl_nn33"></a>33.6 Exception handling </H2>
 
 
 <p>
@@ -2433,7 +2433,7 @@ Since SWIG's exception handling is user-definable, you are not limited to C++ ex
 See the chapter on "<a href="Customization.html#Customization">Customization Features</a>" for more examples.
 </p>
 
-<H2><a name="Tcl_nn34"></a>32.7 Typemaps</H2>
+<H2><a name="Tcl_nn34"></a>33.7 Typemaps</H2>
 
 
 <p>
@@ -2450,7 +2450,7 @@ Typemaps are only used if you want to change some aspect of the primitive
 C-Tcl interface.
 </p>
 
-<H3><a name="Tcl_nn35"></a>32.7.1 What is a typemap?</H3>
+<H3><a name="Tcl_nn35"></a>33.7.1 What is a typemap?</H3>
 
 
 <p>
@@ -2567,7 +2567,7 @@ parameter is omitted):
 </pre>
 </div>
 
-<H3><a name="Tcl_nn36"></a>32.7.2 Tcl typemaps</H3>
+<H3><a name="Tcl_nn36"></a>33.7.2 Tcl typemaps</H3>
 
 
 <p>
@@ -2705,7 +2705,7 @@ Initialize an argument to a value before any conversions occur.
 Examples of these methods will appear shortly.
 </p>
 
-<H3><a name="Tcl_nn37"></a>32.7.3 Typemap variables</H3>
+<H3><a name="Tcl_nn37"></a>33.7.3 Typemap variables</H3>
 
 
 <p>
@@ -2776,7 +2776,7 @@ properly assigned.
 The Tcl name of the wrapper function being created.
 </div>
 
-<H3><a name="Tcl_nn38"></a>32.7.4 Converting  a Tcl list to a char ** </H3>
+<H3><a name="Tcl_nn38"></a>33.7.4 Converting  a Tcl list to a char ** </H3>
 
 
 <p>
@@ -2838,7 +2838,7 @@ argv[2] = Larry
 3
 </pre></div>
 
-<H3><a name="Tcl_nn39"></a>32.7.5 Returning values in arguments</H3>
+<H3><a name="Tcl_nn39"></a>33.7.5 Returning values in arguments</H3>
 
 
 <p>
@@ -2880,7 +2880,7 @@ result, a Tcl function using these typemaps will work like this :
 %
 </pre></div>
 
-<H3><a name="Tcl_nn40"></a>32.7.6 Useful functions</H3>
+<H3><a name="Tcl_nn40"></a>33.7.6 Useful functions</H3>
 
 
 <p>
@@ -2957,7 +2957,7 @@ int      Tcl_IsShared(Tcl_Obj *obj);
 </pre>
 </div>
 
-<H3><a name="Tcl_nn41"></a>32.7.7 Standard  typemaps</H3>
+<H3><a name="Tcl_nn41"></a>33.7.7 Standard  typemaps</H3>
 
 
 <p>
@@ -3041,7 +3041,7 @@ work)
 </pre>
 </div>
 
-<H3><a name="Tcl_nn42"></a>32.7.8 Pointer handling</H3>
+<H3><a name="Tcl_nn42"></a>33.7.8 Pointer handling</H3>
 
 
 <p>
@@ -3117,7 +3117,7 @@ For example:
 </pre>
 </div>
 
-<H2><a name="Tcl_nn43"></a>32.8 Turning a SWIG module into a Tcl Package.</H2>
+<H2><a name="Tcl_nn43"></a>33.8 Turning a SWIG module into a Tcl Package.</H2>
 
 
 <p>
@@ -3189,7 +3189,7 @@ As a final note, most SWIG examples do not yet use the
 to use the <tt>load</tt> command instead.
 </p>
 
-<H2><a name="Tcl_nn44"></a>32.9 Building new kinds of Tcl interfaces (in Tcl)</H2>
+<H2><a name="Tcl_nn44"></a>33.9 Building new kinds of Tcl interfaces (in Tcl)</H2>
 
 
 <p>
@@ -3288,7 +3288,7 @@ danger of blowing something up (although it is easily accomplished
 with an out of bounds array access).
 </p>
 
-<H3><a name="Tcl_nn45"></a>32.9.1 Proxy classes</H3>
+<H3><a name="Tcl_nn45"></a>33.9.1 Proxy classes</H3>
 
 
 <p>
diff --git a/Doc/Manual/chapters b/Doc/Manual/chapters
index 55a0aec13..66c7caa19 100644
--- a/Doc/Manual/chapters
+++ b/Doc/Manual/chapters
@@ -14,6 +14,7 @@ Varargs.html
 Warnings.html
 Modules.html
 Allegrocl.html
+COM.html
 CSharp.html
 Chicken.html
 Guile.html
diff --git a/Source/Modules/com.cxx b/Source/Modules/com.cxx
index 74496cbcf..fe74a52ac 100644
--- a/Source/Modules/com.cxx
+++ b/Source/Modules/com.cxx
@@ -197,7 +197,7 @@ class COM:public Language {
   GUID *proxy_iid;
   GUID *proxy_static_iid;
   GUID *proxy_clsid;
-  GUID guid_seed;
+  GUID master_guid;
   GUID typelib_guid;
   GUID module_iid;
   GUID module_clsid;
@@ -243,7 +243,7 @@ public:
       clsid_list(NewString("")),
       namespce(NULL) {
     /* Use NIL GUID by default */
-    memset(&guid_seed, 0, sizeof(GUID));
+    memset(&master_guid, 0, sizeof(GUID));
     memset(&typelib_guid, 0, sizeof(GUID));
     memset(&module_iid, 0, sizeof(GUID));
     memset(&module_clsid, 0, sizeof(GUID));
@@ -324,8 +324,8 @@ public:
     Node *optionsnode = Getattr(Getattr(n, "module"), "options");
 
     if (optionsnode) {
-      if (Getattr(optionsnode, "guidseed")) {
-	if (!parseGUID(Getattr(optionsnode, "guidseed"), &guid_seed)) {
+      if (Getattr(optionsnode, "masterguid")) {
+	if (!parseGUID(Getattr(optionsnode, "masterguid"), &master_guid)) {
           /* Bad GUID */
           /* FIXME: report an error */
         }
@@ -1251,18 +1251,18 @@ public:
 
     char *prep_input = new char[16 + name_len];
 
-    /* guid_seed serves as a "name space ID" as used in RFC 4122. */
-    prep_input[0] = (guid_seed.Data1 >> 24) & 0xff;
-    prep_input[1] = (guid_seed.Data1 >> 16) & 0xff;
-    prep_input[2] = (guid_seed.Data1 >> 8) & 0xff;
-    prep_input[3] = guid_seed.Data1 & 0xff;
-    prep_input[4] = (guid_seed.Data2 >> 8) & 0xff;
-    prep_input[5] = guid_seed.Data2 & 0xff;
-    prep_input[6] = (guid_seed.Data3 >> 8) & 0xff;
-    prep_input[7] = guid_seed.Data3 & 0xff;
+    /* master_guid serves as a "name space ID" as used in RFC 4122. */
+    prep_input[0] = (master_guid.Data1 >> 24) & 0xff;
+    prep_input[1] = (master_guid.Data1 >> 16) & 0xff;
+    prep_input[2] = (master_guid.Data1 >> 8) & 0xff;
+    prep_input[3] = master_guid.Data1 & 0xff;
+    prep_input[4] = (master_guid.Data2 >> 8) & 0xff;
+    prep_input[5] = master_guid.Data2 & 0xff;
+    prep_input[6] = (master_guid.Data3 >> 8) & 0xff;
+    prep_input[7] = master_guid.Data3 & 0xff;
 
     for (int i = 0; i < 8; ++i) {
-      prep_input[8 + i] = guid_seed.Data4[i];
+      prep_input[8 + i] = master_guid.Data4[i];
     }
 
     for (int i = 0; i < name_len; ++i) {
author	Jan Jezabek <jezabek@poczta.onet.pl>	2008-08-12 14:51:58 +0000
committer	Jan Jezabek <jezabek@poczta.onet.pl>	2008-08-12 14:51:58 +0000
commit	e7e337ed1302dca96279c1449cbe568820511c07 (patch)
tree	eddd5dea5a30a3635dd3b6dfc928a033aac6e80a
parent	a85254e3476e2de7f1ec6e45d6bbf49bd609cf9c (diff)
download	swig-e7e337ed1302dca96279c1449cbe568820511c07.tar.gz