From a25bf63826e44cfcc99effe44e13505d63c806f7 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 15 Jun 2008 19:48:40 +0000 Subject: [PATCH] Merge in boostbook changes, fixes free-function-group and adds support for variadic parameters. Merged revisions 45298-45302,45308-45338,45340-45345,45348-45352,45356-45358,45360-45377,45379-45392,45394,45396-45408,45410-45420,45424-45444,45448,45450-45455,45457-45478,45480,45484-45544,45546-45549,45551-45564,45566-45569,45571-45572,45575,45578-45584,45586-45593,45595-45597,45599,45605,45610-45618,45622-45624,45628-45632,45634-45637,45639-45644,45646,45648-45652,45654-45656,45666,45668-45670,45674-45675,45679-45680,45683-45684,45687,45691,45706-45708,45710-45741 via svnmerge from https://svn.boost.org/svn/boost/trunk ................ r45298 | fmhess | 2008-05-12 14:59:20 +0100 (Mon, 12 May 2008) | 6 lines Prevent a class' or namespace's associated free functions (a "free-function-group" element inside a "class" or "namespace" element) from reappearing in the synopsis of nested classes or namespaces. This is a merge of revision 45297 from the boost_docs sandbox. ................ r45741 | danieljames | 2008-05-25 17:14:17 +0100 (Sun, 25 May 2008) | 35 lines Support for variadic parameters. Merged revisions 44832-44957,44959-44995,44997-45128,45132-45135 via svnmerge from https://svn.boost.org/svn/boost/branches/doc ........ r44832 | danieljames | 2008-04-28 07:55:01 +0100 (Mon, 28 Apr 2008) | 2 lines Add variadic attribute to template type parameters. ........ r44943 | danieljames | 2008-04-30 20:27:32 +0100 (Wed, 30 Apr 2008) | 1 line Back out my half-done support for variadic template parameters. ........ r44994 | danieljames | 2008-05-01 21:52:59 +0100 (Thu, 01 May 2008) | 1 line Support for variadic template parameters. ........ r45132 | danieljames | 2008-05-05 12:37:35 +0100 (Mon, 05 May 2008) | 2 lines Rename variadic attributes pack. ........ r45133 | danieljames | 2008-05-05 12:37:50 +0100 (Mon, 05 May 2008) | 2 lines Support for function parameter packs. ........ r45134 | danieljames | 2008-05-05 12:38:08 +0100 (Mon, 05 May 2008) | 2 lines Support for inherited pack expansions. ........ r45135 | danieljames | 2008-05-05 12:38:25 +0100 (Mon, 05 May 2008) | 2 lines Support for pack expansions in template specializations. ........ ................ [SVN r46414] --- doc/reference.dtdxml | 35 +++++++++++++++++++++++++++++++++-- doc/reference.xml | 5 +++++ dtd/boostbook.dtd | 10 ++++++++-- xsl/function.xsl | 7 ++++++- xsl/lookup.xsl | 32 ++++++++++++++------------------ xsl/template.xsl | 5 +++++ xsl/type.xsl | 5 ++++- 7 files changed, 75 insertions(+), 24 deletions(-) diff --git a/doc/reference.dtdxml b/doc/reference.dtdxml index 3b28855..b013579 100644 --- a/doc/reference.dtdxml +++ b/doc/reference.dtdxml @@ -17,6 +17,7 @@ The name of the file associated with this element The specifiers for this function, e.g., inline, static, etc. cv-qualifiers for this method, e.g., const volatile +Set to '1' if the parameter is a parameter pack. name CDATA #REQUIRED + pack CDATA #IMPLIED %boost.common.attrib; + access CDATA #REQUIRED + pack CDATA #IMPLIED %boost.common.attrib; + + Set to '1' if this is a pack exapansion. + - %boost.common.attrib; + + pack CDATA #IMPLIED + %boost.common.attrib; + + Set to '1' if this is a pack exapansion. + - name CDATA #IMPLIED + name CDATA #IMPLIED + pack CDATA #IMPLIED + name CDATA #REQUIRED + pack CDATA #IMPLIED %boost.common.attrib; + last-revision#IMPLIEDCDATASet to $Date$ to keep "last revised" information in sync with CVS changes +pack#IMPLIEDCDATASet to '1' if the parameter is a parameter pack. name#REQUIREDCDATAThe name of the element being declared to referenced id#IMPLIEDCDATAA global identifier for this element xml:base#IMPLIEDCDATAImplementation detail used by XIncludes @@ -550,6 +551,7 @@ last-revision#IMPLIEDCDATASet to $Date$ to keep "last revised" information in sync with CVS changes access#REQUIREDCDATAThe access specifier ("public", "private", or "protected") of the inheritance. id#IMPLIEDCDATAA global identifier for this element +pack#IMPLIEDCDATASet to '1' if this is a pack exapansion. xml:base#IMPLIEDCDATAImplementation detail used by XIncludes @@ -1300,6 +1302,7 @@ last-revision#IMPLIEDCDATASet to $Date$ to keep "last revised" information in sync with CVS changes id#IMPLIEDCDATAA global identifier for this element +pack#IMPLIEDCDATASet to '1' if this is a pack exapansion. xml:base#IMPLIEDCDATAImplementation detail used by XIncludes @@ -1806,6 +1809,7 @@ name#IMPLIEDCDATAThe name of the element being declared to referenced +pack#IMPLIEDCDATASet to '1' if the parameter is a parameter pack. @@ -2299,6 +2303,7 @@ last-revision#IMPLIEDCDATASet to $Date$ to keep "last revised" information in sync with CVS changes +pack#IMPLIEDCDATASet to '1' if the parameter is a parameter pack. name#REQUIREDCDATAThe name of the element being declared to referenced id#IMPLIEDCDATAA global identifier for this element xml:base#IMPLIEDCDATAImplementation detail used by XIncludes diff --git a/dtd/boostbook.dtd b/dtd/boostbook.dtd index 27388ef..ba9d610 100644 --- a/dtd/boostbook.dtd +++ b/dtd/boostbook.dtd @@ -167,11 +167,13 @@ @@ -181,7 +183,9 @@ - + @@ -189,6 +193,7 @@ @@ -397,7 +402,8 @@ + name CDATA #IMPLIED + pack CDATA #IMPLIED> + + ... + @@ -393,7 +396,7 @@ - + @@ -410,6 +413,7 @@ mode="annotation"> + @@ -446,6 +450,7 @@ mode="annotation"> + diff --git a/xsl/lookup.xsl b/xsl/lookup.xsl index 2bf75c8..95505a8 100644 --- a/xsl/lookup.xsl +++ b/xsl/lookup.xsl @@ -194,29 +194,25 @@ - + + + , + + + + ... + + + + < - - - , - - + > - - - - - - - - - - - - diff --git a/xsl/template.xsl b/xsl/template.xsl index 53b64e2..730cb55 100644 --- a/xsl/template.xsl +++ b/xsl/template.xsl @@ -314,6 +314,7 @@ typename + ... @@ -388,6 +389,7 @@ + ... @@ -438,6 +440,9 @@ , + + ... + diff --git a/xsl/type.xsl b/xsl/type.xsl index 5c189f1..3f6f567 100644 --- a/xsl/type.xsl +++ b/xsl/type.xsl @@ -533,6 +533,8 @@ Unknown type element "" in type.display.na + ... + , @@ -626,6 +628,7 @@ Unknown type element "" in type.display.na + ... @@ -1058,7 +1061,7 @@ Unknown type element "" in type.display.na -