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

package/data/synonyms.csv

@@ -25,7 +25,7 @@ Achnatherum lemmonii subsp. lemmonii,Stipa lemmonii var. lemmonii
 Acmispon strigosus var. hirtellus,Acmispon strigosus
 Acroptilon repens,Rhaponticum repens
 Actaea rubra subsp. arguta,Actaea rubra
-Adelinia grande,Adelinia grandis,INAT
+Adelinia grandis,Adelinia grandis,INAT
 Adiantum boreale,Adiantum aleuticum
 Adiantum pedatum subsp. calderi,Adiantum aleuticum
 Adiantum pedatum var. aleuticum,Adiantum aleuticum
@@ -461,6 +461,7 @@ Cordylanthus rigidus var. ferrisianus,Cordylanthus rigidus subsp. rigidus
 Coreopsis calliopsidea,Leptosyne calliopsidea
 Coreopsis hamiltonii,Leptosyne hamiltonii
 Coreopsis stillmanii,Leptosyne stillmanii
+Corethrogyne filaginifolia var. californica,Corethrogyne filaginifolia
 Cornus ×californica,Cornus sericea subsp. sericea
 Cornus californica var. nevadensis,Cornus sericea subsp. sericea
 Cornus californica,Cornus sericea subsp. sericea
@@ -831,6 +832,8 @@ Heracleum lanatum,Heracleum maximum
 Herniaria cinerea,Herniaria hirsuta var. cinerea,INAT
 Herniaria hirsuta subsp. cinerea,Herniaria hirsuta var. cinerea
 Herpestris pilosa,Mimetanthe pilosa
+Hesperocyparis macrocarpa,Hesperocyparis macrocarpa,INAT
+Hesperocyparis sargentii,Hesperocyparis sargentii,INAT
 Hesperomecon filiformis,Hesperomecon linearis
 Hesperoscordum hyacinthinum,Triteleia hyacinthina
 Hesperoscordum lacteum,Triteleia hyacinthina
@@ -904,6 +907,8 @@ Iva axillaris var. robustior,Iva axillaris
 Jacobaea vulgaris,Senecio jacobaea,INAT
 Johnstonella micromeres,Cryptantha micromeres,INAT
 Juglans californica var. californica,Juglans californica
+Juncoides comosa var. subsessilis,Luzula subsessilis
+Juncoides subsessilis,Luzula subsessilis
 Juncus amuricus,Juncus bufonius var. occidentalis,INAT
 Juncus arcticus var. balticus,Juncus balticus subsp. ater
 Juncus arcticus var. mexicanus,Juncus mexicanus
@@ -973,7 +978,6 @@ Leptosiphon luteus,Leptosiphon parviflorus
 Leptosiphon micranthus,Leptosiphon parviflorus
 Leptotaenia californica,Lomatium californicum
 Lepturus cylindricus,Hainardia cylindrica
-Lessingia filaginifolia var. californica,Corethrogyne filaginifolia
 Lessingia filaginifolia var. filaginifolia,Corethrogyne filaginifolia
 Lessingia germanorum var. parvula,Lessingia tenuis
 Lessingia germanorum var. tenuis,Lessingia tenuis
@@ -1083,8 +1087,6 @@ Lupinus subvexus var. transmontanus,Lupinus microcarpus var. microcarpus
 Lupinus subvexus,Lupinus microcarpus var. microcarpus
 Lupinus vallicola,Lupinus nanus
 Lupinus variicolor,Lupinus littoralis var. variicolor
-Luzula comosa var. congesta,Luzula comosa var. comosa
-Luzula comosa var. macrantha,Luzula subsessilis
 Luzula comosa var. subsessilis,Luzula subsessilis
 Lythrum alatum var. linearifolium,Lythrum californicum
 Lythrum sanfordii,Lythrum californicum
@@ -1102,13 +1104,12 @@ Mahonia nervosa var. mendocinensis,Berberis nervosa
 Mahonia pinnata subsp. pinnata,Berberis pinnata subsp. pinnata
 Maianthemum racemosum subsp. amplexicaule,Maianthemum racemosum
 Malacothamnus arcuatus var. elmeri,Malacothamnus hallii,INAT
