From 2688ce22128783603a33e25be71ae312bed25d1d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 24 Jan 2013 14:20:54 +0000 Subject: [PATCH] 2013-01-24 15:14 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg + links to markdown and markdown to man-page converter tool ! minor cleanup to prev * utils/hbmk2/hbmk2.1 * some updates * ChangeLog.txt ! typos/updates in previous entry * extras/hbdoc/*.prg * src/rtl/memoedit.prg * tests/clasinh.prg * tests/classch.prg * tests/inhprob.prg ! updated for new ::super: syntax * src/rtl/itemseri.c ! fixed typo in latest modification: 'warning: use of unary operator that may be intended as compound assignment (+=)' * contrib/hbgd/tests/test_out.prg * contrib/hbhttpd/* * contrib/hbtip/thtml.prg * contrib/xhb/*.prg * extras/httpsrv/* * extras/guestbk/* * website/faq/*.html * website/samples/HowToBuildOnLinux.html * website/third-party.html * some steps to modernize old HTML * extras/hbdoc/*.prg * do not use [] as string delimiter - tests/function.cfm - website/samples/function.cfm.html * .gitattributes - obsolete file deleted --- harbour/.gitattributes | 1 - harbour/ChangeLog.txt | 48 ++- harbour/contrib/hbgd/tests/test_out.prg | 18 +- .../contrib/hbhttpd/tests/tpl/app/account.tpl | 2 +- .../contrib/hbhttpd/tests/tpl/app/cart.tpl | 3 +- .../hbhttpd/tests/tpl/app/register.tpl | 2 +- .../hbhttpd/tests/tpl/app/shopping.tpl | 3 +- harbour/contrib/hbhttpd/widgets.prg | 2 +- harbour/contrib/hbtip/thtml.prg | 2 +- harbour/contrib/xhb/hjwindow.prg | 56 +-- harbour/contrib/xhb/hterrsys.prg | 68 ++-- harbour/contrib/xhb/htjlist.prg | 52 +-- harbour/contrib/xhb/htmlform.ch | 8 +- harbour/contrib/xhb/htmutil.prg | 56 +-- harbour/contrib/xhb/tedit.prg | 46 +-- harbour/contrib/xhb/thtm.prg | 380 +++++++++--------- harbour/extras/guestbk/guestbk.htm | 7 +- harbour/extras/guestbk/guestbk.ini | 8 +- harbour/extras/guestbk/guestbk.prg | 3 +- harbour/extras/hbdoc/genhtml.prg | 8 +- harbour/extras/hbdoc/gentxt.prg | 8 +- harbour/extras/hbdoc/genxml.prg | 10 +- harbour/extras/httpsrv/home/postsample.html | 6 +- harbour/extras/httpsrv/home/testajax.html | 2 +- harbour/extras/httpsrv/home/testxmldb.html | 14 +- harbour/extras/httpsrv/modules/cookie.prg | 6 +- harbour/extras/httpsrv/modules/info.prg | 24 +- harbour/extras/httpsrv/uhttpd.prg | 68 ++-- harbour/src/rtl/itemseri.c | 2 +- harbour/src/rtl/memoedit.prg | 2 +- harbour/tests/clasinh.prg | 4 +- harbour/tests/classch.prg | 2 +- harbour/tests/function.cfm | 50 --- harbour/tests/inhprob.prg | 4 +- harbour/utils/hbmk2/hbmk2.1 | 42 +- harbour/utils/hbmk2/hbmk2.prg | 17 +- harbour/website/faq/harbour.html | 183 +++++---- harbour/website/faq/harbour1.html | 49 ++- harbour/website/faq/harbour10.html | 45 +-- harbour/website/faq/harbour11.html | 54 ++- harbour/website/faq/harbour12.html | 53 ++- harbour/website/faq/harbour13.html | 51 ++- harbour/website/faq/harbour14.html | 57 ++- harbour/website/faq/harbour15.html | 57 ++- harbour/website/faq/harbour16.html | 49 ++- harbour/website/faq/harbour17.html | 53 ++- harbour/website/faq/harbour18.html | 51 ++- harbour/website/faq/harbour19.html | 55 ++- harbour/website/faq/harbour2.html | 45 +-- harbour/website/faq/harbour20.html | 67 ++- harbour/website/faq/harbour21.html | 53 ++- harbour/website/faq/harbour22.html | 77 ++-- harbour/website/faq/harbour23.html | 67 ++- harbour/website/faq/harbour24.html | 55 ++- harbour/website/faq/harbour25.html | 65 ++- harbour/website/faq/harbour26.html | 45 +-- harbour/website/faq/harbour27.html | 49 ++- harbour/website/faq/harbour28.html | 49 ++- harbour/website/faq/harbour29.html | 65 ++- harbour/website/faq/harbour3.html | 45 +-- harbour/website/faq/harbour30.html | 51 ++- harbour/website/faq/harbour31.html | 49 ++- harbour/website/faq/harbour32.html | 49 ++- harbour/website/faq/harbour33.html | 49 ++- harbour/website/faq/harbour34.html | 55 ++- harbour/website/faq/harbour35.html | 53 ++- harbour/website/faq/harbour36.html | 53 ++- harbour/website/faq/harbour37.html | 53 ++- harbour/website/faq/harbour38.html | 51 ++- harbour/website/faq/harbour39.html | 59 ++- harbour/website/faq/harbour4.html | 45 +-- harbour/website/faq/harbour40.html | 49 ++- harbour/website/faq/harbour41.html | 47 ++- harbour/website/faq/harbour42.html | 43 +- harbour/website/faq/harbour43.html | 55 ++- harbour/website/faq/harbour44.html | 55 ++- harbour/website/faq/harbour45.html | 49 ++- harbour/website/faq/harbour46.html | 51 ++- harbour/website/faq/harbour47.html | 59 ++- harbour/website/faq/harbour48.html | 65 ++- harbour/website/faq/harbour49.html | 49 ++- harbour/website/faq/harbour5.html | 45 +-- harbour/website/faq/harbour50.html | 49 ++- harbour/website/faq/harbour51.html | 59 ++- harbour/website/faq/harbour52.html | 57 ++- harbour/website/faq/harbour53.html | 55 ++- harbour/website/faq/harbour54.html | 47 ++- harbour/website/faq/harbour55.html | 63 ++- harbour/website/faq/harbour56.html | 67 ++- harbour/website/faq/harbour57.html | 73 ++-- harbour/website/faq/harbour58.html | 53 ++- harbour/website/faq/harbour59.html | 49 ++- harbour/website/faq/harbour6.html | 67 ++- harbour/website/faq/harbour60.html | 55 ++- harbour/website/faq/harbour61.html | 47 ++- harbour/website/faq/harbour62.html | 55 ++- harbour/website/faq/harbour63.html | 135 +++---- harbour/website/faq/harbour7.html | 59 ++- harbour/website/faq/harbour8.html | 51 ++- harbour/website/faq/harbour9.html | 49 ++- harbour/website/faq/harbour_toc.html | 195 +++++---- harbour/website/faq/index.html | 183 +++++---- .../website/samples/HowToBuildOnLinux.html | 2 +- harbour/website/samples/function.cfm.html | 71 ---- harbour/website/third-party.html | 8 +- 105 files changed, 2512 insertions(+), 2644 deletions(-) delete mode 100644 harbour/tests/function.cfm delete mode 100644 harbour/website/samples/function.cfm.html diff --git a/harbour/.gitattributes b/harbour/.gitattributes index 475fc4ca92..3154505ab3 100644 --- a/harbour/.gitattributes +++ b/harbour/.gitattributes @@ -7,7 +7,6 @@ *.bas text *.c text *.cfg text -*.cfm text *.ch text *.css text *.def text diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index e454edacbc..334c5d5753 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,13 +10,54 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-01-24 15:14 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.prg + + links to markdown and markdown to man-page converter tool + ! minor cleanup to prev + + * utils/hbmk2/hbmk2.1 + * some updates + + * ChangeLog.txt + ! typos/updates in previous entry + + * extras/hbdoc/*.prg + * src/rtl/memoedit.prg + * tests/clasinh.prg + * tests/classch.prg + * tests/inhprob.prg + ! updated for new ::super: syntax + + * src/rtl/itemseri.c + ! fixed typo in latest modification: + 'warning: use of unary operator that may be intended as compound assignment (+=)' + + * contrib/hbgd/tests/test_out.prg + * contrib/hbhttpd/* + * contrib/hbtip/thtml.prg + * contrib/xhb/*.prg + * extras/httpsrv/* + * extras/guestbk/* + * website/faq/*.html + * website/samples/HowToBuildOnLinux.html + * website/third-party.html + * some steps to modernize old HTML + + * extras/hbdoc/*.prg + * do not use [] as string delimiter + + - tests/function.cfm + - website/samples/function.cfm.html + * .gitattributes + - obsolete file deleted + 2013-01-23 17:14 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg * utils/hbmk2/*.po + added '-warn=yes' option in sync with warn= .hbc directive * cleaned help for -cpp and -cpp= options * '-inc' option moved to short help page and clarified a little - - deprecated several hbmk2 options synonyms. After this + - deprecated several hbmk2 option synonyms. After this update, hbmk2 will issue a warning with the recommended replacement switch (and exact location where it has found it), and these will ultimately disappear with @@ -24,7 +65,7 @@ on how disrupting it is or how long the new release will take): -compiler= -> -comp= - -platform -> -plat= + -platform= -> -plat= -mwindows -> -gui -mconsole -> -std -nodebug -> -debug- @@ -38,11 +79,14 @@ -nohbcppmm -> -hbcppmm- -nostrip -> -strip- -warn= (value omitted) -> -warn=yes + -warn= -> -warn=yes -nowarn -> -warn- -compr= (value omitted) -> -compr=yes + -compr= -> -compr=yes -compr=def -> -compr=yes -nocompr -> -compr- -head= (value omitted) -> -head=full + -head= -> -head=full -head -> -head=full -head- -> -head=off -nohead -> -head=off diff --git a/harbour/contrib/hbgd/tests/test_out.prg b/harbour/contrib/hbgd/tests/test_out.prg index 738fdca5bd..8f10a4476b 100644 --- a/harbour/contrib/hbgd/tests/test_out.prg +++ b/harbour/contrib/hbgd/tests/test_out.prg @@ -77,29 +77,29 @@ PROCEDURE Main( ... ) ELSEIF cPhoto != NIL StartHTML() #if 0 - OutHTML ValToPrg( hParams ) + "
" - OutHTML ValToPrg( cParams ) + "
" - OutHTML ValToPrg( cQuery ) + "
" - OutHTML "" + "
" + OutHTML ValToPrg( hParams ) + "
" + OutHTML ValToPrg( cParams ) + "
" + OutHTML ValToPrg( cQuery ) + "
" + OutHTML "" + "
" #endif OutHTML "" OutHTML "" OutHTML "" OutHTML "" OutHTML "
" - OutHTML "" + "
" + OutHTML "" + "
" OutHTML "
" OutHTML "" + "
" + "'>" + "
" OutHTML "
" OutHTML cPhoto OutHTML "
" - OutHTML "
" + OutHTML "
" #if 0 - OutHTML "" + "
" - OutHTML OS() + "
" + OutHTML "" + "
" + OutHTML OS() + "
" #endif EndHTML() ELSE diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/account.tpl b/harbour/contrib/hbhttpd/tests/tpl/app/account.tpl index e49d6f603d..b2acb35473 100644 --- a/harbour/contrib/hbhttpd/tests/tpl/app/account.tpl +++ b/harbour/contrib/hbhttpd/tests/tpl/app/account.tpl @@ -1,7 +1,7 @@ {{extend _main}} Shopping | Cart | Logout
-

My account

+

My account

{{if errtext}}{{= errtext}}

{{endif}} diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/cart.tpl b/harbour/contrib/hbhttpd/tests/tpl/app/cart.tpl index 9515ff78e0..8a556ebbb8 100644 --- a/harbour/contrib/hbhttpd/tests/tpl/app/cart.tpl +++ b/harbour/contrib/hbhttpd/tests/tpl/app/cart.tpl @@ -1,8 +1,7 @@ {{extend _main}} Shopping | My account | Logout
-

Cart

+

Cart

Your cart is worth: {{= cartsum}}

{{: browse}} - diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/register.tpl b/harbour/contrib/hbhttpd/tests/tpl/app/register.tpl index b5d0b4f10a..5c11910b99 100644 --- a/harbour/contrib/hbhttpd/tests/tpl/app/register.tpl +++ b/harbour/contrib/hbhttpd/tests/tpl/app/register.tpl @@ -1,7 +1,7 @@ {{extend _main}} Login

-

Create new account

+

Create new account

{{if errtext}}{{= errtext}}

{{endif}}

User name{{= user}}
diff --git a/harbour/contrib/hbhttpd/tests/tpl/app/shopping.tpl b/harbour/contrib/hbhttpd/tests/tpl/app/shopping.tpl index 4d69284743..d510a3fe45 100644 --- a/harbour/contrib/hbhttpd/tests/tpl/app/shopping.tpl +++ b/harbour/contrib/hbhttpd/tests/tpl/app/shopping.tpl @@ -1,8 +1,7 @@ {{extend _main}} Cart | My account | Logout
-

Shopping

+

Shopping

Your cart is worth: {{= cartsum}}

{{: browse}} - diff --git a/harbour/contrib/hbhttpd/widgets.prg b/harbour/contrib/hbhttpd/widgets.prg index 7198fedb14..fdabe34a93 100644 --- a/harbour/contrib/hbhttpd/widgets.prg +++ b/harbour/contrib/hbhttpd/widgets.prg @@ -418,7 +418,7 @@ METHOD Output() CLASS UWBrowse cUrl := Left( cUrl, nI - 1 ) ENDIF cUrl += iif( "?" $ cUrl, "&", "?" ) + "_pos=" - cRet := '
' + cRet + cRet := '
' + cRet IF ! Eof() cI := cUrl + hb_ntos( Self:nPos + Self:nPageSize ) cRet := '>>' + cRet diff --git a/harbour/contrib/hbtip/thtml.prg b/harbour/contrib/hbtip/thtml.prg index 86450f1189..6c2835938a 100644 --- a/harbour/contrib/hbtip/thtml.prg +++ b/harbour/contrib/hbtip/thtml.prg @@ -701,7 +701,7 @@ METHOD isOptional() CLASS THtmlNode RETURN hb_bitAnd( ::htmlTagType[ 2 ], CM_OPT ) > 0 -// checks if this is a node (leafs contain no further nodes, e.g.
,

,_text_) +// checks if this is a node (leafs contain no further nodes, e.g.
,
,_text_) METHOD isNode() CLASS THtmlNode diff --git a/harbour/contrib/xhb/hjwindow.prg b/harbour/contrib/xhb/hjwindow.prg index e0db54b33a..d85aa8e9b7 100644 --- a/harbour/contrib/xhb/hjwindow.prg +++ b/harbour/contrib/xhb/hjwindow.prg @@ -89,17 +89,17 @@ CREATE CLASS TJSWindow METHOD Write( c ) - METHOD lineBreak() INLINE ::QOut( "
" ) + METHOD lineBreak() INLINE ::QOut( "
" ) - METHOD Paragraph() INLINE ::QOut( "

" ) + METHOD Paragraph() INLINE ::QOut( "

" ) - METHOD Center( l ) INLINE ::QOut( iif( l, "
", "
" ) ) + METHOD Center( l ) INLINE ::QOut( iif( l, "
", "
" ) ) - METHOD bold( l ) INLINE ::QOut( iif( l, "", "" ) ) + METHOD bold( l ) INLINE ::QOut( iif( l, "", "" ) ) - METHOD Italic( l ) INLINE ::QOut( iif( l, "", "" ) ) + METHOD Italic( l ) INLINE ::QOut( iif( l, "", "" ) ) - METHOD ULine( l ) INLINE ::QOut( iif( l, "", "" ) ) + METHOD ULine( l ) INLINE ::QOut( iif( l, "", "" ) ) METHOD Put() @@ -348,33 +348,33 @@ METHOD Begin() CLASS TJSWindow LOCAL i - FWrite( ::nH, "" + CRLF() ) + FWrite( ::nH, "" + crlf() ) RETURN Self @@ -411,7 +411,7 @@ METHOD Begin() CLASS TJSWindow METHOD End() CLASS TJSWindow - HtmlJSCmd( ::nH, ::varName + ".document.write('')" + CRLF() ) + HtmlJSCmd( ::nH, ::varName + ".document.write('')" + CRLF() ) RETURN Self @@ -430,18 +430,18 @@ METHOD ImageURL( cImage, cUrl, nHeight, nBorder, ; __defaultNIL( @cUrl, "" ) IF cName != NIL - cStr += ' NAME= "' + cName + '"' + CRLF() + cStr += ' name= "' + cName + '"' + CRLF() ENDIF IF cAlt != NIL - cStr += ' ALT= "' + cAlt + '"' + CRLF() + cStr += ' alt= "' + cAlt + '"' + CRLF() ENDIF IF nBorder != NIL - cStr += " BORDER = " + hb_ntos( nBorder ) + CRLF() + cStr += " border= " + hb_ntos( nBorder ) + CRLF() ENDIF IF nHeight != NIL - cStr += " HEIGHT = " + hb_ntos( nHeight ) + "% " + CRLF() + cStr += " height= " + hb_ntos( nHeight ) + "% " + CRLF() ENDIF IF cOnClick != NIL @@ -455,11 +455,11 @@ METHOD ImageURL( cImage, cUrl, nHeight, nBorder, ; ENDIF IF cURL != NIL - ::QOut( '' ) + ::QOut( '' ) ELSE - ::QOut( '' ) + ::QOut( '' ) ENDIF RETURN Self diff --git a/harbour/contrib/xhb/hterrsys.prg b/harbour/contrib/xhb/hterrsys.prg index 5448594db5..2acbb22136 100644 --- a/harbour/contrib/xhb/hterrsys.prg +++ b/harbour/contrib/xhb/hterrsys.prg @@ -47,7 +47,7 @@ #include "error.ch" #include "cgi.ch" -#define DEF_ERR_HEADER "Date : " + DToC( Date() ) + "
" + "Time : " + Time() + "
" +#define DEF_ERR_HEADER "Date : " + DToC( Date() ) + "
" + "Time : " + Time() + "
" // put messages to STDERR #command ? => ?? Chr( 13 ) + Chr( 10 ) ; ?? @@ -114,64 +114,64 @@ STATIC FUNCTION xhb_cgi_DefError( e ) // RESET System // - cErrString := CRLF() + "
" + CRLF() - cErrString += '' + cErrString := CRLF() + "
" + CRLF() + cErrString += '' - cErrString += '" + cErrString += '" - cErrString += '" + cErrString += "" - cErrString += '' - cErrString += '' + cErrString += '' - cErrString += '' + cErrString += '" + CRLF() + "" + CRLF() + "
' - cErrstring += '' + CRLF() - cErrString += "ERROR REPORT" - cErrString += "
' + cErrstring += '' + CRLF() + cErrString += "ERROR REPORT" + cErrString += "
' - cErrstring += '' + CRLF() + cErrString += '
' + cErrstring += '' + CRLF() cErrString += DEF_ERR_HEADER - cErrString += "
' - cErrstring += '' + CRLF() - cErrString += '' + cMessage + '' + cErrString += '
' + cErrstring += '' + CRLF() + cErrString += '' + cMessage + '' - cErrString += '
' + CRLF() - cErrstring += '' + CRLF() - cErrString += "ERRORCODE...... :" + hb_ntos( e:GenCode ) + "
" + CRLF() - cErrString += "SUBSYSTEM..... :" + e:SubSystem + "
" + CRLF() - cErrString += "DESCRIPTION...:" + e:Description + "
" + CRLF() - cErrString += "OPERATION......:" + e:Operation + "
" + CRLF() - cErrString += "FILENAME........ :" + e:FileName + "
" + CRLF() + cErrString += '
' + CRLF() + cErrstring += '' + CRLF() + cErrString += "ERRORCODE...... :" + hb_ntos( e:GenCode ) + "
" + CRLF() + cErrString += "SUBSYSTEM..... :" + e:SubSystem + "
" + CRLF() + cErrString += "DESCRIPTION...:" + e:Description + "
" + CRLF() + cErrString += "OPERATION......:" + e:Operation + "
" + CRLF() + cErrString += "FILENAME........ :" + e:FileName + "
" + CRLF() cErrString += "TRIES............. :" + hb_ntos( e:Tries ) + CRLF() - cErrString += '
' - cErrstring += '' + CRLF() - cErrstring += '' + cErrString += '
' + cErrstring += '' + CRLF() + cErrstring += '' i := 2 DO WHILE ! Empty( ProcName( i ) ) cErrString += "Called from " + RTrim( ProcName( i ) ) + ; - "(" + hb_ntos( ProcLine( i ) ) + ")
" + CRLF() + "(" + hb_ntos( ProcLine( i ) ) + ")
" + CRLF() i++ ENDDO - cErrstring += '' - cErrString += '
' - cErrstring += '' + CRLF() + cErrstring += '' + cErrString += '
' + cErrstring += '' + CRLF() cErrstring += "Extra Notes..." - cErrString += "
" + CRLF() - FWrite( nH, "
" + cErrString + CRLF() ) + cErrString += "" + CRLF() + "" + CRLF() + "" + CRLF() + FWrite( nH, "
" + cErrString + CRLF() ) MemoWrit( "Error.Log", HardCR( cErrString ) + CRLF() + ; HardCR( MemoRead( "Error.Log" ) ) ) - FWrite( nH, "" + CRLF() + "" + CRLF() + "" + CRLF() ) + FWrite( nH, "" + CRLF() + "" + CRLF() + "" + CRLF() ) HtmlJSCmd( nH, 'Alert("There was an error processing your request:\n' + ; 'Look at the bottom of this page for\n' + ; 'error description and parameters...");' ) - FWrite( nH, "" + CRLF() + "" + CRLF() ) + FWrite( nH, "" + CRLF() + "" + CRLF() ) CLOSE ALL @@ -223,7 +223,7 @@ STATIC FUNCTION ErrorMessage( e ) // add error description if available IF HB_ISSTRING( e:description ) - cMessage += "
" + e:description + cMessage += "
" + e:description ENDIF // add either filename or operation diff --git a/harbour/contrib/xhb/htjlist.prg b/harbour/contrib/xhb/htjlist.prg index 4e64892a86..75cd086d89 100644 --- a/harbour/contrib/xhb/htjlist.prg +++ b/harbour/contrib/xhb/htjlist.prg @@ -116,13 +116,13 @@ METHOD New( name, lOpen, width, height, bgColor, ; ::nItems := 0 ::aSCript := {} - cStr := "" + CRLF() + "" + CRLF() + ; - "" + CRLF() + ; - '' + CRLF() + ; + cStr := "" + CRLF() + "" + CRLF() + ; + "" + CRLF() + ; + '' + CRLF() + ; CRLF() + ; - '' + CRLF() + ; + '' + CRLF() + ; CRLF() + ; - '" + CRLF() - cStr += '" + CRLF() - cStr += '" + CRLF() + cStr += '" + CRLF() + cStr += "" + CRLF() AAdd( ::aScript, cStr ) cStr := "" - cStr += "Collapsable Lists: Basic Example" + CRLF() - cStr += "" + CRLF() - cStr += '' + CRLF() - cStr += '

' + CRLF() + cStr += "Collapsable Lists: Basic Example" + CRLF() + cStr += "" + CRLF() + cStr += '' + CRLF() + cStr += '
' + CRLF() #if 0 - cStr += '
' + CRLF() + cStr += '
' + CRLF() #endif FOR i := 0 TO ::nItems - cStr += '
' + CRLF() + cStr += '
' + CRLF() NEXT - cStr += "" + CRLF() + cStr += "" + CRLF() AAdd( ::aScript, cStr ) diff --git a/harbour/contrib/xhb/htmlform.ch b/harbour/contrib/xhb/htmlform.ch index 65b477ddfc..82fb40b677 100644 --- a/harbour/contrib/xhb/htmlform.ch +++ b/harbour/contrib/xhb/htmlform.ch @@ -221,12 +221,12 @@ #xcommand LINE BREAK ; IN ; => ; - :AddControl( "
" + CRLF() ) + :AddControl( "
" + CRLF() ) #xcommand LINE IN ; => ; - :AddControl( CRLF() + "
" + CRLF() ) + :AddControl( CRLF() + "
" + CRLF() ) #xcommand SPACE IN ; => ; @@ -243,10 +243,10 @@ #xcommand START GROUP IN => ; - :AddControl( CRLF() + "
" + + "" + CRLF() ) + :AddControl( CRLF() + "
" + + "" + CRLF() ) #xcommand END GROUP IN => ; - :AddControl( CRLF() + "
" + CRLF() ) + :AddControl( CRLF() + "
" + CRLF() ) #xtranslate __TYPE__ => "TEXT" diff --git a/harbour/contrib/xhb/htmutil.prg b/harbour/contrib/xhb/htmutil.prg index 396d496002..124fbd6aad 100644 --- a/harbour/contrib/xhb/htmutil.prg +++ b/harbour/contrib/xhb/htmutil.prg @@ -165,7 +165,7 @@ PROCEDURE HtmlBrowse( oHtm, cAction, lUseLinks ) oHtm:defineTable( 1, 1, 98 ) oHtm:newTableRow( "black" ) oHtm:newTableCell(,,, 3, "white" ) - oHtm:Write( htmlSpace( 5 ) + "Browsing Table: " + Alias() + "" ) + oHtm:Write( htmlSpace( 5 ) + "Browsing Table: " + Alias() + "" ) oHtm:endTableCell() oHtm:endTableRow( "black" ) oHtm:endTable() @@ -238,7 +238,7 @@ PROCEDURE htmlBrowseSql( oHtm, cAction, lUseLinks, cTarget, oServer, oQuery ) oHtm:defineTable( 1, 1, 98 ) oHtm:newTableRow( "black" ) oHtm:newTableCell(,,, 3, "white" ) - oHtm:Write( htmlSpace( 5 ) + "Browsing Table: " + Alias() + "" ) + oHtm:Write( htmlSpace( 5 ) + "Browsing Table: " + Alias() + "" ) oHtm:endTableCell() oHtm:endTableRow( "black" ) oHtm:endTable() @@ -342,17 +342,17 @@ CREATE CLASS JWindow METHOD Write( c ) - METHOD lineBreak() INLINE ::QOut( "
" ) + METHOD lineBreak() INLINE ::QOut( "
" ) - METHOD Paragraph() INLINE ::QOut( "

" ) + METHOD Paragraph() INLINE ::QOut( "

" ) - METHOD Center( l ) INLINE ::QOut( iif( l, "
", "
" ) ) + METHOD Center( l ) INLINE ::QOut( iif( l, "
", "
" ) ) - METHOD bold( l ) INLINE ::QOut( iif( l, "", "" ) ) + METHOD bold( l ) INLINE ::QOut( iif( l, "", "" ) ) - METHOD Italic( l ) INLINE ::QOut( iif( l, "", "" ) ) + METHOD Italic( l ) INLINE ::QOut( iif( l, "", "" ) ) - METHOD ULine( l ) INLINE ::QOut( iif( l, "", "" ) ) + METHOD ULine( l ) INLINE ::QOut( iif( l, "", "" ) ) METHOD Put() @@ -611,33 +611,33 @@ METHOD Begin() CLASS JWindow LOCAL i - FWrite( ::nH, "" + CRLF() ) + FWrite( ::nH, "" + CRLF() ) RETURN Self @@ -676,7 +676,7 @@ METHOD Begin() CLASS JWindow METHOD End() CLASS JWindow - HtmlJSCmd( ::nH, ::varName + ".document.write('')" + CRLF() ) + HtmlJSCmd( ::nH, ::varName + ".document.write('')" + CRLF() ) RETURN Self @@ -697,18 +697,18 @@ METHOD ImageURL( cImage, cUrl, nHeight, nBorder, ; __defaultNIL( @cUrl, "" ) IF cName != NIL - cStr += ' NAME= "' + cName + '"' + CRLF() + cStr += ' name= "' + cName + '"' + CRLF() ENDIF IF cAlt != NIL - cStr += ' ALT= "' + cAlt + '"' + CRLF() + cStr += ' alt= "' + cAlt + '"' + CRLF() ENDIF IF nBorder != NIL - cStr += " BORDER = " + hb_ntos( nBorder ) + CRLF() + cStr += " border= " + hb_ntos( nBorder ) + CRLF() ENDIF IF nHeight != NIL - cStr += " HEIGHT = " + hb_ntos( nHeight ) + "% " + CRLF() + cStr += " height= " + hb_ntos( nHeight ) + "% " + CRLF() ENDIF IF cOnClick != NIL @@ -722,11 +722,11 @@ METHOD ImageURL( cImage, cUrl, nHeight, nBorder, ; ENDIF IF cURL != NIL - ::QOut( '' ) + ::QOut( '' ) ELSE - ::QOut( '' ) + ::QOut( '' ) ENDIF RETURN Self diff --git a/harbour/contrib/xhb/tedit.prg b/harbour/contrib/xhb/tedit.prg index 0f60a22bc5..b840d888cd 100644 --- a/harbour/contrib/xhb/tedit.prg +++ b/harbour/contrib/xhb/tedit.prg @@ -199,9 +199,9 @@ METHOD Put() CLASS THtmlControl ::form := HtmlFormName() ::oHtm := HtmlPageObject() - ::cOutput += iif( ::lBreak, CRLF() + "
", CRLF() ) + ::cOutput += iif( ::lBreak, CRLF() + "
", CRLF() ) IF ::lLabel - ::cOutPut += CRLF() + "