bookish-press 0.5.71 → 0.5.74

package/dist/components/chapter/Link.svelte

@@ -18,6 +18,10 @@ function isInvalidChapterLink() {
             let parts = chapter.split(':');
             chapter = parts[0];
         }
+        else if (url.indexOf('#') >= 0) {
+            let parts = chapter.split('#');
+            chapter = parts[0];
+        }
         if (chapter !== '' && !$edition?.hasChapter(chapter))
             return true;
     }

package/dist/components/chapter/Paragraph.svelte

@@ -98,4 +98,22 @@ $: dropcap =
         font-size: var(--bookish-header-3-font-size);
         font-style: italic;
     }
+
+    h5 {
+        font-size: var(--bookish-paragraph-font-size);
+        display: inline;
+    }
+
+    h5::after {
+        content: '. ';
+    }
+
+    h5 + :global(p) {
+        display: inline;
+    }
+
+    h5 + :global(p::after) {
+        content: '\0A';
+        display: block;
+    }
 </style>

package/dist/components/chapter/Table.svelte

@@ -9,7 +9,7 @@ let editable = isChapterEditable();
 $: rows = node.getRows();
 </script>
 
-<Figure {node} caption={node.getCaption()}>
+<Figure {node} caption={node.getCaption()} focusable={false}>
     <Rows>
         {#each rows as row, index}
             <tr class={editable ? 'editable' : null}>

package/dist/components/editor/BookishEditor.svelte

@@ -18,7 +18,7 @@ import commands from './Commands';
 import { afterUpdate, onMount, setContext } from 'svelte';
 import { getCaret } from '../page/Contexts';
 import CaretView from './CaretView.svelte';
-import Parser from '../../models/chapter/Parser';
+import Parser, { Reserved } from '../../models/chapter/Parser';
 const IDLE_TIME = 500;
 export let text;
 export let parser;
@@ -704,8 +704,14 @@ function handlePaste(context, text, save) {
         return handlePasteNode(context, text, save);
     if (text.plain === undefined)
         return undefined;
-    // If we're pasting text, then we parse it as a series of paragraphs.
-    const chapter = Parser.parseChapter(undefined, text.plain);
+    // Escape all reserved Bookdown characters.
+    const escaped = text.plain.replaceAll(Reserved, '\\$1');
+    const chapter = 
+    // If we're pasting text into a paragraph node, then we parse it as a series of paragraphs.
+    context.block instanceof ParagraphNode
+        ? Parser.parseChapter(undefined, escaped)
+        : // Otherwise parse as just a format node, replacing all text newlines with a space.
+            Parser.parseFormat(undefined, escaped.replaceAll('\n', ' '));
     const edit = handlePasteNode(context, chapter, save);
     if (edit)
         return edit;

package/dist/components/editor/Commands.js

@@ -35,6 +35,7 @@ import FootnoteIcon from './icons/footnote.svg?raw';
 import Header1Icon from './icons/header1.svg?raw';
 import Header2Icon from './icons/header2.svg?raw';
 import Header3Icon from './icons/header3.svg?raw';
+import Header4Icon from './icons/header4.svg?raw';
 import IndentIcon from './icons/indent.svg?raw';
 import ItalicIcon from './icons/italic.svg?raw';
 import LabelIcon from './icons/label.svg?raw';
@@ -79,10 +80,10 @@ function deleteTableRowColumn(context, table, format, row) {
         ? table.withoutRow(location.row)
         : table.withoutColumn(location.column), (t) => {
         return (row
-            ? t.getCell(location.row === table.getRowCount()
+            ? t.getCell(location.row === table.getRowCount() - 1
                 ? location.row - 1
                 : location.row, location.column)
-            : t.getCell(location.row, location.column === table.getColumnCount()
+            : t.getCell(location.row, location.column === table.getColumnCount() - 1
                 ? location.column - 1
                 : location.column))?.getFirstCaret();
     });
@@ -1109,7 +1110,10 @@ const commands = [
         active: (context) => context.chapter &&
             context.atom === undefined &&
             context.meta === undefined,
-        handler: (context) => context.root.withSegmentAtSelection(context.range, (text) => new CommentNode(new FormatNode('', [new TextNode(text)]))),
+        handler: (context) => context.root.withSegmentAtSelection({
+            start: context.root.sortRange(context.range).end,
+            end: context.root.sortRange(context.range).end,
+        }, (text) => new CommentNode(new FormatNode('', [new TextNode(text)]))),
     },
     {
         icon: ParagraphIcon,
@@ -1172,6 +1176,20 @@ const commands = [
             context.paragraph.getLevel() !== 3,
         handler: (context) => rootWithNode(context, context.paragraph, context.paragraph?.withLevel(3)),
     },
+    {
+        icon: Header4Icon,
+        description: 'format as 4rd level header',
+        category: 'level',
+        mutates: true,
+        control: true,
+        alt: true,
+        shift: false,
+        code: 'Digit4',
+        visible: (context) => context.paragraph !== undefined,
+        active: (context) => context.paragraph !== undefined &&
+            context.paragraph.getLevel() !== 4,
+        handler: (context) => rootWithNode(context, context.paragraph, context.paragraph?.withLevel(4)),
+    },
     {
         icon: RuleIcon,
         description: 'insert horizontal rule',

package/dist/components/editor/LinkEditor.svelte

@@ -55,12 +55,25 @@ $: {
     // Add an option for each chapter and it's labels.
     if ($edition) {
         for (const chap of $edition?.getChapters() ?? []) {
+            // Include the chapter itself
             options.push([`Chapter: ${chap.getTitle()}`, chap.getID()]);
-            for (const label of chap.getAST($edition)?.getLabels() ?? [])
-                options.push([
-                    chap.getTitle() + ': ' + label.getMeta(),
-                    `${chap.getID()}:${label.getMeta()}`,
-                ]);
+            const root = chap.getAST($edition);
+            if (root) {
+                // Include the chapter's headers
+                const headers = root.getHeaders();
+                for (let number = 0; number < headers.length; number++) {
+                    options.push([
+                        chap.getTitle() + ': ' + headers[number].toText(),
+                        `${chap.getID()}#header-${number}`,
+                    ]);
+                }
+                // Include all of the labels in the chapter
+                for (const label of root.getLabels())
+                    options.push([
+                        chap.getTitle() + ': ' + label.getMeta(),
+                        `${chap.getID()}:${label.getMeta()}`,
+                    ]);
+            }
         }
     }
 }

package/dist/components/editor/icons/header4.svg

@@ -0,0 +1,7 @@
+<svg role="presentation" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14">
+    <g transform="scale(0.5 0.5)" transform-origin="7 12">
+        <line x1="3" y1="2" x2="3" y2="12" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line>
+        <line x1="3" y1="7" x2="11" y2="7" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line>
+        <line x1="11" y1="2" x2="11" y2="12" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line>
+    </g>
+</svg>

package/dist/components/page/Analytics.svelte

@@ -0,0 +1,21 @@
+<script>/** By default, we use the Bookish.press Google Analytics tag */
+export let gtagid = null;
+$: id = gtagid ?? 'G-BGFDV229BN';
+</script>
+
+<svelte:head>
+    <script
+        async
+        src="https://www.googletagmanager.com/gtag/js?id={id}"
+    ></script>
+    {@html `<script>
+            window.dataLayer = window.dataLayer || [];
+
+    function gtag() {
+        dataLayer.push(arguments);
+    }
+
+    gtag('js', new Date());
+    gtag('config', "${id}");
+    </script>`}
+</svelte:head>

package/dist/components/page/Analytics.svelte.d.ts

@@ -0,0 +1,16 @@
+import { SvelteComponent } from "svelte";
+declare const __propDef: {
+    props: {
+        /** By default, we use the Bookish.press Google Analytics tag */ gtagid?: string | null | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type AnalyticsProps = typeof __propDef.props;
+export type AnalyticsEvents = typeof __propDef.events;
+export type AnalyticsSlots = typeof __propDef.slots;
+export default class Analytics extends SvelteComponent<AnalyticsProps, AnalyticsEvents, AnalyticsSlots> {
+}
+export {};

package/dist/components/page/DefinitionView.svelte

@@ -62,6 +62,7 @@ $: syns = definition.synonyms || [];
             {#if editable}
                 <TextEditor
                     text={definition.phrase}
+                    saveOnExit
                     label={'Glossary phrase editor.'}
                     placeholder="phrase"
                     valid={(text) => {
@@ -74,7 +75,7 @@ $: syns = definition.synonyms || [];
                                       phrase: text,
                                       definition: definition.definition,
                                       synonyms: definition.synonyms,
-                                  })
+                                  }),
                               )
                             : undefined}
                 />
@@ -106,7 +107,7 @@ $: syns = definition.synonyms || [];
                                       phrase: definition.phrase,
                                       definition: node.toBookdown(),
                                       synonyms: definition.synonyms,
-                                  })
+                                  }),
                               )
                             : undefined}
                     chapter={false}
