bookish-press 0.5.26 → 0.5.62
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/components/Auth.svelte.d.ts +2 -2
- package/dist/components/BookPreview.svelte +1 -0
- package/dist/components/BookPreview.svelte.d.ts +2 -2
- package/dist/components/Link.svelte.d.ts +2 -2
- package/dist/components/app/BookList.svelte.d.ts +2 -2
- package/dist/components/app/Button.svelte.d.ts +2 -2
- package/dist/components/app/Feedback.svelte.d.ts +2 -2
- package/dist/components/app/Head.svelte.d.ts +2 -2
- package/dist/components/app/Large.svelte.d.ts +2 -2
- package/dist/components/app/Lead.svelte.d.ts +2 -2
- package/dist/components/app/Link.svelte.d.ts +2 -2
- package/dist/components/app/Options.svelte.d.ts +2 -2
- package/dist/components/app/Paragraph.svelte.d.ts +2 -2
- package/dist/components/app/Section.svelte.d.ts +2 -2
- package/dist/components/app/Table.svelte.d.ts +2 -2
- package/dist/components/app/TextInput.svelte.d.ts +2 -2
- package/dist/components/chapter/Atom.svelte.d.ts +2 -2
- package/dist/components/chapter/Block.svelte.d.ts +2 -2
- package/dist/components/chapter/Callout.svelte.d.ts +2 -2
- package/dist/components/chapter/CaptionedCode.svelte.d.ts +2 -2
- package/dist/components/chapter/ChapterBody.svelte +2 -0
- package/dist/components/chapter/ChapterBody.svelte.d.ts +2 -2
- package/dist/components/chapter/Citations.svelte.d.ts +2 -2
- package/dist/components/chapter/Code.svelte.d.ts +2 -2
- package/dist/components/chapter/Comment.svelte.d.ts +2 -2
- package/dist/components/chapter/Definition.svelte +6 -7
- package/dist/components/chapter/Definition.svelte.d.ts +2 -2
- package/dist/components/chapter/Embed.svelte +4 -3
- package/dist/components/chapter/Embed.svelte.d.ts +2 -2
- package/dist/components/chapter/ErrorMessage.svelte.d.ts +2 -2
- package/dist/components/chapter/ExtendedPrism.d.ts +1 -1
- package/dist/components/chapter/Figure.svelte +6 -0
- package/dist/components/chapter/Figure.svelte.d.ts +2 -2
- package/dist/components/chapter/Footnote.svelte.d.ts +2 -2
- package/dist/components/chapter/Format.svelte +21 -16
- package/dist/components/chapter/Format.svelte.d.ts +2 -2
- package/dist/components/chapter/InlineCode.svelte.d.ts +2 -2
- package/dist/components/chapter/Label.svelte.d.ts +2 -2
- package/dist/components/chapter/LineBreak.svelte +6 -0
- package/dist/components/chapter/LineBreak.svelte.d.ts +17 -0
- package/dist/components/chapter/Link.svelte.d.ts +2 -2
- package/dist/components/chapter/List.svelte +16 -33
- package/dist/components/chapter/List.svelte.d.ts +2 -2
- package/dist/components/chapter/Marginal.svelte +5 -4
- package/dist/components/chapter/Marginal.svelte.d.ts +2 -2
- package/dist/components/chapter/Paragraph.svelte.d.ts +2 -2
- package/dist/components/chapter/Positioned.svelte.d.ts +2 -2
- package/dist/components/chapter/Problem.svelte.d.ts +2 -2
- package/dist/components/chapter/Python.svelte.d.ts +2 -2
- package/dist/components/chapter/Quote.svelte.d.ts +2 -2
- package/dist/components/chapter/Rule.svelte +2 -2
- package/dist/components/chapter/Rule.svelte.d.ts +2 -2
- package/dist/components/chapter/Table.svelte.d.ts +2 -2
- package/dist/components/chapter/Text.svelte.d.ts +2 -2
- package/dist/components/controls/DarkToggle.svelte +1 -1
- package/dist/components/controls/DarkToggle.svelte.d.ts +2 -2
- package/dist/components/editor/BookishEditor.svelte +13 -16
- package/dist/components/editor/BookishEditor.svelte.d.ts +2 -2
- package/dist/components/editor/CalloutEditor.svelte.d.ts +2 -2
- package/dist/components/editor/CaptionedCodeEditor.svelte.d.ts +2 -2
- package/dist/components/editor/CaretContext.d.ts +1 -1
- package/dist/components/editor/CaretView.svelte.d.ts +2 -2
- package/dist/components/editor/CitationsEditor.svelte.d.ts +2 -2
- package/dist/components/editor/Commands.js +121 -55
- package/dist/components/editor/ConfirmButton.svelte +7 -1
- package/dist/components/editor/ConfirmButton.svelte.d.ts +2 -2
- package/dist/components/editor/DefinitionEditor.svelte.d.ts +2 -2
- package/dist/components/editor/EmbedEditor.svelte.d.ts +2 -2
- package/dist/components/editor/Icon.svelte.d.ts +2 -2
- package/dist/components/editor/ImageChooser.svelte +2 -1
- package/dist/components/editor/ImageChooser.svelte.d.ts +2 -2
- package/dist/components/editor/ImageThumbnail.svelte +11 -7
- package/dist/components/editor/ImageThumbnail.svelte.d.ts +2 -2
- package/dist/components/editor/InlineCodeEditor.svelte.d.ts +2 -2
- package/dist/components/editor/LabelEditor.svelte.d.ts +2 -2
- package/dist/components/editor/LanguageEditor.svelte.d.ts +2 -2
- package/dist/components/editor/LinkEditor.svelte +4 -3
- package/dist/components/editor/LinkEditor.svelte.d.ts +2 -2
- package/dist/components/editor/Note.svelte.d.ts +2 -2
- package/dist/components/editor/Permissions.svelte +2 -0
- package/dist/components/editor/Permissions.svelte.d.ts +2 -2
- package/dist/components/editor/PositionEditor.svelte.d.ts +2 -2
- package/dist/components/editor/QuoteEditor.svelte.d.ts +2 -2
- package/dist/components/editor/Switch.svelte.d.ts +2 -2
- package/dist/components/editor/TableEditor.svelte.d.ts +2 -2
- package/dist/components/editor/TextEditor.svelte.d.ts +2 -2
- package/dist/components/editor/Toggle.svelte +1 -1
- package/dist/components/editor/Toggle.svelte.d.ts +2 -2
- package/dist/components/editor/Toolbar.svelte +2 -1
- package/dist/components/editor/Toolbar.svelte.d.ts +2 -2
- package/dist/components/editor/ToolbarGroup.svelte.d.ts +2 -2
- package/dist/components/editor/ToolbarSpacer.svelte.d.ts +2 -2
- package/dist/components/editor/URLEditor.svelte.d.ts +2 -2
- package/dist/components/page/Acknowledgements.svelte.d.ts +2 -2
- package/dist/components/page/Authors.svelte.d.ts +2 -2
- package/dist/components/page/BookLoader.svelte.d.ts +2 -2
- package/dist/components/page/BulkReferenceEditor.svelte.d.ts +2 -2
- package/dist/components/page/Chapter.svelte +1 -1
- package/dist/components/page/Chapter.svelte.d.ts +2 -2
- package/dist/components/page/ChapterNumber.svelte.d.ts +2 -2
- package/dist/components/page/ChapterTitle.svelte.d.ts +2 -2
- package/dist/components/page/DefinitionView.svelte.d.ts +2 -2
- package/dist/components/page/Description.svelte.d.ts +2 -2
- package/dist/components/page/Edition.svelte.d.ts +2 -2
- package/dist/components/page/EditionLoader.svelte +12 -3
- package/dist/components/page/EditionLoader.svelte.d.ts +2 -2
- package/dist/components/page/Editions.svelte +1 -1
- package/dist/components/page/Editions.svelte.d.ts +2 -2
- package/dist/components/page/Glossary.svelte.d.ts +2 -2
- package/dist/components/page/Header.svelte.d.ts +2 -2
- package/dist/components/page/Index.svelte.d.ts +2 -2
- package/dist/components/page/Instructions.svelte.d.ts +2 -2
- package/dist/components/page/License.svelte.d.ts +2 -2
- package/dist/components/page/Loading.svelte.d.ts +2 -2
- package/dist/components/page/Media.svelte.d.ts +2 -2
- package/dist/components/page/MediaPreview.svelte.d.ts +2 -2
- package/dist/components/page/Muted.svelte.d.ts +2 -2
- package/dist/components/page/Outline.svelte +1 -1
- package/dist/components/page/Outline.svelte.d.ts +2 -2
- package/dist/components/page/Page.svelte.d.ts +2 -2
- package/dist/components/page/PageHeader.svelte.d.ts +2 -2
- package/dist/components/page/PageParagraph.svelte.d.ts +2 -2
- package/dist/components/page/PossibleChapter.svelte.d.ts +2 -2
- package/dist/components/page/PossibleReference.svelte.d.ts +2 -2
- package/dist/components/page/Print.svelte.d.ts +2 -2
- package/dist/components/page/Publish.svelte.d.ts +2 -2
- package/dist/components/page/Reference.svelte.d.ts +2 -2
- package/dist/components/page/References.svelte.d.ts +2 -2
- package/dist/components/page/Rows.svelte.d.ts +2 -2
- package/dist/components/page/Search.svelte.d.ts +2 -2
- package/dist/components/page/Status.svelte.d.ts +2 -2
- package/dist/components/page/SubdomainEditor.svelte.d.ts +2 -2
- package/dist/components/page/TableOfContents.svelte +2 -2
- package/dist/components/page/TableOfContents.svelte.d.ts +2 -2
- package/dist/components/page/TableOfContentsImage.svelte.d.ts +2 -2
- package/dist/components/page/TableOfContentsRow.svelte +1 -1
- package/dist/components/page/TableOfContentsRow.svelte.d.ts +2 -2
- package/dist/components/page/ThemeEditor.svelte.d.ts +2 -2
- package/dist/components/page/ThemeEditorPreview.svelte.d.ts +2 -2
- package/dist/components/page/ThemeSetEditor.svelte.d.ts +2 -2
- package/dist/components/page/ThemeVariableEditor.svelte.d.ts +2 -2
- package/dist/components/page/Title.svelte.d.ts +2 -2
- package/dist/components/page/Unknown.svelte.d.ts +2 -2
- package/dist/models/CRUD.d.ts +1 -0
- package/dist/models/CRUD.js +17 -4
- package/dist/models/book/Chapter.d.ts +10 -8
- package/dist/models/book/Chapter.js +16 -6
- package/dist/models/book/Edition.d.ts +3 -2
- package/dist/models/book/Edition.js +12 -5
- package/dist/models/chapter/Caret.d.ts +2 -1
- package/dist/models/chapter/Caret.js +20 -6
- package/dist/models/chapter/DefinitionNode.js +1 -1
- package/dist/models/chapter/FormatNode.d.ts +4 -1
- package/dist/models/chapter/FormatNode.js +57 -10
- package/dist/models/chapter/InlineCodeNode.js +1 -1
- package/dist/models/chapter/LineBreakNode.d.ts +15 -0
- package/dist/models/chapter/LineBreakNode.js +37 -0
- package/dist/models/chapter/LinkNode.js +1 -1
- package/dist/models/chapter/ListNode.js +1 -1
- package/dist/models/chapter/Parser.d.ts +2 -0
- package/dist/models/chapter/Parser.js +15 -8
- package/dist/models/chapter/Symbols.d.ts +1 -0
- package/dist/models/chapter/Symbols.js +1 -0
- package/package.json +23 -23
|
@@ -3,6 +3,7 @@ import TextNode from './TextNode';
|
|
|
3
3
|
import { caretRangeToIndexRange, caretToIndex, indexToCaret, } from './Caret';
|
|
4
4
|
import MetadataNode from './MetadataNode';
|
|
5
5
|
import AtomNode from './AtomNode';
|
|
6
|
+
import LineBreakNode from './LineBreakNode';
|
|
6
7
|
export default class FormatNode extends Node {
|
|
7
8
|
#format;
|
|
8
9
|
#segments;
|
|
@@ -10,14 +11,25 @@ export default class FormatNode extends Node {
|
|
|
10
11
|
super();
|
|
11
12
|
this.#format = format;
|
|
12
13
|
// Remove consecutive empty text nodes.
|
|
13
|
-
this.#segments = segments
|
|
14
|
+
this.#segments = segments
|
|
15
|
+
.filter((item, position, list) => {
|
|
14
16
|
if (position === 0 ||
|
|
15
17
|
!(item instanceof TextNode) ||
|
|
16
18
|
item.getLength() > 0)
|
|
17
19
|
return true;
|
|
18
20
|
const previous = list[position - 1];
|
|
19
21
|
return !(previous instanceof TextNode && previous.getLength() === 0);
|
|
20
|
-
})
|
|
22
|
+
})
|
|
23
|
+
// Insert text nodes between consecutive line breaks without them.
|
|
24
|
+
.map((item, position, list) => item instanceof LineBreakNode &&
|
|
25
|
+
list[position + 1] instanceof LineBreakNode
|
|
26
|
+
? [item, new TextNode()]
|
|
27
|
+
: [item])
|
|
28
|
+
// Flatten the mapped list we made.
|
|
29
|
+
.flat();
|
|
30
|
+
// Always ensure an empty text node.
|
|
31
|
+
if (this.#segments.length === 0)
|
|
32
|
+
this.#segments.push(new TextNode());
|
|
21
33
|
}
|
|
22
34
|
getType() {
|
|
23
35
|
return 'formatted';
|
|
@@ -124,6 +136,11 @@ export default class FormatNode extends Node {
|
|
|
124
136
|
}
|
|
125
137
|
// If there's not, is there an adjacent caret in the sequence of text and atom nodes?
|
|
126
138
|
const adjacentNode = this.getAdjacentTextOrAtom(caret.node, next);
|
|
139
|
+
// If there's a line break adjacent to the next node, account for it.
|
|
140
|
+
const linebreak = adjacentNode &&
|
|
141
|
+
(next
|
|
142
|
+
? this.getSegmentBefore(adjacentNode) instanceof LineBreakNode
|
|
143
|
+
: this.getSegmentAfter(adjacentNode) instanceof LineBreakNode);
|
|
127
144
|
if (adjacentNode !== undefined) {
|
|
128
145
|
// Normally we skip over node boundaries because they look identical to each other.
|
|
129
146
|
// But some nodes are zero length, so we have to account for that.
|
|
@@ -131,25 +148,27 @@ export default class FormatNode extends Node {
|
|
|
131
148
|
node: adjacentNode,
|
|
132
149
|
index: next
|
|
133
150
|
? adjacentNode instanceof TextNode
|
|
134
|
-
? adjacentNode.isEmpty()
|
|
151
|
+
? adjacentNode.isEmpty() || linebreak
|
|
135
152
|
? 0
|
|
136
153
|
: 1
|
|
137
154
|
: 0
|
|
138
155
|
: adjacentNode instanceof TextNode
|
|
139
156
|
? adjacentNode.isEmpty()
|
|
140
157
|
? 0
|
|
141
|
-
:
|
|
158
|
+
: linebreak
|
|
159
|
+
? adjacentNode.getLength()
|
|
160
|
+
: adjacentNode.getLength() - 1
|
|
142
161
|
: 0,
|
|
143
162
|
};
|
|
144
163
|
}
|
|
145
|
-
// Otherwise, there is no
|
|
164
|
+
// Otherwise, there is no adjacent caret.
|
|
146
165
|
return undefined;
|
|
147
166
|
}
|
|
148
167
|
getFirstCaret() {
|
|
149
168
|
const text = this.getTextNodes();
|
|
150
169
|
if (text.length === 0)
|
|
151
170
|
return undefined;
|
|
152
|
-
return { node: this.
|
|
171
|
+
return { node: this.getFirstTextNode(), index: 0 };
|
|
153
172
|
}
|
|
154
173
|
getLastCaret() {
|
|
155
174
|
const text = this.getTextNodes();
|
|
@@ -516,6 +535,19 @@ export default class FormatNode extends Node {
|
|
|
516
535
|
// Increment the text index; atoms count for one character.
|
|
517
536
|
textIndex++;
|
|
518
537
|
}
|
|
538
|
+
// Line break? Preserve the node, unless it's being deleted.
|
|
539
|
+
else if (node instanceof LineBreakNode) {
|
|
540
|
+
// Save any text prior to the line break as a text node in the current format.
|
|
541
|
+
saveText();
|
|
542
|
+
// Insert the line break unless we're deleting
|
|
543
|
+
if (format !== undefined ||
|
|
544
|
+
textIndex < selectionStartIndex ||
|
|
545
|
+
textIndex > selectionEndIndex) {
|
|
546
|
+
newFormats[0].segments.push(node);
|
|
547
|
+
}
|
|
548
|
+
// Increment the text index; atoms count for one character.
|
|
549
|
+
textIndex++;
|
|
550
|
+
}
|
|
519
551
|
});
|
|
520
552
|
// Save any remaining text that we've accumulated.
|
|
521
553
|
saveText();
|
|
@@ -723,18 +755,33 @@ export default class FormatNode extends Node {
|
|
|
723
755
|
if (!(node instanceof FormatNode ||
|
|
724
756
|
node instanceof TextNode ||
|
|
725
757
|
node instanceof MetadataNode ||
|
|
758
|
+
node instanceof LineBreakNode ||
|
|
726
759
|
node instanceof AtomNode))
|
|
727
760
|
return;
|
|
728
761
|
const newFormat = this.withSegmentAt(node, caret);
|
|
762
|
+
if (newFormat === undefined)
|
|
763
|
+
return;
|
|
764
|
+
const segmentAfter = newFormat.getSegmentAfter(node);
|
|
729
765
|
const newCaret = node instanceof AtomNode
|
|
730
766
|
? node.getDefaultCaret()
|
|
731
767
|
: node instanceof FormatNode
|
|
732
768
|
? node.getLastCaret()
|
|
733
|
-
: node
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
|
|
769
|
+
: // Line break? Place the caret just after the line break, whether a text node or something else
|
|
770
|
+
node instanceof LineBreakNode
|
|
771
|
+
? segmentAfter !== undefined && segmentAfter instanceof TextNode
|
|
772
|
+
? { node: segmentAfter, index: 0 }
|
|
773
|
+
: undefined
|
|
774
|
+
: node instanceof MetadataNode
|
|
775
|
+
? { node: node.getText(), index: node.getText().getLength() }
|
|
776
|
+
: { node: node, index: node.getLength() };
|
|
777
|
+
if (newCaret === undefined)
|
|
737
778
|
return;
|
|
738
779
|
return { root: newFormat, range: { start: newCaret, end: newCaret } };
|
|
739
780
|
}
|
|
781
|
+
getSegmentAfter(segment) {
|
|
782
|
+
return this.#segments[this.#segments.indexOf(segment) + 1];
|
|
783
|
+
}
|
|
784
|
+
getSegmentBefore(segment) {
|
|
785
|
+
return this.#segments[this.#segments.indexOf(segment) - 1];
|
|
786
|
+
}
|
|
740
787
|
}
|
|
@@ -15,7 +15,7 @@ export default class InlineCodeNode extends MetadataNode {
|
|
|
15
15
|
}
|
|
16
16
|
toBookdown() {
|
|
17
17
|
return ('`' +
|
|
18
|
-
this.getText().
|
|
18
|
+
this.getText().getText().replace(/`/g, '\\`') +
|
|
19
19
|
'`' +
|
|
20
20
|
(this.getMeta() === 'plaintext' ? '' : this.getMeta()));
|
|
21
21
|
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { CaretRange } from './Caret';
|
|
2
|
+
import Node from './Node';
|
|
3
|
+
export default class LineBreakNode extends Node {
|
|
4
|
+
constructor();
|
|
5
|
+
getType(): string;
|
|
6
|
+
getParentOf(): Node | undefined;
|
|
7
|
+
toText(): string;
|
|
8
|
+
toBookdown(): string;
|
|
9
|
+
getCaretPositionCount(): number;
|
|
10
|
+
toHTML(): string;
|
|
11
|
+
getChildren(): never[];
|
|
12
|
+
copy(): this;
|
|
13
|
+
withChildReplaced(): this | undefined;
|
|
14
|
+
withContentInRange(range: CaretRange): this | undefined;
|
|
15
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import Node from './Node';
|
|
2
|
+
import { LINE_BREAK } from './Symbols';
|
|
3
|
+
export default class LineBreakNode extends Node {
|
|
4
|
+
constructor() {
|
|
5
|
+
super();
|
|
6
|
+
}
|
|
7
|
+
getType() {
|
|
8
|
+
return 'linebreak';
|
|
9
|
+
}
|
|
10
|
+
getParentOf() {
|
|
11
|
+
return undefined;
|
|
12
|
+
}
|
|
13
|
+
toText() {
|
|
14
|
+
return LINE_BREAK;
|
|
15
|
+
}
|
|
16
|
+
toBookdown() {
|
|
17
|
+
return LINE_BREAK;
|
|
18
|
+
}
|
|
19
|
+
getCaretPositionCount() {
|
|
20
|
+
return 1;
|
|
21
|
+
}
|
|
22
|
+
toHTML() {
|
|
23
|
+
return '<br/>';
|
|
24
|
+
}
|
|
25
|
+
getChildren() {
|
|
26
|
+
return [];
|
|
27
|
+
}
|
|
28
|
+
copy() {
|
|
29
|
+
return new LineBreakNode();
|
|
30
|
+
}
|
|
31
|
+
withChildReplaced() {
|
|
32
|
+
return this;
|
|
33
|
+
}
|
|
34
|
+
withContentInRange(range) {
|
|
35
|
+
return this;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
@@ -14,7 +14,7 @@ export default class LinkNode extends MetadataNode {
|
|
|
14
14
|
return `<a href="${this.getMeta()}">${this.getText().toHTML()}</a>`;
|
|
15
15
|
}
|
|
16
16
|
toBookdown() {
|
|
17
|
-
return `[${this.getText().
|
|
17
|
+
return `[${this.getText().getText()}|${this.getMeta()}]`;
|
|
18
18
|
}
|
|
19
19
|
copy() {
|
|
20
20
|
return new LinkNode(this.getText(), this.getMeta());
|
|
@@ -101,7 +101,7 @@ export default class ListNode extends BlockNode {
|
|
|
101
101
|
return (format !== undefined &&
|
|
102
102
|
caret.node.hasAncestor(root, this) &&
|
|
103
103
|
caret.index === 0 &&
|
|
104
|
-
format.
|
|
104
|
+
format.getFirstTextNode() === caret.node);
|
|
105
105
|
}
|
|
106
106
|
getItemContaining(caret) {
|
|
107
107
|
const match = this.#items.find((n) => n.getParentOf(caret.node) !== undefined);
|
|
@@ -21,6 +21,7 @@ import TextNode from './TextNode';
|
|
|
21
21
|
import type Position from './Position';
|
|
22
22
|
import type BlockNode from './BlockNode';
|
|
23
23
|
import type Bookkeeping from './Bookkeeping';
|
|
24
|
+
import LineBreakNode from './LineBreakNode';
|
|
24
25
|
export default class Parser {
|
|
25
26
|
book: Edition | undefined;
|
|
26
27
|
text: string;
|
|
@@ -62,6 +63,7 @@ export default class Parser {
|
|
|
62
63
|
parseCallout(): CalloutNode;
|
|
63
64
|
parseTable(): TableNode;
|
|
64
65
|
parseFormat(awaiting?: string): FormatNode;
|
|
66
|
+
parseLineBreak(): LineBreakNode;
|
|
65
67
|
parseEmbed(): EmbedNode;
|
|
66
68
|
parseComment(): CommentNode;
|
|
67
69
|
parseLabel(): LabelNode | ErrorNode;
|
|
@@ -14,10 +14,11 @@ import LinkNode from './LinkNode';
|
|
|
14
14
|
import ListNode from './ListNode';
|
|
15
15
|
import ParagraphNode from './ParagraphNode';
|
|
16
16
|
import QuoteNode from './QuoteNode';
|
|
17
|
-
import Reference from '../book/Reference';
|
|
18
17
|
import RuleNode from './RuleNode';
|
|
19
18
|
import TableNode from './TableNode';
|
|
20
19
|
import TextNode from './TextNode';
|
|
20
|
+
import LineBreakNode from './LineBreakNode';
|
|
21
|
+
import { LINE_BREAK } from './Symbols';
|
|
21
22
|
const numberedRE = /^[0-9]+\.+/;
|
|
22
23
|
const bulletRE = /^\*+\s+/;
|
|
23
24
|
// TODO This grammar is slightly out of date.
|
|
@@ -181,6 +182,7 @@ export default class Parser {
|
|
|
181
182
|
next === '*' ||
|
|
182
183
|
next === '`' ||
|
|
183
184
|
next === '@' ||
|
|
185
|
+
next === LINE_BREAK ||
|
|
184
186
|
next === '~' ||
|
|
185
187
|
(next === ':' &&
|
|
186
188
|
charAfterNext !== null &&
|
|
@@ -578,7 +580,10 @@ export default class Parser {
|
|
|
578
580
|
// Parse some bold, italic, subscript, superscript
|
|
579
581
|
if (next === '_' || next === '*' || next === '^')
|
|
580
582
|
segments.push(this.parseStyle(next));
|
|
581
|
-
// Parse
|
|
583
|
+
// Parse a line break
|
|
584
|
+
else if (this.nextIs(LINE_BREAK))
|
|
585
|
+
segments.push(this.parseLineBreak());
|
|
586
|
+
// Parse inline code text
|
|
582
587
|
else if (this.nextIs('`'))
|
|
583
588
|
segments.push(this.parseInlineCode());
|
|
584
589
|
// Parse a citation list
|
|
@@ -634,6 +639,11 @@ export default class Parser {
|
|
|
634
639
|
}
|
|
635
640
|
return new FormatNode('', segments);
|
|
636
641
|
}
|
|
642
|
+
parseLineBreak() {
|
|
643
|
+
// Read the line break
|
|
644
|
+
this.read();
|
|
645
|
+
return new LineBreakNode();
|
|
646
|
+
}
|
|
637
647
|
parseEmbed() {
|
|
638
648
|
// Read |
|
|
639
649
|
this.read();
|
|
@@ -739,12 +749,9 @@ export default class Parser {
|
|
|
739
749
|
let code = '';
|
|
740
750
|
while (this.more() && !this.nextIs('`')) {
|
|
741
751
|
let next = this.read(false);
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
next = '`';
|
|
746
|
-
}
|
|
747
|
-
}
|
|
752
|
+
// Skip backslash of escaped characters.
|
|
753
|
+
if (next === '\\')
|
|
754
|
+
next = this.read();
|
|
748
755
|
code = code + next;
|
|
749
756
|
}
|
|
750
757
|
// Read the backtick.
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const LINE_BREAK = "\u21A9";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export const LINE_BREAK = '↩';
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "bookish-press",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "0.5.
|
|
4
|
+
"version": "0.5.62",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"description": "A platform for reading and writing readable, accessible, beautiful online books.",
|
|
7
7
|
"license": "MIT",
|
|
@@ -27,32 +27,32 @@
|
|
|
27
27
|
"merge": "git checkout main && git merge dev && git push origin main && git checkout dev"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@sveltejs/adapter-static": "^2
|
|
31
|
-
"@sveltejs/kit": "^1.
|
|
32
|
-
"@sveltejs/package": "^2
|
|
33
|
-
"@types/prismjs": "^1.26
|
|
34
|
-
"@types/smoothscroll-polyfill": "^0
|
|
35
|
-
"@types/uuid": "^9.0
|
|
36
|
-
"prettier": "^
|
|
37
|
-
"prettier-plugin-svelte": "^
|
|
30
|
+
"@sveltejs/adapter-static": "^2",
|
|
31
|
+
"@sveltejs/kit": "^1.22",
|
|
32
|
+
"@sveltejs/package": "^2",
|
|
33
|
+
"@types/prismjs": "^1.26",
|
|
34
|
+
"@types/smoothscroll-polyfill": "^0",
|
|
35
|
+
"@types/uuid": "^9.0",
|
|
36
|
+
"prettier": "^3",
|
|
37
|
+
"prettier-plugin-svelte": "^3",
|
|
38
38
|
"svelte-adapter-firebase": "^0.15.0",
|
|
39
|
-
"svelte-check": "^3
|
|
40
|
-
"svelte-preprocess": "^5
|
|
41
|
-
"tslib": "^2
|
|
42
|
-
"typescript": "^
|
|
43
|
-
"vite": "^4
|
|
44
|
-
"vitest": "^0
|
|
39
|
+
"svelte-check": "^3",
|
|
40
|
+
"svelte-preprocess": "^5",
|
|
41
|
+
"tslib": "^2",
|
|
42
|
+
"typescript": "^5",
|
|
43
|
+
"vite": "^4",
|
|
44
|
+
"vitest": "^0"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"ajv": "^8
|
|
48
|
-
"ajv-formats": "^2
|
|
47
|
+
"ajv": "^8",
|
|
48
|
+
"ajv-formats": "^2",
|
|
49
49
|
"firebase": "latest",
|
|
50
|
-
"firebase-functions": "
|
|
51
|
-
"prismjs": "^1.29
|
|
52
|
-
"smoothscroll-polyfill": "^0.4
|
|
53
|
-
"svelte": "^
|
|
54
|
-
"@sveltejs/kit": "^1.
|
|
55
|
-
"uuid": "^9.0
|
|
50
|
+
"firebase-functions": "latest",
|
|
51
|
+
"prismjs": "^1.29",
|
|
52
|
+
"smoothscroll-polyfill": "^0.4",
|
|
53
|
+
"svelte": "^4.0",
|
|
54
|
+
"@sveltejs/kit": "^1.22",
|
|
55
|
+
"uuid": "^9.0"
|
|
56
56
|
},
|
|
57
57
|
"types": "./dist/index.d.ts",
|
|
58
58
|
"exports": {
|