kokopu-react 1.3.1 → 1.5.0

package/src/css/error_box.css

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *
@@ -36,6 +36,17 @@
 	font-style: italic;
 }
 
-.kokopu-errorMessage {
+.kokopu-errorMessage,
+.kokopu-errorExcerpt {
 	margin-top: 0.4em;
 }
+
+.kokopu-errorExcerpt {
+	white-space: pre-wrap;
+	font-family: monospace;
+	line-height: 1.5em;
+	color: #400;
+	background-color: #ffd;
+	border: solid 1px #aa0;
+	padding: 0.75em 1em 0.15em;
+}

package/src/css/fonts.css

@@ -0,0 +1,34 @@
+/******************************************************************************
+ *                                                                            *
+ *    This file is part of Kokopu-React, a JavaScript chess library.          *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
+ *                                                                            *
+ *    This program is free software: you can redistribute it and/or           *
+ *    modify it under the terms of the GNU Lesser General Public License      *
+ *    as published by the Free Software Foundation, either version 3 of       *
+ *    the License, or (at your option) any later version.                     *
+ *                                                                            *
+ *    This program is distributed in the hope that it will be useful,         *
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            *
+ *    GNU Lesser General Public License for more details.                     *
+ *                                                                            *
+ *    You should have received a copy of the GNU Lesser General               *
+ *    Public License along with this program. If not, see                     *
+ *    <http://www.gnu.org/licenses/>.                                         *
+ *                                                                            *
+ ******************************************************************************/
+
+
+@font-face {
+	font-family: 'Chess Alpha';
+	src:
+		url('../fonts/chessalpha.woff2') format('woff2'),
+		url('../fonts/chessalpha.woff') format('woff');
+	font-weight: normal;
+	font-style: normal;
+}
+
+.kokopu-font-alpha {
+	font-family: 'Chess Alpha', sans-serif;
+}

package/src/css/movetext.css

@@ -0,0 +1,117 @@
+/******************************************************************************
+ *                                                                            *
+ *    This file is part of Kokopu-React, a JavaScript chess library.          *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
+ *                                                                            *
+ *    This program is free software: you can redistribute it and/or           *
+ *    modify it under the terms of the GNU Lesser General Public License      *
+ *    as published by the Free Software Foundation, either version 3 of       *
+ *    the License, or (at your option) any later version.                     *
+ *                                                                            *
+ *    This program is distributed in the hope that it will be useful,         *
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            *
+ *    GNU Lesser General Public License for more details.                     *
+ *                                                                            *
+ *    You should have received a copy of the GNU Lesser General               *
+ *    Public License along with this program. If not, see                     *
+ *    <http://www.gnu.org/licenses/>.                                         *
+ *                                                                            *
+ ******************************************************************************/
+
+
+.kokopu-colorTag {
+	width : 1.2em;
+	height: 1.2em;
+	vertical-align: middle;
+	display: inline-block;
+	border: 1px solid black;
+	margin-right: 0.25em;
+}
+
+.kokopu-headerGroup-whitePlayer .kokopu-colorTag {
+	background-color: white;
+} 
+
+.kokopu-headerGroup-blackPlayer .kokopu-colorTag {
+	background-color: black;
+}
+
+.kokopu-headerGroup-titleRating:before,
+.kokopu-header-round:before {
+	content: "\a0("; /* \a0 == &nbsp; */
+}
+
+.kokopu-headerGroup-titleRating:after,
+.kokopu-header-round:after {
+	content: ")";
+}
+
+.kokopu-header-round,
+.kokopu-header-annotator {
+	font-style: italic;
+}
+
+* + .kokopu-move:before,
+* + .kokopu-gameResult:before,
+* + span.kokopu-comment:before {
+	content: " ";
+}
+
+span.kokopu-variation:before {
+	content: " (";
+}
+
+span.kokopu-variation:after {
+	content: ")";
+}
+
+* + .kokopu-nag:before {
+	content: "\a0"; /* \a0 == &nbsp; */
+}
+
+div.kokopu-subVariation {
+	margin-left: 1.5em;
+}
+
+.kokopu-move,
+.kokopu-gameResult {
+	font-weight: bold;
+}
+
+.kokopu-subVariation .kokopu-move {
+	font-weight: inherit;
+}
+
+.kokopu-diagram {
+	text-align: center;
+	line-height: 0px;
+}
+
+.kokopu-moveContent {
+	display: inline-block;
+	padding-left: 1px;
+	padding-right: 1px;
+}
+
+.kokopu-selectedMove .kokopu-moveContent {
+	background-color: currentcolor;
+}
+
+.kokopu-selectedMove .kokopu-moveContent > * {
+	filter: invert(1);
+}
+
+.kokopu-clickableMove .kokopu-moveContent:hover {
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+.kokopu-focusFieldContainer {
+	position: fixed;
+	bottom: 0px;
+	right: 0px;
+	width: 0px;
+	height: 0px;
+	overflow: hidden;
+}

package/src/css/{label.css → symbol.css}

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *
@@ -20,7 +20,11 @@
  ******************************************************************************/
 
 
-.kokopu-label {
+.kokopu-symbolCircle {
+	fill: transparent;
+}
+
+.kokopu-symbolText {
 	font-style: normal;
 	font-family: sans-serif;
 	text-anchor: middle;

package/src/i18n.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *
@@ -21,10 +21,21 @@
 
 
 const i18n = {
+
+	// Error box
+	LINE: 'line {0}',
+
+	// Chessboard
 	INVALID_FEN_ERROR_TITLE: 'Invalid FEN string.',
 	INVALID_NOTATION_ERROR_TITLE: 'Invalid move notation.',
 	INVALID_POSITION_ATTRIBUTE_ERROR_MESSAGE: 'Invalid "position" attribute.',
 	INVALID_MOVE_ATTRIBUTE_ERROR_MESSAGE: 'Invalid "move" attribute.',
+
+	// Movetext
+	PIECE_SYMBOLS: { 'K':'K', 'Q':'Q', 'R':'R', 'B':'B', 'N':'N', 'P':'P' },
+	ANNOTATED_BY: 'Annotated by {0}',
+	INVALID_PGN_ERROR_TITLE: 'Invalid PGN string.',
+	INVALID_GAME_ATTRIBUTE_ERROR_MESSAGE: 'Invalid "game" attribute.',
 };
 
 export default i18n;

package/src/impl/ArrowTip.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *
@@ -29,7 +29,7 @@ import React from 'react';
  */
 export default function ArrowTip(props) {
 	return (
-		<marker id={props.id} markerWidth={4} markerHeight={4} refX={2.5} refY={2} orient="auto" style={{ fill: props.color }}>
+		<marker id={props.id} markerWidth={4} markerHeight={4} refX={2.5} refY={2} orient="auto" fill={props.color}>
 			<path d="M 4,2 L 0,4 L 1,2 L 0,0 Z" />
 		</marker>
 	);
@@ -45,9 +45,5 @@ ArrowTip.propTypes = {
 	/**
 	 * Color to use to colorize the shape (for example: `'green'`, `'#ff0000'`...).
 	 */
-	color: PropTypes.string,
-};
-
-ArrowTip.defaultProps = {
-	color: 'currentcolor',
+	color: PropTypes.string.isRequired,
 };

package/src/impl/HtmlSanitizer.js

@@ -0,0 +1,120 @@
+/******************************************************************************
+ *                                                                            *
+ *    This file is part of Kokopu-React, a JavaScript chess library.          *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
+ *                                                                            *
+ *    This program is free software: you can redistribute it and/or           *
+ *    modify it under the terms of the GNU Lesser General Public License      *
+ *    as published by the Free Software Foundation, either version 3 of       *
+ *    the License, or (at your option) any later version.                     *
+ *                                                                            *
+ *    This program is distributed in the hope that it will be useful,         *
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            *
+ *    GNU Lesser General Public License for more details.                     *
+ *                                                                            *
+ *    You should have received a copy of the GNU Lesser General               *
+ *    Public License along with this program. If not, see                     *
+ *    <http://www.gnu.org/licenses/>.                                         *
+ *                                                                            *
+ ******************************************************************************/
+
+
+import React from 'react';
+import * as htmlparser2 from 'htmlparser2';
+
+
+/**
+ * HTML sanitizer: parse HTML string, keeping only the allowed HTML nodes, and the corresponding React object.
+ */
+export default class HtmlSanitizer {
+
+	constructor({ allowedTags, allowedAttributes }) {
+		this._allowedTags = allowedTags ? new Set(allowedTags) : new Set();
+		this._allowedAttributes = allowedAttributes ? new Map(Object.entries(allowedAttributes).map(([k, v]) => [k, new Set(v)])) : new Map();
+		this._keyCounter = 0;
+	}
+
+	/**
+	 * @param {string} text HTML string to be parsed.
+	 * @returns {*} React object corresponding to the given HTML string. Can also be a fragment, or just a simple string if the given HTML string
+	 *          does not contain any HTML tag.
+	 */
+	parse(text) {
+		let dom = htmlparser2.parseDocument(text);
+
+		// Ensure that the returned object is a non-empty node type.
+		if (dom.type !== 'root') {
+			return undefined;
+		}
+
+		// Process the children of the root node.
+		let result = [];
+		dom.children.forEach(child => {
+			let childElement = this._processNode(child);
+			if (childElement) {
+				result.push(childElement);
+			}
+		});
+
+		// Return the result.
+		if (result.length === 0) {
+			return undefined;
+		}
+		else if (result.length === 1) {
+			return result[0];
+		}
+		else {
+			return <React.Fragment key={this._allocateKey()}>{result}</React.Fragment>;
+		}
+	}
+
+	_processNode(node) {
+		if (node.type === 'text') {
+			return node.data;
+		}
+		else if (node.type === 'tag') {
+			let children = node.children.map(child => this._processNode(child));
+			if (this._allowedTags.has(node.name)) {
+				let attributes = this._filterAttributes(node.name, node.attribs);
+				attributes['key'] = this._allocateKey();
+				return React.createElement(node.name, attributes, children);
+			}
+			else {
+				return <React.Fragment key={this._allocateKey()}>{children}</React.Fragment>;
+			}
+		}
+		else {
+			return undefined;
+		}
+	}
+
+	_filterAttributes(nodeName, attributes) {
+		let result = {};
+		for (let [attribute, value] of Object.entries(attributes)) {
+			if (this._isAttributeAllowed(nodeName, attribute)) {
+				result[attribute === 'class' ? 'className' : attribute] = value;
+			}
+		}
+		return result;
+	}
+
+	_isAttributeAllowed(nodeName, attribute) {
+		if (attribute === 'key' && attribute === 'ref' && attribute === 'className') { // Those attributes are always forbidden.
+			return false;
+		}
+		let allowedAttributesForCurrent = this._allowedAttributes.get(nodeName);
+		if (allowedAttributesForCurrent && allowedAttributesForCurrent.has(attribute)) {
+			return true;
+		}
+		let allowedAttributesForAll = this._allowedAttributes.get('*');
+		if (allowedAttributesForAll && allowedAttributesForAll.has(attribute)) {
+			return true;
+		}
+		return false;
+	}
+
+	_allocateKey() {
+		return 'auto-' + (this._keyCounter++);
+	}
+}

package/src/impl/TextSymbol.js

@@ -0,0 +1,76 @@
+/******************************************************************************
+ *                                                                            *
+ *    This file is part of Kokopu-React, a JavaScript chess library.          *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
+ *                                                                            *
+ *    This program is free software: you can redistribute it and/or           *
+ *    modify it under the terms of the GNU Lesser General Public License      *
+ *    as published by the Free Software Foundation, either version 3 of       *
+ *    the License, or (at your option) any later version.                     *
+ *                                                                            *
+ *    This program is distributed in the hope that it will be useful,         *
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            *
+ *    GNU Lesser General Public License for more details.                     *
+ *                                                                            *
+ *    You should have received a copy of the GNU Lesser General               *
+ *    Public License along with this program. If not, see                     *
+ *    <http://www.gnu.org/licenses/>.                                         *
+ *                                                                            *
+ ******************************************************************************/
+
+
+import PropTypes from 'prop-types';
+import React from 'react';
+
+import '../css/symbol.css';
+
+const SHAPE_THICKNESS_FACTOR = 0.1;
+const DOT_RADIUS_FACTOR = 0.15;
+const CIRCLE_RADIUS_FACTOR = 0.425;
+
+
+/**
+ * Symbol of a text marker.
+ */
+export default function TextSymbol(props) {
+	if (props.symbol === 'dot') {
+		return <circle cx={props.x} cy={props.y} r={props.size * DOT_RADIUS_FACTOR} fill={props.color} />;
+	}
+	else if (props.symbol === 'circle') {
+		let thickness = props.size * SHAPE_THICKNESS_FACTOR;
+		return <circle className="kokopu-symbolCircle" cx={props.x} cy={props.y} r={props.size * CIRCLE_RADIUS_FACTOR} stroke={props.color} strokeWidth={thickness} />;
+	}
+	else {
+		let symbol = props.symbol === 'plus' ? '+' : props.symbol === 'times' ? '\u00d7' : props.symbol;
+		return <text className="kokopu-symbolText" x={props.x} y={props.y} fill={props.color} fontSize={props.size}>{symbol}</text>;
+	}
+}
+
+TextSymbol.propTypes = {
+
+	/**
+	 * X-coordinate of the center of the symbol.
+	 */
+	x: PropTypes.number.isRequired,
+
+	/**
+	 * Y-coordinate of the center of the symbol.
+	 */
+	y: PropTypes.number.isRequired,
+
+	/**
+	 * Size of the symbol (i.e. size of square in which the symbol is rendered).
+	 */
+	size: PropTypes.number.isRequired,
+
+	/**
+	 * Symbol code.
+	 */
+	symbol: PropTypes.string.isRequired,
+
+	/**
+	 * Color to use to colorize the shape (for example: `'green'`, `'#ff0000'`...).
+	 */
+	color: PropTypes.string.isRequired,
+};

package/src/impl/colorsets.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *

package/src/impl/piecesets.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *

package/src/impl/util.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *
@@ -56,5 +56,5 @@ export function isValidColor(color) {
 
 
 export function isValidSymbol(symbol) {
-	return /^[A-Za-z0-9]$/.test(symbol);
+	return /^(?:[A-Za-z0-9]|plus|times|dot|circle)$/.test(symbol);
 }

package/src/index.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *
@@ -24,6 +24,7 @@ export { flattenSquareMarkers, parseSquareMarkers, flattenTextMarkers, parseText
 export { default as i18n } from './i18n';
 export { default as Chessboard } from './Chessboard';
 export { default as ErrorBox } from './ErrorBox';
+export { default as Movetext } from './Movetext';
 export { default as SquareMarkerIcon } from './SquareMarkerIcon';
 export { default as TextMarkerIcon } from './TextMarkerIcon';
 export { default as ArrowMarkerIcon } from './ArrowMarkerIcon';

package/src/markers.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *
@@ -41,14 +41,14 @@ export function flattenSquareMarkers(markers) {
 /**
  * Transform a set of text markers defined as a "square -> (symbol, color)" struct into a comma-separated string.
  *
- * @param {object} markers For example: `{ e4: { symbol: 'A', color: 'g' }, d5: { symbol: 'z', color: 'r' }}`
- * @returns {string} For example: `'Rzd5,GAe4'`
+ * @param {object} markers For example: `{ e4: { symbol: 'A', color: 'g' }, d5: { symbol: 'z', color: 'r' }, h3: { symbol: 'plus', color: 'y' } }`
+ * @returns {string} For example: `'Rzd5,GAe4,Y(plus)h3'`
  */
 export function flattenTextMarkers(markers) {
 	return Object.entries(markers)
 		.filter(([ sq, desc ]) => isValidSquare(sq) && desc && isValidColor(desc.color) && isValidSymbol(desc.symbol))
 		.sort((a, b) => a[0].localeCompare(b[0]))
-		.map(([ sq, desc ]) => desc.color.toUpperCase() + desc.symbol + sq)
+		.map(([ sq, desc ]) => desc.color.toUpperCase() + (desc.symbol.length === 1 ? desc.symbol : '(' + desc.symbol + ')') + sq)
 		.join(',');
 }
 
@@ -91,12 +91,13 @@ export function parseSquareMarkers(markers) {
 /**
  * Parse a set of text markers defined as a comma-separated string into a "square -> (symbol, color)" struct.
  *
- * @param {string} markers For example: `'Rzd5,GAe4'`
- * @returns {object} For example: `{ e4: { symbol: 'A', color: 'g' }, d5: { symbol: 'z', color: 'r' }}`
+ * @param {string} markers For example: `'Rzd5,GAe4,Y(plus)h3'`
+ * @returns {object} For example: `{ e4: { symbol: 'A', color: 'g' }, d5: { symbol: 'z', color: 'r' }, h3: { symbol: 'plus', color: 'y' } }`
  */
 export function parseTextMarkers(markers) {
 	return parseMarkers(markers, token => {
-		return /^([GRY])([A-Za-z0-9])([a-h][1-8])$/.test(token) ? { key: RegExp.$3, value: { symbol: RegExp.$2, color: RegExp.$1.toLowerCase() } } : undefined;
+		return /^([GRY])(?:([A-Za-z0-9])|\((plus|times|dot|circle)\))([a-h][1-8])$/.test(token) ?
+			{ key: RegExp.$4, value: { symbol: RegExp.$2 || RegExp.$3, color: RegExp.$1.toLowerCase() } } : undefined;
 	});
 }
 

package/test/1_markers.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *
@@ -65,6 +65,13 @@ describe('Flatten text markers', () => {
 		h7: { symbol: 'x', color: 'r' },
 		d2: { symbol: 'L', color: 'r' },
 	})).is('G2a1,YMc5,RLd2,Rxh7,Ywh8'); });
+	it('Multi-character symbols', () => { test.value(flattenTextMarkers({
+		a1: { symbol: 'A', color: 'y' },
+		a7: { symbol: 'plus', color: 'g' },
+		b3: { symbol: 'times', color: 'r' },
+		g5: { symbol: 'dot', color: 'y' },
+		h3: { symbol: 'circle', color: 'g' },
+	})).is('YAa1,G(plus)a7,R(times)b3,Y(dot)g5,G(circle)h3'); });
 	it('<empty>', () => { test.value(flattenTextMarkers({})).is(''); });
 
 	it('Wrong square', () => { test.value(flattenTextMarkers({
@@ -83,6 +90,10 @@ describe('Flatten text markers', () => {
 		d8: { symbol: '-', color: 'r' },
 		c1: { symbol: 'abcd', color: 'r' },
 	})).is('G0a2'); });
+	it('Wrong multi-character symbol', () => { test.value(flattenTextMarkers({
+		a2: { symbol: '0', color: 'g' },
+		b5: { symbol: 'whatever', color: 'r' },
+	})).is('G0a2'); });
 });
 
 
@@ -100,6 +111,13 @@ describe('Parse text markers', () => {
 		h7: { symbol: 'x', color: 'r' },
 		d2: { symbol: 'L', color: 'r' },
 	}); });
+	it('Multi-character symbols', () => { test.value(parseTextMarkers('YAa1,G(plus)a7, R(times)b3  ,Y(dot)g5,G(circle)h3')).is({
+		a1: { symbol: 'A', color: 'y' },
+		a7: { symbol: 'plus', color: 'g' },
+		b3: { symbol: 'times', color: 'r' },
+		g5: { symbol: 'dot', color: 'y' },
+		h3: { symbol: 'circle', color: 'g' },
+	}); });
 	it('<empty>', () => { test.value(parseTextMarkers('')).is({}); });
 	it('<blank>', () => { test.value(parseTextMarkers(' ')).is({}); });
 
@@ -107,6 +125,7 @@ describe('Parse text markers', () => {
 	it('Duplicated square', () => { test.value(parseTextMarkers('Rka3,Gba3')).is({ a3: { symbol: 'b', color: 'g' } }); });
 	it('Wrong color', () => { test.value(parseTextMarkers('G3a6,BAg5')).is({ a6: { symbol: '3', color: 'g' } }); });
 	it('Wrong symbol', () => { test.value(parseTextMarkers('Rb2,RAg5,G.d3,Yabcde7')).is({ g5: { symbol: 'A', color: 'r' } }); });
+	it('Wrong multi-character symbol', () => { test.value(parseTextMarkers('RZb2,Y(whatever)e4')).is({ b2: { symbol: 'Z', color: 'r' } }); });
 	it('Wrong format', () => { test.value(parseTextMarkers('Something RHa2 invalid, Yqe4, G g3')).is({ e4: { symbol: 'q', color: 'y' } }); });
 });
 

package/test/2_chessboard_util.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *

package/test/3_marker_icons_graphic.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *
@@ -36,5 +36,5 @@ describe('Marker icons graphic', function() {
 	});
 
 	itChecksScreenshots(browserContext, '01_marker_icons', [ 'default square', 'colorized square', 'wrapped square', 'default text', 'colorized text', 'wrapped text',
-		'default arrow', 'colorized arrow', 'wrapped arrow' ]);
+		'default arrow', 'colorized arrow', 'wrapped arrow', 'colorized symbol', 'wrapped symbol' ]);
 });

package/test/4_chessboard_graphic.js

@@ -1,7 +1,7 @@
 /******************************************************************************
  *                                                                            *
  *    This file is part of Kokopu-React, a JavaScript chess library.          *
- *    Copyright (C) 2021  Yoann Le Montagner <yo35 -at- melix.net>            *
+ *    Copyright (C) 2021-2022  Yoann Le Montagner <yo35 -at- melix.net>       *
  *                                                                            *
  *    This program is free software: you can redistribute it and/or           *
  *    modify it under the terms of the GNU Lesser General Public License      *