2011-01-16 23:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbmxml/tests/testmxml.prg
    ! Reverted 2011-01-17 00:05 UTC+0200 Petr Chornyj.
      It's wrong solution, it makes the output non-portable.
    ; TOFIX: Change LF to CRLF in libmxml for a proper fix.
This commit is contained in:
Viktor Szakats
2011-01-16 22:31:06 +00:00
parent a26fe95871
commit 9eb980c479
2 changed files with 14 additions and 8 deletions

View File

@@ -16,6 +16,12 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-01-16 23:29 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbmxml/tests/testmxml.prg
! Reverted 2011-01-17 00:05 UTC+0200 Petr Chornyj.
It's wrong solution, it makes the output non-portable.
; TOFIX: Change LF to CRLF in libmxml for a proper fix.
2011-01-17 00:05 UTC+0200 Petr Chornyj (myorg63 at mail.ru)
* contrib/hbmxml/hbmxml.c
! Fixed warning reported by bcc55 in mxmlNewCustom()

View File

@@ -658,7 +658,7 @@ FUNCTION whitespace_cb( hNode, nWhere ) /* O - Whitespace string or nil */
*/
IF nWhere == MXML_WS_BEFORE_OPEN .OR. nWhere == MXML_WS_AFTER_CLOSE
RETURN e"\n"
RETURN hb_eol()
ENDIF
ELSEIF cName == "dl" .OR. cName == "ol" .OR. cName == "ul"
@@ -666,7 +666,7 @@ FUNCTION whitespace_cb( hNode, nWhere ) /* O - Whitespace string or nil */
* Put a newline before and after list elements...
*/
RETURN e"\n"
RETURN hb_eol()
ELSEIF cName == "dd" .OR. cName == "dd" .OR. cName == "li"
/*
@@ -674,13 +674,13 @@ FUNCTION whitespace_cb( hNode, nWhere ) /* O - Whitespace string or nil */
*/
IF nWhere == MXML_WS_BEFORE_OPEN
RETURN e"\t"
RETURN Space( 8 )
ELSEIF nWhere == MXML_WS_AFTER_CLOSE
RETURN e"\n"
RETURN hb_eol()
ENDIF
ELSEIF Left( cName, 4 ) == "?xml"
IF nWhere == MXML_WS_AFTER_OPEN
RETURN e"\n"
RETURN hb_eol()
ELSE
RETURN nil
ENDIF
@@ -699,14 +699,14 @@ FUNCTION whitespace_cb( hNode, nWhere ) /* O - Whitespace string or nil */
nLevel := 0
ENDIF
RETURN Replicate( e"\t", nLevel )
RETURN Replicate( Chr( 9 ), nLevel )
ELSEIF nWhere == MXML_WS_AFTER_CLOSE .OR. ;
( ( cName == "group" .OR. cName == "option" .OR. cName == "choice" ) .AND. ;
nWhere == MXML_WS_AFTER_OPEN )
RETURN e"\n"
RETURN hb_eol()
ELSEIF nWhere == MXML_WS_AFTER_OPEN .AND. Empty( mxmlGetFirstChild( hNode ) )
RETURN e"\n"
RETURN hb_eol()
ENDIF
/*