@ca-plant-list/ca-plant-list 0.2.17 → 0.3.0

package/data/illustrations/inkscape/asteraceae_floret.svg

@@ -2,13 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   width="82.437302mm"
-   height="84.504379mm"
-   viewBox="0 0 82.437302 84.504379"
+   width="128.66954"
+   height="142.59889"
+   viewBox="0 0 128.66954 142.59889"
    version="1.1"
    id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
-   sodipodi:docname="pappus.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   sodipodi:docname="asteraceae_floret.svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -23,16 +23,35 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="1"
-     inkscape:cx="215"
-     inkscape:cy="258.5"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="2.59"
+     inkscape:cx="140.73359"
+     inkscape:cy="30.694981"
      inkscape:window-width="1920"
      inkscape:window-height="991"
      inkscape:window-x="-9"
      inkscape:window-y="-9"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     inkscape:current-layer="layer1"
+     showguides="false">
+    <inkscape:grid
+       id="grid1"
+       units="mm"
+       originx="-39.627926"
+       originy="-40.140491"
+       spacingx="0.99999998"
+       spacingy="1"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true" />
+  </sodipodi:namedview>
   <defs
      id="defs1">
     <marker
@@ -59,99 +78,122 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-48.054274,-6.5122836)">
+     transform="translate(-39.627926,-40.140491)">
     <path
-       style="fill:#959595;fill-opacity:1;stroke:none;stroke-width:2.065;stroke-dasharray:2.065, 2.065"
-       id="path1"
+       style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none"
+       id="path7"
        sodipodi:type="arc"
-       sodipodi:cx="73.289581"
-       sodipodi:cy="59.928123"
-       sodipodi:rx="8.4666662"
-       sodipodi:ry="31.088541"
-       sodipodi:start="5.4977871"
-       sodipodi:end="3.9269908"
        sodipodi:arc-type="chord"
-       d="m 79.276418,37.945204 a 8.4666662,31.088541 0 0 1 1.835343,33.879988 8.4666662,31.088541 0 0 1 -7.82218,19.191473 8.4666662,31.088541 0 0 1 -7.822179,-19.191471 8.4666662,31.088541 0 0 1 1.835342,-33.879988 z"
-       sodipodi:open="true" />
-    <path
-       style="fill:#959595;fill-opacity:1;stroke:#888888;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1"
-       d="m 48.252744,13.074373 19.05,24.870833"
-       id="path2" />
+       sodipodi:open="true"
+       sodipodi:start="5.2359878"
+       sodipodi:end="4.1887902"
+       sodipodi:ry="56.11969"
+       sodipodi:rx="27.5"
+       sodipodi:cy="126.11969"
+       sodipodi:cx="72.5"
+       d="M 86.250001,77.518614 A 27.5,56.11969 0 0 1 99.06296,140.64454 27.5,56.11969 0 0 1 72.5,182.23938 27.5,56.11969 0 0 1 45.93704,140.64453 27.5,56.11969 0 0 1 58.75,77.518613 Z" />
     <path
-       style="fill:#959595;fill-opacity:1;stroke:#888888;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1"
-       d="M 98.326427,13.074373 79.276418,37.945204"
-       id="path3" />
+       style="fill:none;stroke:#000000;stroke-width:1;stroke-dasharray:none"
+       d="M 58.75,77.518613 40.060939,45.148209"
+       id="path8"
+       inkscape:transform-center-x="9.3445304"
+       inkscape:transform-center-y="-16.185202"
+       inkscape:tile-cx="58.75"
+       inkscape:tile-cy="77.518613"
+       inkscape:tile-w="19.555086"
+       inkscape:tile-h="32.870404"
+       inkscape:tile-x0="39.627926"
+       inkscape:tile-y0="44.898209" />
     <use
        x="0"
        y="0"
-       xlink:href="#path3"
-       id="use3"
-       transform="rotate(-17.225801,77.256566,49.067977)"
-       inkscape:transform-center-x="-5.3061657"
-       inkscape:transform-center-y="-14.176349" />
-    <path
-       style="fill:#959595;fill-opacity:1;stroke:#888888;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1"
-       d="M 55.685646,9.6812171 69.484073,37.807082"
-       id="path4"
-       inkscape:transform-center-x="7.1157592"
-       inkscape:transform-center-y="-13.630721" />
-    <path
-       style="fill:#959595;fill-opacity:1;stroke:#888888;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1"
-       d="M 62.704903,7.5472606 70.994496,37.758907"
-       id="path5"
-       inkscape:transform-center-x="4.4384202"
-       inkscape:transform-center-y="-14.721786" />
+       inkscape:tiled-clone-of="#path8"
+       xlink:href="#path8"
+       id="use26"
+       inkscape:transform-center-x="9.3445304"
+       inkscape:transform-center-y="-16.185202" />
     <use
        x="0"
        y="0"
