From: <ai...@us...> - 2008-12-30 03:11:06
|
Revision: 9234 http://plplot.svn.sourceforge.net/plplot/?rev=9234&view=rev Author: airwin Date: 2008-12-30 03:11:03 +0000 (Tue, 30 Dec 2008) Log Message: ----------- Consistent changes to all versions of example 23 to get rid of extra blank in stdout. Modified Paths: -------------- trunk/bindings/octave/demos/x23c.m trunk/examples/ada/x23a.adb.cmake trunk/examples/ada/xthick23a.adb.cmake trunk/examples/c/x23c.c trunk/examples/c++/x23.cc trunk/examples/f77/x23f.fm4 trunk/examples/f95/x23f.f90 trunk/examples/java/x23.java trunk/examples/ocaml/x23.ml trunk/examples/perl/x23.pl trunk/examples/python/xw23.py trunk/examples/tcl/x23.tcl Modified: trunk/bindings/octave/demos/x23c.m =================================================================== --- trunk/bindings/octave/demos/x23c.m 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/bindings/octave/demos/x23c.m 2008-12-30 03:11:03 UTC (rev 9234) @@ -277,7 +277,7 @@ fci_old = plgfci(); [ifamily,istyle,iweight] = plgfont(); fprintf(strm,"For example 23 prior to page 12 the FCI is 0x%x\n",fci_old); -fprintf(strm,"For example 23 prior to page 12 the font family, style and weight are %s %s %s\n",deblank(family(ifamily+1,:)), deblank(style(istyle+1,:)), deblank(weight(iweight+1,:))); +fprintf(strm,"For example 23 prior to page 12 the font family, style and weight are %s %s %s\n",deblank(family(ifamily+1,:)), deblank(style(istyle+1,:)), deblank(weight(iweight+1,:))); for page=11:15 dy = 0.030; Modified: trunk/examples/ada/x23a.adb.cmake =================================================================== --- trunk/examples/ada/x23a.adb.cmake 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/ada/x23a.adb.cmake 2008-12-30 03:11:03 UTC (rev 9234) @@ -371,7 +371,7 @@ -- Put(fci_old, Base => 16, Width => 0); -- Outputs "Ada" style. Put("0x" & Hex_Image_8(fci_old)); -- Outputs "C" style. New_Line; - Put("For example 23 prior to page 12 the font family, style and weight are " + Put("For example 23 prior to page 12 the font family, style and weight are " & family(ifamily) & " " & style(istyle) & " " & weight(iweight)); New_Line; Modified: trunk/examples/ada/xthick23a.adb.cmake =================================================================== --- trunk/examples/ada/xthick23a.adb.cmake 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/ada/xthick23a.adb.cmake 2008-12-30 03:11:03 UTC (rev 9234) @@ -371,7 +371,7 @@ -- Put(fci_old, Base => 16, Width => 0); -- Outputs "Ada" style. Put("0x" & Hex_Image_8(fci_old)); -- Outputs "C" style. New_Line; - Put("For example 23 prior to page 12 the font family, style and weight are " + Put("For example 23 prior to page 12 the font family, style and weight are " & family(ifamily) & " " & style(istyle) & " " & weight(iweight)); New_Line; Modified: trunk/examples/c/x23c.c =================================================================== --- trunk/examples/c/x23c.c 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/c/x23c.c 2008-12-30 03:11:03 UTC (rev 9234) @@ -284,7 +284,7 @@ plgfci(&fci_old); plgfont(&ifamily, &istyle, &iweight); printf("For example 23 prior to page 12 the FCI is 0x%x\n",fci_old); - printf("For example 23 prior to page 12 the font family, style and weight are %s %s %s\n",family[ifamily], style[istyle], weight[iweight]); + printf("For example 23 prior to page 12 the font family, style and weight are %s %s %s\n",family[ifamily], style[istyle], weight[iweight]); for (page=11; page<16; page++) { PLFLT dy = 0.030; Modified: trunk/examples/c++/x23.cc =================================================================== --- trunk/examples/c++/x23.cc 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/c++/x23.cc 2008-12-30 03:11:03 UTC (rev 9234) @@ -312,7 +312,7 @@ pls->gfci(fci_old); pls->gfont(ifamily, istyle, iweight); cout << "For example 23 prior to page 12 the FCI is 0x" << hex << fci_old << endl; - cout << "For example 23 prior to page 12 the font family, style and weight are " << family[ifamily] << " " << style[istyle] << " " << weight[iweight] << endl; + cout << "For example 23 prior to page 12 the font family, style and weight are " << family[ifamily] << " " << style[istyle] << " " << weight[iweight] << endl; for (page=11; page<16; page++) { PLFLT dy = 0.030; Modified: trunk/examples/f77/x23f.fm4 =================================================================== --- trunk/examples/f77/x23f.fm4 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/f77/x23f.fm4 2008-12-30 03:11:03 UTC (rev 9234) @@ -313,7 +313,7 @@ write (*,'(a,z8)') 'For example 23 prior to page 12 the FCI is 0x' & ,fci_old write (*,'(a)') 'For example 23 prior to page 12 the '// - & 'font family, style and weight are '// + & 'font family, style and weight are '// & trim(family(ifamily+1))//' '//trim(style(istyle+1))//' '// & trim(weight(iweight+1)) Modified: trunk/examples/f95/x23f.f90 =================================================================== --- trunk/examples/f95/x23f.f90 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/f95/x23f.f90 2008-12-30 03:11:03 UTC (rev 9234) @@ -302,7 +302,7 @@ call plgfci(fci_old) call plgfont(ifamily, istyle, iweight) write (*,'(a,z8)') 'For example 23 prior to page 12 the FCI is 0x',fci_old - write (*,'(a)') 'For example 23 prior to page 12 the font family, style and weight are '// & + write (*,'(a)') 'For example 23 prior to page 12 the font family, style and weight are '// & trim(family(ifamily+1))//' '//trim(style(istyle+1))//' '//trim(weight(iweight+1)) do page=11,15 Modified: trunk/examples/java/x23.java =================================================================== --- trunk/examples/java/x23.java 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/java/x23.java 2008-12-30 03:11:03 UTC (rev 9234) @@ -298,7 +298,7 @@ pls.gfci(fci_old); pls.gfont(ifamily, istyle, iweight); System.out.println("For example 23 prior to page 12 the FCI is 0x"+Long.toHexString(fci_old[0])); - System.out.println("For example 23 prior to page 12 the font family, style and weight are "+family[ifamily[0]]+" "+ style[istyle[0]]+ " "+ weight[iweight[0]]);; + System.out.println("For example 23 prior to page 12 the font family, style and weight are "+family[ifamily[0]]+" "+ style[istyle[0]]+ " "+ weight[iweight[0]]);; for (page=11; page<16; page++) { double dy = 0.030; Modified: trunk/examples/ocaml/x23.ml =================================================================== --- trunk/examples/ocaml/x23.ml 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/ocaml/x23.ml 2008-12-30 03:11:03 UTC (rev 9234) @@ -276,7 +276,7 @@ let ifamily, istyle, iweight = plgfont () in printf "For example 23 prior to page 12 the FCI is 0x%lx\n" (Int64.to_int32 fci_old); - printf "For example 23 prior to page 12 the font family, style and weight are %s %s %s\n" + printf "For example 23 prior to page 12 the font family, style and weight are %s %s %s\n" family.(ifamily) style.(istyle) weight.(iweight); for page = 11 to 15 do Modified: trunk/examples/perl/x23.pl =================================================================== --- trunk/examples/perl/x23.pl 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/perl/x23.pl 2008-12-30 03:11:03 UTC (rev 9234) @@ -276,7 +276,7 @@ my ($ifamily, $istyle, $iweight) = plgfont(); 1; printf("For example 23 prior to page 12 the FCI is 0x%x\n",$fci_old); -printf("For example 23 prior to page 12 the font family, style and weight are %s %s %s\n", +printf("For example 23 prior to page 12 the font family, style and weight are %s %s %s\n", $family[$ifamily], $style[$istyle], $weight[$iweight]); for (my $page=11; $page<16; $page++) { Modified: trunk/examples/python/xw23.py =================================================================== --- trunk/examples/python/xw23.py 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/python/xw23.py 2008-12-30 03:11:03 UTC (rev 9234) @@ -258,7 +258,7 @@ istyle = font[1] iweight = font[2] print "For example 23 prior to page 12 the FCI is",hex(fci_old) - print "For example 23 prior to page 12 the font family, style and weight are ",family[ifamily],style[istyle],weight[iweight] + print "For example 23 prior to page 12 the font family, style and weight are %s %s %s" % (family[ifamily],style[istyle],weight[iweight]) FCI_COMBINATIONS = 30 dy = 0.030 Modified: trunk/examples/tcl/x23.tcl =================================================================== --- trunk/examples/tcl/x23.tcl 2008-12-30 00:03:38 UTC (rev 9233) +++ trunk/examples/tcl/x23.tcl 2008-12-30 03:11:03 UTC (rev 9234) @@ -299,7 +299,7 @@ $w cmd plgfci fci_old $w cmd plgfont ifamily istyle iweight puts [ format "For example 23 prior to page 12 the FCI is 0x%x" $fci_old ] - puts [ format "For example 23 prior to page 12 the font family, style and weight are %s %s %s" \ + puts [ format "For example 23 prior to page 12 the font family, style and weight are %s %s %s" \ $family($ifamily) $style($istyle) $weight($iweight) ] for {set page 11} {$page<16} {incr page} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |