diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 166113c2c9..72bd170a3f 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,24 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-01-24 19:24 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbhpdf/core.c
+  * contrib/hbhpdf/hbhpdf.hbx
+    + added HPDF_GetErrorDetail( hDoc ) -> nErrorCode
+
+  * contrib/hbhpdf/harupdf.ch
+    + added error constants from hpdferro.h
+      descriptions here:
+         https://github.com/libharu/libharu/wiki/Error-handling
+
+  * contrib/xhb/*.prg
+    * HTML
+
+  * contrib/hbhpdf/*.c
+  * tests/wvtext.prg
+  * src/rtl/itemseri.c
+    * formatting (mostly comments)
+
 2013-01-24 15:34 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/ChangeLog.txt
     ! removed multiple ChangeLog entry for my last commit
diff --git a/harbour/contrib/hbhpdf/core.c b/harbour/contrib/hbhpdf/core.c
index 7300b48d2c..12e7cb8e4b 100644
--- a/harbour/contrib/hbhpdf/core.c
+++ b/harbour/contrib/hbhpdf/core.c
@@ -81,7 +81,7 @@ HPDF_Doc hb_HPDF_Doc_par( int iParam )
      Most of the functions return hStatus == HPDF_OK or ERROR Code
  */
 
-/* HPdf_New() -> hDoc
+/* HPDF_New() -> hDoc
  */
 HB_FUNC( HPDF_NEW )
 {
@@ -92,7 +92,7 @@ HB_FUNC( HPDF_NEW )
    hb_retptrGC( ph );
 }
 
-/* HPdf_Free( hDoc ) -> NIL
+/* HPDF_Free( hDoc ) -> NIL
  */
 HB_FUNC( HPDF_FREE )
 {
@@ -108,28 +108,28 @@ HB_FUNC( HPDF_FREE )
    }
 }
 
-/* HPdf_NewDoc( hDoc ) -> hStatus
+/* HPDF_NewDoc( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_NEWDOC )
 {
    hb_retnl( ( long ) HPDF_NewDoc( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_FreeDoc( hNewDoc ) -> NIL
+/* HPDF_FreeDoc( hNewDoc ) -> NIL
  */
 HB_FUNC( HPDF_FREEDOC )
 {
    HPDF_FreeDoc( hb_HPDF_Doc_par( 1 ) );
 }
 
-/* HPdf_FreeDocAll() -> NIL
+/* HPDF_FreeDocAll() -> NIL
  */
 HB_FUNC( HPDF_FREEDOCALL )
 {
    HPDF_FreeDocAll( hb_HPDF_Doc_par( 1 ) );
 }
 
-/* HPdf_SaveToFile( hDoc, cFileToSave ) -> hStatus
+/* HPDF_SaveToFile( hDoc, cFileToSave ) -> hStatus
  */
 HB_FUNC( HPDF_SAVETOFILE )
 {
@@ -142,21 +142,21 @@ HB_FUNC( HPDF_SAVETOFILE )
       hb_xfree( pszFree );
 }
 
