@ca-plant-list/ca-plant-list 0.4.33 → 0.4.35

package/data/text/Allium-obtusum-var-obtusum.md

@@ -0,0 +1 @@
+Nearly prostrate.

package/data/text/Allium-validum.md

@@ -0,0 +1 @@
+Stamens protruding beyond petals.

package/data/text/Amelanchier-alnifolia-var-pumila.md

@@ -0,0 +1 @@
+Upper leaf without hairs. Flower with 5 [styles](./g/style.html).

package/data/text/Amelanchier-utahensis.md

@@ -0,0 +1 @@
+Upper leaf with hairs. Flower with 2 to 4 [styles](./g/style.html).

package/data/text/Angelica-breweri.md

@@ -0,0 +1 @@
+Umbels hairless or sparsely hairy. Secondary umbels open, not spherical.

package/data/text/Angelica-capitellata.md

@@ -0,0 +1 @@
+Umbels covered with hairs. Secondary umbels spherical.

package/data/text/Castilleja-applegatei-subsp-pallida.md

@@ -0,0 +1 @@
+In dry areas. Leaf usually with 3 lobes. Generally shorther than _C. miniata_.

package/data/text/Castilleja-miniata-subsp-miniata.md

@@ -0,0 +1 @@
+In wet areas. Usually 50 cm or taller. Leaves not toothed or lobed.

package/data/text/Ceanothus-cordulatus.md

@@ -0,0 +1 @@
+Twigs grayish, stiff and thorn-like.

package/data/text/Ceanothus-velutinus.md

@@ -0,0 +1 @@
+Twigs green or brown, flexible and not thorny.

package/data/text/Collinsia-parviflora.md

@@ -0,0 +1 @@
+Inflorescence hairless or sparsely glandular.

package/data/text/Collinsia-torreyi.md

@@ -0,0 +1 @@
+Inflorescence densely glandular.

package/data/text/Ericameria-nauseosa-var-speciosa.md

@@ -0,0 +1 @@
+Generally in dry areas. Disc flowers only. Phyllaries with keels.

package/data/text/Ericameria-nauseosa.md

@@ -0,0 +1 @@
+Disc flowers only. Phyllaries with keels.

package/data/text/Erigeron-algidus.md

@@ -0,0 +1 @@
+Leaves on stem sparse and narrow. Phyllaries and stem hairy.

package/data/text/Erigeron-coulteri.md

@@ -0,0 +1 @@
+Leaves on stem usually clasping the stem. Ray flowers narrow (narrower than _E. glacialis_).

package/data/text/Hackelia-micrantha.md

@@ -0,0 +1 @@
+[Calyx](./g/calyx.html) shorter than 3mm. Corolla tube does not extend much beyond calyx. Flowers usually 5-8mm in diameter.

package/data/text/Linanthus-pungens-subsp-pulchriflorus.md

@@ -0,0 +1 @@
+Flowers funnel shaped. Leaves spine-tipped.

package/data/text/Lupinus-argenteus-var-meionanthus.md

@@ -0,0 +1 @@
+In dry areas. Silvery leaves. Yellow patch on banner petals.

package/data/text/Lupinus-latifolius-var-latifolius.md

@@ -1 +1 @@
-Fruit densely hairy. Upper keel margin hairy from base to middle, not hairy from middle to tip
+In moist areas or open forest. Fruit densely hairy. Upper keel margin hairy from base to middle, not hairy from middle to tip. Stem not hollow. Often more than 1 meter tall.

package/data/text/Lupinus-polyphyllus-var-burkei.md

@@ -0,0 +1 @@
+In wet areas. Leaves and keel margins generally not hairy. Stem hollow.

package/data/text/Penstemon-deustus-var-deustus.md

@@ -0,0 +1 @@
+Leaves generally wider (8-18 mm) than var. pedicellatus. Upper lip white.

package/data/text/Penstemon-deustus-var-pedicellatus.md

@@ -0,0 +1 @@
+Leaves generally narrower (<= 8 mm) than var. deustus. Upper lip brown.

package/data/text/Penstemon-heterodoxus-var-heterodoxus.md

@@ -0,0 +1 @@
+Usually on dry mountain slopes. Inflorescence with glandular hairs. Similar to _P. rydbergii_.

package/data/text/Penstemon-rydbergii-var-oreocharis.md

