More tartans

tartans/index.mdwn

@@ -2,16 +2,16 @@ Title: Tartans
 Header: <script src="weave.js"></script>
 Header: <script src="presets.js"></script>
 
-<canvas id="loom" width="800" height="600" style="width: 100%;">
+<canvas id="loom" width="800" height="600" style="width: 100%; background: #444;">
 	Sorry, you need HTML5 and JavaScript for this.
 	<img src="nmloe.png">
 </canvas>
 
 <div>
-<select id="preset"><option disabled>Presets:</option></select>
+<select id="preset"><option>Presets:</option></select>
 <input id="sett" size="30">
 <span style="white-space: nowrap;">
-Zoom: <select id="thick"><option>0.8</option><option>1</option><option selected>2</option></select>
+Zoom: <select id="thick"><option>0.8</option><option>1</option><option selected>2</option><option>3</option></select>
 </span>
 </div>
 

tartans/presets.js

@@ -17,16 +17,24 @@ var tartans = {
 	},
 	"Buchanan": {
 		"sett": "Y8 BK2 Y8 BK2 B6 BK2 G8 B4 G8 BK2 B6 BK2 LR10 W2 LR10 BK2 B6 BK2 .",
-		"description": "I typed in this one as an example of an asymmetric sett."
+		"description": "The period at the end indicates this sett is asymmetrical."
 	},
 	"California": {
 		"sett": "Y8 K2 G20 R4 G20 R8 G20 K32 B56 K2 LB8 K2 B56 K32 G20 R4 G20 K2 Y8",
 		"description": "Contributed by the illustrious Sam Phillips"
 	},
+	"Canadian National \"Maple Leaf\"": {
+		"sett": "Y8 DR8 BR8 DG24 R4 DG4 R16 DR16 R16 DG4 R4 DG24.",
+		"description": "Another asymmetrical sett: that's what the period at the end means. This is just a quick guess on my part. Makes me think of lumberjacks!"
+	},
 	"Colorado": {
 		"sett": "Y4 R6 (669)34 K40 G4 W6 LV6 W6 G22",
 		"description": "Wikipedia lists the sett as [Y/6] R4 MB26 K32 G4 W4 Lv4 W4 [G/44]. I'm not familiar with the [Color/Count] notation, the count appears to be doubled, possibly to indicate the total count of that thread in the mirror section.\n\nColorado house joint resolution 97-1016 makes this official but doesnt provide a thread count.  It speaks of \"cerulean blue\" which I approximate with the unique (669) color."
 	},
