Be more consistent with the use of name and description

[r2c2.git] / tracks.dat

diff --git a/tracks.dat b/tracks.dat
index 9a35bdea3c601ee7113da4a5d4511a4ff4dc3c47..34eeef8a8b97f14eecb5fab25a66f49de08bd4aa 100644 (file)
--- a/tracks.dat
+++ b/tracks.dat
@@ -44,8 +44,14 @@ track_appearance "C"
 
 track "24064"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24064";
+       };
        appearance "C";
-       description "Straight, 64.3mm (R3-R4-R5)";
+       name "Straight, 64.3 mm";
+       description "R3-R4-R5 spacing";
        part
        {
                length 64.3;
@@ -54,8 +60,14 @@ track "24064"
 
 track "24071"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24071";
+       };
        appearance "C";
-       description "Straight, 70.8mm (for slim turnouts)";
+       name "Straight, 70.8 mm";
+       description "For slim turnouts";
        part
        {
                length 70.8;
@@ -65,8 +77,14 @@ track "24071"
 
 track "24077"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24077";
+       };
        appearance "C";
-       description "Straight, 77.5mm (R1-R2-R3)";
+       name "Straight, 77.5 mm";
+       description "R1-R2-R3 spacing";
        part
        {
                length 77.5;
@@ -76,8 +94,13 @@ track "24077"
 
 track "24094"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24094";
+       };
        appearance "C";
-       description "Straight, 94.2mm";
+       name "Straight, 94.2 mm";
        part
        {
                length 94.2;
@@ -87,8 +110,13 @@ track "24094"
 
 track "24172"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24172";
+       };
        appearance "C";
-       description "Straight, 171.7mm";
+       name "Straight, 171.7 mm";
        part
        {
                length 171.7;
@@ -98,8 +126,14 @@ track "24172"
 
 track "24188"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24188";
+       };
        appearance "C";
-       description "Straight, 188.3mm (turnout length)";
+       name "Straight, 188.3 mm";
+       description "Turnout length";
        part
        {
                length 188.3;
@@ -109,8 +143,13 @@ track "24188"
 
 track "24229"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24229";
+       };
        appearance "C";
-       description "Straight, 229.3mm";
+       name "Straight, 229.3 mm";
        part
        {
                length 229.3;
@@ -119,8 +158,14 @@ track "24229"
 
 track "24236"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24236";
+       };
        appearance "C";
-       description "Straight, 236.1mm (slim turnout length)";
+       name "Straight, 236.1 mm";
+       description "Slim turnout length";
        part
        {
                length 236.1;
@@ -129,8 +174,13 @@ track "24236"
 
 track "24360"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24360";
+       };
        appearance "C";
-       description "Straight, 360mm";
+       name "Straight, 360 mm";
        part
        {
                length 360;
@@ -141,8 +191,14 @@ track "24360"
 
 track "24107"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24107";
+       };
        appearance "C";
-       description "Curve, R1 = 360mm, 7.5°";
+       name "Curve, R1, 7.5°";
+       description "R = 360 mm";
        part
        {
                length 7.5;
@@ -152,8 +208,14 @@ track "24107"
 
 track "24115"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24115";
+       };
        appearance "C";
-       description "Curve, R1 = 360mm, 15°";
+       name "Curve, R1, 15°";
+       description "R = 360 mm";
        part
        {
                length 15;
@@ -163,8 +225,14 @@ track "24115"
 
 track "24130"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24130";
+       };
        appearance "C";
-       description "Curve, R1 = 360mm, 30°";
+       name "Curve, R1, 30°";
+       description "R = 360 mm";
        part
        {
                length 30;
@@ -176,8 +244,14 @@ track "24130"
 
 track "24206"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24206";
+       };
        appearance "C";
-       description "Curve, R2 = 437.5mm, 5.7° (turnout to 30°)";
+       name "Curve, R2, 5.7°";
+       description "R = 437.5 mm, complements turnout to 30°";
        part
        {
                length 5.7;
@@ -187,8 +261,14 @@ track "24206"
 
 track "24207"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24207";
+       };
        appearance "C";
-       description "Curve, R2 = 437.5mm, 7.5°";
+       name "Curve, R2, 7.5°";
+       description "R = 437.5 mm";
        part
        {
                length 7.5;
@@ -198,8 +278,14 @@ track "24207"
 
 track "24215"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24215";
+       };
        appearance "C";
-       description "Curve, R2 = 437.5mm, 15°";
+       name "Curve, R2, 15°";
+       description "R = 437.5 mm";
        part
        {
                length 15;
@@ -209,8 +295,14 @@ track "24215"
 
 track "24224"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24224";
+       };
        appearance "C";
-       description "Curve, R2 = 437.5mm, 24.3° (turnout)";
+       name "Curve, R2, 24.3°";
+       description "R = 437.5 mm, turnout angle";
        part
        {
                length 24.3;
@@ -220,8 +312,14 @@ track "24224"
 
 track "24230"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24230";
+       };
        appearance "C";