-Malacothamnus fremontii subsp. cercophorus,Malacothamnus fremontii
-Malacothamnus helleri,Malacothamnus fremontii
-Malacothamnus howellii,Malacothamnus fremontii
+Malacothamnus hallii,Malacothamnus arcuatus var. elmeri
 Malacothrix coulteri var. cognata,Malacothrix coulteri
 Malacothrix senecioides,Malacothrix clevelandii
 Malva pseudolavatera,Malva multiflora
 Malvastrum exilis,Eremalche exilis
+Malvastrum hallii,Malacothamnus arcuatus var. elmeri
 Marah fabacea var. agrestis,Marah fabacea
 Maruta cotula,Anthemis cotula
 Meconella linearis,Hesperomecon linearis
@@ -1267,7 +1268,6 @@ Myosurus minimus subsp. major,Myosurus minimus
 Myosurus minimus var. filiformis,Myosurus minimus
 Myosurus minimus var. major,Myosurus minimus
 Myosurus minimus var. sessiliflorus,Myosurus sessilis
-Myosurus minimus,Myosurus minimus subsp. minimus,INAT
 Myrica californica,Morella californica
 Myriophyllum brasiliense,Myriophyllum aquaticum
 Myriophyllum exalbescens,Myriophyllum sibiricum
@@ -1352,8 +1352,6 @@ Parvisedum pentandrum,Sedella pentandra
 Paspalum distichum var. indutum,Paspalum distichum
 Paspalum paspalodes,Paspalum distichum
 Pectocarya pusilla,Gruvelia pusilla,INAT
-Pedicularis aurantiaca,Pedicularis densiflora
-Pedicularis densiflora subsp. aurantiaca,Pedicularis densiflora
 Penstemon heterophyllus subsp. heterophyllus,Penstemon heterophyllus var. heterophyllus
 Penstemon heterophyllus subsp. purdyi,Penstemon heterophyllus var. purdyi
 Pentagramma triangularis subsp. semipallida,Pentagramma triangularis
@@ -1828,6 +1826,7 @@ Spergularia bocconei,Spergularia bocconi,INAT
 Spergularia marina var. tenuis,Spergularia marina
 Spergularia maritima,Spergularia media var. media
 Spergularia salina,Spergularia marina
+Sphaeralcea fasciculata var. elmeri,Malacothamnus arcuatus var. elmeri
 Spirodela oligorrhiza,Landoltia punctata
 Spirodela punctata,Landoltia punctata
 Sporobolus alterniflorus,Spartina alterniflora,INAT
@@ -1859,9 +1858,7 @@ Streptanthus albidus subsp. peramoenus,Streptanthus glandulosus subsp. glandulos
 Streptanthus breweri var. breweri,Streptanthus breweri
 Streptanthus coulteri var. lemmonii,Caulanthus lemmonii
 Streptanthus flavescens,Caulanthus flavescens
-Streptanthus glandulosus subsp. arkii,Streptanthus glandulosus subsp. glandulosus
 Streptanthus glandulosus subsp. glandulosus,Streptanthus albidus subsp. peramoenus,INAT
-Streptanthus glandulosus subsp. raichei,Streptanthus glandulosus subsp. glandulosus
 Streptanthus lemmonii,Caulanthus lemmonii
 Stropholirion californicum,Dichelostemma volubile
 Stylocline amphibola,Micropus amphibolus
@@ -1914,30 +1911,33 @@ Toxicodendron trilobatum,Rhus aromatica
 Trientalis borealis subsp. latifolia,Lysimachia latifolia
 Trientalis latifolia,Lysimachia latifolia
 Trifolium albopurpureum var. albopurpureum,Trifolium albopurpureum
+Trifolium albopurpureum var. columbinum,Trifolium columbinum
 Trifolium albopurpureum var. dichotomum,Trifolium dichotomum
 Trifolium albopurpureum var. olivaceum,Trifolium columbinum
 Trifolium amplectens var. hydrophilum,Trifolium hydrophilum
 Trifolium amplectens var. truncatum,Trifolium depauperatum var. truncatum