+	"Debian": {
+		"sett": "B28 Y4 B28 DR28 BK4 DR28 W4 BK4 W12 R12 W12 BK4 W4 R12 W4 BK4 W4 R12 W4 BK4 W4 BK4 W4 BK4 W12 R12 W4 R12 W4 BK4 W4 BK4 W12 DR28 BK4 DR28.",
+		"description": "This thing apparently spells out \"debian\" in morse code. All I know is it's way too busy. But it's cool that they put a message in it. I wonder if I could make a UPC barcode..."
+	},
 	"The Hacker": {
 		"sett": "G1 LG3 G3 K7",
 		"description": "Created by pi-rho, an impressive hacker in his own right."
@@ -43,6 +51,10 @@ var tartans = {
 		"sett": "W4 LGR16 B4 LGR8 B8 Y4 B4 R4 B20",
 		"description": "Based on a terrible gif that appars to be a part of Nevada Revised Statute 235.130.  Designed by Richard Zygmunt Pawlowski, approved May 8, 2001."
 	},
+	"Nova Scotia": {
+		"sett": "LB1 W1 LB28 B1 G1 B1 G4 B1 G1 B1 G20 DB20 Y1 G1 Y1 R1",
+		"description": "Courtesy Felix Crux"
+	},
 	"Oklahoma": {
 		"sett": "R4 W8 LB64 Y6 BK16",
 		"description": "Based on a photo on a web page."
@@ -51,6 +63,10 @@ var tartans = {
 		"sett": "Y3 LV10 G4 LV4 G4 W2 G8 LBR24 R4 LB2 K2",
 		"description": "Here you go, people of Oregon: your legislature apparently thought the best way to record your tartan was registering it with a private company."
 	},
+	"Neale's Bedsheet": {
+		"sett": "R3 W5 B21 W62 B3 R5 W2 B4 R11 B17 W10 B60 W10 B10 W2 R6 W2 B28 DB10 R2 B23.",
+		"description": "This gigantic sett was used in some bedding I got for about $5, which I guess just goes to show that machine-operated looms are capable of doing better tricks for less money than human-operated ones."
+	},
 	"Neale's PJs": {
 		"sett": "W7 C3 GR5 BK3 C5 BK3 C6 GR3 C5",
 		"description": "This is an approximation of the pajamas I was wearing when I wrote the tartan designer.  They weren't actually a tartan.  I guess modern weavers feel they ought to show off the fact that they can do fancy tricks with their looms."
@@ -59,6 +75,18 @@ var tartans = {
 		"sett": "W3 G24 Y2 W2 G2 W2 G2 W1",
 		"description": "More of my PJs.  This one is an exact copy, I can count the threads in this fabric."
 	},
+	"Neale's PJs III": {
+		"sett": "BK16 GR28 W3 GR28 LGR16",
+		"description": "Another pair of PJs. Why do I keep adding pajamas? It's almost as if I feel like the idea of weaving patterns being a guarded secret is laughable!"
+	},
+	"Neale's PJs IV": {
+		"sett": "R5 (333)12",
+		"description": "More pajamas."
+	},
+	"Neale's PJs V": {
+		"sett": "GR8 BK3 W2 BK3 Y2 BK4 LB1 BK8",
+		"description": "Yet more pajamas. I'd love it if somebody made a kilt out of this and recorded peoples' reactions at a Scottish festival or something."
+	},
 	"Shrek": {
 		"sett": "LBR4 BR8 G16 R2 G16 BR32",
 		"description": "I (Neale) created this based on Shrek's pants in a couple of frame grabs from the movie.  It appears to be different from the recently-released \"Shrek's Tartan\"."
@@ -74,5 +102,9 @@ var tartans = {
 	"Washington State": {
 		"sett": "W3 R6 B36 G72 LB6 BK6 Y2",
 		"description": "Adopted 1991 by the spartan RCW 1.20.110."
+	},
+	"Winchester's Tie": {
+		"sett": "R32G8 R32 G8 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W1 R1 W8 .",
+		"description": "The tie worn by a stuffed animal a high school girlfriend gave me. It's a neat trick that would be a pain in the rear to do by hand."
 	}
 }

tartans/weave.js

@@ -37,6 +37,8 @@ var colors = {
 	"K":   Yarn(0.00, 0.00, 0.00), // Black
 	"BK":  Yarn(0.00, 0.00, 0.00), // Black
 	"GR":  Yarn(0.50, 0.50, 0.50), // Gray
+	"DR":  Yarn(0.30, 0.00, 0.00), // Dark Red
+	"DG":  Yarn(0.00, 0.25, 0.00), // Dark Green
 	"DB":  Yarn(0.00, 0.00, 0.30), // Dark Blue
 	"LB":  Yarn(0.00, 0.40, 0.90), // Light Blue
 	"LR":  Yarn(0.80, 0.00, 0.00), // Light Red
@@ -194,7 +196,8 @@ function preset() {
 	var tartan = tartans[presetName];
 
 	if (! tartan) {
-		presetName = "New Mexico Land Of Enchantment";
+		var keys = Object.keys(tartans);
+		presetName = keys[Math.floor(Math.random() * keys.length)];
 		tartan = tartans[presetName];
 		document.getElementById("preset").value = presetName;
 	}
@@ -245,8 +248,10 @@ function init() {
 
 	if (presetName) {
 		preset();
-	} else {
+	} else if (qs["s"]) {
 		update();
+	} else {
+		preset();
 	}
 }
 window.addEventListener("load", init);