@@ -0,0 +1 @@
+Generally in high elevation wet habitats. Usually not hairy. Similar to _P. heterodoxus_.

package/data/text/Phlox-diffusa.md

@@ -0,0 +1 @@
+Flowers not funnel shaped (base rounded). Leaves not spine-tipped.

package/data/text/Potentilla-flabellifolia.md

@@ -0,0 +1 @@
+Petals with small notch at tips.

package/data/text/Potentilla-gracilis-var-fastigiata.md

@@ -0,0 +1 @@
+Leaves palmate, with 5-7 toothed leaflets.

package/data/text/Primula-jeffreyi.md

@@ -1 +1 @@
-Stem hairy and glandular.
+Stem hairy and glandular. Intergrades with _P. tetrandra_.

package/data/text/Primula-tetrandra.md

@@ -1 +1 @@
-Stem not hairy.
+Stem not hairy. Intergrades with _P. jeffreyi_.

package/data/text/Pyrola-asarifolia-subsp-asarifolia.md

@@ -0,0 +1 @@
+Leaf blades round, with petioles.

package/data/text/Pyrola-dentata.md

@@ -0,0 +1 @@
+Flower bract not longer than [pedicel](./g/pedicel.html).

package/data/text/Pyrola-picta.md

@@ -0,0 +1 @@
+Leaves with wide white veins. Flower bract not longer than [pedicel](./g/pedicel.html).

package/data/text/Salix-lemmonii.md

@@ -0,0 +1 @@
+Leaves generally narrow and pointed at both ends.

package/data/text/Salix-scouleriana.md

@@ -0,0 +1 @@
+Leaves wider at end than at base; base generally wedge-shaped.

package/data/text/Senecio-integerrimus-var-exaltatus.md

@@ -0,0 +1 @@
+Usually around 13 ray flowers. Leaves not triangular, larger and more numerous towards base. Phyllary tips black.

package/data/text/Senecio-integerrimus-var-major.md

@@ -0,0 +1 @@
+Usually around 13 ray flowers. Leaves not triangular, larger and more numerous towards base. Phyllary tips green.

package/data/text/Senecio-triangularis.md

@@ -0,0 +1 @@
+Usually 8 ray flowers. Leaves triangular and toothed; evenly distributed along stem.

package/data/text/Sorbus-californica.md

@@ -0,0 +1 @@
+Hairs reddish brown and sparse. Intergrades with [_S. scopulina_](./Sorbus-scopulina.html).

package/data/text/Sorbus-scopulina.md

@@ -0,0 +1 @@
+Hairs whitish.

package/ebook/css/main.css

@@ -8,6 +8,14 @@ div.flr {
     align-items: center;
 }
 
+div.hdr {
+    display: flex;
+    column-gap: 2rem;
+    row-gap: .5rem;
+    flex-flow: row wrap;
+    justify-content: space-between;
+}
+
 div.section {
     margin-bottom: .5rem;
 }

package/lib/ebook/ebook.js

