-docstring htmlize(docstring const & str);
-
-// to be removed
-/// \return true if tag was opened, false if not
-bool openTag(odocstream & os, std::string const & tag,
- std::string const & attr);
-/// \return true if tag was opened, false if not
-bool closeTag(odocstream & os, std::string const & tag);
-}
+docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e);
+/// cleans \param str for use as an atttribute by replacing
+/// all non-alnum by "_"
+docstring cleanAttr(docstring const & str);
+///
+std::string escapeChar(char c, XHTMLStream::EscapeSettings e);
+///
+std::string htmlize(std::string const & str, XHTMLStream::EscapeSettings e);
+///
+std::string cleanAttr(std::string const & str);
+
+} // namespace html