diff options
| author | Shawn Hussey <shawn@zeroc.com> | 2011-08-30 17:34:28 -0230 |
|---|---|---|
| committer | Shawn Hussey <shawn@zeroc.com> | 2011-08-30 17:34:28 -0230 |
| commit | 3c0b7e1fe299f1d3d84923c9dc4db0c9fb75c38e (patch) | |
| tree | 642e8722bce74db931624e209e6672aa63abbd4b /cpp/src/slice2confluence/ConfluenceOutput.h | |
| parent | Fixed some Slice comment markup. (diff) | |
| download | ice-3c0b7e1fe299f1d3d84923c9dc4db0c9fb75c38e.tar.bz2 ice-3c0b7e1fe299f1d3d84923c9dc4db0c9fb75c38e.tar.xz ice-3c0b7e1fe299f1d3d84923c9dc4db0c9fb75c38e.zip | |
Fixed navigational and stylistic bugs and added confluence character escaping before comment markup parsing.
Added --sort-order param for sorting modules.
Improvements and bugfixes for slice2confluence.
Diffstat (limited to 'cpp/src/slice2confluence/ConfluenceOutput.h')
| -rw-r--r-- | cpp/src/slice2confluence/ConfluenceOutput.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h index 2897f3086cd..70f68b24132 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.h +++ b/cpp/src/slice2confluence/ConfluenceOutput.h @@ -28,8 +28,13 @@ public: void endElement(); // End an element. void attr(const std::string&, const std::string&); // Add an attribute to an element. + std::string convertCommentHTML(std::string comment); + std::string escapeComment(std::string comment); + + std::string getAnchorMarkup(const std::string&, const std::string& = ""); std::string getLinkMarkup(const std::string&, const std::string& = "", const std::string& = "", const std::string& = ""); std::string getImageMarkup(const std::string&, const std::string& = ""); + std::string getNavMarkup(const std::string&, const std::string&); void startEscapes(); void endEscapes(); @@ -48,6 +53,7 @@ private: bool _escape; std::string _listMarkers; + std::string _commentListMarkers; }; template<typename T> |