diff --git a/doc/src/build.py b/doc/src/build.py index 0fbd80f..41a028b 100755 --- a/doc/src/build.py +++ b/doc/src/build.py @@ -1,4 +1,4 @@ -# Copyright (c) Aleksey Gurtovoy 2008 +# Copyright (c) Aleksey Gurtovoy 2008-2009 # # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at @@ -10,21 +10,21 @@ import os def build(): - def cleanup(): - if os.path.exists( 'refmanual.gen' ): - os.unlink( 'refmanual.gen' ) + def cleanup(): + if os.path.exists( 'refmanual.gen' ): + os.unlink( 'refmanual.gen' ) - if os.path.exists( 'build' ): - shutil.rmtree( 'build' ) + if os.path.exists( 'build' ): + shutil.rmtree( 'build' ) - def generate_html(): - os.system( 'python refmanual.py' ) - os.mkdir( 'build' ) - os.system( 'rst2htmlrefdoc.py -g -d -t --no-frames --traceback refmanual.gen build/refmanual.html' ) + def generate_html(): + os.system( 'python refmanual.py' ) + os.mkdir( 'build' ) + os.system( 'rst2htmlrefdoc.py -g -d -t --no-frames --dont-copy-stylesheet --stylesheet-path=style.css --traceback refmanual.gen build/refmanual.html' ) - os.chdir( 'refmanual' ) - cleanup() - generate_html() + os.chdir( 'refmanual' ) + cleanup() + generate_html() build() diff --git a/doc/src/docutils/writers/html4_refdoc/__init__.py b/doc/src/docutils/writers/html4_refdoc/__init__.py index 7c6eaf1..ba3395a 100755 --- a/doc/src/docutils/writers/html4_refdoc/__init__.py +++ b/doc/src/docutils/writers/html4_refdoc/__init__.py @@ -52,6 +52,12 @@ class refdoc_translator(html4_frames.frame_pages_translator): self.__super.depart_title(self, node) + def visit_table(self, node): + self = self.active_visitor() + self.body.append( + self.starttag(node, 'table', CLASS='docutils table', border="1")) + + def visit_reference(self, node): self.in_reference = 1 if len(node) == 1 and isinstance(node[0], nodes.literal) and node[0].has_key('class'): @@ -161,10 +167,24 @@ class refdoc_translator(html4_frames.frame_pages_translator): identifier = match.group(2) if not base.document.has_name( identifier.lower() ): return self.encode(match.group(0)) - + + def get_section_id( id ): + node = base.document.ids[ id ] + if isinstance( node, nodes.section ): + return id + + if isinstance( node, nodes.target ): + return get_section_id( node.get( 'refid' ) ) + + return None + + id = get_section_id( base.document.nameids[ identifier.lower() ] ) + if not id: + return self.encode(match.group(0)) + result = self.encode(match.group(1)) result += '%s' \ - % ( base._chunk_ref( base._active_chunk_id(), base.document.nameids[identifier.lower()] ) + % ( base._chunk_ref( base._active_chunk_id(), id ) , self.encode(identifier) ) diff --git a/doc/src/refmanual/Algorithms.rst b/doc/src/refmanual/Algorithms.rst index 5d310e4..1494120 100644 --- a/doc/src/refmanual/Algorithms.rst +++ b/doc/src/refmanual/Algorithms.rst @@ -1,5 +1,5 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -41,4 +41,5 @@ concept. .. |Output Iterator| replace:: `Output Iterator `__ -.. |sequence algorithms| replace:: `sequence algorithms <|Algorithms link|>`__ +.. |sequence algorithms| replace:: `sequence algorithms`_ +.. _`sequence algorithms`: `Algorithms`_ diff --git a/doc/src/refmanual/AssociativeSequence.rst b/doc/src/refmanual/AssociativeSequence.rst index bffb191..3685670 100644 --- a/doc/src/refmanual/AssociativeSequence.rst +++ b/doc/src/refmanual/AssociativeSequence.rst @@ -1,6 +1,6 @@ .. Sequences/Concepts//Associative Sequence |70 -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -114,8 +114,8 @@ See also |Sequences|, |Extensible Associative Sequence|, |has_key|, |count|, |order|, |at|, |key_type|, |value_type| -.. |key| replace:: `key <|key-part_link|>`__ -.. |key-part_link| replace:: `key-part`_ +.. |key| replace:: `key`_ +.. _`key`: `key-part`_ -.. |value| replace:: `value <|value-part_link|>`__ -.. |value-part_link| replace:: `value-part`_ +.. |value| replace:: `value`_ +.. _`value`: `value-part`_ diff --git a/doc/src/refmanual/CFG_NO_PREPROCESSED.rst b/doc/src/refmanual/CFG_NO_PREPROCESSED.rst index fb98df8..69d4df6 100644 --- a/doc/src/refmanual/CFG_NO_PREPROCESSED.rst +++ b/doc/src/refmanual/CFG_NO_PREPROCESSED.rst @@ -1,6 +1,6 @@ .. Macros/Configuration//BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS |10 -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -40,4 +40,5 @@ See also |Macros|, |Configuration| -.. |preprocessed headers| replace:: `preprocessed headers <|BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS link|>`__ +.. |preprocessed headers| replace:: `preprocessed headers`_ +.. _`preprocessed headers`: `BOOST_MPL_CFG_NO_PREPROCESSED`_ diff --git a/doc/src/refmanual/Metafunctions-Arithmetic.rst b/doc/src/refmanual/Metafunctions-Arithmetic.rst index 23af0d1..bbe600c 100644 --- a/doc/src/refmanual/Metafunctions-Arithmetic.rst +++ b/doc/src/refmanual/Metafunctions-Arithmetic.rst @@ -1,8 +1,9 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) .. |Arithmetic Operations| replace:: `Arithmetic Operations`_ -.. |arithmetic| replace:: `arithmetic <|Arithmetic Operations|>`__ +.. |arithmetic| replace:: arithmetic_ +.. _arithmetic: `Arithmetic Operations`_ diff --git a/doc/src/refmanual/Metafunctions-Bitwise.rst b/doc/src/refmanual/Metafunctions-Bitwise.rst index 4ae5c10..3bd7085 100644 --- a/doc/src/refmanual/Metafunctions-Bitwise.rst +++ b/doc/src/refmanual/Metafunctions-Bitwise.rst @@ -1,8 +1,9 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) .. |Bitwise Operations| replace:: `Bitwise Operations`_ -.. |bitwise| replace:: `bitwise <|Bitwise Operations|>`__ +.. |bitwise| replace:: `bitwise`_ +.. _`bitwise`: `Bitwise Operations`_ diff --git a/doc/src/refmanual/Metafunctions-Comparisons.rst b/doc/src/refmanual/Metafunctions-Comparisons.rst index 357b03f..9a8541b 100644 --- a/doc/src/refmanual/Metafunctions-Comparisons.rst +++ b/doc/src/refmanual/Metafunctions-Comparisons.rst @@ -1,8 +1,9 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) .. |Comparisons| replace:: `Comparisons`_ -.. |comparison| replace:: `comparison <|Comparisons|>`__ +.. |comparison| replace:: `comparison`_ +.. _`comparison`: `Comparisons`_ diff --git a/doc/src/refmanual/Metafunctions-Composition.rst b/doc/src/refmanual/Metafunctions-Composition.rst index c8a3c80..0d7482b 100644 --- a/doc/src/refmanual/Metafunctions-Composition.rst +++ b/doc/src/refmanual/Metafunctions-Composition.rst @@ -1,9 +1,13 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + .. |Composition and Argument Binding| replace:: `Composition and Argument Binding`_ -.. |composition| replace:: `composition <|Composition and Argument Binding link|>`__ -.. |argument binding| replace:: `argument binding <|Composition and Argument Binding link|>`__ +.. |composition| replace:: `composition`_ +.. _`composition`: `Composition and Argument Binding`_ + +.. |argument binding| replace:: `argument binding`_ +.. _`argument binding`: `Composition and Argument Binding`_ diff --git a/doc/src/refmanual/Metafunctions-Conditional.rst b/doc/src/refmanual/Metafunctions-Conditional.rst index 58dd6c6..f85f197 100644 --- a/doc/src/refmanual/Metafunctions-Conditional.rst +++ b/doc/src/refmanual/Metafunctions-Conditional.rst @@ -1,7 +1,7 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -.. |control flow| replace:: `control flow <|Control Flow link|>`__ +.. |control flow| replace:: `control flow`_ diff --git a/doc/src/refmanual/Metafunctions-Invocation.rst b/doc/src/refmanual/Metafunctions-Invocation.rst index f842791..b32c367 100644 --- a/doc/src/refmanual/Metafunctions-Invocation.rst +++ b/doc/src/refmanual/Metafunctions-Invocation.rst @@ -1,7 +1,7 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -.. |invocation| replace:: `invocation <|Invocation link|>`__ +.. |invocation| replace:: `invocation`_ diff --git a/doc/src/refmanual/Metafunctions-Logical.rst b/doc/src/refmanual/Metafunctions-Logical.rst index 5bc3aa6..41402b2 100644 --- a/doc/src/refmanual/Metafunctions-Logical.rst +++ b/doc/src/refmanual/Metafunctions-Logical.rst @@ -1,9 +1,11 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -.. |logical| replace:: `logical <|Logical Operations|>`__ +.. |logical| replace:: `logical`_ +.. _`logical`: `Logical Operations`_ + .. |Logical Operations| replace:: `Logical Operations`_ .. |logical operations| replace:: `logical operations`_ diff --git a/doc/src/refmanual/Metafunctions-Trivial.rst b/doc/src/refmanual/Metafunctions-Trivial.rst index a397f56..5373e0b 100644 --- a/doc/src/refmanual/Metafunctions-Trivial.rst +++ b/doc/src/refmanual/Metafunctions-Trivial.rst @@ -1,5 +1,5 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -53,4 +53,5 @@ See Also |Metafunctions|, |Trivial Metafunction| -.. |Trivial Metafunctions| replace:: `Trivial Metafunctions <|Trivial link|>`__ +.. |Trivial Metafunctions| replace:: `Trivial Metafunctions`_ +.. _`Trivial Metafunctions`: `label-Metafunctions-Trivial`_ diff --git a/doc/src/refmanual/Metafunctions-Type.rst b/doc/src/refmanual/Metafunctions-Type.rst index 2515e84..78d7f98 100644 --- a/doc/src/refmanual/Metafunctions-Type.rst +++ b/doc/src/refmanual/Metafunctions-Type.rst @@ -1,7 +1,7 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -.. |type selection| replace:: `type selection <|Type Selection link|>`__ +.. |type selection| replace:: `type selection`_ diff --git a/doc/src/refmanual/Placeholders.rst b/doc/src/refmanual/Placeholders.rst index 742a1da..bcb34b5 100644 --- a/doc/src/refmanual/Placeholders.rst +++ b/doc/src/refmanual/Placeholders.rst @@ -1,12 +1,14 @@ .. Metafunctions/Composition and Argument Binding//_1,_2,..._n |10 -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) Placeholders ============ +.. _`placeholder`: + Synopsis -------- @@ -98,3 +100,20 @@ See also -------- |Composition and Argument Binding|, |arg|, |lambda|, |bind|, |apply|, |apply_wrap| + + +.. |placeholder| replace:: `placeholder`_ + +.. |_1| replace:: `_1`_ +.. |_2| replace:: `_2`_ +.. |_3| replace:: `_3`_ +.. |_4| replace:: `_4`_ +.. |_5| replace:: `_5`_ + +.. _`_1`: `Placeholders`_ +.. _`_2`: `Placeholders`_ +.. _`_3`: `Placeholders`_ +.. _`_4`: `Placeholders`_ +.. _`_5`: `Placeholders`_ + +.. |_1,_2,..._n| replace:: |_1|, |_2|, |_3|,\ |...| diff --git a/doc/src/refmanual/Sequences-Concepts.rst b/doc/src/refmanual/Sequences-Concepts.rst index e3b6736..2d54542 100644 --- a/doc/src/refmanual/Sequences-Concepts.rst +++ b/doc/src/refmanual/Sequences-Concepts.rst @@ -1,5 +1,5 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -29,4 +29,5 @@ The taxonomy of sequence concepts in MPL parallels the taxonomy of the MPL the common parts of different sequence classes' specifications. -.. |sequence concepts| replace:: `sequence concepts <|Sequences/Concepts link|>`__ +.. |sequence concepts| replace:: `sequence concepts`_ +.. _`sequence concepts`: `label-Sequences-Concepts`_ diff --git a/doc/src/refmanual/TagDispatchedMetafunction.rst b/doc/src/refmanual/TagDispatchedMetafunction.rst index 0df080b..d0446fe 100644 --- a/doc/src/refmanual/TagDispatchedMetafunction.rst +++ b/doc/src/refmanual/TagDispatchedMetafunction.rst @@ -1,6 +1,6 @@ .. Metafunctions/Concepts//Tag Dispatched Metafunction |50 -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -161,5 +161,8 @@ See also |Metafunction|, |Metafunction Class|, |Numeric Metafunction| -.. |tag-metafunction| replace:: `tag metafunction <|tag-metafunction link|>`__ -.. |tag dispatched| replace:: `tag dispatched <|Tag Dispatched Metafunction link|>`__ +.. |tag-metafunction| replace:: `tag metafunctions`_ +.. _`tag metafunctions`: `tag-metafunction`_ + +.. |tag dispatched| replace:: `tag dispatched`_ +.. _`tag dispatched`: `Tag Dispatched Metafunction`_ diff --git a/doc/src/refmanual/Terminology.rst b/doc/src/refmanual/Terminology.rst index f9f3ccc..67c4400 100644 --- a/doc/src/refmanual/Terminology.rst +++ b/doc/src/refmanual/Terminology.rst @@ -1,11 +1,10 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) .. _`Overloaded name`: -.. |Overloaded name link| replace:: `Overloaded name`_ Overloaded name Overloaded name is a term used in this reference documentation to designate @@ -14,11 +13,7 @@ Overloaded name is implemented by other, unspecified, means. -.. |overloaded name| replace:: `overloaded name <|Overloaded name link|>`__ - - .. _`Concept-identical`: -.. |Concept-identical link| replace:: `Concept-identical`_ Concept-identical A sequence ``s1`` is said to be concept-identical to a sequence ``s2`` if @@ -26,7 +21,6 @@ Concept-identical .. _`Bind expression`: -.. |Bind expression link| replace:: `Bind expression`_ Bind expression A bind expression is simply that |--| an instantiation of one of the |bind| @@ -43,5 +37,6 @@ Bind expression _2 -.. |bind expression| replace:: `bind expression <|Bind expression link|>`__ -.. |concept-identical| replace:: `concept-identical <|Concept-identical link|>`__ +.. |overloaded name| replace:: `overloaded name`_ +.. |concept-identical| replace:: `concept-identical`_ +.. |bind expression| replace:: `bind expression`_ diff --git a/doc/src/refmanual/VariadicSequence.rst b/doc/src/refmanual/VariadicSequence.rst index 8ebae8f..926d4ce 100644 --- a/doc/src/refmanual/VariadicSequence.rst +++ b/doc/src/refmanual/VariadicSequence.rst @@ -1,6 +1,6 @@ .. Sequences/Concepts//Variadic Sequence |100 -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -113,7 +113,11 @@ See also |Sequences|, |Configuration|, |Integral Sequence Wrapper| -.. |variadic| replace:: `variadic <|Variadic Sequence link|>`__ -.. |variadic forms| replace:: `variadic forms <|Variadic Sequence link|>`__ -.. |numbered forms| replace:: `numbered forms <|Variadic Sequence link|>`__ -.. |Variadic Sequence link| replace:: `Variadic Sequence`_ +.. |variadic| replace:: `variadic`_ +.. _`variadic`: `Variadic Sequence`_ + +.. |variadic forms| replace:: `variadic forms`_ +.. _`variadic forms`: `Variadic Sequence`_ + +.. |numbered forms| replace:: `numbered forms`_ +.. _`numbered forms`: `Variadic Sequence`_ diff --git a/doc/src/refmanual/bool_.rst b/doc/src/refmanual/bool_.rst index d941a4f..bbe12fe 100644 --- a/doc/src/refmanual/bool_.rst +++ b/doc/src/refmanual/bool_.rst @@ -1,6 +1,6 @@ .. Data Types/Numeric//bool_ |10 -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -76,7 +76,7 @@ Example .. parsed-literal:: BOOST_MPL_ASSERT(( is_same< bool_::value_type, bool > )); - BOOST_MPL_ASSERT(( is_same< bool_, |true_| > )); } + BOOST_MPL_ASSERT(( is_same< bool_, true\_ > )); } BOOST_MPL_ASSERT(( is_same< bool_::type, bool_ > )); BOOST_MPL_ASSERT_RELATION( bool_::value, ==, true ); assert( bool_() == true ); @@ -88,5 +88,8 @@ See also |Data Types|, |Integral Constant|, |int_|, |long_|, |integral_c| -.. |true_| replace:: ```true_`` <|bool_ link|>`__ -.. |false_| replace:: ```false_`` <|bool_ link|>`__ +.. |true_| replace:: `true_`_ +.. _`true_`: `bool_`_ + +.. |false_| replace:: `false_`_ +.. _`false_`: `bool_`_ diff --git a/doc/src/refmanual/inserter_.rst b/doc/src/refmanual/inserter_.rst index 3dd6bc1..ecdfee5 100644 --- a/doc/src/refmanual/inserter_.rst +++ b/doc/src/refmanual/inserter_.rst @@ -1,12 +1,12 @@ .. Algorithms/Inserters//inserter -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -|+inserter+| -================ +|inserter(title)| +================= .. _`inserter_`: @@ -100,5 +100,5 @@ See also |Algorithms|, |Inserter|, |Reversible Algorithm|, |front_inserter|, |back_inserter| -.. |+inserter+| replace:: inserter -.. |inserter| replace:: ':refentry:`inserter` <|inserter_ link|>'__ +.. |inserter(title)| replace:: inserter +.. |inserter| replace:: ':refentry:`inserter` <|inserter_|>'__ diff --git a/doc/src/refmanual/refmanual.py b/doc/src/refmanual/refmanual.py index ef15671..1879e19 100644 --- a/doc/src/refmanual/refmanual.py +++ b/doc/src/refmanual/refmanual.py @@ -1,4 +1,4 @@ -# Copyright (c) Aleksey Gurtovoy 2001-2007 +# Copyright (c) Aleksey Gurtovoy 2001-2009 # # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at @@ -20,8 +20,7 @@ def __section_header(section): underline = underlines[len(parts) - 1] * len(parts[-1]) if len(parts) > 0: hidden_target = '.. _`label-%s`:' % '-'.join( parts ) - replacement_link = '.. |%s link| replace:: `label-%s`_' % ( '/'.join( parts ), '-'.join( parts ) ) - return '\n%s\n%s\n%s\n%s\n\n' % (parts[-1], underline, hidden_target, replacement_link ) + return '\n%s\n%s\n%s\n\n' % (parts[-1], underline, hidden_target ) else: return '\n%s\n%s\n\n' % (parts[-1], underline ) @@ -40,15 +39,12 @@ def __include_page( output, page, name = None ): else: ref = '/'.join( page.split('.')[0].split('-') ) if ref.upper() == ref or ref.lower() == ref: output.write( - ( '.. |%(ref)s| replace:: `|%(ref)s refentry| <|%(ref)s link|>`__\n' - + '.. |%(ref)s refentry| replace:: :refentry:`%(ref)s`\n' - + '.. |%(ref)s link| replace:: `%(ref)s`_\n' - ) + ( '.. |%(ref)s| replace:: `%(ref)s`_\n' ) % { 'ref': ref } ) else: if ref.find( '/' ) == -1: - ref = ' '.join( filter( lambda x: len(x) > 0, re.split( '([A-Z][a-z]+)', ref ) ) ) + ref = ' '.join( filter( lambda x: len( x.strip() ) > 0, re.split( '([A-Z][a-z]+)', ref ) ) ) output.write( '.. |%(ref)s| replace:: `%(ref)s`_\n' % { 'ref': ref } ) modtime = time.gmtime( os.stat( page ).st_mtime ) diff --git a/doc/src/refmanual/refmanual.rst b/doc/src/refmanual/refmanual.rst index 604e2db..90497a0 100644 --- a/doc/src/refmanual/refmanual.rst +++ b/doc/src/refmanual/refmanual.rst @@ -1,5 +1,5 @@ -.. Copyright Aleksey Gurtovoy, David Abrahams 2007. +.. Copyright Aleksey Gurtovoy, David Abrahams 2001-2009. .. Distributed under the Boost .. Software License, Version 1.0. (See accompanying .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -7,7 +7,7 @@ The MPL Reference Manual ************************ -:Copyright: Copyright © Aleksey Gurtovoy and David Abrahams, 2001-2007. +:Copyright: Copyright © Aleksey Gurtovoy and David Abrahams, 2001-2009. :License: Distributed under the Boost Software License, Version 1.0. (See accompanying file ``LICENSE_1_0.txt`` or copy at @@ -84,23 +84,6 @@ __ http://www.boost.org/LICENSE_1_0.txt .. |O(1)| replace:: *O(1)* -.. |_1| replace:: `|_1 refentry| <|Placeholders|>`__ -.. |_2| replace:: `|_2 refentry| <|Placeholders|>`__ -.. |_3| replace:: `|_3 refentry| <|Placeholders|>`__ -.. |_4| replace:: `|_4 refentry| <|Placeholders|>`__ -.. |_5| replace:: `|_5 refentry| <|Placeholders|>`__ - -.. |_1 refentry| replace:: :refentry:`_1` -.. |_2 refentry| replace:: :refentry:`_2` -.. |_3 refentry| replace:: :refentry:`_3` -.. |_4 refentry| replace:: :refentry:`_4` -.. |_5 refentry| replace:: :refentry:`_5` - -.. |placeholder| replace:: `placeholder <|Placeholders|>`__ - -.. |_1,_2,..._n| replace:: |_1|, |_2|, |_3|,\ |...| - - .. |--| unicode:: U+02014 .. EM DASH @@ -122,13 +105,8 @@ __ http://www.boost.org/LICENSE_1_0.txt .. |preprocessed headers disclaimer| replace:: [*Note:* Overriding will take effect - *only* if the library is configured not to use `preprocessed headers - <|BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS_link|>`__. See - |BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS_ref| for more information. |--| *end note*\] - -.. |BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS_ref| replace:: `:refentry:`BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS` <|BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS_link|>`__ -.. |BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS_link| replace:: `BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS`_ - + *only* if the library is configured not to use |preprocessed headers|. See + |BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS| for more information. |--| *end note*\] .. |transformation algorithm disclaimer| replace:: [*Note:* This wording applies to a no-inserter version(s) of the algorithm. See the diff --git a/doc/style.css b/doc/style.css index 8dc82f7..1609151 100644 --- a/doc/style.css +++ b/doc/style.css @@ -7,7 +7,6 @@ */ - .first { margin-top: 0; @@ -22,27 +21,43 @@ /* */ - a { - color: #0000cc; + text-decoration: none; /* no underline */ } -a:visited +a:hover { - color: #800080; + text-decoration: underline; } -/* -sup a:link, -sup a:visited, -a.interlink:link, -a.interlink:visited +@media screen { - color: #505050; - text-decoration: none; + a + { + color: #0C7445; + } + + a:visited + { + color: #663974; + } } -*/ + + +@media print +{ + a + { + color: black; + } + + a:visited + { + color: black; + } +} + a.refentry { @@ -78,7 +93,8 @@ a.header:visited a.identifier:hover, a.header:hover { - color: #0000cc; + color: #0077cc; + text-decoration: underline; } a.toc-backref:link, @@ -117,13 +133,15 @@ caption body { - background: #fffff5; + margin: 1em; + font-family: sans-serif; + font-size: 10pt; } -body.refmanual +p { - background: #fffff5 url(refmanual/manual.png) no-repeat top right fixed; - margin-right: 25pt; + text-align: left; + line-height: 1.15; } /*
*/ @@ -500,10 +518,19 @@ pre.literal-block padding-right: 1em; margin-top: 10pt; margin-left: 0pt; -/* background-color: #f7f7f7;*/ - background-color: #f5f5f5; } + +@media screen +{ + pre.literal-block + { + + background-color: #fafffb; + } +} + + td pre.literal-block { @@ -530,6 +557,15 @@ table margin-bottom: 0.5em; } +@media screen +{ + table.table th + { + background-color:#fafffb; + } +} + + table.docinfo { border: solid 0; @@ -549,12 +585,29 @@ table.citation border-left: solid thin gray; } +@media screen +{ + table.citation + { + background-color:#fafffb; + } +} + table.footnote { border: solid 0; border-left: solid thin black; } +@media screen +{ + table.footnote + { + background-color:#fafffb; + } +} + + table.header, table.footer { @@ -567,7 +620,7 @@ table.footer table.table { - border: solid 1px black; + border: solid 1px #c7c7c7; border-collapse: collapse; margin-bottom: 10pt; } @@ -581,7 +634,6 @@ td, table.table th { - border: solid 1px black; vertical-align: top; } @@ -592,6 +644,16 @@ th padding-right: 5pt; } + +@media screen +{ + table.table th + { + background-color:#fafffb; + } +} + + table.table td { @@ -650,11 +712,16 @@ tr.footer /* */ -tt.literal +@media screen { - background-color: #f5f5f5; + tt.literal + { + + background-color: #fafffb; + } } + h1 tt, h2