Added document_id_path to the doxygen_xml2qbk. Added links to reference.

[SVN r82398]
This commit is contained in:
Adam Wulkiewicz
2013-01-08 03:36:16 +00:00
parent 010a58325f
commit 273f5f5347
6 changed files with 286 additions and 277 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -57,7 +57,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"><p><small>Last revised: January 08, 2013 at 01:06:35 GMT</small></p></td>
<td align="left"><p><small>Last revised: January 08, 2013 at 03:33:47 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

View File

@@ -13,9 +13,10 @@ import os, sys
cmd = "doxygen_xml2qbk"
cmd = cmd + " --xml xml/%s.xml"
cmd = cmd + " --start_include ."
cmd = cmd + " --document_id_path %s"
cmd = cmd + " > generated/%s.qbk"
os.system("doxygen Doxyfile")
os.system(cmd % ("classboost_1_1geometry_1_1index_1_1rtree", "rtree"))
os.system(cmd % ("classboost_1_1geometry_1_1index_1_1rtree", "geometry_index.r_tree.index.boost_geometry_index_rtree", "rtree"))
os.system("b2")

View File

@@ -27,6 +27,8 @@ struct configuration
std::vector<std::string> convenience_headers;
std::string skip_namespace;
std::string document_id_path;
};

View File

@@ -75,6 +75,8 @@ int main(int argc, char** argv)
"Namespace to skip (e.g. boost::mylib::")
("copyright", po::value<std::string>(&copyright_filename),
"Name of QBK file including (commented) copyright and license")
("document_id_path", po::value<std::string>(&config.document_id_path),
"The QBK document ID path")
;
po::variables_map varmap;
@@ -103,6 +105,9 @@ int main(int argc, char** argv)
{
boost::split(config.convenience_headers, convenience_headers, boost::is_any_of(","));
}
if ( !config.document_id_path.empty() && config.document_id_path[config.document_id_path.size() - 1] != '.' )
config.document_id_path += '.';
}
// Read files into strings

View File

@@ -698,9 +698,15 @@ void quickbook_output_member(class_or_struct const& cos,
if (f.type == type)
{
out << "[[`";
out << "[[";
if ( !config.document_id_path.empty() )
out << "[link " << config.document_id_path << "member" << i << " ";
out << "`";
quickbook_synopsis_short(f, out);
out << "`][" << f.brief_description << "]]" << std::endl;
out << "`";
if ( !config.document_id_path.empty() )
out << "]";
out << "][" << f.brief_description << "]]" << std::endl;
}
}
out << "]" << std::endl
@@ -720,7 +726,7 @@ void quickbook_output_detail_member(class_or_struct const& cos,
std::stringstream ss;
quickbook_synopsis_short(f, ss);
out << "[section " << ss.str() << "]" << std::endl;
out << "[section:member" << i << " " << ss.str() << "]" << std::endl;
out << "[heading Synopsis]" << std::endl;
quickbook_synopsis(f, out, true, true);