fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-05-20 08:20 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbmisc/numtxthu.prg
   * contrib/hbmisc/numtxten.prg
     + Updated.

   * utils/hbmake/hbmake.prg
     ! Typos.
This commit is contained in:
Viktor Szakats
2008-05-20 06:28:49 +00:00
parent 72dadeef4f
commit d0a2b04f79
4 changed files with 157 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-05-20 08:20 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbmisc/numtxthu.prg
* contrib/hbmisc/numtxten.prg
+ Updated.
* utils/hbmake/hbmake.prg
! Typos.
2008-05-20 02:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* doc/es/Makefile
* doc/whatsnew.txt

165
harbour/contrib/hbmisc/numtxten.prg
View File

@@ -7,94 +7,93 @@
// ; Decimals not supported
FUNCTION NumToTxtEN(nValue)
LOCAL cRetVal := ""
FUNCTION NumToTxtEN( nValue )
LOCAL cRetVal := ""
IF nValue == 0
RETURN "zero"
ENDIF
IF nValue == 0
RETURN "zero"
ENDIF
IF nValue < 0
nValue := -nValue
cRetVal += "minus "
ENDIF
IF nValue < 0
nValue := -nValue
cRetVal += "minus "
ENDIF
IF nValue >= 1000000
IF nValue >= 100000000
cRetVal += int_to_string(Int(nValue / 100000000)) + " hundred "
nValue -= 100000000 * Int(nValue / 100000000)
ENDIF
IF nValue >= 1000000
cRetVal += int_to_string(Int(nValue / 1000000)) + " "
nValue -= 1000000 * Int(nValue / 1000000)
ENDIF
cRetVal += "million "
ENDIF
IF nValue >= 1000
IF nValue >= 100000
cRetVal += int_to_string(Int(nValue / 100000)) + " hundred "
nValue -= 100000 * Int(nValue / 100000)
ENDIF
IF nValue >= 1000
cRetVal += int_to_string(Int(nValue / 1000)) + " "
nValue -= 1000 * Int(nValue / 1000)
ENDIF
cRetVal += "thousand "
ENDIF
IF nValue >= 100
cRetVal += int_to_string(Int(nValue / 100)) + " hundred "
nValue -= 100 * Int(nValue / 100)
ENDIF
IF nValue >= 1
cRetVal += int_to_string(Int(nValue))
nValue -= Int(nValue)
ENDIF
IF nValue >= 1000000
IF nValue >= 100000000
cRetVal += int_to_string( Int( nValue / 100000000 ) ) + " hundred "
nValue -= 100000000 * Int( nValue / 100000000 )
ENDIF
IF nValue >= 1000000
cRetVal += int_to_string( Int( nValue / 1000000 ) ) + " "
nValue -= 1000000 * Int( nValue / 1000000 )
ENDIF
cRetVal += "million "
ENDIF
IF nValue >= 1000
IF nValue >= 100000
cRetVal += int_to_string( Int( nValue / 100000 ) ) + " hundred "
nValue -= 100000 * Int( nValue / 100000 )
ENDIF
IF nValue >= 1000
cRetVal += int_to_string( Int( nValue / 1000 ) ) + " "
nValue -= 1000 * Int( nValue / 1000 )
ENDIF
cRetVal += "thousand "
ENDIF
IF nValue >= 100
cRetVal += int_to_string( Int( nValue / 100 ) ) + " hundred "
nValue -= 100 * Int( nValue / 100 )
ENDIF
IF nValue >= 1
cRetVal += int_to_string( Int( nValue ) )
nValue -= Int( nValue )
ENDIF
RETURN RTrim(cRetVal)
RETURN RTrim( cRetVal )
STATIC FUNCTION int_to_string(nValue)
LOCAL cRetVal
LOCAL aArray1 := {;
"one" ,;
"two" ,;
"three" ,;
"four" ,;
"five" ,;
"six" ,;
"seven" ,;
"eight" ,;
"nine" ,;
"ten" ,;
"eleven" ,;
"twelve" ,;
"thirteen" ,;
"fourteen" ,;
"fifteen" ,;
"sixteen" ,;
"seventeen" ,;
"eighteen" ,;
"nineteen" }
STATIC FUNCTION int_to_string( nValue )
LOCAL cRetVal
LOCAL aArray1 := {;
"one" ,;
"two" ,;
"three" ,;
"four" ,;
"five" ,;
"six" ,;
"seven" ,;
"eight" ,;
"nine" ,;
"ten" ,;
"eleven" ,;
"twelve" ,;
"thirteen" ,;
"fourteen" ,;
"fifteen" ,;
"sixteen" ,;
"seventeen" ,;
"eighteen" ,;
"nineteen" }
LOCAL aArray2 := {;
"ten" ,;
"twenty" ,;
"thirty" ,;
"forty" ,;
"fifty" ,;
"sixty" ,;
"seventy" ,;
"eighty" ,;
"ninety" }
LOCAL aArray2 := {;
"ten" ,;
"twenty" ,;
"thirty" ,;
"forty" ,;
"fifty" ,;
"sixty" ,;
"seventy" ,;
"eighty" ,;
"ninety" }
IF nValue < 20
cRetVal := aArray1[nValue]
ELSE
cRetVal := aArray2[Int(nValue / 10)]
nValue -= 10 * Int(nValue / 10)
IF Int(nValue) >= 1
cRetVal += " " + aArray1[Int(nValue)]
ENDIF
ENDIF
RETURN cRetVal
IF nValue < 20
cRetVal := aArray1[ nValue ]
ELSE
cRetVal := aArray2[ Int( nValue / 10 ) ]
nValue -= 10 * Int( nValue / 10 )
IF Int( nValue ) >= 1
cRetVal += " " + aArray1[ Int( nValue ) ]
ENDIF
ENDIF
RETURN cRetVal

