Fixing markup escaping for slice2confluence.

1 files changed, 16 insertions, 0 deletions

diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h
index 70f68b24132..294b0fb3054 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.h
+++ b/cpp/src/slice2confluence/ConfluenceOutput.h
@@ -1,4 +1,6 @@
 #include <IceUtil/OutputUtil.h>
+#include <list>
+#include <utility>
 
 #ifndef CONFLUENCE_OUTPUT
 #define CONFLUENCE_OUTPUT
@@ -41,6 +43,20 @@ public:
     
     std::string currentElement() const;
     
+    /**
+     * Wrap sections in these markers to prevent them from being confluence-escaped.
+     * The regular confluence-escaping process will remove these markers.
+     */
+    const static std::string TEMP_ESCAPER_START; // wrap sections
+    const static std::string TEMP_ESCAPER_END; // wrap sections
+    
+    /**
+     * Gets the start and end positions of all TEMP_ESCAPED sections of the given string.
+     */
+    std::list<std::pair<unsigned int,unsigned int> > getMarkerLimits(const std::string&);
+    
+    std::string removeMarkers(std::string);
+    
 private:
     
     std::string escape(const ::std::string&) const;