diff --git a/uppsrc/RichText/EncodeHTML.cpp b/uppsrc/RichText/EncodeHTML.cpp index e6faddb38..391b74804 100644 --- a/uppsrc/RichText/EncodeHTML.cpp +++ b/uppsrc/RichText/EncodeHTML.cpp @@ -246,8 +246,7 @@ String AsHtml(const RichTxt& text, const RichStyles& styles, Index& css, endtag = ""; } String cs; - if(part.text[0] != 9) - cs = HtmlCharStyle(part.format, p.format); + cs = HtmlCharStyle(part.format, p.format); if(!cs.IsEmpty()) { html << ""; endtag = "" + endtag; @@ -392,4 +391,20 @@ String AsCss(Index& ss) return css; } +String MakeHtml(const char *title, const String& css, const String& body) +{ + String h = + "\r\n" + "\t\n" + "\t\n" + "\t\n" + "" + String(title) + "\r\n" + ; + if(!IsNull(css)) + h << "\r\n"; + h << "" << body << ""; + return h; +} + } diff --git a/uppsrc/RichText/RichText.h b/uppsrc/RichText/RichText.h index a54892a27..2bfa05159 100644 --- a/uppsrc/RichText/RichText.h +++ b/uppsrc/RichText/RichText.h @@ -513,6 +513,8 @@ String EncodeHtml(const RichText& text, Index& css, const VectorMap& escape = VectorMap()); String AsCss(Index& ss); +String MakeHtml(const char *title, const String& css, const String& body); + inline //BW - no labels String EncodeHtml(const RichText& text, Index& css, const VectorMap& links, diff --git a/uppsrc/ide/Browser/TopicWin.cpp b/uppsrc/ide/Browser/TopicWin.cpp index fc0947a97..43aa24411 100644 --- a/uppsrc/ide/Browser/TopicWin.cpp +++ b/uppsrc/ide/Browser/TopicWin.cpp @@ -135,22 +135,6 @@ void TopicEditor::ExportGroupPdf() } } -String MakeHtml(const char *title, String css, String body) -{ - String h = - "\r\n" - "\t\n" - "\t\n" - "\t\n" - "" + String(title) + "\r\n" - ; - if(!IsNull(css)) - h << "\r\n"; - h << "" << body << ""; - return h; -} - void TopicEditor::ExportHTML() { String path = SelectFileSaveAs("HTML files\t*.html\nAll files\t*.*"); diff --git a/uppsrc/ide/NewPackageFile.cpp b/uppsrc/ide/NewPackageFile.cpp index 36ee4480b..b0bf31cc1 100644 --- a/uppsrc/ide/NewPackageFile.cpp +++ b/uppsrc/ide/NewPackageFile.cpp @@ -26,7 +26,7 @@ NewPackageFileWindow::NewPackageFileWindow() Type("witz", "Skylark template file (web framework files)"); Type("qtf", "U++ rich text file"); Type("t", "Translation file"); - Type("tpp", "Documentation file"); + Type("tpp", "Documentation folder"); type.AddSeparator(); Type("json", "JSON file"); Type("xml", "XML file");