103
harbour/contrib/hbmisc/numtxthu.prg
View File

@@ -6,7 +6,7 @@
* Harbour Project source code:
* NumToTxtHU() function to convert a number to Hungarian text
*
* Copyright 1999-2001 Viktor Szakats <viktor.szakats@syenar.hu>
* Copyright 1999-2008 Viktor Szakats <viktor.szakats@syenar.hu>
* www - http://www.harbour-project.org
*
* This program is free software; you can redistribute it and/or modify
@@ -50,66 +50,69 @@
*
*/
FUNCTION NumToTxtHU(nValue)
LOCAL aTort := { "tized", "sz zad", "ezred", "t¡zezred", "sz zezred", "milliomod" }
LOCAL cRetVal
LOCAL tmp, tmp1, tmp2
FUNCTION NumToTxtHU( nValue )
LOCAL aTort := { "tized", "sz zad", "ezred", "t¡zezred", "sz zezred", "milliomod", "milli rdod" }
LOCAL cRetVal
LOCAL tmp, tmp1, tmp2
IF nValue == 0
RETURN "nulla"
ENDIF
IF nValue < 0
nValue := -nValue
cRetVal := "m¡nusz "
ELSE
cRetVal := ""
ENDIF
IF nValue < 0
nValue := -nValue
cRetVal := "m¡nusz "
ELSE
cRetVal := ""
ENDIF
IF Int( nValue ) == 0
cRetVal += "nulla"
ENDIF
cRetVal += NumToTxtRaw(tmp := Int(nValue))
cRetVal += NumToTxtRaw( tmp := Int( nValue ) )
IF (tmp := (nValue-tmp)) > 0 .AND. tmp < 1
IF ( tmp := ( nValue - tmp ) ) > 0 .AND. tmp < 1
tmp1 := Len(tmp2 := SubStr(Str(tmp, 8, 6), 3))
tmp1 := Len( tmp2 := SubStr( Str( tmp, 8, 6 ), 3 ) )
WHILE SubStr(tmp2, tmp1, 1) == "0" .AND. tmp1 > 0
tmp1--
ENDDO
WHILE SubStr( tmp2, tmp1, 1 ) == "0" .AND. tmp1 > 0
tmp1--
ENDDO
cRetVal += " eg‚sz " + NumToTxtRaw(tmp * (10 ^ tmp1))
IF tmp1 >= 1 .AND. tmp1 <= Len(aTort)
cRetVal += " " + aTort[tmp1]
ENDIF
ENDIF
cRetVal += " eg‚sz " + NumToTxtRaw( tmp * ( 10 ^ tmp1 ) ) + iif( tmp1 >= 1 .AND. tmp1 <= Len( aTort ), " " + aTort[ tmp1 ], "" )
ENDIF
RETURN cRetVal
RETURN cRetVal
#define NTT_MAXLENGTH 18
STATIC FUNCTION NumToTxtRaw( nValue )
LOCAL aEgesz := { "", "ezer" , "milli¢", "milli rd", "billi¢" , "trilli¢", "kvadrilli¢", "kvintilli¢" } // , "szextilli¢", "szeptilli¢", "oktilli¢", "nontilli¢" }
LOCAL aEgyes := { "", "egy" , "kett‹" , "h rom" , "n‚gy" , "”t" , "hat" , "h‚t" , "nyolc" , "kilenc" }
LOCAL aTizes1 := { "", "t¡z" , "h£sz" , "harminc" , "negyven", "”tven" , "hatvan" , "hetven" , "nyolcvan" , "kilencven" }
LOCAL aTizes2 := { "", "tizen", "huszon", "harminc" , "negyven", "”tven" , "hatvan" , "hetven" , "nyolcvan" , "kilencven" }
STATIC FUNCTION NumToTxtRaw(nValue)
LOCAL aDigit[NTT_MAXLENGTH]
LOCAL cValue := StrZero(nValue, NTT_MAXLENGTH)
LOCAL aEgesz := {"", "ezer" , "milli¢", "milli rd", "billi¢" , "ezerbilli¢"}
LOCAL aEgyes := {{"", "egy" , "kett‹" , "h rom" , "n‚gy" , "”t" , "hat" , "h‚t" , "nyolc" , "kilenc" },;
{"", "egy" , "kett‹" , "h rom" , "n‚gy" , "”t" , "hat" , "h‚t" , "nyolc" , "kilenc" }}
LOCAL aTizes := {{"", "t¡z" , "h£sz" , "harminc" , "negyven", "”tven", "hatvan", "hetven", "nyolcvan", "kilencven" },;
{"", "tizen", "huszon", "harminc" , "negyven", "”tven", "hatvan", "hetven", "nyolcvan", "kilencven" }}
LOCAL tmp
LOCAL aDigit
LOCAL nLen
LOCAL cValue
LOCAL tmp
FOR tmp := 1 TO NTT_MAXLENGTH
aDigit[tmp] := Val(SubStr(cValue, NTT_MAXLENGTH - tmp + 1, 1))
NEXT
cValue := LTrim( Str( nValue, 20, 0 ) )
cValue := PadL( cValue, ( Int( Max( Len( cValue ) - 1, 0 ) / 3 ) + 1 ) * 3, "0" )
cValue := ""
FOR tmp := 1 TO 16 STEP 3
IF aDigit[tmp] != 0 .OR. aDigit[tmp + 1] != 0 .OR. aDigit[tmp + 2] != 0
cValue := aEgyes[iif(tmp == 1, 1, 2)][aDigit[tmp] + 1] + aEgesz[(tmp - 1) / 3 + 1] + iif(Empty(cValue), "", "-") + cValue
cValue := aTizes[iif(aDigit[tmp] == 0, 1, 2)][aDigit[tmp + 1] + 1] + cValue
IF aDigit[tmp + 2] != 0
cValue := aEgyes[ 2][aDigit[tmp + 2] + 1] + "sz z" + cValue
ENDIF
ENDIF
NEXT
aDigit := Array( nLen := Len( cValue ) )
FOR tmp := 1 TO nLen
aDigit[ tmp ] := Val( SubStr( cValue, tmp, 1 ) )
NEXT
RETURN cValue
cValue := ""
FOR tmp := 1 TO nLen - 2 STEP 3
IF aDigit[ tmp ] != 0 .OR. ;
aDigit[ tmp + 1 ] != 0 .OR. ;
aDigit[ tmp + 2 ] != 0
cValue += iif( Empty( cValue ), "", "-") +;
iif( aDigit[ tmp ] != 0, aEgyes[ aDigit[ tmp ] + 1 ] + "sz z", "" ) +;
iif( aDigit[ tmp + 2 ] == 0, aTizes1[ aDigit[ tmp + 1 ] + 1 ], aTizes2[ aDigit[ tmp + 1 ] + 1 ] ) +;
aEgyes[ aDigit[ tmp + 2 ] + 1 ] +;
aEgesz[ ( Int( ( nLen - tmp ) / 3 ) ) + 1 ]
ENDIF
NEXT
RETURN cValue