-       description "Curve, R2 = 437.5mm, 30°";
+       name "Curve, R2, 30°";
+       description "R = 437.5 mm";
        part
        {
                length 30;
@@ -233,8 +331,14 @@ track "24230"
 
 track "24330"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24330";
+       };
        appearance "C";
-       description "Curve, R3 = 515mm, 30°";
+       name "Curve, R3, 30°";
+       description "R = 515mm";
        part
        {
                length 30;
@@ -246,8 +350,14 @@ track "24330"
 
 track "24430"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24430";
+       };
        appearance "C";
-       description "Curve, R4 = 579.3mm, 30°";
+       name "Curve, R4, 30°";
+       description "R = 579.3mm";
        part
        {
                length 30;
@@ -259,8 +369,14 @@ track "24430"
 
 track "24530"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24530";
+       };
        appearance "C";
-       description "Curve, R5 = 643.6mm, 30°";
+       name "Curve, R5, 30°";
+       description "R = 643.6mm";
        part
        {
                length 30;
@@ -272,8 +388,14 @@ track "24530"
 
 track "24912"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24912";
+       };
        appearance "C";
-       description "Curve, R = 1114.6mm, 12.1° (slim turnout)";
+       name "Curve, 12.1°";
+       description "R = 1114.6mm, slim turnout angle";
        part
        {
                length 12.1;
@@ -285,8 +407,14 @@ track "24912"
 
 track "24671"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24671";
+       };
        appearance "C";
-       description "Curved turnout, left";
+       name "Curved turnout, left";
+       description "R1, R = 360 mm, 30°";
        part
        {
                length 77.5;
@@ -309,8 +437,14 @@ track "24671"
 
 track "24672"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24672";
+       };
        appearance "C";
-       description "Curved turnout, right";
+       name "Curved turnout, right";
+       description "R1, R = 360 mm, 30°";
        part
        {
                length 77.5;
@@ -335,8 +469,14 @@ track "24672"
 
 track "24611"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24611";
+       };
        appearance "C";
-       description "Turnout, left";
+       name "Turnout, left";
+       description "R2, R = 437.5 mm, 24.3°";
        part
        {
                length 188.3;
@@ -352,8 +492,14 @@ track "24611"
 
 track "24612"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24612";
+       };
        appearance "C";
-       description "Turnout, right";
+       name "Turnout, right";
+       description "R2, R = 437.5 mm, 24.3°";
        part
        {
                length 188.3;
@@ -369,8 +515,14 @@ track "24612"
 
 track "24630"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24630";
+       };
        appearance "C";
-       description "Turnout, 3-way";
+       name "Turnout, 3-way";
+       description "R2, R = 437.5 mm, 24.3°";
        part
        {
                length 188.3;
@@ -392,8 +544,14 @@ track "24630"
 
 track "24624"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24624";
+       };
        appearance "C";
-       description "Turnout, double slip";
+       name "Turnout, double slip";
+       description "R2, R = 437.5 mm, 24.3°";
        state_bits 1;
        part
        {
@@ -425,8 +583,14 @@ track "24624"
 
 track "24711"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24711";
+       };
        appearance "C";
-       description "Slim turnout, left";
+       name "Slim turnout, left";
+       description "R = 1114.6mm, 12.1°";
        part
        {
                length 236.1;
@@ -442,8 +606,14 @@ track "24711"
 
 track "24712"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24712";
+       };
        appearance "C";
-       description "Slim turnout, right";
+       name "Slim turnout, right";
+       description "R = 1114.6mm, 12.1°";
        part
        {
                length 236.1;
@@ -461,8 +631,14 @@ track "24712"
 
 track "24640"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24640";
+       };
        appearance "C";
-       description "Crossing, 24.3°";
+       name "Crossing, 24.3°";
+       description "Turnout angle";
        part
        {
                length 188.3;
@@ -476,8 +652,14 @@ track "24640"
 
 track "24649"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24649";
+       };
        appearance "C";
-       description "Crossing, 48.6°";
+       name "Crossing, 48.6°";
+       description "2× turnout angle";
        part
        {
                length 103.3;
@@ -491,8 +673,14 @@ track "24649"
 
 track "24740"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24740";
+       };
        appearance "C";
-       description "Slim crossing, 12.1°";
+       name "Slim crossing, 12.1°";
+       description "Slim turnout angle";
        part
        {
                length 236.1;
@@ -508,8 +696,13 @@ track "24740"
 
 track "24977"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "24977";
+       };
        appearance "C";
-       description "Bumper";
+       name "Bumper";
        object "bumper.object";
        part
        {
@@ -522,6 +715,12 @@ track "24977"
 
 signal "7039"
 {
+       article_number
+       {
+               vendor "Märklin";
+               article "7039";
+       };
+       name "Home signal";
        indication "Hp1"
        {
                aspect 0;