From d50b2119a70567a790ff2641f9abee92d5fbbe09 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 22 Jul 2012 19:17:02 +0000 Subject: [PATCH] 2012-07-22 21:15 UTC+0200 Viktor Szakats (vszakats syenar.net) * contrib/hbnf/doc/en/clrsel.txt * contrib/hbnf/doc/en/kspeed.txt * contrib/hbnf/doc/en/mouse1.txt * contrib/hbnf/doc/en/mouse2.txt * contrib/xhb/htmutil.prg * contrib/xhb/ttable.prg * extras/gfspell/spell.prg * extras/hbvpdf/hbvpdf.prg * extras/hbvpdf/hbvpdft.prg * extras/hbxlsxml/xlsxml_y.prg * extras/httpsrv/cgifunc.prg * utils/hbtest/rt_misc.prg * contrib/hbnf/aredit.prg * contrib/hbnf/clrsel.prg * contrib/hbnf/dispmsg.prg * contrib/hbnf/menu1.prg * contrib/hbnf/mouse1.prg * contrib/hbnf/mouse2.prg * contrib/hbnf/pegs.prg * contrib/hbnf/popadder.prg * contrib/hbnf/tbwhile.prg ! further removing high 8-bit chars --- harbour/ChangeLog | 26 ++++++++- harbour/contrib/hbnf/aredit.prg | 6 +- harbour/contrib/hbnf/clrsel.prg | 20 +++---- harbour/contrib/hbnf/dispmsg.prg | 4 +- harbour/contrib/hbnf/doc/en/clrsel.txt | 6 +- harbour/contrib/hbnf/doc/en/kspeed.txt | 72 ++++++++++++------------ harbour/contrib/hbnf/doc/en/mouse1.txt | 12 ++-- harbour/contrib/hbnf/doc/en/mouse2.txt | 12 ++-- harbour/contrib/hbnf/menu1.prg | 12 ++-- harbour/contrib/hbnf/mouse1.prg | 2 +- harbour/contrib/hbnf/mouse2.prg | 2 +- harbour/contrib/hbnf/pegs.prg | 6 +- harbour/contrib/hbnf/popadder.prg | 34 ++++++------ harbour/contrib/hbnf/tbwhile.prg | 6 +- harbour/contrib/xhb/htmutil.prg | 76 ++++++++++++++++++++++++-- harbour/contrib/xhb/ttable.prg | 6 +- harbour/extras/gfspell/spell.prg | 2 +- harbour/extras/hbvpdf/hbvpdf.prg | 6 +- harbour/extras/hbvpdf/hbvpdft.prg | 6 +- harbour/extras/hbxlsxml/xlsxml_y.prg | 4 +- harbour/extras/httpsrv/cgifunc.prg | 24 ++++---- harbour/utils/hbtest/rt_misc.prg | 20 +++---- 22 files changed, 226 insertions(+), 138 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 38c499e66e..64ffd558da 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,30 @@ The license applies to all entries newer than 2009-04-28. */ +2012-07-22 21:15 UTC+0200 Viktor Szakats (vszakats syenar.net) + * contrib/hbnf/doc/en/clrsel.txt + * contrib/hbnf/doc/en/kspeed.txt + * contrib/hbnf/doc/en/mouse1.txt + * contrib/hbnf/doc/en/mouse2.txt + * contrib/xhb/htmutil.prg + * contrib/xhb/ttable.prg + * extras/gfspell/spell.prg + * extras/hbvpdf/hbvpdf.prg + * extras/hbvpdf/hbvpdft.prg + * extras/hbxlsxml/xlsxml_y.prg + * extras/httpsrv/cgifunc.prg + * utils/hbtest/rt_misc.prg + * contrib/hbnf/aredit.prg + * contrib/hbnf/clrsel.prg + * contrib/hbnf/dispmsg.prg + * contrib/hbnf/menu1.prg + * contrib/hbnf/mouse1.prg + * contrib/hbnf/mouse2.prg + * contrib/hbnf/pegs.prg + * contrib/hbnf/popadder.prg + * contrib/hbnf/tbwhile.prg + ! further removing high 8-bit chars + 2012-07-22 20:08 UTC+0200 Viktor Szakats (vszakats syenar.net) * include/hbapigt.h * tests/db_brows.prg @@ -44,7 +68,7 @@ * tests/testbrw.prg * tests/wcecon.prg ! fixing high 8-bit chars (using various methods) - (finished) + (finished. Except: hbnf, xhb, hbtest, most extras, utils) ; NOTE: Some sources have been converted to UTF-8, so from now on make sure to use an UTF-8 enabled editor and use only UTF-8 chars when typing diff --git a/harbour/contrib/hbnf/aredit.prg b/harbour/contrib/hbnf/aredit.prg index 59359dd557..8d1e41c6bf 100644 --- a/harbour/contrib/hbnf/aredit.prg +++ b/harbour/contrib/hbnf/aredit.prg @@ -43,9 +43,9 @@ #include "inkey.ch" * Default heading, column, footer separators -#define DEF_HSEP "" -#define DEF_CSEP " " -#define DEF_FSEP "" +#define DEF_HSEP hb_UTF8ToStr( "═╤═" ) +#define DEF_CSEP hb_UTF8ToStr( " │ " ) +#define DEF_FSEP hb_UTF8ToStr( "═╧═" ) * Default info for tb_methods section #define KEY_ELEM 1 diff --git a/harbour/contrib/hbnf/clrsel.prg b/harbour/contrib/hbnf/clrsel.prg index 11af60b408..8273514ccb 100644 --- a/harbour/contrib/hbnf/clrsel.prg +++ b/harbour/contrib/hbnf/clrsel.prg @@ -125,7 +125,7 @@ *.... a typical application might have the following different settings * normally these would be stored in a .dbf/.dbv aClrs := {; - { "Desktop", "N/BG", "D", "" }, ; + { "Desktop", "N/BG", "D", hb_UTF8ToStr( "▒" ) }, ; { "Title", "N/W", "T" }, ; { "Top Menu", "N/BG,N/W,W+/BG,W+/N,GR+/N", "M" }, ; { "Sub Menu", "W+/N*,GR+/N*,GR+/N*,W+/R,G+/R","M" }, ; @@ -299,7 +299,7 @@ DO WHILE .T. IF !( aOpt[ C_TYPE ] == "T" ) // no prompt for titles SETCOLOR( iif( lColour, "N/W,W+/R,,,N/W", "N/W,W+/N,,,N/W" ) ) Double( nT, nL+1, nB, nR-1 ) - @ nT, nL+2 SAY PadC( " "+ aOpt[C_NAME] +" ", nR -nL -3, "" ) + @ nT, nL+2 SAY PadC( " "+ aOpt[C_NAME] +" ", nR -nL -3, hb_UTF8ToStr( "═" ) ) FOR nX := 1 TO LEN( aPrompt ) @ nX+nT, nL+2 PROMPT PadR( aPrompt[nX], nR -nL -3 ) NEXT @@ -332,7 +332,7 @@ DO WHILE .T. *.... allow change to specific part of colour string IF !( aOpt[ C_TYPE ] == "T" ) Single( nT, nL+1, nB, nR-1 ) - @ nT, nL+2 SAY PadC( " "+ aOpt[C_NAME] +" ", nR -nL -3, "" ) + @ nT, nL+2 SAY PadC( " "+ aOpt[C_NAME] +" ", nR -nL -3, hb_UTF8ToStr( "─" ) ) ENDIF cClr := _ftClrSel( aClrPal, cClr, nChoice, aOpt ) // selection routine aClrs[ nChoice ] := cClr // put colour back in array @@ -397,7 +397,7 @@ DO CASE ClearS( 19, 41, 24, 66 ) Single( 19, 42, 24, 65 ) @ 20,43 SAY " Invoice Entry " - @ 21,42 SAY "Ĵ" + @ 21,42 SAY hb_UTF8ToStr( "├──────────────────────┤" ) @ 22,43 SAY " Amount " @ 23,43 SAY " Date " SETCOLOR( aClr[2] ) @@ -412,7 +412,7 @@ DO CASE @ 19,42 SAY " " @ 20,42 SAY " Test Message " @ 21,42 SAY " " - @ 22,41 SAY "Ĵ" + @ 22,41 SAY hb_UTF8ToStr( "├───────────────────────┤" ) SETCOLOR( aClr[2] ) @ 23,44 SAY " Accept " SETCOLOR( aClr[5] ) @@ -423,12 +423,12 @@ DO CASE ClearS( 18, 37, 24, 70 ) Single( 18, 38, 24, 69 ) @ 19,39 SAY " Cust Name Amount " - @ 20,38 SAY "͵" - @ 21,39 SAY " 312 Rick Shaw 143.25 " - @ 23,39 SAY " " - @ 24,38 SAY ";" + @ 20,38 SAY hb_UTF8ToStr( "╞══════╤══════════════╤════════╡" ) + @ 21,39 SAY hb_UTF8ToStr( " 312 │ Rick Shaw │ 143.25 " ) + @ 23,39 SAY hb_UTF8ToStr( " │ │ " ) + @ 24,38 SAY hb_UTF8ToStr( "╘══════╧══════════════╧════════╛" ) SETCOLOR( aClr[2] ) - @ 22,39 SAY " 1005 Harry Pitts 78.95 " + @ 22,39 SAY hb_UTF8ToStr( " 1005 │ Harry Pitts │ 78.95 " ) SETCOLOR( aClr[5] ) @ 23,39 SAY " 3162 " @ 23,46 SAY " Barb Wire " diff --git a/harbour/contrib/hbnf/dispmsg.prg b/harbour/contrib/hbnf/dispmsg.prg index 4a36a9eb3c..bce4dc80d5 100644 --- a/harbour/contrib/hbnf/dispmsg.prg +++ b/harbour/contrib/hbnf/dispmsg.prg @@ -159,9 +159,9 @@ FUNCTION FT_DispMsg( aInfo, cKey, nBoxTop, nBoxLeft, cnBoxString, lShadow ) // consistent with DISPBOX() IF cnBoxString == NIL .OR. cnBoxString == 2 - cnBoxString := "ͻȺ " + cnBoxString := hb_UTF8ToStr( "╔═╗║╝═╚║ " ) ELSEIF cnBoxString == 1 - cnBoxString := "Ŀ " + cnBoxString := hb_UTF8ToStr( "┌─┐│┘─└│ " ) ENDIF lShadow := iif( lShadow == NIL, .T., lShadow ) diff --git a/harbour/contrib/hbnf/doc/en/clrsel.txt b/harbour/contrib/hbnf/doc/en/clrsel.txt index 22ad7c9f75..0e673ff934 100644 --- a/harbour/contrib/hbnf/doc/en/clrsel.txt +++ b/harbour/contrib/hbnf/doc/en/clrsel.txt @@ -53,7 +53,7 @@ * a more appropriate test display. * * [4] cFillChar is the character (for desktop background only) - * Default is CHR(177) "" + * Default is CHR(177) "▒▒▒▒▒▒▒▒▒▒▒▒▒▒" * * * .T. use colour palette @@ -63,7 +63,7 @@ * * 2 Byte character string for colour test display * - * Default is the CHR(254)+CHR(254) "" + * Default is the CHR(254)+CHR(254) "■■" * * $RETURNS$ * An array identical to the one passed, with new selected colours @@ -85,7 +85,7 @@ * *.... a typical application might have the following different settings * * normally these would be stored in a .dbf/.dbv * aClrs := {; - * { "Desktop", "N/BG", "D", "" }, ; + * { "Desktop", "N/BG", "D", "▒" }, ; * { "Title", "N/W", "T" }, ; * { "Top Menu", "N/BG,N/W,W+/BG,W+/N,GR+/N", "M" }, ; * { "Sub Menu", "W+/N*,GR+/N*,GR+/N*,W+/R,G+/R","M" }, ; diff --git a/harbour/contrib/hbnf/doc/en/kspeed.txt b/harbour/contrib/hbnf/doc/en/kspeed.txt index c635b12c14..cbe5c76782 100644 --- a/harbour/contrib/hbnf/doc/en/kspeed.txt +++ b/harbour/contrib/hbnf/doc/en/kspeed.txt @@ -16,42 +16,42 @@ * * is the keyboard repeat rate. * - * Ŀ Ŀ - * nDelayTime DELAY RepeatRate SPEED - * Ĵ Ĵ - * 0 250ms 0 30.0cps - * 1 (default) 500ms 1 26.7cps - * 2 750ms 2 24.0cps - * 3 1000ms 3 21.8cps - * 4 20.0cps - * 5 18.5cps - * 6 17.1cps - * 7 16.0cps - * 8 15.0cps - * 9 13.3cps - * 10 12.0cps - * 11 10.9cps - * 12 (default) 10.0cps - * 13 9.2cps - * 14 8.6cps - * 15 8.0cps - * 16 7.5cps - * 17 6.7cps - * 18 6.0cps - * 19 5.5cps - * 20 5.0cps - * 21 4.6cps - * 22 4.3cps - * 23 4.0cps - * 24 3.7cps - * 25 3.3cps - * 26 3.0cps - * 27 2.7cps - * 28 2.5cps - * 29 2.3cps - * 30 2.1cps - * 31 2.0cps - * + * ┌───────────────────────┐ ┌────────────────────────┐ + * │ nDelayTime DELAY │ │ RepeatRate SPEED │ + * ├───────────────────────┤ ├────────────────────────┤ + * │ 0 250ms │ │ 0 30.0cps │ + * │ 1 (default) 500ms │ │ 1 26.7cps │ + * │ 2 750ms │ │ 2 24.0cps │ + * │ 3 1000ms │ │ 3 21.8cps │ + * └───────────────────────┘ │ 4 20.0cps │ + * │ 5 18.5cps │ + * │ 6 17.1cps │ + * │ 7 16.0cps │ + * │ 8 15.0cps │ + * │ 9 13.3cps │ + * │ 10 12.0cps │ + * │ 11 10.9cps │ + * │ 12 (default) 10.0cps │ + * │ 13 9.2cps │ + * │ 14 8.6cps │ + * │ 15 8.0cps │ + * │ 16 7.5cps │ + * │ 17 6.7cps │ + * │ 18 6.0cps │ + * │ 19 5.5cps │ + * │ 20 5.0cps │ + * │ 21 4.6cps │ + * │ 22 4.3cps │ + * │ 23 4.0cps │ + * │ 24 3.7cps │ + * │ 25 3.3cps │ + * │ 26 3.0cps │ + * │ 27 2.7cps │ + * │ 28 2.5cps │ + * │ 29 2.3cps │ + * │ 30 2.1cps │ + * │ 31 2.0cps │ + * └────────────────────────┘ * $RETURNS$ * NIL * $DESCRIPTION$ diff --git a/harbour/contrib/hbnf/doc/en/mouse1.txt b/harbour/contrib/hbnf/doc/en/mouse1.txt index 4af6c13ffc..c1d1482f7a 100644 --- a/harbour/contrib/hbnf/doc/en/mouse1.txt +++ b/harbour/contrib/hbnf/doc/en/mouse1.txt @@ -766,8 +766,8 @@ * intensity and forground and background colors. The mask is represented in * the diagram below: * - * Bit: 15 14 1211 10 87 0 - * Function:blink backgroundintensityforegroundcharacter + * Bit: │15 │14 12│11 │10 8│7 0│ + * Function:│blink │background│intensity│foreground│character│ * * Blinking and high intensity are on when the bit is 1. The background and * foreground indicate which colors are used for each. The software mouse @@ -777,10 +777,10 @@ * Thus to keep the character the same but invert the foreground and * background colors the following values would be used: * - * Bit: 15 14 1211 10 87 0 - * Function:blink backgroundintensityforegroundcharacter - * screen: 0 111 0 111 11111111 =30719 - * cursor: 0 111 0 111 00000000 =30464 + * Bit: │15 │14 12│11 │10 8│7 0│ + * Function:│blink │background│intensity│foreground│character│ + * screen: │ 0 │ 111 │ 0 │ 111 │11111111 │ =30719 + * cursor: │ 0 │ 111 │ 0 │ 111 │00000000 │ =30464 * * The hardware cursor is the text cursor provided by the video board. One * specifies the range of scan lines which are on using and diff --git a/harbour/contrib/hbnf/doc/en/mouse2.txt b/harbour/contrib/hbnf/doc/en/mouse2.txt index 9cba9b02b7..087e9a6c9e 100644 --- a/harbour/contrib/hbnf/doc/en/mouse2.txt +++ b/harbour/contrib/hbnf/doc/en/mouse2.txt @@ -512,8 +512,8 @@ * intensity and forground and background colors. The mask is represented in * the diagram below: * - * Bit: 15 14 1211 10 87 0 - * Function:blink backgroundintensityforegroundcharacter + * Bit: │15 │14 12│11 │10 8│7 0│ + * Function:│blink │background│intensity│foreground│character│ * * Blinking and high intensity are on when the bit is 1. The background and * foreground indicate which colors are used for each. The software mouse @@ -523,10 +523,10 @@ * Thus to keep the character the same but invert the foreground and * background colors the following values would be used: * - * Bit: 15 14 1211 10 87 0 - * Function:blink backgroundintensityforegroundcharacter - * screen: 0 111 0 111 11111111 =30719 - * cursor: 0 111 0 111 00000000 =30464 + * Bit: │15 │14 12│11 │10 8│7 0│ + * Function:│blink │background│intensity│foreground│character│ + * screen: │ 0 │ 111 │ 0 │ 111 │11111111 │ =30719 + * cursor: │ 0 │ 111 │ 0 │ 111 │00000000 │ =30464 * * The hardware cursor is the text cursor provided by the video board. One * specifies the range of scan lines which are on using and diff --git a/harbour/contrib/hbnf/menu1.prg b/harbour/contrib/hbnf/menu1.prg index 403c2fbe1c..ba84dfc55b 100644 --- a/harbour/contrib/hbnf/menu1.prg +++ b/harbour/contrib/hbnf/menu1.prg @@ -153,13 +153,13 @@ THREAD STATIC NHPOS, NVPOS, NMAXROW, NMAXCOL CLEAR SCREEN SETCOLOR( cNormN ) @ nMaxRow, 0 - @ nMaxRow, 0 SAY " FT_MENU1 1.0 " + @ nMaxRow, 0 SAY hb_UTF8ToStr( " FT_MENU1 1.0 │ " ) @ NMAXROW,16 SAY "WRITTEN BY PAUL FERRARA [76702,556] FOR NANFORUM.LIB" - @ NMAXROW,69 SAY " "+DTOC( DATE() ) + @ NMAXROW,69 SAY hb_UTF8ToStr( "│ " )+DTOC( DATE() ) SETCOLOR( cErrH ) - @ nMaxRow-11, 23, nMaxRow-3, 56 BOX "Ŀ " - @ nMaxRow- 9,23 SAY "Ĵ" + @ nMaxRow-11, 23, nMaxRow-3, 56 BOX hb_UTF8ToStr( "┌─┐│┘─└│ " ) + @ nMaxRow- 9,23 SAY hb_UTF8ToStr( "├────────────────────────────────┤" ) SETCOLOR( cErrN ) @ nMaxRow-10,33 SAY "Navigation Keys" @ nMaxRow- 8,25 SAY "LeftArrow RightArrow Alt-E" @@ -279,7 +279,7 @@ FUNCTION FT_MENU1( aBar, aOptions, aColors, nTopRow, lShadow ) FT_SHADOW( nTopRow+1, aBoxLoc[nHpos], LEN(aChoices[nHpos,1])+nTopRow+2, aBarWidth[nHpos]+3+aBoxLoc[nHpos] ) ENDIF SETCOLOR( cBorder ) - @ nTopRow+1, aBoxLoc[nHpos], LEN(aChoices[nHpos,1])+nTopRow+2, aBarWidth[nHpos]+3+aBoxLoc[nHpos] BOX "ͻȺ " + @ nTopRow+1, aBoxLoc[nHpos], LEN(aChoices[nHpos,1])+nTopRow+2, aBarWidth[nHpos]+3+aBoxLoc[nHpos] BOX "╔═╗║╝═╚║ " SETCOLOR( cBox +","+ cCurrent +",,,"+ cUnselec ) nVpos := ACHOICE( nTopRow+2, aBoxLoc[nHpos]+2, LEN(aChoices[nHpos,1])+nTopRow+2, aBarWidth[nHpos]+1+aBoxLoc[nHpos], aChoices[nHpos,1], aChoices[nHpos,3], "__ftAcUdf", aLastSel[nHpos]) DO CASE @@ -347,7 +347,7 @@ STATIC FUNCTION _ftBailOut( cBorder, cBox ) sOldScreen := SAVESCREEN(nMaxRow/2-1, 24, nMaxRow/2+2, 55) cOldColor := SETCOLOR( cBorder ) FT_SHADOW( nMaxRow/2-1, 24, nMaxRow/2+2, 55 ) - @ nMaxRow/2-1, 24, nMaxRow/2+2, 55 BOX "ͻȺ " + @ nMaxRow/2-1, 24, nMaxRow/2+2, 55 BOX hb_UTF8ToStr( "╔═╗║╝═╚║ " ) SETCOLOR( cBox ) @ nMaxRow/2, 26 SAY "Press ESCape To Confirm Exit" @ nMaxRow/2+1,27 SAY "Or Any Other Key To Resume" diff --git a/harbour/contrib/hbnf/mouse1.prg b/harbour/contrib/hbnf/mouse1.prg index 7233981db2..f18f734cbb 100644 --- a/harbour/contrib/hbnf/mouse1.prg +++ b/harbour/contrib/hbnf/mouse1.prg @@ -40,7 +40,7 @@ THREAD static s_lMinit:=.F. * ..... Set up the screen cSavClr := setcolor( "w/n" ) - @ 0,0,maxrow(),maxcol() box "" + @ 0,0,maxrow(),maxcol() box hb_UTF8ToStr( "░░░░░░░░░" ) setcolor( "GR+/RB" ) // scroll( 7,2,19,63,0 ) diff --git a/harbour/contrib/hbnf/mouse2.prg b/harbour/contrib/hbnf/mouse2.prg index 0cb8e4fd1c..68e4378eec 100644 --- a/harbour/contrib/hbnf/mouse2.prg +++ b/harbour/contrib/hbnf/mouse2.prg @@ -111,7 +111,7 @@ THREAD static lMinit:=.F. * ..... Set up the screen cSavClr := setcolor( "w/n" ) - @ 0,0,maxrow(),maxcol() box "" + @ 0,0,maxrow(),maxcol() box hb_UTF8ToStr( "░░░░░░░░░" ) setcolor( "GR+/RB" ) scroll( 7,2,19,63,0 ) diff --git a/harbour/contrib/hbnf/pegs.prg b/harbour/contrib/hbnf/pegs.prg index 616c17c907..db756e90b9 100644 --- a/harbour/contrib/hbnf/pegs.prg +++ b/harbour/contrib/hbnf/pegs.prg @@ -33,9 +33,9 @@ #include "setcurs.ch" #translate SINGLEBOX(, , , ) => ; - @ , , , BOX "Ŀ " + @ , , , BOX hb_UTF8ToStr( "┌─┐│┘─└│ " ) #translate DOUBLEBOX(, , , ) => ; - @ , , , BOX 'ͻȺ ' + @ , , , BOX hb_UTF8ToStr( '╔═╗║╝═╚║ ' ) memvar getlist /* @@ -160,7 +160,7 @@ return NIL static function DrawBox(nelement) setcolor(iif(board_[nelement][4], '+w/rb', 'w/n')) @ board_[nelement][1,1], board_[nelement][1,2], board_[nelement][1,3], ; - board_[nelement][1,4] box "Ŀ " + board_[nelement][1,4] box hb_UTF8ToStr( "┌─┐│┘─└│ " ) DevPos(board_[nelement][1,1] + 1, board_[nelement][1,2] + 2) DevOut(ltrim(str(nelement))) return NIL diff --git a/harbour/contrib/hbnf/popadder.prg b/harbour/contrib/hbnf/popadder.prg index 4639d7c692..a06882b4aa 100644 --- a/harbour/contrib/hbnf/popadder.prg +++ b/harbour/contrib/hbnf/popadder.prg @@ -61,7 +61,7 @@ #define K_MULTIPLY 42 #define K_DIVIDE 47 #define K_ZERO 48 -#define B_DOUBLE "ͻȺ " +#define B_DOUBLE "╔═╗║╝═╚║ " #define B_SINGLE "+-+|+-+| " #define CRLF CHR(13)+CHR(10) @@ -367,21 +367,21 @@ STATIC FUNCTION _ftAddScreen(aAdder) _ftPushWin(2+nTopOS,2+nAddSpace,22+nTopOS,30+nAddSpace," Adder ", ; " for Help",,B_DOUBLE) nCol := 5+nAddSpace - @ 7+nTopOS, nCol SAY ' Ŀ Ŀ Ŀ' - @ 8+nTopOS, nCol SAY ' ' - @ 9+nTopOS, nCol SAY ' ' - @ 10+nTopOS, nCol SAY 'Ŀ Ŀ Ŀ Ŀ' - @ 11+nTopOS, nCol SAY ' ' - @ 12+nTopOS, nCol SAY ' ' - @ 13+nTopOS, nCol SAY 'Ŀ Ŀ Ŀ ' - @ 14+nTopOS, nCol SAY ' ' - @ 15+nTopOS, nCol SAY ' ' - @ 16+nTopOS, nCol SAY 'Ŀ Ŀ Ŀ Ŀ' - @ 17+nTopOS, nCol SAY ' ' - @ 18+nTopOS, nCol SAY ' ' - @ 19+nTopOS, nCol SAY 'Ŀ Ŀ ' - @ 20+nTopOS, nCol SAY ' ' - @ 21+nTopOS, nCol SAY ' ' + @ 7+nTopOS, nCol SAY hb_UTF8ToStr( ' ┌───┐ ┌───┐ ┌───┐' ) + @ 8+nTopOS, nCol SAY hb_UTF8ToStr( ' │ │ │ │ │ │' ) + @ 9+nTopOS, nCol SAY hb_UTF8ToStr( ' └───┘ └───┘ └───┘' ) + @ 10+nTopOS, nCol SAY hb_UTF8ToStr( '┌───┐ ┌───┐ ┌───┐ ┌───┐' ) + @ 11+nTopOS, nCol SAY hb_UTF8ToStr( '│ │ │ │ │ │ │ │' ) + @ 12+nTopOS, nCol SAY hb_UTF8ToStr( '└───┘ └───┘ └───┘ │ │' ) + @ 13+nTopOS, nCol SAY hb_UTF8ToStr( '┌───┐ ┌───┐ ┌───┐ │ │' ) + @ 14+nTopOS, nCol SAY hb_UTF8ToStr( '│ │ │ │ │ │ │ │' ) + @ 15+nTopOS, nCol SAY hb_UTF8ToStr( '└───┘ └───┘ └───┘ └───┘' ) + @ 16+nTopOS, nCol SAY hb_UTF8ToStr( '┌───┐ ┌───┐ ┌───┐ ┌───┐' ) + @ 17+nTopOS, nCol SAY hb_UTF8ToStr( '│ │ │ │ │ │ │ │' ) + @ 18+nTopOS, nCol SAY hb_UTF8ToStr( '└───┘ └───┘ └───┘ │ │' ) + @ 19+nTopOS, nCol SAY hb_UTF8ToStr( '┌─────────┐ ┌───┐ │ │' ) + @ 20+nTopOS, nCol SAY hb_UTF8ToStr( '│ │ │ │ │ │' ) + @ 21+nTopOS, nCol SAY hb_UTF8ToStr( '└─────────┘ └───┘ └───┘' ) _ftSetWinColor(W_CURR,W_TITLE) nCol := 7+nAddSpace @ 11+nTopOS, nCol SAY "7" @@ -777,7 +777,7 @@ STATIC FUNCTION _ftAddHelp " ove - the Adder from right to left" +CRLF+; " ape - turn Tape Display On or Off" +CRLF+; " croll - the tape display" + CRLF +CRLF+; - " ----- 1st Clear entry" +CRLF+; + " ---┬-- 1st Clear entry" +CRLF+; " +-- 2nd Clear ADDER" +CRLF+; " - Quit" +CRLF+; " - return a to the active get" diff --git a/harbour/contrib/hbnf/tbwhile.prg b/harbour/contrib/hbnf/tbwhile.prg index 9888906e3b..2767520ffa 100644 --- a/harbour/contrib/hbnf/tbwhile.prg +++ b/harbour/contrib/hbnf/tbwhile.prg @@ -195,9 +195,9 @@ FUNCTION FT_BRWSWHL(aFields, bWhileCond, cKey, nFreeze, lSaveScrn, ; b := TBrowseDB(nTop, nLeft, nBottom, nRight) /* default heading and column separators */ - b:headSep := "" - b:colSep := " " - b:footSep := "" + b:headSep := hb_UTF8ToStr( "═╤═" ) + b:colSep := hb_UTF8ToStr( " │ " ) + b:footSep := hb_UTF8ToStr( "═╧═" ) /* add custom 'TbSkipWhil' (to handle passed condition) */ b:skipBlock := {|x| TbSkipWhil(x, bWhileCond)} diff --git a/harbour/contrib/xhb/htmutil.prg b/harbour/contrib/xhb/htmutil.prg index 67851a1095..a14813f6b2 100644 --- a/harbour/contrib/xhb/htmutil.prg +++ b/harbour/contrib/xhb/htmutil.prg @@ -725,9 +725,73 @@ RETURN Self #define GREEK_ALPHABET {; -"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ; // A- - "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ; // - - "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" ; // - + Chr( 193 ), ; + Chr( 194 ), ; + Chr( 195 ), ; + Chr( 196 ), ; + Chr( 197 ), ; + Chr( 198 ), ; + Chr( 199 ), ; + Chr( 200 ), ; + Chr( 201 ), ; + Chr( 202 ), ; + Chr( 203 ), ; + Chr( 204 ), ; + Chr( 205 ), ; + Chr( 206 ), ; + Chr( 207 ), ; + Chr( 208 ), ; + Chr( 209 ), ; + Chr( 211 ), ; + Chr( 212 ), ; + Chr( 213 ), ; + Chr( 214 ), ; + Chr( 215 ), ; + Chr( 216 ), ; + Chr( 217 ), ; + Chr( 225 ), ; + Chr( 226 ), ; + Chr( 227 ), ; + Chr( 228 ), ; + Chr( 229 ), ; + Chr( 230 ), ; + Chr( 231 ), ; + Chr( 232 ), ; + Chr( 233 ), ; + Chr( 234 ), ; + Chr( 235 ), ; + Chr( 236 ), ; + Chr( 237 ), ; + Chr( 238 ), ; + Chr( 239 ), ; + Chr( 240 ), ; + Chr( 241 ), ; + Chr( 243 ), ; + Chr( 242 ), ; + Chr( 244 ), ; + Chr( 245 ), ; + Chr( 246 ), ; + Chr( 247 ), ; + Chr( 248 ), ; + Chr( 249 ), ; + Chr( 220 ), ; + Chr( 221 ), ; + Chr( 222 ), ; + Chr( 250 ), ; + Chr( 223 ), ; + Chr( 252 ), ; + Chr( 253 ), ; + Chr( 251 ), ; + Chr( 254 ), ; + Chr( 162 ), ; + Chr( 184 ), ; + Chr( 185 ), ; + Chr( 186 ), ; + Chr( 188 ), ; + Chr( 190 ), ; + Chr( 191 ), ; + Chr( 218 ), ; + Chr( 219 ) ; } /**** @@ -754,15 +818,15 @@ FUNCTION initGreek() n := 1 FOR i := 128 TO 175 aArr[ i ] := aGreek[ n ] - n ++ + n++ NEXT FOR i := 224 TO 240 aArr[ i ] := aGreek[ n ] - n ++ + n++ NEXT aArr[ 244 ] := aGreek[ n ] - n ++ + n++ aArr[ 245 ] := aGreek[ n ] RETURN aArr diff --git a/harbour/contrib/xhb/ttable.prg b/harbour/contrib/xhb/ttable.prg index 442d83856d..de5d67ca91 100644 --- a/harbour/contrib/xhb/ttable.prg +++ b/harbour/contrib/xhb/ttable.prg @@ -100,8 +100,8 @@ FUNCTION NetDbUse( cDataBase, cAlias, nSeconds, cDriver, ; DO WHILE ( lforever .or. nSeconds > 0 ) .and. LASTKEY() != K_ESC IF !lfirstPass DISPOUTAT( MAXROW(), 0, ; - PADC( "Network retry " + ; - LTRIM( STR( nSeconds, 4, 1 ) ) + " ESCape = Exit ", ; + PADC( "Network retry | " + ; + LTRIM( STR( nSeconds, 4, 1 ) ) + " | ESCape = Exit ", ; MAXCOL() + 1 ), ; scNetMsgColor ) lFirstPass := .F. @@ -208,7 +208,7 @@ FUNCTION NetLock( nType, lReleaseLocks, nSeconds ) ENDIF DISPOUTAT( MAXROW(), 0, ; - PADC( "Network Retry " + cWord + " " + STR( nSeconds, 3 ) + " ESC Exit", MAXCOL() + 1 ), ; + PADC( "Network Retry " + cWord + " | " + STR( nSeconds, 3 ) + " | ESC Exit", MAXCOL() + 1 ), ; scNetMsgColor ) nKey := INKEY( 1 ) //TONE( 1,1 ) diff --git a/harbour/extras/gfspell/spell.prg b/harbour/extras/gfspell/spell.prg index 840dd7da41..764544932c 100644 --- a/harbour/extras/gfspell/spell.prg +++ b/harbour/extras/gfspell/spell.prg @@ -1425,7 +1425,7 @@ for i := 1 to 26 cBuf := substr(cBuf,5) z := 1 do while !empty(cBuf) - if substr(cBuf,z,1)>="" + if substr(cBuf,z,1)>=Chr(128) cWord := substr(cBuf,1,z) append blank replace DICT->word with temp+ExtractWord(cWord) diff --git a/harbour/extras/hbvpdf/hbvpdf.prg b/harbour/extras/hbvpdf/hbvpdf.prg index 377bc3b861..5e586fa4b0 100644 --- a/harbour/extras/hbvpdf/hbvpdf.prg +++ b/harbour/extras/hbvpdf/hbvpdf.prg @@ -300,9 +300,9 @@ DEFAULT cColor to "" IF nBorder > 0 /* 1 - Ŀ - 4 2 - + +-----+ + 4 | | 2 + +-----+ 3 */ t_aReport[ PAGEBUFFER ] += CRLF + "0 g " + ltrim(str( y1 )) + " " + ltrim(str( t_aReport[ PAGEY ] - x1 )) + " " + ltrim(str( y2 - y1 )) + " -" + ltrim(str( nBorder )) + " re f" diff --git a/harbour/extras/hbvpdf/hbvpdft.prg b/harbour/extras/hbvpdf/hbvpdft.prg index 3758684d8d..6ecb92f8ac 100644 --- a/harbour/extras/hbvpdf/hbvpdft.prg +++ b/harbour/extras/hbvpdf/hbvpdft.prg @@ -447,9 +447,9 @@ DEFAULT cColor TO "" IF nBorder > 0 /* 1 - ----- - 4 2 - ----- + +-----+ + 4 | | 2 + +-----+ 3 */ ::aReport[ PAGEBUFFER ] += CRLF + "0 g " + ltrim(str( y1 )) + " " + ltrim(str( ::aReport[ PAGEY ] - x1 )) + " " + ltrim(str( y2 - y1 )) + " -" + ltrim(str( nBorder )) + " re f" diff --git a/harbour/extras/hbxlsxml/xlsxml_y.prg b/harbour/extras/hbxlsxml/xlsxml_y.prg index 206e37ea4a..468c73c073 100644 --- a/harbour/extras/hbxlsxml/xlsxml_y.prg +++ b/harbour/extras/hbxlsxml/xlsxml_y.prg @@ -533,10 +533,10 @@ METHOD ExcelWriterXML_Style:border( position,weight,color,linestyle ) position := 'All' // All, Left, Top, Right, Bottom, DiagonalLeft, DiagonalRight ENDIF IF weight == NIL - weight := '1' // 0Hairline, 1Thin, 2Medium, 3Thick + weight := '1' // 0-Hairline, 1-Thin, 2-Medium, 3-Thick ENDIF IF color == NIL - color := 'Automatic' // Automatic, 6-hexadecimal digit number IN "#rrggbb" format OR it can be any of the Microsoft Internet Explorer named colors + color := 'Automatic' // Automatic, 6-hexadecimal digit number IN "#rrggbb" format OR it can be any of the MS Internet Explorer named colors ENDIF IF linestyle == NIL linestyle := 'Continuous' // None, Continuous, Dash, Dot, DashDot, DashDotDot, SlantDashDot, Double diff --git a/harbour/extras/httpsrv/cgifunc.prg b/harbour/extras/httpsrv/cgifunc.prg index 2710d8090d..9fe71a80e0 100644 --- a/harbour/extras/httpsrv/cgifunc.prg +++ b/harbour/extras/httpsrv/cgifunc.prg @@ -531,7 +531,7 @@ FUNCTION uhttpd_HtmlEntities( cString, cQuote_style ) // { Chr( 165 ), '¥' } ,; // ¥ Yen sign // { Chr( 166 ), '¦' } ,; // ¦ or &brkbar; Broken vertical bar // { Chr( 167 ), '§' } ,; // § Section sign -// { Chr( 168 ), '¨' } ,; // ¨ or ¨ Diresis / Umlaut +// { Chr( 168 ), '¨' } ,; // ¨ or ¨ Diaeresis / Umlaut // { Chr( 169 ), '©' } ,; // © Copyright // { Chr( 170 ), 'ª' } ,; // ª Feminine ordinal // { Chr( 171 ), '«' } ,; // « Left angle quote, guillemet left @@ -559,31 +559,31 @@ FUNCTION uhttpd_HtmlEntities( cString, cQuote_style ) // { Chr( 193 ), 'Á' } ,; // Á Capital A, acute accent // { Chr( 194 ), 'Â' } ,; // Â Capital A, circumflex // { Chr( 195 ), 'Ã' } ,; // Ã Capital A, tilde -// { Chr( 196 ), 'Ä' } ,; // Ä Capital A, diresis / umlaut +// { Chr( 196 ), 'Ä' } ,; // Ä Capital A, diaeresis / umlaut // { Chr( 197 ), 'Å' } ,; // Å Capital A, ring // { Chr( 198 ), 'Æ' } ,; // Æ Capital AE ligature // { Chr( 199 ), 'Ç' } ,; // Ç Capital C, cedilla // { Chr( 200 ), 'È' } ,; // È Capital E, grave accent // { Chr( 201 ), 'É' } ,; // É Capital E, acute accent // { Chr( 202 ), 'Ê' } ,; // Ê Capital E, circumflex -// { Chr( 203 ), 'Ë' } ,; // Ë Capital E, diresis / umlaut +// { Chr( 203 ), 'Ë' } ,; // Ë Capital E, diaeresis / umlaut // { Chr( 204 ), 'Ì' } ,; // Ì Capital I, grave accent // { Chr( 205 ), 'Í' } ,; // Í Capital I, acute accent // { Chr( 206 ), 'Î' } ,; // Î Capital I, circumflex -// { Chr( 207 ), 'Ï' } ,; // Ï Capital I, diresis / umlaut +// { Chr( 207 ), 'Ï' } ,; // Ï Capital I, diaeresis / umlaut // { Chr( 208 ), 'Ð' } ,; // Ð Capital Eth, Icelandic // { Chr( 209 ), 'Ñ' } ,; // Ñ Capital N, tilde // { Chr( 210 ), 'Ò' } ,; // Ò Capital O, grave accent // { Chr( 211 ), 'Ó' } ,; // Ó Capital O, acute accent // { Chr( 212 ), 'Ô' } ,; // Ô Capital O, circumflex // { Chr( 213 ), 'Õ' } ,; // Õ Capital O, tilde -// { Chr( 214 ), 'Ö' } ,; // Ö Capital O, diresis / umlaut +// { Chr( 214 ), 'Ö' } ,; // Ö Capital O, diaeresis / umlaut // { Chr( 215 ), '×' } ,; // × Multiply sign // { Chr( 216 ), 'Ø' } ,; // Ø Capital O, slash // { Chr( 217 ), 'Ù' } ,; // Ù Capital U, grave accent // { Chr( 218 ), 'Ú' } ,; // Ú Capital U, acute accent // { Chr( 219 ), 'Û' } ,; // Û Capital U, circumflex -// { Chr( 220 ), 'Ü' } ,; // Ü Capital U, diresis / umlaut +// { Chr( 220 ), 'Ü' } ,; // Ü Capital U, diaeresis / umlaut // { Chr( 221 ), 'Ý' } ,; // Ý Capital Y, acute accent // { Chr( 222 ), 'Þ' } ,; // Þ Capital Thorn, Icelandic // { Chr( 223 ), 'ß' } ,; // ß Small sharp s, German sz @@ -591,34 +591,34 @@ FUNCTION uhttpd_HtmlEntities( cString, cQuote_style ) // { Chr( 225 ), 'á' } ,; // á Small a, acute accent // { Chr( 226 ), 'â' } ,; // â Small a, circumflex // { Chr( 227 ), 'ã' } ,; // ã Small a, tilde -// { Chr( 228 ), 'ä' } ,; // ä Small a, diresis / umlaut +// { Chr( 228 ), 'ä' } ,; // ä Small a, diaeresis / umlaut // { Chr( 229 ), 'å' } ,; // å Small a, ring // { Chr( 230 ), 'æ' } ,; // æ Small ae ligature // { Chr( 231 ), 'ç' } ,; // ç Small c, cedilla // { Chr( 232 ), 'è' } ,; // è Small e, grave accent // { Chr( 233 ), 'é' } ,; // é Small e, acute accent // { Chr( 234 ), 'ê' } ,; // ê Small e, circumflex -// { Chr( 235 ), 'ë' } ,; // ë Small e, diresis / umlaut +// { Chr( 235 ), 'ë' } ,; // ë Small e, diaeresis / umlaut // { Chr( 236 ), 'ì' } ,; // ì Small i, grave accent // { Chr( 237 ), 'í' } ,; // í Small i, acute accent // { Chr( 238 ), 'î' } ,; // î Small i, circumflex -// { Chr( 239 ), 'ï' } ,; // ï Small i, diresis / umlaut +// { Chr( 239 ), 'ï' } ,; // ï Small i, diaeresis / umlaut // { Chr( 240 ), 'ð' } ,; // ð Small eth, Icelandic // { Chr( 241 ), 'ñ' } ,; // ñ Small n, tilde // { Chr( 242 ), 'ò' } ,; // ò Small o, grave accent // { Chr( 243 ), 'ó' } ,; // ó Small o, acute accent // { Chr( 244 ), 'ô' } ,; // ô Small o, circumflex // { Chr( 245 ), 'õ' } ,; // õ Small o, tilde -// { Chr( 246 ), 'ö' } ,; // ö Small o, diresis / umlaut +// { Chr( 246 ), 'ö' } ,; // ö Small o, diaeresis / umlaut // { Chr( 247 ), '÷' } ,; // ÷ Division sign // { Chr( 248 ), 'ø' } ,; // ø Small o, slash // { Chr( 249 ), 'ù' } ,; // ù Small u, grave accent // { Chr( 250 ), 'ú' } ,; // ú Small u, acute accent // { Chr( 251 ), 'û' } ,; // û Small u, circumflex -// { Chr( 252 ), 'ü' } ,; // ü Small u, diresis / umlaut +// { Chr( 252 ), 'ü' } ,; // ü Small u, diaeresis / umlaut // { Chr( 253 ), 'ý' } ,; // ý Small y, acute accent // { Chr( 254 ), 'þ' } ,; // þ Small thorn, Icelandic -// { Chr( 255 ), 'ÿ' } ; // ÿ Small y, diresis / umlaut +// { Chr( 255 ), 'ÿ' } ; // ÿ Small y, diaeresis / umlaut // } LOCAL aTranslations := {} diff --git a/harbour/utils/hbtest/rt_misc.prg b/harbour/utils/hbtest/rt_misc.prg index 7b9a466e5b..3a0f6d1a12 100644 --- a/harbour/utils/hbtest/rt_misc.prg +++ b/harbour/utils/hbtest/rt_misc.prg @@ -534,12 +534,12 @@ PROCEDURE Main_MISC() TEST_LINE( Eval( NIL ) , "E 13 BASE 1004 No exported method (EVAL) OS:0 #:0 A:1:U:NIL F:S" ) TEST_LINE( Eval( 1 ) , "E 13 BASE 1004 No exported method (EVAL) OS:0 #:0 A:1:N:1 F:S" ) TEST_LINE( Eval( @sbBlock ) , "E 13 BASE 1004 No exported method (EVAL) OS:0 #:0 A:1:B:{||...} F:S" ) /* CA-Cl*pper returns "E 13 BASE 1004 No exported method (EVAL) OS:0 #:0 A:1:U:{||...} F:S" */ - TEST_LINE( Eval( {|p1| p1 },"A","B") , "A" ) - TEST_LINE( Eval( {|p1,p2| p1+p2 },"A","B") , "AB" ) + TEST_LINE( Eval( {| p1 | p1 },"A","B") , "A" ) + TEST_LINE( Eval( {| p1, p2 | p1 + p2 },"A","B"), "AB" ) #ifdef __HARBOUR__ - TEST_LINE( Eval( {|p1,p2,p3| HB_SYMBOL_UNUSED(p2), HB_SYMBOL_UNUSED(p3), p1 },"A","B") , "A" ) + TEST_LINE( Eval( {| p1, p2, p3 | HB_SYMBOL_UNUSED( p2 ), HB_SYMBOL_UNUSED( p3 ), p1 }, "A", "B" ), "A" ) #else - TEST_LINE( Eval( {|p1,p2,p3| p1 },"A","B") , "A" ) + TEST_LINE( Eval( {| p1, p2, p3 | p1 }, "A", "B" ) , "A" ) #endif TEST_LINE( suNIL:Eval() , "E 13 BASE 1004 No exported method (EVAL) OS:0 #:0 A:1:U:NIL F:S" ) TEST_LINE( scString:Eval() , "E 13 BASE 1004 No exported method (EVAL) OS:0 #:0 A:1:C:HELLO F:S" ) @@ -856,8 +856,8 @@ PROCEDURE Main_MISC() #ifdef __HARBOUR__ TEST_LINE( HardCR(@scString) , "HELLO" ) /* Bug in CA-Cl*pper, it will return "" */ #endif - TEST_LINE( HardCR("H"+SO+LF+"P"+SO+LF+"W"+SO+"M") , "H"+Chr(13)+""+Chr(10)+"P"+Chr(13)+""+Chr(10)+"WM" ) - TEST_LINE( HardCR("H"+NU+"B"+SO+LF+NU+"P"+SO+LF+"W"+SO+"M"+NU) , "H"+Chr(0)+"B"+Chr(13)+""+Chr(10)+""+Chr(0)+"P"+Chr(13)+""+Chr(10)+"WM"+Chr(0)+"" ) + TEST_LINE( HardCR("H"+SO+LF+"P"+SO+LF+"W"+SO+"M") , "H"+Chr(13)+""+Chr(10)+"P"+Chr(13)+""+Chr(10)+"W"+Chr(141)+"M" ) + TEST_LINE( HardCR("H"+NU+"B"+SO+LF+NU+"P"+SO+LF+"W"+SO+"M"+NU) , "H"+Chr(0)+"B"+Chr(13)+""+Chr(10)+""+Chr(0)+"P"+Chr(13)+""+Chr(10)+"W"+Chr(141)+"M"+Chr(0)+"" ) /* MEMOTRAN() */ @@ -872,9 +872,9 @@ PROCEDURE Main_MISC() #endif TEST_LINE( MemoTran("H"+SO+LF+"P"+CR+LF+"M") , "H P;M" ) TEST_LINE( MemoTran("H"+NU+"O"+SO+LF+"P"+CR+LF+"M"+NU+"I") , "H"+Chr(0)+"O P;M"+Chr(0)+"I" ) - TEST_LINE( MemoTran("M"+CR+"s"+CR+LF+"w"+SO+"w"+SO+LF+"h"+CR) , "M"+Chr(13)+"s;ww h"+Chr(13)+"" ) - TEST_LINE( MemoTran("M"+CR+"s"+CR+LF+"w"+SO+"w"+SO+LF+"h"+CR,"111","222"), "M"+Chr(13)+"s1ww2h"+Chr(13)+"" ) - TEST_LINE( MemoTran("M"+CR+"s"+CR+LF+"w"+SO+"w"+SO+LF+"h"+CR,"","") , "M"+Chr(13)+"s"+Chr(0)+"ww"+Chr(0)+"h"+Chr(13)+"" ) + TEST_LINE( MemoTran("M"+CR+"s"+CR+LF+"w"+SO+"w"+SO+LF+"h"+CR) , "M"+Chr(13)+"s;w"+Chr(141)+"w h"+Chr(13)+"" ) + TEST_LINE( MemoTran("M"+CR+"s"+CR+LF+"w"+SO+"w"+SO+LF+"h"+CR,"111","222"), "M"+Chr(13)+"s1w"+Chr(141)+"w2h"+Chr(13)+"" ) + TEST_LINE( MemoTran("M"+CR+"s"+CR+LF+"w"+SO+"w"+SO+LF+"h"+CR,"","") , "M"+Chr(13)+"s"+Chr(0)+"w"+Chr(141)+"w"+Chr(0)+"h"+Chr(13)+"" ) /* MEMOWRITE()/MEMOREAD() */ @@ -889,7 +889,7 @@ PROCEDURE Main_MISC() TEST_LINE( MemoWrit("$$MEMOFI.TMP",Chr(26)) , .T. ) TEST_LINE( MemoRead("$$MEMOFI.TMP") , ""+Chr(26)+"" ) TEST_LINE( MemoWrit("$$MEMOFI.TMP",scStringW) , .T. ) - TEST_LINE( MemoRead("$$MEMOFI.TMP") , ""+Chr(13)+""+Chr(10)+""+Chr(10)+""+Chr(9)+"" ) + TEST_LINE( MemoRead("$$MEMOFI.TMP") , ""+Chr(13)+""+Chr(10)+Chr(141)+Chr(10)+""+Chr(9)+"" ) TEST_LINE( MemoWrit(BADFNAME2() ,scStringZ) , .F. ) #ifndef __XPP__ TEST_LINE( MemoRead() , "" )