From f10a46d489d87d81a6b2454b5cdccce531188c84 Mon Sep 17 00:00:00 2001 From: lingdocs <71590811+lingdocs@users.noreply.github.com> Date: Sun, 18 Jul 2021 12:22:46 +0300 Subject: [PATCH] add future chapter --- package.json | 2 +- src/content/index.js | 5 + src/content/verbs/fa-camera-img.PNG | Bin 0 -> 1400 bytes src/content/verbs/fa-video-img.PNG | Bin 0 -> 705 bytes src/content/verbs/future-verbs.mdx | 91 ++++ .../verbs/imperfective-future-graph.svg | 411 +++++++++++++++++ ...erfective-future-graph.svg:Zone.Identifier | 0 src/content/verbs/perfective-future-graph.svg | 414 ++++++++++++++++++ ...erfective-future-graph.svg:Zone.Identifier | 0 src/content/verbs/present-verbs.mdx | 18 +- src/content/verbs/subjunctive-verbs.mdx | 18 +- yarn.lock | 8 +- 12 files changed, 946 insertions(+), 21 deletions(-) create mode 100644 src/content/verbs/fa-camera-img.PNG create mode 100644 src/content/verbs/fa-video-img.PNG create mode 100644 src/content/verbs/future-verbs.mdx create mode 100644 src/content/verbs/imperfective-future-graph.svg create mode 100644 src/content/verbs/imperfective-future-graph.svg:Zone.Identifier create mode 100644 src/content/verbs/perfective-future-graph.svg create mode 100644 src/content/verbs/perfective-future-graph.svg:Zone.Identifier diff --git a/package.json b/package.json index 09556cc..74b697e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@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/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/src/content/index.js b/src/content/index.js index 6d9eed0..b0a4ca1 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -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 presentVerbs from "!babel-loader!mdx-loader!./verbs/present-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 rootsAndStems from "!babel-loader!mdx-loader!./verbs/roots-and-stems.mdx"; import * as sentenceStructure from "!babel-loader!mdx-loader!./verbs/sentence-structure.mdx"; @@ -101,6 +102,10 @@ const contentTree = [ import: subjunctiveVerbs, slug: "subjunctive-verbs", }, + { + import: futureVerbs, + slug: "future-verbs", + }, { import: verbEndings, slug: "verb-endings", diff --git a/src/content/verbs/fa-camera-img.PNG b/src/content/verbs/fa-camera-img.PNG new file mode 100644 index 0000000000000000000000000000000000000000..8f81035af9d53a7d11693db90437a5a8e5ba2bc4 GIT binary patch literal 1400 zcmZ8hc~H^`6eja3LszFXuPiHda+S`%k-neD9lg%$xV-z4`8Xx+B4R_4a~5Ah44o z!duQBa=54}%dJ(7pg>N$u6ZNvK}@c}lH5^@wsW%sftvHxwk|2j{XL0}f!9DFt>kam zH5+Aw2Z5BpP6#_+eCP^UnBa@rPu%uT8&}kd%h5$xwhh?t;Xn7&>(>u8^E}@aK)W;8 zUsvZbXr}6*aK}vzYJA|wcJ0DD$0j3!GYTV)MSxpd2c-8`MkePt6b`;C>bbaOOl+O^ z#pTg2r_j-i)i8HKi;RPLEy-0I1L;t9S;BUQ;FUWh`w{_N5!?E4R`kt(6ZeTJmlF%R zx*(IC9~RO-U-r-dtAlCS>w7F%e;8J@UPT$s5T3N2M?j>lPG*4NSpir1hs;Hc+B*Q< zL&#Vy3+}gssZQuyUkQh^WV1Ur(a8l7+296Z`|Dof3ni7dJ9L+@txXdLO30N^tNpQw+T&ZT}qw+W;%SyNZ5NQTAvgy~PDAY5E4 zTgV%Ksy>XI!r((0Hqano6k-{v@`iftZAl%f*1;Txbv$PduwAGKZg$FoRDtZ{Ykz+)jrubFVz8CWAlehYv1l`dIzO1j?0_ewQwA0Y` zCTrIsRSVc^-k+tVRVzj-)sqj7i=l~0zg}!rZVP>cwdIDs^1tiJ7D^+i%cY`{k&>lb z!^G)Sci#LnYe-{Hb1p+h&HO0Ian_zJSfJWxKITV7BqUTWYwhl~%Bbg~*s1uxWn!P1 zh*CuzofOQe(q8`3iAzwJIJa9gombD-gtNjEhWX28@_S?tTF`y&9nS9nwm+4c$(NXznxaf|2-Z3Oi8>&WDAVe%<~8M0pmvewd!i8-$ zda%OF!Vrwfqpjh1x{Crw6o(@<9XbRP5L|Jtq6Kv+b_nEN-Wg=;oT(Ms%TfK(4S2|Y z@><`H6hnuq<;TL#Z2oTCvd}!W;bmMT5v8kX)0jI^i*MaF8)#=YQ4km*d~EOfW(}j! zK|{y0&npn!$9-Rqhyi*B-jHH#c|-flO~x#O9&=B68S^CJy_`T^ny89grNOK?M=kjF zOpCxkx_GE|sh_4!cC>*xDxKM`8-Rv1Ruw%hlg!WG(s{CMwEDuyLM3>~cVVdxpDU9X zY2Vo08K2>2yucngemn#pTa*aYc-fn?4(AtKMXzb<5dH9WhmO4InmuZ%&X8mikqT$+ zhjB+`TxxT(RogNzCQF6TF+QNqF@>Nv0~u%F0^k-)Fp?9IOHDAWEoTt8og+lT zpFK=7w#!^U+V)~?r)K81sIsRIABsM>_&EJsH}BQ$@6Fzx`g`-H?&;6s`l))~pS*wW zv-#$h{)7tF9kcd4+;bsd@BDK&rvBczWz(>8@54H#KlbE*|H#F9t;tvRK zFuOC&h{2yb;lZ&rcGY1(?yMW?=cNxEIJ>iU!)%7!9kzShf3X;_R68`gPxYQ5-) zbJeN#FBLvp%PUw7J}fB9|G<~NzJJ1{34 QnCuulUHx3vIVCg!0E_h@xc~qF literal 0 HcmV?d00001 diff --git a/src/content/verbs/future-verbs.mdx b/src/content/verbs/future-verbs.mdx new file mode 100644 index 0000000..aecd511 --- /dev/null +++ b/src/content/verbs/future-verbs.mdx @@ -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. Imperfective Future +1. 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. + +
+ +
+ + + +{` `} + Present + + + { + return { + title: , + body:
+ +
, + }; +}}/> + +## 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. + +
+ +
+ + + +{` `} + Subjunctive + + + { + return { + title: , + body:
+ +
, + }; +}}/> diff --git a/src/content/verbs/imperfective-future-graph.svg b/src/content/verbs/imperfective-future-graph.svg new file mode 100644 index 0000000..64a12f8 --- /dev/null +++ b/src/content/verbs/imperfective-future-graph.svg @@ -0,0 +1,411 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/content/verbs/imperfective-future-graph.svg:Zone.Identifier b/src/content/verbs/imperfective-future-graph.svg:Zone.Identifier new file mode 100644 index 0000000..e69de29 diff --git a/src/content/verbs/perfective-future-graph.svg b/src/content/verbs/perfective-future-graph.svg new file mode 100644 index 0000000..0696c06 --- /dev/null +++ b/src/content/verbs/perfective-future-graph.svg @@ -0,0 +1,414 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/content/verbs/perfective-future-graph.svg:Zone.Identifier b/src/content/verbs/perfective-future-graph.svg:Zone.Identifier new file mode 100644 index 0000000..e69de29 diff --git a/src/content/verbs/present-verbs.mdx b/src/content/verbs/present-verbs.mdx index d1da2ae..4f03d90 100644 --- a/src/content/verbs/present-verbs.mdx +++ b/src/content/verbs/present-verbs.mdx @@ -41,14 +41,16 @@ The present ending will change according ...removeFVariants(item.entry), e: item.def, }} />, - body: , + body:
+ +
, }; }}/> diff --git a/src/content/verbs/subjunctive-verbs.mdx b/src/content/verbs/subjunctive-verbs.mdx index f298c2b..53a8650 100644 --- a/src/content/verbs/subjunctive-verbs.mdx +++ b/src/content/verbs/subjunctive-verbs.mdx @@ -61,14 +61,16 @@ The subjunctive is made the same way as its cousin the , + body:
+ +
, }; }}/> diff --git a/yarn.lock b/yarn.lock index e3af5e9..522da5d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1554,10 +1554,10 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@lingdocs/pashto-inflector@^0.7.0": - version "0.7.1" - resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.7.1.tgz#0790a4987455bb4c39bfda3efdb89edca7d7c020" - integrity sha512-F0j644Zduxudr/V1r97U2wYA80B9SwDm8Xk1nOwOVz53EoF9y25673iTSHwbefB4XgpUSfPYM7yipEqUE/0zlA== +"@lingdocs/pashto-inflector@^0.8.1": + version "0.8.1" + resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-0.8.1.tgz#5d8e4beca36f979b95fd323f879fffbdd6ffe32e" + integrity sha512-9jbWKrZbPil9xllprLGNjo9L7DOXGYf7ds/zr84xgleSGgsu3ih0mUw/+4ou0tS8ZcdM4RPxq0NkWphjbdBoGA== dependencies: classnames "^2.2.6" pbf "^3.2.1"