@@ -122,7 +123,7 @@ $: syns = definition.synonyms || [];
                 <Format
                     node={Parser.parseFormat(
                         undefined,
-                        definition.definition
+                        definition.definition,
                     ).withTextIfEmpty()}
                 />
             {/if}

package/dist/components/page/Edition.svelte

@@ -8,7 +8,7 @@ import { isDark, setDark } from '../../util/dark';
 import { page } from '$app/stores';
 // Poly fill smooth scrolling for Safari.
 onMount(() => smoothscroll.polyfill());
-// The book edition to render.
+// The book and edition to render
 export let edition;
 // The base path allows links to adjust to different routing contexts in which a book is placed.
 // For example, when the book is hosted alone, all routes might start with the bare root "/",
@@ -79,8 +79,8 @@ function toRules(set) {
 }
 </script>
 
-<!-- Keep the imports up to date -->
 <svelte:head>
+    <!-- Keep the imports up to date -->
     {@html '<' + `style>${themeCSS}</style>`}
 
     <meta property="og:title" content={edition.getTitle()} />

package/dist/components/page/TableOfContents.svelte

@@ -1,5 +1,4 @@
 <script>import Instructions from './Instructions.svelte';
-import Parser from '../../models/chapter/Parser';
 import TableOfContentsRow from './TableOfContentsRow.svelte';
 import ChapterIDs from '../../models/book/ChapterID';
 import Page from './Page.svelte';
