summaryrefslogtreecommitdiffstats
path: root/Source/cmRST.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-21 18:53:25 (GMT)
committerBrad King <brad.king@kitware.com>2013-10-21 18:56:26 (GMT)
commit7b9ae406f3f2fbe4de9d075a50ec0daae4fa1274 (patch)
treeb525f98d473db4ff36f499fd0652ba136824c210 /Source/cmRST.h
parentbf02e750796c6b42b0e9d39ba322cd5191489a0e (diff)
downloadCMake-7b9ae406f3f2fbe4de9d075a50ec0daae4fa1274.zip
CMake-7b9ae406f3f2fbe4de9d075a50ec0daae4fa1274.tar.gz
CMake-7b9ae406f3f2fbe4de9d075a50ec0daae4fa1274.tar.bz2
cmRST: Do not process inline markup in code-block literals
Move the ProcessDirectiveParsedLiteral and ProcessDirectiveCodeBlock method internals into an OutputMarkupLines helper. Pass through it a new "inlineMarkup" parameter and teach OutputLine to understand it. When false, do not process inline markup. Extend the CMakeLib.testRST test to cover the two cases.
Diffstat (limited to 'Source/cmRST.h')
-rw-r--r--Source/cmRST.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmRST.h b/Source/cmRST.h
index 9352941..a3b9c32 100644
--- a/Source/cmRST.h
+++ b/Source/cmRST.h
@@ -48,8 +48,9 @@ private:
void Reset();
void ProcessLine(std::string const& line);
void NormalLine(std::string const& line);
- void OutputLine(std::string const& line);
+ void OutputLine(std::string const& line, bool inlineMarkup);
std::string ReplaceSubstitutions(std::string const& line);
+ void OutputMarkupLines(bool inlineMarkup);
bool ProcessInclude(std::string file, IncludeType type);
void ProcessDirectiveParsedLiteral();
void ProcessDirectiveCodeBlock();