-/* HPdf_SaveToStream( hDoc ) -> hStatus
+/* HPDF_SaveToStream( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_SAVETOSTREAM )
 {
    hb_retnl( ( long ) HPDF_SaveToStream( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_GetStreamSize( hDoc ) -> nSize
+/* HPDF_GetStreamSize( hDoc ) -> nSize
  */
 HB_FUNC( HPDF_GETSTREAMSIZE )
 {
    hb_retnl( ( long ) HPDF_GetStreamSize( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_ReadFromStream( hDoc, @cBuffer ) -> nBytesRead
+/* HPDF_ReadFromStream( hDoc, @cBuffer ) -> nBytesRead
  */
 HB_FUNC( HPDF_READFROMSTREAM )
 {
@@ -174,21 +174,21 @@ HB_FUNC( HPDF_READFROMSTREAM )
       hb_xfree( buffer );
 }
 
-/* HPdf_ResetStream( hDoc ) -> hStatus
+/* HPDF_ResetStream( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_RESETSTREAM )
 {
    hb_retnl( ( long ) HPDF_ResetStream( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_HasDoc( hDoc ) -> lHasDoc
+/* HPDF_HasDoc( hDoc ) -> lHasDoc
  */
 HB_FUNC( HPDF_HASDOC )
 {
    hb_retl( HPDF_HasDoc( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_SetErrorHandler( hDoc, procErrHandler ) -> hStatus
+/* HPDF_SetErrorHandler( hDoc, procErrHandler ) -> hStatus
  */
 HB_FUNC( HPDF_SETERRORHANDLER )
 {
@@ -198,28 +198,35 @@ HB_FUNC( HPDF_SETERRORHANDLER )
    hb_retnl( ( long ) HPDF_SetErrorHandler( hb_HPDF_Doc_par( 1 ), ( HPDF_Error_Handler ) hb_parptr( 2 ) ) );
 }
 
-/* HPdf_GetError( hDoc ) -> nErrorCode
+/* HPDF_GetError( hDoc ) -> nErrorCode
  */
 HB_FUNC( HPDF_GETERROR )
 {
    hb_retnl( ( long ) HPDF_GetError( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_ResetError( hDoc ) -> NIL
+/* HPDF_GetErrorDetail( hDoc ) -> nErrorCode
+ */
+HB_FUNC( HPDF_GETERRORDETAIL )
+{
+   hb_retnl( ( long ) HPDF_GetErrorDetail( hb_HPDF_Doc_par( 1 ) ) );
+}
+
+/* HPDF_ResetError( hDoc ) -> NIL
  */
 HB_FUNC( HPDF_RESETERROR )
 {
    HPDF_ResetError( hb_HPDF_Doc_par( 1 ) );
 }
 
-/* HPdf_SetPagesConfiguration( hDoc, nPagePerPages ) -> hStatus
+/* HPDF_SetPagesConfiguration( hDoc, nPagePerPages ) -> hStatus
  */
 HB_FUNC( HPDF_SETPAGESCONFIGURATION )
 {
    hb_retnl( ( long ) HPDF_SetPagesConfiguration( hb_HPDF_Doc_par( 1 ), hb_parni( 2 ) ) );
 }
 
-/* HPdf_SetPageLayout( hDoc, nLayout ) -> hStatus
+/* HPDF_SetPageLayout( hDoc, nLayout ) -> hStatus
         nLayout ==
    HPDF_PAGE_LAYOUT_SINGLE             0
    HPDF_PAGE_LAYOUT_ONE_COLUMN         1
@@ -232,14 +239,14 @@ HB_FUNC( HPDF_SETPAGELAYOUT )
    hb_retnl( ( long ) HPDF_SetPageLayout( hb_HPDF_Doc_par( 1 ), ( HPDF_PageLayout ) hb_parni( 2 ) ) );
 }
 
-/* HPdf_GetPageLayout( hDoc ) -> nLayout
+/* HPDF_GetPageLayout( hDoc ) -> nLayout
  */
 HB_FUNC( HPDF_GETPAGELAYOUT )
 {
    hb_retni( ( int ) HPDF_GetPageLayout( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_SetPageMode( hDoc, nPageMode ) -> hStatus
+/* HPDF_SetPageMode( hDoc, nPageMode ) -> hStatus
        nPageMode ==
    HPDF_PAGE_MODE_USE_NONE     0  Display the document with neither outline nor thumbnail.
    HPDF_PAGE_MODE_USE_OUTLINE  1  Display the document with outline pane.
@@ -252,49 +259,49 @@ HB_FUNC( HPDF_SETPAGEMODE )
    hb_retnl( ( long ) HPDF_SetPageMode( hb_HPDF_Doc_par( 1 ), ( HPDF_PageMode ) hb_parni( 2 ) ) );
 }
 
-/* HPdf_GetPageMode( hDoc ) -> nPageMode
+/* HPDF_GetPageMode( hDoc ) -> nPageMode
  */
 HB_FUNC( HPDF_GETPAGEMODE )
 {
    hb_retni( ( int ) HPDF_GetPageMode( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_SetOpenAction( hDoc, hDestn ) -> hStatus
+/* HPDF_SetOpenAction( hDoc, hDestn ) -> hStatus
  */
 HB_FUNC( HPDF_SETOPENACTION )
 {
    hb_retnl( ( long ) HPDF_SetOpenAction( hb_HPDF_Doc_par( 1 ), ( HPDF_Destination ) hb_parptr( 2 ) ) );
 }
 
-/* HPdf_GetCurrentPage( hDoc ) -> hPage
+/* HPDF_GetCurrentPage( hDoc ) -> hPage
  */
 HB_FUNC( HPDF_GETCURRENTPAGE )
 {
    hb_retptr( ( void * ) HPDF_GetCurrentPage( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_AddPage( hDoc ) -> hPage
+/* HPDF_AddPage( hDoc ) -> hPage
  */
 HB_FUNC( HPDF_ADDPAGE )
 {
    hb_retptr( ( void  * ) HPDF_AddPage( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_InsertPage( hDoc, hPage ) -> hPageInserted  : Just before hPage
+/* HPDF_InsertPage( hDoc, hPage ) -> hPageInserted  : Just before hPage
  */
 HB_FUNC( HPDF_INSERTPAGE )
 {
    hb_retptr( ( void * ) HPDF_InsertPage( hb_HPDF_Doc_par( 1 ), ( HPDF_Page ) hb_parptr( 2 ) ) );
 }
 
-/* HPdf_GetFont( hDoc, cFontName, cEncoding ) -> hFont
+/* HPDF_GetFont( hDoc, cFontName, cEncoding ) -> hFont
  */
 HB_FUNC( HPDF_GETFONT )
 {
    hb_retptr( ( void * ) HPDF_GetFont( hb_HPDF_Doc_par( 1 ), hb_parc( 2 ), hb_parc( 3 ) ) );
 }
 
-/* HPdf_AddPageLabel( hDoc, nPageNum, nPgNoStyle, nFirstPageInRange, cPrefixToLabel ) -> hStatus
+/* HPDF_AddPageLabel( hDoc, nPageNum, nPgNoStyle, nFirstPageInRange, cPrefixToLabel ) -> hStatus
        nPgNoStyle
    HPDF_PAGE_NUM_STYLE_DECIMAL         1   Page label is displayed by Arabic numerals.
    HPDF_PAGE_NUM_STYLE_UPPER_ROMAN     2   Page label is displayed by Uppercase roman numerals.
@@ -307,42 +314,42 @@ HB_FUNC( HPDF_ADDPAGELABEL )
    hb_retnl( ( long ) HPDF_AddPageLabel( hb_HPDF_Doc_par( 1 ), hb_parni( 2 ), ( HPDF_PageNumStyle ) hb_parni( 3 ), hb_parni( 4 ), hb_parc( 5 ) ) );
 }
 
-/* HPdf_CreateExtGState( hDoc ) -> hExtGState
+/* HPDF_CreateExtGState( hDoc ) -> hExtGState
  */
 HB_FUNC( HPDF_CREATEEXTGSTATE )
 {
    hb_retptr( ( void * ) HPDF_CreateExtGState( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_CreateOutline( hDoc, hParentOutline, cTitle, hEncoder ) -> hOutline
+/* HPDF_CreateOutline( hDoc, hParentOutline, cTitle, hEncoder ) -> hOutline
  */
 HB_FUNC( HPDF_CREATEOUTLINE )
 {
    hb_retptr( ( void * ) HPDF_CreateOutline( hb_HPDF_Doc_par( 1 ), ( HPDF_Outline ) hb_parptr( 2 ), hb_parc( 3 ), ( HPDF_Encoder ) hb_parptr( 4 ) ) );
 }
 
-/* HPdf_GetEncoder( hDoc, cEncoding ) -> hEncoder
+/* HPDF_GetEncoder( hDoc, cEncoding ) -> hEncoder
  */
 HB_FUNC( HPDF_GETENCODER )
 {
    hb_retptr( ( void * ) HPDF_GetEncoder( hb_HPDF_Doc_par( 1 ), hb_parc( 2 ) ) );
 }
 
-/* HPdf_GetCurrentEncoder( hDoc ) -> hEncoder
+/* HPDF_GetCurrentEncoder( hDoc ) -> hEncoder
  */
 HB_FUNC( HPDF_GETCURRENTENCODER )
 {
    hb_retptr( ( void * ) HPDF_GetCurrentEncoder( hb_HPDF_Doc_par( 1 ) ) );
 }
 
-/* HPdf_SetCurrentEncoder( hDoc, hEncoder ) -> hStatus
+/* HPDF_SetCurrentEncoder( hDoc, hEncoder ) -> hStatus
  */
 HB_FUNC( HPDF_SETCURRENTENCODER )
 {
    hb_retnl( ( long ) HPDF_SetCurrentEncoder( hb_HPDF_Doc_par( 1 ), hb_parc( 2 ) ) );
 }
 
-/* HPdf_SetInfoAttr( hDoc, nInfoType, cInfo ) -> hStatus
+/* HPDF_SetInfoAttr( hDoc, nInfoType, cInfo ) -> hStatus
        nInfoType ==
    HPDF_INFO_AUTHOR
    HPDF_INFO_CREATOR
@@ -355,14 +362,14 @@ HB_FUNC( HPDF_SETINFOATTR )
    hb_retnl( ( long ) HPDF_SetInfoAttr( hb_HPDF_Doc_par( 1 ), ( HPDF_InfoType ) hb_parni( 2 ), hb_parc( 3 ) ) );
 }
 
-/* HPdf_GetInfoAttr( hDoc, nInfoType ) -> cInfo
+/* HPDF_GetInfoAttr( hDoc, nInfoType ) -> cInfo
  */
 HB_FUNC( HPDF_GETINFOATTR )
 {
    hb_retc( HPDF_GetInfoAttr( hb_HPDF_Doc_par( 1 ), ( HPDF_InfoType ) hb_parni( 2 ) ) );
 }
 
-/* HPdf_SetInfoDateAttr( hDoc, nInfoType, aDateValues ) -> hStatus
+/* HPDF_SetInfoDateAttr( hDoc, nInfoType, aDateValues ) -> hStatus
        nInfoType ==
    HPDF_INFO_CREATION_DATE
    HPDF_INFO_MOD_DATE
@@ -384,14 +391,14 @@ HB_FUNC( HPDF_SETINFODATEATTR )
    hb_retnl( ( long ) HPDF_SetInfoDateAttr( hb_HPDF_Doc_par( 1 ), ( HPDF_InfoType ) hb_parni( 2 ), date ) );
 }
 
-/* HPdf_SetPassword( hDoc, cOwnerPassword = NO NIL, cUserPassword = CANBE NIL ) -> hStatus
+/* HPDF_SetPassword( hDoc, cOwnerPassword = NO NIL, cUserPassword = CANBE NIL ) -> hStatus
  */
 HB_FUNC( HPDF_SETPASSWORD )
 {
    hb_retnl( ( long ) HPDF_SetPassword( hb_HPDF_Doc_par( 1 ), hb_parc( 2 ), hb_parc( 3 ) ) );
 }
 
-/* HPdf_SetPermission( hDoc, nPermission ) -> hStatus
+/* HPDF_SetPermission( hDoc, nPermission ) -> hStatus
        nPermission ==
    HPDF_ENABLE_READ      1   user can read the document.
    HPDF_ENABLE_PRINT     2   user can print the document.
@@ -404,7 +411,7 @@ HB_FUNC( HPDF_SETPERMISSION )
    hb_retnl( ( long ) HPDF_SetPermission( hb_HPDF_Doc_par( 1 ), hb_parni( 2 ) ) );
 }
 
-/* HPdf_SetEncryptionMode( hDoc, nEncMode, nKeyLen ) -> hStatus
+/* HPDF_SetEncryptionMode( hDoc, nEncMode, nKeyLen ) -> hStatus
        nEncMode ==
    HPDF_ENCRYPT_R2    1   Use "Revision 2" algorithm.
                              The length of key is automatically set to 5(40bit).
@@ -416,7 +423,7 @@ HB_FUNC( HPDF_SETENCRYPTIONMODE )
    hb_retnl( ( long ) HPDF_SetEncryptionMode( hb_HPDF_Doc_par( 1 ), ( HPDF_EncryptMode ) hb_parni( 2 ), hb_parni( 3 ) ) );
 }
 
-/* HPdf_SetCompressionMode( hDoc, nCompMode ) -> hStatus
+/* HPDF_SetCompressionMode( hDoc, nCompMode ) -> hStatus
        nCompMode ==
    HPDF_COMP_NONE         1    All contents are not compressed.
    HPDF_COMP_TEXT         2    Compress the contents stream of the page.
@@ -433,21 +440,21 @@ HB_FUNC( HPDF_SETCOMPRESSIONMODE )
 /*                           Page Handling                              */
 /*----------------------------------------------------------------------*/
 
-/* HPdf_Page_SetWidth( hPage, nWidth ) -> hStatus
+/* HPDF_Page_SetWidth( hPage, nWidth ) -> hStatus
  */
 HB_FUNC( HPDF_PAGE_SETWIDTH )
 {
    hb_retnl( ( long ) HPDF_Page_SetWidth( ( HPDF_Page ) hb_parptr( 1 ), ( HPDF_REAL ) hb_parnd( 2 ) ) );
 }
 
-/* HPdf_Page_SetHeight( hPage, nHeight ) -> hStatus
+/* HPDF_Page_SetHeight( hPage, nHeight ) -> hStatus
  */
 HB_FUNC( HPDF_PAGE_SETHEIGHT )
 {
    hb_retnl( ( long ) HPDF_Page_SetHeight( ( HPDF_Page ) hb_parptr( 1 ), ( HPDF_REAL ) hb_parnd( 2 ) ) );
 }
 
-/* HPdf_Page_SetSize( hPage, nSize, nOrientation = 1 Portrait, 2 Landscape ) -> hStatus
+/* HPDF_Page_SetSize( hPage, nSize, nOrientation = 1 Portrait, 2 Landscape ) -> hStatus
        nSize ==
    HPDF_PAGE_SIZE_LETTER         1      8.5 x 11 (Inches) 612 x 792
    HPDF_PAGE_SIZE_LEGAL          2      8.5 x 14 (Inches) 612 x 1008
@@ -467,35 +474,35 @@ HB_FUNC( HPDF_PAGE_SETSIZE )
    hb_retnl( ( long ) HPDF_Page_SetSize( ( HPDF_Page ) hb_parptr( 1 ), ( HPDF_PageSizes ) hb_parni( 2 ), ( HPDF_PageDirection ) hb_parni( 3 ) ) );
 }
 
-/* HPdf_Page_SetRotate( hPage, nAngle = 0-360 ) -> hStatus
+/* HPDF_Page_SetRotate( hPage, nAngle = 0-360 ) -> hStatus
  */
 HB_FUNC( HPDF_PAGE_SETROTATE )
 {
    hb_retnl( ( long ) HPDF_Page_SetRotate( ( HPDF_Page ) hb_parptr( 1 ), ( HPDF_UINT16 ) hb_parni( 2 ) ) );
 }
 
-/* HPdf_Page_GetWidth( hPage ) -> nWidth
+/* HPDF_Page_GetWidth( hPage ) -> nWidth
  */
 HB_FUNC( HPDF_PAGE_GETWIDTH )
 {
    hb_retnd( ( double ) HPDF_Page_GetWidth( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetHeight( hPage ) -> nHeight
+/* HPDF_Page_GetHeight( hPage ) -> nHeight
  */
 HB_FUNC( HPDF_PAGE_GETHEIGHT )
 {
    hb_retnd( ( double ) HPDF_Page_GetHeight( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_CreateDestination( hPage ) -> hDestn
+/* HPDF_Page_CreateDestination( hPage ) -> hDestn
  */
 HB_FUNC( HPDF_PAGE_CREATEDESTINATION )
 {
    hb_retptr( ( void * ) HPDF_Page_CreateDestination( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_CreateAnnot( hPage, aRect[nLeft,nTop,nRight,nBottom], cText, cEncoder ) -> nHandle
+/* HPDF_Page_CreateAnnot( hPage, aRect[nLeft,nTop,nRight,nBottom], cText, cEncoder ) -> nHandle
  */
 HB_FUNC( HPDF_PAGE_CREATETEXTANNOT )
 {
@@ -509,7 +516,7 @@ HB_FUNC( HPDF_PAGE_CREATETEXTANNOT )
    hb_retptr( HPDF_Page_CreateTextAnnot( ( HPDF_Page ) hb_parptr( 1 ), rc, hb_parc( 3 ), ( HPDF_Encoder ) hb_parptr( 4 ) ) );
 }
 
-/* HPdf_Page_CreateLinkAnnot( hPage, aRect, hDestn ) -> nHandle
+/* HPDF_Page_CreateLinkAnnot( hPage, aRect, hDestn ) -> nHandle
  */
 HB_FUNC( HPDF_PAGE_CREATELINKANNOT )
 {
@@ -523,7 +530,7 @@ HB_FUNC( HPDF_PAGE_CREATELINKANNOT )
    hb_retptr( HPDF_Page_CreateLinkAnnot( ( HPDF_Page ) hb_parptr( 1 ), rc, ( HPDF_Destination ) hb_parptr( 3 ) ) );
 }
 
-/* HPdf_Page_CreateURILinkAnnot( hPage, aRect, cURI ) -> nHandle
+/* HPDF_Page_CreateURILinkAnnot( hPage, aRect, cURI ) -> nHandle
  */
 HB_FUNC( HPDF_PAGE_CREATEURILINKANNOT )
 {
@@ -537,28 +544,28 @@ HB_FUNC( HPDF_PAGE_CREATEURILINKANNOT )
    hb_retptr( HPDF_Page_CreateURILinkAnnot( ( HPDF_Page ) hb_parptr( 1 ), rc, hb_parc( 3 ) ) );
 }
 
-/* HPdf_Page_TextWidth( hPage, cText ) -> nTextWidth
+/* HPDF_Page_TextWidth( hPage, cText ) -> nTextWidth
  */
 HB_FUNC( HPDF_PAGE_TEXTWIDTH )
 {
    hb_retnd( ( double ) HPDF_Page_TextWidth( ( HPDF_Page ) hb_parptr( 1 ), hb_parc( 2 ) ) );
 }
 
-/* HPdf_Page_MeasureText( hPage, cText, nWidth, lWordWrap ) -> nByteLenOfTextToFitWidth
+/* HPDF_Page_MeasureText( hPage, cText, nWidth, lWordWrap ) -> nByteLenOfTextToFitWidth
  */
 HB_FUNC( HPDF_PAGE_MEASURETEXT )
 {
    hb_retnl( ( long ) HPDF_Page_MeasureText( ( HPDF_Page ) hb_parptr( 1 ), hb_parc( 2 ), ( HPDF_REAL ) hb_parnd( 3 ), hb_parl( 4 ) ? HPDF_TRUE : HPDF_FALSE, NULL ) );
 }
 
-/* HPdf_Page_GetMode( hPage ) -> nGraphicMode
+/* HPDF_Page_GetMode( hPage ) -> nGraphicMode
  */
 HB_FUNC( HPDF_PAGE_GETGMODE )
 {
    hb_retnl( ( long ) HPDF_Page_GetGMode( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetCurrentPos( hPage ) -> aCurPos[ nX, nY ]
+/* HPDF_Page_GetCurrentPos( hPage ) -> aCurPos[ nX, nY ]
  */
 HB_FUNC( HPDF_PAGE_GETCURRENTPOS )
 {
@@ -573,7 +580,7 @@ HB_FUNC( HPDF_PAGE_GETCURRENTPOS )
    hb_itemReturnRelease( info );
 }
 
-/* HPdf_Page_GetCurrentTextPos( hPage ) -> aCurTextPos[ nX, nY ]
+/* HPDF_Page_GetCurrentTextPos( hPage ) -> aCurTextPos[ nX, nY ]
  */
 HB_FUNC( HPDF_PAGE_GETCURRENTTEXTPOS )
 {
@@ -588,21 +595,21 @@ HB_FUNC( HPDF_PAGE_GETCURRENTTEXTPOS )
    hb_itemReturnRelease( info );
 }
 
-/* HPdf_Page_GetCurrentFont( hPage ) -> hFont
+/* HPDF_Page_GetCurrentFont( hPage ) -> hFont
  */
 HB_FUNC( HPDF_PAGE_GETCURRENTFONT )
 {
    hb_retptr( ( void * ) HPDF_Page_GetCurrentFont( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetCurrentFontSize( hPage ) -> nFontSize
+/* HPDF_Page_GetCurrentFontSize( hPage ) -> nFontSize
  */
 HB_FUNC( HPDF_PAGE_GETCURRENTFONTSIZE )
 {
    hb_retnd( ( double ) HPDF_Page_GetCurrentFontSize( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetTransMatrix( hPage ) -> aMatrix[ ]
+/* HPDF_Page_GetTransMatrix( hPage ) -> aMatrix[ ]
  */
 HB_FUNC( HPDF_PAGE_GETTRANSMATRIX )
 {
@@ -621,35 +628,35 @@ HB_FUNC( HPDF_PAGE_GETTRANSMATRIX )
    hb_itemReturnRelease( info );
 }
 
-/* HPdf_Page_GetLineWidth( hPage ) -> nLineWidth
+/* HPDF_Page_GetLineWidth( hPage ) -> nLineWidth
  */
 HB_FUNC( HPDF_PAGE_GETLINEWIDTH )
 {
    hb_retnd( ( double ) HPDF_Page_GetLineWidth( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetLineCap( hPage ) -> nLineCapStyle
+/* HPDF_Page_GetLineCap( hPage ) -> nLineCapStyle
  */
 HB_FUNC( HPDF_PAGE_GETLINECAP )
 {
    hb_retnl( ( long ) HPDF_Page_GetLineCap( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetLineJoin( hPage ) -> nLineJoinStyle
+/* HPDF_Page_GetLineJoin( hPage ) -> nLineJoinStyle
  */
 HB_FUNC( HPDF_PAGE_GETLINEJOIN )
 {
    hb_retnl( ( long ) HPDF_Page_GetLineJoin( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetMiterLimit( hPage ) -> nMiterLimit
+/* HPDF_Page_GetMiterLimit( hPage ) -> nMiterLimit
  */
 HB_FUNC( HPDF_PAGE_GETMITERLIMIT )
 {
    hb_retnd( ( double ) HPDF_Page_GetMiterLimit( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetDash( hPage ) -> aDash
+/* HPDF_Page_GetDash( hPage ) -> aDash
  */
 HB_FUNC( HPDF_PAGE_GETDASH )
 {
@@ -672,56 +679,56 @@ HB_FUNC( HPDF_PAGE_GETDASH )
    hb_itemReturnRelease( info );
 }
 
-/* HPdf_Page_GetFlat( hPage ) -> nCurFlatness
+/* HPDF_Page_GetFlat( hPage ) -> nCurFlatness
  */
 HB_FUNC( HPDF_PAGE_GETFLAT )
 {
    hb_retnd( ( double ) HPDF_Page_GetFlat( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetCharSpace( hPage ) -> nCurCharSpace
+/* HPDF_Page_GetCharSpace( hPage ) -> nCurCharSpace
  */
 HB_FUNC( HPDF_PAGE_GETCHARSPACE )
 {
    hb_retnd( ( double ) HPDF_Page_GetCharSpace( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetWordSpace( hPage ) -> nCurWordSpace
+/* HPDF_Page_GetWordSpace( hPage ) -> nCurWordSpace
  */
 HB_FUNC( HPDF_PAGE_GETWORDSPACE )
 {
    hb_retnd( ( double ) HPDF_Page_GetWordSpace( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetHorizontalScalling( hPage ) -> nHorzScaling
+/* HPDF_Page_GetHorizontalScalling( hPage ) -> nHorzScaling
  */
 HB_FUNC( HPDF_PAGE_GETHORIZONTALSCALLING )
 {
    hb_retnd( ( double ) HPDF_Page_GetHorizontalScalling( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetTextLeading( hPage ) -> nTextLeading
+/* HPDF_Page_GetTextLeading( hPage ) -> nTextLeading
  */
 HB_FUNC( HPDF_PAGE_GETTEXTLEADING )
 {
    hb_retnd( ( double ) HPDF_Page_GetTextLeading( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetTextRenderingMode( hPage ) -> nTextRenderingMode
+/* HPDF_Page_GetTextRenderingMode( hPage ) -> nTextRenderingMode
  */
 HB_FUNC( HPDF_PAGE_GETTEXTRENDERINGMODE )
 {
    hb_retnd( ( double ) HPDF_Page_GetTextRenderingMode( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetTextRise( hPage ) -> nTextRise
+/* HPDF_Page_GetTextRise( hPage ) -> nTextRise
  */
 HB_FUNC( HPDF_PAGE_GETTEXTRISE )
 {
    hb_retnd( ( double ) HPDF_Page_GetTextRise( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetRGBFill( hPage ) -> aRGBFill[ nRed, nGreen, nBlue ]
+/* HPDF_Page_GetRGBFill( hPage ) -> aRGBFill[ nRed, nGreen, nBlue ]
  */
 HB_FUNC( HPDF_PAGE_GETRGBFILL )
 {
@@ -737,7 +744,7 @@ HB_FUNC( HPDF_PAGE_GETRGBFILL )
    hb_itemReturnRelease( info );
 }
 
-/* HPdf_Page_GetRGBStroke( hPage ) -> aRGBStroke[ nRed, nGreen, nBlue ]
+/* HPDF_Page_GetRGBStroke( hPage ) -> aRGBStroke[ nRed, nGreen, nBlue ]
  */
 HB_FUNC( HPDF_PAGE_GETRGBSTROKE )
 {
@@ -753,7 +760,7 @@ HB_FUNC( HPDF_PAGE_GETRGBSTROKE )
    hb_itemReturnRelease( info );
 }
 
-/* HPdf_Page_GetCMYKFill( hPage ) -> aCMYKFill[ nC, nM, nY, nK ]
+/* HPDF_Page_GetCMYKFill( hPage ) -> aCMYKFill[ nC, nM, nY, nK ]
  */
 HB_FUNC( HPDF_PAGE_GETCMYKFILL )
 {
@@ -770,7 +777,7 @@ HB_FUNC( HPDF_PAGE_GETCMYKFILL )
    hb_itemReturnRelease( info );
 }
 
-/* HPdf_Page_GetCMYKStroke( hPage ) -> aCMYKStroke[ nC, nM, nY, nK ]
+/* HPDF_Page_GetCMYKStroke( hPage ) -> aCMYKStroke[ nC, nM, nY, nK ]
  */
 HB_FUNC( HPDF_PAGE_GETCMYKSTROKE )
 {
@@ -787,35 +794,35 @@ HB_FUNC( HPDF_PAGE_GETCMYKSTROKE )
    hb_itemReturnRelease( info );
 }
 
-/* HPdf_Page_GetGrayFill( hPage ) -> nGrayFillValue
+/* HPDF_Page_GetGrayFill( hPage ) -> nGrayFillValue
  */
 HB_FUNC( HPDF_PAGE_GETGRAYFILL )
 {
    hb_retnd( ( double ) HPDF_Page_GetGrayFill( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetGrayStroke( hPage ) -> nGrayStrokeValue
+/* HPDF_Page_GetGrayStroke( hPage ) -> nGrayStrokeValue
  */
 HB_FUNC( HPDF_PAGE_GETGRAYSTROKE )
 {
    hb_retnd( ( double ) HPDF_Page_GetGrayStroke( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetStrokingColorSpace( hPage ) -> nStrokingSpace
+/* HPDF_Page_GetStrokingColorSpace( hPage ) -> nStrokingSpace
  */
 HB_FUNC( HPDF_PAGE_GETSTROKINGCOLORSPACE )
 {
    hb_retni( ( int ) HPDF_Page_GetStrokingColorSpace( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetFillingColorSpace( hPage ) -> nFillingColorSpace
+/* HPDF_Page_GetFillingColorSpace( hPage ) -> nFillingColorSpace
  */
 HB_FUNC( HPDF_PAGE_GETFILLINGCOLORSPACE )
 {
    hb_retni( ( int ) HPDF_Page_GetFillingColorSpace( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_GetTextMatrix( hPage ) -> aMatrix[ ]
+/* HPDF_Page_GetTextMatrix( hPage ) -> aMatrix[ ]
  */
 HB_FUNC( HPDF_PAGE_GETTEXTMATRIX )
 {
@@ -834,14 +841,14 @@ HB_FUNC( HPDF_PAGE_GETTEXTMATRIX )
    hb_itemReturnRelease( info );
 }
 
-/* HPdf_Page_GetGStateDepth( hPage ) -> nGStateDepth
+/* HPDF_Page_GetGStateDepth( hPage ) -> nGStateDepth
  */
 HB_FUNC( HPDF_PAGE_GETGSTATEDEPTH )
 {
    hb_retni( ( int ) HPDF_Page_GetGStateDepth( ( HPDF_Page ) hb_parptr( 1 ) ) );
 }
 
-/* HPdf_Page_SetSlideShow( hPage, nType, nDurationPerFrame, nTranstnTime = 1 Second ) -> hStatus
+/* HPDF_Page_SetSlideShow( hPage, nType, nDurationPerFrame, nTranstnTime = 1 Second ) -> hStatus
        nType ==
    HPDF_TS_WIPE_RIGHT
    HPDF_TS_WIPE_UP
diff --git a/harbour/contrib/hbhpdf/enccns.c b/harbour/contrib/hbhpdf/enccns.c
index 94ad976ac2..73c3075ade 100644
--- a/harbour/contrib/hbhpdf/enccns.c
+++ b/harbour/contrib/hbhpdf/enccns.c
@@ -49,7 +49,7 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_UseCNSEncodings( hDoc ) -> hStatus
+/* HPDF_UseCNSEncodings( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_USECNSENCODINGS )
 {
diff --git a/harbour/contrib/hbhpdf/enccnt.c b/harbour/contrib/hbhpdf/enccnt.c
index 3d21957157..0adeb75e92 100644
--- a/harbour/contrib/hbhpdf/enccnt.c
+++ b/harbour/contrib/hbhpdf/enccnt.c
@@ -49,7 +49,7 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_UseCNTEncodings( hDoc ) -> hStatus
+/* HPDF_UseCNTEncodings( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_USECNTENCODINGS )
 {
diff --git a/harbour/contrib/hbhpdf/encjp.c b/harbour/contrib/hbhpdf/encjp.c
index badb692510..ec6c62b7bd 100644
--- a/harbour/contrib/hbhpdf/encjp.c
+++ b/harbour/contrib/hbhpdf/encjp.c
@@ -49,7 +49,7 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_UseJPEncodings( hDoc ) -> hStatus
+/* HPDF_UseJPEncodings( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_USEJPENCODINGS )
 {
diff --git a/harbour/contrib/hbhpdf/enckr.c b/harbour/contrib/hbhpdf/enckr.c
index 9ccb4e8f5d..1b7119288d 100644
--- a/harbour/contrib/hbhpdf/enckr.c
+++ b/harbour/contrib/hbhpdf/enckr.c
@@ -49,7 +49,7 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_UseKREncodings( hDoc ) -> hStatus
+/* HPDF_UseKREncodings( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_USEKRENCODINGS )
 {
diff --git a/harbour/contrib/hbhpdf/font.c b/harbour/contrib/hbhpdf/font.c
index c12704580f..20f9141ab6 100644
--- a/harbour/contrib/hbhpdf/font.c
+++ b/harbour/contrib/hbhpdf/font.c
@@ -49,7 +49,7 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_LoadTypeIFontFromFile( hDoc, cAFMFileName, cPFA_PFBFileName ) -> cFontName
+/* HPDF_LoadTypeIFontFromFile( hDoc, cAFMFileName, cPFA_PFBFileName ) -> cFontName
  */
 HB_FUNC( HPDF_LOADTYPE1FONTFROMFILE )
 {
@@ -67,7 +67,7 @@ HB_FUNC( HPDF_LOADTYPE1FONTFROMFILE )
       hb_xfree( pszFree2 );
 }
 
-/* HPdf_LoadTTFontFromFile( hDoc, cTTFontFileName, lEmbed ) -> cFontName
+/* HPDF_LoadTTFontFromFile( hDoc, cTTFontFileName, lEmbed ) -> cFontName
  */
 HB_FUNC( HPDF_LOADTTFONTFROMFILE )
 {
@@ -80,7 +80,7 @@ HB_FUNC( HPDF_LOADTTFONTFROMFILE )
       hb_xfree( pszFree );
 }
 
-/* HPdf_LoadTTFontFromFile2( hDoc, cTTFontFileName, nIndexInFile, lEmbed ) -> cFontName
+/* HPDF_LoadTTFontFromFile2( hDoc, cTTFontFileName, nIndexInFile, lEmbed ) -> cFontName
  */
 HB_FUNC( HPDF_LOADTTFONTFROMFILE2 )
 {
diff --git a/harbour/contrib/hbhpdf/fontcns.c b/harbour/contrib/hbhpdf/fontcns.c
index 7399240de4..6e68dc96a7 100644
--- a/harbour/contrib/hbhpdf/fontcns.c
+++ b/harbour/contrib/hbhpdf/fontcns.c
@@ -49,7 +49,7 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_UseCNSFonts( hDoc ) -> hStatus
+/* HPDF_UseCNSFonts( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_USECNSFONTS )
 {
diff --git a/harbour/contrib/hbhpdf/fontcnt.c b/harbour/contrib/hbhpdf/fontcnt.c
index 2baef2b07c..beaa054f3b 100644
--- a/harbour/contrib/hbhpdf/fontcnt.c
+++ b/harbour/contrib/hbhpdf/fontcnt.c
@@ -49,7 +49,7 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_UseCNTFonts( hDoc ) -> hStatus
+/* HPDF_UseCNTFonts( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_USECNTFONTS )
 {
diff --git a/harbour/contrib/hbhpdf/fontjp.c b/harbour/contrib/hbhpdf/fontjp.c
index 8d946842df..85e3a8e69a 100644
--- a/harbour/contrib/hbhpdf/fontjp.c
+++ b/harbour/contrib/hbhpdf/fontjp.c
@@ -49,7 +49,7 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_UseJPFonts( hDoc ) -> hStatus
+/* HPDF_UseJPFonts( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_USEJPFONTS )
 {
diff --git a/harbour/contrib/hbhpdf/fontkr.c b/harbour/contrib/hbhpdf/fontkr.c
index f6f41f631d..3e074afdd7 100644
--- a/harbour/contrib/hbhpdf/fontkr.c
+++ b/harbour/contrib/hbhpdf/fontkr.c
@@ -49,7 +49,7 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_UseKRFonts( hDoc ) -> hStatus
+/* HPDF_UseKRFonts( hDoc ) -> hStatus
  */
 HB_FUNC( HPDF_USEKRFONTS )
 {
diff --git a/harbour/contrib/hbhpdf/harupdf.ch b/harbour/contrib/hbhpdf/harupdf.ch
index e26cee5231..3bce982266 100644
--- a/harbour/contrib/hbhpdf/harupdf.ch
+++ b/harbour/contrib/hbhpdf/harupdf.ch
@@ -777,4 +777,126 @@
 #define HPDF_PDFA_1A                        0
 #define HPDF_PDFA_1B                        1
 
+/* Error code */
+#define HPDF_ARRAY_COUNT_ERR                0x1001
+#define HPDF_ARRAY_ITEM_NOT_FOUND           0x1002
+#define HPDF_ARRAY_ITEM_UNEXPECTED_TYPE     0x1003
+#define HPDF_BINARY_LENGTH_ERR              0x1004
+#define HPDF_CANNOT_GET_PALLET              0x1005
+#define HPDF_DICT_COUNT_ERR                 0x1007
+#define HPDF_DICT_ITEM_NOT_FOUND            0x1008
+#define HPDF_DICT_ITEM_UNEXPECTED_TYPE      0x1009
+#define HPDF_DICT_STREAM_LENGTH_NOT_FOUND   0x100A
+#define HPDF_DOC_ENCRYPTDICT_NOT_FOUND      0x100B
+#define HPDF_DOC_INVALID_OBJECT             0x100C
+/*                                          0x100D */
+#define HPDF_DUPLICATE_REGISTRATION         0x100E
+#define HPDF_EXCEED_JWW_CODE_NUM_LIMIT      0x100F
+/*                                          0x1010 */
+#define HPDF_ENCRYPT_INVALID_PASSWORD       0x1011
+/*                                          0x1012 */
+#define HPDF_ERR_UNKNOWN_CLASS              0x1013
+#define HPDF_EXCEED_GSTATE_LIMIT            0x1014
+#define HPDF_FAILD_TO_ALLOC_MEM             0x1015
+#define HPDF_FILE_IO_ERROR                  0x1016
+#define HPDF_FILE_OPEN_ERROR                0x1017
+/*                                          0x1018 */
+#define HPDF_FONT_EXISTS                    0x1019
+#define HPDF_FONT_INVALID_WIDTHS_TABLE      0x101A
+#define HPDF_INVALID_AFM_HEADER             0x101B
+#define HPDF_INVALID_ANNOTATION             0x101C
+/*                                          0x101D */
+#define HPDF_INVALID_BIT_PER_COMPONENT      0x101E
+#define HPDF_INVALID_CHAR_MATRICS_DATA      0x101F
+#define HPDF_INVALID_COLOR_SPACE            0x1020
+#define HPDF_INVALID_COMPRESSION_MODE       0x1021
+#define HPDF_INVALID_DATE_TIME              0x1022
+#define HPDF_INVALID_DESTINATION            0x1023
+/*                                          0x1024 */
+#define HPDF_INVALID_DOCUMENT               0x1025
+#define HPDF_INVALID_DOCUMENT_STATE         0x1026
+#define HPDF_INVALID_ENCODER                0x1027
+#define HPDF_INVALID_ENCODER_TYPE           0x1028
+/*                                          0x1029 */
+/*                                          0x102A */
+#define HPDF_INVALID_ENCODING_NAME          0x102B
+#define HPDF_INVALID_ENCRYPT_KEY_LEN        0x102C
+#define HPDF_INVALID_FONTDEF_DATA           0x102D
+#define HPDF_INVALID_FONTDEF_TYPE           0x102E
+#define HPDF_INVALID_FONT_NAME              0x102F
+#define HPDF_INVALID_IMAGE                  0x1030
+#define HPDF_INVALID_JPEG_DATA              0x1031
+#define HPDF_INVALID_N_DATA                 0x1032
+#define HPDF_INVALID_OBJECT                 0x1033
+#define HPDF_INVALID_OBJ_ID                 0x1034
+#define HPDF_INVALID_OPERATION              0x1035
+#define HPDF_INVALID_OUTLINE                0x1036
+#define HPDF_INVALID_PAGE                   0x1037
+#define HPDF_INVALID_PAGES                  0x1038
+#define HPDF_INVALID_PARAMETER              0x1039
+/*                                          0x103A */
+#define HPDF_INVALID_PNG_IMAGE              0x103B
+#define HPDF_INVALID_STREAM                 0x103C
+#define HPDF_MISSING_FILE_NAME_ENTRY        0x103D
+/*                                          0x103E */
+#define HPDF_INVALID_TTC_FILE               0x103F
+#define HPDF_INVALID_TTC_INDEX              0x1040
+#define HPDF_INVALID_WX_DATA                0x1041
+#define HPDF_ITEM_NOT_FOUND                 0x1042
+#define HPDF_LIBPNG_ERROR                   0x1043
+#define HPDF_NAME_INVALID_VALUE             0x1044
+#define HPDF_NAME_OUT_OF_RANGE              0x1045
+/*                                          0x1046 */
+/*                                          0x1047 */
+#define HPDF_PAGE_INVALID_PARAM_COUNT       0x1048
+#define HPDF_PAGES_MISSING_KIDS_ENTRY       0x1049
+#define HPDF_PAGE_CANNOT_FIND_OBJECT        0x104A
+#define HPDF_PAGE_CANNOT_GET_ROOT_PAGES     0x104B
+#define HPDF_PAGE_CANNOT_RESTORE_GSTATE     0x104C
+#define HPDF_PAGE_CANNOT_SET_PARENT         0x104D
+#define HPDF_PAGE_FONT_NOT_FOUND            0x104E
+#define HPDF_PAGE_INVALID_FONT              0x104F
+#define HPDF_PAGE_INVALID_FONT_SIZE         0x1050
+#define HPDF_PAGE_INVALID_GMODE             0x1051
+#define HPDF_PAGE_INVALID_INDEX             0x1052
+#define HPDF_PAGE_INVALID_ROTATE_VALUE      0x1053
+#define HPDF_PAGE_INVALID_SIZE              0x1054
+#define HPDF_PAGE_INVALID_XOBJECT           0x1055
+#define HPDF_PAGE_OUT_OF_RANGE              0x1056
+#define HPDF_REAL_OUT_OF_RANGE              0x1057
+#define HPDF_STREAM_EOF                     0x1058
+#define HPDF_STREAM_READLN_CONTINUE         0x1059
+/*                                          0x105A */
+#define HPDF_STRING_OUT_OF_RANGE            0x105B
+#define HPDF_THIS_FUNC_WAS_SKIPPED          0x105C
+#define HPDF_TTF_CANNOT_EMBEDDING_FONT      0x105D
+#define HPDF_TTF_INVALID_CMAP               0x105E
+#define HPDF_TTF_INVALID_FOMAT              0x105F
+#define HPDF_TTF_MISSING_TABLE              0x1060
+#define HPDF_UNSUPPORTED_FONT_TYPE          0x1061
+#define HPDF_UNSUPPORTED_FUNC               0x1062
+#define HPDF_UNSUPPORTED_JPEG_FORMAT        0x1063
+#define HPDF_UNSUPPORTED_TYPE1_FONT         0x1064
+#define HPDF_XREF_COUNT_ERR                 0x1065
+#define HPDF_ZLIB_ERROR                     0x1066
+#define HPDF_INVALID_PAGE_INDEX             0x1067
+#define HPDF_INVALID_URI                    0x1068
+#define HPDF_PAGE_LAYOUT_OUT_OF_RANGE       0x1069
+#define HPDF_PAGE_MODE_OUT_OF_RANGE         0x1070
+#define HPDF_PAGE_NUM_STYLE_OUT_OF_RANGE    0x1071
+#define HPDF_ANNOT_INVALID_ICON             0x1072
+#define HPDF_ANNOT_INVALID_BORDER_STYLE     0x1073
+#define HPDF_PAGE_INVALID_DIRECTION         0x1074
+#define HPDF_INVALID_FONT                   0x1075
+#define HPDF_PAGE_INSUFFICIENT_SPACE        0x1076
+#define HPDF_PAGE_INVALID_DISPLAY_TIME      0x1077
+#define HPDF_PAGE_INVALID_TRANSITION_TIME   0x1078
+#define HPDF_INVALID_PAGE_SLIDESHOW_TYPE    0x1079
+#define HPDF_EXT_GSTATE_OUT_OF_RANGE        0x1080
+#define HPDF_INVALID_EXT_GSTATE             0x1081
+#define HPDF_EXT_GSTATE_READ_ONLY           0x1082
+#define HPDF_INVALID_U3D_DATA               0x1083
+#define HPDF_NAME_CANNOT_GET_NAMES          0x1084
+#define HPDF_INVALID_ICC_COMPONENT_NUM      0x1085
+
 #endif /* _HARUPDF_CH */
diff --git a/harbour/contrib/hbhpdf/hbhpdf.hbx b/harbour/contrib/hbhpdf/hbhpdf.hbx
index 5949ed7199..2a27bf9674 100644
--- a/harbour/contrib/hbhpdf/hbhpdf.hbx
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbx
@@ -72,6 +72,7 @@ DYNAMIC HPDF_GetCurrentEncoder
 DYNAMIC HPDF_GetCurrentPage
 DYNAMIC HPDF_GetEncoder
 DYNAMIC HPDF_GetError
+DYNAMIC HPDF_GETERRORDETAIL
 DYNAMIC HPDF_GetFont
 DYNAMIC HPDF_GetInfoAttr
 DYNAMIC HPDF_GetPageLayout
diff --git a/harbour/contrib/hbhpdf/image.c b/harbour/contrib/hbhpdf/image.c
index 072e90af95..c42fbeaf20 100644
--- a/harbour/contrib/hbhpdf/image.c
+++ b/harbour/contrib/hbhpdf/image.c
@@ -49,21 +49,21 @@
 
 #include "hbhpdf.h"
 
-/* HPdf_LoadPngImageFromFile( hDoc, cPNGFileName ) -> hImage
+/* HPDF_LoadPngImageFromFile( hDoc, cPNGFileName ) -> hImage
  */
 HB_FUNC( HPDF_LOADPNGIMAGEFROMFILE )
 {
    hb_retptr( ( void * ) HPDF_LoadPngImageFromFile( hb_HPDF_Doc_par( 1 ), hb_parc( 2 ) ) );
 }
 
-/* HPdf_LoadPngImageFromFile2( hDoc, cPNGFileName ) -> hImage
+/* HPDF_LoadPngImageFromFile2( hDoc, cPNGFileName ) -> hImage
  */
 HB_FUNC( HPDF_LOADPNGIMAGEFROMFILE2 )
 {
    hb_retptr( ( void * ) HPDF_LoadPngImageFromFile2( hb_HPDF_Doc_par( 1 ), hb_parc( 2 ) ) );
 }
 
-/* HPdf_LoadRawImageFromFile( hDoc, cImageFileName, nWidth, nHeight, nColorSpace ) -> hImage
+/* HPDF_LoadRawImageFromFile( hDoc, cImageFileName, nWidth, nHeight, nColorSpace ) -> hImage
        nColorSpace
    HPDF_CS_DEVICE_GRAY
    HPDF_CS_DEVICE_RGB
@@ -74,14 +74,14 @@ HB_FUNC( HPDF_LOADRAWIMAGEFROMFILE )
    hb_retptr( ( void * ) HPDF_LoadRawImageFromFile( hb_HPDF_Doc_par( 1 ), hb_parc( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HPDF_ColorSpace ) hb_parni( 5 ) ) );
 }
 
-/* HPdf_LoadRawImageFromMem( hDoc, cBuffer, nWidth, nHeight, nColorSpace, nBitsPerComponents ) -> hImage
+/* HPDF_LoadRawImageFromMem( hDoc, cBuffer, nWidth, nHeight, nColorSpace, nBitsPerComponents ) -> hImage
  */
 HB_FUNC( HPDF_LOADRAWIMAGEFROMMEM )
 {
    hb_retptr( ( void * ) HPDF_LoadRawImageFromMem( hb_HPDF_Doc_par( 1 ), ( HPDF_BYTE * ) hb_parc( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HPDF_ColorSpace ) hb_parni( 5 ), hb_parni( 6 ) ) );
 }
 
-/* HPdf_LoadJPEGImageFromFile( hDoc, cHPEGFileName ) -> hImage
+/* HPDF_LoadJPEGImageFromFile( hDoc, cHPEGFileName ) -> hImage
  */
 HB_FUNC( HPDF_LOADJPEGIMAGEFROMFILE )
 {
diff --git a/harbour/contrib/xhb/dumpvar.prg b/harbour/contrib/xhb/dumpvar.prg
index 5d29f030a9..a6938c1621 100644
--- a/harbour/contrib/xhb/dumpvar.prg
+++ b/harbour/contrib/xhb/dumpvar.prg
@@ -93,7 +93,6 @@ FUNCTION hb_DumpVar( xVar, lRecursive, nMaxRecursionLevel )
 
 STATIC FUNCTION __HB_DumpVar( xVar, lAssocAsObj, lRecursive, nIndent, nRecursionLevel, nMaxRecursionLevel )
 
-   LOCAL cType := ValType( xVar )
    LOCAL cString := "", cKey
    LOCAL nEolLen
 
@@ -108,8 +107,8 @@ STATIC FUNCTION __HB_DumpVar( xVar, lAssocAsObj, lRecursive, nIndent, nRecursion
       RETURN AsString( xVar )
    ENDIF
 
-   DO CASE
-   CASE cType == "O"
+   SWITCH ValType( xVar )
+   CASE "O"
 
       IF ! lAssocAsObj .AND. xVar:className() == "TASSOCIATIVEARRAY"
          cString += Space( nIndent ) + "Type='Associative' -> " + hb_eol()
@@ -143,8 +142,9 @@ STATIC FUNCTION __HB_DumpVar( xVar, lAssocAsObj, lRecursive, nIndent, nRecursion
 #endif
          cString += Space( nIndent ) + " +----------->" + hb_eol()
       ENDIF
+      EXIT
 
-   CASE cType == "A"
+   CASE "A"
       IF nRecursionLevel == 1
          cString += Space( nIndent ) + "Type='A' -> { Array of " + hb_ntos( Len( xVar ) ) + " Items }" + hb_eol()
       ENDIF
@@ -153,8 +153,9 @@ STATIC FUNCTION __HB_DumpVar( xVar, lAssocAsObj, lRecursive, nIndent, nRecursion
       ELSE
          cString += DShowArray( xVar, lRecursive, nIndent, nRecursionLevel, nMaxRecursionLevel )
       ENDIF
+      EXIT
 
-   CASE cType == "H"
+   CASE "H"
       IF nRecursionLevel == 1
          cString += Space( nIndent ) + "Type='H' -> { Hash of " + hb_ntos( Len( xVar ) ) + " Items }" + hb_eol()
       ENDIF
@@ -163,10 +164,11 @@ STATIC FUNCTION __HB_DumpVar( xVar, lAssocAsObj, lRecursive, nIndent, nRecursion
       ELSE
          cString += DShowHash( xVar, lRecursive, nIndent, nRecursionLevel, nMaxRecursionLevel )
       ENDIF
+      EXIT
 
    OTHERWISE
-      cString +=  Space( nIndent ) + AsString( xVar ) + hb_eol()
-   ENDCASE
+      cString += Space( nIndent ) + AsString( xVar ) + hb_eol()
+   ENDSWITCH
 
    RETURN cString
 
@@ -351,17 +353,7 @@ STATIC FUNCTION DecodeType( nType AS NUMERIC )
    RETURN PadR( cString, 7 )
 
 STATIC FUNCTION asString( x )
-
-   LOCAL v := ValType( x )
-
-   DO CASE
-   CASE v == "C"
-      RETURN '"' + x + '"'
-   OTHERWISE
-      RETURN hb_CStr( x )
-   ENDCASE
-
-   RETURN x
+   RETURN iif( HB_ISSTRING( x ), '"' + x + '"', hb_CStr( x ) )
 
 #include "error.ch"
 
diff --git a/harbour/contrib/xhb/hjwindow.prg b/harbour/contrib/xhb/hjwindow.prg
index d85aa8e9b7..1b1877f0e9 100644
--- a/harbour/contrib/xhb/hjwindow.prg
+++ b/harbour/contrib/xhb/hjwindow.prg
@@ -359,7 +359,7 @@ METHOD Begin() CLASS TJSWindow
    IF ::aScriptSrc != NIL
       FOR i := 1 TO Len( ::aScriptSrc )
          ::QOut( ;
-            '<script language=JavaScript SRC="' + ::aScriptSrc[ i ] + '"></script>' )
+            '<script language=JavaScript src="' + ::aScriptSrc[ i ] + '"></script>' )
       NEXT
    ENDIF
 
diff --git a/harbour/contrib/xhb/htjlist.prg b/harbour/contrib/xhb/htjlist.prg
index 75cd086d89..4d1dd33c79 100644
--- a/harbour/contrib/xhb/htjlist.prg
+++ b/harbour/contrib/xhb/htjlist.prg
@@ -191,9 +191,9 @@ METHOD SetFont( name, font, fntColor, fntSize ) CLASS TJSList
    __defaultNIL( @fntSize, ::Size )
 
    cStr += name + [.SetFont("<font ] + ;
-      " FACE = '" + font + "' " + ;
-      " SIZE = " + hb_ntos( fntSize ) + "'" + ;
-      " COLOR = '" + fntColor + "' " + ;
+      " face= '" + font + "' " + ;
+      " size= " + hb_ntos( fntSize ) + "'" + ;
+      " color= '" + fntColor + "' " + ;
       [ > ","</font>");] + CRLF()
 
    AAdd( ::aScript, cStr )
diff --git a/harbour/contrib/xhb/htmutil.prg b/harbour/contrib/xhb/htmutil.prg
index 124fbd6aad..af4c6f2254 100644
--- a/harbour/contrib/xhb/htmutil.prg
+++ b/harbour/contrib/xhb/htmutil.prg
@@ -622,14 +622,14 @@ METHOD Begin() CLASS JWindow
    IF ::aScriptSrc != NIL
       FOR i := 1 TO Len( ::aScriptSrc )
          ::QOut( ;
-            '<script language=JavaScript SRC="' + ::aScriptSrc[ i ] + '"></script>' )
+            '<script language=JavaScript src="' + ::aScriptSrc[ i ] + '"></script>' )
       NEXT
    ENDIF
 
    IF ::aServerSrc != NIL
       FOR i := 1 TO Len( ::aServerSrc )
          ::QOut( ;
-            '<script language=JavaScript SRC="' + ::aServerSrc[ i ] + '" runat=SERVER></script>' )
+            '<script language=JavaScript src="' + ::aServerSrc[ i ] + '" runat=SERVER></script>' )
       NEXT
    ENDIF
 
diff --git a/harbour/contrib/xhb/tedit.prg b/harbour/contrib/xhb/tedit.prg
index b840d888cd..8c0f8a2423 100644
--- a/harbour/contrib/xhb/tedit.prg
+++ b/harbour/contrib/xhb/tedit.prg
@@ -216,21 +216,21 @@ METHOD Put() CLASS THtmlControl
    ENDIF
 
    IF ::Name != NIL
-      ::cOutput += Space( 2 ) + '     NAME="' + ::Name + '"' + CRLF()
+      ::cOutput += Space( 2 ) + '     name="' + ::Name + '"' + CRLF()
    ENDIF
 
    IF ::Type == "TEXTAREA"
 
       IF ::Rows != NIL
-         ::cOutput += Space( 2 ) + '     ROWS="' + hb_ntos( ::Rows ) + '"' + CRLF()
+         ::cOutput += Space( 2 ) + '     rows="' + hb_ntos( ::Rows ) + '"' + CRLF()
       ENDIF
 
       IF ::Cols != NIL
-         ::cOutput += Space( 2 ) + '     COLS="' + hb_ntos( ::Cols ) + '"' + CRLF()
+         ::cOutput += Space( 2 ) + '     cols="' + hb_ntos( ::Cols ) + '"' + CRLF()
       ENDIF
 
       IF ::Wrap != NIL
-         ::cOutput += Space( 2 ) + '     WRAP="' + ::Wrap + '"' + CRLF()
+         ::cOutput += Space( 2 ) + '     wrap="' + ::Wrap + '"' + CRLF()
       ENDIF
 
    ENDIF
@@ -241,35 +241,35 @@ METHOD Put() CLASS THtmlControl
          ::Picture := "@X"
       ENDIF
 
-      ::cOutput += Space( 2 ) + '    VALUE="' + Transform( ::Value, ::Picture ) + '"' + CRLF()
+      ::cOutput += Space( 2 ) + '    value="' + Transform( ::Value, ::Picture ) + '"' + CRLF()
    ENDIF
 
    IF ::maxChars != NIL
-      ::cOutput += Space( 2 ) + 'MAXLENGTH="' + hb_ntos( ::maxChars ) + '"' + CRLF()
+      ::cOutput += Space( 2 ) + 'maxlength="' + hb_ntos( ::maxChars ) + '"' + CRLF()
    ENDIF
 
    IF ::Size != NIL
-      ::cOutput += Space( 2 ) + '     SIZE="' + hb_ntos( ::Size ) + '"' + CRLF()
+      ::cOutput += Space( 2 ) + '     size="' + hb_ntos( ::Size ) + '"' + CRLF()
    ENDIF
 
    IF ::Id != NIL
-      ::cOutput += Space( 2 ) + '       ID="' + ::Id + '"' + CRLF()
+      ::cOutput += Space( 2 ) + '       id="' + ::Id + '"' + CRLF()
    ENDIF
 
    IF ::Style != NIL
-      ::cOutput += Space( 2 ) + '    STYLE="' + ::Style + '"' + CRLF()
+      ::cOutput += Space( 2 ) + '    style="' + ::Style + '"' + CRLF()
    ENDIF
 
    IF ::type == "IMAGE"
 
       IF ::Source != NIL
-         ::cOutput += Space( 2 ) + '      SRC="' + ::Source + '"' + CRLF()
+         ::cOutput += Space( 2 ) + '      src="' + ::Source + '"' + CRLF()
       ENDIF
 
    ENDIF
 
    IF ::Align != NIL
-      ::cOutput += Space( 2 ) + '    ALIGN="' + ::Align + '"' + CRLF()
+      ::cOutput += Space( 2 ) + '    align="' + ::Align + '"' + CRLF()
    ENDIF
 
    IF ::type == "RADIO" .OR. ::type == "CHECKBOX"
@@ -555,14 +555,14 @@ METHOD Put( lPutControls ) CLASS THtmlForm
 //    FWrite( ::nH, ::cOutput )
       ::oHtm:cStr += ::cOutput
       ::cOutPut := '<table bgcolor="#9196A0" ' + CRLF() + ;
-         "       COLS=1 " + CRLF() + ;
-         "       ROWS=1 " + CRLF() + ;
-         "       CELLPADDING=3 " + CRLF() + ;
-         "       CELLSPACING=3 " + CRLF() + ;
-         "       WIDTH=" + hb_ntos( ::width ) + "% " + CRLF() + ;
-         '       BORDERCOLORLIGHT="#000000" ' + CRLF() + ;
-         '       BORDERCOLORDARK="#FFFFFF" ' + CRLF() + ;
-         "       BORDER " + CRLF() + ;
+         "       cols=1 " + CRLF() + ;
+         "       rows=1 " + CRLF() + ;
+         "       cellpadding=3 " + CRLF() + ;
+         "       cellspacing=3 " + CRLF() + ;
+         "       width=" + hb_ntos( ::width ) + "% " + CRLF() + ;
+         '       bordercolorlight="#000000" ' + CRLF() + ;
+         '       bordercolordark="#FFFFFF" ' + CRLF() + ;
+         "       border " + CRLF() + ;
          "       >" + CRLF()
 //    FWrite( ::nH, ::cOutput )
       ::oHtm:cStr += ::cOutput
@@ -574,7 +574,7 @@ METHOD Put( lPutControls ) CLASS THtmlForm
          ::oHtm:cStr += ::cOutput
 
          IF ::captionImage != NIL
-            ::cOutPut := ' BACKGROUND="' + ::captionImage + '"' + CRLF()
+            ::cOutPut := ' background="' + ::captionImage + '"' + CRLF()
 //          FWrite( ::nH, ::cOutput )
             ::oHtm:cStr += ::cOutput
          ENDIF
@@ -597,14 +597,14 @@ METHOD Put( lPutControls ) CLASS THtmlForm
          ::oHtm:cStr += ::cOutput
       ENDIF
 
-      ::cOutPut := '<tr BGCOLOR="' + ::color + '">' + CRLF()
+      ::cOutPut := '<tr bgcolor="' + ::color + '">' + CRLF()
 //    FWrite( ::nH, ::cOutput )
       ::oHtm:cStr += ::cOutput
       ::cOutPut := '<td'
 //    FWrite( ::nH, ::cOutput )
       ::oHtm:cStr += ::cOutput
       IF ::bgImage != NIL
-         ::cOutPut := ' BACKGROUND="' + ::bgImage + '"' + CRLF()
+         ::cOutPut := ' background="' + ::bgImage + '"' + CRLF()
 //       FWrite( ::nH, ::cOutput )
          ::oHtm:cStr += ::cOutput
       ENDIF
@@ -625,31 +625,31 @@ METHOD Put( lPutControls ) CLASS THtmlForm
    ::oHtm:cStr += ::cOutput
 
    IF ::name != NIL
-      ::cOutPut := Space( 5 ) + '    NAME="' + ::Name + '"' + CRLF()
+      ::cOutPut := Space( 5 ) + '    name="' + ::Name + '"' + CRLF()
 //    FWrite( ::nH, ::cOutput )
       ::oHtm:cStr += ::cOutput
    ENDIF
 
    IF ::method != NIL
-      ::cOutPut := Space( 5 ) + '  METHOD="' + ::Method + '"' + CRLF()
+      ::cOutPut := Space( 5 ) + '  method="' + ::Method + '"' + CRLF()
 //    FWrite( ::nH, ::cOutput )
       ::oHtm:cStr += ::cOutput
    ENDIF
 
    IF ::Action != NIL
-      ::cOutPut := Space( 5 ) + '  ACTION=' + ::Action + '' + CRLF()
+      ::cOutPut := Space( 5 ) + '  action=' + ::Action + '' + CRLF()
 //    FWrite( ::nH, ::cOutput )
       ::oHtm:cStr += ::cOutput
    ENDIF
 
    IF ::Target != NIL
-      ::cOutPut := Space( 5 ) + '  TARGET=' + ::Target + '' + CRLF()
+      ::cOutPut := Space( 5 ) + '  target=' + ::Target + '' + CRLF()
 //    FWrite( ::nH, ::cOutput )
       ::oHtm:cStr += ::cOutput
    ENDIF
 
    IF ::Enctype != NIL
-      ::cOutPut := Space( 5 ) + ' ENCTYPE="' + ::encType + '"' + CRLF()
+      ::cOutPut := Space( 5 ) + ' enctype="' + ::encType + '"' + CRLF()
 //    FWrite( ::nH, ::cOutput )
       ::oHtm:cStr += ::cOutput
    ENDIF
diff --git a/harbour/contrib/xhb/thtm.prg b/harbour/contrib/xhb/thtm.prg
index 13228c0208..64a294b7da 100644
--- a/harbour/contrib/xhb/thtm.prg
+++ b/harbour/contrib/xhb/thtm.prg
@@ -861,11 +861,11 @@ METHOD HLine( nSize, nWidth, lShade, cColor ) CLASS THtml
 
    IF lShade
       ::cStr +=  CRLF() + ;
-         '<hr size = ' + hb_ntos( nSize ) + iif( cColor != NIL, " COLOR  " + cColor, "" ) + ' WIDTH = ' + hb_ntos( nWidth ) + '%>' + ;
+         "<hr size = " + hb_ntos( nSize ) + iif( cColor != NIL, " COLOR  " + cColor, "" ) + " width= " + hb_ntos( nWidth ) + '%>' + ;
          CRLF()
    ELSE
       ::cStr +=  CRLF() + ;
-         '<hr noshade size = ' + hb_ntos( nSize ) + iif( cColor != NIL, " COLOR  " + cColor, "" ) + ' WIDTH = ' + hb_ntos( nWidth ) + '%>' + ;
+         "<hr noshade size = " + hb_ntos( nSize ) + iif( cColor != NIL, " COLOR  " + cColor, "" ) + " width= " + hb_ntos( nWidth ) + '%>' + ;
          CRLF()
    ENDIF
 
@@ -1134,21 +1134,21 @@ METHOD PutImage( cImage, nBorder, nHeight, ;
    ENDIF
 
    IF nBorder != NIL .AND. HB_ISNUMERIC( nBorder )
-      cStr += " BORDER = " + hb_ntos( nBorder )
+      cStr += " border= " + hb_ntos( nBorder )
    ELSEIF nBorder != NIL .AND. HB_ISSTRING( nBorder )
-      cStr += " BORDER = " + '"' + nBorder + '"'
+      cStr += " border= " + '"' + nBorder + '"'
    ENDIF
 
    IF nHeight != NIL .AND. HB_ISNUMERIC( nHeight )
-      cStr += " HEIGHT = " + hb_ntos( nHeight ) + " "
+      cStr += " height= " + hb_ntos( nHeight ) + " "
    ELSEIF nHeight != NIL .AND. HB_ISSTRING( nHeight )
-      cStr += " HEIGHT = " + '"' + nHeight + '"'
+      cStr += " height= " + '"' + nHeight + '"'
    ENDIF
 
    IF nWidth != NIL .AND. HB_ISNUMERIC( nWidth )
-      cStr += " width = " + hb_ntos( nWidth ) + " "
+      cStr += " width= " + hb_ntos( nWidth ) + " "
    ELSEIF nWidth != NIL .AND. HB_ISSTRING( nWidth )
-      cStr += " width = " + nWidth + " "
+      cStr += " width= " + nWidth + " "
    ENDIF
 
    IF cOnClick != NIL
diff --git a/harbour/src/rtl/itemseri.c b/harbour/src/rtl/itemseri.c
index 69557ffd3d..c0d3c3769a 100644
--- a/harbour/src/rtl/itemseri.c
+++ b/harbour/src/rtl/itemseri.c
@@ -452,11 +452,11 @@ static HB_SIZE hb_itemSerialSize( PHB_ITEM pItem, HB_BOOL fNumSize,
             u = nLen - u;
             nLen = hb_cdpnDupLen( szVal, nLen, cdpIn, cdpOut );
             if( nLen <= 255 )
-               nSize = u > 1 ? nLen - u + 3: nLen + 2;
+               nSize = u > 1 ? nLen - u + 3 : nLen + 2;
             else if( nLen <= UINT16_MAX )
-               nSize = u > 2 ? nLen - u + 5: nLen + 3;
+               nSize = u > 2 ? nLen - u + 5 : nLen + 3;
             else
-               nSize = u > 4 ? nLen - u + 9: nLen + 5;
+               nSize = u > 4 ? nLen - u + 9 : nLen + 5;
          }
          break;
 
@@ -1351,8 +1351,8 @@ static HB_SIZE hb_deserializeItem( PHB_ITEM pItem,
 static HB_BOOL hb_deserializeTest( const HB_UCHAR ** pBufferPtr, HB_SIZE * pnSize,
                                    HB_SIZE nOffset, PHB_CYCLIC_REF * pRefPtr )
 {
-   const HB_UCHAR * pBuffer = * pBufferPtr;
-   HB_SIZE nSize = * pnSize, nLen = 0;
+   const HB_UCHAR * pBuffer = *pBufferPtr;
+   HB_SIZE nSize = *pnSize, nLen = 0;
 
    if( nSize == 0 )
       return HB_FALSE;
@@ -1488,7 +1488,7 @@ static HB_BOOL hb_deserializeTest( const HB_UCHAR ** pBufferPtr, HB_SIZE * pnSiz
             nSize++;
          break;
       case HB_SERIAL_REF:
-         if( !hb_itemSerialOffsetRef( pRefPtr, HB_GET_LE_UINT32( pBuffer ) ) )
+         if( ! hb_itemSerialOffsetRef( pRefPtr, HB_GET_LE_UINT32( pBuffer ) ) )
             return HB_FALSE;
          nSize = 5;
          break;
@@ -1603,19 +1603,19 @@ static HB_BOOL hb_deserializeTest( const HB_UCHAR ** pBufferPtr, HB_SIZE * pnSiz
          break;
    }
 
-   if( nSize > * pnSize )
+   if( nSize > *pnSize )
       return HB_FALSE;
 
-   * pnSize -= nSize;
-   * pBufferPtr += nSize;
+   *pnSize -= nSize;
+   *pBufferPtr += nSize;
 
    while( nLen )
    {
       nOffset += nSize;
-      nSize = * pnSize;
-      if( !hb_deserializeTest( pBufferPtr, pnSize, nOffset, pRefPtr ) )
+      nSize = *pnSize;
+      if( ! hb_deserializeTest( pBufferPtr, pnSize, nOffset, pRefPtr ) )
          return HB_FALSE;
-      nSize -= * pnSize;
+      nSize -= *pnSize;
       --nLen;
    }
 
diff --git a/harbour/tests/wvtext.prg b/harbour/tests/wvtext.prg
index e29b39b57f..099e91db50 100644
--- a/harbour/tests/wvtext.prg
+++ b/harbour/tests/wvtext.prg
@@ -405,7 +405,7 @@ PROCEDURE thFunc()
    ENDIF
    hb_gtInfo( HB_GTI_FONTNAME , "Lucida Console" )
    hb_gtInfo( HB_GTI_WINTITLE, "test.dbf    [" + iif( ( s_nBrowser % 2 ) != 0, "RESIZABLE_BY_ROWS", "RESIZABLE_BY_FONT" ) + "]" )
-   hb_gtInfo( HB_GTI_ALTENTER, .T. )  //allow alt-enter for full screen
+   hb_gtInfo( HB_GTI_ALTENTER, .T. )  // allow alt-enter for full screen
 
    SetCursor( SC_NONE )
 
@@ -424,7 +424,7 @@ PROCEDURE thFunc()
       " Rows and " + hb_ntos( MaxCol() ) + " Columns"
    hb_DispOutAt( 0, 0, PadC( cTitle, MaxCol() + 1 ), "N/GR*" )
 
-   hb_gtInfo( HB_GTI_SETPOS_XY, s_nZx, s_nZy ) //this does not work until something is displayed
+   hb_gtInfo( HB_GTI_SETPOS_XY, s_nZx, s_nZy ) // this does not work until something is displayed
 
    USE test NEW SHARED
    aStruct := dbStruct()