X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=public%2Fjavascripts%2Futils%2FprintDiagram.js;h=4727430382c9a9cdbb7bffc7f2962dccb6a722e2;hp=ef750490ed02ad88c3af54663ac3de12606e78b1;hb=69f3d8014e594ef949792d04d97b8286e9c2c268;hpb=da06a6eb0237123ce43fdb01cb06246b8b57f5e5

diff --git a/public/javascripts/utils/printDiagram.js b/public/javascripts/utils/printDiagram.js
index ef750490..47274303 100644
--- a/public/javascripts/utils/printDiagram.js
+++ b/public/javascripts/utils/printDiagram.js
@@ -7,17 +7,70 @@ function getDiagram(args)
 	const board = VariantRules.GetBoard(args.position);
 	const orientation = args.orientation || "w";
 	let markArray = [];
-	if (!!args.marks)
+	if (!!args.marks && args.marks != "-")
 	{
 		// Turn (human) marks into coordinates
 		markArray = doubleArray(sizeX, sizeY, false);
 		let squares = args.marks.split(",");
 		for (let i=0; i<squares.length; i++)
 		{
-			const res = /^([a-z]+)([0-9]+)$/i.exec(squares[i]);
-			const x = sizeX - parseInt(res[2]); //white at bottom, so counting is reversed
-			const y = res[1].charCodeAt(0)-97; //always one char: max 26, big enough
-			markArray[x][y] = true;
+			const coords = V.SquareToCoords(squares[i]);
+			markArray[coords.x][coords.y] = true;
+		}
+	}
+	let shadowArray = [];
+	if (!!args.shadow && args.shadow != "-")
+	{
+		// Turn (human) shadow indications into coordinates
+		shadowArray = doubleArray(sizeX, sizeY, false);
+		let squares = args.shadow.split(",");
+		for (let i=0; i<squares.length; i++)
+		{
+			const rownum = V.size.x - parseInt(squares[i]);
+			if (!isNaN(rownum))
+			{
+				// Shadow a full row
+				for (let i=0; i<V.size.y; i++)
+					shadowArray[rownum][i] = true;
+				continue;
+			}
+			if (squares[i].length == 1)
+			{
+				// Shadow a full column
+				const colnum = V.ColumnToCoord(squares[i]);
+				for (let i=0; i<V.size.x; i++)
+					shadowArray[i][colnum] = true;
+				continue;
+			}
+			if (squares[i].indexOf("-") >= 0)
+			{
+				// Shadow a range of squares, horizontally or vertically
+				const firstLastSq = squares[i].split("-");
+				const range =
+				[
+					V.SquareToCoords(firstLastSq[0]),
+					V.SquareToCoords(firstLastSq[1])
+				];
+				const step =
+				[
+					range[1].x == range[0].x
+						? 0
+						: (range[1].x - range[0].x) / Math.abs(range[1].x - range[0].x),
+					range[1].y == range[0].y
+						? 0
+						: (range[1].y - range[0].y) / Math.abs(range[1].y - range[0].y)
+				];
+				// Convention: range always from smaller to larger number
+				for (let x=range[0].x, y=range[0].y; x <= range[1].x && y <= range[1].y;
+					x += step[0], y += step[1])
+				{
+					shadowArray[x][y] = true;
+				}
+				continue;
+			}
+			// Shadow just one square:
+			const coords = V.SquareToCoords(squares[i]);
+			shadowArray[coords.x][coords.y] = true;
 		}
 	}
 	let boardDiv = "";
@@ -30,13 +83,15 @@ function getDiagram(args)
 		for (let j=startY; j>=0 && j<sizeY; j+=inc)
 		{
 			boardDiv += "<div class='board board" + sizeY + " " +
-				((i+j)%2==0 ? "light-square-diag" : "dark-square-diag") + "'>";
+				((i+j)%2==0 ? "light-square-diag" : "dark-square-diag") +
+				(shadowArray.length > 0 && shadowArray[i][j] ? " in-shadow" : "") +
+				"'>";
 			if (board[i][j] != V.EMPTY)
 			{
 				boardDiv += "<img src='/images/pieces/" +
 					V.getPpath(board[i][j]) + ".svg' class='piece'/>";
 			}
-			if (!!args.marks && markArray[i][j])
+			if (markArray.length > 0 && markArray[i][j])
 				boardDiv += "<img src='/images/mark.svg' class='mark-square'/>";
 			boardDiv += "</div>";
 		}