From: <ai...@us...> - 2011-07-04 19:54:25
|
Revision: 11785 http://plplot.svn.sourceforge.net/plplot/?rev=11785&view=rev Author: airwin Date: 2011-07-04 19:54:19 +0000 (Mon, 04 Jul 2011) Log Message: ----------- Style previous changes. Modified Paths: -------------- trunk/include/plplotP.h trunk/src/plsym.c Modified: trunk/include/plplotP.h =================================================================== --- trunk/include/plplotP.h 2011-07-04 19:37:47 UTC (rev 11784) +++ trunk/include/plplotP.h 2011-07-04 19:54:19 UTC (rev 11785) @@ -625,9 +625,9 @@ PLDLLIMPEXP void plP_script_scale( PLBOOL ifupper, PLINT *level, - PLFLT *old_scale, PLFLT *scale, - PLFLT *old_offset, PLFLT *offset); - + PLFLT *old_scale, PLFLT *scale, + PLFLT *old_offset, PLFLT *offset ); + // Driver draws text void Modified: trunk/src/plsym.c =================================================================== --- trunk/src/plsym.c 2011-07-04 19:37:47 UTC (rev 11784) +++ trunk/src/plsym.c 2011-07-04 19:54:19 UTC (rev 11785) @@ -787,7 +787,7 @@ PLINT ch, i, length, level = 0, style, oline = 0, uline = 0; PLFLT width = 0., xorg = 0., yorg = 0., def, ht, dscale, scale; - PLFLT old_sscale, sscale, old_soffset, soffset; + PLFLT old_sscale, sscale, old_soffset, soffset; plgchr( &def, &ht ); dscale = 0.05 * ht; @@ -805,17 +805,17 @@ ch = symbol[i]; if ( ch == -1 ) // superscript { - plP_script_scale( TRUE, &level, - &old_sscale, &sscale, &old_soffset, &soffset); - yorg = 16.0*dscale*soffset; - scale = dscale * sscale; + plP_script_scale( TRUE, &level, + &old_sscale, &sscale, &old_soffset, &soffset ); + yorg = 16.0 * dscale * soffset; + scale = dscale * sscale; } else if ( ch == -2 ) // subscript { - plP_script_scale( FALSE, &level, - &old_sscale, &sscale, &old_soffset, &soffset); - yorg = -16.0*dscale*soffset; - scale = dscale * sscale; + plP_script_scale( FALSE, &level, + &old_sscale, &sscale, &old_soffset, &soffset ); + yorg = -16.0 * dscale * soffset; + scale = dscale * sscale; } else if ( ch == -3 ) // back-char xorg -= width * scale; @@ -1268,35 +1268,35 @@ void plP_script_scale( PLBOOL ifupper, PLINT *level, - PLFLT *old_scale, PLFLT *scale, - PLFLT *old_offset, PLFLT *offset) + PLFLT *old_scale, PLFLT *scale, + PLFLT *old_offset, PLFLT *offset ) { - if (*level == 0) - { - *old_scale = 1.; - *old_offset = 0.; - } - else - { - *old_scale = *scale; - *old_offset = *offset; - } - if((*level >=0 && ifupper) || (*level <=0 && !ifupper)) - { - // If superscript of subscript moves further away from centerline.... - *scale = 0.75 * *old_scale; - *offset = *old_offset + *old_scale; - } - else - { - // If superscript of subscript moves closer to centerline.... - *scale = *old_scale/0.75; - *offset = *old_offset - *scale; - } - if(ifupper) - (*level)++; - else - (*level)--; + if ( *level == 0 ) + { + *old_scale = 1.; + *old_offset = 0.; + } + else + { + *old_scale = *scale; + *old_offset = *offset; + } + if ( ( *level >= 0 && ifupper ) || ( *level <= 0 && !ifupper ) ) + { + // If superscript of subscript moves further away from centerline.... + *scale = 0.75 * *old_scale; + *offset = *old_offset + *old_scale; + } + else + { + // If superscript of subscript moves closer to centerline.... + *scale = *old_scale / 0.75; + *offset = *old_offset - *scale; + } + if ( ifupper ) + ( *level )++; + else + ( *level )--; } //-------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |