2012-11-18 12:46 UTC+0100 Viktor Szakats (harbour syenar.net)

* src/pp/ppcore.c * src/pp/pplib.c * some uncrustify formattings applied * tests/testbrw.prg * website/samples/testbrw.prg.html * cleanup * website/menu/harbour-menu.js ! fixed menu links to work when used under a subdir * website/samples/array16.prg.html * website/samples/arreval.prg.html * website/samples/begin.prg.html * website/samples/byref.prg.html * website/samples/codebl.prg.html * website/samples/codebloc.prg.html * website/samples/dates3.prg.html * website/samples/foreach.prg.html * website/samples/hello.prg.html * website/samples/initexit.prg.html * website/samples/longdev.prg.html * website/samples/mousetst.prg.html * website/samples/onidle.prg.html * website/samples/osshell.prg.html * website/samples/parseini.prg.html * website/samples/switch.prg.html * website/samples/testbrdb.prg.html * website/samples/testbrw.prg.html * website/samples/testhtml.prg.html * website/samples/testidle.prg.html * website/samples/tstmacro.prg.html * enabled light mode to disable gutter, so now the code can be copy pasted easily
2012-11-18 11:51:17 +00:00
parent 2a9b27f09b
commit ceb5386de5
26 changed files with 493 additions and 457 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,42 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2012-11-18 12:46 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * src/pp/ppcore.c
+  * src/pp/pplib.c
+    * some uncrustify formattings applied
+
+  * tests/testbrw.prg
+  * website/samples/testbrw.prg.html
+    * cleanup
+
+  * website/menu/harbour-menu.js
+    ! fixed menu links to work when used under a subdir
+
+  * website/samples/array16.prg.html
+  * website/samples/arreval.prg.html
+  * website/samples/begin.prg.html
+  * website/samples/byref.prg.html
+  * website/samples/codebl.prg.html
+  * website/samples/codebloc.prg.html
+  * website/samples/dates3.prg.html
+  * website/samples/foreach.prg.html
+  * website/samples/hello.prg.html
+  * website/samples/initexit.prg.html
+  * website/samples/longdev.prg.html
+  * website/samples/mousetst.prg.html
+  * website/samples/onidle.prg.html
+  * website/samples/osshell.prg.html
+  * website/samples/parseini.prg.html
+  * website/samples/switch.prg.html
+  * website/samples/testbrdb.prg.html
+  * website/samples/testbrw.prg.html
+  * website/samples/testhtml.prg.html
+  * website/samples/testidle.prg.html
+  * website/samples/tstmacro.prg.html
+    * enabled light mode to disable gutter, so now
+      the code can be copy pasted easily
+
 2012-11-18 02:52 UTC+0100 Viktor Szakats (harbour syenar.net)
  * package/mpkg_win.nsi
  * package/winuni/mpkg_win_uni.nsi
--- a/harbour/src/pp/ppcore.c
+++ b/harbour/src/pp/ppcore.c
--- a/harbour/src/pp/pplib.c
+++ b/harbour/src/pp/pplib.c
@@ -170,7 +170,7 @@ HB_FUNC( __PP_INIT )

      pStatePtr = ( PHB_PP_STATE * ) hb_gcAllocate( sizeof( PHB_PP_STATE ),
                                                    &s_gcPPFuncs );
