Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r50215 - in trunk/tools/quickbook: . detail
From: daniel_james_at_[hidden]
Date: 2008-12-08 18:38:30


Author: danieljames
Date: 2008-12-08 18:38:29 EST (Mon, 08 Dec 2008)
New Revision: 50215
URL: http://svn.boost.org/trac/boost/changeset/50215

Log:
Put the markup strings in their own cpp file to avoid gcc warnings.
Added:
   trunk/tools/quickbook/detail/markups.cpp (contents, props changed)
Text files modified:
   trunk/tools/quickbook/Jamfile.v2 | 1
   trunk/tools/quickbook/detail/markups.hpp | 176 ++++++++++++++++++++--------------------
   2 files changed, 89 insertions(+), 88 deletions(-)

Modified: trunk/tools/quickbook/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/Jamfile.v2 (original)
+++ trunk/tools/quickbook/Jamfile.v2 2008-12-08 18:38:29 EST (Mon, 08 Dec 2008)
@@ -17,6 +17,7 @@
     detail/post_process.cpp
     detail/collector.cpp
     detail/template_stack.cpp
+ detail/markups.cpp
     /boost//program_options
     /boost//filesystem
     : #<define>QUICKBOOK_NO_DATES

Added: trunk/tools/quickbook/detail/markups.cpp
==============================================================================
--- (empty file)
+++ trunk/tools/quickbook/detail/markups.cpp 2008-12-08 18:38:29 EST (Mon, 08 Dec 2008)
@@ -0,0 +1,101 @@
+/*=============================================================================
+ Copyright (c) 2002 2004 2006 Joel de Guzman
+ Copyright (c) 2004 Eric Niebler
+ http://spirit.sourceforge.net/
+
+ Use, modification and distribution is subject to 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)
+=============================================================================*/
+
+#include "./markups.hpp"
+
+namespace quickbook
+{
+ const char* comment_pre = "<!--";
+ const char* comment_post = "-->";
+ const char* paragraph_pre = "<para>\n";
+ const char* paragraph_post = "</para>\n";
+ const char* h1_pre = "<bridgehead renderas=\"sect1\">";
+ const char* h1_post = "</bridgehead>";
+ const char* h2_pre = "<bridgehead renderas=\"sect2\">";
+ const char* h2_post = "</bridgehead>";
+ const char* h3_pre = "<bridgehead renderas=\"sect3\">";
+ const char* h3_post = "</bridgehead>";
+ const char* h4_pre = "<bridgehead renderas=\"sect4\">";
+ const char* h4_post = "</bridgehead>";
+ const char* h5_pre = "<bridgehead renderas=\"sect5\">";
+ const char* h5_post = "</bridgehead>";
+ const char* h6_pre = "<bridgehead renderas=\"sect6\">";
+ const char* h6_post = "</bridgehead>";
+ const char* hr_ = "<para/>";
+ const char* blurb_pre = "<sidebar role=\"blurb\">\n";
+ const char* blurb_post = "</sidebar>\n";
+ const char* blockquote_pre = "<blockquote><para>";
+ const char* blockquote_post = "</para></blockquote>";
+ const char* preformatted_pre = "<programlisting>";
+ const char* preformatted_post = "</programlisting>";
+ const char* warning_pre = "<warning>";
+ const char* warning_post = "</warning>";
+ const char* caution_pre = "<caution>";
+ const char* caution_post = "</caution>";
+ const char* important_pre = "<important>";
+ const char* important_post = "</important>";
+ const char* note_pre = "<note>";
+ const char* note_post = "</note>";
+ const char* tip_pre = "<tip>";
+ const char* tip_post = "</tip>";
+ const char* list_item_pre = "<listitem>\n";
+ const char* list_item_post = "\n</listitem>";
+ const char* bold_pre_ = "<emphasis role=\"bold\">";
+ const char* bold_post_ = "</emphasis>";
+ const char* italic_pre_ = "<emphasis>";
+ const char* italic_post_ = "</emphasis>";
+ const char* underline_pre_ = "<emphasis role=\"underline\">";
+ const char* underline_post_ = "</emphasis>";
+ const char* teletype_pre_ = "<literal>";
+ const char* teletype_post_ = "</literal>";
+ const char* strikethrough_pre_ = "<emphasis role=\"strikethrough\">";
+ const char* strikethrough_post_ = "</emphasis>";
+ const char* quote_pre_ = "<quote>";
+ const char* quote_post_ = "</quote>";
+ const char* break_mark = "<sbr/>\n";
+ const char* url_pre_ = "<ulink url=\"";
+ const char* url_post_ = "</ulink>";
+ const char* link_pre_ = "<link linkend=\"";
+ const char* link_post_ = "</link>";
+ const char* start_varlistentry_ = "<varlistentry>";
+ const char* end_varlistentry_ = "</varlistentry>\n";
+ const char* start_varlistterm_ = "<term>";
+ const char* end_varlistterm_ = "</term>";
+ const char* start_varlistitem_ = "<listitem>";
+ const char* end_varlistitem_ = "</listitem>";
+ const char* start_header_ = "<thead>";
+ const char* end_header_ = "</thead>\n";
+ const char* start_row_ = "<row>";
+ const char* end_row_ = "</row>\n";
+ const char* start_cell_ = "<entry>";
+ const char* end_cell_ = "</entry>";
+ const char* funcref_pre_ = "<functionname alt=\"";
+ const char* funcref_post_ = "</functionname>";
+ const char* classref_pre_ = "<classname alt=\"";
+ const char* classref_post_ = "</classname>";
+ const char* memberref_pre_ = "<methodname alt=\"";
+ const char* memberref_post_ = "</methodname>";
+ const char* enumref_pre_ = "<enumname alt=\"";
+ const char* enumref_post_ = "</enumname>";
+ const char* macroref_pre_ = "<macroname alt=\"";
+ const char* macroref_post_ = "</macroname>";
+ const char* headerref_pre_ = "<headername alt=\"";
+ const char* headerref_post_ = "</headername>";
+ const char* conceptref_pre_ = "<conceptname alt=\"";
+ const char* conceptref_post_ = "</conceptname>";
+ const char* globalref_pre_ = "<globalname alt=\"";
+ const char* globalref_post_ = "</globalname>";
+ const char* footnote_pre_ = "<footnote><para>";
+ const char* footnote_post_ = "</para></footnote>";
+ const char* escape_pre_ = "<!--quickbook-escape-prefix-->";
+ const char* escape_post_ = "<!--quickbook-escape-postfix-->";
+ const char* replaceable_pre_ = "<replaceable>";
+ const char* replaceable_post_ = "</replaceable>";
+}

