kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmRST: Parse toctree lines with Sphinx cross-reference syntax

Browse Source
This commit is contained in:
Brad King 2016-05-02 13:51:26 -04:00
parent 845cb217a7
commit de37065661
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmRST.cxx
View File

@ -46,7 +46,8 @@ cmRST::cmRST(std::ostream& os, std::string const& docroot):
"):`(<*([^`<]|[^` \t]<)*)([ \t]+<[^`]*>)?`"), "):`(<*([^`<]|[^` \t]<)*)([ \t]+<[^`]*>)?`"),
Substitution("(^|[^A-Za-z0-9_])" Substitution("(^|[^A-Za-z0-9_])"
"((\\|[^| \t\r\n]([^|\r\n]*[^| \t\r\n])?\\|)(__|_|))" "((\\|[^| \t\r\n]([^|\r\n]*[^| \t\r\n])?\\|)(__|_|))"
"([^A-Za-z0-9_]|$)") "([^A-Za-z0-9_]|$)"),
TocTreeLink("^.*[ \t]+<([^>]+)>$")
{ {
this->Replace["|release|"] = cmVersion::GetCMakeVersion(); this->Replace["|release|"] = cmVersion::GetCMakeVersion();
} }
@ -429,9 +430,18 @@ void cmRST::ProcessDirectiveTocTree()
for(std::vector<std::string>::iterator i = this->MarkupLines.begin(); for(std::vector<std::string>::iterator i = this->MarkupLines.begin();
i != this->MarkupLines.end(); ++i) i != this->MarkupLines.end(); ++i)
{ {
if(!i->empty() && i->find_first_of(":") == i->npos) std::string const& line = *i;
if (!line.empty() && line[0] != ':')
{ {
this->ProcessInclude(*i + ".rst", IncludeTocTree); if (this->TocTreeLink.find(line))
{
std::string const& link = this->TocTreeLink.match(1);
this->ProcessInclude(link + ".rst", IncludeTocTree);
}
else
{
this->ProcessInclude(line + ".rst", IncludeTocTree);
}
} }
} }
} }

1
Source/cmRST.h
View File

@ -89,6 +89,7 @@ private:
cmsys::RegularExpression ModuleRST; cmsys::RegularExpression ModuleRST;
cmsys::RegularExpression CMakeRole; cmsys::RegularExpression CMakeRole;
cmsys::RegularExpression Substitution; cmsys::RegularExpression Substitution;
cmsys::RegularExpression TocTreeLink;
std::vector<std::string> MarkupLines; std::vector<std::string> MarkupLines;
std::string DocDir; std::string DocDir;