@@ -4,193 +4,193 @@ import { XHTML } from "./xhtml.js";
 import { Config } from "../config.js";
 
 const MEDIA_TYPES = {
-  SVG: "image/svg+xml",
-  JPG: "image/jpeg",
-  XHTML: "application/xhtml+xml",
+    SVG: "image/svg+xml",
+    JPG: "image/jpeg",
+    XHTML: "application/xhtml+xml",
 };
 
 /**
  * @type {Object<string,string>}
  */
 const EXT_MEDIA_MAP = {
-  jpeg: MEDIA_TYPES.JPG,
-  jpg: MEDIA_TYPES.JPG,
-  svg: MEDIA_TYPES.SVG,
+    jpeg: MEDIA_TYPES.JPG,
+    jpg: MEDIA_TYPES.JPG,
+    svg: MEDIA_TYPES.SVG,
 };
 
 class EBook {
-  #outputDir;
-  #filename;
-  #pub_id;
-  #title;
-
-  /**
-   * @param {string} outputDir
-   * @param {string} filename
-   * @param {string} pub_id
-   * @param {string} title
-   */
-  constructor(outputDir, filename, pub_id, title) {
-    this.#outputDir = outputDir;
-    this.#filename = filename;
-    this.#pub_id = pub_id;
-    this.#title = title;
-
-    // Initialize output directory.
-    fs.rmSync(this.#outputDir, { force: true, recursive: true });
-    fs.mkdirSync(this.getContentDir(), { recursive: true });
-  }
-
-  async create() {
-    const contentDir = this.getContentDir();
-
-    this.#createContainerFile();
-    await this.createPages();
-    this.#createPackageFile();
-
-    // Copy assets
-    fs.cpSync(Config.getPackageDir() + "/ebook", contentDir, {
-      recursive: true,
-    });
-
-    this.createZip();
-  }
-
-  #createContainerFile() {
-    const metaDir = this.#getMetaDir();
-
-    fs.mkdirSync(metaDir, { recursive: true });
-
-    let xml =
-      '<?xml version="1.0"?>' +
-      '<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">';
-
-    xml +=
-      '<rootfiles><rootfile full-path="epub/package.opf" media-type="application/oebps-package+xml" /></rootfiles>';
-    xml += "</container>";
-
-    fs.writeFileSync(metaDir + "/container.xml", xml);
-  }
-
-  #createPackageFile() {
-    const dir = this.getContentDir();
-
-    let xml =
-      '<?xml version="1.0"?>\n' +
-      '<package version="3.0" xml:lang="en" xmlns="http://www.idpf.org/2007/opf" unique-identifier="pub-id">';
-
-    xml += this.#renderMetadata();
-    xml += this.#renderManifest();
-    xml += this.#renderSpine();
-
-    xml += "</package>";
-
-    fs.writeFileSync(dir + "/package.opf", xml);
-  }
-
-  async createPages() {
-    throw new Error("must be implemented by subclass");
-  }
-
-  createZip() {
-    // Create zip.
-    const filename = this.#outputDir + "/" + this.#filename + ".epub";
-    const output = fs.createWriteStream(filename);
-    const archive = archiver("zip", {
-      zlib: { level: 9 }, // Sets the compression level.
-    });
-
-    archive.pipe(output);
-
-    archive.append("application/epub+zip", {
-      name: "mimetype",
-      store: true,
-    });
-
-    archive.directory(this.#getMetaDir(), "META-INF");
-    archive.directory(this.getContentDir(), "epub");
-
-    archive.finalize();
-  }
-
-  getContentDir() {
-    return this.#outputDir + "/epub";
-  }
-
-  /**
-   * @param {string} id
-   * @param {string} href
-   * @param {string} mediaType
-   */
-  static getManifestEntry(id, href, mediaType = MEDIA_TYPES.XHTML) {
-    return (
-      '<item id="' +
-      id +
-      '" href="' +
-      href +
-      '" media-type="' +
-      mediaType +
-      '" />'
-    );
-  }
-
-  /**
-   * @param {string} ext
-   */
-  static getMediaTypeForExt(ext) {
-    return EXT_MEDIA_MAP[ext];
-  }
-
-  /**
-   * @param {string} id
-   */
-  static getSpineEntry(id) {
-    return '<itemref idref="' + id + '"/>';
-  }
-
-  #getMetaDir() {
-    return this.#outputDir + "/META-INF";
-  }
-
-  #renderManifest() {
-    let xml = "<manifest>";
-    xml += '<item id="c0" href="css/main.css" media-type="text/css" />';
-    xml += this.renderManifestEntries();
-    xml +=
-      '<item id="toc" href="toc.xhtml" media-type="application/xhtml+xml" properties="nav" />';
-    return xml + "</manifest>";
-  }
-
-  renderManifestEntries() {
-    throw new Error("must be implemented by subclass");
-  }
-
-  #renderMetadata() {
-    let xml = '<metadata xmlns:dc="http://purl.org/dc/elements/1.1/">';
-    xml += XHTML.textElement("dc:identifier", this.#pub_id, {
-      id: "pub-id",
-    });
-    xml += "<dc:language>en-US</dc:language>";
-    xml += XHTML.textElement("dc:title", this.#title);
-    const d = new Date();
-    d.setUTCMilliseconds(0);
-    xml +=
-      '<meta property="dcterms:modified">' +
-      d.toISOString().replace(".000", "") +
-      "</meta>";
-    return xml + "</metadata>";
-  }
-
-  #renderSpine() {
-    let xml = "<spine>";
-    xml += '<itemref idref="toc"/>';
-    xml += this.renderSpineElements();
-    return xml + "</spine>";
-  }
-
-  renderSpineElements() {
-    throw new Error("must be implemented by subclass");
-  }
+    #outputDir;
+    #filename;
+    #pub_id;
+    #title;
+
+    /**
+     * @param {string} outputDir
+     * @param {string} filename
+     * @param {string} pub_id
+     * @param {string} title
+     */
+    constructor(outputDir, filename, pub_id, title) {
+        this.#outputDir = outputDir;
+        this.#filename = filename;
+        this.#pub_id = pub_id;
+        this.#title = title;
+
+        // Initialize output directory.
+        fs.rmSync(this.#outputDir, { force: true, recursive: true });
+        fs.mkdirSync(this.getContentDir(), { recursive: true });
+    }
+
+    async create() {
+        const contentDir = this.getContentDir();
+
+        this.#createContainerFile();
+        await this.createPages();
+        this.#createPackageFile();
+
+        // Copy assets
+        fs.cpSync(Config.getPackageDir() + "/ebook", contentDir, {
+            recursive: true,
+        });
+
+        this.createZip();
+    }
+
+    #createContainerFile() {
+        const metaDir = this.#getMetaDir();
+
+        fs.mkdirSync(metaDir, { recursive: true });
+
+        let xml =
+            '<?xml version="1.0"?>' +
+            '<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">';
+
+        xml +=
+            '<rootfiles><rootfile full-path="epub/package.opf" media-type="application/oebps-package+xml" /></rootfiles>';
+        xml += "</container>";
+
+        fs.writeFileSync(metaDir + "/container.xml", xml);
+    }
+
+    #createPackageFile() {
+        const dir = this.getContentDir();
+
+        let xml =
+            '<?xml version="1.0"?>\n' +
+            '<package version="3.0" xml:lang="en" xmlns="http://www.idpf.org/2007/opf" unique-identifier="pub-id">';
+
+        xml += this.#renderMetadata();
+        xml += this.#renderManifest();
+        xml += this.#renderSpine();
+
+        xml += "</package>";
+
+        fs.writeFileSync(dir + "/package.opf", xml);
+    }
+
+    async createPages() {
+        throw new Error("must be implemented by subclass");
+    }
+
+    createZip() {
+        // Create zip.
+        const filename = this.#outputDir + "/" + this.#filename + ".epub";
+        const output = fs.createWriteStream(filename);
+        const archive = archiver("zip", {
+            zlib: { level: 9 }, // Sets the compression level.
+        });
+
+        archive.pipe(output);
+
+        archive.append("application/epub+zip", {
+            name: "mimetype",
+            store: true,
+        });
+
+        archive.directory(this.#getMetaDir(), "META-INF");
+        archive.directory(this.getContentDir(), "epub");
+
+        archive.finalize();
+    }
+
+    getContentDir() {
+        return this.#outputDir + "/epub";
+    }
+
+    /**
+     * @param {string} id
+     * @param {string} href
+     * @param {string} mediaType
+     */
+    static getManifestEntry(id, href, mediaType = MEDIA_TYPES.XHTML) {
+        return (
+            '<item id="' +
+            id +
+            '" href="' +
+            href +
+            '" media-type="' +
+            mediaType +
+            '" />'
+        );
+    }
+
+    /**
+     * @param {string} ext
+     */
+    static getMediaTypeForExt(ext) {
+        return EXT_MEDIA_MAP[ext];
+    }
+
+    /**
+     * @param {string} id
+     */
+    static getSpineEntry(id) {
+        return '<itemref idref="' + id + '"/>';
+    }
+
+    #getMetaDir() {
+        return this.#outputDir + "/META-INF";
+    }
+
+    #renderManifest() {
+        let xml = "<manifest>";
+        xml += '<item id="c0" href="css/main.css" media-type="text/css" />';
+        xml += this.renderManifestEntries();
+        xml +=
+            '<item id="toc" href="toc.xhtml" media-type="application/xhtml+xml" properties="nav" />';
+        return xml + "</manifest>";
+    }
+
+    renderManifestEntries() {
+        throw new Error("must be implemented by subclass");
+    }
+
+    #renderMetadata() {
+        let xml = '<metadata xmlns:dc="http://purl.org/dc/elements/1.1/">';
+        xml += XHTML.textElement("dc:identifier", this.#pub_id, {
+            id: "pub-id",
+        });
+        xml += "<dc:language>en-US</dc:language>";
+        xml += XHTML.textElement("dc:title", this.#title);
+        const d = new Date();
+        d.setUTCMilliseconds(0);
+        xml +=
+            '<meta property="dcterms:modified">' +
+            d.toISOString().replace(".000", "") +
+            "</meta>";
+        return xml + "</metadata>";
+    }
+
+    #renderSpine() {
+        let xml = "<spine>";
+        xml += '<itemref idref="toc"/>';
+        xml += this.renderSpineElements();
+        return xml + "</spine>";
+    }
+
+    renderSpineElements() {
+        throw new Error("must be implemented by subclass");
+    }
 }
 
 export { EBook };