Modified: trunk/tools/quickbook/detail/markups.hpp
==============================================================================
--- trunk/tools/quickbook/detail/markups.hpp (original)
+++ trunk/tools/quickbook/detail/markups.hpp 2008-12-08 18:38:29 EST (Mon, 08 Dec 2008)
@@ -10,95 +10,95 @@
 #if !defined(BOOST_SPIRIT_MARKUPS_HPP)
 #define BOOST_SPIRIT_MARKUPS_HPP
 
-namespace quickbook { namespace /*unnamed*/
+namespace quickbook
 {
- const char* comment_pre = "<!--";
- const char* comment_post = "-->";
- const char* paragraph_pre = "<para>\n";
- const char* paragraph_post = "</para>\n";
- const char* h1_pre = "<bridgehead renderas=\"sect1\">";
- const char* h1_post = "</bridgehead>";
- const char* h2_pre = "<bridgehead renderas=\"sect2\">";
- const char* h2_post = "</bridgehead>";
- const char* h3_pre = "<bridgehead renderas=\"sect3\">";
- const char* h3_post = "</bridgehead>";
- const char* h4_pre = "<bridgehead renderas=\"sect4\">";
- const char* h4_post = "</bridgehead>";
- const char* h5_pre = "<bridgehead renderas=\"sect5\">";
- const char* h5_post = "</bridgehead>";
- const char* h6_pre = "<bridgehead renderas=\"sect6\">";
- const char* h6_post = "</bridgehead>";
- const char* hr_ = "<para/>";
- const char* blurb_pre = "<sidebar role=\"blurb\">\n";
- const char* blurb_post = "</sidebar>\n";
- const char* blockquote_pre = "<blockquote><para>";
- const char* blockquote_post = "</para></blockquote>";
- const char* preformatted_pre = "<programlisting>";
- const char* preformatted_post = "</programlisting>";
- const char* warning_pre = "<warning>";
- const char* warning_post = "</warning>";
- const char* caution_pre = "<caution>";
- const char* caution_post = "</caution>";
- const char* important_pre = "<important>";
- const char* important_post = "</important>";
- const char* note_pre = "<note>";
- const char* note_post = "</note>";
- const char* tip_pre = "<tip>";
- const char* tip_post = "</tip>";
- const char* list_item_pre = "<listitem>\n";
- const char* list_item_post = "\n</listitem>";
- const char* bold_pre_ = "<emphasis role=\"bold\">";
- const char* bold_post_ = "</emphasis>";
- const char* italic_pre_ = "<emphasis>";
- const char* italic_post_ = "</emphasis>";
- const char* underline_pre_ = "<emphasis role=\"underline\">";
- const char* underline_post_ = "</emphasis>";
- const char* teletype_pre_ = "<literal>";
- const char* teletype_post_ = "</literal>";
- const char* strikethrough_pre_ = "<emphasis role=\"strikethrough\">";
- const char* strikethrough_post_ = "</emphasis>";
- const char* quote_pre_ = "<quote>";
- const char* quote_post_ = "</quote>";
- const char* break_mark = "<sbr/>\n";
- const char* url_pre_ = "<ulink url=\"";
- const char* url_post_ = "</ulink>";
- const char* link_pre_ = "<link linkend=\"";
- const char* link_post_ = "</link>";
- const char* start_varlistentry_ = "<varlistentry>";
- const char* end_varlistentry_ = "</varlistentry>\n";
- const char* start_varlistterm_ = "<term>";
- const char* end_varlistterm_ = "</term>";
- const char* start_varlistitem_ = "<listitem>";
- const char* end_varlistitem_ = "</listitem>";
- const char* start_header_ = "<thead>";
- const char* end_header_ = "</thead>\n";
- const char* start_row_ = "<row>";
- const char* end_row_ = "</row>\n";
- const char* start_cell_ = "<entry>";
- const char* end_cell_ = "</entry>";
- const char* funcref_pre_ = "<functionname alt=\"";
- const char* funcref_post_ = "</functionname>";
- const char* classref_pre_ = "<classname alt=\"";
- const char* classref_post_ = "</classname>";
- const char* memberref_pre_ = "<methodname alt=\"";
- const char* memberref_post_ = "</methodname>";
- const char* enumref_pre_ = "<enumname alt=\"";
- const char* enumref_post_ = "</enumname>";
- const char* macroref_pre_ = "<macroname alt=\"";
- const char* macroref_post_ = "</macroname>";
- const char* headerref_pre_ = "<headername alt=\"";
- const char* headerref_post_ = "</headername>";
- const char* conceptref_pre_ = "<conceptname alt=\"";
- const char* conceptref_post_ = "</conceptname>";
- const char* globalref_pre_ = "<globalname alt=\"";
- const char* globalref_post_ = "</globalname>";
- const char* footnote_pre_ = "<footnote><para>";
- const char* footnote_post_ = "</para></footnote>";
- const char* escape_pre_ = "<!--quickbook-escape-prefix-->";
- const char* escape_post_ = "<!--quickbook-escape-postfix-->";
- const char* replaceable_pre_ = "<replaceable>";
- const char* replaceable_post_ = "</replaceable>";
-}}
+ extern const char* comment_pre;
+ extern const char* comment_post;
+ extern const char* paragraph_pre;
+ extern const char* paragraph_post;
+ extern const char* h1_pre;
+ extern const char* h1_post;
+ extern const char* h2_pre;
+ extern const char* h2_post;
+ extern const char* h3_pre;
+ extern const char* h3_post;
+ extern const char* h4_pre;
+ extern const char* h4_post;
+ extern const char* h5_pre;
+ extern const char* h5_post;
+ extern const char* h6_pre;
+ extern const char* h6_post;
+ extern const char* hr_;
+ extern const char* blurb_pre;
+ extern const char* blurb_post;
+ extern const char* blockquote_pre;
+ extern const char* blockquote_post;
+ extern const char* preformatted_pre;
+ extern const char* preformatted_post;
+ extern const char* warning_pre;
+ extern const char* warning_post;
+ extern const char* caution_pre;
+ extern const char* caution_post;
+ extern const char* important_pre;
+ extern const char* important_post;
+ extern const char* note_pre;
+ extern const char* note_post;
+ extern const char* tip_pre;
+ extern const char* tip_post;
+ extern const char* list_item_pre;
+ extern const char* list_item_post;
+ extern const char* bold_pre_;
+ extern const char* bold_post_;
+ extern const char* italic_pre_;
+ extern const char* italic_post_;
+ extern const char* underline_pre_;
+ extern const char* underline_post_;
+ extern const char* teletype_pre_;
+ extern const char* teletype_post_;
+ extern const char* strikethrough_pre_;
+ extern const char* strikethrough_post_;
+ extern const char* quote_pre_;
+ extern const char* quote_post_;
+ extern const char* break_mark;
+ extern const char* url_pre_;
+ extern const char* url_post_;
+ extern const char* link_pre_;
+ extern const char* link_post_;
+ extern const char* start_varlistentry_;
+ extern const char* end_varlistentry_;
+ extern const char* start_varlistterm_;
+ extern const char* end_varlistterm_;
+ extern const char* start_varlistitem_;
+ extern const char* end_varlistitem_;
+ extern const char* start_header_;
+ extern const char* end_header_;
+ extern const char* start_row_;
+ extern const char* end_row_;
+ extern const char* start_cell_;
+ extern const char* end_cell_;
+ extern const char* funcref_pre_;
+ extern const char* funcref_post_;
+ extern const char* classref_pre_;
+ extern const char* classref_post_;
+ extern const char* memberref_pre_;
+ extern const char* memberref_post_;
+ extern const char* enumref_pre_;
+ extern const char* enumref_post_;
+ extern const char* macroref_pre_;
+ extern const char* macroref_post_;
+ extern const char* headerref_pre_;
+ extern const char* headerref_post_;
+ extern const char* conceptref_pre_;
+ extern const char* conceptref_post_;
+ extern const char* globalref_pre_;
+ extern const char* globalref_post_;
+ extern const char* footnote_pre_;
+ extern const char* footnote_post_;
+ extern const char* escape_pre_;
+ extern const char* escape_post_;
+ extern const char* replaceable_pre_;
+ extern const char* replaceable_post_;
+}
 
 #endif // BOOST_SPIRIT_MARKUPS_HPP
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk