@digabi/exam-engine-mastering 19.7.1 → 19.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/__tests__/testExamMastering.js +28 -21
- package/dist/__tests__/testExamMastering.js.map +1 -1
- package/dist/__tests__/testMexCreation.js +10 -10
- package/dist/__tests__/testMexCreation.js.map +1 -1
- package/dist/__tests__/tsconfig.tsbuildinfo +1 -1
- package/dist/createMex.js +4 -4
- package/dist/createMex.js.map +1 -1
- package/dist/crypto-utils.js +1 -1
- package/dist/crypto-utils.js.map +1 -1
- package/dist/i18n/index.js +4 -4
- package/dist/mastering/createGradingStructure.js +7 -7
- package/dist/mastering/createGradingStructure.js.map +1 -1
- package/dist/mastering/createTranslationFile.js +2 -2
- package/dist/mastering/createTranslationFile.js.map +1 -1
- package/dist/mastering/index.d.ts.map +1 -1
- package/dist/mastering/index.js +48 -36
- package/dist/mastering/index.js.map +1 -1
- package/dist/mastering/render-formula.js +6 -6
- package/dist/mastering/render-formula.js.map +1 -1
- package/dist/mastering/utils.js +1 -1
- package/dist/mastering/utils.js.map +1 -1
- package/dist/migrations/migrateFrom01To02.js +2 -2
- package/dist/migrations/migrateFrom01To02.js.map +1 -1
- package/dist/migrations/migrateFrom02To03.js +1 -1
- package/dist/migrations/migrateFrom02To03.js.map +1 -1
- package/dist/migrations.js +1 -1
- package/package.json +5 -5
- package/schema/exam.xsd +12 -0
- package/schema/xhtml11-model-1.xsd +5 -3
|
@@ -4,9 +4,9 @@ mjAPI.config({
|
|
|
4
4
|
extensions: 'TeX/mhchem.js',
|
|
5
5
|
MathJax: {
|
|
6
6
|
SVG: {
|
|
7
|
-
font: 'Latin-Modern'
|
|
8
|
-
}
|
|
9
|
-
}
|
|
7
|
+
font: 'Latin-Modern'
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
10
|
});
|
|
11
11
|
mjAPI.start();
|
|
12
12
|
const errorSvg = `<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
|
|
@@ -37,10 +37,10 @@ function renderFormula(formula, mode, throwOnLatexError) {
|
|
|
37
37
|
math: formula,
|
|
38
38
|
format: mode === 'display' ? 'TeX' : 'inline-TeX',
|
|
39
39
|
svg: true,
|
|
40
|
-
ex: 9
|
|
40
|
+
ex: 9 // Noto Sans 16px
|
|
41
41
|
})
|
|
42
|
-
.then(
|
|
43
|
-
.catch(
|
|
42
|
+
.then(result => result.svg)
|
|
43
|
+
.catch(errors => {
|
|
44
44
|
if (throwOnLatexError) {
|
|
45
45
|
throw errors;
|
|
46
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-formula.js","sourceRoot":"","sources":["../../src/mastering/render-formula.js"],"names":[],"mappings":";AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;AAErC,KAAK,CAAC,MAAM,CAAC;IACX,UAAU,EAAE,eAAe;IAC3B,OAAO,EAAE;QACP,GAAG,EAAE;YACH,IAAI,EAAE,cAAc;SACrB;KACF;CACF,CAAC,CAAA;AAEF,KAAK,CAAC,KAAK,EAAE,CAAA;AAEb,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;OAcV,CAAA;AAEP;;;;;;GAMG;AACH,SAAS,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,iBAAiB;IACrD,OAAO,KAAK;SACT,OAAO,CAAC;QACP,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY;QACjD,GAAG,EAAE,IAAI;QACT,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"render-formula.js","sourceRoot":"","sources":["../../src/mastering/render-formula.js"],"names":[],"mappings":";AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;AAErC,KAAK,CAAC,MAAM,CAAC;IACX,UAAU,EAAE,eAAe;IAC3B,OAAO,EAAE;QACP,GAAG,EAAE;YACH,IAAI,EAAE,cAAc;SACrB;KACF;CACF,CAAC,CAAA;AAEF,KAAK,CAAC,KAAK,EAAE,CAAA;AAEb,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;OAcV,CAAA;AAEP;;;;;;GAMG;AACH,SAAS,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,iBAAiB;IACrD,OAAO,KAAK;SACT,OAAO,CAAC;QACP,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY;QACjD,GAAG,EAAE,IAAI;QACT,EAAE,EAAE,CAAC,CAAC,iBAAiB;KACxB,CAAC;SACD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;SAC1B,KAAK,CAAC,MAAM,CAAC,EAAE;QACd,IAAI,iBAAiB,EAAE;YACrB,MAAM,MAAM,CAAA;SACb;aAAM;YACL,OAAO,QAAQ,CAAA;SAChB;IACH,CAAC,CAAC,CAAA;AACN,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,aAAa,CAAA"}
|
package/dist/mastering/utils.js
CHANGED
|
@@ -50,7 +50,7 @@ function getNumericAttribute(name, element, defaultValue) {
|
|
|
50
50
|
exports.getNumericAttribute = getNumericAttribute;
|
|
51
51
|
/** Helper function for generating `(.//e:foo | .//e:bar | .//e:baz)`-like XPath selectors. */
|
|
52
52
|
function xpathOr(names) {
|
|
53
|
-
return `(${names.map(
|
|
53
|
+
return `(${names.map(localName => `.//e:${localName}`).join(' | ')})`;
|
|
54
54
|
}
|
|
55
55
|
exports.xpathOr = xpathOr;
|
|
56
56
|
function _getAttr(element, name, transform, defaultValue) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/mastering/utils.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAmC;AACnC,oDAAsB;AAKtB,SAAS,WAAW,CAAC,KAAY;IAC/B,OAAO,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;QACtB,CAAC,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,KAAK;QACpC,CAAC,CAAC,gBAAC,CAAC,UAAU,CAAC,KAAK,CAAC;YACrB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;AAC9C,CAAC;AAED,SAAgB,cAAc,CAAC,OAAgB,EAAE,KAAY;IAC3D,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;IAC7B,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;IACpC,OAAO,MAAM,YAAY,mBAAO,EAAE;QAChC,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE;YACrB,OAAO,MAAM,CAAA;SACd;QACD,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAA;KACzB;AACH,CAAC;AATD,wCASC;AAEM,MAAM,WAAW,GACtB,CAAC,GAAG,KAAe,EAAE,EAAE,CACvB,CAAC,OAAgB,EAAW,EAAE,CAC5B,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;AAHrB,QAAA,WAAW,eAGU;AAE3B,MAAM,WAAW,GACtB,CAAC,IAAY,EAAE,KAAa,EAAE,EAAE,CAChC,CAAC,OAAgB,EAAW,EAAE,WAC5B,OAAA,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,0CAAE,KAAK,EAAE,MAAK,KAAK,CAAA,EAAA,CAAA;AAH5B,QAAA,WAAW,eAGiB;AAElC,MAAM,YAAY,GACvB,CAAC,IAAY,EAAE,EAAE,CACjB,CAAC,OAAgB,EAAW,EAAE,CAC5B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAA;AAHjB,QAAA,YAAY,gBAGK;AAE9B;;;;GAIG;AACH,SAAgB,YAAY,CAAa,IAAY,EAAE,OAAgB,EAAE,YAAgB;IACvF,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;AAC/G,CAAC;AAFD,oCAEC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CAAa,IAAY,EAAE,OAAgB,EAAE,YAAgB;IAC9F,OAAO,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;AAC/G,CAAC;AAFD,kDAEC;AAED,8FAA8F;AAC9F,SAAgB,OAAO,CAAC,KAAwB;IAC9C,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/mastering/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,11 +25,11 @@ const schema_1 = require("../mastering/schema");
|
|
|
25
25
|
* */
|
|
26
26
|
function migrateFrom01To02(doc) {
|
|
27
27
|
var _a;
|
|
28
|
-
doc.find('./e:languages', schema_1.ns).forEach(
|
|
28
|
+
doc.find('./e:languages', schema_1.ns).forEach(languages => {
|
|
29
29
|
languages
|
|
30
30
|
.name('exam-versions')
|
|
31
31
|
.find('./e:language', schema_1.ns)
|
|
32
|
-
.forEach(
|
|
32
|
+
.forEach(language => {
|
|
33
33
|
language.name('exam-version').attr('lang', language.text()).text('');
|
|
34
34
|
});
|
|
35
35
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrateFrom01To02.js","sourceRoot":"","sources":["../../src/migrations/migrateFrom01To02.ts"],"names":[],"mappings":";;;AACA,gDAAwC;AAExC;;;;;;;;;;;;;;;;;;;;KAoBK;AACL,SAAgB,iBAAiB,CAAC,GAAa;;IAC7C,GAAG,CAAC,IAAI,CAAU,eAAe,EAAE,WAAE,CAAC,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"migrateFrom01To02.js","sourceRoot":"","sources":["../../src/migrations/migrateFrom01To02.ts"],"names":[],"mappings":";;;AACA,gDAAwC;AAExC;;;;;;;;;;;;;;;;;;;;KAoBK;AACL,SAAgB,iBAAiB,CAAC,GAAa;;IAC7C,GAAG,CAAC,IAAI,CAAU,eAAe,EAAE,WAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACzD,SAAS;aACN,IAAI,CAAC,eAAe,CAAC;aACrB,IAAI,CAAU,cAAc,EAAE,WAAE,CAAC;aACjC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAClB,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACtE,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,MAAA,GAAG,CAAC,IAAI,EAAE,0CAAE,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;AAChD,CAAC;AAXD,8CAWC"}
|
|
@@ -26,7 +26,7 @@ function migrateFrom02To03(doc) {
|
|
|
26
26
|
if (childNodes.length) {
|
|
27
27
|
const name = element.name();
|
|
28
28
|
const title = element.node(`${name}-title`).namespace(schema_1.ns.e);
|
|
29
|
-
childNodes.forEach(
|
|
29
|
+
childNodes.forEach(node => title.addChild(node));
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
(_a = doc.root()) === null || _a === void 0 ? void 0 : _a.attr('exam-schema-version', '0.3');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrateFrom02To03.js","sourceRoot":"","sources":["../../src/migrations/migrateFrom02To03.ts"],"names":[],"mappings":";;;AACA,gDAAwC;AAExC;;;;;;;;;;;;;;;;KAgBK;AACL,SAAgB,iBAAiB,CAAC,GAAa;;IAC7C,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,IAAI,CAAU,uBAAuB,EAAE,WAAE,CAAC,EAAE;QACpE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAA;QACvC,IAAI,UAAU,CAAC,MAAM,EAAE;YACrB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;YAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,SAAS,CAAC,WAAE,CAAC,CAAC,CAAC,CAAA;YAC3D,UAAU,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"migrateFrom02To03.js","sourceRoot":"","sources":["../../src/migrations/migrateFrom02To03.ts"],"names":[],"mappings":";;;AACA,gDAAwC;AAExC;;;;;;;;;;;;;;;;KAgBK;AACL,SAAgB,iBAAiB,CAAC,GAAa;;IAC7C,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,IAAI,CAAU,uBAAuB,EAAE,WAAE,CAAC,EAAE;QACpE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,CAAA;QACvC,IAAI,UAAU,CAAC,MAAM,EAAE;YACrB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;YAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,SAAS,CAAC,WAAE,CAAC,CAAC,CAAC,CAAA;YAC3D,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;SACjD;KACF;IAED,MAAA,GAAG,CAAC,IAAI,EAAE,0CAAE,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAA;AAChD,CAAC;AAXD,8CAWC"}
|
package/dist/migrations.js
CHANGED
|
@@ -10,7 +10,7 @@ const migrations = {
|
|
|
10
10
|
'0.1': migrateFrom01To02_1.migrateFrom01To02,
|
|
11
11
|
'0.2': migrateFrom02To03_1.migrateFrom02To03,
|
|
12
12
|
'0.3': migrateFrom03To04_1.migrateFrom03To04,
|
|
13
|
-
'0.4': noop
|
|
13
|
+
'0.4': noop
|
|
14
14
|
};
|
|
15
15
|
const supportedVersions = Object.keys(migrations);
|
|
16
16
|
exports.currentExamSchemaVersion = supportedVersions[supportedVersions.length - 1];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@digabi/exam-engine-mastering",
|
|
3
|
-
"version": "19.
|
|
3
|
+
"version": "19.8.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"author": "Matriculation Examination Board, Finland",
|
|
6
6
|
"license": "EUPL-1.1",
|
|
@@ -9,17 +9,17 @@
|
|
|
9
9
|
"schema"
|
|
10
10
|
],
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@digabi/exam-engine-core": "19.
|
|
12
|
+
"@digabi/exam-engine-core": "19.8.1",
|
|
13
13
|
"@ffprobe-installer/ffprobe": "^2.0.0",
|
|
14
14
|
"cloneable-readable": "^3.0.0",
|
|
15
|
-
"compare-versions": "^
|
|
15
|
+
"compare-versions": "^6.0.0",
|
|
16
16
|
"ffprobe": "^1.1.0",
|
|
17
17
|
"glob": "^8.0.3",
|
|
18
18
|
"glob-promise": "^6.0.2",
|
|
19
|
-
"i18next": "^
|
|
19
|
+
"i18next": "^23.2.11",
|
|
20
20
|
"libxmljs2": "^0.32.0",
|
|
21
21
|
"mathjax-node": "^2.1.1",
|
|
22
22
|
"yazl": "^2.5.1"
|
|
23
23
|
},
|
|
24
|
-
"gitHead": "
|
|
24
|
+
"gitHead": "9896044f3a9b1070e788d4a8b4ab011e211151af"
|
|
25
25
|
}
|
package/schema/exam.xsd
CHANGED
|
@@ -324,6 +324,18 @@
|
|
|
324
324
|
</xs:complexType>
|
|
325
325
|
</xs:element>
|
|
326
326
|
|
|
327
|
+
<xs:element name="question-number">
|
|
328
|
+
<xs:complexType>
|
|
329
|
+
<xs:attribute name="suffix" type="xs:string" />
|
|
330
|
+
</xs:complexType>
|
|
331
|
+
</xs:element>
|
|
332
|
+
|
|
333
|
+
<xs:element name="translation">
|
|
334
|
+
<xs:complexType>
|
|
335
|
+
<xs:attribute name="key" type="xs:string" />
|
|
336
|
+
</xs:complexType>
|
|
337
|
+
</xs:element>
|
|
338
|
+
|
|
327
339
|
<xs:element name="image">
|
|
328
340
|
<xs:complexType>
|
|
329
341
|
<xs:sequence>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8" ?>
|
|
2
|
-
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
|
3
|
-
xmlns:e="http://ylioppilastutkinto.fi/exam.xsd"
|
|
2
|
+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
|
3
|
+
xmlns:e="http://ylioppilastutkinto.fi/exam.xsd"
|
|
4
4
|
xmlns:xh11d="http://www.w3.org/1999/xhtml/datatypes/" elementFormDefault="qualified">
|
|
5
5
|
<xs:import namespace="http://www.w3.org/1999/xhtml/datatypes/" schemaLocation="xhtml-datatypes-1.xsd" />
|
|
6
6
|
<xs:import namespace="http://ylioppilastutkinto.fi/exam.xsd" schemaLocation="exam.xsd" />
|
|
@@ -93,6 +93,8 @@
|
|
|
93
93
|
<xs:element ref="e:attachment-links" />
|
|
94
94
|
<xs:element ref="e:localization" />
|
|
95
95
|
<xs:element ref="e:formula" />
|
|
96
|
+
<xs:element ref="e:question-number" />
|
|
97
|
+
<xs:element ref="e:translation" />
|
|
96
98
|
</xs:choice>
|
|
97
99
|
</xs:group>
|
|
98
100
|
<!--
|
|
@@ -319,4 +321,4 @@
|
|
|
319
321
|
<xs:group ref="xhtml.Misc.class" />
|
|
320
322
|
</xs:choice>
|
|
321
323
|
</xs:group>
|
|
322
|
-
</xs:schema>
|
|
324
|
+
</xs:schema>
|