package/lib/ebook/pages/taxonpage.js

@@ -8,16 +8,19 @@ import { Images } from "../images.js";
 import imageSize from "image-size";
 
 class TaxonPage extends EBookPage {
+    #config;
     #taxon;
     #images;
 
     /**
      * @param {string} outputDir
+     * @param {Config} config
      * @param {import("../../taxonomy/taxon.js").Taxon} taxon
      * @param {Images} images
      */
-    constructor(outputDir, taxon, images) {
+    constructor(outputDir, config, taxon, images) {
         super(outputDir + "/" + taxon.getFileName(), taxon.getName());
+        this.#config = config;
         this.#taxon = taxon;
         this.#images = images;
     }
@@ -40,19 +43,26 @@ class TaxonPage extends EBookPage {
         const name = this.#taxon.getName();
         let html = XHTML.textElement("h1", name);
 
+        // Show header with common name, native status, and family.
+        let header = "";
+
+        const cn = this.#taxon.getCommonNames();
+        if (cn && cn.length > 0) {
+            header += XHTML.textElement("div", cn.join(", "));
+        }
+
         const family = this.#taxon.getFamily();
-        html += XHTML.wrap(
+        header += XHTML.wrap(
             "div",
             XHTML.getLink(family.getFileName(), family.getName()),
-            { class: "section" },
         );
 
-        const cn = this.#taxon.getCommonNames();
-        if (cn && cn.length > 0) {
-            html += XHTML.textElement("div", cn.join(", "), {
-                class: "section",
-            });
-        }
+        header += XHTML.textElement(
+            "div",
+            this.#taxon.getStatusDescription(this.#config),
+        );
+
+        html += XHTML.wrap("div", header, "section hdr");
 
         html += HTMLTaxon.getFlowerInfo(this.#taxon, "section flr");
 

package/lib/ebook/plantbook.js

@@ -11,16 +11,19 @@ import { TaxonPage } from "./pages/taxonpage.js";
 import { TOCPage } from "./pages/tocpage.js";
 
 class PlantBook extends EBook {
+    #config;
     #taxa;
     #glossary;
     #images;
+    #maxTaxa;
 
     /**
      * @param {string} outputDir
      * @param {import("../config.js").Config} config
      * @param {import("../types.js").Taxa} taxa
+     * @param {number|undefined} maxTaxa
      */
-    constructor(outputDir, config, taxa) {
+    constructor(outputDir, config, taxa, maxTaxa) {
         super(
             outputDir,
             getRequiredConfigValue(config, "filename"),
@@ -28,16 +31,21 @@ class PlantBook extends EBook {
             getRequiredConfigValue(config, "title"),
         );
 
+        this.#config = config;
         this.#taxa = taxa;
         const generator = new EBookSiteGenerator(config, this.getContentDir());
         this.#glossary = new GlossaryPages(generator);
         this.#images = new Images(generator, this.getContentDir(), taxa);
+        this.#maxTaxa = maxTaxa;
     }
 
     async createPages() {
         const contentDir = this.getContentDir();
 
-        const taxonList = this.#taxa.getTaxonList();
+        const allTaxa = this.#taxa.getTaxonList();
+        const taxonList = this.#maxTaxa
+            ? allTaxa.slice(0, this.#maxTaxa)
+            : allTaxa;
 
         await this.#images.createImages(taxonList);
 
@@ -45,9 +53,15 @@ class PlantBook extends EBook {
             "creating taxon pages",
             taxonList.length,
         );
+
         for (let index = 0; index < taxonList.length; index++) {
             const taxon = taxonList[index];
-            new TaxonPage(contentDir, taxon, this.#images).create();
+            new TaxonPage(
+                contentDir,
+                this.#config,
+                taxon,
+                this.#images,
+            ).create();
             meter.update(index + 1);
         }
         meter.stop();