add future chapter

This commit is contained in:
lingdocs 2021-07-18 12:22:46 +03:00
parent 3e2ca7b074
commit f10a46d489
12 changed files with 946 additions and 21 deletions

View File

@ -4,7 +4,7 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.15.2", "@fortawesome/fontawesome-free": "^5.15.2",
"@lingdocs/pashto-inflector": "^0.7.0", "@lingdocs/pashto-inflector": "^0.8.1",
"@testing-library/jest-dom": "^4.2.4", "@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2", "@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2", "@testing-library/user-event": "^7.1.2",

View File

@ -22,6 +22,7 @@ import * as verbAspect from "!babel-loader!mdx-loader!./verbs/verb-aspect.mdx";
import * as verbsIntro from "!babel-loader!mdx-loader!./verbs/verbs-intro.mdx"; import * as verbsIntro from "!babel-loader!mdx-loader!./verbs/verbs-intro.mdx";
import * as presentVerbs from "!babel-loader!mdx-loader!./verbs/present-verbs.mdx"; import * as presentVerbs from "!babel-loader!mdx-loader!./verbs/present-verbs.mdx";
import * as subjunctiveVerbs from "!babel-loader!mdx-loader!./verbs/subjunctive-verbs.mdx"; import * as subjunctiveVerbs from "!babel-loader!mdx-loader!./verbs/subjunctive-verbs.mdx";
import * as futureVerbs from "!babel-loader!mdx-loader!./verbs/future-verbs.mdx";
import * as verbEndings from "!babel-loader!mdx-loader!./verbs/verb-endings.mdx"; import * as verbEndings from "!babel-loader!mdx-loader!./verbs/verb-endings.mdx";
import * as rootsAndStems from "!babel-loader!mdx-loader!./verbs/roots-and-stems.mdx"; import * as rootsAndStems from "!babel-loader!mdx-loader!./verbs/roots-and-stems.mdx";
import * as sentenceStructure from "!babel-loader!mdx-loader!./verbs/sentence-structure.mdx"; import * as sentenceStructure from "!babel-loader!mdx-loader!./verbs/sentence-structure.mdx";
@ -101,6 +102,10 @@ const contentTree = [
import: subjunctiveVerbs, import: subjunctiveVerbs,
slug: "subjunctive-verbs", slug: "subjunctive-verbs",
}, },
{
import: futureVerbs,
slug: "future-verbs",
},
{ {
import: verbEndings, import: verbEndings,
slug: "verb-endings", slug: "verb-endings",

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

View File

@ -0,0 +1,91 @@
---
title: Future
---
import {
defaultTextOptions as opts,
Examples,
InlinePs,
removeFVariants,
ConjugationViewer,
} from "@lingdocs/pashto-inflector";
import cousins from "./cousins.png";
import psmd from "../../lib/psmd";
import Carousel from "../../components/Carousel";
import Link from "../../components/Link";
import Formula from "../../components/formula/Formula";
import verbs from "../../words/verbs";
import shuffleArray from "../../lib/shuffle-array";
import imperfectiveFuture from "./imperfective-future-graph.svg";
import perfectiveFuture from "./perfective-future-graph.svg";
export const basicVerbs = verbs.filter((v) => !v.entry.c?.includes("gramm. trans."));
There are two kinds of future forms in Pashto:
2. <i class="fas fa-video" /> Imperfective Future
1. <i class="fas fa-camera" /> Perfective Future
## Imperfective Future
This is used to talk about something happening in the future, while thinking of the event as an ongoing or recurring event. It can also be used to stress the certainty of the event happening.
<div className="text-center">
<img src={imperfectiveFuture} alt="" className="img-fluid" />
</div>
<Formula>
<InlinePs opts={opts} ps={{ p: "به", f: "ba" }} /> +{` `}
<Link to="/verbs/present-verbs/">Present</Link>
</Formula>
<Carousel stickyTitle items={shuffleArray(basicVerbs)} render={(item) => {
return {
title: <InlinePs opts={opts} ps={{
...removeFVariants(item.entry),
e: item.def,
}} />,
body: <div style={{ textAlign: "left" }}>
<ConjugationViewer
entry={item.entry}
textOptions={opts}
highlightInRootsAndStems={["imperfective stem"]}
showOnly={["Present", "Imperfective Future"]}
hidePastParticiple
sentenceLevel="easy"
/>
</div>,
};
}}/>
## Perfective Future
This is used to talk about something happening in the future, while thinking of the event *as a whole* or as a one time event. It can also be used when there is a little less certainty that the event will happen.
<div className="text-center">
<img src={perfectiveFuture} alt="" className="img-fluid" />
</div>
<Formula>
<InlinePs opts={opts} ps={{ p: "به", f: "ba" }} /> +{` `}
<Link to="/verbs/subjunctive-verbs/">Subjunctive</Link>
</Formula>
<Carousel stickyTitle items={shuffleArray(basicVerbs)} render={(item) => {
return {
title: <InlinePs opts={opts} ps={{
...removeFVariants(item.entry),
e: item.def,
}} />,
body: <div style={{ textAlign: "left" }}>
<ConjugationViewer
entry={item.entry}
textOptions={opts}
highlightInRootsAndStems={["Perfective stem"]}
showOnly={["Subjunctive", "Perfective Future"]}
hidePastParticiple
sentenceLevel="easy"
/>
</div>,
};
}}/>

View File

@ -0,0 +1,411 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="531.7431"
height="164.3564"
viewBox="0 0 140.69031 43.485966"
version="1.1"
id="svg8"
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
sodipodi:docname="imperfective-future.svg">
<defs
id="defs2">
<rect
x="121.9088"
y="7.8961401"
width="56.433346"
height="18.811117"
id="rect6050" />
<rect
x="107.62167"
y="38.37397"
width="41.756546"
height="15.296953"
id="rect5964" />
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path1352"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<rect
x="37.338371"
y="5.0927606"
width="52.299042"
height="14.883522"
id="rect5876" />
<marker
inkscape:stockid="Arrow1Mstart"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mstart"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path1349"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
transform="matrix(0.4,0,0,0.4,4,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Lend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Lend"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path1346"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
transform="matrix(-0.8,0,0,-0.8,-10,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Lstart"
orient="auto"
refY="0"
refX="0"
id="marker1631"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path1629"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
transform="matrix(0.8,0,0,0.8,10,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Lstart"
orient="auto"
refY="0"
refX="0"
id="marker1615"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path1613"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
transform="matrix(0.8,0,0,0.8,10,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Lstart"
orient="auto"
refY="0"
refX="0"
id="Arrow1Lstart"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path1343"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
transform="matrix(0.8,0,0,0.8,10,0)" />
</marker>
<rect
x="62.350956"
y="47.882885"
width="66.975845"
height="16.33053"
id="rect1054" />
<rect
id="rect1910"
height="26.602938"
width="109.33515"
y="-7.9594593"
x="78.980247" />
<rect
id="rect1904"
height="12.862959"
width="71.915634"
y="2.4186096"
x="38.637333" />
<rect
id="rect1742"
height="22.867559"
width="43.65625"
y="33.489403"
x="49.46875" />
<rect
x="26.647322"
y="26.647322"
width="34.962795"
height="14.552084"
id="rect837" />
<rect
id="rect837-8"
height="14.552084"
width="34.962795"
y="26.647322"
x="26.647322" />
<rect
id="rect852"
height="14.552084"
width="34.962795"
y="26.647322"
x="26.647322" />
<rect
x="49.46875"
y="33.489403"
width="43.65625"
height="22.867559"
id="rect1742-2" />
<rect
x="49.46875"
y="33.489403"
width="43.65625"
height="22.867559"
id="rect1755" />
<rect
x="49.46875"
y="33.489403"
width="43.65625"
height="22.867559"
id="rect1742-5" />
<rect
x="49.46875"
y="33.489403"
width="43.65625"
height="22.867559"
id="rect1784" />
<rect
id="rect1742-2-1"
height="22.867559"
width="43.65625"
y="33.489403"
x="49.46875" />
<rect
id="rect1787"
height="22.867559"
width="43.65625"
y="33.489403"
x="49.46875" />
<rect
x="78.980247"
y="-7.9594593"
width="116.05897"
height="23.679539"
id="rect1910-4" />
<rect
x="78.980247"
y="-7.9594593"
width="109.33515"
height="26.602938"
id="rect1927" />
<rect
id="rect1910-4-1"
height="15.49402"
width="47.651417"
y="-7.9594593"
x="78.980247" />
<rect
id="rect1956"
height="23.679539"
width="116.05897"
y="-7.9594593"
x="78.980247" />
<rect
id="rect1054-5"
height="16.33053"
width="66.975845"
y="47.882885"
x="62.350956" />
<rect
id="rect1067"
height="16.33053"
width="66.975845"
y="47.882885"
x="62.350956" />
<rect
id="rect5876-9"
height="13.849944"
width="16.123816"
y="5.0927606"
x="37.338371" />
<rect
id="rect5977"
height="14.883522"
width="52.299042"
y="5.0927606"
x="37.338371" />
<rect
x="37.338371"
y="5.0927606"
width="29.973761"
height="14.263375"
id="rect5876-9-4" />
<rect
x="37.338371"
y="5.0927606"
width="16.123816"
height="13.849944"
id="rect6006" />
<rect
x="37.338371"
y="5.0927606"
width="31.8342"
height="13.436513"
id="rect5876-9-8" />
<rect
x="37.338371"
y="5.0927606"
width="16.123816"
height="13.849944"
id="rect6006-1" />
<marker
inkscape:isstock="true"
style="overflow:visible"
id="Arrow1Mend-3"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow1Mend">
<path
transform="matrix(-0.4,0,0,-0.4,-4,0)"
style="fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:#666666;stroke-width:1pt;stroke-opacity:1"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
id="path1352-7" />
</marker>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.279939"
inkscape:cx="272.14963"
inkscape:cy="221.16176"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
inkscape:document-rotation="0"
showgrid="false"
fit-margin-top="10"
fit-margin-left="10"
fit-margin-right="10"
fit-margin-bottom="10"
units="px"
inkscape:window-width="1920"
inkscape:window-height="1001"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:snap-global="true"
inkscape:snap-to-guides="true" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-46.189009,10.114638)">
<text
transform="translate(0.37797619,0.37797619)"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect1904);fill:#000000;fill-opacity:1;stroke:none;"
id="text1902"
xml:space="preserve" />
<text
id="text1916"
y="10.543595"
x="64.887398"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
xml:space="preserve"><tspan
style="stroke-width:0.264583"
y="10.543595"
x="64.887398"
id="tspan1914"
sodipodi:role="line" /></text>
<g
transform="translate(0,0.18449876)"
id="g2100">
<g
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect1910-4);fill:#000000;fill-opacity:1;stroke:none"
id="text1908-0-1"
transform="translate(-20.320974,53.966148)"
aria-label="...was eating supper." />
</g>
<g
transform="translate(0.7472605)"
id="g190">
<path
id="path5870"
d="M 48.087582,22.870299 H 183.48628"
style="fill:none;stroke:#000000;stroke-width:0.765;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path5872"
d="M 115.78693,15.015107 V 30.725491"
style="fill:none;stroke:#000000;stroke-width:0.765;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<text
xml:space="preserve"
id="text5962"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect5964);fill:#000000;fill-opacity:1;stroke:none;" />
<rect
style="fill:#ffffff;stroke:#000000;stroke-width:0.864259"
id="rect123-9"
width="11.752648"
height="8.8811474"
x="125.0246"
y="18.429726" />
<g
transform="translate(0.6201485,-60.822466)"
id="g194">
<path
style="fill:none;stroke:#000000;stroke-width:0.765;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 48.214696,61.208853 H 183.61339"
id="path5870-2" />
<path
style="fill:none;stroke:#000000;stroke-width:0.765;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 115.91404,53.353661 V 69.064044"
id="path5872-7" />
</g>
<rect
y="-4.0541849"
x="130.79721"
height="8.8811474"
width="35.111511"
id="rect123"
style="fill:#ffffff;stroke:#000000;stroke-width:0.864258" />
<rect
y="18.429726"
x="142.92624"
height="8.8811474"
width="11.752649"
id="rect123-9-39"
style="fill:#ffffff;stroke:#000000;stroke-width:0.864259" />
<rect
y="18.429726"
x="160.82788"
height="8.8811474"
width="11.752649"
id="rect123-9-10"
style="fill:#ffffff;stroke:#000000;stroke-width:0.864259" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,414 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="perfective-future.svg"
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
id="svg8"
version="1.1"
viewBox="0 0 140.69031 21.002049"
height="79.377823"
width="531.7431">
<defs
id="defs2">
<rect
id="rect409"
height="12.402935"
width="16.950678"
y="-14.548825"
x="146.44608" />
<rect
id="rect371"
height="14.470091"
width="23.772291"
y="-19.303284"
x="138.79759" />
<rect
id="rect328"
height="15.090237"
width="13.023082"
y="53.347046"
x="9.3936357" />
<rect
id="rect6050"
height="18.811117"
width="56.433346"
y="7.8961401"
x="121.9088" />
<rect
id="rect5964"
height="15.296953"
width="41.756546"
y="38.37397"
x="107.62167" />
<marker
inkscape:isstock="true"
style="overflow:visible"
id="Arrow1Mend"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow1Mend">
<path
transform="matrix(-0.4,0,0,-0.4,-4,0)"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
id="path1352" />
</marker>
<rect
id="rect5876"
height="14.883522"
width="52.299042"
y="5.0927606"
x="37.338371" />
<marker
inkscape:isstock="true"
style="overflow:visible"
id="Arrow1Mstart"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow1Mstart">
<path
transform="matrix(0.4,0,0,0.4,4,0)"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
id="path1349" />
</marker>
<marker
inkscape:isstock="true"
style="overflow:visible"
id="Arrow1Lend"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow1Lend">
<path
transform="matrix(-0.8,0,0,-0.8,-10,0)"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
id="path1346" />
</marker>
<marker
inkscape:isstock="true"
style="overflow:visible"
id="marker1631"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow1Lstart">
<path
transform="matrix(0.8,0,0,0.8,10,0)"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
id="path1629" />
</marker>
<marker
inkscape:isstock="true"
style="overflow:visible"
id="marker1615"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow1Lstart">
<path
transform="matrix(0.8,0,0,0.8,10,0)"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
id="path1613" />
</marker>
<marker
inkscape:isstock="true"
style="overflow:visible"
id="Arrow1Lstart"
refX="0"
refY="0"
orient="auto"
inkscape:stockid="Arrow1Lstart">
<path
transform="matrix(0.8,0,0,0.8,10,0)"
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
id="path1343" />
</marker>
<rect
id="rect1054"
height="16.33053"
width="66.975845"
y="47.882885"
x="62.350956" />
<rect
x="78.980247"
y="-7.9594593"
width="109.33515"
height="26.602938"
id="rect1910" />
<rect
x="38.637333"
y="2.4186096"
width="71.915634"
height="12.862959"
id="rect1904" />
<rect
x="49.46875"
y="33.489403"
width="43.65625"
height="22.867559"
id="rect1742" />
<rect
id="rect837"
height="14.552084"
width="34.962795"
y="26.647322"
x="26.647322" />
<rect
x="26.647322"
y="26.647322"
width="34.962795"
height="14.552084"
id="rect837-8" />
<rect
x="26.647322"
y="26.647322"
width="34.962795"
height="14.552084"
id="rect852" />
<rect
id="rect1742-2"
height="22.867559"
width="43.65625"
y="33.489403"
x="49.46875" />
<rect
id="rect1755"
height="22.867559"
width="43.65625"
y="33.489403"
x="49.46875" />
<rect
id="rect1742-5"
height="22.867559"
width="43.65625"
y="33.489403"
x="49.46875" />
<rect
id="rect1784"
height="22.867559"
width="43.65625"
y="33.489403"
x="49.46875" />
<rect
x="49.46875"
y="33.489403"
width="43.65625"
height="22.867559"
id="rect1742-2-1" />
<rect
x="49.46875"
y="33.489403"
width="43.65625"
height="22.867559"
id="rect1787" />
<rect
id="rect1910-4"
height="23.679539"
width="116.05897"
y="-7.9594593"
x="78.980247" />
<rect
id="rect1927"
height="26.602938"
width="109.33515"
y="-7.9594593"
x="78.980247" />
<rect
x="78.980247"
y="-7.9594593"
width="47.651417"
height="15.49402"
id="rect1910-4-1" />
<rect
x="78.980247"
y="-7.9594593"
width="116.05897"
height="23.679539"
id="rect1956" />
<rect
x="62.350956"
y="47.882885"
width="66.975845"
height="16.33053"
id="rect1054-5" />
<rect
x="62.350956"
y="47.882885"
width="66.975845"
height="16.33053"
id="rect1067" />
<rect
x="37.338371"
y="5.0927606"
width="16.123816"
height="13.849944"
id="rect5876-9" />
<rect
x="37.338371"
y="5.0927606"
width="52.299042"
height="14.883522"
id="rect5977" />
<rect
id="rect5876-9-4"
height="14.263375"
width="29.973761"
y="5.0927606"
x="37.338371" />
<rect
id="rect6006"
height="13.849944"
width="16.123816"
y="5.0927606"
x="37.338371" />
<rect
id="rect5876-9-8"
height="13.436513"
width="31.8342"
y="5.0927606"
x="37.338371" />
<rect
id="rect6006-1"
height="13.849944"
width="16.123816"
y="5.0927606"
x="37.338371" />
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0"
refX="0"
id="Arrow1Mend-3"
style="overflow:visible"
inkscape:isstock="true">
<path
id="path1352-7"
d="M 0,0 5,-5 -12.5,0 5,5 Z"
style="fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:#666666;stroke-width:1pt;stroke-opacity:1"
transform="matrix(-0.4,0,0,-0.4,-4,0)" />
</marker>
<rect
x="9.3936357"
y="53.347046"
width="13.023082"
height="15.090237"
id="rect328-5" />
<rect
x="9.3936357"
y="53.347046"
width="13.023082"
height="15.090237"
id="rect341" />
</defs>
<sodipodi:namedview
inkscape:snap-to-guides="true"
inkscape:snap-global="false"
inkscape:window-maximized="1"
inkscape:window-y="-9"
inkscape:window-x="-9"
inkscape:window-height="1001"
inkscape:window-width="1920"
units="px"
fit-margin-bottom="10"
fit-margin-right="10"
fit-margin-left="10"
fit-margin-top="10"
showgrid="false"
inkscape:document-rotation="0"
inkscape:current-layer="layer1"
inkscape:document-units="mm"
inkscape:cy="221.18205"
inkscape:cx="272.15815"
inkscape:zoom="1.279939"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
transform="translate(-46.189011,10.114638)"
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<text
xml:space="preserve"
id="text1902"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect1904);fill:#000000;fill-opacity:1;stroke:none;"
transform="translate(0.37797619,0.37797619)" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="64.887398"
y="10.543595"
id="text1916"><tspan
sodipodi:role="line"
id="tspan1914"
x="64.887398"
y="10.543595"
style="stroke-width:0.264583" /></text>
<g
id="g2100"
transform="translate(0,0.18449876)">
<g
aria-label="...was eating supper."
transform="translate(-20.320974,53.966148)"
id="text1908-0-1"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect1910-4);fill:#000000;fill-opacity:1;stroke:none" />
</g>
<text
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect5964);fill:#000000;fill-opacity:1;stroke:none;"
id="text5962"
xml:space="preserve" />
<g
id="g194"
transform="translate(0.6201485,-60.822466)">
<path
id="path5870-2"
d="M 48.214696,61.208853 H 183.61339"
style="fill:none;stroke:#000000;stroke-width:0.765;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path5872-7"
d="M 115.91404,53.353661 V 69.064044"
style="fill:none;stroke:#000000;stroke-width:0.765;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
<path
d="m 143.97149,3.289336 a 4.0309539,4.0309539 0 0 1 -5.68985,-0.096143 4.0309539,4.0309539 0 0 1 0.0763,-5.6901554 4.0309539,4.0309539 0 0 1 5.69039,0.056399 4.0309539,4.0309539 0 0 1 -0.0365,5.6905492"
sodipodi:arc-type="arc"
sodipodi:open="true"
sodipodi:end="0.79007041"
sodipodi:start="0.80404003"
sodipodi:ry="4.0309539"
sodipodi:rx="4.0309539"
sodipodi:cy="0.38638431"
sodipodi:cx="141.1748"
sodipodi:type="arc"
id="path367"
style="fill:#333333;stroke:#333333;stroke-width:0.865" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -41,14 +41,16 @@ The <Link to="/verbs/verb-endings/">present ending</Link> will change according
...removeFVariants(item.entry), ...removeFVariants(item.entry),
e: item.def, e: item.def,
}} />, }} />,
body: <ConjugationViewer body: <div className="text-left">
<ConjugationViewer
entry={item.entry} entry={item.entry}
textOptions={opts} textOptions={opts}
highlightInRootsAndStems={["imperfective stem"]} highlightInRootsAndStems={["imperfective stem"]}
showOnly="Present" showOnly="Present"
hidePastParticiple hidePastParticiple
sentenceLevel="easy" sentenceLevel="easy"
/>, />
</div>,
}; };
}}/> }}/>

