react-cheminfo 0.137.0 → 0.138.0
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/lib/drawing/render/motion.d.ts +2 -2
- package/lib/drawing/render/motion.d.ts.map +1 -1
- package/lib/drawing/render/motion.js +23 -4
- package/lib/drawing/render/motion.js.map +1 -1
- package/lib/drawing/render/primitives.d.ts +14 -0
- package/lib/drawing/render/primitives.d.ts.map +1 -1
- package/lib/drawing/render/svg.d.ts.map +1 -1
- package/lib/drawing/render/svg.js +27 -7
- package/lib/drawing/render/svg.js.map +1 -1
- package/lib/referents/core/figureReferents.d.ts +3 -2
- package/lib/referents/core/figureReferents.d.ts.map +1 -1
- package/lib/referents/core/figureReferents.js +6 -3
- package/lib/referents/core/figureReferents.js.map +1 -1
- package/lib/referents/core/index.d.ts +1 -0
- package/lib/referents/core/index.d.ts.map +1 -1
- package/lib/referents/core/index.js +1 -0
- package/lib/referents/core/index.js.map +1 -1
- package/lib/referents/core/quoteParts.d.ts +21 -0
- package/lib/referents/core/quoteParts.d.ts.map +1 -0
- package/lib/referents/core/quoteParts.js +71 -0
- package/lib/referents/core/quoteParts.js.map +1 -0
- package/lib/referents/core/readReferents.d.ts +2 -1
- package/lib/referents/core/readReferents.d.ts.map +1 -1
- package/lib/referents/core/readReferents.js +28 -2
- package/lib/referents/core/readReferents.js.map +1 -1
- package/lib/referents/core/types.d.ts +44 -0
- package/lib/referents/core/types.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/drawing/render/motion.ts +23 -4
- package/src/drawing/render/primitives.ts +14 -0
- package/src/drawing/render/svg.ts +34 -7
- package/src/referents/core/figureReferents.ts +8 -3
- package/src/referents/core/index.ts +1 -0
- package/src/referents/core/quoteParts.ts +82 -0
- package/src/referents/core/readReferents.ts +27 -2
- package/src/referents/core/types.ts +45 -0
|
@@ -20,7 +20,7 @@ export declare const RUN_FADE: {
|
|
|
20
20
|
* the page carries them once for every scene it draws, and every figure that
|
|
21
21
|
* has something to move carries them too, so the two never drift apart.
|
|
22
22
|
*/
|
|
23
|
-
export declare const MOTION_CSS = "/* A bubble rises from where it is drawn, three of its own heights, fading in\n and out, so a stream of them keeps going. */\n[data-motion='moving'] .glass-bubble {\n animation: glass-bubble-rise 1.4s linear infinite;\n transform-box: fill-box;\n}\n\n@keyframes glass-bubble-rise {\n 0% {\n opacity: 0;\n transform: translateY(0);\n }\n\n 20%,\n 75% {\n opacity: 1;\n }\n\n 100% {\n opacity: 0;\n transform: translateY(-300%);\n }\n}\n\n/* A stir bar seen from the side, turning about the upright: it shortens along\n the way it lies to its own thickness and back, each half turn. */\n[data-motion='moving'] .glass-turning {\n animation: glass-bar-turn 0.35s linear infinite;\n transform-box: fill-box;\n transform-origin: center;\n}\n\n@keyframes glass-bar-turn {\n 0%,\n 100% {\n transform: rotate(var(--glass-lying)) scaleX(1)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 12.5%,\n 87.5% {\n transform: rotate(var(--glass-lying)) scaleX(0.92)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 25%,\n 75% {\n transform: rotate(var(--glass-lying)) scaleX(0.71)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 37.5%,\n 62.5% {\n transform: rotate(var(--glass-lying)) scaleX(0.4)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 50% {\n transform: rotate(var(--glass-lying)) scaleX(0.27)\n rotate(calc(-1 * var(--glass-lying)));\n }\n}\n\n/* A rotor seen face on, spinning in its plane about the middle of its box,\n clockwise, or the other way when it spins back. */\n[data-motion='moving'] .glass-spinning {\n animation: glass-spin 1.2s linear infinite;\n transform-box: fill-box;\n transform-origin: center;\n}\n\n[data-motion='moving'] .glass-spinning-back {\n animation-direction: reverse;\n}\n\n@keyframes glass-spin {\n to {\n transform: rotate(360deg);\n }\n}\n\n/* A figure carries each bubble running along water, and each drop falling, as\n a run that only shows moving (written hidden, for a program that reads no\n style), and the ones drawn where they stand as a still copy that only shows\n held still. */\n[data-motion='moving'] .glass-run {\n display: inline;\n}\n\n[data-motion='moving'] .glass-stands {\n display: none;\n}\n\n@media print, (prefers-reduced-motion: reduce) {\n .glass-bubble,\n .glass-turning,\n .glass-spinning {\n animation: none;\n }\n\n [data-motion='moving'] .glass-run {\n display: none;\n }\n\n [data-motion='moving'] .glass-stands {\n display: inline;\n }\n}";
|
|
23
|
+
export declare const MOTION_CSS = "/* A bubble rises from where it is drawn, three of its own heights, fading in\n and out, so a stream of them keeps going. */\n[data-motion='moving'] .glass-bubble {\n animation: glass-bubble-rise 1.4s linear infinite;\n transform-box: fill-box;\n}\n\n@keyframes glass-bubble-rise {\n 0% {\n opacity: 0;\n transform: translateY(0);\n }\n\n 20%,\n 75% {\n opacity: 1;\n }\n\n 100% {\n opacity: 0;\n transform: translateY(-300%);\n }\n}\n\n/* A stir bar seen from the side, turning about the upright: it shortens along\n the way it lies to its own thickness and back, each half turn. */\n[data-motion='moving'] .glass-turning {\n animation: glass-bar-turn 0.35s linear infinite;\n transform-box: fill-box;\n transform-origin: center;\n}\n\n@keyframes glass-bar-turn {\n 0%,\n 100% {\n transform: rotate(var(--glass-lying)) scaleX(1)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 12.5%,\n 87.5% {\n transform: rotate(var(--glass-lying)) scaleX(0.92)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 25%,\n 75% {\n transform: rotate(var(--glass-lying)) scaleX(0.71)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 37.5%,\n 62.5% {\n transform: rotate(var(--glass-lying)) scaleX(0.4)\n rotate(calc(-1 * var(--glass-lying)));\n }\n\n 50% {\n transform: rotate(var(--glass-lying)) scaleX(0.27)\n rotate(calc(-1 * var(--glass-lying)));\n }\n}\n\n/* A rotor seen face on, spinning in its plane about the middle of its box,\n clockwise, or the other way when it spins back. */\n[data-motion='moving'] .glass-spinning {\n animation: glass-spin 1.2s linear infinite;\n transform-box: fill-box;\n transform-origin: center;\n}\n\n[data-motion='moving'] .glass-spinning-back {\n animation-direction: reverse;\n}\n\n@keyframes glass-spin {\n to {\n transform: rotate(360deg);\n }\n}\n\n/* A piece an orbital shaker swirls, seen edge on: it sways from one side of\n the orbit to the other and back, a round trip a third of a second long, as\n at 180 rpm. */\n[data-motion='moving'] .glass-swirling {\n animation: glass-swirl 0.167s ease-in-out infinite alternate;\n}\n\n@keyframes glass-swirl {\n from {\n transform: translateX(calc(-1 * var(--glass-orbit)));\n }\n\n to {\n transform: translateX(var(--glass-orbit));\n }\n}\n\n/* A figure carries each bubble running along water, and each drop falling, as\n a run that only shows moving (written hidden, for a program that reads no\n style), and the ones drawn where they stand as a still copy that only shows\n held still. */\n[data-motion='moving'] .glass-run {\n display: inline;\n}\n\n[data-motion='moving'] .glass-stands {\n display: none;\n}\n\n@media print, (prefers-reduced-motion: reduce) {\n .glass-bubble,\n .glass-turning,\n .glass-spinning,\n .glass-swirling {\n animation: none;\n }\n\n [data-motion='moving'] .glass-run {\n display: none;\n }\n\n [data-motion='moving'] .glass-stands {\n display: inline;\n }\n}";
|
|
24
24
|
/**
|
|
25
25
|
* The stylesheet a figure carries: {@link MOTION_CSS}, its comments and
|
|
26
26
|
* spaces taken out.
|
|
@@ -46,7 +46,7 @@ export declare function runTiming(flow: NonNullable<PathPrimitive['flow']>): {
|
|
|
46
46
|
};
|
|
47
47
|
/**
|
|
48
48
|
* Whether a scene has anything that moves: a bubble, a run, a turning piece,
|
|
49
|
-
* a spinning rotor.
|
|
49
|
+
* a spinning rotor, a piece an orbital shaker swirls.
|
|
50
50
|
* @param scene - The scene.
|
|
51
51
|
* @returns True when a figure of it can be set moving.
|
|
52
52
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/motion.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAQ5D,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAK9C,gEAAgE;AAChE,eAAO,MAAM,QAAQ;;;CAAiD,CAAC;AAEvE;;;;GAIG;AACH,eAAO,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"motion.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/motion.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAQ5D,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAK9C,gEAAgE;AAChE,eAAO,MAAM,QAAQ;;;CAAiD,CAAC;AAEvE;;;;GAIG;AACH,eAAO,MAAM,UAAU,67FA6HrB,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,YAAY,QAAyB,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG;IACnE,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,CAMA;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAgBhD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKhD"}
|
|
@@ -103,6 +103,23 @@ export const MOTION_CSS = `/* A bubble rises from where it is drawn, three of it
|
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
|
|
106
|
+
/* A piece an orbital shaker swirls, seen edge on: it sways from one side of
|
|
107
|
+
the orbit to the other and back, a round trip a third of a second long, as
|
|
108
|
+
at 180 rpm. */
|
|
109
|
+
[data-motion='moving'] .glass-swirling {
|
|
110
|
+
animation: glass-swirl 0.167s ease-in-out infinite alternate;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
@keyframes glass-swirl {
|
|
114
|
+
from {
|
|
115
|
+
transform: translateX(calc(-1 * var(--glass-orbit)));
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
to {
|
|
119
|
+
transform: translateX(var(--glass-orbit));
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
|
|
106
123
|
/* A figure carries each bubble running along water, and each drop falling, as
|
|
107
124
|
a run that only shows moving (written hidden, for a program that reads no
|
|
108
125
|
style), and the ones drawn where they stand as a still copy that only shows
|
|
@@ -118,7 +135,8 @@ export const MOTION_CSS = `/* A bubble rises from where it is drawn, three of it
|
|
|
118
135
|
@media print, (prefers-reduced-motion: reduce) {
|
|
119
136
|
.glass-bubble,
|
|
120
137
|
.glass-turning,
|
|
121
|
-
.glass-spinning
|
|
138
|
+
.glass-spinning,
|
|
139
|
+
.glass-swirling {
|
|
122
140
|
animation: none;
|
|
123
141
|
}
|
|
124
142
|
|
|
@@ -159,19 +177,20 @@ export function runTiming(flow) {
|
|
|
159
177
|
}
|
|
160
178
|
/**
|
|
161
179
|
* Whether a scene has anything that moves: a bubble, a run, a turning piece,
|
|
162
|
-
* a spinning rotor.
|
|
180
|
+
* a spinning rotor, a piece an orbital shaker swirls.
|
|
163
181
|
* @param scene - The scene.
|
|
164
182
|
* @returns True when a figure of it can be set moving.
|
|
165
183
|
*/
|
|
166
184
|
export function sceneMoves(scene) {
|
|
167
185
|
for (const item of scene.items) {
|
|
168
|
-
if (item.turning !== undefined)
|
|
186
|
+
if (item.turning !== undefined || item.swirling !== undefined)
|
|
169
187
|
return true;
|
|
170
188
|
for (const primitive of item.primitives) {
|
|
171
189
|
if (primitive.kind === 'path' &&
|
|
172
190
|
(primitive.flow !== undefined ||
|
|
173
191
|
primitive.bubble !== undefined ||
|
|
174
|
-
primitive.spins !== undefined
|
|
192
|
+
primitive.spins !== undefined ||
|
|
193
|
+
primitive.swirls !== undefined)) {
|
|
175
194
|
return true;
|
|
176
195
|
}
|
|
177
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion.js","sourceRoot":"","sources":["../../../src/drawing/render/motion.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,+EAA+E;AAC/E,MAAM,WAAW,GAAG,GAAG,CAAC;AAExB,wEAAwE;AACxE,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,2EAA2E;AAC3E,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAE9C,mEAAmE;AACnE,MAAM,MAAM,GAAG,+DAA+D,CAAC;AAE/E,gEAAgE;AAChE,MAAM,CAAC,MAAM,QAAQ,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;AAEvE;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG
|
|
1
|
+
{"version":3,"file":"motion.js","sourceRoot":"","sources":["../../../src/drawing/render/motion.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,6 +87,13 @@ export interface PathPrimitive {
|
|
|
87
87
|
* @default undefined — the whole piece turns, as a stir bar does
|
|
88
88
|
*/
|
|
89
89
|
turns?: true;
|
|
90
|
+
/**
|
|
91
|
+
* Whether it alone swirls while its piece runs, the rest still: the
|
|
92
|
+
* platform of an orbital shaker, over its casing. Set moving it swirls; a
|
|
93
|
+
* file holds it still.
|
|
94
|
+
* @default undefined — the whole piece swirls, as a flask on the platform does
|
|
95
|
+
*/
|
|
96
|
+
swirls?: true;
|
|
90
97
|
/**
|
|
91
98
|
* The way it spins in its own plane while its piece runs, with the
|
|
92
99
|
* primitives drawn next to it that spin the same way, about the middle of
|
|
@@ -209,6 +216,13 @@ export interface SceneItem<K extends string = string> {
|
|
|
209
216
|
* @default undefined — it stays still
|
|
210
217
|
*/
|
|
211
218
|
turning?: number;
|
|
219
|
+
/**
|
|
220
|
+
* For what an orbital shaker swirls, the radius of its orbit, in points:
|
|
221
|
+
* set moving, it circles the orbit, seen edge on as a sway from one side
|
|
222
|
+
* to the other; a file holds it still.
|
|
223
|
+
* @default undefined — it stays still
|
|
224
|
+
*/
|
|
225
|
+
swirling?: number;
|
|
212
226
|
}
|
|
213
227
|
/** A whole rendered drawing. */
|
|
214
228
|
export interface Scene<K extends string = string> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"primitives.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/primitives.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD,yBAAyB;AACzB,MAAM,WAAW,aAAa;IAC5B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe;IACf,IAAI,EAAE,KAAK,CAAC;IACZ,qBAAqB;IACrB,EAAE,EAAE,KAAK,CAAC;IACV,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,2DAA2D;AAC3D,MAAM,WAAW,gBAAgB;IAC/B,6BAA6B;IAC7B,IAAI,EAAE,SAAS,CAAC;IAChB,6BAA6B;IAC7B,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB;AAED,gFAAgF;AAChF,MAAM,WAAW,aAAa;IAC5B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,CAAC,EAAE,MAAM,CAAC;IACV,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,4EAA4E;IAC5E,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB;;;OAGG;IACH,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB;;;OAGG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,KAAK,CAAC,EAAE,IAAI,CAAC;IACb;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,IAAI,CAAC;IACb;;;;;;;;OAQG;IACH,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC3E;AAED,6CAA6C;AAC7C,MAAM,MAAM,IAAI,GAAG,WAAW,GAAG,eAAe,CAAC;AAEjD,4DAA4D;AAC5D,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,IAAI,EAAE,KAAK,CAAC;IACZ,yBAAyB;IACzB,CAAC,EAAE,MAAM,CAAC;IACV,yBAAyB;IACzB,CAAC,EAAE,MAAM,CAAC;IACV,yBAAyB;IACzB,CAAC,EAAE,MAAM,CAAC;CACX;AAED,qBAAqB;AACrB,MAAM,WAAW,aAAa;IAC5B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,2BAA2B;IAC3B,CAAC,EAAE,MAAM,CAAC;IACV,4BAA4B;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,IAAI,CAAC,EAAE,cAAc,GAAG,UAAU,CAAC;CACpC;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,6BAA6B;IAC7B,IAAI,EAAE,SAAS,CAAC;IAChB,8CAA8C;IAC9C,CAAC,EAAE,MAAM,CAAC;IACV,iDAAiD;IACjD,CAAC,EAAE,MAAM,CAAC;IACV,oCAAoC;IACpC,MAAM,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;IACnC,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,qEAAqE;IACrE,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,6BAA6B;IAC7B,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;IAChB,4DAA4D;IAC5D,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,qDAAqD;IACrD,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,2CAA2C;AAC3C,MAAM,MAAM,SAAS,GACjB,aAAa,GACb,gBAAgB,GAChB,aAAa,GACb,YAAY,GACZ,aAAa,GACb,gBAAgB,GAChB,cAAc,CAAC;AAEnB,wCAAwC;AACxC,gFAAgF;AAChF,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IACnD,uEAAuE;IACvE,IAAI,EAAE,CAAC,CAAC;IACR,sBAAsB;IACtB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,oCAAoC;AACpC,MAAM,WAAW,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;IAClD,wBAAwB;IACxB,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,uBAAuB;IACvB,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"primitives.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/primitives.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/svg.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAUxD,OAAO,KAAK,EAGV,SAAS,EACT,KAAK,EAEN,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wDAAwD;AACxD,eAAO,MAAM,cAAc,mCAAmC,CAAC;AAE/D,mEAAmE;AACnE,MAAM,WAAW,aAAa;IAC5B,2CAA2C;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,uBAAuB;IACvB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,uBAAuB;IACvB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B;AAED,kCAAkC;AAClC,MAAM,WAAW,UAAU;IACzB,mEAAmE;IACnE,KAAK,EAAE,YAAY,CAAC;IACpB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,CAgBnE;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CACvB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,UAAU,GAClB,MAAM,CAUR;
|
|
1
|
+
{"version":3,"file":"svg.d.ts","sourceRoot":"","sources":["../../../src/drawing/render/svg.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAUxD,OAAO,KAAK,EAGV,SAAS,EACT,KAAK,EAEN,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,wDAAwD;AACxD,eAAO,MAAM,cAAc,mCAAmC,CAAC;AAE/D,mEAAmE;AACnE,MAAM,WAAW,aAAa;IAC5B,2CAA2C;IAC3C,EAAE,EAAE,MAAM,CAAC;IACX,uBAAuB;IACvB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,uBAAuB;IACvB,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1B;AAED,kCAAkC;AAClC,MAAM,WAAW,UAAU;IACzB,mEAAmE;IACnE,KAAK,EAAE,YAAY,CAAC;IACpB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,CAgBnE;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CACvB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,GAAG,EACV,OAAO,EAAE,UAAU,GAClB,MAAM,CAUR;AAmHD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,YAAY,EACnB,GAAG,GAAE,MAAoB,GACxB,MAAM,CAsBR"}
|
|
@@ -113,18 +113,38 @@ function itemMarkup(item, options) {
|
|
|
113
113
|
: inner.join('');
|
|
114
114
|
})
|
|
115
115
|
.join('');
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
const
|
|
120
|
-
|
|
116
|
+
const motion = motionOf(item);
|
|
117
|
+
// A piece whose paddle or platform alone moves keeps the rest still.
|
|
118
|
+
if (motion && item.primitives.some(motion.alone)) {
|
|
119
|
+
const still = item.primitives.filter((primitive) => !motion.alone(primitive));
|
|
120
|
+
const moving = item.primitives.filter(motion.alone);
|
|
121
|
+
return `<g cd:${kind}="${id}"${label}${ink}${faded}>${markup(still)}<g${motion.markup}>${markup(moving)}</g></g>`;
|
|
121
122
|
}
|
|
122
|
-
const
|
|
123
|
-
return `<g cd:${kind}="${id}"${label}${ink}${faded}${
|
|
123
|
+
const whole = motion?.markup ?? '';
|
|
124
|
+
return `<g cd:${kind}="${id}"${label}${ink}${faded}${whole}>${markup(item.primitives)}</g>`;
|
|
125
|
+
}
|
|
126
|
+
// How a piece moves, and which of its primitives move alone when some do: a
|
|
127
|
+
// stir bar turns, a stirrer's paddle under its shaft; a flask on an orbital
|
|
128
|
+
// shaker swirls, the shaker's platform over its casing.
|
|
129
|
+
function motionOf(item) {
|
|
130
|
+
if (item.turning !== undefined) {
|
|
131
|
+
return { markup: turningMarkup(item.turning), alone: turnsAlone };
|
|
132
|
+
}
|
|
133
|
+
if (item.swirling !== undefined) {
|
|
134
|
+
return { markup: swirlingMarkup(item.swirling), alone: swirlsAlone };
|
|
135
|
+
}
|
|
136
|
+
return undefined;
|
|
124
137
|
}
|
|
125
138
|
function turnsAlone(primitive) {
|
|
126
139
|
return primitive.kind === 'path' && primitive.turns === true;
|
|
127
140
|
}
|
|
141
|
+
function swirlsAlone(primitive) {
|
|
142
|
+
return primitive.kind === 'path' && primitive.swirls === true;
|
|
143
|
+
}
|
|
144
|
+
// What sets a piece swirling on the orbit of an orbital shaker.
|
|
145
|
+
function swirlingMarkup(orbit) {
|
|
146
|
+
return ` class="glass-swirling" style="--glass-orbit: ${number(orbit)}px"`;
|
|
147
|
+
}
|
|
128
148
|
// What sets a stir bar turning about the upright, the way it lies.
|
|
129
149
|
function turningMarkup(lying) {
|
|
130
150
|
return ` class="glass-turning" style="--glass-lying: ${number(lying)}deg"`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/drawing/render/svg.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAQ/C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGpD,wDAAwD;AACxD,MAAM,CAAC,MAAM,cAAc,GAAG,gCAAgC,CAAC;AAiC/D;;;;;;;;GAQG;AACH,MAAM,UAAU,SAAS,CAAC,KAAY,EAAE,OAAmB;IACzD,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAChD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QACxC,CAAC;aAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;YACvE,KAAK,CAAC,IAAI,CACR,mBAAmB,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CACrI,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,GAAG,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,0BAA0B,KAAK,CAAC,KAAK,mBAAmB,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,iEAAiE,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;AAC7Q,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS,CACvB,KAAY,EACZ,KAAU,EACV,OAAmB;IAEnB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9C,OAAO,GAAG,KAAK,SAAS,IAAI,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;IAC/C,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,SAAS,CACvE,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,EACnB,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,CACtB,EAAE,CAAC;AACN,CAAC;AAED,SAAS,SAAS,CAAC,CAAM,EAAE,CAAM;IAC/B,OAAO,CACL,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK;QACnB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK;QACnB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM;QACpB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CACrB,CAAC;AACJ,CAAC;AAUD,SAAS,cAAc,CACrB,KAAY,EACZ,SAAmC;IAEnC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA2B,CAAC;IACpD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,KAAK,GAAoB,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACvD,KAAK,MAAM,EAAE,IAAI,QAAQ,CAAC,KAAK;YAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QACnE,KAAK,MAAM,EAAE,IAAI,QAAQ,CAAC,KAAK;YAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,GAAG,EAA8B,CAAC;IACrD,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAY,EAAE,OAAmB;IACzD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;IAC5C,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAC3B,OAAO,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,cAAc,CAAC,GAAQ,EAAE,UAAkB;IAClD,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACpC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,OAAO,iCAAiC,MAAM,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,MAAM,CAAC,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;AACpJ,CAAC;AAED,SAAS,UAAU,CAAC,IAAe,EAAE,OAAmB;IACtD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IAC7B,MAAM,EAAE,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC1B,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACxD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,MAAM,GAAG,CAAC,UAAgC,EAAE,EAAE,CAClD,QAAQ,CAAC,UAAU,CAAC;SACjB,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,EAAE;QAClC,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACjE,OAAO,KAAK;YACV,CAAC,CAAC,aAAa,SAAS,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM;YACxD,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACrB,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,yDAAyD;IACzD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACnE,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAClD,OAAO,SAAS,IAAI,KAAK,EAAE,IAAI,KAAK,GAAG,GAAG,GAAG,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;IAClI,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9E,OAAO,SAAS,IAAI,KAAK,EAAE,IAAI,KAAK,GAAG,GAAG,GAAG,KAAK,GAAG,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;AAChG,CAAC;AAED,SAAS,UAAU,CAAC,SAAoB;IACtC,OAAO,SAAS,CAAC,IAAI,KAAK,MAAM,IAAI,SAAS,CAAC,KAAK,KAAK,IAAI,CAAC;AAC/D,CAAC;AAED,mEAAmE;AACnE,SAAS,aAAa,CAAC,KAAa;IAClC,OAAO,gDAAgD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;AAC7E,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAC7B,SAAoB,EACpB,KAAmB,EACnB,MAAc,KAAK,CAAC,KAAK;IAEzB,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,MAAM;YACT,OAAO,aAAa,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC;QACpL,KAAK,SAAS;YACZ,OAAO,oBAAoB,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,mBAAmB,CAAC;QACjJ,KAAK,MAAM;YACT,OAAO,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACtC,KAAK,KAAK;YACR,OAAO,eAAe,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,GAAG,mBAAmB,CAAC;QACpI,KAAK,MAAM;YACT,OAAO,YAAY,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,SAAS,CAAC,KAAK,IAAI,GAAG,mBAAmB,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;QACjM,KAAK,SAAS;YACZ,OAAO,aAAa,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QACvC,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,SAAS,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC;YAC5C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,eAAe,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,aAAa,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,+BAA+B,IAAI,2DAA2D,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;QAC/Q,CAAC;QACD;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAED,2EAA2E;AAC3E,8EAA8E;AAC9E,6BAA6B;AAC7B,SAAS,UAAU,CAAC,SAAwB,EAAE,KAAmB;IAC/D,MAAM,KAAK,GAAG,GAAG,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;IAC1E,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACtC,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,UAAU,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,GAAG,kBAAkB,MAAM,CAAC,WAAW,GAAG,CAAC;QAChG,MAAM,GAAG,GAAG,6CAA6C,CAAC,IAAI,KAAK,yBAAyB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,8CAA8C,QAAQ,CAAC,MAAM,eAAe,QAAQ,CAAC,QAAQ,KAAK,KAAK,WAAW,CAAC;QACnP,OAAO,IAAI,CAAC,KAAK;YACf,CAAC,CAAC,iCAAiC,CAAC,IAAI,KAAK,KAAK,GAAG,EAAE;YACvD,CAAC,CAAC,GAAG,CAAC;IACV,CAAC;IACD,MAAM,MAAM,GACV,MAAM,KAAK,SAAS;QAClB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,iDAAiD,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC;IAC9E,OAAO,QAAQ,MAAM,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC;AAC7C,CAAC;AAED,SAAS,YAAY,CACnB,SAAwC,EACxC,KAAmB;IAEnB,MAAM,KAAK,GACT,CAAC,SAAS,CAAC,KAAK,KAAK,KAAK,CAAC,SAAS;QAClC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,kBAAkB,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC;QACjD,CAAC,OAAO,IAAI,SAAS,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,OAAO,KAAK,KAAK;YACrE,CAAC,CAAC,YAAY,SAAS,CAAC,KAAK,GAAG;YAChC,CAAC,CAAC,EAAE,CAAC,CAAC;IACV,IAAI,CAAC,SAAS,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IAClC,OAAO,GAAG,KAAK,sBAAsB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;AACxI,CAAC;AAED,4EAA4E;AAC5E,iDAAiD;AACjD,SAAS,UAAU,CAAC,SAAwB;IAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;IACnE,IAAI,CAAC,SAAS,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IACnC,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;QACvB,OAAO,UAAU,eAAe,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC;IACjF,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,kBAAkB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,OAAO,UAAU,GAAG,IAAI,KAAK,GAAG,MAAM,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,WAAW,CAAC,OAAmB,EAAE,IAAY,EAAE,EAAU;IAChE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;IACnD,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC;AAC9E,CAAC"}
|
|
1
|
+
{"version":3,"file":"svg.js","sourceRoot":"","sources":["../../../src/drawing/render/svg.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,9 @@ import type { FigureReferents } from './types.ts';
|
|
|
7
7
|
/** The namespace the referents are written in, which names them whatever their prefix. */
|
|
8
8
|
export declare const FIGURE_REFERENTS_NAMESPACE = "https://www.cheminfo.org/ns/referents/1";
|
|
9
9
|
/**
|
|
10
|
-
* Write what a figure numbers into its SVG, in
|
|
11
|
-
* figure numbering nothing is written
|
|
10
|
+
* Write what a figure numbers and lets a document quote into its SVG, in
|
|
11
|
+
* place of what it carried. A figure numbering and quoting nothing is written
|
|
12
|
+
* without any.
|
|
12
13
|
* @param svg - The figure, as an SVG document.
|
|
13
14
|
* @param referents - What it numbers.
|
|
14
15
|
* @returns The figure.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"figureReferents.d.ts","sourceRoot":"","sources":["../../../src/referents/core/figureReferents.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,0FAA0F;AAC1F,eAAO,MAAM,0BAA0B,4CACI,CAAC;AAE5C
|
|
1
|
+
{"version":3,"file":"figureReferents.d.ts","sourceRoot":"","sources":["../../../src/referents/core/figureReferents.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,0FAA0F;AAC1F,eAAO,MAAM,0BAA0B,4CACI,CAAC;AAE5C;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,eAAe,GACzB,MAAM,CAmBR;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAQ5E;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO1D"}
|
|
@@ -8,15 +8,18 @@ import { readReferents } from "./readReferents.js";
|
|
|
8
8
|
/** The namespace the referents are written in, which names them whatever their prefix. */
|
|
9
9
|
export const FIGURE_REFERENTS_NAMESPACE = 'https://www.cheminfo.org/ns/referents/1';
|
|
10
10
|
/**
|
|
11
|
-
* Write what a figure numbers into its SVG, in
|
|
12
|
-
* figure numbering nothing is written
|
|
11
|
+
* Write what a figure numbers and lets a document quote into its SVG, in
|
|
12
|
+
* place of what it carried. A figure numbering and quoting nothing is written
|
|
13
|
+
* without any.
|
|
13
14
|
* @param svg - The figure, as an SVG document.
|
|
14
15
|
* @param referents - What it numbers.
|
|
15
16
|
* @returns The figure.
|
|
16
17
|
*/
|
|
17
18
|
export function withFigureReferents(svg, referents) {
|
|
18
19
|
const text = withoutFigureReferents(svg);
|
|
19
|
-
if (referents.referents.length === 0 &&
|
|
20
|
+
if (referents.referents.length === 0 &&
|
|
21
|
+
referents.series.length === 0 &&
|
|
22
|
+
(referents.quotes ?? []).length === 0) {
|
|
20
23
|
return text;
|
|
21
24
|
}
|
|
22
25
|
const element = `<cheminfo:referents xmlns:cheminfo="${FIGURE_REFERENTS_NAMESPACE}">${escapeText(JSON.stringify(referents))}</cheminfo:referents>`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"figureReferents.js","sourceRoot":"","sources":["../../../src/referents/core/figureReferents.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,0FAA0F;AAC1F,MAAM,CAAC,MAAM,0BAA0B,GACrC,yCAAyC,CAAC;AAE5C
|
|
1
|
+
{"version":3,"file":"figureReferents.js","sourceRoot":"","sources":["../../../src/referents/core/figureReferents.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ export * from './labelList.ts';
|
|
|
3
3
|
export * from './labelTokens.ts';
|
|
4
4
|
export * from './labels.ts';
|
|
5
5
|
export * from './numbering.ts';
|
|
6
|
+
export * from './quoteParts.ts';
|
|
6
7
|
export * from './readReferents.ts';
|
|
7
8
|
export * from './referentPicture.ts';
|
|
8
9
|
export * from './seriesLetter.ts';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/referents/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/referents/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}
|
|
@@ -3,6 +3,7 @@ export * from "./labelList.js";
|
|
|
3
3
|
export * from "./labelTokens.js";
|
|
4
4
|
export * from "./labels.js";
|
|
5
5
|
export * from "./numbering.js";
|
|
6
|
+
export * from "./quoteParts.js";
|
|
6
7
|
export * from "./readReferents.js";
|
|
7
8
|
export * from "./referentPicture.js";
|
|
8
9
|
export * from "./seriesLetter.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/referents/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/referents/core/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The text of a quote a figure carries, read out of its inline HTML as runs of
|
|
3
|
+
* text and the marks over them: what a document inserts, and what a menu
|
|
4
|
+
* shows. Only the marks a quote may carry are read; every other tag is
|
|
5
|
+
* dropped, its text kept, so nothing a figure carries is ever run as markup.
|
|
6
|
+
*/
|
|
7
|
+
/** A mark over a run of a quote's text. */
|
|
8
|
+
export type QuoteMark = 'superscript' | 'subscript' | 'italic' | 'bold';
|
|
9
|
+
/** A run of a quote's text, under the same marks. */
|
|
10
|
+
export interface QuotePart {
|
|
11
|
+
text: string;
|
|
12
|
+
/** The marks over it, each once, in the order they were opened. */
|
|
13
|
+
marks: QuoteMark[];
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* The runs of a quote's text.
|
|
17
|
+
* @param html - The quote, as inline HTML.
|
|
18
|
+
* @returns Its text, run by run; adjacent runs under the same marks are one.
|
|
19
|
+
*/
|
|
20
|
+
export declare function quoteParts(html: string): QuotePart[];
|
|
21
|
+
//# sourceMappingURL=quoteParts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quoteParts.d.ts","sourceRoot":"","sources":["../../../src/referents/core/quoteParts.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,2CAA2C;AAC3C,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC;AAExE,qDAAqD;AACrD,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,mEAAmE;IACnE,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB;AAaD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,CAoBpD"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The text of a quote a figure carries, read out of its inline HTML as runs of
|
|
3
|
+
* text and the marks over them: what a document inserts, and what a menu
|
|
4
|
+
* shows. Only the marks a quote may carry are read; every other tag is
|
|
5
|
+
* dropped, its text kept, so nothing a figure carries is ever run as markup.
|
|
6
|
+
*/
|
|
7
|
+
import { unescapeXml } from "../../drawing/render/markup.js";
|
|
8
|
+
const MARKS = {
|
|
9
|
+
sup: 'superscript',
|
|
10
|
+
sub: 'subscript',
|
|
11
|
+
i: 'italic',
|
|
12
|
+
em: 'italic',
|
|
13
|
+
b: 'bold',
|
|
14
|
+
strong: 'bold',
|
|
15
|
+
};
|
|
16
|
+
const TAG = /^<(?<close>\/)?(?<name>[a-z][a-z\d]*)\b[^>]*>$/i;
|
|
17
|
+
/**
|
|
18
|
+
* The runs of a quote's text.
|
|
19
|
+
* @param html - The quote, as inline HTML.
|
|
20
|
+
* @returns Its text, run by run; adjacent runs under the same marks are one.
|
|
21
|
+
*/
|
|
22
|
+
export function quoteParts(html) {
|
|
23
|
+
const parts = [];
|
|
24
|
+
const open = [];
|
|
25
|
+
for (const token of html.split(/(?<tag><[^>]*>)/)) {
|
|
26
|
+
if (token === '')
|
|
27
|
+
continue;
|
|
28
|
+
if (token.startsWith('<')) {
|
|
29
|
+
const groups = TAG.exec(token)?.groups;
|
|
30
|
+
const mark = MARKS[groups?.name?.toLowerCase() ?? ''];
|
|
31
|
+
if (mark === undefined)
|
|
32
|
+
continue;
|
|
33
|
+
if (groups?.close === undefined) {
|
|
34
|
+
open.push(mark);
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
const index = open.lastIndexOf(mark);
|
|
38
|
+
if (index !== -1)
|
|
39
|
+
open.splice(index, 1);
|
|
40
|
+
}
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
append(parts, decoded(token), [...new Set(open)]);
|
|
44
|
+
}
|
|
45
|
+
return parts;
|
|
46
|
+
}
|
|
47
|
+
function append(parts, text, marks) {
|
|
48
|
+
if (text === '')
|
|
49
|
+
return;
|
|
50
|
+
const last = parts.at(-1);
|
|
51
|
+
if (last !== undefined && sameMarks(last.marks, marks)) {
|
|
52
|
+
last.text += text;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
parts.push({ text, marks });
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
function sameMarks(first, second) {
|
|
59
|
+
return (first.length === second.length &&
|
|
60
|
+
first.every((mark) => second.includes(mark)));
|
|
61
|
+
}
|
|
62
|
+
function decoded(text) {
|
|
63
|
+
try {
|
|
64
|
+
return unescapeXml(text);
|
|
65
|
+
}
|
|
66
|
+
catch {
|
|
67
|
+
// A character reference past the last code point: kept as written.
|
|
68
|
+
return text;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=quoteParts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"quoteParts.js","sourceRoot":"","sources":["../../../src/referents/core/quoteParts.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAY7D,MAAM,KAAK,GAAwC;IACjD,GAAG,EAAE,aAAa;IAClB,GAAG,EAAE,WAAW;IAChB,CAAC,EAAE,QAAQ;IACX,EAAE,EAAE,QAAQ;IACZ,CAAC,EAAE,MAAM;IACT,MAAM,EAAE,MAAM;CACf,CAAC;AAEF,MAAM,GAAG,GAAG,iDAAiD,CAAC;AAE9D;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,MAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,MAAM,IAAI,GAAgB,EAAE,CAAC;IAC7B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAClD,IAAI,KAAK,KAAK,EAAE;YAAE,SAAS;QAC3B,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;YACvC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YACtD,IAAI,IAAI,KAAK,SAAS;gBAAE,SAAS;YACjC,IAAI,MAAM,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;gBAChC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBACrC,IAAI,KAAK,KAAK,CAAC,CAAC;oBAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC1C,CAAC;YACD,SAAS;QACX,CAAC;QACD,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,MAAM,CAAC,KAAkB,EAAE,IAAY,EAAE,KAAkB;IAClE,IAAI,IAAI,KAAK,EAAE;QAAE,OAAO;IACxB,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,IAAI,IAAI,KAAK,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;QACvD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAkB,EAAE,MAAmB;IACxD,OAAO,CACL,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;QAC9B,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,IAAY;IAC3B,IAAI,CAAC;QACH,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -6,7 +6,8 @@ import type { FigureReferents } from './types.ts';
|
|
|
6
6
|
/**
|
|
7
7
|
* Referents from parsed JSON.
|
|
8
8
|
* @param value - What was parsed.
|
|
9
|
-
* @returns The referents and
|
|
9
|
+
* @returns The referents, series and quotes that read; empty lists for
|
|
10
|
+
* anything else, and no quotes when none read.
|
|
10
11
|
*/
|
|
11
12
|
export declare function readReferents(value: unknown): FigureReferents;
|
|
12
13
|
//# sourceMappingURL=readReferents.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readReferents.d.ts","sourceRoot":"","sources":["../../../src/referents/core/readReferents.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"readReferents.d.ts","sourceRoot":"","sources":["../../../src/referents/core/readReferents.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAGV,eAAe,EAKhB,MAAM,YAAY,CAAC;AAEpB;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,CAoB7D"}
|
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
/**
|
|
6
6
|
* Referents from parsed JSON.
|
|
7
7
|
* @param value - What was parsed.
|
|
8
|
-
* @returns The referents and
|
|
8
|
+
* @returns The referents, series and quotes that read; empty lists for
|
|
9
|
+
* anything else, and no quotes when none read.
|
|
9
10
|
*/
|
|
10
11
|
export function readReferents(value) {
|
|
11
12
|
const record = isRecord(value) ? value : {};
|
|
@@ -21,7 +22,32 @@ export function readReferents(value) {
|
|
|
21
22
|
if (one)
|
|
22
23
|
series.push(one);
|
|
23
24
|
}
|
|
24
|
-
|
|
25
|
+
const quotes = [];
|
|
26
|
+
for (const item of listOf(record.quotes)) {
|
|
27
|
+
const quote = readQuote(item);
|
|
28
|
+
if (quote)
|
|
29
|
+
quotes.push(quote);
|
|
30
|
+
}
|
|
31
|
+
return quotes.length === 0
|
|
32
|
+
? { referents, series }
|
|
33
|
+
: { referents, series, quotes };
|
|
34
|
+
}
|
|
35
|
+
function readQuote(value) {
|
|
36
|
+
if (!isRecord(value) || !isKey(value.key) || !isKey(value.kind)) {
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
if (!isText(value.title) || !isText(value.html))
|
|
40
|
+
return undefined;
|
|
41
|
+
const quote = {
|
|
42
|
+
key: value.key,
|
|
43
|
+
kind: value.kind,
|
|
44
|
+
title: value.title,
|
|
45
|
+
html: value.html,
|
|
46
|
+
};
|
|
47
|
+
if (isText(value.picture))
|
|
48
|
+
quote.picture = value.picture;
|
|
49
|
+
copyStructure(value, quote);
|
|
50
|
+
return quote;
|
|
25
51
|
}
|
|
26
52
|
function readReferent(value) {
|
|
27
53
|
if (!isRecord(value) || !isKey(value.key))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readReferents.js","sourceRoot":"","sources":["../../../src/referents/core/readReferents.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"readReferents.js","sourceRoot":"","sources":["../../../src/referents/core/readReferents.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAYH;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5C,MAAM,SAAS,GAAqB,EAAE,CAAC;IACvC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,QAAQ;YAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7B,IAAI,GAAG;YAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IACD,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,KAAK;YAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC;QACxB,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE;QACvB,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACpC,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAClE,MAAM,KAAK,GAAgB;QACzB,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,IAAI,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC;IACF,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IACzD,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5B,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5D,MAAM,QAAQ,GAAmB,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;IACpD,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;QAAE,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAClD,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;QAAE,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACnD,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/B,IAAI,GAAG;QAAE,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;IAC5B,aAAa,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC/B,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;QAAE,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IACxD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACjC,MAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,MAAM;gBAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QACD,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC;IAC7B,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5D,MAAM,MAAM,GAAmB,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC;IAClD,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IAC1D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,IAAI,GAAgB,EAAE,CAAC;IAC7B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,SAAS;QACjD,MAAM,MAAM,GAA2B,EAAE,CAAC;QAC1C,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACjC,IAAI,OAAO,IAAI,KAAK,QAAQ;oBAAE,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;YACtD,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,MAAM,GAAmB,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACjE,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS;QAAE,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAChE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,OAAO,CAAC,KAAc;IAC7B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACvC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACtC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1E,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAChD,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AACjC,CAAC;AAED,SAAS,aAAa,CACpB,IAA6B,EAC7B,EAAoD;IAEpD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACjD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACjD,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAAE,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;AACvC,CAAC;AAED,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,EAAE,CAAC;AACnD,CAAC;AAED,SAAS,KAAK,CAAC,KAAc;IAC3B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC;AAChF,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -124,12 +124,56 @@ export interface ReferentSeries {
|
|
|
124
124
|
*/
|
|
125
125
|
numbering?: SeriesNumbering;
|
|
126
126
|
}
|
|
127
|
+
/**
|
|
128
|
+
* A text a figure lets a document quote as it stands, rather than number: the
|
|
129
|
+
* description of an NMR spectrum as a journal prints it, offered by the `@`
|
|
130
|
+
* menu of the document the figure is placed in.
|
|
131
|
+
*/
|
|
132
|
+
export interface FigureQuote {
|
|
133
|
+
/** What names it, stable for as long as the figure carries it. */
|
|
134
|
+
key: string;
|
|
135
|
+
/** What it is, `nmr`: quotes of one kind are offered together. */
|
|
136
|
+
kind: string;
|
|
137
|
+
/** What it is offered as, `¹H NMR · ethylbenzene`. */
|
|
138
|
+
title: string;
|
|
139
|
+
/**
|
|
140
|
+
* The text, as inline HTML: only `<sup>`, `<sub>`, `<i>`, `<em>`, `<b>` and
|
|
141
|
+
* `<strong>` are read, by `quoteParts`.
|
|
142
|
+
*/
|
|
143
|
+
html: string;
|
|
144
|
+
/**
|
|
145
|
+
* What it describes, as an SVG document: the structure the spectrum was
|
|
146
|
+
* recorded on.
|
|
147
|
+
* @default undefined — named by its title alone
|
|
148
|
+
*/
|
|
149
|
+
picture?: string;
|
|
150
|
+
/**
|
|
151
|
+
* The structure as an OpenChemLib ID code.
|
|
152
|
+
* @default undefined
|
|
153
|
+
*/
|
|
154
|
+
idCode?: string;
|
|
155
|
+
/**
|
|
156
|
+
* The structure as SMILES.
|
|
157
|
+
* @default undefined
|
|
158
|
+
*/
|
|
159
|
+
smiles?: string;
|
|
160
|
+
/**
|
|
161
|
+
* The structure's molecular formula.
|
|
162
|
+
* @default undefined
|
|
163
|
+
*/
|
|
164
|
+
mf?: string;
|
|
165
|
+
}
|
|
127
166
|
/** What a figure numbers. */
|
|
128
167
|
export interface FigureReferents {
|
|
129
168
|
/** The referents, in the order their labels are read. */
|
|
130
169
|
referents: FigureReferent[];
|
|
131
170
|
/** The series the figure defines. */
|
|
132
171
|
series: ReferentSeries[];
|
|
172
|
+
/**
|
|
173
|
+
* The texts it lets a document quote.
|
|
174
|
+
* @default undefined — none
|
|
175
|
+
*/
|
|
176
|
+
quotes?: FigureQuote[];
|
|
133
177
|
}
|
|
134
178
|
/** A label, or a reference in the text: a referent, or one of its members. */
|
|
135
179
|
export interface ReferentMention {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/referents/core/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,qEAAqE;AACrE,MAAM,WAAW,WAAW;IAC1B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,kEAAkE;AAClE,MAAM,WAAW,cAAc;IAC7B,6CAA6C;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,yDAAyD;AACzD,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;CAC5B;AAED,kEAAkE;AAClE,MAAM,WAAW,SAAS;IACxB,4EAA4E;IAC5E,EAAE,EAAE,MAAM,CAAC;IACX,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,SAAS,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,qBAAqB;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,kEAAkE;IAClE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,gDAAgD;IAChD,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB;;;OAGG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAED,6BAA6B;AAC7B,MAAM,WAAW,eAAe;IAC9B,yDAAyD;IACzD,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,qCAAqC;IACrC,MAAM,EAAE,cAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/referents/core/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,qEAAqE;AACrE,MAAM,WAAW,WAAW;IAC1B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,kEAAkE;AAClE,MAAM,WAAW,cAAc;IAC7B,6CAA6C;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,yDAAyD;AACzD,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC;CAC5B;AAED,kEAAkE;AAClE,MAAM,WAAW,SAAS;IACxB,4EAA4E;IAC5E,EAAE,EAAE,MAAM,CAAC;IACX,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,SAAS,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,qBAAqB;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,kEAAkE;IAClE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,gDAAgD;IAChD,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB;;;OAGG;IACH,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,kEAAkE;IAClE,GAAG,EAAE,MAAM,CAAC;IACZ,kEAAkE;IAClE,IAAI,EAAE,MAAM,CAAC;IACb,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,6BAA6B;AAC7B,MAAM,WAAW,eAAe;IAC9B,yDAAyD;IACzD,SAAS,EAAE,cAAc,EAAE,CAAC;IAC5B,qCAAqC;IACrC,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB;;;OAGG;IACH,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB;AAED,8EAA8E;AAC9E,MAAM,WAAW,eAAe;IAC9B,oBAAoB;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-cheminfo",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.138.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "React components, hooks and framework-free helpers shared by the cheminfo sites: site chrome, citations, sharing, routing, pedagogy, charts, and the structure, orbital and 3D molecule viewers",
|
|
6
6
|
"author": "Luc Patiny",
|
|
@@ -111,6 +111,23 @@ export const MOTION_CSS = `/* A bubble rises from where it is drawn, three of it
|
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
+
/* A piece an orbital shaker swirls, seen edge on: it sways from one side of
|
|
115
|
+
the orbit to the other and back, a round trip a third of a second long, as
|
|
116
|
+
at 180 rpm. */
|
|
117
|
+
[data-motion='moving'] .glass-swirling {
|
|
118
|
+
animation: glass-swirl 0.167s ease-in-out infinite alternate;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
@keyframes glass-swirl {
|
|
122
|
+
from {
|
|
123
|
+
transform: translateX(calc(-1 * var(--glass-orbit)));
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
to {
|
|
127
|
+
transform: translateX(var(--glass-orbit));
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
114
131
|
/* A figure carries each bubble running along water, and each drop falling, as
|
|
115
132
|
a run that only shows moving (written hidden, for a program that reads no
|
|
116
133
|
style), and the ones drawn where they stand as a still copy that only shows
|
|
@@ -126,7 +143,8 @@ export const MOTION_CSS = `/* A bubble rises from where it is drawn, three of it
|
|
|
126
143
|
@media print, (prefers-reduced-motion: reduce) {
|
|
127
144
|
.glass-bubble,
|
|
128
145
|
.glass-turning,
|
|
129
|
-
.glass-spinning
|
|
146
|
+
.glass-spinning,
|
|
147
|
+
.glass-swirling {
|
|
130
148
|
animation: none;
|
|
131
149
|
}
|
|
132
150
|
|
|
@@ -175,19 +193,20 @@ export function runTiming(flow: NonNullable<PathPrimitive['flow']>): {
|
|
|
175
193
|
|
|
176
194
|
/**
|
|
177
195
|
* Whether a scene has anything that moves: a bubble, a run, a turning piece,
|
|
178
|
-
* a spinning rotor.
|
|
196
|
+
* a spinning rotor, a piece an orbital shaker swirls.
|
|
179
197
|
* @param scene - The scene.
|
|
180
198
|
* @returns True when a figure of it can be set moving.
|
|
181
199
|
*/
|
|
182
200
|
export function sceneMoves(scene: Scene): boolean {
|
|
183
201
|
for (const item of scene.items) {
|
|
184
|
-
if (item.turning !== undefined) return true;
|
|
202
|
+
if (item.turning !== undefined || item.swirling !== undefined) return true;
|
|
185
203
|
for (const primitive of item.primitives) {
|
|
186
204
|
if (
|
|
187
205
|
primitive.kind === 'path' &&
|
|
188
206
|
(primitive.flow !== undefined ||
|
|
189
207
|
primitive.bubble !== undefined ||
|
|
190
|
-
primitive.spins !== undefined
|
|
208
|
+
primitive.spins !== undefined ||
|
|
209
|
+
primitive.swirls !== undefined)
|
|
191
210
|
) {
|
|
192
211
|
return true;
|
|
193
212
|
}
|
|
@@ -92,6 +92,13 @@ export interface PathPrimitive {
|
|
|
92
92
|
* @default undefined — the whole piece turns, as a stir bar does
|
|
93
93
|
*/
|
|
94
94
|
turns?: true;
|
|
95
|
+
/**
|
|
96
|
+
* Whether it alone swirls while its piece runs, the rest still: the
|
|
97
|
+
* platform of an orbital shaker, over its casing. Set moving it swirls; a
|
|
98
|
+
* file holds it still.
|
|
99
|
+
* @default undefined — the whole piece swirls, as a flask on the platform does
|
|
100
|
+
*/
|
|
101
|
+
swirls?: true;
|
|
95
102
|
/**
|
|
96
103
|
* The way it spins in its own plane while its piece runs, with the
|
|
97
104
|
* primitives drawn next to it that spin the same way, about the middle of
|
|
@@ -223,6 +230,13 @@ export interface SceneItem<K extends string = string> {
|
|
|
223
230
|
* @default undefined — it stays still
|
|
224
231
|
*/
|
|
225
232
|
turning?: number;
|
|
233
|
+
/**
|
|
234
|
+
* For what an orbital shaker swirls, the radius of its orbit, in points:
|
|
235
|
+
* set moving, it circles the orbit, seen edge on as a sway from one side
|
|
236
|
+
* to the other; a file holds it still.
|
|
237
|
+
* @default undefined — it stays still
|
|
238
|
+
*/
|
|
239
|
+
swirling?: number;
|
|
226
240
|
}
|
|
227
241
|
|
|
228
242
|
/** A whole rendered drawing. */
|
|
@@ -181,20 +181,47 @@ function itemMarkup(item: SceneItem, options: SvgOptions): string {
|
|
|
181
181
|
: inner.join('');
|
|
182
182
|
})
|
|
183
183
|
.join('');
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
const
|
|
188
|
-
|
|
184
|
+
const motion = motionOf(item);
|
|
185
|
+
// A piece whose paddle or platform alone moves keeps the rest still.
|
|
186
|
+
if (motion && item.primitives.some(motion.alone)) {
|
|
187
|
+
const still = item.primitives.filter(
|
|
188
|
+
(primitive) => !motion.alone(primitive),
|
|
189
|
+
);
|
|
190
|
+
const moving = item.primitives.filter(motion.alone);
|
|
191
|
+
return `<g cd:${kind}="${id}"${label}${ink}${faded}>${markup(still)}<g${motion.markup}>${markup(moving)}</g></g>`;
|
|
189
192
|
}
|
|
190
|
-
const
|
|
191
|
-
return `<g cd:${kind}="${id}"${label}${ink}${faded}${
|
|
193
|
+
const whole = motion?.markup ?? '';
|
|
194
|
+
return `<g cd:${kind}="${id}"${label}${ink}${faded}${whole}>${markup(item.primitives)}</g>`;
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
// How a piece moves, and which of its primitives move alone when some do: a
|
|
198
|
+
// stir bar turns, a stirrer's paddle under its shaft; a flask on an orbital
|
|
199
|
+
// shaker swirls, the shaker's platform over its casing.
|
|
200
|
+
function motionOf(
|
|
201
|
+
item: SceneItem,
|
|
202
|
+
): { markup: string; alone: (primitive: Primitive) => boolean } | undefined {
|
|
203
|
+
if (item.turning !== undefined) {
|
|
204
|
+
return { markup: turningMarkup(item.turning), alone: turnsAlone };
|
|
205
|
+
}
|
|
206
|
+
if (item.swirling !== undefined) {
|
|
207
|
+
return { markup: swirlingMarkup(item.swirling), alone: swirlsAlone };
|
|
208
|
+
}
|
|
209
|
+
return undefined;
|
|
192
210
|
}
|
|
193
211
|
|
|
194
212
|
function turnsAlone(primitive: Primitive): boolean {
|
|
195
213
|
return primitive.kind === 'path' && primitive.turns === true;
|
|
196
214
|
}
|
|
197
215
|
|
|
216
|
+
function swirlsAlone(primitive: Primitive): boolean {
|
|
217
|
+
return primitive.kind === 'path' && primitive.swirls === true;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
// What sets a piece swirling on the orbit of an orbital shaker.
|
|
221
|
+
function swirlingMarkup(orbit: number): string {
|
|
222
|
+
return ` class="glass-swirling" style="--glass-orbit: ${number(orbit)}px"`;
|
|
223
|
+
}
|
|
224
|
+
|
|
198
225
|
// What sets a stir bar turning about the upright, the way it lies.
|
|
199
226
|
function turningMarkup(lying: number): string {
|
|
200
227
|
return ` class="glass-turning" style="--glass-lying: ${number(lying)}deg"`;
|
|
@@ -14,8 +14,9 @@ export const FIGURE_REFERENTS_NAMESPACE =
|
|
|
14
14
|
'https://www.cheminfo.org/ns/referents/1';
|
|
15
15
|
|
|
16
16
|
/**
|
|
17
|
-
* Write what a figure numbers into its SVG, in
|
|
18
|
-
* figure numbering nothing is written
|
|
17
|
+
* Write what a figure numbers and lets a document quote into its SVG, in
|
|
18
|
+
* place of what it carried. A figure numbering and quoting nothing is written
|
|
19
|
+
* without any.
|
|
19
20
|
* @param svg - The figure, as an SVG document.
|
|
20
21
|
* @param referents - What it numbers.
|
|
21
22
|
* @returns The figure.
|
|
@@ -25,7 +26,11 @@ export function withFigureReferents(
|
|
|
25
26
|
referents: FigureReferents,
|
|
26
27
|
): string {
|
|
27
28
|
const text = withoutFigureReferents(svg);
|
|
28
|
-
if (
|
|
29
|
+
if (
|
|
30
|
+
referents.referents.length === 0 &&
|
|
31
|
+
referents.series.length === 0 &&
|
|
32
|
+
(referents.quotes ?? []).length === 0
|
|
33
|
+
) {
|
|
29
34
|
return text;
|
|
30
35
|
}
|
|
31
36
|
const element = `<cheminfo:referents xmlns:cheminfo="${FIGURE_REFERENTS_NAMESPACE}">${escapeText(JSON.stringify(referents))}</cheminfo:referents>`;
|
|
@@ -3,6 +3,7 @@ export * from './labelList.ts';
|
|
|
3
3
|
export * from './labelTokens.ts';
|
|
4
4
|
export * from './labels.ts';
|
|
5
5
|
export * from './numbering.ts';
|
|
6
|
+
export * from './quoteParts.ts';
|
|
6
7
|
export * from './readReferents.ts';
|
|
7
8
|
export * from './referentPicture.ts';
|
|
8
9
|
export * from './seriesLetter.ts';
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The text of a quote a figure carries, read out of its inline HTML as runs of
|
|
3
|
+
* text and the marks over them: what a document inserts, and what a menu
|
|
4
|
+
* shows. Only the marks a quote may carry are read; every other tag is
|
|
5
|
+
* dropped, its text kept, so nothing a figure carries is ever run as markup.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
import { unescapeXml } from '../../drawing/render/markup.ts';
|
|
9
|
+
|
|
10
|
+
/** A mark over a run of a quote's text. */
|
|
11
|
+
export type QuoteMark = 'superscript' | 'subscript' | 'italic' | 'bold';
|
|
12
|
+
|
|
13
|
+
/** A run of a quote's text, under the same marks. */
|
|
14
|
+
export interface QuotePart {
|
|
15
|
+
text: string;
|
|
16
|
+
/** The marks over it, each once, in the order they were opened. */
|
|
17
|
+
marks: QuoteMark[];
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
const MARKS: Readonly<Record<string, QuoteMark>> = {
|
|
21
|
+
sup: 'superscript',
|
|
22
|
+
sub: 'subscript',
|
|
23
|
+
i: 'italic',
|
|
24
|
+
em: 'italic',
|
|
25
|
+
b: 'bold',
|
|
26
|
+
strong: 'bold',
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
const TAG = /^<(?<close>\/)?(?<name>[a-z][a-z\d]*)\b[^>]*>$/i;
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* The runs of a quote's text.
|
|
33
|
+
* @param html - The quote, as inline HTML.
|
|
34
|
+
* @returns Its text, run by run; adjacent runs under the same marks are one.
|
|
35
|
+
*/
|
|
36
|
+
export function quoteParts(html: string): QuotePart[] {
|
|
37
|
+
const parts: QuotePart[] = [];
|
|
38
|
+
const open: QuoteMark[] = [];
|
|
39
|
+
for (const token of html.split(/(?<tag><[^>]*>)/)) {
|
|
40
|
+
if (token === '') continue;
|
|
41
|
+
if (token.startsWith('<')) {
|
|
42
|
+
const groups = TAG.exec(token)?.groups;
|
|
43
|
+
const mark = MARKS[groups?.name?.toLowerCase() ?? ''];
|
|
44
|
+
if (mark === undefined) continue;
|
|
45
|
+
if (groups?.close === undefined) {
|
|
46
|
+
open.push(mark);
|
|
47
|
+
} else {
|
|
48
|
+
const index = open.lastIndexOf(mark);
|
|
49
|
+
if (index !== -1) open.splice(index, 1);
|
|
50
|
+
}
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
append(parts, decoded(token), [...new Set(open)]);
|
|
54
|
+
}
|
|
55
|
+
return parts;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
function append(parts: QuotePart[], text: string, marks: QuoteMark[]): void {
|
|
59
|
+
if (text === '') return;
|
|
60
|
+
const last = parts.at(-1);
|
|
61
|
+
if (last !== undefined && sameMarks(last.marks, marks)) {
|
|
62
|
+
last.text += text;
|
|
63
|
+
} else {
|
|
64
|
+
parts.push({ text, marks });
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
function sameMarks(first: QuoteMark[], second: QuoteMark[]): boolean {
|
|
69
|
+
return (
|
|
70
|
+
first.length === second.length &&
|
|
71
|
+
first.every((mark) => second.includes(mark))
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
function decoded(text: string): string {
|
|
76
|
+
try {
|
|
77
|
+
return unescapeXml(text);
|
|
78
|
+
} catch {
|
|
79
|
+
// A character reference past the last code point: kept as written.
|
|
80
|
+
return text;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import type {
|
|
7
|
+
FigureQuote,
|
|
7
8
|
FigureReferent,
|
|
8
9
|
FigureReferents,
|
|
9
10
|
ReferentBox,
|
|
@@ -15,7 +16,8 @@ import type {
|
|
|
15
16
|
/**
|
|
16
17
|
* Referents from parsed JSON.
|
|
17
18
|
* @param value - What was parsed.
|
|
18
|
-
* @returns The referents and
|
|
19
|
+
* @returns The referents, series and quotes that read; empty lists for
|
|
20
|
+
* anything else, and no quotes when none read.
|
|
19
21
|
*/
|
|
20
22
|
export function readReferents(value: unknown): FigureReferents {
|
|
21
23
|
const record = isRecord(value) ? value : {};
|
|
@@ -29,7 +31,30 @@ export function readReferents(value: unknown): FigureReferents {
|
|
|
29
31
|
const one = readSeries(item);
|
|
30
32
|
if (one) series.push(one);
|
|
31
33
|
}
|
|
32
|
-
|
|
34
|
+
const quotes: FigureQuote[] = [];
|
|
35
|
+
for (const item of listOf(record.quotes)) {
|
|
36
|
+
const quote = readQuote(item);
|
|
37
|
+
if (quote) quotes.push(quote);
|
|
38
|
+
}
|
|
39
|
+
return quotes.length === 0
|
|
40
|
+
? { referents, series }
|
|
41
|
+
: { referents, series, quotes };
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
function readQuote(value: unknown): FigureQuote | undefined {
|
|
45
|
+
if (!isRecord(value) || !isKey(value.key) || !isKey(value.kind)) {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
if (!isText(value.title) || !isText(value.html)) return undefined;
|
|
49
|
+
const quote: FigureQuote = {
|
|
50
|
+
key: value.key,
|
|
51
|
+
kind: value.kind,
|
|
52
|
+
title: value.title,
|
|
53
|
+
html: value.html,
|
|
54
|
+
};
|
|
55
|
+
if (isText(value.picture)) quote.picture = value.picture;
|
|
56
|
+
copyStructure(value, quote);
|
|
57
|
+
return quote;
|
|
33
58
|
}
|
|
34
59
|
|
|
35
60
|
function readReferent(value: unknown): FigureReferent | undefined {
|
|
@@ -131,12 +131,57 @@ export interface ReferentSeries {
|
|
|
131
131
|
numbering?: SeriesNumbering;
|
|
132
132
|
}
|
|
133
133
|
|
|
134
|
+
/**
|
|
135
|
+
* A text a figure lets a document quote as it stands, rather than number: the
|
|
136
|
+
* description of an NMR spectrum as a journal prints it, offered by the `@`
|
|
137
|
+
* menu of the document the figure is placed in.
|
|
138
|
+
*/
|
|
139
|
+
export interface FigureQuote {
|
|
140
|
+
/** What names it, stable for as long as the figure carries it. */
|
|
141
|
+
key: string;
|
|
142
|
+
/** What it is, `nmr`: quotes of one kind are offered together. */
|
|
143
|
+
kind: string;
|
|
144
|
+
/** What it is offered as, `¹H NMR · ethylbenzene`. */
|
|
145
|
+
title: string;
|
|
146
|
+
/**
|
|
147
|
+
* The text, as inline HTML: only `<sup>`, `<sub>`, `<i>`, `<em>`, `<b>` and
|
|
148
|
+
* `<strong>` are read, by `quoteParts`.
|
|
149
|
+
*/
|
|
150
|
+
html: string;
|
|
151
|
+
/**
|
|
152
|
+
* What it describes, as an SVG document: the structure the spectrum was
|
|
153
|
+
* recorded on.
|
|
154
|
+
* @default undefined — named by its title alone
|
|
155
|
+
*/
|
|
156
|
+
picture?: string;
|
|
157
|
+
/**
|
|
158
|
+
* The structure as an OpenChemLib ID code.
|
|
159
|
+
* @default undefined
|
|
160
|
+
*/
|
|
161
|
+
idCode?: string;
|
|
162
|
+
/**
|
|
163
|
+
* The structure as SMILES.
|
|
164
|
+
* @default undefined
|
|
165
|
+
*/
|
|
166
|
+
smiles?: string;
|
|
167
|
+
/**
|
|
168
|
+
* The structure's molecular formula.
|
|
169
|
+
* @default undefined
|
|
170
|
+
*/
|
|
171
|
+
mf?: string;
|
|
172
|
+
}
|
|
173
|
+
|
|
134
174
|
/** What a figure numbers. */
|
|
135
175
|
export interface FigureReferents {
|
|
136
176
|
/** The referents, in the order their labels are read. */
|
|
137
177
|
referents: FigureReferent[];
|
|
138
178
|
/** The series the figure defines. */
|
|
139
179
|
series: ReferentSeries[];
|
|
180
|
+
/**
|
|
181
|
+
* The texts it lets a document quote.
|
|
182
|
+
* @default undefined — none
|
|
183
|
+
*/
|
|
184
|
+
quotes?: FigureQuote[];
|
|
140
185
|
}
|
|
141
186
|
|
|
142
187
|
/** A label, or a reference in the text: a referent, or one of its members. */
|