-Trifolium appendiculatum var. appendiculatum,Trifolium variegatum var. major
-Trifolium appendiculatum var. rostratum,Trifolium variegatum var. variegatum
+Trifolium appendiculatum var. rostratum,Trifolium variegatum
 Trifolium barbigerum var. andrewsii,Trifolium grayi
 Trifolium barbigerum var. barbigerum,Trifolium barbigerum
+Trifolium bifidum var. bifidum,Trifolium bifidum
+Trifolium bifidum var. decipiens,Trifolium bifidum
 Trifolium depauperatum var. hydrophilum,Trifolium hydrophilum
 Trifolium fucatum var. gambelii,Trifolium fucatum
 Trifolium fucatum var. virescens,Trifolium fucatum
-Trifolium geminiflorum,Trifolium variegatum var. geminiflorum
+Trifolium geminiflorum,Trifolium variegatum
 Trifolium gracilentum var. gracilentum,Trifolium gracilentum
 Trifolium gracilentum var. inconspicuum,Trifolium gracilentum
 Trifolium microdon var. pilosum,Trifolium microdon
 Trifolium minutissimum,Trifolium barbigerum
 Trifolium olivaceum,Trifolium columbinum,INAT
-Trifolium pauciflorum,Trifolium variegatum var. variegatum
+Trifolium pauciflorum,Trifolium variegatum
 Trifolium procumbens,Trifolium campestre
 Trifolium tomentosum var. tomentosum,Trifolium tomentosum
 Trifolium tridentatum var. aciculare,Trifolium willdenovii
 Trifolium tridentatum,Trifolium willdenovii
-Trifolium variegatum var. melananthum,Trifolium variegatum var. major
-Trifolium variegatum var. trilobatum,Trifolium variegatum var. variegatum
+Trifolium variegatum var. geminiflorum,Trifolium variegatum
+Trifolium variegatum var. pauciflorum,Trifolium variegatum
+Trifolium variegatum var. trilobatum,Trifolium variegatum
 Trillium chloropetalum var. giganteum,Trillium chloropetalum
 Trisetum cernuum var. canescens,Trisetum canescens
 Triteleia angustiflora,Triteleia laxa
@@ -2000,8 +2000,8 @@ Vulpia myuros var. myuros,Festuca myuros
 Vulpia octoflora var. hirtella,Festuca octoflora
 Vulpia octoflora,Festuca octoflora
 Woodwardia chamissoi,Woodwardia fimbriata
-Xanthium strumarium var. canadense,Xanthium strumarium
-Xanthium strumarium var. glabratum,Xanthium strumarium
+Xanthium strumarium var. canadense,Xanthium orientale
+Xanthium strumarium var. glabratum,Xanthium orientale
 Xerobotrys glaucus,Arctostaphylos glauca
 Zauschneria californica subsp. californica,Epilobium canum subsp. canum
 Zauschneria cana,Epilobium canum subsp. canum

package/data/taxa.csv

@@ -27,7 +27,7 @@ Acmispon parviflorus,least trefoil,N,91717,11299,57048
 Acmispon strigosus,,N,91722,11305,58152
 Acmispon wrangelianus,common trefoil,N,82483,11306,57050
 Actaea rubra,baneberry,N,11894,93,49870
-Adelinia grandis,hound's tongue,N,101954,14544,769151,blue
+Adelinia grandis,hound's tongue,N,101954,14544,1520640,blue
 Adenocaulon bicolor,American trailplant,N,721,94,56854
 Adenostoma fasciculatum,chamise,N,11939,97,47146
 Adiantum aleuticum,five-finger fern,N,11945,100,52667
@@ -201,7 +201,7 @@ Balsamorhiza deltoidea,,N,1634,1047,70383
 Balsamorhiza macrolepis,,N,1639,1051,69665,,,,350,1B.2,,,S2,G2
 Barbarea orthoceras,winter cress,N,15481,1057,52976
 Bassia hyssopifolia,,X,15511,1060,58125
