@ca-plant-list/ca-plant-list 0.2.18 → 0.3.1

package/lib/ebook/plantbook.js

@@ -1,5 +1,6 @@
 import { Families } from "@ca-plant-list/ca-plant-list";
 import { EBook } from "./ebook.js";
+import { EBookSiteGenerator } from "./ebooksitegenerator.js";
 import { GlossaryPages } from "./glossarypages.js";
 import { Images } from "./images.js";
 import { PageListFamilies } from "./pages/page_list_families.js";
@@ -8,7 +9,7 @@ import { PageListFlowers } from "./pages/page_list_flowers.js";
 import { PageListSpecies } from "./pages/page_list_species.js";
 import { TaxonPage } from "./pages/taxonpage.js";
 import { TOCPage } from "./pages/tocpage.js";
-import { FLOWER_COLOR_NAMES } from "../taxa.js";
+import { Taxa } from "../taxa.js";
 
 class PlantBook extends EBook {
 
@@ -26,8 +27,9 @@ class PlantBook extends EBook {
         );
 
         this.#taxa = taxa;
-        this.#glossary = new GlossaryPages();
-        this.#images = new Images( this.getContentDir(), taxa );
+        const generator = new EBookSiteGenerator( this.getContentDir() );
+        this.#glossary = new GlossaryPages( generator );
+        this.#images = new Images( generator, this.getContentDir(), taxa );
 
     }
 
