bookish-press 0.4.31 → 0.4.33

package/components/chapter/ChapterBody.svelte

@@ -39,21 +39,6 @@ $: blocks = node.getBlocks();
         min-width: 100%;
     }
 
-    /* This implements a drop cap in the first letter of the first text in the first format of the first paragraph of a chapter (but only chapters). */
-    :global(
-            .chapter-content
-                .bookish-chapter-body
-                p:first-of-type:not(.placeholder)::first-letter
-        ) {
-        padding: 0 0.25rem;
-        margin: 0 0.25rem 0 0;
-        font-size: 4rem;
-        font-weight: 700;
-        float: left;
-        line-height: 1;
-        color: var(--bookish-paragraph-color);
-    }
-
     :global(.bookish-content-highlight) {
         position: relative;
     }

package/components/chapter/Link.svelte

@@ -35,20 +35,22 @@ function isInvalidChapterLink() {
     <a href={url} target="_blank" rel="noreferrer"><Text node={content} /></a>
     <!-- If's a chapter link with a label -->
 {:else if url.indexOf(':') >= 0}
-    <!-- If the chapter isn't specified, set to the current chapter's id. -->
     {#if url.split(':')[0] === ''}
+        <!-- If the chapter isn't specified, assume this chapter. -->
         <a href={'#' + url.split(':')[1]}><Text node={content} /></a>
     {:else}
-        <a href={'/' + url.split(':')[0] + '#' + url.split(':')[1]}
+        <!-- If it is specified, include the base relative chapter ID and the label -->
+        <a href={`${$base}${url.split(':')[0]}#${url.split(':')[1]}`}
             ><Text node={content} /></a
         >
     {/if}
-    <!-- If this is internal link, make a route link to the chapter. -->
 {:else}
-    <a href={$base + '/' + url}><Text node={content} /></a>
+    <!-- If this is internal link, make a route link to the chapter. -->
+    <a href={`${$base}${url}`}><Text node={content} /></a>
 {/if}
 
 <style>
+    a,
     .bookish-editor-link {
         color: var(--bookish-link-color);
         font-weight: var(--bookish-link-font-weight);

package/components/chapter/List.svelte

@@ -19,6 +19,11 @@ export let node;
 </svelte:element>
 
 <style>
+    ol,
+    ul {
+        line-height: var(--bookish-paragraph-line-height-tight);
+    }
+
     ol {
         list-style: none;
         counter-reset: item;

package/components/chapter/Paragraph.svelte

@@ -56,6 +56,17 @@ $: classes =
         min-height: var(--bookish-paragraph-line-height);
     }
 
+    /* This implements a drop cap in the first letter of the first text in the first format of the first paragraph of a chapter (but only chapters). */
+    :global(.chapter-content) p:first-of-type:not(.placeholder)::first-letter {
+        padding: 0 0.25rem;
+        margin: 0 0.25rem 0 0;
+        font-size: 4rem;
+        font-weight: 700;
+        float: left;
+        line-height: 1;
+        color: var(--bookish-paragraph-color);
+    }
+
     .placeholder {
         color: var(--bookish-muted-color);
         font-style: italic;

package/components/page/Edition.svelte

@@ -12,7 +12,7 @@ export let edition;
 // For example, when the book is hosted alone, all routes might start with the bare root "/",
 // but when the book is being viewed or edited in the Bookish app, it needs a prefix for the
 // route in the app.
-export let base = '/';
+export let base = '';
 // When the base changes, update the context.
 let baseStore = writable(base);
 $: setContext(BASE, baseStore);

package/components/page/Reference.svelte

@@ -264,7 +264,7 @@ function move(field, direction) {
 
 <style>
     .reference {
-        line-height: var(--bookish-paragraph-line-height);
+        line-height: var(--bookish-paragraph-line-height-tight);
         margin-top: 0;
         margin-bottom: var(--bookish-header-spacing);
     }

package/index.d.ts

@@ -11,3 +11,4 @@ export { default as Feedback } from "./components/app/Feedback.svelte";
 export { default as Loading } from "./components/page/Loading.svelte";
 export { default as EditionModel } from "./models/book/Edition";
 export { EDITION } from "./components/page/Contexts";
+export { default as Schema } from "./models/book/Schema";

package/index.js

@@ -11,4 +11,4 @@ export { default as Feedback } from './components/app/Feedback.svelte';
 export { default as Loading } from './components/page/Loading.svelte';
 export { default as EditionModel } from './models/book/Edition';
 export { EDITION } from './components/page/Contexts';
-export { Schema } from './models/book/Schema';
+export { default as Schema } from './models/book/Schema';

package/models/CRUD.js

@@ -108,7 +108,7 @@ export async function createBook(userID) {
     // Create a model to store it.
     let book = Book.fromJSON(bookRef, 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, {}).withNewChapter();
+    let newEdition = new Edition(bookRef, undefined, [], 'Untitled', [], 1, '', null, {}, '', [], 'All rights reserved.', '', [], {}, {}, {}, {}, 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/models/book/Edition.d.ts

@@ -26,6 +26,7 @@ export type EditionSpecification = {
     symbols: Record<string, string>;
     glossary: Record<string, Definition>;
     theme: Theme | null;
+    base: string | null;
     uids: string[];
     chapteruids: string[];
     active: Record<string, string>;
@@ -50,8 +51,9 @@ export default class Edition {
     readonly symbols: Record<string, string>;
     readonly glossary: Record<string, Definition>;
     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, 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>);
     static fromJSON(editionRef: DocumentReference | undefined, spec: EditionSpecification): Edition;
     static parseReference(citationID: string, ref: string | string[], edition: Edition, short?: boolean): FormatNode | Reference;
     toObject(): EditionSpecification;

package/models/book/Edition.js

@@ -23,10 +23,11 @@ export default class Edition {
     symbols;
     glossary;
     theme;
+    base;
     active;
     // 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, active) {
+    constructor(bookRef, editionRef, uids, title, authors, number, summary, published, images, description, chapters, license, acknowledgements, tags, sources, references, symbols, glossary, theme, base, active) {
         this.bookRef = bookRef;
         this.editionRef = editionRef;
         this.uids = uids;
@@ -52,12 +53,13 @@ export default class Edition {
         this.symbols = Object.assign({}, symbols);
         this.glossary = Object.assign({}, glossary);
         this.theme = theme;
+        this.base = base;
         this.active = active;
     }
     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.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);
     }
     static parseReference(citationID, ref, edition, short = false) {
         if (typeof ref === 'string')
@@ -97,6 +99,7 @@ export default class Edition {
             symbols: Object.assign({}, this.symbols),
             glossary: Object.assign({}, this.glossary),
             theme: this.theme,
+            base: this.base,
             uids: this.uids.slice(),
             chapteruids: this.getChapterUIDS(),
             active: this.active,
@@ -113,37 +116,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.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);
     }
     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.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);
     }
     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.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);
     }
     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.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);
     }
     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.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);
     }
     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.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);
     }
     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.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);
     }
     getChapters() {
         return this.chapters.slice();
@@ -169,7 +172,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.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);
     }
     withChapterText(text) {
         return this.withChapters(this.chapters.map((chapter) => {
@@ -196,7 +199,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.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);
     }
     withNewChapter() {
         // Synthesize a chapter ID placeholder that doesn't overlap with existing chapter names
@@ -225,7 +228,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.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);
     }
     getSymbols() {
         return this.symbols;
@@ -242,7 +245,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.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);
     }
     withNewReferences(references) {
         const newReferences = Object.assign({}, this.references);
@@ -283,7 +286,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.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);
     }
     withDefinition(id, phrase, definition, synonyms) {
         const newGlossary = Object.assign({}, this.glossary);
@@ -320,7 +323,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.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);
     }
     withThemeValue(group, name, value) {
         if (this.theme === null)
@@ -338,7 +341,7 @@ export default class Edition {
         return [...this.authors];
     }
     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.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);
     }
     withAuthor(name) {
         return this.withAuthors([...this.authors, name]);
@@ -361,7 +364,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.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);
     }
     hasImage(id) {
         return this.images[id] !== null;
@@ -372,7 +375,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.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);
     }
     isEditor(uid) {
         return this.uids.includes(uid);
@@ -395,7 +398,7 @@ 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, 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);
     }
     getBookReadingTime() {
         return this.chapters

package/models/book/Schema.d.ts

@@ -166,6 +166,9 @@ declare const Schema: {
         theme: {
             type: string[];
         };
+        base: {
+            type: string[];
+        };
     };
 };
 export default Schema;

package/models/book/Schema.js

@@ -107,6 +107,9 @@ const Schema = {
         theme: {
             type: ['object', 'null'],
         },
+        base: {
+            type: ['string'],
+        },
     },
 };
 export default Schema;

package/models/book/Theme.js

@@ -382,7 +382,7 @@ export const SketchyTheme = {
     // Spacing
     spacing: {
         paragraphLineHeight: '2.4em',
-        paragraphLineHeightTight: '1.4em',
+        paragraphLineHeightTight: '1.8em',
         headerLineHeight: '1.3em',
         paragraphSpacing: '1.8rem',
         headerSpacing: '2rem',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bookish-press",
   "private": false,
-  "version": "0.4.31",
+  "version": "0.4.33",
   "type": "module",
   "description": "A platform for reading and writing readable, accessible, beautiful online books.",
   "license": "MIT",