@@ -153,16 +152,20 @@ onMount(() => {
                     readingTime === undefined
                         ? 'Forthcoming'
                         : readingTime < 5
-                        ? '<5 min read'
-                        : readingTime < 60
-                        ? '~' + Math.floor(readingTime / 5) * 5 + ' min read'
-                        : '~' + Math.floor(readingTime / 60) + ' hour read'}
+                          ? '<5 min read'
+                          : readingTime < 60
+                            ? '~' +
+                              Math.floor(readingTime / 5) * 5 +
+                              ' min read'
+                            : '~' + Math.floor(readingTime / 60) + ' hour read'}
                 {@const section = chapter.getSection()}
                 {@const etc =
                     readingEstimate +
                     (!chapter.isForthcoming()
                         ? getProgressDescription(
-                              chapterID in progress ? progress[chapterID] : null
+                              chapterID in progress
+                                  ? progress[chapterID]
+                                  : null,
                           )
                         : '')}
 
@@ -184,7 +187,7 @@ onMount(() => {
                                     setChapter(
                                         edition,
                                         chapter,
-                                        chapter.withSection(text)
+                                        chapter.withSection(text),
                                     )}
                             />
                         {:else if section}{section}{/if}
@@ -201,7 +204,7 @@ onMount(() => {
                                         setChapter(
                                             edition,
                                             chapter,
-                                            chapter.asForthcoming(on)
+                                            chapter.asForthcoming(on),
                                         )}
                                 >
                                     {etc}
@@ -288,6 +291,28 @@ onMount(() => {
             <Editions editors={false} />
         {/if}
 
+        {#if editable && $edition}
+            <PageHeader id="editions">Analytics</PageHeader>
+            <Instructions {editable}
+                >Want to use Google Analytics to track traffic? Enter your tag
+                ID here.</Instructions
+            >
+            <TextEditor
+                label={'Google Analytics ag'}
+                text={$edition.gtagid ?? ''}
+                placeholder="gtag ID"
+                valid={() => undefined}
+                save={(text) =>
+                    $edition
+                        ? edition.set(
+                              $edition.withGTag(
+                                  text.length === 0 ? null : text,
+                              ),
+                          )
+                        : undefined}
+            />
+        {/if}
+
         {#if $book && (editable || isEditionPartiallyEditable())}
             <PageHeader id="editors">Editors</PageHeader>
             <Instructions {editable}>

package/dist/models/CRUD.js

@@ -113,7 +113,7 @@ export async function createBook(userID) {
     // Create a model to store it.
     let book = Book.fromJSON(bookRef.id, newBookData);
     // Make a new default edition with a single chapter with this user id.
-    let newEdition = new Edition(bookRef, undefined, [], 'Untitled', [], 1, '', null, {}, '', [], 'All rights reserved.', '', [], {}, {}, {}, {}, null, null, {}).withNewChapter();
+    let newEdition = new Edition(bookRef, undefined, [], 'Untitled', [], 1, '', null, {}, '', [], 'All rights reserved.', '', [], {}, {}, {}, {}, null, null, {}, null).withNewChapter();
     // Add the edition to the editions collection in the database so we can get an edition ref.
     const editionRef = await addDoc(collection(db, 'books', bookRef.id, 'editions'), newEdition.toObject());
     // Remember the ref.

package/dist/models/book/Edition.d.ts

@@ -32,6 +32,8 @@ export type EditionSpecification = {
     /** All uids who have edit access to at least one chapter. Used in firestore rules to give permission to update book. */
     chapteruids: string[];
     active: Record<string, string>;
+    /** An optional Google Analytics tag ID */
+    gtagid: string | null;
 };
 export default class Edition {
     readonly bookRef: DocumentReference;
@@ -55,7 +57,8 @@ export default class Edition {
     readonly theme: Theme | null;
     readonly base: string | null;
     readonly active: Record<string, string>;
-    constructor(bookRef: DocumentReference, editionRef: DocumentReference | undefined, uids: string[], title: string, authors: string[], number: number, summary: string, published: number | null, images: Record<string, string | null>, description: string, chapters: Chapter[], license: string, acknowledgements: string, tags: string[], sources: Record<string, string>, references: Record<string, string | string[]> | Record<string, FormatNode | Reference>, symbols: Record<string, string>, glossary: Record<string, Definition>, theme: Theme | null, base: string | null, active: Record<string, string>);
+    readonly gtagid: string | null;
+    constructor(bookRef: DocumentReference, editionRef: DocumentReference | undefined, uids: string[], title: string, authors: string[], number: number, summary: string, published: number | null, images: Record<string, string | null>, description: string, chapters: Chapter[], license: string, acknowledgements: string, tags: string[], sources: Record<string, string>, references: Record<string, string | string[]> | Record<string, FormatNode | Reference>, symbols: Record<string, string>, glossary: Record<string, Definition>, theme: Theme | null, base: string | null, active: Record<string, string>, gtagid: string | null);
     static fromJSON(editionRef: DocumentReference | undefined, spec: EditionSpecification): Edition;
     static parseReference(citationID: string, ref: string | string[], edition: Edition, short?: boolean): FormatNode | Reference;
     toObject(): EditionSpecification;
@@ -125,6 +128,7 @@ export default class Edition {
     hasLease(uid: string, content: string): boolean;
     isLeased(contentID: string): boolean;
     withLock(uid: string, content: string, lock: boolean): Edition;
+    withGTag(gtagid: string | null): Edition;
     getBookReadingTime(): number | undefined;
     getChapterNumber(chapterID: string): undefined;
     getSource(sourceID: string): string | null;

package/dist/models/book/Edition.js

@@ -25,9 +25,10 @@ export default class Edition {
     theme;
     base;
     active;
+    gtagid;
     // Given an object with a valid specification and an object mapping chapter IDs to chapter text,
     // construct an object representing a book.
-    constructor(bookRef, editionRef, uids, title, authors, number, summary, published, images, description, chapters, license, acknowledgements, tags, sources, references, symbols, glossary, theme, base, active) {
+    constructor(bookRef, editionRef, uids, title, authors, number, summary, published, images, description, chapters, license, acknowledgements, tags, sources, references, symbols, glossary, theme, base, active, gtagid) {
         this.bookRef = bookRef;
         this.editionRef = editionRef;
         this.uids = uids;
@@ -55,11 +56,12 @@ export default class Edition {
         this.theme = theme;
         this.base = base;
         this.active = active;
+        this.gtagid = gtagid;
     }
     static fromJSON(editionRef, spec) {
         // Copy all of the specification metadata to fields.
         // Choose suitable defaults if the spec is lacking a field.
-        return new Edition(spec.bookRef, editionRef, spec.uids, spec.title, spec.authors, spec.number, spec.summary, spec.published, spec.images, spec.description, spec.chapters.map((chap) => Chapter.fromJSON(chap)), spec.license, spec.acknowledgements, spec.tags ?? [], spec.sources ?? {}, spec.references ?? {}, spec.symbols ?? {}, spec.glossary ?? {}, spec.theme, spec.base, spec.active);
+        return new Edition(spec.bookRef, editionRef, spec.uids, spec.title, spec.authors, spec.number, spec.summary, spec.published, spec.images, spec.description, spec.chapters.map((chap) => Chapter.fromJSON(chap)), spec.license, spec.acknowledgements, spec.tags ?? [], spec.sources ?? {}, spec.references ?? {}, spec.symbols ?? {}, spec.glossary ?? {}, spec.theme, spec.base, spec.active, spec.gtagid);
     }
     static parseReference(citationID, ref, edition, short = false) {
         if (typeof ref === 'string')
@@ -103,6 +105,7 @@ export default class Edition {
             uids: this.uids.slice(),
             chapteruids: this.getChapterUIDS(),
             active: this.active,
+            gtagid: this.gtagid ?? null,
         };
         return editionJSON;
     }
@@ -116,37 +119,37 @@ export default class Edition {
         return Array.from(new Set(this.chapters.map((chapter) => chapter.uids).flat()));
     }
     withRef(editionRef) {
-        return new Edition(this.bookRef, editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     getTitle() {
         return this.title;
     }
     withTitle(title) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     getDescription() {
         return this.description;
     }
     setDescription(description) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     getAcknowledgements() {
         return this.acknowledgements;
     }
     withAcknowledgements(acks) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, acks, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, acks, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     withSummary(summary) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     asPublished(published) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, published ? Date.now() : null, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, published ? Date.now() : null, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     getLicense() {
         return this.license;
     }
     setLicense(license) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     getChapters() {
         return this.chapters.slice();
@@ -172,7 +175,7 @@ export default class Edition {
         return this.chapters.length;
     }
     withChapters(chapters) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     withChapterText(textByID) {
         const newChapters = this.chapters.map((chapter) => {
@@ -198,7 +201,7 @@ export default class Edition {
         return this.withRef(undefined).withChapters(this.chapters.map((chap) => chap.withoutRef()));
     }
     withIncrementedEditionNumber() {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number + 1, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number + 1, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     withNewChapter() {
         // Synthesize a chapter ID placeholder that doesn't overlap with existing chapter names
@@ -230,7 +233,7 @@ export default class Edition {
         const temp = newChapters[index + increment];
         newChapters[index + increment] = newChapters[index];
         newChapters[index] = temp;
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, newChapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, newChapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     getSymbols() {
         return this.symbols;
@@ -247,7 +250,7 @@ export default class Edition {
             : undefined;
     }
     withReferences(newReferences) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, newReferences, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, newReferences, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     withNewReferences(references) {
         const newReferences = Object.assign({}, this.references);
@@ -288,7 +291,7 @@ export default class Edition {
         return id in this.glossary;
     }
     withGlossary(glossary) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, glossary, this.theme, this.base, this.active, this.gtagid);
     }
     withDefinition(id, phrase, definition, synonyms) {
         const newGlossary = Object.assign({}, this.glossary);
@@ -325,7 +328,7 @@ export default class Edition {
         return this.theme;
     }
     withTheme(theme) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, theme, this.base, this.active, this.gtagid);
     }
     withThemeValue(group, name, value) {
         if (this.theme === null)
@@ -348,7 +351,7 @@ export default class Edition {
             .join(', ');
     }
     withAuthors(authors) {
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     withAuthor(name) {
         return this.withAuthors([...this.authors, name]);
@@ -371,7 +374,7 @@ export default class Edition {
         ]);
     }
     withEditors(uids) {
-        return new Edition(this.bookRef, this.editionRef, uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     hasImage(id) {
         return this.images[id] !== null;
@@ -382,7 +385,7 @@ export default class Edition {
     withImage(id, embed) {
         const newImages = Object.assign({}, this.images);
         newImages[id] = embed;
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, newImages, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, newImages, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, this.gtagid);
     }
     isEditor(uid) {
         return this.uids.includes(uid);
@@ -405,7 +408,10 @@ export default class Edition {
             newActive[content] = uid;
         else
             delete newActive[content];
-        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, newActive);
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, newActive, this.gtagid);
+    }
+    withGTag(gtagid) {
+        return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active, gtagid);
     }
     getBookReadingTime() {
         return this.chapters

package/dist/models/chapter/ParagraphNode.js

@@ -68,22 +68,12 @@ export default class ParagraphNode extends BlockNode {
         return this.#format.toText();
     }
     toBookdown() {
-        return ((this.#level === 1
-            ? '# '
-            : this.#level === 2
-                ? '## '
-                : this.#level === 3
-                    ? '### '
-                    : '') + this.#format.toBookdown());
+        return this.#level === 0
+            ? this.#format.toBookdown()
+            : `${'#'.repeat(this.#level)} ${this.#format.toBookdown()}`;
     }
     toHTML() {
-        const tag = this.#level === 1
-            ? 'h1'
-            : this.#level === 2
-                ? 'h2'
-                : this.#level === 3
-                    ? 'h2'
-                    : 'p';
+        const tag = this.#level === 0 ? 'p' : `h${this.#level}`;
         return `<${tag}>${this.#format.toHTML()}</${tag}>`;
     }
     withLevel(level) {

package/dist/models/chapter/Parser.d.ts

@@ -22,6 +22,7 @@ import type Position from './Position';
 import type BlockNode from './BlockNode';
 import type Bookkeeping from './Bookkeeping';
 import LineBreakNode from './LineBreakNode';
+export declare const Reserved: RegExp;
 export default class Parser {
     book: Edition | undefined;
     text: string;

package/dist/models/chapter/Parser.js

@@ -46,6 +46,7 @@ const bulletRE = /^\*+\s+/;
 // LINK :: [CONTENT|TEXT]
 // FOOTNOTE :: {TEXT}
 // TEXT :: (.+)
+export const Reserved = /([_*`@~:^<>{}\[\]])/g;
 export default class Parser {
     book;
     text;
@@ -355,7 +356,7 @@ export default class Parser {
         // Read any whitespace after the hashes.
         this.readWhitespace();
         // Parse some content.
-        return new ParagraphNode(Math.min(3, count), this.parseFormat());
+        return new ParagraphNode(Math.min(4, count), this.parseFormat());
     }
     parseRule() {
         // Read until the end of the line. Ignore all text that follows.

package/dist/models/chapter/TableNode.js

@@ -168,8 +168,10 @@ export default class TableNode extends BlockNode {
         if (index < 0 || index >= this.getColumnCount())
             return;
         const newRows = this.#rows.slice();
-        for (let r = 0; r < this.#rows.length; r++)
+        for (let r = 0; r < this.#rows.length; r++) {
+            newRows[r] = newRows[r].slice();
             newRows[r].splice(index, 1);
+        }
         return new TableNode(newRows, this.#position, this.#caption);
     }
     withNewColumn(index) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "bookish-press",
     "private": false,
-    "version": "0.5.71",
+    "version": "0.5.74",
     "type": "module",
     "description": "A platform for reading and writing readable, accessible, beautiful online books.",
     "license": "MIT",
@@ -20,9 +20,9 @@
         "//env": "echo 'This copies the .env file corresponding to the current Firebase project specified with firebase use, defaulting to local'",
         "env": "cp .env.${GCLOUD_PROJECT:-example} .env",
         "//stage": "echo 'switch to the dev project, deploy, relying on Firebase's predeploy hook to run the build script above before release'",
-        "stage": "firebase use dev && firebase deploy",
+        "stage": "firebase use dev && cp .env.bookish-dev-21ac3 .env && firebase deploy",
         "//release": "echo 'switch to the prod project, deploy, relying on Firebase's predeploy hook to run the build script above before release'",
-        "release": "firebase use prod && firebase deploy",
+        "release": "firebase use prod && cp .env.bookish-prod .env && firebase deploy",
         "//merge": "merge dev into main, push to remote",
         "merge": "git checkout main && git merge dev && git push origin main && git checkout dev"
     },