@@ -35,15 +37,17 @@ class PlantBook extends EBook {
 
         const contentDir = this.getContentDir();
 
+        await this.#images.createImages( contentDir );
+
         console.log( "creating taxon pages" );
         const taxonList = this.#taxa.getTaxonList();
         for ( const taxon of taxonList ) {
             const name = taxon.getName();
-            new TaxonPage( contentDir, taxon, this.#images[ name ] ).create();
+            new TaxonPage( contentDir, taxon, this.#images.getTaxonImages( name ) ).create();
         }
 
         // Create lists.
-        for ( const colorName of FLOWER_COLOR_NAMES ) {
+        for ( const colorName of Taxa.getFlowerColorNames() ) {
             new PageListFlowerColor( contentDir, this.#taxa.getFlowerColor( colorName ) ).create();
         }
 
@@ -60,8 +64,7 @@ class PlantBook extends EBook {
         }
         new PageListSpecies( contentDir, taxonList, "list_species.html", "All Species" ).create();
 
-        await this.#images.createImages( contentDir );
-        this.#glossary.createPages( contentDir );
+        this.#glossary.renderPages();
 
         new TOCPage( contentDir ).create();
     }
@@ -73,7 +76,7 @@ class PlantBook extends EBook {
         // Add lists.
         xml += "<item id=\"lspecies\" href=\"list_species.html\" media-type=\"application/xhtml+xml\" />";
         xml += "<item id=\"lfamilies\" href=\"list_families.html\" media-type=\"application/xhtml+xml\" />";
-        for ( const colorName of FLOWER_COLOR_NAMES ) {
+        for ( const colorName of Taxa.getFlowerColorNames() ) {
             const color = this.#taxa.getFlowerColor( colorName );
             xml += "<item id=\"l" + color.getColorName() + "\" href=\"" + color.getFileName() + "\" media-type=\"application/xhtml+xml\" />";
         }
@@ -105,7 +108,7 @@ class PlantBook extends EBook {
         let xml = "";
 
         // Add lists.
-        for ( const colorName of FLOWER_COLOR_NAMES ) {
+        for ( const colorName of Taxa.getFlowerColorNames() ) {
             const color = this.#taxa.getFlowerColor( colorName );
             xml += "<itemref idref=\"l" + color.getColorName() + "\"/>";
         }

package/lib/errorlog.js

@@ -1,4 +1,5 @@
 import * as fs from "node:fs";
+import * as path from "node:path";
 
 class ErrorLog {
 
@@ -19,6 +20,9 @@ class ErrorLog {
     }
 
     write() {
+        // Make sure directory exists.
+        fs.mkdirSync( path.dirname( this.#fileName ), { recursive: true } );
+
         fs.writeFileSync( this.#fileName, this.#errors.join( "\n" ) );
     }
 

package/lib/files.js

@@ -1,4 +1,5 @@
 import * as fs from "node:fs";
+import * as path from "node:path";
 import { default as unzipper } from "unzipper";
 
 class Files {
@@ -52,6 +53,10 @@ class Files {
         return stats !== undefined && stats.isDirectory();
     }
 
+    static join( ...paths ) {
+        return path.join( ...paths ).replaceAll( "\\", "/" );
+    }
+
     static mkdir( path ) {
         fs.mkdirSync( path, { recursive: true } );
     }

package/lib/index.d.ts

@@ -76,6 +76,7 @@ export class Files {
     static fetch(url: string | URL, targetFileName: string | undefined, headers?: any): Promise<Headers>;
     static getDirEntries(path: any): string[];
     static isDir(path: any): boolean;
+    static join(...paths: any[]): any;
     static mkdir(path: any): void;
     static read(path: any): string;
     static rmDir(dir: any): void;
@@ -174,12 +175,14 @@ import { TaxaProcessor } from "./taxaprocessor.js";
 import { TAXA_COLNAMES } from "./taxon.js";
 import { Taxon } from "./taxon.js";
 export { BasePageRenderer, CommandProcessor, CommandAndTaxaProcessor, Config, CSV, ErrorLog, Exceptions, Families, Files, GenericTaxaLoader, HTML, Jekyll, PlantBook, Taxa, TaxaLoader, TaxaProcessor, TAXA_COLNAMES, Taxon };
-export class Jekyll {
+export class Jekyll extends SiteGenerator {
     static getFrontMatter(atts: any): string;
     static hasInclude(baseDir: any, path: any): boolean;
     static include(path: any): string;
     static writeInclude(baseDir: any, path: any, data: any): void;
+    writeTemplate(content: any, attributes: any, filename: any): void;
 }
+import { SiteGenerator } from "./sitegenerator.js";
 export class Jepson {
     static getEFloraLink(id: any): string;
 }
@@ -194,16 +197,28 @@ export class RarePlants {
     static getRPIRankDescription(rank: any): any;
     static getRPIRankAndThreatDescriptions(rank: any): any[];
 }
-export const FLOWER_COLOR_NAMES: string[];
+export class SiteGenerator {
+    constructor(baseDir: any);
+    copyIllustrations(flowerColors: any): void;
+    getBaseDir(): any;
+    mkdir(path: any): void;
+    #private;
+}
 export class Taxa {
     static getHTMLTable(taxa: any, columns?: {
         title: string;
         data: (t: any) => any;
     }[]): string;
+    static getFlowerColorNames(): string[];
+    static getFlowerColors(): {
+        name: string;
+        color: string;
+    }[];
     constructor(inclusionList: any, errorLog: any, showFlowerErrors: any, taxaMeta?: {}, taxonClass?: typeof Taxon, extraTaxa?: any[], extraSynonyms?: any[]);
     getFlowerColor(name: any): any;
     getTaxon(name: any): any;
     getTaxonList(): any[];
+    hasSynonym(formerName: any): boolean;
     #private;
 }
 export namespace TAXA_LIST_COLS {

package/lib/jekyll.js

@@ -1,14 +1,22 @@
 import { Files } from "./files.js";
+import { SiteGenerator } from "./sitegenerator.js";
 
 const FRONT_DELIM = "---";
 
-class Jekyll {
+class Jekyll extends SiteGenerator {
+
+    constructor( baseDir ) {
+        super( baseDir );
+    }
 
     static getFrontMatter( atts ) {
         const lines = [ FRONT_DELIM ];
         for ( const [ k, v ] of Object.entries( atts ) ) {
             lines.push( k + ": \"" + v + "\"" );
         }
+        if ( !atts.layout ) {
+            lines.push( "layout: default" );
+        }
         lines.push( FRONT_DELIM );
         return lines.join( "\n" ) + "\n";
     }
@@ -26,6 +34,10 @@ class Jekyll {
         Files.write( baseDir + "/_includes/" + path, data );
     }
 
+    writeTemplate( content, attributes, filename ) {
+        Files.write( Files.join( this.getBaseDir(), filename ), Jekyll.getFrontMatter( attributes ) + content );
+    }
+
 }
 
 export { Jekyll };

package/lib/sitegenerator.js

@@ -0,0 +1,79 @@
+import { optimize } from "svgo";
+
+import { Config } from "./config.js";
+import { Files } from "./files.js";
+
+class SiteGenerator {
+    #baseDir;
+
+    constructor( baseDir ) {
+        this.#baseDir = baseDir;
+    }
+
+    copyIllustrations( flowerColors ) {
+        function createFlowerColorIcons( outputDir, flowerColors ) {
+            // Read generic input.
+            const inputFileName = Files.join( outputDir, "flower.svg" );
+            const srcSVG = Files.read( inputFileName );
+            for ( const color of flowerColors ) {
+                Files.write(
+                    Files.join( outputDir, "f-" + color.name + ".svg" ),
+                    srcSVG.replace( "#ff0", color.color )
+                );
+            }
+            // Delete input file.
+            Files.rmDir( inputFileName );
+        }
+
+        function optimizeSVG( outputDir ) {
+            const srcDir = Config.getPackageDir() + "/data/illustrations/inkscape";
+            const entries = Files.getDirEntries( srcDir );
+            for ( const entry of entries ) {
+                const srcFile = Files.join( srcDir, entry );
+                const srcSVG = Files.read( srcFile );
+                const result = optimize( srcSVG, {
+                    plugins: [
+                        {
+                            name: "preset-default",
+                            params: {
+                                overrides: {
+                                    // minifyStyles changes font-weight: normal to 400, which keeps it from being removed as a default.
+                                    // Disable it here and run it last.
+                                    minifyStyles: false,
+                                    removeViewBox: false,
+                                },
+                            },
+                        },
+                        "convertStyleToAttrs",
+                        {
+                            name: "removeAttrs",
+                            params: {
+                                attrs: "(style)",
+                            },
+                        },
+                        "removeDimensions",
+                        "minifyStyles",
+                    ],
+                    multipass: true,
+                } );
+                Files.write( Files.join( outputDir, entry ), result.data );
+            }
+        }
+
+        const outputDir = Files.join( this.#baseDir, "i" );
+        Files.mkdir( outputDir );
+
+        optimizeSVG( outputDir );
+        createFlowerColorIcons( outputDir, flowerColors );
+    }
+
+    getBaseDir() {
+        return this.#baseDir;
+    }
+
+    mkdir( path ) {
+        Files.mkdir( Files.join( this.#baseDir, path ) );
+    }
+}
+
+export { SiteGenerator };

package/lib/taxa.js

@@ -4,7 +4,14 @@ import { HTML } from "./html.js";
 import { CSV } from "./csv.js";
 import { RarePlants } from "./rareplants.js";
 
-const FLOWER_COLOR_NAMES = [ "white", "red", "pink", "orange", "yellow", "blue" ];
+const FLOWER_COLORS = [
+    { name: "white", color: "white" },
+    { name: "red", color: "red" },
+    { name: "pink", color: "pink" },
+    { name: "orange", color: "orange" },
+    { name: "yellow", color: "yellow" },
+    { name: "blue", color: "blue" },
+];
 
 const TAXA_LIST_COLS = {
     CESA: {
@@ -68,13 +75,14 @@ class Taxa {
     #taxa = {};
     #flower_colors = {};
     #sortedTaxa;
+    #synonyms = new Set();
 
     constructor( inclusionList, errorLog, showFlowerErrors, taxaMeta = {}, taxonClass = Taxon, extraTaxa = [], extraSynonyms = [] ) {
 
         this.#errorLog = errorLog;
 
-        for ( const color of FLOWER_COLOR_NAMES ) {
-            this.#flower_colors[ color ] = new FlowerColor( color );
+        for ( const color of FLOWER_COLORS ) {
+            this.#flower_colors[ color.name ] = new FlowerColor( color.name );
         }
 
         const dataDir = Config.getPackageDir() + "/data";
@@ -130,6 +138,14 @@ class Taxa {
         return this.#flower_colors[ name ];
     }
 
+    static getFlowerColorNames() {
+        return FLOWER_COLORS.map( ( o ) => o.name );
+    }
+
+    static getFlowerColors() {
+        return FLOWER_COLORS;
+    }
+
     getTaxon( name ) {
         return this.#taxa[ name ];
     }
@@ -138,18 +154,25 @@ class Taxa {
         return this.#sortedTaxa;
     }
 
+    hasSynonym( formerName ) {
+        return this.#synonyms.has( formerName );
+    }
+
     #loadSyns( synCSV, inclusionList ) {
         for ( const syn of synCSV ) {
             const currName = syn[ "Current" ];
             const taxon = this.getTaxon( currName );
             if ( !taxon ) {
-                if ( inclusionList === true ) {
-                    // If including all taxa, note the error.
+                if ( inclusionList === true && !syn.Type ) {
+                    // If including all taxa, note the error - the target is not defined, and this is not
+                    // a synonym for a non-Jepson system.
                     console.log( "synonym target not found: " + currName );
                 }
                 continue;
             }
-            taxon.addSynonym( syn[ "Former" ], syn[ "Type" ] );
+            const formerName = syn[ "Former" ];
+            this.#synonyms.add( formerName );
+            taxon.addSynonym( formerName, syn[ "Type" ] );
         }
     }
 
@@ -206,4 +229,4 @@ class Taxa {
 
 }
 
-export { FLOWER_COLOR_NAMES, Taxa, TAXA_LIST_COLS };
+export { Taxa, TAXA_LIST_COLS };

package/lib/taxaprocessor.js

@@ -27,8 +27,8 @@ class TaxaProcessor {
         console.log( "loading data" );
         this.#taxaLoader = new this.#taxaLoaderClass( this.#options );
         await this.#taxaLoader.load();
-        await commandRunner( this );
         this.#taxaLoader.writeErrorLog();
+        await commandRunner( this );
     }
 
 }

package/lib/web/glossarypages.js

@@ -1,49 +1,54 @@
 import { Files, HTML } from "@ca-plant-list/ca-plant-list";
 import { Glossary } from "../plants/glossary.js";
-import { Jekyll } from "../jekyll.js";
+import { Markdown } from "../markdown.js";
+
+const ENTRY_DIR = "g";
 
 class GlossaryPages {
 
-    #outputDir;
-    #entryDir;
+    #siteGenerator;
     #glossary;
 
-    constructor( outputDir ) {
-        this.#outputDir = outputDir;
-        this.#entryDir = outputDir + "/g";
+    constructor( siteGenerator ) {
+        this.#siteGenerator = siteGenerator;
         this.#glossary = new Glossary();
     }
 
     #generateEntryPage( entry ) {
-        const front = Jekyll.getFrontMatter( { title: entry.getTermName() } );
-        const markdown = entry.getMarkdown();
-        Files.write( this.#entryDir + "/" + entry.getTermName() + ".md", front + markdown );
+        const title = entry.getTermName();
+        let html = HTML.textElement( "h1", title );
+        html += HTML.wrap( "div", Markdown.strToHTML( entry.getMarkdown() ), { class: "glossary" } );
+        this.#siteGenerator.writeTemplate( html, { title: title }, Files.join( ENTRY_DIR, title + ".html" ) );
     }
 
     #generateEntryPages() {
+
+        // Make sure output directory exists.
+        this.#siteGenerator.mkdir( ENTRY_DIR );
+
         const entries = this.#glossary.getEntries();
         for ( const entry of entries ) {
             this.#generateEntryPage( entry );
         }
     }
 
-    #generateIncludeFile() {
-
+    #generateIndexPage() {
         const links = [];
         const entries = this.#glossary.getEntries();
         for ( const entry of entries ) {
-            links.push( HTML.getLink( "g/" + entry.getHTMLFileName(), entry.getTermName() ) );
+            links.push( HTML.getLink( Files.join( ENTRY_DIR, entry.getHTMLFileName() ), entry.getTermName() ) );
         }
+        let html = HTML.wrap( "h1", "Glossary" );
+        html += HTML.wrap( "ol", HTML.arrayToLI( links ) );
+        this.#siteGenerator.writeTemplate( html, { title: "Glossary" }, "glossary.html" );
+    }
 
-        Files.write( this.#outputDir + "/_includes/glossary.html", HTML.arrayToLI( links ), true );
-
+    getGlossary() {
+        return this.#glossary;
     }
 
     renderPages() {
-        // Make sure output directory exists.
-        Files.mkdir( this.#entryDir );
-
-        this.#generateIncludeFile();
+        this.#generateIndexPage();
         this.#generateEntryPages();
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ca-plant-list/ca-plant-list",
-    "version": "0.2.18",
+    "version": "0.3.1",
     "description": "Tools to create Jekyll files for a website listing plants in an area of California.",
     "license": "MIT",
     "repository": {
@@ -30,6 +30,7 @@
         "image-size": "^1.0.2",
         "markdown-it": "^13.0.1",
         "sharp": "^0.32.1",
+        "svgo": "^3.0.3",
         "unzipper": "^0.10.11"
     },
     "devDependencies": {
@@ -37,4 +38,4 @@
         "eslint": "^8.26.0",
         "typescript": "^4.9.3"
     }
-}
+}

package/data/illustrations/optimized/asteraceae_floret.svg

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="82.437mm" height="84.504mm" version="1.1" viewBox="0 0 82.437 84.504" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <marker id="Triangle" overflow="visible" markerHeight="1" markerWidth="1" orient="auto-start-reverse" preserveAspectRatio="xMidYMid" viewBox="0 0 1 1">
-   <path transform="scale(.5)" d="m5.77 0-8.65 5v-10z" fill="context-stroke" fill-rule="evenodd" stroke="context-stroke" stroke-width="1pt"/>
-  </marker>
- </defs>
- <g transform="translate(-48.054 -6.5123)">
-  <g fill="#959595">
-   <path d="m79.276 37.945a8.4667 31.089 0 0 1 1.8353 33.88 8.4667 31.089 0 0 1-7.8222 19.191 8.4667 31.089 0 0 1-7.8222-19.191 8.4667 31.089 0 0 1 1.8353-33.88z"/>
-   <path d="m48.253 13.074 19.05 24.871" stroke="#888" stroke-width=".5"/>
-   <path id="path3" d="m98.326 13.074-19.05 24.871" fill="#959595" stroke="#888" stroke-width=".5"/>
-  </g>
-  <use transform="rotate(-17.226 77.257 49.068)" xlink:href="#path3"/>
-  <path d="m55.686 9.6812 13.798 28.126" fill="#959595" stroke="#888" stroke-width=".5"/>
-  <path d="m62.705 7.5473 8.2896 30.212" fill="#959595" stroke="#888" stroke-width=".5"/>
-  <use transform="rotate(-5.8666 77.05 56.397)" xlink:href="#path3"/>
-  <use transform="rotate(-27.32 76.391 49.027)" xlink:href="#path3"/>
-  <g>
-   <path d="m69.881 6.5376 3.171 31.167" fill="#959595" stroke="#888" stroke-width=".5"/>
-   <text x="114.47877" y="66.073151" fill="#050000" font-family="Arial" font-size="4.9389px" stroke="#020000" stroke-width="0" xml:space="preserve"><tspan x="114.47877" y="66.073151" fill="#050000" font-family="Arial" font-size="4.9389px" stroke="#020000" stroke-width="0">achene</tspan></text>
-   <text x="114.47877" y="28.502281" fill="#050000" font-family="Arial" font-size="4.9389px" stroke="#020000" stroke-width="0" xml:space="preserve"><tspan x="114.47877" y="28.502281" fill="#050000" font-family="Arial" font-size="4.9389px" stroke="#020000" stroke-width="0">pappus</tspan></text>
-   <path d="m88.996 65.009 20.886-0.12554" marker-start="url(#Triangle)" stroke="#000" stroke-width=".42043"/>
-   <path d="m90.584 27.967 20.886-0.12554" marker-start="url(#Triangle)" stroke="#000" stroke-width=".42043"/>
-  </g>
- </g>
-</svg>

package/data/illustrations/optimized/f-blue.svg

@@ -1,11 +0,0 @@
-<svg version="1.1" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <ellipse id="a" cx="15" cy="15" rx="2.5" ry="15" fill="blue" stroke-width="0" />
-    <use xlink:href="#a" />
-    <use transform="rotate(30,15,15)" xlink:href="#a" />
-    <use transform="rotate(60,15,15)" xlink:href="#a" />
-    <use transform="rotate(90,15,15)" xlink:href="#a" />
-    <use transform="rotate(120,15,15)" xlink:href="#a" />
-    <use transform="rotate(150,15,15)" xlink:href="#a" />
-</svg>
-    

package/data/illustrations/optimized/f-orange.svg

@@ -1,11 +0,0 @@
-<svg version="1.1" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <ellipse id="a" cx="15" cy="15" rx="2.5" ry="15" fill="orange" stroke-width="0" />
-    <use xlink:href="#a" />
-    <use transform="rotate(30,15,15)" xlink:href="#a" />
-    <use transform="rotate(60,15,15)" xlink:href="#a" />
-    <use transform="rotate(90,15,15)" xlink:href="#a" />
-    <use transform="rotate(120,15,15)" xlink:href="#a" />
-    <use transform="rotate(150,15,15)" xlink:href="#a" />
-</svg>
-    

package/data/illustrations/optimized/f-pink.svg

@@ -1,11 +0,0 @@
-<svg version="1.1" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <ellipse id="a" cx="15" cy="15" rx="2.5" ry="15" fill="pink" stroke-width="0" />
-    <use xlink:href="#a" />
-    <use transform="rotate(30,15,15)" xlink:href="#a" />
-    <use transform="rotate(60,15,15)" xlink:href="#a" />
-    <use transform="rotate(90,15,15)" xlink:href="#a" />
-    <use transform="rotate(120,15,15)" xlink:href="#a" />
-    <use transform="rotate(150,15,15)" xlink:href="#a" />
-</svg>
-    

package/data/illustrations/optimized/f-red.svg

@@ -1,11 +0,0 @@
-<svg version="1.1" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <ellipse id="a" cx="15" cy="15" rx="2.5" ry="15" fill="red" stroke-width="0" />
-    <use xlink:href="#a" />
-    <use transform="rotate(30,15,15)" xlink:href="#a" />
-    <use transform="rotate(60,15,15)" xlink:href="#a" />
-    <use transform="rotate(90,15,15)" xlink:href="#a" />
-    <use transform="rotate(120,15,15)" xlink:href="#a" />
-    <use transform="rotate(150,15,15)" xlink:href="#a" />
-</svg>
-    

package/data/illustrations/optimized/f-white.svg

@@ -1,11 +0,0 @@
-<svg version="1.1" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <ellipse id="a" cx="15" cy="15" rx="2.5" ry="15" fill="white" stroke-width="0" />
-    <use xlink:href="#a" />
-    <use transform="rotate(30,15,15)" xlink:href="#a" />
-    <use transform="rotate(60,15,15)" xlink:href="#a" />
-    <use transform="rotate(90,15,15)" xlink:href="#a" />
-    <use transform="rotate(120,15,15)" xlink:href="#a" />
-    <use transform="rotate(150,15,15)" xlink:href="#a" />
-</svg>
-    

package/data/illustrations/optimized/f-yellow.svg

@@ -1,11 +0,0 @@
-<svg version="1.1" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <ellipse id="a" cx="15" cy="15" rx="2.5" ry="15" fill="yellow" stroke-width="0" />
-    <use xlink:href="#a" />
-    <use transform="rotate(30,15,15)" xlink:href="#a" />
-    <use transform="rotate(60,15,15)" xlink:href="#a" />
-    <use transform="rotate(90,15,15)" xlink:href="#a" />
-    <use transform="rotate(120,15,15)" xlink:href="#a" />
-    <use transform="rotate(150,15,15)" xlink:href="#a" />
-</svg>
-    

package/data/illustrations/optimized/peduncle.svg

@@ -1,21 +0,0 @@
-<svg version="1.1" viewBox="0 0 102.55 60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<defs>
-<marker id="b" overflow="visible" markerHeight="1" markerWidth="1" orient="auto-start-reverse" preserveAspectRatio="xMidYMid" viewBox="0 0 1 1">
-<path transform="scale(.5)" d="m5.77 0-8.65 5v-10z" fill="context-stroke" fill-rule="evenodd" stroke="context-stroke" stroke-width="1pt"/>
-</marker>
-</defs>
-<path d="m15 60v-45" fill="#14140c" stroke="#160707"/>
-<use xlink:href="#a"/>
-<use transform="rotate(30,15,15)" xlink:href="#a"/>
-<use transform="rotate(60,15,15)" xlink:href="#a"/>
-<use transform="rotate(90,15,15)" xlink:href="#a"/>
-<use transform="rotate(120,15,15)" xlink:href="#a"/>
-<use transform="rotate(150,15,15)" xlink:href="#a"/>
-<ellipse id="a" cx="15" cy="15" rx="2.5" ry="15" fill="#ff0" stroke-width="0"/>
-<g fill="#14140c" stroke="#160707">
-<path d="m20 45h25" marker-start="url(#b)" stroke-width=".5"/>
-<text x="50" y="47.068359" font-family="Arial" font-size="8px" letter-spacing=".5px" opacity=".55843" stroke-width=".1" xml:space="preserve"><tspan x="50" y="47.068359" font-family="Arial" font-size="8px" letter-spacing=".5px" stroke-width=".1" style="font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal">peduncle</tspan></text>
-<path d="m35 15h10" marker-start="url(#b)" stroke-width=".5"/>
-<text x="49.696735" y="17.068359" font-family="Arial" font-size="8px" letter-spacing=".5px" opacity=".55843" stroke-width=".1" xml:space="preserve"><tspan x="49.696735" y="17.068359" font-family="Arial" font-size="8px" letter-spacing=".5px" stroke-width=".1" style="font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal">inflorescence</tspan></text>
-</g>
-</svg>

package/jekyll/glossary.md

@@ -1,5 +0,0 @@
----
-title: Glossary
----
-
-{%include glossary.html %}