-Bellardia trixago,,X,15566,1064,51286
+Bellardia trixago var. trixago,,X,8635,14706,1115038
 Bellis perennis,English daisy,X,1652,1065,55563
 Berberis aquifolium var. aquifolium,,N,71483,1068,126887
 Berberis aquifolium var. dictyota,,N,76967,1069,775436
@@ -846,8 +846,8 @@ Hesperevax acaulis var. ambusticola,fire evax,N,59934,4108,80930
 Hesperevax caulescens,hogwallow starfish,N,28021,4110,60135,,,,1931,4.2,,,S3,G3
 Hesperevax sparsiflora var. sparsiflora,,N,59937,4113,61172
 Hesperocnide tenella,black haired nettle,N,28033,4118,59036
-Hesperocyparis macrocarpa,Monterey cypress,N,89298,11190,322545,,,,536,1B.2,,,S1,G1
-Hesperocyparis sargentii,Sargent cypress,N,89302,10803,83149
+Hesperocyparis macrocarpa,Monterey cypress,N,89298,11190,77378,,,,536,1B.2,,,S1,G1
+Hesperocyparis sargentii,Sargent cypress,N,89302,10803,77381
 Hesperolinon breweri,Brewer's dwarf flax,N,28038,4121,77385,,,,404,1B.2,,,S2,G2
 Hesperolinon californicum,California dwarf flax,N,28039,4122,77386
 Hesperolinon clevelandii,,N,28040,4123,77387
@@ -1103,8 +1103,9 @@ Madia radiata,showy madia,N,4053,5296,77924,,,,1054,1B.1,,,S3,G3
 Madia sativa,coast tarweed,N,4055,5298,53143,yellow
 Maianthemum racemosum,false Solomon's seal,N,32495,10096,51062
 Maianthemum stellatum,,N,32497,9629,53268
+Malacothamnus arcuatus var. elmeri,,N,108345,14681,1497404
 Malacothamnus fremontii,white-coat mallow,N,32524,5312,70397
-Malacothamnus hallii,Hall's bush mallow,N,32519,5314,1497404,,,,1065,1B.2,,,S2,G2
+Malacothamnus hallii,,N,108345,14681,1497404,,,,1065,1B.2,,,S2,G2
 Malacothrix californica,,N,4059,5325,58026
 Malacothrix clevelandii,Cleveland's malacothrix,N,4060,5326,58841
 Malacothrix coulteri,snake's-head,N,4061,5327,58027
@@ -1145,7 +1146,7 @@ Mentha spicata,spearmint,X,33209,10111,62652
 Mentha suaveolens,pineapple mint,X,33212,5417,77993
 Mentzelia affinis,,N,33219,5418,58194
 Mentzelia dispersa,,N,33236,5423,58196
-Mentzelia laevicaulis,blazingstar,N,33250,5431,62308
+Mentzelia laevicaulis var. laevicaulis,blazingstar,N,61864,14741,241687
 Mentzelia lindleyi,,N,33255,5432,53923
 Mentzelia micrantha,,N,33259,5433,58933
 Mentzelia pectinata,,N,33274,5439,58198
@@ -1186,7 +1187,6 @@ Myosotis discolor,,X,34209,5721,70265
 Myosotis latifolia,forget-me-not,X,34211,5722,49132
 Myosotis laxa,,N,34212,5723,78150
 Myosurus minimus subsp. apus,little mousetail,N,,5731,181537,,,,1159,3.1,,,S2,G5T2Q
-Myosurus minimus subsp. minimus,,N,,,58306
 Myosurus minimus,mouse-tail,N,34224,5729,58306
 Myosurus sessilis,,N,34226,5732,60235
 Myriophyllum aquaticum,parrot's feather,X,34261,5735,60202
@@ -1378,7 +1378,7 @@ Pogogyne douglasii,,N,38936,6704,63943
 Pogogyne serpylloides,,N,38939,6708,57118
 Pogogyne zizyphoroides,,N,78298,6709,60209
 Polemonium carneum,royal sky pilot,N,38971,6712,78665,,,,3345,2B.2,,,S2,G3G4
