[frontierkernel-commits] Frontier/Common/source langscan.c,1.4,1.5 oppack.c,1.4,1.5

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2875

Modified Files:
	langscan.c oppack.c 
Log Message:
partial fix for string to script/outline bug < http://sourceforge.net/tracker/index.php?func=detail&aid=1093595&group_id=120666&atid=687798 >

Index: langscan.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langscan.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** langscan.c	11 Jan 2005 22:48:07 -0000	1.4
--- langscan.c	22 Jan 2005 18:35:56 -0000	1.5
***************
*** 1161,1164 ****
--- 1161,1167 ----
  				if ((token2 == '}') || (ctscanlines > line2)) { /*we got a return, go ahead & strip it*/
  					
+ 					if (token2 == '}') /* 2005-01-15 creedon - fix suggested by JES w/caveats < http://sourceforge.net/tracker/index.php?func=detail&aid=1093595&group_id=120666&atid=687798 > */
+ 						ix1 = ix2 - 1;
+ 
  					short len = ix2 - ix1;
  					

Index: oppack.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oppack.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** oppack.c	11 Jan 2005 22:48:09 -0000	1.4
--- oppack.c	22 Jan 2005 18:35:56 -0000	1.5
***************
*** 1225,1230 ****
  			}
  		
! 		if (gethandlesize (hlinetext) == 0) // 5.0a4 dmb: empty lines don't dictate structure
! 			level = lastlevel;
  		
  		if (level > lastlevel) {
--- 1225,1231 ----
  			}
  		
! 		 /* 2005-01-21 creedon, aradke, JES - empty lines DO dictate structure < http://sourceforge.net/tracker/index.php?func=detail&aid=1093595&group_id=120666&atid=687798 > */
! 		 /* if (gethandlesize (hlinetext) == 0) // 5.0a4 dmb: empty lines don't dictate structure
! 			level = lastlevel; */
  		
  		if (level > lastlevel) {