Index: libcfa/src/iostream.cfa
===================================================================
--- libcfa/src/iostream.cfa	(revision b19b3623da9e91bd1dc2397cc1211cf5def36992)
+++ libcfa/src/iostream.cfa	(revision bb1eabcd6f64b0ee41ffacd7dd40e7329004f68e)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May  3 08:08:29 2026
-// Update Count     : 2241
+// Last Modified On : Sun May  3 22:02:37 2026
+// Update Count     : 2271
 //
 
@@ -698,6 +698,5 @@
 		} // if
 		if ( f.flags.quote ) {							// print as string
-			char qv[] = "' '";
-			qv[1] = f.val;
+			char qv[] = { f.qleft, f.val, f.qright ? : f.qleft, '\0' };
 			f.flags.quote = false;						// already quoted
 			_Ostream_Manip(const char *) fmtuc @= { qv, f.wd, f.pc, 's', {f.all} };
@@ -743,8 +742,6 @@
 			int len = strlen( f.val );
 			char qv[len + 3];							// space for quotes and '\0'
-			qv[0] = '"';								// copy string surrounded with quotes
-			strcpy( &qv[1], f.val );
-			qv[len + 1] = '"';
-			qv[len + 2] = '\0';
+			qv[0] = f.qleft; strcpy( &qv[1], f.val );
+			qv[len + 1] = f.qright ? : f.qleft; qv[len + 2] = '\0'; // copy string surrounded with quotes
 			f.flags.quote = false;						// already quoted
 			_Ostream_Manip(const char *) fmtuc @= { qv, f.wd, f.pc, 's', {f.all} };