--- a/svghmi/analyse_widget.xslt Mon Oct 04 07:41:18 2021 +0200
+++ b/svghmi/analyse_widget.xslt Mon Oct 04 07:52:54 2021 +0200
@@ -221,14 +221,16 @@
<xsl:text>in between 0 and 100.
- <xsl:text>If "value" labeled text is found, then its content is replaced by value. <xsl:text>Change end angle of Inkscape's arc</xsl:text>
+ <arg name="min" count="optional" accepts="int,real"> + <xsl:text>minimum value</xsl:text> + <arg name="max" count="optional" accepts="int,real"> + <xsl:text>maximum value</xsl:text> <path name="value" accepts="HMI_INT,HMI_REAL">
<xsl:text>Value to display</xsl:text>
@@ -583,10 +585,6 @@
<xsl:text>in between 0 and 100.
- <xsl:text>If "value" labeled text is found, then its content is replaced by value. <xsl:text>Moves "needle" along "range"</xsl:text>
--- a/svghmi/gen_index_xhtml.xslt Mon Oct 04 07:41:18 2021 +0200
+++ b/svghmi/gen_index_xhtml.xslt Mon Oct 04 07:52:54 2021 +0200
@@ -2402,14 +2402,16 @@
<xsl:text>in between 0 and 100.
- <xsl:text>If "value" labeled text is found, then its content is replaced by value. <xsl:text>Change end angle of Inkscape's arc</xsl:text>
+ <arg name="min" count="optional" accepts="int,real"> + <xsl:text>minimum value</xsl:text> + <arg name="max" count="optional" accepts="int,real"> + <xsl:text>maximum value</xsl:text> <path name="value" accepts="HMI_INT,HMI_REAL">
<xsl:text>Value to display</xsl:text>
@@ -2477,6 +2479,12 @@
+ <xsl:text> if(this.args.length >= 2) + <xsl:text> [this.min, this.max]=this.args; <xsl:text> let [start, end, cx, cy, rx, ry] = ["start", "end", "cx", "cy", "rx", "ry"].
<xsl:text> map(tag=>Number(this.path_elt.getAttribute('sodipodi:'+tag)))
@@ -2525,7 +2533,7 @@
<xsl:call-template name="defs_by_labels">
<xsl:with-param name="hmi_element" select="$hmi_element"/>
<xsl:with-param name="labels">
- <xsl:text>value min max</xsl:text>+ <xsl:text>min max</xsl:text> <xsl:with-param name="mandatory" select="'no'"/>
@@ -3248,483 +3256,6 @@
- <xsl:template match="preamble:display">- <xsl:text>/* </xsl:text>- <xsl:value-of select="local-name()"/>- <xsl:text>/* https://github.com/alexei/sprintf.js/blob/master/src/sprintf.js */- <xsl:text>/* global window, exports, define */- <xsl:text>!function() {- <xsl:text> 'use strict'- <xsl:text> not_string: /[^s]/,- <xsl:text> not_bool: /[^t]/,- <xsl:text> not_type: /[^T]/,- <xsl:text> not_primitive: /[^v]/,- <xsl:text> number: /[diefg]/,- <xsl:text> numeric_arg: /[bcdiefguxX]/,- <xsl:text> json: /[j]/,- <xsl:text> not_json: /[^j]/,- <xsl:text> text: /^[^%]+/,- <xsl:text> modulo: /^%{2}/,- <xsl:text> placeholder: /^%(?:([1-9]\d*)\$|\(([^)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/,- <xsl:text> key: /^([a-z_][a-z_\d]*)/i,- <xsl:text> key_access: /^\.([a-z_][a-z_\d]*)/i,- <xsl:text> index_access: /^\[(\d+)\]/,- <xsl:text> sign: /^[+-]/- <xsl:text> function sprintf(key) {- <xsl:text> // arguments is not an array, but should be fine for this call- <xsl:text> return sprintf_format(sprintf_parse(key), arguments)- <xsl:text> function vsprintf(fmt, argv) {- <xsl:text> return sprintf.apply(null, [fmt].concat(argv || []))- <xsl:text> function sprintf_format(parse_tree, argv) {- <xsl:text> var cursor = 1, tree_length = parse_tree.length, arg, output = '', i, k, ph, pad, pad_character, pad_length, is_positive, sign- <xsl:text> for (i = 0; i < tree_length; i++) {- <xsl:text> if (typeof parse_tree[i] === 'string') {- <xsl:text> output += parse_tree[i]- <xsl:text> else if (typeof parse_tree[i] === 'object') {- <xsl:text> ph = parse_tree[i] // convenience purposes only- <xsl:text> if (ph.keys) { // keyword argument- <xsl:text> arg = argv[cursor]- <xsl:text> for (k = 0; k < ph.keys.length; k++) {- <xsl:text> if (arg == undefined) {- <xsl:text> throw new Error(sprintf('[sprintf] Cannot access property "%s" of undefined value "%s"', ph.keys[k], ph.keys[k-1]))- <xsl:text> arg = arg[ph.keys[k]]- <xsl:text> else if (ph.param_no) { // positional argument (explicit)- <xsl:text> arg = argv[ph.param_no]- <xsl:text> else { // positional argument (implicit)- <xsl:text> arg = argv[cursor++]- <xsl:text> if (re.not_type.test(ph.type) && re.not_primitive.test(ph.type) && arg instanceof Function) {- <xsl:text> if (re.numeric_arg.test(ph.type) && (typeof arg !== 'number' && isNaN(arg))) {- <xsl:text> throw new TypeError(sprintf('[sprintf] expecting number but found %T', arg))- <xsl:text> if (re.number.test(ph.type)) {- <xsl:text> is_positive = arg >= 0- <xsl:text> switch (ph.type) {- <xsl:text> arg = parseInt(arg, 10).toString(2)- <xsl:text> arg = String.fromCharCode(parseInt(arg, 10))- <xsl:text> arg = parseInt(arg, 10)- <xsl:text> arg = JSON.stringify(arg, null, ph.width ? parseInt(ph.width) : 0)- <xsl:text> arg = ph.precision ? parseFloat(arg).toExponential(ph.precision) : parseFloat(arg).toExponential()- <xsl:text> arg = ph.precision ? parseFloat(arg).toFixed(ph.precision) : parseFloat(arg)- <xsl:text> arg = ph.precision ? String(Number(arg.toPrecision(ph.precision))) : parseFloat(arg)- <xsl:text> arg = (parseInt(arg, 10) >>> 0).toString(8)- <xsl:text> arg = String(arg)- <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg)- <xsl:text> arg = String(!!arg)- <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg)- <xsl:text> arg = Object.prototype.toString.call(arg).slice(8, -1).toLowerCase()- <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg)- <xsl:text> arg = parseInt(arg, 10) >>> 0- <xsl:text> arg = arg.valueOf()- <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg)- <xsl:text> arg = (parseInt(arg, 10) >>> 0).toString(16)- <xsl:text> arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase()- <xsl:text> if (re.json.test(ph.type)) {- <xsl:text> output += arg- <xsl:text> if (re.number.test(ph.type) && (!is_positive || ph.sign)) {- <xsl:text> sign = is_positive ? '+' : '-'- <xsl:text> arg = arg.toString().replace(re.sign, '')- <xsl:text> pad_character = ph.pad_char ? ph.pad_char === '0' ? '0' : ph.pad_char.charAt(1) : ' '- <xsl:text> pad_length = ph.width - (sign + arg).length- <xsl:text> pad = ph.width ? (pad_length > 0 ? pad_character.repeat(pad_length) : '') : ''- <xsl:text> output += ph.align ? sign + arg + pad : (pad_character === '0' ? sign + pad + arg : pad + sign + arg)- <xsl:text> return output- <xsl:text> var sprintf_cache = Object.create(null)- <xsl:text> function sprintf_parse(fmt) {- <xsl:text> if (sprintf_cache[fmt]) {- <xsl:text> return sprintf_cache[fmt]- <xsl:text> var _fmt = fmt, match, parse_tree = [], arg_names = 0- <xsl:text> while (_fmt) {- <xsl:text> if ((match = re.text.exec(_fmt)) !== null) {- <xsl:text> parse_tree.push(match[0])- <xsl:text> else if ((match = re.modulo.exec(_fmt)) !== null) {- <xsl:text> parse_tree.push('%')- <xsl:text> else if ((match = re.placeholder.exec(_fmt)) !== null) {- <xsl:text> if (match[2]) {- <xsl:text> arg_names |= 1- <xsl:text> var field_list = [], replacement_field = match[2], field_match = []- <xsl:text> if ((field_match = re.key.exec(replacement_field)) !== null) {- <xsl:text> field_list.push(field_match[1])- <xsl:text> while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {- <xsl:text> if ((field_match = re.key_access.exec(replacement_field)) !== null) {- <xsl:text> field_list.push(field_match[1])- <xsl:text> else if ((field_match = re.index_access.exec(replacement_field)) !== null) {- <xsl:text> field_list.push(field_match[1])- <xsl:text> throw new SyntaxError('[sprintf] failed to parse named argument key')- <xsl:text> throw new SyntaxError('[sprintf] failed to parse named argument key')- <xsl:text> match[2] = field_list- <xsl:text> arg_names |= 2- <xsl:text> if (arg_names === 3) {- <xsl:text> throw new Error('[sprintf] mixing positional and named placeholders is not (yet) supported')- <xsl:text> parse_tree.push(- <xsl:text> placeholder: match[0],- <xsl:text> param_no: match[1],- <xsl:text> keys: match[2],- <xsl:text> sign: match[3],- <xsl:text> pad_char: match[4],- <xsl:text> align: match[5],- <xsl:text> width: match[6],- <xsl:text> precision: match[7],- <xsl:text> type: match[8]- <xsl:text> throw new SyntaxError('[sprintf] unexpected placeholder')- <xsl:text> _fmt = _fmt.substring(match[0].length)- <xsl:text> return sprintf_cache[fmt] = parse_tree- <xsl:text> * export to either browser or node.js- <xsl:text> /* eslint-disable quote-props */- <xsl:text> if (typeof exports !== 'undefined') {- <xsl:text> exports['sprintf'] = sprintf- <xsl:text> exports['vsprintf'] = vsprintf- <xsl:text> if (typeof window !== 'undefined') {- <xsl:text> window['sprintf'] = sprintf- <xsl:text> window['vsprintf'] = vsprintf- <xsl:text> if (typeof define === 'function' && define['amd']) {- <xsl:text> define(function() {- <xsl:text> 'sprintf': sprintf,- <xsl:text> 'vsprintf': vsprintf- <xsl:text> /* eslint-enable quote-props */- <xsl:text>}(); // eslint-disable-line <xsl:template match="widget[@type='DropDown']" mode="widget_desc">
<xsl:value-of select="@type"/>
@@ -6146,10 +5677,6 @@
<xsl:text>in between 0 and 100.
- <xsl:text>If "value" labeled text is found, then its content is replaced by value. <xsl:text>Moves "needle" along "range"</xsl:text>
@@ -6235,7 +5762,7 @@
<xsl:call-template name="defs_by_labels">
<xsl:with-param name="hmi_element" select="$hmi_element"/>
<xsl:with-param name="labels">
- <xsl:text>value min max</xsl:text>+ <xsl:text>min max</xsl:text> <xsl:with-param name="mandatory" select="'no'"/>
@@ -7990,6 +7517,470 @@
<xsl:apply-templates select="document('')/*/epilogue:*"/>
+ <xsl:text>/* https://github.com/alexei/sprintf.js/blob/master/src/sprintf.js */ + <xsl:text>/* global window, exports, define */ + <xsl:text>!function() { + <xsl:text> 'use strict' + <xsl:text> not_string: /[^s]/, + <xsl:text> not_bool: /[^t]/, + <xsl:text> not_type: /[^T]/, + <xsl:text> not_primitive: /[^v]/, + <xsl:text> number: /[diefg]/, + <xsl:text> numeric_arg: /[bcdiefguxX]/, + <xsl:text> json: /[j]/, + <xsl:text> not_json: /[^j]/, + <xsl:text> text: /^[^%]+/, + <xsl:text> modulo: /^%{2}/, + <xsl:text> placeholder: /^%(?:([1-9]\d*)\$|\(([^)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/, + <xsl:text> key: /^([a-z_][a-z_\d]*)/i, + <xsl:text> key_access: /^\.([a-z_][a-z_\d]*)/i, + <xsl:text> index_access: /^\[(\d+)\]/, + <xsl:text> sign: /^[+-]/ + <xsl:text> function sprintf(key) { + <xsl:text> // arguments is not an array, but should be fine for this call + <xsl:text> return sprintf_format(sprintf_parse(key), arguments) + <xsl:text> function vsprintf(fmt, argv) { + <xsl:text> return sprintf.apply(null, [fmt].concat(argv || [])) + <xsl:text> function sprintf_format(parse_tree, argv) { + <xsl:text> var cursor = 1, tree_length = parse_tree.length, arg, output = '', i, k, ph, pad, pad_character, pad_length, is_positive, sign + <xsl:text> for (i = 0; i < tree_length; i++) { + <xsl:text> if (typeof parse_tree[i] === 'string') { + <xsl:text> output += parse_tree[i] + <xsl:text> else if (typeof parse_tree[i] === 'object') { + <xsl:text> ph = parse_tree[i] // convenience purposes only + <xsl:text> if (ph.keys) { // keyword argument + <xsl:text> arg = argv[cursor] + <xsl:text> for (k = 0; k < ph.keys.length; k++) { + <xsl:text> if (arg == undefined) { + <xsl:text> throw new Error(sprintf('[sprintf] Cannot access property "%s" of undefined value "%s"', ph.keys[k], ph.keys[k-1])) + <xsl:text> arg = arg[ph.keys[k]] + <xsl:text> else if (ph.param_no) { // positional argument (explicit) + <xsl:text> arg = argv[ph.param_no] + <xsl:text> else { // positional argument (implicit) + <xsl:text> arg = argv[cursor++] + <xsl:text> if (re.not_type.test(ph.type) && re.not_primitive.test(ph.type) && arg instanceof Function) { + <xsl:text> if (re.numeric_arg.test(ph.type) && (typeof arg !== 'number' && isNaN(arg))) { + <xsl:text> throw new TypeError(sprintf('[sprintf] expecting number but found %T', arg)) + <xsl:text> if (re.number.test(ph.type)) { + <xsl:text> is_positive = arg >= 0 + <xsl:text> switch (ph.type) { + <xsl:text> arg = parseInt(arg, 10).toString(2) + <xsl:text> arg = String.fromCharCode(parseInt(arg, 10)) + <xsl:text> arg = parseInt(arg, 10) + <xsl:text> arg = JSON.stringify(arg, null, ph.width ? parseInt(ph.width) : 0) + <xsl:text> arg = ph.precision ? parseFloat(arg).toExponential(ph.precision) : parseFloat(arg).toExponential() + <xsl:text> arg = ph.precision ? parseFloat(arg).toFixed(ph.precision) : parseFloat(arg) + <xsl:text> arg = ph.precision ? String(Number(arg.toPrecision(ph.precision))) : parseFloat(arg) + <xsl:text> arg = (parseInt(arg, 10) >>> 0).toString(8) + <xsl:text> arg = String(arg) + <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + <xsl:text> arg = String(!!arg) + <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + <xsl:text> arg = Object.prototype.toString.call(arg).slice(8, -1).toLowerCase() + <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + <xsl:text> arg = parseInt(arg, 10) >>> 0 + <xsl:text> arg = arg.valueOf() + <xsl:text> arg = (ph.precision ? arg.substring(0, ph.precision) : arg) + <xsl:text> arg = (parseInt(arg, 10) >>> 0).toString(16) + <xsl:text> arg = (parseInt(arg, 10) >>> 0).toString(16).toUpperCase() + <xsl:text> if (re.json.test(ph.type)) { + <xsl:text> output += arg + <xsl:text> if (re.number.test(ph.type) && (!is_positive || ph.sign)) { + <xsl:text> sign = is_positive ? '+' : '-' + <xsl:text> arg = arg.toString().replace(re.sign, '') + <xsl:text> pad_character = ph.pad_char ? ph.pad_char === '0' ? '0' : ph.pad_char.charAt(1) : ' ' + <xsl:text> pad_length = ph.width - (sign + arg).length + <xsl:text> pad = ph.width ? (pad_length > 0 ? pad_character.repeat(pad_length) : '') : '' + <xsl:text> output += ph.align ? sign + arg + pad : (pad_character === '0' ? sign + pad + arg : pad + sign + arg) + <xsl:text> return output + <xsl:text> var sprintf_cache = Object.create(null) + <xsl:text> function sprintf_parse(fmt) { + <xsl:text> if (sprintf_cache[fmt]) { + <xsl:text> return sprintf_cache[fmt] + <xsl:text> var _fmt = fmt, match, parse_tree = [], arg_names = 0 + <xsl:text> while (_fmt) { + <xsl:text> if ((match = re.text.exec(_fmt)) !== null) { + <xsl:text> parse_tree.push(match[0]) + <xsl:text> else if ((match = re.modulo.exec(_fmt)) !== null) { + <xsl:text> parse_tree.push('%') + <xsl:text> else if ((match = re.placeholder.exec(_fmt)) !== null) { + <xsl:text> if (match[2]) { + <xsl:text> arg_names |= 1 + <xsl:text> var field_list = [], replacement_field = match[2], field_match = [] + <xsl:text> if ((field_match = re.key.exec(replacement_field)) !== null) { + <xsl:text> field_list.push(field_match[1]) + <xsl:text> while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') { + <xsl:text> if ((field_match = re.key_access.exec(replacement_field)) !== null) { + <xsl:text> field_list.push(field_match[1]) + <xsl:text> else if ((field_match = re.index_access.exec(replacement_field)) !== null) { + <xsl:text> field_list.push(field_match[1]) + <xsl:text> throw new SyntaxError('[sprintf] failed to parse named argument key') + <xsl:text> throw new SyntaxError('[sprintf] failed to parse named argument key') + <xsl:text> match[2] = field_list + <xsl:text> arg_names |= 2 + <xsl:text> if (arg_names === 3) { + <xsl:text> throw new Error('[sprintf] mixing positional and named placeholders is not (yet) supported') + <xsl:text> parse_tree.push( + <xsl:text> placeholder: match[0], + <xsl:text> param_no: match[1], + <xsl:text> keys: match[2], + <xsl:text> sign: match[3], + <xsl:text> pad_char: match[4], + <xsl:text> align: match[5], + <xsl:text> width: match[6], + <xsl:text> precision: match[7], + <xsl:text> type: match[8] + <xsl:text> throw new SyntaxError('[sprintf] unexpected placeholder') + <xsl:text> _fmt = _fmt.substring(match[0].length) + <xsl:text> return sprintf_cache[fmt] = parse_tree + <xsl:text> * export to either browser or node.js + <xsl:text> /* eslint-disable quote-props */ + <xsl:text> if (typeof exports !== 'undefined') { + <xsl:text> exports['sprintf'] = sprintf + <xsl:text> exports['vsprintf'] = vsprintf + <xsl:text> if (typeof window !== 'undefined') { + <xsl:text> window['sprintf'] = sprintf + <xsl:text> window['vsprintf'] = vsprintf + <xsl:text> if (typeof define === 'function' && define['amd']) { + <xsl:text> define(function() { + <xsl:text> 'sprintf': sprintf, + <xsl:text> 'vsprintf': vsprintf + <xsl:text> /* eslint-enable quote-props */ + <xsl:text>}(); // eslint-disable-line --- a/svghmi/gen_index_xhtml.ysl2 Mon Oct 04 07:41:18 2021 +0200
+++ b/svghmi/gen_index_xhtml.ysl2 Mon Oct 04 07:52:54 2021 +0200
@@ -94,6 +94,8 @@
| \n//\n//\n// Statements that needs to be at the end \n//\n//
apply "document('')/*/epilogue:*";
+ include text sprintf.js 