aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS6
-rw-r--r--documentation/xsd.12
-rw-r--r--documentation/xsd.xhtml4
3 files changed, 8 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index d202c00..318a243 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
Version 3.3.0
* New option, --char-encoding, allows to specify the character encoding
- that should be used in the object model. Valid values for the 'char'
+ that should be used in the generated code. Valid values for the 'char'
character type are 'utf8' (default), 'iso8859-1' (new), 'lcp' (Xerces-C++
local code page), and 'custom' (allows to support custom encodings). Note
that if you use a non-default character encoding and include some libxsd
@@ -9,6 +9,10 @@ Version 3.3.0
fist include the correct xsd/cxx/xml/char-<enc>.hxx header, where <enc>
is iso8859-1, lcp, etc. This mechanism replaces the XSD_USE_LCP macro.
+ For the wchar_t character type the only valid value for this option is
+ 'auto' and the encoding is automatically selected between UTF-16 and
+ UTF-32, depending on the wchar_t type size.
+
* When the XSD compiler is built with Xerces-C++ 3.1.0 or later, enable
handling of multiple imports for the same namespace. Before all
subsequent imports for a namespace were ignored which caused errors
diff --git a/documentation/xsd.1 b/documentation/xsd.1
index 7536bb6..9beb2a3 100644
--- a/documentation/xsd.1
+++ b/documentation/xsd.1
@@ -128,7 +128,7 @@ and
.BR wchar_t .
.
.IP "\fB\--char-encoding \fIenc\fR"
-Specify the character encoding that should be used in the object model.
+Specify the character encoding that should be used in the generated code.
Valid values for the
.B char
character type are
diff --git a/documentation/xsd.xhtml b/documentation/xsd.xhtml
index 1330509..932689c 100644
--- a/documentation/xsd.xhtml
+++ b/documentation/xsd.xhtml
@@ -126,8 +126,8 @@
are <code><b>char</b></code> and <code><b>wchar_t</b></code>.</dd>
<dt><code><b>--char-encoding</b> <i>enc</i></code></dt>
- <dd>Specify the character encoding that should be used in the object
- model. Valid values for the <code><b>char</b></code> character type
+ <dd>Specify the character encoding that should be used in the generated
+ code. Valid values for the <code><b>char</b></code> character type
are <code><b>utf8</b></code> (default), <code><b>iso8859-1</b></code>,
<code><b>lcp</b></code> (Xerces-C++ local code page), and
<code><b>custom</b></code>. If you pass <code><b>custom</b></code> as