diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 52183bfaf2..1ccc53a553 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,25 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-02-15 02:11 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.*.po + * utils/hbmk2/hbmk2.prg + ! fixed most hacks around embedded newlines in hbmk2's + own output messages. Now they are handled natively, + which will fix output that contains "\n" as normal + part of the text, f.e. "C:\name\", and makes the + newlines in .po files standard. + + * ChangeLog.txt + * utils/hbmk2/hbmk2.prg + ! "Markdown" cased correctly + + * src/rtl/strxchg.c + + SVN props + + * contrib/hbtip/httpcli.prg + * cleanups + 2013-02-15 01:53 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/include/harbour.hbx * harbour/src/rtl/Makefile @@ -212,9 +231,9 @@ 2013-02-11 21:51 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg - + ability to output help text in MarkDown format: + + ability to output help text in Markdown format: hbmk2 --longhelpmd > man.md - view it with any MarkDown compatible viewer, or + view it with any Markdown compatible viewer, or convert to HTML/PDF/MANPAGE/TROFF/etc. 2013-02-11 14:51 UTC+0100 Viktor Szakats (harbour syenar.net) diff --git a/harbour/contrib/hbtip/httpcli.prg b/harbour/contrib/hbtip/httpcli.prg index 9c9f1426b9..2d93bc5f94 100644 --- a/harbour/contrib/hbtip/httpcli.prg +++ b/harbour/contrib/hbtip/httpcli.prg @@ -84,7 +84,6 @@ CREATE CLASS TIPClientHTTP FROM TIPClient METHOD Attach( cName, cFileName, cType ) METHOD PostMultiPart( xPostData, cQuery ) METHOD WriteAll( cFile ) - METHOD StandardFields() PROTECTED: @@ -181,7 +180,7 @@ METHOD PostByVerb( xPostData, cQuery, cVerb ) CLASS TIPClientHTTP // End of header ::inetSendAll( ::SocketCon, ::cCRLF ) - IF ::inetErrorCode( ::SocketCon ) == 0 + IF ::inetErrorCode( ::SocketCon ) == 0 ::inetSendAll( ::SocketCon, cData ) ::bInitialized := .T. RETURN ::ReadHeaders() @@ -199,14 +198,13 @@ METHOD StandardFields() CLASS TIPClientHTTP ::inetSendAll( ::SocketCon, "Connection: close" + ::cCRLF ) // Perform a basic authentication request - IF ::cAuthMode == "Basic" .AND. ! ( "Authorization" $ ::hFields ) + IF ::cAuthMode == "Basic" .AND. !( "Authorization" $ ::hFields ) oEncoder := TIPEncoderBase64():New() oEncoder:bHttpExcept := .T. ::inetSendAll( ::SocketCon, "Authorization: Basic " + ; oEncoder:Encode( ::oUrl:cUserID + ":" + ::oUrl:cPassword ) + ::cCRLF ) ENDIF - // send cookies cCookies := ::getCookies() IF ! Empty( cCookies ) @@ -354,7 +352,6 @@ METHOD Read( nLen ) CLASS TIPClientHTTP ::nLength := -1 // chunked data is followed by a blank line /* cLine := */ ::InetRecvLine( ::SocketCon, @nPos, 1024 ) - ENDIF RETURN cData @@ -393,7 +390,7 @@ METHOD setCookie( cLine ) CLASS TIPClientHTTP cDefaultPath := "/" ENDIF // this function currently ignores expires, secure and other tags that may be in the cookie for now... - // ?"Setting COOKIE:",cLine + // ? "Setting COOKIE:", cLine aParam := hb_regexSplit( ";", cLine ) cName := cValue := "" cHost := cDefaultHost @@ -582,10 +579,11 @@ METHOD PostMultiPart( xPostData, cQuery ) CLASS TIPClientHTTP // nRead := FRead( nFile, @cBuf, nBuf ) cBuf := FReadStr( nFile, nBuf ) nRead := hb_BLen( cBuf ) -/* IF nRead < nBuf +#if 0 + IF nRead < nBuf cBuf := PadR( cBuf, nRead ) ENDIF -*/ +#endif cData += cBuf ENDDO FClose( nFile ) @@ -607,7 +605,7 @@ METHOD PostMultiPart( xPostData, cQuery ) CLASS TIPClientHTTP // End of header ::inetSendAll( ::SocketCon, ::cCRLF ) - IF ::inetErrorCode( ::SocketCon ) == 0 + IF ::inetErrorCode( ::SocketCon ) == 0 ::inetSendAll( ::SocketCon, cData ) ::bInitialized := .T. RETURN ::ReadHeaders() diff --git a/harbour/utils/hbmk2/hbmk2.es_PE.po b/harbour/utils/hbmk2/hbmk2.es_PE.po index b50a037854..74080ba7f2 100644 --- a/harbour/utils/hbmk2/hbmk2.es_PE.po +++ b/harbour/utils/hbmk2/hbmk2.es_PE.po @@ -48,8 +48,8 @@ msgstr "fuerza modo C++/C" #: hbmk2.prg:1104 hbmk2.prg:1450 hbmk2.prg:1561 #, c-format -msgid "Error: %1$s not set, failed to autodetect.\\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory." -msgstr "Error: %1$s no definido, fallo autodetección.\\nPor favor, ejecute esta herramienta desde su ubicación original dentro de la carpeta de instalación de Harbour o configure la variable de entorno %1$s hacia el directorio raíz de Harbour." +msgid "Error: %1$s not set, failed to autodetect.\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory." +msgstr "Error: %1$s no definido, fallo autodetección.\nPor favor, ejecute esta herramienta desde su ubicación original dentro de la carpeta de instalación de Harbour o configure la variable de entorno %1$s hacia el directorio raíz de Harbour." #: hbmk2.prg:953 hbmk2.prg:1268 hbmk2.prg:1341 #, c-format @@ -98,8 +98,8 @@ msgstr "Compilador C detectado automáticamente: %1$s" #: hbmk2.prg:1301 hbmk2.prg:1673 hbmk2.prg:1756 #, c-format -msgid "Could not detect any supported C compiler in your PATH.\\nSetup one or set -comp= option to one of these values: %1$s" -msgstr "No se pudo detectar ningún compilador C en su PATH.\\nPor favor, utilice la opción -comp= para especificar uno de estos valores: %1$s" +msgid "Could not detect any supported C compiler in your PATH.\nSetup one or set -comp= option to one of these values: %1$s" +msgstr "No se pudo detectar ningún compilador C en su PATH.\nPor favor, utilice la opción -comp= para especificar uno de estos valores: %1$s" #: hbmk2.prg:1307 hbmk2.prg:1679 hbmk2.prg:1762 #, c-format @@ -113,8 +113,8 @@ msgstr "Usando Harbour: %1$s %2$s %3$s %4$s" #: hbmk2.prg:1299 hbmk2.prg:1671 hbmk2.prg:1754 #, c-format -msgid "Choose a C compiler by using -comp= option.\\nYou have the following choices on your platform: %1$s" -msgstr "Por favor, elija un compilador C usando la Opción: -comp=.\\ntiene las siguientes opciones en su plataforma: %1$s" +msgid "Choose a C compiler by using -comp= option.\nYou have the following choices on your platform: %1$s" +msgstr "Por favor, elija un compilador C usando la Opción: -comp=.\ntiene las siguientes opciones en su plataforma: %1$s" #: hbmk2.prg:1380 hbmk2.prg:1855 hbmk2.prg:1954 #, c-format @@ -303,8 +303,8 @@ msgstr "Enlazando... %1$s" #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "set C compiler warning level\\n can be: max, yes, low, no, def (default: yes)" -msgstr "Configure nivel de advertencia (warnings) del compilador C\\n puede ser: max, yes, low, no, def (default: yes)" +msgid "set C compiler warning level\n can be: max, yes, low, no, def (default: yes)" +msgstr "Configure nivel de advertencia (warnings) del compilador C\n puede ser: max, yes, low, no, def (default: yes)" #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102 #, c-format @@ -453,13 +453,13 @@ msgstr "activa (o desactiva) beep simple en caso de éxito, doble beep en caso d #: hbmk2.prg:7942 #, c-format -msgid "working directory for incremental build mode\\n(default: %1$s/plat/comp)" -msgstr "directorio de trabajo para el modo de compilación incremental\\n(default: %1$s/plat/comp)" +msgid "working directory for incremental build mode\n(default: %1$s/plat/comp)" +msgstr "directorio de trabajo para el modo de compilación incremental\n(default: %1$s/plat/comp)" #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "compress executable/dynamic lib (needs UPX)\\n can be: yes, no, min, max" -msgstr "comprime executable/librería dinamica (necesita UPX)\\n puede ser: yes, no, min, max" +msgid "compress executable/dynamic lib (needs UPX)\n can be: yes, no, min, max" +msgstr "comprime executable/librería dinamica (necesita UPX)\n puede ser: yes, no, min, max" #: hbmk2.prg:7960 hbmk2.prg:11650 hbmk2.prg:13120 #, c-format @@ -468,18 +468,18 @@ msgstr "Múltiples parámetros son aceptados -l, -L, -i y