Index: TECH/Console/TerminalInput.cls.xml
===================================================================
diff -u -r3717 -r3718
--- TECH/Console/TerminalInput.cls.xml	(.../TerminalInput.cls.xml)	(revision 3717)
+++ TECH/Console/TerminalInput.cls.xml	(.../TerminalInput.cls.xml)	(revision 3718)
@@ -3,6 +3,22 @@
 <Class name="TECH.Console.TerminalInput">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="ZetNieuweLijnNaInput">
+<Type>%Boolean</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>initvalue:%CacheString</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ZetNieuweLijnNaInput = $$$True
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="StartNieuwScherm">
 <Implementation><![CDATA[	Do ..Write("", $$$True)
 ]]></Implementation>
@@ -12,25 +28,29 @@
 <FormalSpec>DefaultWaarde:%String,ToonDefaultIndienLeeg:%Boolean=1,TrimInputWaarde:%Boolean=1,MaxLength:%Integer=-1</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim InputWaarde As %String = ..VraagInput(TrimInputWaarde, MaxLength)
+	#dim InputWaarde As %String = ..VraagInput(TrimInputWaarde, MaxLength, $$$False)
 
 	If (InputWaarde = "") {
 		Set InputWaarde = DefaultWaarde
 		Do:(ToonDefaultIndienLeeg) ..Write(InputWaarde)
 	}
+	Do:(..ZetNieuweLijnNaInput) ..Write($$$CRLF)
+	
 	Quit InputWaarde
 ]]></Implementation>
 </Method>
 
 <Method name="VraagInput">
-<FormalSpec>TrimInputWaarde:%Boolean=1,MaxLength:%Integer=-1</FormalSpec>
+<FormalSpec>TrimInputWaarde:%Boolean=1,MaxLength:%Integer=-1,AddNewLine:%Boolean</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim InputWaarde As %String
 	
 	Do ..Read(.InputWaarde, MaxLength)
 	Set:(TrimInputWaarde) InputWaarde = $$$Trim(InputWaarde)
 
+	Do:($Get(AddNewLine, ..ZetNieuweLijnNaInput)) ..Write($$$CRLF)
+	
 	Quit InputWaarde
 ]]></Implementation>
 </Method>
@@ -40,13 +60,17 @@
 	#dim Key As %String
 	Do ..DrukAnyKey(.Key)
 	// To do : alleen enter-key aanvaarden.
+
+	Do:(..ZetNieuweLijnNaInput) ..Write($$$CRLF)
 ]]></Implementation>
 </Method>
 
 <Method name="DrukAnyKey">
 <FormalSpec><![CDATA[&Key:%String]]></FormalSpec>
 <Implementation><![CDATA[
 	Do ..Read(.Key, 1)
+
+	Do:(..ZetNieuweLijnNaInput) ..Write($$$CRLF)
 ]]></Implementation>
 </Method>