bookish-press 0.7.0 → 0.7.1

package/dist/components/chapter/Citations.svelte

@@ -38,7 +38,9 @@ afterUpdate(() => $chapter?.layoutMarginals());
             ><Marginal
                 {node}
                 id={'citation-' + citations.join('-')}
-                label="citations"
+                label="reference {citations
+                    .map((c) => $root.getCitationNumber(c))
+                    .join(', ')}"
                 ><svelte:fragment slot="interactor">
                     {#each citations as citationID, index}{@const citationNumber =
                             $root.getCitationNumber(
@@ -61,6 +63,7 @@ afterUpdate(() => $chapter?.layoutMarginals());
                         {@const ref = $edition?.getReference(citationID)}
                         {#if citationNumber && ref && $edition}<span
                                 class="bookish-reference"
+                                aria-hidden="true"
                             >
                                 <sup class="bookish-citation-symbol"
                                     >{citationNumber}</sup

package/dist/components/editor/BookishEditor.svelte

@@ -41,6 +41,7 @@ let undoPosition = -1;
 let clipboard = undefined;
 let ignoredInput = false;
 let activeEditor = getCaret();
+let accent = undefined;
 let editedNode;
 $: {
     // Note: when the text changes externally, the caret will be lost. We either have
@@ -462,8 +463,16 @@ function getCaretContext() {
         clipboard: clipboard,
         handleCopy: handleCopy,
         handlePaste: handlePaste,
+        setAccent,
+        getAccent,
     };
 }
+function setAccent(newAccent) {
+    accent = newAccent;
+}
+function getAccent() {
+    return accent;
+}
 function getUtilities() {
     return {
         getCaretOnLine: getCaretOnLine,
@@ -506,7 +515,7 @@ function handleKey(event, press = false) {
                 (command.active instanceof Function &&
                     command.active.call(undefined, context, event.key)))) {
             // See if the command is handled
-            if (executeCommand(command, event.key)) {
+            if (executeCommand(command, event.key, event.code)) {
                 event.preventDefault();
                 event.stopPropagation();
                 return true;
@@ -560,14 +569,17 @@ function handleKey(event, press = false) {
         }
     }
 }
-function executeCommand(command, key) {
+function executeCommand(command, key, code) {
     // Assume we process it, then flip it if we don't.
     ignoredInput = false;
     const context = getCaretContext();
     if (context && caretRange) {
-        const results = command.handler.call(undefined, context, getUtilities(), key);
+        const results = command.handler.call(undefined, context, getUtilities(), key, code);
         // If the command invoked produced a new range
-        if (results !== undefined) {
+        if (results === true) {
+            return true;
+        }
+        else if (results !== undefined) {
             const { root, range } = results;
             const newRange = { start: range.start, end: range.end };
             if (root === editedNode && command.mutates)
@@ -845,6 +857,7 @@ setContext('claimeditor', claimActiveEditor);
             italic={isItalic}
             disabled={!editorFocused || locked}
             {locked}
+            {accent}
         />
     {/if}
 </div>

package/dist/components/editor/CaretContext.d.ts

@@ -17,6 +17,8 @@ import type Node from '../../models/chapter/Node';
 export type PasteContent = {
     plain: string | undefined;
 };
+export type Accent = '`' | "'" | '^' | '~' | ':';
+export declare const Accents: Record<string, string>;
 type CaretContext = {
     chapter: boolean;
     range: CaretRange;
@@ -46,5 +48,7 @@ type CaretContext = {
     clipboard: Clipboard;
     handleCopy: (node: Node) => void;
     handlePaste: (context: CaretContext, text: PasteContent | Node, save: boolean) => Edit;
+    setAccent: (accent: Accent | undefined) => void;
+    getAccent: () => Accent | undefined;
 };
 export type { CaretContext as default };

package/dist/components/editor/CaretContext.js

@@ -1 +1,52 @@
-export {};
+export const Accents = {
+    '`a': 'à',
+    '`A': 'À',
+    '`e': 'è',
+    '`E': 'È',
+    '`i': 'ì',
+    '`I': 'Ì',
+    '`o': 'ò',
+    '`O': 'Ò',
+    '`u': 'ù',
+    '`U': 'Ù',
+    "'a": 'á',
+    "'A": 'Á',
+    "'e": 'é',
+    "'E": 'É',
+    "'i": 'í',
+    "'I": 'Í',
+    "'o": 'ó',
+    "'O": 'Ó',
+    "'u": 'ú',
+    "'U": 'Ú',
+    '^a': 'â',
+    '^A': 'Â',
+    '^e': 'ê',
+    '^E': 'Ê',
+    '^i': 'î',
+    '^I': 'Î',
+    '^o': 'ô',
+    '^O': 'Ô',
+    '^u': 'û',
+    '^U': 'Û',
+    '~a': 'ã',
+    '~A': 'Ã',
+    '~e': 'ẽ',
+    '~E': 'Ẽ',
+    '~i': 'ĩ',
+    '~I': 'Ĩ',
+    '~o': 'õ',
+    '~O': 'Õ',
+    '~u': 'ũ',
+    '~U': 'Ũ',
+    ':a': 'ä',
+    ':A': 'Ä',
+    ':e': 'ë',
+    ':E': 'Ë',
+    ':i': 'ï',
+    ':I': 'Ï',
+    ':o': 'ö',
+    ':O': 'Ö',
+    ':u': 'ü',
+    ':U': 'Ü',
+};

package/dist/components/editor/CaretState.d.ts

@@ -13,7 +13,7 @@ type CaretState = {
     context: CaretContext | undefined;
     edit: (previous: Node, edited: Node) => void;
     setCaret: (range: CaretRange) => void;
-    executor: (command: Command, key: string) => void;
+    executor: (command: Command, key: string, code: string) => void;
     focused: boolean;
 };
 export type { CaretState as default };

package/dist/components/editor/CaretView.svelte

@@ -9,6 +9,7 @@ export let disabled;
 export let ignored;
 export let blink;
 export let locked;
+export let accent;
 let element;
 let headerHeight = 0;
 // When the caret updates position, scroll the element into view after the render is complete.
@@ -38,7 +39,9 @@ afterUpdate(() => {
     style:height="{height}px"
     style:scroll-margin-top="{headerHeight}px"
     bind:this={element}
-    >{#if locked}🔒{/if}</div
+    >{#if locked}🔒{/if}{#if accent}
+        <span class="accent">{accent}</span>
+    {/if}</div
 >
 
 <style>
@@ -84,4 +87,12 @@ afterUpdate(() => {
         outline-width: 1px;
         outline-color: var(--bookish-link-color);
     }
+
+    .accent {
+        display: inline-block;
+        position: absolute;
+        top: -0.5em;
+        color: var(--app-muted-color);
+        font-size: 200%;
+    }
 </style>

package/dist/components/editor/CaretView.svelte.d.ts

@@ -1,4 +1,5 @@
 import { SvelteComponent } from "svelte";
+import type { Accent } from './CaretContext';
 declare const __propDef: {
     props: {
         left: number;
@@ -11,6 +12,7 @@ declare const __propDef: {
         ignored: boolean;
         blink: boolean;
         locked: boolean;
+        accent: Accent | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/dist/components/editor/Command.d.ts

@@ -15,6 +15,6 @@ type Command = {
     mutates: boolean;
     visible: boolean | ((context: CaretContext) => boolean);
     active: boolean | ((context: CaretContext, key?: string) => boolean);
-    handler: (context: CaretContext, utilities: CaretUtilities, key: string) => Edit;
+    handler: (context: CaretContext, utilities: CaretUtilities, key: string, code: string) => Edit | true;
 };
 export type { Command as default };

package/dist/components/editor/Commands.js

@@ -54,6 +54,7 @@ import SuperscriptIcon from './icons/super.svg?raw';
 import TableIcon from './icons/table.svg?raw';
 import UndoIcon from './icons/undo.svg?raw';
 import UnindentIcon from './icons/unindent.svg?raw';
+import { Accents } from './CaretContext';
 import LineBreakNode from '../../models/chapter/LineBreakNode';
 /**
  * Icons:
@@ -109,6 +110,25 @@ function rootWithNode(context, original, replacement, caret) {
             : context.range,
     };
 }
+function createAccentCommand(accent, code, control, alt, shift, description) {
+    return {
+        icon: accent,
+        description: description,
+        category: 'text',
+        mutates: false,
+        control,
+        alt,
+        shift,
+        key: undefined,
+        code,
+        visible: false,
+        active: true,
+        handler: (context) => {
+            context.setAccent(accent);
+            return true;
+        },
+    };
+}
 // An ordered list of command specifications for keyboard and mouse input.
 const commands = [
     {
@@ -695,6 +715,8 @@ const commands = [
         handler: (context) => {
             if (context.root === undefined)
                 return;
+            // Reset the accent.
+            context.setAccent(undefined);
             if (context.isSelection) {
                 const edit = context.root.withRangeFormatted(context.range, undefined);
                 if (edit === undefined)
@@ -1505,6 +1527,26 @@ const commands = [
             return { root: context.root, range: context.range };
         },
     },
+    // Windows grave
+    createAccentCommand('`', 'Backquote', true, false, false, 'insert a grave accent'),
+    // Mac grave
+    createAccentCommand('`', 'Backquote', false, true, false, 'insert a grave accent'),
+    // Windows apostrophe
+    createAccentCommand("'", 'Quote', true, false, false, 'insert an apostrophe accent'),
+    // Mac apostrophe
+    createAccentCommand('`', 'KeyE', false, true, false, 'insert an apostrophe accent'),
+    // Windows caret
+    createAccentCommand('^', 'Digit6', true, false, true, 'insert a caret accent'),
+    // Mac caret
+    createAccentCommand('^', 'KeyI', false, true, false, 'insert a caret accent'),
+    // Windows tilde
+    createAccentCommand('~', 'Backquote', true, false, true, 'insert a tilde accent'),
+    // Mac tilde
+    createAccentCommand('~', 'KeyN', false, true, false, 'insert a tilde accent'),
+    // Windows umlaut
+    createAccentCommand(':', 'Semicolon', true, false, true, 'insert a tilde accent'),
+    // Mac umlaut
+    createAccentCommand(':', 'KeyU', false, true, false, 'insert a grave accent'),
     {
         icon: 'insert symbol',
         description: 'insert character',
@@ -1521,6 +1563,16 @@ const commands = [
             utilities;
             const range = context.range;
             if (key.length === 1) {
+                // See if there's an accent.
+                const accent = context.getAccent();
+                if (accent !== undefined) {
+                    // Reset the accent.
+                    context.setAccent(undefined);
+                    const match = Accents[accent + key];
+                    if (match) {
+                        key = match;
+                    }
+                }
                 // Insert at the start.
                 let sortedRange = range.start.node.sortRange(range);
                 let insertionPoint = sortedRange.start;

package/dist/components/editor/Toolbar.svelte

@@ -186,12 +186,7 @@ function handleKeyPress(event) {
                                     ' ' +
                                     getShortcutDescription(command)}
                                 tabIndex="0"
-                                command={() =>
-                                    caret?.executor.call(
-                                        undefined,
-                                        command,
-                                        '',
-                                    )}
+                                command={() => caret?.executor(command, '', '')}
                             >
                                 <Icon icon={command.icon} />
                             </Button>

package/dist/components/page/DefinitionView.svelte

@@ -74,7 +74,7 @@ $: syns = definition.synonyms || [];
                                   $edition.withEditedDefinition(id, {
                                       phrase: text,
                                       definition: definition.definition,
-                                      synonyms: definition.synonyms,
+                                      synonyms: definition.synonyms ?? [],
                                   }),
                               )
                             : undefined}
@@ -106,7 +106,7 @@ $: syns = definition.synonyms || [];
                                   $edition.withEditedDefinition(id, {
                                       phrase: definition.phrase,
                                       definition: node.toBookdown(),
-                                      synonyms: definition.synonyms,
+                                      synonyms: definition.synonyms ?? [],
                                   }),
                               )
                             : undefined}

package/dist/components/page/EditionLoader.svelte

@@ -97,7 +97,7 @@ onDestroy(() => {
 </script>
 
 {#if $book === undefined || error}
-    <Feedback error>Unable to load edition.</Feedback>
+    <Feedback error>Unable to load edition: {error}</Feedback>
 {:else if $edition === undefined}
     <Loading />
 {:else}

package/dist/models/CRUD.js

@@ -138,18 +138,22 @@ export async function createNewEdition(book) {
     if (latestEditionID === undefined)
         throw 'No editions on this book';
     const latestDraftDoc = await getDoc(doc(db, 'books', book.id, 'editions', latestEditionID));
-    const latestDraft = latestDraftDoc.exists()
+    const latestDraftData = latestDraftDoc.exists()
         ? latestDraftDoc.data()
         : undefined;
-    if (latestDraft === undefined)
+    if (latestDraftData === undefined)
         return book;
+    const latestDraft = Edition.fromJSON(latestDraftDoc.ref, latestDraftData);
     // Make a copy without chapter and edition refs, because we want to create new ones,
     // and with an incremented edition number.
-    const newEdition = latestDraft.withoutRefs();
+    let newEdition = latestDraft.withoutRefs();
     // Create a copy of the existing draft as a new edition.
-    const newEditionRef = await addDoc(collection(db, 'editions'), newEdition.toObject());
+    const newEditionRef = await addDoc(collection(db, 'books', book.id, 'editions'), newEdition.toObject());
+    newEdition = newEdition
+        .withRef(newEditionRef)
+        .withIncrementedEditionNumber();
     // Create the edition, creating chapter text as necessary, using the edition sync function.
-    updateEdition(book, undefined, newEdition.withRef(newEditionRef));
+    updateEdition(book, undefined, newEdition);
     // Put the new edition in the book.
     book = book.withEditions([
         newEdition.getInfo(),

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "bookish-press",
     "private": false,
-    "version": "0.7.0",
+    "version": "0.7.1",
     "type": "module",
     "description": "A platform for reading and writing readable, accessible, beautiful online books.",
     "license": "MIT",
@@ -51,11 +51,12 @@
         "ajv": "^8",
         "ajv-formats": "^3",
         "firebase": "^11",
-        "firebase-admin": "^13.2.0",
-        "firebase-functions": "^6.3.2",
+        "firebase-admin": "^12.7.0",
+        "firebase-functions": "^6",
         "prismjs": "^1.29",
         "smoothscroll-polyfill": "^0.4",
-        "svelte": "^4"
+        "svelte": "^4",
+        "uuid": "^11"
     },
     "engines": {
         "node": "20"