-Polycarpon tetraphyllum var. tetraphyllum,four-leaved allseed,X,81542,11032,81277
+Polycarpon tetraphyllum subsp. tetraphyllum,four-leaved allseed,X,80560,14756,81277
 Polygonum argyrocoleon,persian knotweed,X,39158,6738,78676
 Polygonum aviculare subsp. aviculare,,X,80990,10667,80151
 Polygonum aviculare subsp. depressum,,X,80993,11034,63967
@@ -1728,8 +1728,7 @@ Trichostema lanceolatum,vinegar weed,N,46991,8032,54875
 Trifolium albopurpureum,Indian clover,N,47029,8043,58162
 Trifolium angustifolium,narrowleaf clover,X,47040,8051,69939
 Trifolium barbigerum,bearded clover,N,47049,8054,57074
-Trifolium bifidum var. bifidum,Pinole clover,N,73999,8059,61180
-Trifolium bifidum var. decipiens,,N,67259,8060,57075
+Trifolium bifidum,Pinole clover,N,47053,8058,60196
 Trifolium campestre,hop clover,X,47059,8064,57076
 Trifolium ciliolatum,foothill clover,N,47063,8065,60197
 Trifolium columbinum,olive clover,N,47030,13577,79425
@@ -1756,9 +1755,7 @@ Trifolium pratense,red clover,X,47160,8104,51875
 Trifolium repens,white clover,X,47164,8105,55745
 Trifolium subterraneum,subterranean clover,X,47174,8106,60201
 Trifolium tomentosum,woolly clover,X,47177,8586,61024
-Trifolium variegatum var. geminiflorum,,N,91702,12114,81436
-Trifolium variegatum var. major,,N,67348,12115,81437
-Trifolium variegatum var. variegatum,,N,74014,12116,81438
+Trifolium variegatum,,N,47179,8108,57080
 Trifolium willdenovii,tomcat clover,N,47186,8109,57081
 Trifolium wormskioldii,cow clover,N,47188,8110,71146
 Triglochin concinna var. concinna,slender arrow-grass,N,74018,8112,81439
@@ -1829,8 +1826,8 @@ Woodwardia fimbriata,giant chain fern,N,48619,8355,52685
 Wyethia angustifolia,narrowleaf mule-ears,N,5572,8356,56987,yellow
 Wyethia glabra,mules ears,N,5578,8359,56988,yellow
 Wyethia helenioides,woolly mules ears,N,5579,8360,50799,yellow
+Xanthium orientale,cocklebur,N,5618,14779,506262
 Xanthium spinosum,spiny cocklebur,X,5590,8366,58045
-Xanthium strumarium,cocklebur,N,5591,8367,57920
 Yabea microcarpa,California hedge parsley,N,48745,8373,56847
 Zannichellia palustris,horned-pondweed,N,48827,8379,79546
 Zantedeschia aethiopica,calla-lily,X,48829,8380,56006

package/ebook/css/main.css

@@ -8,14 +8,11 @@ div.flr {
     align-items: center;
 }
 
-img {
-    width: 100%;
-}
-
 img.flr {
     width: 1rem;
 }
 
-figure {
-    page-break-inside: avoid;
+/* Glossary */
+div.glossary img {
+    max-height: 300px;
 }

package/jekyll/_layouts/default.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link href="{{site.bootstrap-prefix}}/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
+        <title>{{page.title}}</title>
+        <link href="{{site.baseurl}}/assets/css/main.css" rel="stylesheet">
+    </head>
+
+    <body>
+
+        <nav class="navbar navbar-expand-md">
+            <div class="container-xxl px-5">
+                <button id="hamburger" class="navbar-toggler" type="button" data-bs-toggle="collapse"
+                data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
+                aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <a class="navbar-brand" href="{{'/' | relative_url}}">{{site.navbar-name}}</a>
+                <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                    <ul class="navbar-nav me-auto mb-lg-0">
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{site.baseurl}}/index_lists.html">Plant Lists</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{site.baseurl}}/rare_plants.html">Rare Plants</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{site.baseurl}}/name_search.html">Name Search</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{site.baseurl}}/glossary.html">Glossary</a>
+                        </li>
+                        {%include menu_extra.html %}
+                    </ul>
+                </div>
+            </div>
+        </nav>
+
+        <div class="container-xxl px-5">
+            {{content}}
+        </div>
+
+        <script src="{{site.bootstrap-prefix}}/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
+
+        {%if page.js%}
+            <script src="{{site.baseurl}}/assets/js/{{page.js}}" type="module"></script>{%endif%}
+
+            <script src="{{site.baseurl}}/assets/js/ui.js" type="module"></script>
+
+            {%include analytics.html%}
+        </body>
+
+    </html>

