Merge pull request #53 from gilsonsouza/master

Fixed #33: <br/> in ncurses RichText did not behave correctly.

Author: jreidinger

VERSION.cmake

@@ -1,6 +1,6 @@
 SET( VERSION_MAJOR "2" )
 SET( VERSION_MINOR "48" )
-SET( VERSION_PATCH "0" )
+SET( VERSION_PATCH "1" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
 
 ##### This is need for the libyui core, ONLY.

package/libyui-ncurses-doc.spec

@@ -19,7 +19,7 @@
 %define so_version 7
 
 Name:           %{parent}-doc
-Version:        2.48.0
+Version:        2.48.1
 Release:        0
 Source:         %{parent}-%{version}.tar.bz2
 

package/libyui-ncurses.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 30 08:43:16 UTC 2016 - gilson.s.s@gmail.com
+
+- Treat RichText non-pair tag cases (gh#libyui-ncurses/issues#33).
+- 2.48.1
+
 -------------------------------------------------------------------
 Wed Nov 16 12:47:36 UTC 2016 - cwh@suse.com
 

package/libyui-ncurses.spec

@@ -17,7 +17,7 @@
 
 
 Name:           libyui-ncurses
-Version:        2.48.0
+Version:        2.48.1
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 

src/NCRichText.cc

@@ -431,6 +431,7 @@ void NCRichText::AdjustPrePad( const wchar_t *osch )
 
     // replace <br> by \n to get appropriate lines in NCtext
     boost::replace_all( wtxt, L"<br>", L"\n" );
+    boost::replace_all( wtxt, L"<br/>", L"\n" );
 
     yuiDebug() << "Text: " << wtxt << " initial length: " << wch - osch << std::endl;
 
@@ -887,6 +888,12 @@ bool NCRichText::PadTOKEN( const wchar_t * sch, const wchar_t *& ech )
 
 	    if      ( value == L"big" )		token = T_IGNORE;
 	    else if ( value == L"pre" )		token = T_PLAIN;
+            // <br> and <hr> are the only non-pair tags currently supported.
+            // We treat bellow these two special cases in order to work as
+            // users expect. This issue was described at 
+            // https://github.com/libyui/libyui-ncurses/issues/33
+            else if ( value == L"br/" )		token = T_BR;
+	    else if ( value == L"hr/" )		token = T_IGNORE;
 
 	    break;