28
harbour/utils/hbmake/hbmake.prg
View File

@@ -1758,7 +1758,7 @@ FUNCTION CreateMakeFile( cFile, lCreateAndCompile )
lCompMod := oMake:lCompMod
s_lGenppo := oMake:lGenppo
s_lGui := oMake:lGui
cRdd := IIF( oMake:lRddAds, "RddAds", IIF( oMake:lMediator, "Mediator", "None" ) )
cRdd := IIF( oMake:lRddAds, "RDDADS", IIF( oMake:lMediator, "Mediator", "None" ) )
cGuiLib := IIF( oMake:lFwh , "FWH", ;
IIF( oMake:lMini , "MINIGUI", ;
IIF( oMake:lWhoo , "WHOO", ;
@@ -1983,7 +1983,7 @@ While .t.
@ 02,01 SAY s_aLangMessages[ 48 ]
@ 02,16,08,26 GET cRdd;
LISTBOX { "None","RddAds","Mediator","Apollo"};
LISTBOX { "None","RDDADS","Mediator","Apollo"};
WHEN cOS == "Win32" .or. cOS == "Linux";
DROPDOWN;
MESSAGE s_aLangMessages[ 52 ]
@@ -2054,7 +2054,7 @@ While .t.
lxHGtk := "XHGTK" $ alltrim(cGuiLib)
s_lGui := lWhoo .or. lFwh .or. lC4W .or. lMinigui .or. lGtWvt .or. lHwGui .or. lXwt .or. lWhat32 .or. lxHGtk .or. lGtWvw .or. lMWvw
lRddAds := "RddAds" $ cRdd
lRddAds := "RDDADS" $ cRdd
lMediator := "Mediator" $ cRdd
lApollo := "Apollo" $ cRdd
@@ -3002,9 +3002,9 @@ Endif // Create and compile
ELSEIF lMiniGui
FWrite( s_nMakeFileHandle, "LIBFILES = minigui.lib " + IIF( ! s_lMt, cDefaultLibs, cDefaultLibsMt ) + CRLF )
ELSEIF lWhoo
FWrite( s_nMakeFileHandle, "LIBFILES = whoo.lib what32.lib " + IIF( ! s_lMt, cDefaultLibs, cDefaultLibsMt ) + CRLF )
FWrite( s_nMakeFileHandle, "LIBFILES = whoo.lib hbwhat32.lib " + IIF( ! s_lMt, cDefaultLibs, cDefaultLibsMt ) + CRLF )
ELSEIF lWhat32
FWrite( s_nMakeFileHandle, "LIBFILES = what32.lib " + IIF( ! s_lMt, cDefaultLibs, cDefaultLibsMt ) + CRLF )
FWrite( s_nMakeFileHandle, "LIBFILES = hbwhat32.lib " + IIF( ! s_lMt, cDefaultLibs, cDefaultLibsMt ) + CRLF )
ELSEIF lHwGui
FWrite( s_nMakeFileHandle, "LIBFILES = hwgui.lib procmisc.lib hwg_qhtm.lib " + IIF( ! s_lMt, cDefaultLibs, cDefaultLibsMt ) + CRLF )
ELSEIF lC4W
@@ -5513,27 +5513,27 @@ LOCAL aLang := Array( 67 )
aLang[37] := "compile module only /m"
aLang[38] := "User Defines "
aLang[39] := "User include Path"
aLang[40] := "Use External Libs"
aLang[40] := "Use external libs"
aLang[41] := "<Spacebar>-Select <Enter>-Continue process <F5> Sel/Unsel All"
aLang[42] := "Warning level /w"
aLang[43] := "Numbers of source files per line on makefile"
aLang[44] := "Use Multi Thread Library"
aLang[45] := "Executable file name"
aLang[46] := "Warning Level /w"
aLang[46] := "Warning level /w"
aLang[47] := "<Tab>-Next <Sh-Tab>-Prev <Enter>-Sel <"+chr(24)+chr(25)+">-Change Sel <Spacebar>-Open Box"
/* Messages Start Here */
aLang[48] := "3rd Party Rdd"
aLang[49] := "What OS you Use"
aLang[50] := "What C compiler you has"
aLang[48] := "3rd Party RDD"
aLang[49] := "What OS you use"
aLang[50] := "What C compiler you have"
aLang[51] := "This app use Graphical libraries"
aLang[52] := "Do you use 3rd Party Rdd"
aLang[52] := "Do you use 3rd Party RDD"
aLang[53] := "Compress this app"
aLang[54] := "Compress the app after Linked (use upx ?)"
aLang[55] := "Your app will be linked to user harbour.dll"
aLang[56] := "Where the .obj/.o files will be generates"
aLang[57] := "Inform executable name (without .exe extention)"
aLang[56] := "Where the .obj/.o files will be generated"
aLang[57] := "Specify executable name (without .exe extension)"
/* More messages for LIB build */
aLang[58] := "Inform the lib name (without extension)"
aLang[58] := "Specify the lib name (without extension)"
/* More Harbour options for LIB build */
aLang[59] := "Lib name:"
aLang[60] := "Obj dir files:"