package/jekyll/_layouts/html.html

@@ -1,57 +1,6 @@
-<!DOCTYPE html>
-<html lang="en">
+---
+layout: default
+---
 
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href="{{site.bootstrap-prefix}}/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
-        <title>{{page.title}}</title>
-        <link href="{{site.baseurl}}/assets/css/main.css" rel="stylesheet">
-    </head>
-
-    <body>
-
-        <nav class="navbar navbar-expand-md">
-            <div class="container-xxl px-5">
-                <button id="hamburger" class="navbar-toggler" type="button" data-bs-toggle="collapse"
-                data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
-                aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <a class="navbar-brand" href="{{'/' | relative_url}}">{{site.navbar-name}}</a>
-                <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                    <ul class="navbar-nav me-auto mb-lg-0">
-                        <li class="nav-item">
-                            <a class="nav-link" href="{{site.baseurl}}/index_lists.html">Plant Lists</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="{{site.baseurl}}/rare_plants.html">Rare Plants</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="{{site.baseurl}}/name_search.html">Name Search</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="{{site.baseurl}}/glossary.html">Glossary</a>
-                        </li>
-                        {%include menu_extra.html %}
-                    </ul>
-                </div>
-            </div>
-        </nav>
-
-        <div class="container-xxl px-5">
-            <h1>{{page.title}}</h1>
-            {{content}}
-        </div>
-
-        <script src="{{site.bootstrap-prefix}}/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
-
-        {%if page.js%}
-            <script src="{{site.baseurl}}/assets/js/{{page.js}}" type="module"></script>{%endif%}
-
-            <script src="{{site.baseurl}}/assets/js/ui.js" type="module"></script>
-
-            {%include analytics.html%}
-        </body>
-
-    </html>
+<h1>{{page.title}}</h1>
+{{content}}

package/jekyll/assets/css/main.css

@@ -73,6 +73,11 @@ span.rare::before {
     content: "\2606";
 }
 
