diff options
Diffstat (limited to 'xsd/doc')
| -rw-r--r-- | xsd/doc/buildfile | 40 | ||||
| -rw-r--r-- | xsd/doc/cxx/parser/guide/index.xhtml.in | 19 | ||||
| -rw-r--r-- | xsd/doc/cxx/tree/guide/index.xhtml.in | 14 | ||||
| -rw-r--r-- | xsd/doc/cxx/tree/manual/index.xhtml.in | 6 | ||||
| -rw-r--r-- | xsd/doc/pregenerated/xsd.1 | 48 | ||||
| -rw-r--r-- | xsd/doc/pregenerated/xsd.xhtml | 64 | ||||
| -rw-r--r-- | xsd/doc/xsd-epilogue.1 | 17 | ||||
| -rw-r--r-- | xsd/doc/xsd-epilogue.xhtml | 14 | ||||
| -rw-r--r-- | xsd/doc/xsd-prologue.xhtml | 5 |
9 files changed, 138 insertions, 89 deletions
diff --git a/xsd/doc/buildfile b/xsd/doc/buildfile index 2b00ac6..271d17e 100644 --- a/xsd/doc/buildfile +++ b/xsd/doc/buildfile @@ -27,6 +27,12 @@ svg{*}: extension = svg ./: css{default} xsd{custom-literals} {png svg}{**} +# Note: doc_version is also used in the man pages and the manual. +# +doc_version = [string] "$version.major.$version.minor.$version.patch" +if $version.pre_release + doc_version += "-$version.pre_release_string" + # Man pages. # @@ -51,10 +57,6 @@ pregenerated/{man1 xhtml}{*}: dist = (!$develop) if $develop { - doc_version = [string] "$version.major.$version.minor.$version.patch" - if $version.pre_release - doc_version += "-$version.pre_release_string" - # Let's take the last four-digit number to cover 2000-2021,2022. # doc_year = $regex.replace($copyright, '.+[-, ]([0-9][0-9][0-9][0-9]) .+', '\1') @@ -77,7 +79,7 @@ if $develop # {man1 xhtml}{xsd}: dist = ($develop ? pregenerated/ : false) -ops = ../xsd/cxx/cli{options tree/options parser/options} +ops = ../xsd/cli{options cxx/options cxx/tree/options cxx/parser/options} man1{xsd}: $ops \ file{xsd-prologue.1 \ @@ -96,20 +98,20 @@ if $develop -v date="January $doc_year" \ --class CXX::options \ --class options \ - --man-prologue-file $path($<[3]) \ - $path($<[0]) >$o - - $cli --generate-man $man_options \ - -v date="January $doc_year" \ --man-prologue-file $path($<[4]) \ - $path($<[1]) >>$o + $path($<[1]) >$o $cli --generate-man $man_options \ -v date="January $doc_year" \ --man-prologue-file $path($<[5]) \ - --man-epilogue-file $path($<[6]) \ $path($<[2]) >>$o + $cli --generate-man $man_options \ + -v date="January $doc_year" \ + --man-prologue-file $path($<[6]) \ + --man-epilogue-file $path($<[7]) \ + $path($<[3]) >>$o + # If the result differs from the pregenerated version, copy it over. # if! diff $src_base/pregenerated/xsd.1 $o >- @@ -132,20 +134,20 @@ if $develop -v date="January $doc_year" \ --class CXX::options \ --class options \ - --html-prologue-file $path($<[3]) \ - $path($<[0]) >$o - - $cli --generate-html $man_options \ - -v date="January $doc_year" \ --html-prologue-file $path($<[4]) \ - $path($<[1]) >>$o + $path($<[1]) >$o $cli --generate-html $man_options \ -v date="January $doc_year" \ --html-prologue-file $path($<[5]) \ - --html-epilogue-file $path($<[6]) \ $path($<[2]) >>$o + $cli --generate-html $man_options \ + -v date="January $doc_year" \ + --html-prologue-file $path($<[6]) \ + --html-epilogue-file $path($<[7]) \ + $path($<[3]) >>$o + if! diff $src_base/pregenerated/xsd.xhtml $o >- cp $o $src_base/pregenerated/xsd.xhtml end diff --git a/xsd/doc/cxx/parser/guide/index.xhtml.in b/xsd/doc/cxx/parser/guide/index.xhtml.in index 96d06e2..119f421 100644 --- a/xsd/doc/cxx/parser/guide/index.xhtml.in +++ b/xsd/doc/cxx/parser/guide/index.xhtml.in @@ -553,7 +553,7 @@ </p> <pre class="terminal"> -$ xsd cxx-parser --std c++11 --xml-parser expat hello.xsd +$ xsd cxx-parser --xml-parser expat hello.xsd </pre> <p>The <code>--xml-parser</code> option indicates that we want to @@ -1494,7 +1494,7 @@ gender ::gender ::gender; option to let the XSD compiler know about our type map:</p> <pre class="terminal"> -$ xsd cxx-parser --std c++11 --type-map people.map people.xsd +$ xsd cxx-parser --type-map people.map people.xsd </pre> <p>If we now look at the generated <code>people-pskel.hxx</code>, @@ -1673,10 +1673,10 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; - base64Binary std::[auto|unique]_ptr<xml_schema::buffer> - std::[auto|unique]_ptr<xml_schema::buffer>; - hexBinary std::[auto|unique]_ptr<xml_schema::buffer> - std::[auto|unique]_ptr<xml_schema::buffer>; + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; date xml_schema::date; dateTime xml_schema::date_time; @@ -1742,8 +1742,7 @@ people ::people; recompile our schema and move on to implementing the parsers:</p> <pre class="terminal"> -$ xsd cxx-parser --std c++11 --xml-parser expat --type-map people.map \ - people.xsd +$ xsd cxx-parser --xml-parser expat --type-map people.map people.xsd </pre> <p>Here is the implementation of our three parsers in full. One @@ -2608,14 +2607,14 @@ private: <tr> <td><code>base64Binary</code></td> <td><code>base64_binary_pimpl</code></td> - <td><code>std::[auto|unique]_ptr< xml_schema::buffer></code><br/> + <td><code>std::[unique|auto]_ptr< xml_schema::buffer></code><br/> <a href="#6.3">Section 6.3, "<code>base64Binary</code> and <code>hexBinary</code> Parsers"</a></td> </tr> <tr> <td><code>hexBinary</code></td> <td><code>hex_binary_pimpl</code></td> - <td><code>std::[auto|unique]_ptr< xml_schema::buffer></code><br/> + <td><code>std::[unique|auto]_ptr< xml_schema::buffer></code><br/> <a href="#6.3">Section 6.3, "<code>base64Binary</code> and <code>hexBinary</code> Parsers"</a></td> </tr> diff --git a/xsd/doc/cxx/tree/guide/index.xhtml.in b/xsd/doc/cxx/tree/guide/index.xhtml.in index b704e50..2f7f1e2 100644 --- a/xsd/doc/cxx/tree/guide/index.xhtml.in +++ b/xsd/doc/cxx/tree/guide/index.xhtml.in @@ -536,7 +536,7 @@ </p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 hello.xsd +$ xsd cxx-tree hello.xsd </pre> <p>The XSD compiler produces two C++ files: <code>hello.hxx</code> and @@ -633,7 +633,7 @@ hello (std::istream&); select C++98:</p> <pre class="terminal"> -$ xsd cxx-tree hello.xsd +$ xsd cxx-tree --std c++98 hello.xsd </pre> <p>Then the parsing function signatures will become:</p> @@ -726,7 +726,7 @@ Hello, world! it with the <code>--generate-serialization</code> options:</p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 --generate-serialization hello.xsd +$ xsd cxx-tree --generate-serialization hello.xsd </pre> <p>If we now examine the generated <code>hello.hxx</code> file, @@ -911,7 +911,7 @@ main (int argc, char* argv[]) change the type naming scheme:</p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 --type-naming ucc hello.xsd +$ xsd cxx-tree --type-naming ucc hello.xsd </pre> <p>The <code>ucc</code> argument to the <code>--type-naming</code> @@ -978,8 +978,7 @@ hello (std::istream&); <code>--type-regex</code> option:</p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 --type-naming ucc \ - --type-regex '/ (.+)_t/\u$1/' hello.xsd +$ xsd cxx-tree --type-naming ucc --type-regex '/ (.+)_t/\u$1/' hello.xsd </pre> <p>This results in the following changes to the generated code:</p> @@ -1114,8 +1113,7 @@ hello (std::istream&); our schema with the <code>--generate-doxygen</code> option:</p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 --generate-serialization --generate-doxygen \ - hello.xsd +$ xsd cxx-tree --generate-serialization --generate-doxygen hello.xsd </pre> <p>Now the generated <code>hello.hxx</code> file contains comments diff --git a/xsd/doc/cxx/tree/manual/index.xhtml.in b/xsd/doc/cxx/tree/manual/index.xhtml.in index 5a7240a..5274229 100644 --- a/xsd/doc/cxx/tree/manual/index.xhtml.in +++ b/xsd/doc/cxx/tree/manual/index.xhtml.in @@ -8,7 +8,7 @@ <meta name="copyright" content="© @copyright@"/> <meta name="keywords" content="xsd,xml,schema,c++,mapping,data,binding,tree,serialization,guide,manual,examples"/> <meta name="description" content="C++/Tree Mapping User Manual"/> - <meta name="revision" content="4.1.0"/> + <meta name="revision" content="@doc_version@"/> <link rel="stylesheet" type="text/css" href="../../../default.css" /> @@ -441,9 +441,9 @@ called C++/Tree. </p> - <p>Revision 4.1.0<br/> <!-- Remember to change revision in other places --> + <p>Revision @doc_version@<br/> This revision of the manual describes the C++/Tree - mapping as implemented by CodeSynthesis XSD version 4.1.0. + mapping as implemented by CodeSynthesis XSD version @doc_version@. </p> <p>This document is available in the following formats: diff --git a/xsd/doc/pregenerated/xsd.1 b/xsd/doc/pregenerated/xsd.1 index f74a3b0..580ac78 100644 --- a/xsd/doc/pregenerated/xsd.1 +++ b/xsd/doc/pregenerated/xsd.1 @@ -1,7 +1,7 @@ .\" Process this file with .\" groff -man -Tascii xsd.1 .\" -.TH XSD 1 "January 2022" "XSD 4.2.0-b.4" +.TH XSD 1 "January 2023" "XSD 4.2.1-a.0" .SH NAME xsd \- W3C XML Schema to C++ Compiler .\" @@ -119,12 +119,15 @@ if any, should appear after the corresponding . .IP "\fB--std\fR \fIversion\fR" Specify the C++ standard that the generated code should conform to\. Valid -values are \fBc++98\fR (default) and \fBc++11\fR\. +values are \fBc++98\fR, \fBc++11\fR (default), \fBc++14\fR, \fBc++17\fR, +\fBc++20\fR, and \fBc++23\fR\. The C++ standard affects various aspects of the generated code that are discussed in more detail in various mapping-specific documentation\. Overall, when C++11 is selected, the generated code relies on the move semantics and uses \fBstd::unique_ptr\fR instead of deprecated \fBstd::auto_ptr\fR\. +Currently, there is no difference between the C++11 and the later standards +modes\. When the C++11 mode is selected, you normally don't need to perform any extra steps other than enable C++11 in your C++ compiler, if required\. The XSD @@ -381,7 +384,8 @@ Generate \fBmake\fR dependency information\. This option triggers the creation of the \fB\.d\fR file containing the dependencies of the generated files on the main schema file as well as all the schema files that it includes/imports, transitively\. This dependency file is then normally included into the main -\fBmakefile\fR to implement automatic dependency tracking\. +\fBmakefile\fR to implement automatic dependency tracking\. See also the +\fB--dep-*\fR options\. Note also that automatic dependency generation is not supported in the file-per-type mode (\fB--file-per-type\fR)\. In this case, all the generated @@ -402,8 +406,12 @@ directory prefixes\. If you require multiple targets, then you can specify them as a single, space-separated argument or you can repeat this option multiple times\. .IP "\fB--dep-suffix\fR \fIsuffix\fR" -Use the provided \fIsuffix\fR instead of the default \fB\.d\fR to construct -the name of the dependency file\. +Use \fIsuffix\fR instead of the default \fB\.d\fR to construct the name of the +dependency file\. See also \fB--dep-file\fR\. +.IP "\fB--dep-file\fR \fIpath\fR" +Use \fIpath\fR as the generated dependency file path instead of deriving it +from the input file name\. Write the dependency information to \fBstdout\fR if +\fIpath\fR is \fB-\fR\. See also \fB--dep-regex\fR\. .IP "\fB--dep-regex\fR \fIregex\fR" Use the provided expression to construct the name of the dependency file\. \fIregex\fR is a Perl-like regular expression in the form @@ -577,9 +585,14 @@ option is primarily useful when trying to minimize the amount of object code that is linked to an executable by packaging compiled generated code into a static (archive) library\. .IP "\fB--file-list\fR \fIfile\fR" -Write a list of generated C++ files to \fIfile\fR\. This option is primarily -useful in the file-per-type compilation mode (\fB--file-per-type\fR) to create -a list of generated C++ files, for example, as a makefile fragment\. +Write a list of generated C++ files to \fIfile\fR or to \fBstdout\fR if +\fIfile\fR is \fB-\fR\. This option is primarily useful in the file-per-type +compilation mode (\fB--file-per-type\fR) to create a list of generated C++ +files, for example, as a makefile fragment\. +.IP "\fB--file-list-only\fR" +Only write the list of C++ files that would be generated without actually +generating them\. This option only makes sense together with +\fB--file-list\fR\. .IP "\fB--file-list-prologue\fR \fItext\fR" Insert \fItext\fR at the beginning of the file list\. As a convenience, all occurrences of the \fB\en\fR character sequence in \fItext\fR are replaced @@ -1292,7 +1305,6 @@ namespace http://www.example.com/xmlns/my .br .RE - The compiler has a number of predefined mapping rules that can be presented as the following map files. The string-based XML Schema built-in types are mapped to either @@ -1303,6 +1315,14 @@ depending on the character type selected with the .B --char-type option .RB ( char +by default). The binary XML Schema types are mapped to either +.B std::unique_ptr<xml_schema::buffer> +or +.B std::auto_ptr<xml_schema::buffer> +depending on the C++ standard selected with the +.B --std +option +.RB ( c++11 by default). .RS @@ -1382,13 +1402,13 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; .br - base64Binary std::auto_ptr<xml_schema::buffer> + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> .br - std::auto_ptr<xml_schema::buffer>; + std::[unique|auto]_ptr<xml_schema::buffer>; .br - hexBinary std::auto_ptr<xml_schema::buffer> + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> .br - std::auto_ptr<xml_schema::buffer>; + std::[unique|auto]_ptr<xml_schema::buffer>; .br date xml_schema::date; @@ -1471,7 +1491,7 @@ and exit with non-zero exit code. .SH BUGS Send bug reports to the xsd-users@codesynthesis.com mailing list. .SH COPYRIGHT -Copyright (c) 2005-2022 Code Synthesis Tools CC. +Copyright (c) 2005-2023 Code Synthesis. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, diff --git a/xsd/doc/pregenerated/xsd.xhtml b/xsd/doc/pregenerated/xsd.xhtml index 4737ab6..2e30ed4 100644 --- a/xsd/doc/pregenerated/xsd.xhtml +++ b/xsd/doc/pregenerated/xsd.xhtml @@ -1,12 +1,11 @@ -<?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> - +<html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>XSD 4.2.0-b.4 Compiler Command Line Manual</title> + <title>XSD 4.2.1-a.0 Compiler Command Line Manual</title> - <meta name="version" content="4.2.0-b.4"/> - <meta name="copyright" content="© 2005-2022 Code Synthesis Tools CC"/> + <meta charset="UTF-8"/> + <meta name="version" content="4.2.1-a.0"/> + <meta name="copyright" content="© 2005-2023 Code Synthesis"/> <meta name="keywords" content="xsd,xml,schema,c++,mapping,data,binding,code,generator,manual,man,page"/> <meta name="description" content="XSD Compiler Command Line Manual"/> @@ -124,14 +123,16 @@ <dl class="options"> <dt><code><b>--std</b></code> <code><i>version</i></code></dt> <dd>Specify the C++ standard that the generated code should conform to. - Valid values are <code><b>c++98</b></code> (default) and - <code><b>c++11</b></code>. + Valid values are <code><b>c++98</b></code>, <code><b>c++11</b></code> + (default), <code><b>c++14</b></code>, <code><b>c++17</b></code>, + <code><b>c++20</b></code>, and <code><b>c++23</b></code>. <p>The C++ standard affects various aspects of the generated code that are discussed in more detail in various mapping-specific documentation. Overall, when C++11 is selected, the generated code relies on the move semantics and uses <code><b>std::unique_ptr</b></code> instead of - deprecated <code><b>std::auto_ptr</b></code>.</p> + deprecated <code><b>std::auto_ptr</b></code>. Currently, there is no + difference between the C++11 and the later standards modes.</p> <p>When the C++11 mode is selected, you normally don't need to perform any extra steps other than enable C++11 in your C++ compiler, if required. The @@ -480,7 +481,8 @@ dependencies of the generated files on the main schema file as well as all the schema files that it includes/imports, transitively. This dependency file is then normally included into the main <code><b>makefile</b></code> - to implement automatic dependency tracking. + to implement automatic dependency tracking. See also the + <code><b>--dep-*</b></code> options. <p>Note also that automatic dependency generation is not supported in the file-per-type mode (<code><b>--file-per-type</b></code>). In this case, @@ -506,8 +508,15 @@ multiple times.</dd> <dt><code><b>--dep-suffix</b></code> <code><i>suffix</i></code></dt> - <dd>Use the provided <code><i>suffix</i></code> instead of the default - <code><b>.d</b></code> to construct the name of the dependency file.</dd> + <dd>Use <code><i>suffix</i></code> instead of the default + <code><b>.d</b></code> to construct the name of the dependency file. See + also <code><b>--dep-file</b></code>.</dd> + + <dt><code><b>--dep-file</b></code> <code><i>path</i></code></dt> + <dd>Use <code><i>path</i></code> as the generated dependency file path + instead of deriving it from the input file name. Write the dependency + information to <code><b>stdout</b></code> if <code><i>path</i></code> is + <code><b>-</b></code>. See also <code><b>--dep-regex</b></code>.</dd> <dt><code><b>--dep-regex</b></code> <code><i>regex</i></code></dt> <dd>Use the provided expression to construct the name of the dependency @@ -731,10 +740,17 @@ compiled generated code into a static (archive) library.</dd> <dt><code><b>--file-list</b></code> <code><i>file</i></code></dt> - <dd>Write a list of generated C++ files to <code><i>file</i></code>. This - option is primarily useful in the file-per-type compilation mode - (<code><b>--file-per-type</b></code>) to create a list of generated C++ - files, for example, as a makefile fragment.</dd> + <dd>Write a list of generated C++ files to <code><i>file</i></code> or to + <code><b>stdout</b></code> if <code><i>file</i></code> is + <code><b>-</b></code>. This option is primarily useful in the + file-per-type compilation mode (<code><b>--file-per-type</b></code>) to + create a list of generated C++ files, for example, as a makefile + fragment.</dd> + + <dt><code><b>--file-list-only</b></code></dt> + <dd>Only write the list of C++ files that would be generated without + actually generating them. This option only makes sense together with + <code><b>--file-list</b></code>.</dd> <dt><code><b>--file-list-prologue</b></code> <code><i>text</i></code></dt> <dd>Insert <code><i>text</i></code> at the beginning of the file list. As @@ -1465,7 +1481,11 @@ namespace http://www.example.com/xmlns/my built-in types are mapped to either <code><b>std::string</b></code> or <code><b>std::wstring</b></code> depending on the character type selected with the <code><b>--char-type</b></code> option - (<code><b>char</b></code> by default).</p> + (<code><b>char</b></code> by default). The binary XML Schema types are + mapped to either <code>std::unique_ptr<xml_schema::buffer></code> + or <code>std::auto_ptr<xml_schema::buffer></code> depending on the C++ + standard selected with the <code><b>--std</b></code> option + (<code><b>c++11</b></code> by default).</p> <pre> namespace http://www.w3.org/2001/XMLSchema @@ -1512,10 +1532,10 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; - base64Binary std::auto_ptr<xml_schema::buffer> - std::auto_ptr<xml_schema::buffer>; - hexBinary std::auto_ptr<xml_schema::buffer> - std::auto_ptr<xml_schema::buffer>; + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; date xml_schema::date; dateTime xml_schema::date_time; @@ -1585,7 +1605,7 @@ namespace .* </div> <div id="footer"> - Copyright © 2005-2022 Code Synthesis Tools CC. + Copyright © 2005-2023 Code Synthesis. <div id="terms"> Permission is granted to copy, distribute and/or modify this diff --git a/xsd/doc/xsd-epilogue.1 b/xsd/doc/xsd-epilogue.1 index a37da89..9ab1952 100644 --- a/xsd/doc/xsd-epilogue.1 +++ b/xsd/doc/xsd-epilogue.1 @@ -381,7 +381,6 @@ namespace http://www.example.com/xmlns/my .br .RE - The compiler has a number of predefined mapping rules that can be presented as the following map files. The string-based XML Schema built-in types are mapped to either @@ -392,6 +391,14 @@ depending on the character type selected with the .B --char-type option .RB ( char +by default). The binary XML Schema types are mapped to either +.B std::unique_ptr<xml_schema::buffer> +or +.B std::auto_ptr<xml_schema::buffer> +depending on the C++ standard selected with the +.B --std +option +.RB ( c++11 by default). .RS @@ -471,13 +478,13 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; .br - base64Binary std::auto_ptr<xml_schema::buffer> + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> .br - std::auto_ptr<xml_schema::buffer>; + std::[unique|auto]_ptr<xml_schema::buffer>; .br - hexBinary std::auto_ptr<xml_schema::buffer> + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> .br - std::auto_ptr<xml_schema::buffer>; + std::[unique|auto]_ptr<xml_schema::buffer>; .br date xml_schema::date; diff --git a/xsd/doc/xsd-epilogue.xhtml b/xsd/doc/xsd-epilogue.xhtml index 632b2d9..178cf8b 100644 --- a/xsd/doc/xsd-epilogue.xhtml +++ b/xsd/doc/xsd-epilogue.xhtml @@ -290,7 +290,11 @@ namespace http://www.example.com/xmlns/my built-in types are mapped to either <code><b>std::string</b></code> or <code><b>std::wstring</b></code> depending on the character type selected with the <code><b>--char-type</b></code> option - (<code><b>char</b></code> by default).</p> + (<code><b>char</b></code> by default). The binary XML Schema types are + mapped to either <code>std::unique_ptr<xml_schema::buffer></code> + or <code>std::auto_ptr<xml_schema::buffer></code> depending on the C++ + standard selected with the <code><b>--std</b></code> option + (<code><b>c++11</b></code> by default).</p> <pre> namespace http://www.w3.org/2001/XMLSchema @@ -337,10 +341,10 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; - base64Binary std::auto_ptr<xml_schema::buffer> - std::auto_ptr<xml_schema::buffer>; - hexBinary std::auto_ptr<xml_schema::buffer> - std::auto_ptr<xml_schema::buffer>; + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; date xml_schema::date; dateTime xml_schema::date_time; diff --git a/xsd/doc/xsd-prologue.xhtml b/xsd/doc/xsd-prologue.xhtml index e52e1fc..6782a32 100644 --- a/xsd/doc/xsd-prologue.xhtml +++ b/xsd/doc/xsd-prologue.xhtml @@ -1,10 +1,9 @@ -<?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> - +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>$project$ $version$ Compiler Command Line Manual</title> + <meta charset="UTF-8"/> <meta name="version" content="$version$"/> <meta name="copyright" content="© $copyright$"/> <meta name="keywords" content="xsd,xml,schema,c++,mapping,data,binding,code,generator,manual,man,page"/> |