Skip to content

Commit

Permalink
Feature/radu issues (#39)
Browse files Browse the repository at this point in the history
* New epub test case from Radu

* Added SVG test topic to Radu's flowers test

* Issue #90: Updated submodules

Co-authored-by: Eliot Kimber <ekimber@contrext.com>
  • Loading branch information
drmacro and contrext committed Oct 31, 2021
1 parent 64b63d5 commit 868748b
Show file tree
Hide file tree
Showing 37 changed files with 769 additions and 3 deletions.
18 changes: 18 additions & 0 deletions test/dita/radu-epub-test/flowers/concepts/autumnFlowers.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
<concept id="autumnFlowers">
<title>Autumn Flowers</title>
<conbody>
<p>Autumn is the season of the primary harvest. Autumn falls during September - November in
the Northern hemisphere, and during March - June in the Southern hemisphere. Crops are
harvested during Autumn. Leaves change color are at their beautiful best.</p>
<p>Some of the flowers blooming in
autumn<indexterm>flowers<indexterm>autumn</indexterm></indexterm> are: Acashia,
Allium, Alstromeria, Amaranthus, Anemone, Baby's Breath, Bittersweet, Carnation, China
berry, Chrysanthemum, Cockscomb, Cosmos, Echinops, Freesia, Gerbera Daisy, Gladiolus,
Hypericum, Iris, Juniper, Kangaroo paw, Kalancheo, Liatrus, Lily, Asiatic, Lily,
Gloriosa, Misty Blue, Orchid, Pepper berry, Protea, Queen Ann's Lace, Quince, Rover,
Roses, Rowen berry, Salvia, Solidago, Statice, Star of Bethlehem, Sunflower, Yarrow,
Zinnia.</p>
</conbody>
</concept>
7 changes: 7 additions & 0 deletions test/dita/radu-epub-test/flowers/concepts/glossaryBulb.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE glossentry PUBLIC "-//OASIS//DTD DITA Glossary//EN" "glossary.dtd">
<glossentry id="flowers.bulb">
<glossterm>Bulb</glossterm>
<glossdef>A <term>bulb</term> is an underground vertical shoot that has modified leaves (or
thickened leaf bases) that are used as food storage organs by a dormant plant.</glossdef>
</glossentry>
11 changes: 11 additions & 0 deletions test/dita/radu-epub-test/flowers/concepts/glossaryCultivar.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE glossentry PUBLIC "-//OASIS//DTD DITA Glossary//EN" "glossary.dtd">
<glossentry id="flowers.cultivar">
<glossterm>Cultivar</glossterm>
<glossdef>A <term>cultivar</term> is a cultivated plant that has been selected and given a
unique name because of its decorative or useful characteristics; it is usually distinct from
similar plants and when propagated it retains those characteristics. The word
<term>cultivar</term> is generally regarded as a portmanteau of "<b>culti</b>vated" and
"<b>var</b>iety", but could also be derived from "<b>culti</b>gen"
"<b>var</b>iety".</glossdef>
</glossentry>
9 changes: 9 additions & 0 deletions test/dita/radu-epub-test/flowers/concepts/glossaryGenus.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE glossentry PUBLIC "-//OASIS//DTD DITA Glossary//EN" "glossary.dtd">
<glossentry id="flowers.genus">
<glossterm>Genus</glossterm>
<glossdef>A low-level taxonomic rank used in the classification of living and fossil organisms.
Other well-known taxonomic ranks are domain, kingdom, phylum, class, order, family, and
species, with <term>genus</term> fitting between family and species. The scientific name of
a genus may be called the generic name: it is always capitalized.</glossdef>
</glossentry>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE glossentry PUBLIC "-//OASIS//DTD DITA Glossary//EN" "glossary.dtd">
<glossentry id="flowers.panicle">
<glossterm>Panicle</glossterm>
<glossdef>A <term>panicle</term> is a compound raceme, a loose, much-branched indeterminate
inflorescence with pedicellate flowers (and fruit) attached along the secondary branches (in
other words, a branched cluster of flowers in which the branches are racemes).</glossdef>
</glossentry>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE glossentry PUBLIC "-//OASIS//DTD DITA Glossary//EN" "glossary.dtd">
<glossentry id="flowers.perennial">
<glossterm>Perennial</glossterm>
<glossdef>A <term>perennial plant</term> or <term>perennial</term> is a plant that lives for
more than two years. When used by gardeners or horticulturists, this term applies
specifically to perennial herbaceous plants. Scientifically, woody plants like shrubs and
trees are also perennial in their habit.</glossdef>
</glossentry>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE glossentry PUBLIC "-//OASIS//DTD DITA Glossary//EN" "glossary.dtd">
<glossentry id="flowers.pollination">
<glossterm>Pollination</glossterm>
<glossdef><term>Pollination</term> is the process by which pollen is transferred in plants,
thereby enabling fertilisation and sexual reproduction. Pollination is a necessary step in
the reproduction of flowering plants, resulting in the production of offsprings that are
genetically diverse.</glossdef>
</glossentry>
10 changes: 10 additions & 0 deletions test/dita/radu-epub-test/flowers/concepts/glossaryRhizome.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE glossentry PUBLIC "-//OASIS//DTD DITA Glossary//EN" "glossary.dtd">
<glossentry id="flowers.rhizome">
<glossterm>Rhizome</glossterm>
<glossdef>A <term>rhizome</term> is a characteristically horizontal stem of a plant that is
usually found underground, often sending out roots and shoots from its nodes. Some plants
have rhizomes that grow above ground or that lie at the soil surface, including some Iris
species, and ferns, whose spreading stems are rhizomes. Rhizomes may also be referred to as
creeping rootstalks, or rootstocks.</glossdef>
</glossentry>
15 changes: 15 additions & 0 deletions test/dita/radu-epub-test/flowers/concepts/glossarySepal.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE glossentry PUBLIC "-//OASIS//DTD DITA Glossary//EN" "glossary.dtd">
<glossentry id="flowers.sepal">
<glossterm>Sepal</glossterm>
<glossdef>A <term>sepal</term> (from Latin <i>separatus</i> "separate" + <i>petalum</i> "petal")
is a part of the flower of flowering plants. <term>Sepals</term> in a "typical" flower are
green and lie under the more conspicuous petals. As a collective unit the sepals are called
the <term>calyx</term>, and the collection of petals is called the <term>corolla</term>.
Together, these two structures are known as the <term>perianth</term> of the flower. The
petals and sepals are usually differentiated into colorful petals and green sepals. The term
<term>tepal</term> is usually applied when the petals and sepals are not differentiated
and look similar or the petals are absent and the sepals are colorful. When the flower is in
bud, the sepals enclose and protect the more delicate floral parts within. Morphologically
they are modified leaves.</glossdef>
</glossentry>
20 changes: 20 additions & 0 deletions test/dita/radu-epub-test/flowers/concepts/springFlowers.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
<concept id="springFlowers">
<title>Spring Flowers</title>
<conbody>
<p>Spring Time, the time of growth and renewal of new plant and animal life. Spring comes at
different times in the North and South Hemispheres. Spring time in the Northern
hemisphere is between March - May, and between September - November in the Southern
hemisphere. Most flowering plants bloom during spring time. Therefore, flowers that
bloom only during spring, Spring Flowers, bloom at different times in the two
hemispheres. </p>
<p>Some of the flowers blooming in Spring are: Agapanthus, Amaryllis,
Anemone, Apple blossom, Bird of Paradise, Brodea, Calla lily, Cherry Blossom, Corn
flower, Cosmose, Dahlia, Delphinium, Delwood, Forsythia, Freesia, Gardenia, Heather,
Helleborus, Hollyhock, Hyacinth, Larkspur, Casa Blanca Lily, Gloriosa Lily, Stargazer,
Liatrus, Lilac, Lisianthus, Narcissus, Orchid, Peach blossom, Peony, Phlox, Poppy,
Protea, Pussy willow, Ranunculus, Rose, Seeded Eucalyptus, Solidago, Statice,
Stephanotis, Stock, Sweet Pea, Tulip, Viburnum, Wax flower, Zinnia. </p>
</conbody>
</concept>
16 changes: 16 additions & 0 deletions test/dita/radu-epub-test/flowers/concepts/summerFlowers.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
<concept id="summerFlowers">
<title>Summer Flowers</title>
<conbody>
<p>Summer is the time of hot and warm weather. Floral growth is the best in the summer
season. The Northern hemisphere experiences summer during June, July, August, while in
Southern hemisphere during December - February.</p>
<p>Some of the flowers blooming in summer are: Alchemilla, Allium,
Alstromeria, Amaranthus, Baby's Breath, Bird of Paradise, Calla lily, Campanula,
Carnation, Chrysanthemum, Cockscomb, Cosmos, Dahlia, Delphinium, Dianthus, Didiscus,
Euphorbia, Foxglove, Freesia, Gardenia, Genista, Ginger, Gladiolus, Hallaconia, Heather,
Hydrangea, Hypericum, Iris, Kangaroo paw, Liatrus, Lilac, Casa Blanca Lily, Gloriosa
Lily, Star Gazer, Lisianthus.</p>
</conbody>
</concept>
21 changes: 21 additions & 0 deletions test/dita/radu-epub-test/flowers/concepts/winterFlowers.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
<concept id="winterFlowers">
<title>Winter Flowers</title>
<conbody>
<p>Winter is the season of cold weather. The season occurs during December - February in
Northern
hemisphere<?oxy_delete author="Mary" timestamp="20120510T124126+0300" content=" " comment="Delete any extra spacing before and after punctuation marks."?>.
In the Southern hemisphere winter occurs during June - August. </p>
<p>Some of the flowers blooming
<?oxy_delete author="Mary" timestamp="20120510T124054+0300" content=" " comment="Also use a single space between words."?>in
winter are: Acashia, Alstromeria, Amaryllis, Carnation, Chrysanthemums, Cyclamen,
Evergreens, Gerbera Daisy, Ginger, Helleborus, Holly berry, Lily, Asiatic Lily, Casa
Blanca Lily,
<?oxy_comment_start author="John" timestamp="20120510T124636+0300" comment="We should include one more topic with information about Narcissus."?>Narcissus<?oxy_comment_end?>,
Orchid, Pansy, Pepperberry, Phlox, Protea, Queen Ann's Lace,
<?oxy_comment_start author="Bob" timestamp="20120510T124701+0300" comment="It&apos;s a good idea to add more plants (consider including also Roses)."?>Roses<?oxy_comment_end?>,
Star of Bethlehem, Statice. </p>
</conbody>
</concept>
<?oxy_options track_changes="on"?>
64 changes: 64 additions & 0 deletions test/dita/radu-epub-test/flowers/flowers.ditamap
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">
<map>
<title>Growing Flowers</title>
<topicref href="topics/introduction.dita">
<topicmeta>
<data name="wh-tile">
<data name="hide" value="yes"/>
</data>
</topicmeta>
</topicref>
<topicref href="topics/care.dita">
<topicref href="tasks/pruning.dita"/>
<topicref href="tasks/gardenPreparation.dita"/>
<topicref href="topics/svg_test.dita"/>
</topicref>
<topicref href="topics/index.dita" collection-type="sequence">
<topicref href="concepts/springFlowers.dita" collection-type="sequence">
<topicref href="topics/flowers/iris.dita"/>
<topicref href="topics/flowers/snowdrop.dita"/>
</topicref>
<topicref href="concepts/summerFlowers.dita" collection-type="sequence">
<topicref href="topics/flowers/gardenia.dita"/>
<topicref href="topics/flowers/lilac.dita"/>
</topicref>
<topicref href="concepts/autumnFlowers.dita" collection-type="sequence">
<topicref href="topics/flowers/chrysanthemum.dita"/>
<topicref href="topics/flowers/salvia.dita"/>
</topicref>
<topicref href="concepts/winterFlowers.dita" collection-type="sequence">
<topicref href="topics/flowers/gerbera.dita"/>
</topicref>
</topicref>
<?oxy_comment_start author="Mary" timestamp="20120510T115308+0300" comment="We should review the list of glossary terms. I think there are many technical terms in the documentation that need to be addressed."?>
<topichead navtitle="Glossary" id="glossary">
<topicmeta>
<shortdesc>Definitions of the most commonly used gardening terms.</shortdesc>
</topicmeta>
<?oxy_comment_end?>
<topicref navtitle="Genus" href="concepts/glossaryGenus.dita"
keys="genus" print="yes"/>
<topicref navtitle="Pollination" href="concepts/glossaryPollination.dita"
keys="pollination" print="yes"/>
<topicref navtitle="Sepal" href="concepts/glossarySepal.dita"
keys="sepal" print="yes"/>
<topicref navtitle="Rhizome" href="concepts/glossaryRhizome.dita"
keys="rhizome" print="yes"/>
<topicref navtitle="Bulb" href="concepts/glossaryBulb.dita"
keys="bulb" print="yes"/>
<topicref navtitle="Cultivar" href="concepts/glossaryCultivar.dita"
keys="cultivar" print="yes"/>
<topicref navtitle="Perennial" href="concepts/glossaryPerennial.dita"
keys="perennial" print="yes"/>
<topicref navtitle="Panicle" href="concepts/glossaryPanicle.dita"
keys="panicle" print="yes"/>
</topichead>
<topicref href="topics/copyright.dita">
<topicmeta>
<data name="wh-tile">
<data name="hide" value="yes"/>
</data>
</topicmeta>
</topicref>
</map>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test/dita/radu-epub-test/flowers/images/Lilac.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 43 additions & 0 deletions test/dita/radu-epub-test/flowers/tasks/gardenPreparation.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
<task id="gardenPreparation">
<title>Garden Preparation</title>
<taskbody>
<context>
<p>An appreciation of the conditions under which bulbs grow in nature is of considerable
help in understanding their needs in
cultivation<indexterm>general<indexterm>care<indexterm>cultivation</indexterm></indexterm></indexterm>,
but is by no means all-sufficient. When plants are grown away from their native
homes-and perhaps are accommodated in pots indoors-they may respond to quite
different soils, temperatures, moisture conditions, etc., than those to which they
are subjected in the
wild.<indexterm>tasks<indexterm>preparation</indexterm></indexterm>
</p>
</context>
<steps>
<step>
<cmd>Handle bulbs carefully. Any scarred or punctured bulb is more susceptible to
decay or
infestation.<indexterm>general<indexterm>planting</indexterm></indexterm></cmd>
</step>
<step>
<cmd>Make sure that the <b>soil</b> is the <i>proper</i> one. This might be hard to
achieve, but generally an earth midway between sand and clay and containing a
generous measure of organic matter is what most plants want.</cmd>
</step>
<step>
<cmd>All plants need <b>watering</b>, but you should also provide good drainage. An
overabundance of water around bulbs during the dormant period is particularly
harmful. </cmd>
</step>
<step>
<cmd>Plants respond to fertile soil, but <b>fertilizers</b> must not be used
carelessly. Improper dosage can do more harm than good.</cmd>
</step>
<step>
<cmd>When dealing with <b>insects</b> and <b>diseases</b>, proper diagnosis of the
trouble is of primary importance.</cmd>
</step>
</steps>
</taskbody>
</task>
42 changes: 42 additions & 0 deletions test/dita/radu-epub-test/flowers/tasks/pruning.dita
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">
<task id="prunning">
<title>Pruning</title>
<taskbody>
<context>
<p><b>Pruning</b> is the
process<indexterm>tasks<indexterm>pruning</indexterm></indexterm> of removing
certain above-ground elements from a plant; in landscaping this process usually
involves <indexterm>tasks<indexterm>preparation</indexterm></indexterm>removal of
diseased, non-productive, or otherwise unwanted portions from a plant. In nature,
certain meteorological conditions such as wind, snow or seawater mist can conduct a
when for natural pruning process. The purpose of anthropomorphic pruning is to shape
the plant by controlling or directing plant growth, to maintain the health of the
plant, or to increase the yield or quality of flowers and fruits.</p>
<p>In general the smaller the wound (smaller the branch that is cut) the less harm to
the tree. It is therefore typically better to formative prune the tree when juvenile
than try to cut off large branches on a mature tree.</p>
<p><?oxy_comment_start author="John" timestamp="20120510T110753+0300" comment="A list of tools required for prunning should be also provided to the reader (like:
Rope Saws, Pole Prunner and Lopper, Folding Prunner, Portable Buck Saws)."?>Follow
these simple steps:<?oxy_comment_end?></p>
</context>
<steps>
<step>
<cmd>Begin by cutting out all the dead branches.</cmd>
</step>
<step>
<cmd>Remove all tangled or crossed over branches. This allows air to circulate and
reduces bug and fungi infestation. </cmd>
</step>
<step>
<cmd>Take your time! Work comfortably and do not make shortcuts when cutting stems.
Use good quality, sharp tools.</cmd>
</step>
<step>
<cmd>Clean up the area.
<?oxy_comment_start author="Mary" timestamp="20120510T110831+0300" comment="Burning the pest infested branches should be done under supervision. Please mention this."?>Burn
all pest infested branches<?oxy_comment_end?>. </cmd>
</step>
</steps>
</taskbody>
</task>

0 comments on commit 868748b

Please sign in to comment.