Fixed Fortran90 output

Making sure that the updates for continuation lines in Fortran90 are not
contradictory.

Author: vermaseren

sources/notation.c

@@ -968,12 +968,22 @@ void PrintSubtermList(int from,int to)
 		continuation line in fortran mode.
 		But the next statement should start on a blank line.
 */
+/*
 		FiniLine();
 		if ( AC.OutputMode == FORTRANMODE || AC.OutputMode == PFORTRANMODE ) {
-			AO.OutFill = AO.OutputLine; /* Clear the line */
+			AO.OutFill = AO.OutputLine;
 			TokenToLine((UBYTE *)"      ");
 			AO.OutSkip = 7;
 		}
+*/
+		if ( AC.OutputMode == FORTRANMODE || AC.OutputMode == PFORTRANMODE ) {
+			AO.OutSkip = 6;
+			FiniLine();
+			AO.OutSkip = 7;
+		}
+		else {
+			FiniLine();
+		}
 		i += inc;
 	} while ( i != to );
 }

sources/sch.c

@@ -28,7 +28,7 @@
  *   You should have received a copy of the GNU General Public License along
  *   with FORM.  If not, see <http://www.gnu.org/licenses/>.
  */
-/* #] License : */ 
+/* #] License : */
 /*
   	#[ Includes : sch.c
 */
@@ -59,7 +59,7 @@ static int noextralinefeed = 0;
 static int lowestlevel = 1;
 
 /*
-  	#] Includes : 
+  	#] Includes :
  	#[ schryf-Utilities :
  		#[ StrCopy :			UBYTE *StrCopy(from,to)
 */
@@ -71,7 +71,7 @@ UBYTE *StrCopy(UBYTE *from, UBYTE *to)
 }
 
 /*
- 		#] StrCopy : 
+ 		#] StrCopy :
  		#[ AddToLine :			VOID AddToLine(s)
 
 	Puts the characters of s in the outputline. If the line becomes
@@ -175,7 +175,7 @@ VOID AddToLine(UBYTE *s)
 }
 
 /*
- 		#] AddToLine : 
+ 		#] AddToLine :
  		#[ FiniLine :			VOID FiniLine()
 */
 
@@ -194,7 +194,9 @@ VOID FiniLine()
 	if ( noextralinefeed == 0 ) {
 		if ( AC.OutputMode == FORTRANMODE && AC.IsFortran90 == ISFORTRAN90
 			&& Out > AO.OutputLine ) {
+/*
 			*Out++ = fcontchar;
+*/
 		}
 #ifdef WITHRETURN
 		*Out++ = CARRIAGERETURN;
@@ -255,7 +257,7 @@ VOID FiniLine()
 }
 
 /*
- 		#] FiniLine : 
+ 		#] FiniLine :
  		#[ IniLine :			VOID IniLine(extrablank)
 
 	Initializes the output line for the type of output
@@ -287,7 +289,7 @@ VOID IniLine(WORD extrablank)
 }
 
 /*
- 		#] IniLine : 
+ 		#] IniLine :
  		#[ LongToLine :			VOID LongToLine(a,na)
 
 	Puts a Long integer in the output line. If it is only a single
@@ -322,7 +324,7 @@ VOID LongToLine(UWORD *a, WORD na)
 }
 
 /*
- 		#] LongToLine : 
+ 		#] LongToLine :
  		#[ RatToLine :			VOID RatToLine(a,na)
 
 	Puts a rational number in the output line. The sign is ignored.
@@ -502,7 +504,7 @@ VOID RatToLine(UWORD *a, WORD na)
 }
 
 /*
- 		#] RatToLine : 
+ 		#] RatToLine :
  		#[ TalToLine :			VOID TalToLine(x)
 
 	Writes the unsigned number x to the output as a single token.
@@ -527,7 +529,7 @@ VOID TalToLine(UWORD x)
 }
 
 /*
- 		#] TalToLine : 
+ 		#] TalToLine :
  		#[ TokenToLine :		VOID TokenToLine(s)
 
 	Puts s in the output buffer. If it doesn't fit the buffer is
@@ -597,10 +599,11 @@ VOID TokenToLine(UBYTE *s)
 			Out = AO.OutputLine;
 			if ( AO.BlockSpaces == 0 ) {
 				for ( j = 0; j < AO.OutSkip; j++ ) { *Out++ = ' '; }
-				if ( ( AC.OutputMode == FORTRANMODE || AC.OutputMode == PFORTRANMODE )
-				 && AO.OutSkip == 7 ) {
+				if ( ( AC.OutputMode == FORTRANMODE || AC.OutputMode == PFORTRANMODE ) ) {
+				  if ( AO.OutSkip == 7 ) {
 					Out[-2] = fcontchar;
 					Out[-1] = ' ';
+				  }
 				}
 			}
 /*
@@ -639,7 +642,7 @@ VOID TokenToLine(UBYTE *s)
 }
 
 /*
- 		#] TokenToLine : 
+ 		#] TokenToLine :
  		#[ CodeToLine :			VOID CodeToLine(name,number,mode)
 
 	Writes a name and possibly its number to output as a single token.
@@ -655,7 +658,7 @@ UBYTE *CodeToLine(WORD number, UBYTE *Out)
 }
 
 /*
- 		#] CodeToLine : 
+ 		#] CodeToLine :
  		#[ AddArrayIndex :
 */
 
