Update of /cvsroot/boost/boost/tools/quickbook/detail
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4420/tools/quickbook_backend/detail
Modified Files:
Tag: QUICKBOOK_BACKEND
actions.cpp actions.hpp actions_class.cpp actions_class.hpp
Log Message:
Merge from head.
Index: actions.cpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/detail/actions.cpp,v
retrieving revision 1.49.2.8
retrieving revision 1.49.2.9
diff -u -d -r1.49.2.8 -r1.49.2.9
--- actions.cpp 30 Jul 2007 14:47:14 -0000 1.49.2.8
+++ actions.cpp 31 Jul 2007 03:38:08 -0000 1.49.2.9
@@ -724,6 +724,20 @@
actions.table_title.clear();
}
+ void start_varlistitem_action::operator()(char) const
+ {
+ phrase << start_varlistitem_;
+ phrase.push();
+ }
+
+ void end_varlistitem_action::operator()(char) const
+ {
+ std::string str;
+ temp_para.swap(str);
+ phrase.pop();
+ phrase << str << end_varlistitem_;
+ }
+
void table_action::operator()(iterator, iterator) const
{
std::string::iterator first = actions.table_title.begin();
Index: actions.hpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/detail/actions.hpp,v
retrieving revision 1.36.2.7
retrieving revision 1.36.2.8
diff -u -d -r1.36.2.7 -r1.36.2.8
--- actions.hpp 30 Jul 2007 14:47:14 -0000 1.36.2.7
+++ actions.hpp 31 Jul 2007 03:38:08 -0000 1.36.2.8
@@ -380,6 +380,27 @@
std::string str;
};
+ struct start_varlistitem_action
+ {
+ start_varlistitem_action(collector& phrase)
+ : phrase(phrase) {}
+
+ void operator()(char) const;
+
+ collector& phrase;
+ };
+
+ struct end_varlistitem_action
+ {
+ end_varlistitem_action(collector& phrase, collector& temp_para)
+ : phrase(phrase), temp_para(temp_para) {}
+
+ void operator()(char) const;
+
+ collector& phrase;
+ collector& temp_para;
+ };
+
struct macro_identifier_action
{
// Handles macro identifiers
Index: actions_class.cpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/detail/actions_class.cpp,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -u -d -r1.9.2.7 -r1.9.2.8
--- actions_class.cpp 30 Jul 2007 14:47:14 -0000 1.9.2.7
+++ actions_class.cpp 31 Jul 2007 03:38:08 -0000 1.9.2.8
@@ -150,8 +150,8 @@
, end_varlistentry(phrase, end_varlistentry_)
, start_varlistterm(phrase, start_varlistterm_)
, end_varlistterm(phrase, end_varlistterm_)
- , start_varlistitem(phrase, start_varlistitem_)
- , end_varlistitem(phrase, end_varlistitem_)
+ , start_varlistitem(phrase)
+ , end_varlistitem(phrase, temp_para)
, break_("break",*this)
, macro_identifier(*this)
Index: actions_class.hpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/detail/actions_class.hpp,v
retrieving revision 1.9.2.7
retrieving revision 1.9.2.8
diff -u -d -r1.9.2.7 -r1.9.2.8
--- actions_class.hpp 30 Jul 2007 14:47:14 -0000 1.9.2.7
+++ actions_class.hpp 31 Jul 2007 03:38:08 -0000 1.9.2.8
@@ -174,8 +174,8 @@
markup_action end_varlistentry;
markup_action start_varlistterm;
markup_action end_varlistterm;
- markup_action start_varlistitem;
- markup_action end_varlistitem;
+ start_varlistitem_action start_varlistitem;
+ end_varlistitem_action end_varlistitem;
break_action break_;
macro_identifier_action macro_identifier;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
