bookish-press 0.5.62 → 0.5.73

package/dist/components/page/Reference.svelte

@@ -231,7 +231,7 @@ function move(field, direction) {
         </tr>
     </Table>
 {:else}
-    <!-- If not editable, just render the reference. -->
+    <!-- Otherwise, just render the reference. -->
     <p class="reference">
         {#if reference.authors}{reference.authors}{:else}<em>Authors</em>{/if}
         {#if reference.year}({reference.year}){:else}<em>Year</em>{/if}. {#if reference.url === null || reference.url.length === 0}{#if reference.title}{reference.title}{:else}<em
@@ -247,26 +247,31 @@ function move(field, direction) {
     </p>
 {/if}
 {#if edit && editable && !reference.short}
-    <ConfirmButton
-        tooltip="delete reference {reference.title}"
-        confirm="delete reference"
-        command={() =>
-            $edition
-                ? edition.set($edition.withoutReference(reference.citationID))
-                : undefined}>⨉</ConfirmButton
-    >
-    <Button
-        tooltip="stop editing reference"
-        command={() => (editing ? stopEditing() : startEditing())}
-        >{editing ? 'done' : 'edit'}</Button
-    >
+    <div class="controls">
+        {#if editable}<Note>{reference.citationID}</Note>{/if}
+        <ConfirmButton
+            tooltip="delete reference {reference.title}"
+            confirm="delete reference"
+            command={() =>
+                $edition
+                    ? edition.set(
+                          $edition.withoutReference(reference.citationID)
+                      )
+                    : undefined}>⨉</ConfirmButton
+        >
+        <Button
+            tooltip="stop editing reference"
+            command={() => (editing ? stopEditing() : startEditing())}
+            >{editing ? 'done' : 'edit'}</Button
+        >
+    </div>
 {/if}
 
 <style>
     .reference {
         line-height: var(--bookish-paragraph-line-height-tight);
         margin-top: 0;
-        margin-bottom: var(--bookish-block-padding);
+        margin-top: var(--bookish-block-padding);
     }
 
     p {
@@ -289,4 +294,8 @@ function move(field, direction) {
     td {
         line-height: 1;
     }
+
+    .controls {
+        margin-top: calc(var(--bookish-block-padding) / 2);
+    }
 </style>

package/dist/components/page/References.svelte

@@ -36,9 +36,13 @@ if (references !== null) {
             <Outline
                 slot="outline"
                 previous={$edition.getPreviousChapterID(
-                    ChapterIDs.ReferencesID
+                    ChapterIDs.ReferencesID,
+                    editable
+                )}
+                next={$edition.getNextChapterID(
+                    ChapterIDs.ReferencesID,
+                    editable
                 )}
-                next={$edition.getNextChapterID(ChapterIDs.ReferencesID)}
             />
         </Header>
         {#if editable}<BulkReferenceEditor />{/if}

package/dist/components/page/Search.svelte

@@ -5,7 +5,6 @@ import Link from '../Link.svelte';
 import Chapter from '../../models/book/Chapter';
 import ChapterIDs from '../../models/book/ChapterID';
 import { getBase, getEdition, isEditionEditable } from './Contexts';
-import TextInput from '../app/TextInput.svelte';
 import ChapterTitle from './ChapterTitle.svelte';
 import ChapterNumber from './ChapterNumber.svelte';
 import PageHeader from './PageHeader.svelte';
@@ -76,8 +75,11 @@ $: {
         >
             <Outline
                 slot="outline"
-                previous={$edition.getPreviousChapterID(ChapterIDs.SearchID)}
-                next={$edition.getNextChapterID(ChapterIDs.SearchID)}
+                previous={$edition.getPreviousChapterID(
+                    ChapterIDs.SearchID,
+                    false
+                )}
+                next={$edition.getNextChapterID(ChapterIDs.SearchID, false)}
             />
         </Header>
 

package/dist/components/page/SubdomainEditor.svelte

@@ -1,6 +1,6 @@
 <script>import TextEditor from '../editor/TextEditor.svelte';
 import { isSubdomainAvailable } from '../../models/CRUD';
-import Note from '../editor/Note.svelte';
+import { getSubdomain } from '../../util/getSubdomain';
 import { getBook } from './Contexts';
 import Muted from './Muted.svelte';
 let book = getBook();
@@ -22,9 +22,10 @@ const invalidNames = [
             save={// Save the new domain
             async (domain) => {
                 if ($book) {
-                    const available = await isSubdomainAvailable(domain, $book);
+                    const available = await isSubdomainAvailable(domain);
                     if (available) book.set($book.withSubdomain(domain));
-                    else throw Error("Domain isn't available");
+                    else if ($book.getSubdomain() !== domain)
+                        throw Error("Domain isn't available");
                 }
             }}
             placeholder="book name"

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';
@@ -95,7 +94,7 @@ onMount(() => {
             <Outline
                 slot="outline"
                 previous={null}
-                next={$edition.getNextChapterID('')}
+                next={$edition.getNextChapterID('', editable)}
             />
             <div slot="after">
                 <Authors
@@ -126,7 +125,7 @@ onMount(() => {
         <Description />
 
         <Instructions {editable}>
-            This will appear on the <Link to="{$base}/read">book browsing</Link>
+            This will appear on the <Link to="/read">book browsing</Link>
             page and in your table of contents. Write an informative description
             of what your book is about.
         </Instructions>
@@ -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}
@@ -192,7 +195,7 @@ onMount(() => {
                             You can edit this chapter.
                         {/if}
                     </span>
-                    <span slot="etc">
+                    <span class="etc" slot="etc">
                         <Muted>
                             {#if editable}
                                 <Toggle
@@ -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}>
@@ -310,3 +335,9 @@ onMount(() => {
         {/if}
     </Page>
 {/if}
+
+<style>
+    .etc {
+        white-space: nowrap;
+    }
+</style>

package/dist/components/page/TableOfContentsRow.svelte

@@ -82,7 +82,7 @@ $: chapterURL =
                             ? edition.set(
                                   $edition.withoutChapter(chapter.getID())
                               )
-                            : undefined}>- chapter</ConfirmButton
+                            : undefined}>⨉</ConfirmButton
                 >
             {/if}
         </td>
@@ -102,6 +102,8 @@ $: chapterURL =
         display: flex;
         flex-direction: row;
         flex-wrap: nowrap;
+        justify-content: end;
+        margin-inline-end: var(--app-chrome-padding);
         gap: var(--app-chrome-padding);
     }
 

package/dist/models/CRUD.d.ts

@@ -20,9 +20,8 @@ export declare function updateLock(edition: Edition, uid: string, content: strin
  * returns a map of DocumentReferences for new chapters so they can be persisted client side.
  */
 export declare function updateEdition(book: Book, previousEdition: Edition | undefined, newEdition: Edition): Promise<Map<string, DocumentReference>>;
-export declare function deleteChapterText(ref: DocumentReference): Promise<void>;
 export declare function updateBook(book: Book): Promise<void>;
-export declare function isSubdomainAvailable(subdomain: string, book: Book): Promise<boolean>;
+export declare function isSubdomainAvailable(subdomain: string): Promise<boolean>;
 export declare function getBookIDWithSubdomain(subdomain: string): Promise<string | null>;
 export declare function publish(edition: Edition): Promise<string | {
     url: string;

package/dist/models/CRUD.js

@@ -62,7 +62,8 @@ export function listenToChapters(bookID, editionID, react) {
         const chapters = [];
         // For each chapter in the book, if the doc exists and it's not a pending local write, send updated chapters to the front end.
         docs.forEach((doc) => {
-            if (doc.exists() && !doc.metadata.hasPendingWrites)
+            // We propagate pending writes to cycle back local edits to the client.
+            if (doc.exists())
                 // If the chapter text is somehow null, set it to an empty string.
                 // This accounts for previous defects that could lead to null.
                 chapters.push([doc.ref, doc.data().text ?? '']);
@@ -112,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.
@@ -235,15 +236,12 @@ export async function updateEdition(book, previousEdition, newEdition) {
     await setDoc(doc(db, editionPath(newEdition.bookRef.id, editionRef.id)), newEdition.toObject());
     return newChapterRefs;
 }
-export async function deleteChapterText(ref) {
-    deleteDoc(ref);
-}
 export async function updateBook(book) {
     if (!db)
         throw Error("Can't update book, not connected to Firebase.");
     await setDoc(doc(db, 'books', book.getID()), book.toJSON());
 }
-export async function isSubdomainAvailable(subdomain, book) {
+export async function isSubdomainAvailable(subdomain) {
     if (!db)
         throw Error('Not connected to Firebase.');
     return (await getBookIDWithSubdomain(subdomain)) === null;

package/dist/models/book/BookMedia.js

@@ -85,17 +85,22 @@ export default class BookMedia {
         // The canonical path format for Bookish images in the store is image/{bookid}/{imageid}
         // where {bookid} is the Firestore document ID of the book being edited and {imageid} is just a random id.
         const imageRef = ref(storage, `${this.getImagePath()}/${imageName}`);
-        const thumbnailRef = ref(storage, `${this.getImagePath()}/thumbnails/${imageName}`);
         uploadBytes(imageRef, file)
             .then((snapshot) => {
             getDownloadURL(snapshot.ref)
                 // After we get the download URL for the uploaded image,
                 // try to get the thumbnail URL for the resized image on the server.
                 .then((url) => finishedHandler(this.stripTokenFromURL(url), this.makeThumbnailURL(this.stripTokenFromURL(url))))
-                .catch(() => errorHandler('Unable to get image URL.'));
+                .catch((error) => {
+                console.error(error);
+                errorHandler('Unable to get image URL.');
+            });
         })
             .then(() => this.cacheImages())
-            .catch(() => errorHandler('Unable to upload image.'));
+            .catch((error) => {
+            console.error(error);
+            errorHandler('Unable to upload image.');
+        });
         // This seems to be broken in Firebase right now. Switched above to a no-feedback approach.
         // const uploadTask = uploadBytesResumable(imageRef, file);
         // uploadTask.on("state_changed",

package/dist/models/book/Chapter.js

@@ -156,9 +156,8 @@ export default class Chapter {
     }
     getWordCount(edition) {
         if (this._wordCount === undefined)
-            this._wordCount = this.getAST(edition)
-                ?.toText()
-                .split(/\s+/).length;
+            this._wordCount = this.getAST(edition)?.toText().split(/\s+/)
+                .length;
         return this._wordCount;
     }
     // Utility function

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

@@ -27,9 +27,13 @@ export type EditionSpecification = {
     glossary: Record<string, Definition>;
     theme: Theme | null;
     base: string | null;
+    /** People who have edit access to this edition */
     uids: string[];
+    /** 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;
@@ -53,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;
@@ -78,7 +83,7 @@ export default class Edition {
     getChapterPosition(chapterID: string): number | undefined;
     getChapterCount(): number;
     withChapters(chapters: Chapter[]): Edition;
-    withChapterText(text: [DocumentReference, string][]): Edition;
+    withChapterText(textByID: Map<string, string>): Edition;
     withRevisedChapter(previous: Chapter, edited: Chapter): Edition;
     withoutRefs(): Edition;
     withIncrementedEditionNumber(): Edition;
@@ -123,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;
@@ -130,8 +136,8 @@ export default class Edition {
     getChapterSection(chapterID: string): string | undefined;
     getFootnoteSymbol(number: number): string;
     getBookIndex(): Record<string, Set<string>>;
-    getNextChapterID(chapterID: string): string | null;
-    getPreviousChapterID(chapterID: string): string | null;
+    getNextChapterID(chapterID: string, editable: boolean): string | null;
+    getPreviousChapterID(chapterID: string, editable: boolean): string | null;
     getEmbeds(): {
         embed: EmbedNode;
         chapterID: string | undefined;

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,22 +175,17 @@ 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(text) {
-        // No need to make a new edition if no chapter was changed.
-        let modified = false;
+    withChapterText(textByID) {
         const newChapters = this.chapters.map((chapter) => {
-            if (chapter.ref === undefined)
+            if (chapter.ref === undefined) {
                 return chapter;
-            const match = text.find(([ref, text]) => chapter.ref !== undefined &&
-                chapter.ref.id === ref.id &&
-                chapter.text !== text);
-            if (match)
-                modified = true;
-            return match ? chapter.withText(match[1]) : chapter;
+            }
+            const text = textByID.get(chapter.ref.id);
+            return text === undefined ? chapter : chapter.withText(text);
         });
-        return modified ? this.withChapters(newChapters) : this;
+        return this.withChapters(newChapters);
     }
     withRevisedChapter(previous, edited) {
         const index = this.chapters.indexOf(previous);
@@ -203,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
@@ -235,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;
@@ -252,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);
@@ -293,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);
@@ -330,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)
@@ -353,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]);
@@ -376,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;
@@ -387,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);
@@ -410,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
@@ -482,7 +483,7 @@ export default class Edition {
         return bookIndex;
     }
     // Given the current chapter, find the available chapter after it.
-    getNextChapterID(chapterID) {
+    getNextChapterID(chapterID, editable) {
         // Handle back matter chapters.
         switch (chapterID) {
             case ChapterIDs.ReferencesID:
@@ -508,7 +509,7 @@ export default class Edition {
                     if (chapter.getID() === chapterID)
                         after = true;
                     // If we're after the given chapter and it's not forthcoming.
-                    else if (after && !chapter.isForthcoming())
+                    else if (after && (!chapter.isForthcoming() || editable))
                         return chapter.getID();
                 }
                 // If the given ID was the last chapter, go to the next back matter chapter.
@@ -524,7 +525,7 @@ export default class Edition {
         }
     }
     // Given a chapter id, find the available chapter before it.
-    getPreviousChapterID(chapterID) {
+    getPreviousChapterID(chapterID, editable) {
         switch (chapterID) {
             // Handle back matter chapters.
             case ChapterIDs.ReferencesID:
@@ -556,7 +557,7 @@ export default class Edition {
                     if (chapter.getID() === chapterID)
                         before = true;
                     // If we're before the given chapter and it's not forthcoming.
-                    else if (before && !chapter.isForthcoming())
+                    else if (before && (!chapter.isForthcoming() || editable))
                         return chapter.getID();
                 }
                 // If the given ID was the last chapter, go to the next back matter chapter.