Attachment 499864 Details for Bug 691572

YRichText.diff

YRichText.diff (text/plain), 2.57 KB, created by Gabriele Mohr on 2012-07-25 08:35:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gabriele Mohr

Created: 2012-07-25 08:35:23 UTC

Size: 2.57 KB

patch

obsolete

>diff --git a/src/Makefile.am b/src/Makefile.am
>index d5baade..14026ce 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -15,7 +15,7 @@ lib_LTLIBRARIES = libyui.la
> 
> 
> libyui_la_LDFLAGS = -version-info 4:0:0 -Wl,--no-undefined
>-libyui_la_LIBADD = -lpthread -ldl
>+libyui_la_LIBADD = -lpthread -ldl -lboost_regex
> 
> libyui_la_SOURCES =				\
> 	YUI.cc					\
>@@ -94,7 +94,10 @@ libyui_la_SOURCES =				\
> 						\
> 	FSize.cc				\
> 	YStringTree.cc				\
>-	YRpmGroupsTree.cc
>+	YRpmGroupsTree.cc			\
>+						\
>+	markdown.cpp				\
>+	markdown-tokens.cpp
> 
> 
> 
>@@ -192,7 +195,10 @@ pkginclude_HEADERS =				\
> 	TreeItem.h				\
> 	YRpmGroupsTree.h			\
> 	YStringTree.h				\
>-	YTransText.h
>+	YTransText.h				\
>+						\
>+	markdown.h				\
>+	markdown-tokens.h
> 
> 
> CLEANFILES = libyui.kdoc $(BUILT_SOURCES)
>diff --git a/src/YRichText.cc b/src/YRichText.cc
>index dce0448..a39b027 100644
>--- a/src/YRichText.cc
>+++ b/src/YRichText.cc
>@@ -44,6 +44,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
> #include "YUISymbols.h"
> #include "YRichText.h"
> 
>+#include <boost/optional.hpp>
>+#include <boost/regex.hpp>
>+#include <iostream>
>+#include <sstream>
>+
>+#include "markdown.h"
> 
> struct YRichTextPrivate
> {
>@@ -82,6 +88,30 @@ YRichText::~YRichText()
>     // NOP
> }
> 
>+#define DOCTYPETAG ""   // Special doctype for preformatted HTML
>+
>+string YRichText::createHtmlText ( const string & text )
>+{
>+    const std::string htmlIdent(DOCTYPETAG);
>+
>+    if ( text.find( htmlIdent ) != std::string::npos )
>+    {
>+        return text;          // text is already rich text formatted
>+    }
>+
>+    markdown::Document doc;
>+    std::ostringstream oOutputStream;
>+    string htmlText;
>+
>+    doc.read( text );
>+    doc.write( oOutputStream );
>+    htmlText = oOutputStream.str();
>+
>+    if ( !htmlText.empty() )
>+        return htmlText;
>+    else
>+        return text;
>+}
> 
> void YRichText::setValue( const string & newValue )
> {
>diff --git a/src/YRichText.h b/src/YRichText.h
>index ed61114..8695e89 100644
>--- a/src/YRichText.h
>+++ b/src/YRichText.h
>@@ -170,7 +170,11 @@ public:
>      * Reimplemented from YWidget.
>      **/
>     virtual const YPropertySet & propertySet();
>-
>+    
>+    /**
>+     * Create html text from input written in markdown syntax
>+     */
>+    string createHtmlText( const string & newValue );
> 
> protected:
> 
>diff --git a/yast2-libyui.spec.in b/yast2-libyui.spec.in
>index e0893ec..84a644a 100644
>--- a/yast2-libyui.spec.in
>+++ b/yast2-libyui.spec.in
>@@ -76,3 +76,5 @@ mkdir -p "$RPM_BUILD_ROOT"@logdir@
> %dir %{_datadir}/cmake/Modules
> %{_datadir}/cmake/Modules/*
> %doc @docdir@
>+%doc LICENSE.TXT
>+

Actions: View

Attachments on bug 691572: 427858 | 429590 | 443814 | 475800 | 481574 | 499862 | 499863 | 499864