-       xlink:href="#path3"
-       id="use5"
-       transform="rotate(-5.8666313,77.04993,56.396766)"
-       inkscape:transform-center-x="-7.994383"
-       inkscape:transform-center-y="-12.853564" />
+       inkscape:tiled-clone-of="#path8"
+       xlink:href="#path8"
+       transform="rotate(10,61.0575,103.89346)"
+       id="use27"
+       inkscape:transform-center-x="6.3920353"
+       inkscape:transform-center-y="-17.561973" />
     <use
        x="0"
        y="0"
-       xlink:href="#path3"
-       id="use7"
-       transform="rotate(-27.320113,76.390936,49.026984)"
-       inkscape:transform-center-x="-2.7393548"
-       inkscape:transform-center-y="-14.886914" />
-    <path
-       style="fill:#959595;fill-opacity:1;stroke:#888888;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1"
-       d="M 69.880592,6.5375884 73.05161,37.704968"
-       id="path7"
-       inkscape:transform-center-x="1.9386867"
-       inkscape:transform-center-y="-15.253592" />
+       inkscape:tiled-clone-of="#path8"
+       xlink:href="#path8"
+       transform="rotate(20,63.365,103.69158)"
+       id="use28"
+       inkscape:transform-center-x="3.2453215"
+       inkscape:transform-center-y="-18.405132" />
+    <use
+       x="0"
+       y="0"
+       inkscape:tiled-clone-of="#path8"
+       xlink:href="#path8"
+       transform="rotate(30,65.6725,103.35374)"
+       id="use29"
+       inkscape:transform-center-x="-1.7651854e-06"
+       inkscape:transform-center-y="-18.689061" />
+    <use
+       x="0"
+       y="0"
+       inkscape:tiled-clone-of="#path8"
+       xlink:href="#path8"
+       transform="rotate(40,67.980001,102.87783)"
+       id="use30"
+       inkscape:transform-center-x="-3.2453207"
+       inkscape:transform-center-y="-18.405133" />
+    <use
+       x="0"
+       y="0"
+       inkscape:tiled-clone-of="#path8"
+       xlink:href="#path8"
+       transform="rotate(50,70.287501,102.26086)"
+       id="use31"
+       inkscape:transform-center-x="-6.3920329"
+       inkscape:transform-center-y="-17.561974" />
+    <use
+       x="0"
+       y="0"
+       inkscape:tiled-clone-of="#path8"
+       xlink:href="#path8"
+       transform="rotate(60,72.595001,101.49886)"
+       id="use32"
+       inkscape:transform-center-x="-9.3445322"
+       inkscape:transform-center-y="-16.185201" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;writing-mode:lr-tb;fill:#050000;fill-opacity:1;stroke:#020000;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
-       x="114.47877"
-       y="66.073151"
-       id="text7"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-dasharray:none"
+       x="141.38007"
+       y="67.039993"
+       id="text1"><tspan
          sodipodi:role="line"
-         id="tspan7"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;writing-mode:lr-tb;fill:#050000;fill-opacity:1;stroke:#020000;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
-         x="114.47877"
-         y="66.073151">achene</tspan></text>
+         id="tspan1"
+         x="141.38007"
+         y="67.039993">pappus</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;writing-mode:lr-tb;fill:#050000;fill-opacity:1;stroke:#020000;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
-       x="114.47877"
-       y="28.502281"
-       id="text9"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-dasharray:none"
+       x="142.3334"
+       y="128.23164"
+       id="text2"><tspan
          sodipodi:role="line"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;writing-mode:lr-tb;fill:#050000;fill-opacity:1;stroke:#020000;stroke-width:0;stroke-dasharray:none;stroke-opacity:1"
-         x="114.47877"
-         y="28.502281"
-         id="tspan10">pappus</tspan></text>
+         id="tspan2"
+         x="142.3334"
+         y="128.23164">achene</tspan></text>
     <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.420432;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Triangle)"
-       d="m 88.996236,65.009182 20.886414,-0.125543 v 0"
-       id="path16" />
+       style="fill:#000000;stroke:#000000;marker-end:url(#Triangle)"
+       d="M 135,65 H 100"
+       id="path1" />
     <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.420432;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Triangle)"
-       d="m 90.583737,27.967492 20.886423,-0.125543 v 0"
-       id="path17" />
+       style="fill:#000000;stroke:#000000;marker-end:url(#Triangle)"
+       d="M 135,125.41524 H 105"
+       id="path2"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>

package/data/illustrations/inkscape/peduncle.svg

@@ -7,7 +7,7 @@
    viewBox="0 0 102.55142 60"
    version="1.1"
    id="svg1"