+/* Glossary */
+div.glossary img {
+    max-height: 300px;
+}
+
 /* Taxon Page */
 
 .common-names {

package/lib/basepagerenderer.js

@@ -1,24 +1,28 @@
 import { Config } from "./config.js";
 import { Families } from "./families.js";
 import { Files } from "./files.js";
+import { Jekyll } from "./jekyll.js";
+import { Taxa } from "./taxa.js";
 import { GlossaryPages } from "./web/glossarypages.js";
 
 class BasePageRenderer {
 
     static render( outputDir, taxa, familyCols ) {
 
+        const siteGenerator = new Jekyll( outputDir );
+
         // Copy static files
-        Files.rmDir( outputDir );
         // First copy default Jekyll files from package.
         Files.copyDir( Config.getPackageDir() + "/jekyll", outputDir );
         // Then copy Jekyll files from current dir (which may override default files).
         Files.copyDir( "jekyll", outputDir );
+
         // Copy illustrations.
-        Files.copyDir( Config.getPackageDir() + "/data/illustrations/optimized", outputDir + "/i" );
+        siteGenerator.copyIllustrations( Taxa.getFlowerColors() );
 
         Families.renderPages( outputDir, familyCols );
 
-        new GlossaryPages( outputDir ).renderPages();
+        new GlossaryPages( siteGenerator ).renderPages();
 
         this.renderTools( outputDir, taxa );
 

package/lib/commandandtaxaprocessor.js

@@ -1,4 +1,5 @@
 import { CommandProcessor } from "./commandprocessor.js";
+import { Files } from "./files.js";
 import { TaxaProcessor } from "./taxaprocessor.js";
 
 class CommandAndTaxaProcessor extends CommandProcessor {
@@ -14,6 +15,8 @@ class CommandAndTaxaProcessor extends CommandProcessor {
         if ( this.helpShown() ) {
             return;
         }
+        Files.rmDir( this.getOptions().outputdir );
+
         await this.#taxaProcessor.process( commandRunner );
     }
 

package/lib/ebook/ebooksitegenerator.js

@@ -0,0 +1,34 @@
+import { Files } from "../files.js";
+import { SiteGenerator } from "../sitegenerator.js";
+
+class EBookSiteGenerator extends SiteGenerator {
+
+    constructor( baseDir ) {
+        super( baseDir );
+    }
+
+    #pageEnd() {
+        return "</body></html>";
+    }
+
+    #pageStart( depth, attributes ) {
+        let html = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+        html += "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">";
+        html += "<head><title>" + attributes.title + "</title>";
+        html += "<link href=\"" + "../".repeat( depth ) + "css/main.css\" rel=\"stylesheet\" />";
+        html += "</head><body>";
+        return html;
+    }
+
+    #wrap( depth, content, attributes ) {
+        return this.#pageStart( depth, attributes ) + content + this.#pageEnd();
+    }
+
+    writeTemplate( content, attributes, filename ) {
+        const depth = ( filename.match( /\//g ) || [] ).length;
+        Files.write( Files.join( this.getBaseDir(), filename ), this.#wrap( depth, content, attributes ) );
+    }
+
+}
+
+export { EBookSiteGenerator };

package/lib/ebook/glossarypages.js

@@ -1,46 +1,15 @@
-import * as fs from "node:fs";
-
-import { EBookPage } from "./ebookpage.js";
-import { XHTML } from "./xhtml.js";
-
-import { HTML } from "../html.js";
-import { Markdown } from "../markdown.js";
+import { GlossaryPages as BaseGlossaryPages } from "../web/glossarypages.js";
 import { EBook } from "./ebook.js";
 
-import { Glossary } from "../plants/glossary.js";
-
-class GlossaryPages {
-
-    #glossary;
-
-    constructor() {
-        this.#glossary = new Glossary();
-    }
-
-    createPages( contentDir ) {
-
-        const termList = [];
-
-        // Create target directory.
-        const dirTarget = contentDir + "/g";
-        fs.mkdirSync( dirTarget, { recursive: true } );
-
-        for ( const entry of this.#glossary.getEntries() ) {
-
-            new PageGlossaryEntry( contentDir, entry ).create();
-
-            // Add term to index page list.
-            termList.push( HTML.getLink( "g/" + entry.getHTMLFileName(), entry.getTermName() ) );
-
-        }
+class GlossaryPages extends BaseGlossaryPages {
 
-        // Write glossary index page.
-        new PageGlossary( contentDir, termList ).create();
+    constructor( siteGenerator ) {
+        super( siteGenerator );
     }
 
     getManifestEntries() {
 
-        const glossaryEntries = this.#glossary.getEntries();
+        const glossaryEntries = this.getGlossary().getEntries();
         const manifestEntries = [];
 
         manifestEntries.push( EBook.getManifestEntry( "g", "glossary.html" ) );
@@ -54,7 +23,7 @@ class GlossaryPages {
 
     getSpineEntries() {
 
-        const glossaryEntries = this.#glossary.getEntries();
+        const glossaryEntries = this.getGlossary().getEntries();
         const spineEntries = [];
 
         spineEntries.push( EBook.getSpineEntry( "g", "glossary.html" ) );
@@ -68,34 +37,4 @@ class GlossaryPages {
 
 }
 
-class PageGlossary extends EBookPage {
-
-    #entries;
-
-    constructor( outputDir, entries ) {
-        super( outputDir + "/glossary.html", "Glossary" );
-        this.#entries = entries;
-    }
-
-    renderPageBody() {
-        const html = XHTML.textElement( "h1", this.getTitle() );
-        return html + XHTML.wrap( "ol", XHTML.arrayToLI( this.#entries ) );
-    }
-}
-
-class PageGlossaryEntry extends EBookPage {
-
-    #entry;
-
-    constructor( outputDir, entry ) {
-        super( outputDir + "/g/" + entry.getHTMLFileName(), entry.getTermName(), "../" );
-        this.#entry = entry;
-    }
-
-    renderPageBody() {
-        const html = XHTML.textElement( "h1", this.getTitle() );
-        return html + Markdown.strToHTML( this.#entry.getMarkdown() );
-    }
-}
-
 export { GlossaryPages };

package/lib/ebook/images.js

@@ -7,14 +7,17 @@ import { Config, CSV, Files } from "@ca-plant-list/ca-plant-list";
 
 import { Image } from "./image.js";
 import { EBook } from "./ebook.js";
+import { Taxa } from "../taxa.js";
 
 class Images {
 
-    #taxa;
+    #siteGenerator;
     #contentDir;
+    #taxa;
     #images = {};
 
-    constructor( contentDir, taxa ) {
+    constructor( siteGenerator, contentDir, taxa ) {
+        this.#siteGenerator = siteGenerator;
         this.#contentDir = contentDir;
         this.#taxa = taxa;
     }
@@ -55,20 +58,16 @@ class Images {
                 await Files.fetch( src, srcFileName );
             }
 
-            await new sharp( srcFileName ).resize( { width: 400 } ).jpeg( { quality: 40 } ).toFile( targetFileName );
+            await new sharp( srcFileName ).resize( { width: 300 } ).jpeg( { quality: 40 } ).toFile( targetFileName );
 
             imageList.push( new Image( imagePrefix + "/" + filename, row[ "credit" ] ) );
 
         }
 
-        this.#getIllustrations( this.#contentDir );
+        this.#siteGenerator.copyIllustrations( Taxa.getFlowerColors() );
 
     }
 
-    #getIllustrations() {
-        Files.copyDir( Config.getPackageDir() + "/data/illustrations/optimized", this.#contentDir + "/i" );
-    }
-
     getManifestEntries() {
 
         const entries = [];
@@ -83,6 +82,9 @@ class Images {
         return entries.join( "" );
     }
 
+    getTaxonImages( name ) {
+        return this.#images[ name ];
+    }
 }
 
 export { Images };

package/lib/ebook/pages/taxonpage.js

@@ -67,6 +67,7 @@ class TaxonPage extends EBookPage {
         html += renderCustomText( this.#taxon.getBaseFileName() );
 
         if ( this.#photos ) {
+            let photoHTML = "";
             for ( const photo of this.#photos ) {
                 const src = photo.getSrc();
                 const dimensions = sizeOf( this.#outputDir + "/" + src );
@@ -75,7 +76,10 @@ class TaxonPage extends EBookPage {
                 if ( caption ) {
                     img += XHTML.textElement( "figcaption", caption );
                 }
-                html += XHTML.wrap( "figure", img );
+                photoHTML += XHTML.wrap( "figure", img );
+            }
+            if ( photoHTML ) {
+                html += XHTML.wrap( "div", photoHTML );
             }
         }
 

package/lib/ebook/pages/tocpage.js

@@ -1,6 +1,6 @@
+import { Taxa } from "../../taxa.js";
 import { EBookPage } from "../ebookpage.js";
 import { XHTML } from "../xhtml.js";
-import { FLOWER_COLOR_NAMES } from "../../taxa.js";
 import { PageListFlowers } from "./page_list_flowers.js";
 
 class TOCPage extends EBookPage {
@@ -30,7 +30,7 @@ class TOCPage extends EBookPage {
     #getFlowerColorLinks() {
         const html = XHTML.textElement( "span", "Flower Color" );
         const links = [];
-        for ( const colorName of FLOWER_COLOR_NAMES ) {
+        for ( const colorName of Taxa.getFlowerColorNames() ) {
             links.push( XHTML.getLink( "list_fc_" + colorName + ".html", colorName ) );
         }
         return html + XHTML.wrap( "ol", XHTML.arrayToLI( links ) );