-      * pStatePtr = pState;
+      *pStatePtr = pState;
      ppItem = hb_itemPutPtrGC( NULL, ( void * ) pStatePtr );

      hb_pp_init( pState, HB_TRUE, 0, NULL, NULL, NULL,
--- a/harbour/tests/testbrw.prg
+++ b/harbour/tests/testbrw.prg
@@ -62,7 +62,7 @@ PROCEDURE Main()
   nCol := Col()
   hb_DispBox( 4, 4, 17, 31, hb_UTF8ToStrBox( "┌─┐│┘─└│ " ) )
 #ifdef HB_COMPAT_C53
-   oBrowse:SetKey( 0, {| ob, nkey | Defproc( ob, nKey ) } )
+   oBrowse:SetKey( 0, {| ob, nkey | DefProc( ob, nKey ) } )
   WHILE .T.
      oBrowse:ForceStable()
      IF oBrowse:applykey( Inkey( 0 ) ) == -1
@@ -137,11 +137,11 @@ PROCEDURE Main()

 #ifdef HB_COMPAT_C53

-FUNCTION defproc( ob, nkey )
+FUNCTION DefProc( oBrowse, nKey )

   IF nKey == K_TAB
      hb_DispOutAt( 0, 0, Time() )
-      ob:Refreshall()
+      oBrowse:Refreshall()
   ENDIF

   RETURN 1
--- a/harbour/website/menu/harbour-menu.js
+++ b/harbour/website/menu/harbour-menu.js
@@ -1,53 +1,53 @@
 stm_bm(["menu54d6",900,"/images/","blank.gif",0,"","",0,0,250,0,1000,1,0,0,"./","",0,0,1,2,"default","hand","",1,25],this);
 stm_bp("p0",[0,4,0,0,0,0,0,0,100,"",-2,"",-2,10,0,0,"#999999","transparent","",3,0,0,"#000000"]);
 stm_ai("p0i0",[2,"","","",16,-1,0,"","_self","","","","",0,0,0,"","",0,0,0,0,1,"#E6EFF9",1,"#FFD602",1,"","",3,3,0,0,"#E6EFF9","#000000","#000000","#000000","8pt Verdana","8pt Verdana",0,0,"","","","",0,0,0]);
-stm_aix("p0i1","p0i0",[2,"","home.png","home.png",39,65,0,"index.html","_self","","","","",0,0,0,"","",0,0,0,0,1,"#E6EFF9",1,"#FFFFFF",1,"","",3,3,0,0,"#FFFFFF","#E6EFF9"]);
+stm_aix("p0i1","p0i0",[2,"","home.png","home.png",39,65,0,"/index.html","_self","","","","",0,0,0,"","",0,0,0,0,1,"#E6EFF9",1,"#FFFFFF",1,"","",3,3,0,0,"#FFFFFF","#E6EFF9"]);
 stm_aix("p0i2","p0i0",[2,"","","",20]);
-stm_aix("p0i3","p0i1",[2,"","about.png","about.png",38,65,0,"about.html","_self","","","","",0,0,0,"","",-1,-1]);
+stm_aix("p0i3","p0i1",[2,"","about.png","about.png",38,65,0,"/about.html","_self","","","","",0,0,0,"","",-1,-1]);
 stm_bp("p1",[1,4,0,-3,2,0,0,0,100,"",-2,"",-2,50,0,0,"#999999","#E6EFF9","",3,1,1,"#b0c4d7"]);
-stm_aix("p1i0","p0i0",[0," About Harbour ","","",-1,-1,0,"about.html","_self","","","","",0,0,0,"","",0,0,0,0,1,"#E6EFF9",1,"#FFFFFF",0,"","",3,3,1,1,"#E6EFF9","#CCCCCC","#000000","#000000","bold 8pt Verdana","bold 8pt Verdana"]);
-stm_aix("p1i1","p1i0",[0," License ","","",-1,-1,0,"license.html"]);
+stm_aix("p1i0","p0i0",[0," About Harbour ","","",-1,-1,0,"/about.html","_self","","","","",0,0,0,"","",0,0,0,0,1,"#E6EFF9",1,"#FFFFFF",0,"","",3,3,1,1,"#E6EFF9","#CCCCCC","#000000","#000000","bold 8pt Verdana","bold 8pt Verdana"]);
+stm_aix("p1i1","p1i0",[0," License ","","",-1,-1,0,"/license.html"]);
 stm_ep();
 stm_aix("p0i4","p0i2",[]);
-stm_aix("p0i5","p0i1",[2,"","documentation.png","documentation.png",90,65,0,"doc/harbour.html","_self","","","","",0,0,0,"","",-1,-1,0,0,1,"#E6EFF9",1,"#FFD602"]);
+stm_aix("p0i5","p0i1",[2,"","documentation.png","documentation.png",90,65,0,"/doc/harbour.html","_self","","","","",0,0,0,"","",-1,-1,0,0,1,"#E6EFF9",1,"#FFD602"]);
 stm_bpx("p2","p1",[1,4,0,-3,3,0,0,0,100,"",-2,"",-2,50,0,0,"#CCCCCC"]);
 stm_aix("p2i0","p1i0",[0," Basic information (README) ","","",-1,-1,0,"http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/README"]);
 stm_aix("p2i1","p1i0",[0," ChangeLog ","","",-1,-1,0,"http://harbour-project.svn.sourceforge.net/svnroot/harbour-project/trunk/harbour/ChangeLog"]);
 stm_aix("p2i2","p1i0",[0," Clipper 5.3 ","","",-1,-1,0,"http://x-hacker.org/ng/53guide/"]);
-stm_aix("p2i3","p1i0",[0," Harbour ","","",-1,-1,0,"doc/harbour.html"]);
-stm_aix("p2i4","p1i0",[0," FAQ ","","",-1,-1,0,"faq/harbour.html"]);
-stm_aix("p2i5","p1i0",[0," Samples ","","",-1,-1,0,"samples.html"]);
-//stm_aix("p2i3","p1i0",[0," Tutorials & Articles ","","",-1,-1,0,"tutorials.html"]);
+stm_aix("p2i3","p1i0",[0," Harbour ","","",-1,-1,0,"/doc/harbour.html"]);
+stm_aix("p2i4","p1i0",[0," FAQ ","","",-1,-1,0,"/faq/harbour.html"]);
+stm_aix("p2i5","p1i0",[0," Samples ","","",-1,-1,0,"/samples.html"]);
+//stm_aix("p2i3","p1i0",[0," Tutorials & Articles ","","",-1,-1,0,"/tutorials.html"]);
 stm_ep();
 stm_aix("p0i6","p0i2",[]);
 stm_aix("p0i7","p0i3",[2,"","downloads.png","downloads.png",67,65,0,"http://sourceforge.net/project/showfiles.php?group_id=681"]);
 stm_bpx("p3","p1",[]);
 stm_aix("p3i0","p1i0",[0," Binaries & Source ","","",-1,-1,0,"http://sourceforge.net/project/showfiles.php?group_id=681"]);
-stm_aix("p3i1","p1i0",[0," Nightly builds ","","",-1,-1,0,"snapshot.html"]);
-//stm_aix("p3i2","p1i0",[0," Auxiliar tools ","","",-1,-1,0,"tools.html"]);
-stm_aix("p3i3","p1i0",[0," Contributions Libraries ","","",-1,-1,0,"download_contrib.html"]);
-stm_aix("p3i4","p1i0",[0," Third-party Tools and Libraries ","","",-1,-1,0,"third-party.html"]);
+stm_aix("p3i1","p1i0",[0," Nightly builds ","","",-1,-1,0,"/snapshot.html"]);
+//stm_aix("p3i2","p1i0",[0," Auxiliar tools ","","",-1,-1,0,"/tools.html"]);
+stm_aix("p3i3","p1i0",[0," Contributions Libraries ","","",-1,-1,0,"/download_contrib.html"]);
+stm_aix("p3i4","p1i0",[0," Third-party Tools and Libraries ","","",-1,-1,0,"/third-party.html"]);
 stm_ep();
 stm_aix("p0i8","p0i2",[]);
-stm_aix("p0i9","p0i3",[2,"","development.png","development.png",80,65,0,"mailing.html"]);
+stm_aix("p0i9","p0i3",[2,"","development.png","development.png",80,65,0,"/mailing.html"]);
 stm_bpx("p4","p1",[]);
-stm_aix("p4i0","p1i0",[0," Mailing Lists ","","",-1,-1,0,"mailing.html"]);
+stm_aix("p4i0","p1i0",[0," Mailing Lists ","","",-1,-1,0,"/mailing.html"]);
 stm_aix("p4i1","p1i0",[0," Bug/Issue Database ","","",-1,-1,0,"http://sourceforge.net/tracker/?atid=100681&group_id=681&func=browse"]);
 stm_aix("p4i2","p1i0",[0," Report Bugs ","","",-1,-1,0,"https://sourceforge.net/bugs/?group_id=681"]);
 stm_ep();
 stm_aix("p0i10","p0i2",[]);
-stm_aix("p0i11","p0i3",[2,"","news.png","news.png",34,65,0,"news.html"]);
+stm_aix("p0i11","p0i3",[2,"","news.png","news.png",34,65,0,"/news.html"]);
 stm_bpx("p5","p1",[]);
-stm_aix("p5i0","p1i0",[0," News ","","",-1,-1,0,"news.html"]);
-stm_aix("p5i1","p1i0",[0," ChangeLog ","","",-1,-1,0,"changelog.html"]);
+stm_aix("p5i0","p1i0",[0," News ","","",-1,-1,0,"/news.html"]);
+stm_aix("p5i1","p1i0",[0," ChangeLog ","","",-1,-1,0,"/changelog.html"]);
 stm_ep();
 stm_aix("p0i12","p0i2",[]);
-stm_aix("p0i13","p0i1",[2,"","crew.png","crew.png",58,65,0,"crew.html"]);
+stm_aix("p0i13","p0i1",[2,"","crew.png","crew.png",58,65,0,"/crew.html"]);
 stm_aix("p0i14","p0i2",[]);
-stm_aix("p0i15","p0i3",[2,"","harbourart.png","harbourart.png",72,65,0,"logos.html"]);
+stm_aix("p0i15","p0i3",[2,"","harbourart.png","harbourart.png",72,65,0,"/logos.html"]);
 stm_bpx("p6","p1",[]);
-stm_aix("p6i0","p1i0",[0," Official Art ","","",-1,-1,0,"logos.html"]);
-stm_aix("p6i1","p1i0",[0," T-Shirts ","","",-1,-1,0,"tshirts.html"]);
+stm_aix("p6i0","p1i0",[0," Official Art ","","",-1,-1,0,"/logos.html"]);
+stm_aix("p6i1","p1i0",[0," T-Shirts ","","",-1,-1,0,"/tshirts.html"]);
 stm_ep();
 stm_aix("p0i16","p0i2",[]);
 stm_aix("p0i17","p0i3",[2,"","language_en.png","language_en.png",62,65,0,""]);
--- a/harbour/website/samples/array16.prg.html
+++ b/harbour/website/samples/array16.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // Harbour multidimensional arrays support

--- a/harbour/website/samples/arreval.prg.html
+++ b/harbour/website/samples/arreval.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 PROCEDURE Main()

--- a/harbour/website/samples/begin.prg.html
+++ b/harbour/website/samples/begin.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // This files demonstrates the use of BEGIN/RECOVER/END SEQUENCE
 // and BREAK statement
--- a/harbour/website/samples/byref.prg.html
+++ b/harbour/website/samples/byref.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // Managing variables by reference

--- a/harbour/website/samples/codebl.prg.html
+++ b/harbour/website/samples/codebl.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 STATIC s_cbStatic

--- a/harbour/website/samples/codebloc.prg.html
+++ b/harbour/website/samples/codebloc.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // codeblocks test

--- a/harbour/website/samples/dates3.prg.html
+++ b/harbour/website/samples/dates3.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // Testing Harbour dates management.

--- a/harbour/website/samples/foreach.prg.html
+++ b/harbour/website/samples/foreach.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 #define LEFTEQUAL( l, r )       ( Left( l, Len( r ) ) == r )

--- a/harbour/website/samples/hello.prg.html
+++ b/harbour/website/samples/hello.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // Typical welcome message

--- a/harbour/website/samples/initexit.prg.html
+++ b/harbour/website/samples/initexit.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // Testing Harbour INIT and EXIT functions and initialization
 // of static variables
--- a/harbour/website/samples/longdev.prg.html
+++ b/harbour/website/samples/longdev.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // Testing Harbour long string handling with device output.

--- a/harbour/website/samples/mousetst.prg.html
+++ b/harbour/website/samples/mousetst.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 /*
 * Copyright 2000 Alejandro de Garate <alex_degarate hotmail com>
--- a/harbour/website/samples/onidle.prg.html
+++ b/harbour/website/samples/onidle.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 #include "hbmemory.ch"

--- a/harbour/website/samples/osshell.prg.html
+++ b/harbour/website/samples/osshell.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 //
 // This program shells to OS
--- a/harbour/website/samples/parseini.prg.html
+++ b/harbour/website/samples/parseini.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 /**
 * Test for Ini file reading/writing
--- a/harbour/website/samples/switch.prg.html
+++ b/harbour/website/samples/switch.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 #ifdef __XHARBOUR__
 #define OTHERWISE DEFAULT
--- a/harbour/website/samples/testbrdb.prg.html
+++ b/harbour/website/samples/testbrdb.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // Testing Browse()

--- a/harbour/website/samples/testbrw.prg.html
+++ b/harbour/website/samples/testbrw.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 // Harbour Class TBrowse and TBColumn sample

@@ -72,7 +72,7 @@ PROCEDURE Main()
   nCol := Col()
   hb_DispBox( 4, 4, 17, 31, hb_UTF8ToStrBox( "┌─┐│┘─└│ " ) )
 #ifdef HB_COMPAT_C53
-   oBrowse:SetKey( 0, {| ob, nkey | Defproc( ob, nKey ) } )
+   oBrowse:SetKey( 0, {| ob, nkey | DefProc( ob, nKey ) } )
   WHILE .T.
      oBrowse:ForceStable()
      IF oBrowse:applykey( Inkey( 0 ) ) == -1
@@ -147,11 +147,11 @@ PROCEDURE Main()

 #ifdef HB_COMPAT_C53

-FUNCTION defproc( ob, nkey )
+FUNCTION DefProc( oBrowse, nKey )

   IF nKey == K_TAB
      hb_DispOutAt( 0, 0, Time() )
-      ob:Refreshall()
+      oBrowse:Refreshall()
   ENDIF

   RETURN 1
--- a/harbour/website/samples/testhtml.prg.html
+++ b/harbour/website/samples/testhtml.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 /**
 *
--- a/harbour/website/samples/testidle.prg.html
+++ b/harbour/website/samples/testidle.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 PROCEDURE Main()

--- a/harbour/website/samples/tstmacro.prg.html
+++ b/harbour/website/samples/tstmacro.prg.html
@@ -12,7 +12,7 @@
 </head>
 <body>

-<script type="syntaxhighlighter" class="brush: harbour"><![CDATA[
+<script type="syntaxhighlighter" class="brush: harbour; light: true"><![CDATA[

 #include "hbclass.ch"