-   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   inkscape:version="1.3.1 (91b66b0783, 2023-11-16)"
    sodipodi:docname="peduncle.svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -26,14 +26,14 @@
      inkscape:document-units="px"
      showgrid="true"
      inkscape:zoom="4"
-     inkscape:cx="50.625"
+     inkscape:cx="50.75"
      inkscape:cy="59.875"
      inkscape:window-width="1920"
      inkscape:window-height="991"
      inkscape:window-x="-9"
      inkscape:window-y="-9"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer1">
+     inkscape:current-layer="g1">
     <inkscape:grid
        id="grid1"
        units="px"
@@ -78,7 +78,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
-       style="fill:#14140c;fill-opacity:1;stroke:#160707;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
        d="M 15,60 V 15"
        id="path2" />
     <use
@@ -135,36 +135,40 @@
        inkscape:tile-h="30"
        inkscape:tile-x0="12.5"
        inkscape:tile-y0="0" />
-    <path
-       style="fill:#14140c;fill-opacity:1;stroke:#160707;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Triangle)"
-       d="M 20,45 H 45"
-       id="path3" />
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0.5px;opacity:0.558428;fill:#14140c;fill-opacity:1;stroke:#160707;stroke-width:0.1;stroke-dasharray:none;stroke-opacity:1"
-       x="50"
-       y="47.068359"
-       id="text3"><tspan
-         sodipodi:role="line"
-         id="tspan3"
-         x="50"
+    <g
+       id="g1"
+       style="stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1">
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Triangle);stroke-dashoffset:0"
+         d="M 20,45 H 45"
+         id="path3" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Triangle);stroke-dashoffset:0"
+         d="M 35,15 H 45"
+         id="path4"
+         sodipodi:nodetypes="cc" />
+      <text
+         xml:space="preserve"
+         style="font-size:8px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0.5px;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-dasharray:none;stroke-opacity:1"
+         x="49.522655"
          y="47.068359"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0.5px;stroke-width:0.1;stroke-dasharray:none">peduncle</tspan></text>
-    <path
-       style="fill:#14140c;fill-opacity:1;stroke:#160707;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Triangle)"
-       d="M 35,15 H 45"
-       id="path4"
-       sodipodi:nodetypes="cc" />
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0.5px;opacity:0.558428;fill:#14140c;fill-opacity:1;stroke:#160707;stroke-width:0.1;stroke-dasharray:none;stroke-opacity:1"
-       x="49.696735"
-       y="17.068359"
-       id="text4"><tspan
-         sodipodi:role="line"
-         id="tspan4"
-         x="49.696735"
-         y="17.068359"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0.5px;stroke-width:0.1;stroke-dasharray:none">inflorescence</tspan></text>
+         id="text3"><tspan
+           sodipodi:role="line"
+           id="tspan3"
+           x="49.522655"
+           y="47.068359"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0.5px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-dasharray:none;stroke-opacity:1">peduncle</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:8px;font-family:Arial;-inkscape-font-specification:Arial;letter-spacing:0.5px;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-dasharray:none;stroke-opacity:1"
+         x="49.518749"
+         y="17.068218"
+         id="text4"><tspan
+           sodipodi:role="line"
+           id="tspan4"
+           x="49.518749"
+           y="17.068218"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0.5px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-dasharray:none;stroke-opacity:1">inflorescence</tspan></text>
+    </g>
   </g>
 </svg>

package/data/synonyms.csv

@@ -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
@@ -904,6 +905,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 +976,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 +1085,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 +1102,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
@@ -1122,7 +1121,6 @@ Medicago polymorpha var. brevispina,Medicago polymorpha
 Medicago sativa subsp. falcata,Medicago sativa
 Medicago sativa subsp. sativa,Medicago sativa
 Mentha arvensis var. canadensis,Mentha canadensis
-Mentha arvensis var. villosa,Mentha canadensis
 Mentha citrata,Mentha aquatica
 Mentzelia dispersa var. compacta,Mentzelia dispersa
 Mentzelia dispersa var. dispersa,Mentzelia dispersa
@@ -1352,8 +1350,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 +1824,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 +1856,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 +1909,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 +1998,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

@@ -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,1064,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
@@ -1104,7 +1104,7 @@ 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 fremontii,white-coat mallow,N,32524,5312,70397
-Malacothamnus hallii,Hall's bush mallow,N,32519,5314,1497404,,,,1065,1B.2,,,S2,G2
+Malacothamnus arcuatus var. elmeri,,N,108345,14681,1497404
 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 +1145,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,5431,241687
 Mentzelia lindleyi,,N,33255,5432,53923
 Mentzelia micrantha,,N,33259,5433,58933
 Mentzelia pectinata,,N,33274,5439,58198
@@ -1186,7 +1186,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 +1377,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,11032,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 +1727,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 +1754,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 +1825,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,8367,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>