Добавлен картридж TK-580. Изменён формат даты на yyyy.mm.dd

kyocera.r

@@ -9,7 +9,7 @@ date-current: func [] [
 	    insert/dup n "0" (2 - length? n)
 	    n 
 	]
-	rejoin [now/year date-add0 now/month date-add0 now/day]
+	rejoin [now/year "." date-add0 now/month "." date-add0 now/day]
 ]
 
 make-csv: func [] [
@@ -27,7 +27,10 @@ make-csv: func [] [
 		(rejoin ["4;TK-1140;"    c_tk1140/text])
 		(rejoin ["5;TK-3100;"    c_tk3100/text])
 		(rejoin ["6;TK-340;"     c_tk340/text])
-		(rejoin ["7;TK-540;"     c_tk540/text])
+		(rejoin ["7;TK-580C;"    c_tk540C/text])
+		(rejoin ["8;TK-580M;"    c_tk540M/text])
+		(rejoin ["9;TK-580Y;"    c_tk540Y/text])
+		(rejoin ["10;TK-580K;"    c_tk540K/text])
 	]
 	return fileOUT
 ]
@@ -51,7 +54,8 @@ mail: make object! [
 ]
 
 view layout [ 
-	style tx h4 80x24 left
+	style mark h4 74x24 left
+	style num h4 20x24 right
 	style entry field 100x24 center
 
 	title "Ó÷¸ò êàðòðèäæåé"
@@ -59,13 +63,16 @@ view layout [
 	h5 200 right date-current return
 
 	across 
-	h4 "1" tx "TK-110"     c_tk110:  entry return
-	h4 "2" tx "TK-110,112" c_tk112:  entry return
-	h4 "3" tx "TK-1100"    c_tk1100: entry return
-	h4 "4" tx "TK-1140"    c_tk1140: entry return
-	h4 "5" tx "TK-3100"    c_tk3100: entry return
-	h4 "6" tx "TK-340"     c_tk340:  entry return
-	h4 "7" tx "TK-540"     c_tk540:  entry return
+	num "1"  mark "TK-110"     c_tk110:  entry return
+	num "2"  mark "TK-110,112" c_tk112:  entry return
+	num "3"  mark "TK-1100"    c_tk1100: entry return
+	num "4"  mark "TK-1140"    c_tk1140: entry return
+	num "5"  mark "TK-3100"    c_tk3100: entry return
+	num "6"  mark "TK-340"     c_tk340:  entry return
+	num "7"  mark "TK-580C"    c_tk540C:  entry return
+	num "8"  mark "TK-580M"    c_tk540M:  entry return
+	num "9"  mark "TK-580Y"    c_tk540Y:  entry return
+	num "10" mark "TK-580K"    c_tk540K:  entry return
 
 	h4 "E-Mail: " mailto: field 159x24 "v.kerasilov@tkpetrovich.ru" italic 80.250.120 return