View File

@ -61,14 +61,16 @@ The subjunctive is made the same way as its cousin the <Link to="/verbs/present-
...removeFVariants(item.entry), ...removeFVariants(item.entry),
e: item.def, e: item.def,
}} />, }} />,
body: <ConjugationViewer body: <div className="text-left">
<ConjugationViewer
entry={item.entry} entry={item.entry}
textOptions={opts} textOptions={opts}
highlightInRootsAndStems={["perfective stem"]} highlightInRootsAndStems={["perfective stem"]}
showOnly="Subjunctive" showOnly="Subjunctive"
hidePastParticiple hidePastParticiple
sentenceLevel="easy" sentenceLevel="easy"
/>, />
</div>,
}; };
}}/> }}/>

View File

@ -1554,10 +1554,10 @@
"@types/yargs" "^15.0.0" "@types/yargs" "^15.0.0"
chalk "^4.0.0" chalk "^4.0.0"
"@lingdocs/pashto-inflector@^0.7.0": "@lingdocs/pashto-inflector@^0.8.1":
version "0.7.1" version "0.8.1"
resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.7.1.tgz#0790a4987455bb4c39bfda3efdb89edca7d7c020" resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.8.1.tgz#5d8e4beca36f979b95fd323f879fffbdd6ffe32e"
integrity sha512-F0j644Zduxudr/V1r97U2wYA80B9SwDm8Xk1nOwOVz53EoF9y25673iTSHwbefB4XgpUSfPYM7yipEqUE/0zlA== integrity sha512-9jbWKrZbPil9xllprLGNjo9L7DOXGYf7ds/zr84xgleSGgsu3ih0mUw/+4ou0tS8ZcdM4RPxq0NkWphjbdBoGA==
dependencies: dependencies:
classnames "^2.2.6" classnames "^2.2.6"
pbf "^3.2.1" pbf "^3.2.1"