@@ -675,7 +678,7 @@ UBYTE *AddArrayIndex(WORD num,UBYTE *out)
 }
 
 /*
- 		#] AddArrayIndex : 
+ 		#] AddArrayIndex :
  		#[ PrtTerms :			VOID PrtTerms()
 */
 
@@ -697,7 +700,7 @@ VOID PrtTerms()
 }
 
 /*
- 		#] PrtTerms : 
+ 		#] PrtTerms :
  		#[ WrtPower :
 */
 
@@ -733,7 +736,7 @@ UBYTE *WrtPower(UBYTE *Out, WORD Power)
 }
 
 /*
- 		#] WrtPower : 
+ 		#] WrtPower :
  		#[ PrintTime :
 */
 
@@ -747,7 +750,7 @@ void PrintTime()
 }
 
 /*
- 		#] PrintTime : 
+ 		#] PrintTime :
   	#] schryf-Utilities :
  	#[ schryf-Writes :
  		#[ WriteLists :			VOID WriteLists()
@@ -1202,7 +1205,7 @@ VOID WriteLists()
 }
 
 /*
- 		#] WriteLists : 
+ 		#] WriteLists :
  		#[ WriteArgument :		VOID WriteArgument(WORD *t)
 
 		Write a single argument field. The general field goes to
@@ -1301,7 +1304,7 @@ VOID WriteArgument(WORD *t)
 }
 
 /*
- 		#] WriteArgument : 
+ 		#] WriteArgument :
  		#[ WriteSubTerm :		WORD WriteSubTerm(sterm,first)
 
 	Writes a single subterm field to the output line.
@@ -1671,7 +1674,7 @@ WORD WriteSubTerm(WORD *sterm, WORD first)
 }
 
 /*
- 		#] WriteSubTerm : 
+ 		#] WriteSubTerm :
  		#[ WriteInnerTerm :		WORD WriteInnerTerm(term,first)
 
 	Writes the contents of term to the output.
@@ -1822,7 +1825,7 @@ WORD WriteInnerTerm(WORD *term, WORD first)
 }
 
 /*
- 		#] WriteInnerTerm : 
+ 		#] WriteInnerTerm :
  		#[ WriteTerm :			WORD WriteTerm(term,lbrac,first,prtf,br)
 
 	Writes a term to output. It tests the bracket information first.
@@ -2148,7 +2151,7 @@ WrtTmes:				t = term;
 }
 
 /*
- 		#] WriteTerm : 
+ 		#] WriteTerm :
  		#[ WriteExpression :	WORD WriteExpression(terms,ltot)
 
 	Writes a subexpression to output.
@@ -2182,7 +2185,7 @@ WORD WriteExpression(WORD *terms, LONG ltot)
 }
 
 /*
- 		#] WriteExpression : 
+ 		#] WriteExpression :
  		#[ WriteAll :			WORD WriteAll()
 
 		Writes all expressions that should be written
@@ -2398,7 +2401,7 @@ WORD WriteAll()
 }
 
 /*
- 		#] WriteAll : 
+ 		#] WriteAll :
  		#[ WriteOne :			WORD WriteOne(name,alreadyinline)
 
 		Writes one expression from the preprocessor
@@ -2552,7 +2555,7 @@ WORD WriteOne(UBYTE *name, int alreadyinline, int nosemi)
 }
 
 /*
- 		#] WriteOne : 
+ 		#] WriteOne :
   	#] schryf-Writes :
 */