more

package.json

@@ -6,7 +6,7 @@
     "@formkit/auto-animate": "^1.0.0-beta.1",
     "@fortawesome/fontawesome-free": "^5.15.4",
     "@lingdocs/lingdocs-main": "^0.3.1",
-    "@lingdocs/pashto-inflector": "^3.3.5",
+    "@lingdocs/pashto-inflector": "^3.3.8",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",

src/components/phrase-diagram/EditableVPEx.tsx

@@ -16,10 +16,11 @@ function EditableVPEx({ children, opts, formChoice, noEdit, length, mode }: {
     opts: T.TextOptions,
     formChoice?: boolean,
     noEdit?: boolean,
-    length: "long" | "short",
+    length?: "long" | "short",
     mode?: "text" | "blocks",
 }) {
     const [editing, setEditing] = useState<boolean>(false);
+    const [selectedLength, setSelectedLength] = useState<"long" | "short">(length || "short");
     const [vps, setVps] = useState<T.VPSelectionState>({ ...children });
     function handleReset() {
         // TODO: this is crazy, how does children get changed after calling setVps ???
@@ -51,7 +52,8 @@ function EditableVPEx({ children, opts, formChoice, noEdit, length, mode }: {
             justify="left"
             onlyOne="concat"
             setForm={formChoice ? handleSetForm : "disable"}
-            length={length}
+            onLengthChange={setSelectedLength}
+            length={selectedLength}
             mode={mode}
         />
     </div>;

src/content/compound-verbs/helper-verbs.mdx

@@ -9,7 +9,7 @@ import {
     RootsAndStems,
     getVerbInfo,
 } from "@lingdocs/pashto-inflector";
-import { KidsSection, VP, KingIcon, ServantIcon, PerfectiveHead } from "../../components/terms-links";
+import { KidsSection, VP, KingIcon, ServantIcon, PerfectiveHead, Camera, Video } from "../../components/terms-links";
 import psmd from "../../lib/psmd";
 import Link from "../../components/Link";
 import Formula from "../../components/formula/Formula";
@@ -132,9 +132,20 @@ So with this verb we add a complement - something that the subject is *becoming*
     {"blocks":[{"key":0.8034429811171007,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":5,"distance":"far"}}}},{"key":0.19673719282869384,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527812792,"i":5826,"p":"خوشاله","f":"khoshaala","g":"khoshaala","e":"happy, glad","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
 }</EditableVPEx>
 
-But that's not all... Here's something suuuuuper interesting and important about this verb!
+But that's not all... Here's something **suuuuuper interesting and important** about this verb!
 
-👩🏻‍🏭 ‼️ **With the imperfective aspect, the complement is JOINED TO THE VERB IN ONE BLOCK** ‼️ 👨🏻‍🏭
+#### Welding / splitting the complement 👨🏻‍🏭 ⛏️
+
+Depending on which part of the verb tree we're using (imperfective <Video />, perfective <Camera />, or past participle), the complement either gets welded onto the verb or splits off as a <PerfectiveHead />.
+
+- with the imperfective / past particple we **weld** the complement onto the verb
+    - the complement and verb become *one block*
+- with the perfective the complement **stays separate** and acts as a <PerfectiveHead />
+    - the complement sits in front of the verb, just like a <PerfectiveHead />, as a seperate block
+
+##### Welding with the imperfective / past participle 👨🏻‍🏭
+
+When we use the imperfective aspect / past participle, the complement is joined together with the verb in **one block**.
 
 <EditableVPEx opts={opts}>{
     {"blocks":[{"key":0.8034429811171007,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":5,"distance":"far"}}}},{"key":0.19673719282869384,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527812792,"i":5826,"p":"خوشاله","f":"khoshaala","g":"khoshaala","e":"happy, glad","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
@@ -150,17 +161,33 @@ Have a look at the blocks in these examples above. The complement is joined in w
     {"blocks":[{"key":0.8034429811171007,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":6,"distance":"far"}}}},{"key":0.19673719282869384,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":true,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
 }</EditableVPEx>
 
-We **CANNOT SAY** <InlinePs opts={opts} ps={{ p: "❌ مونږ ستړي نه کېږو ❌", f: "❌ moonG stuRee nú keGoo ❌" }} /> because in the imperfective aspect <strong>the complement is welded together with the verb</strong> <InlinePs opts={opts} ps={{ p: "کېدل", f: "kedúl", e: "to become" }} /> 👨🏻‍🏭 and <em>nothing</em> can break those two pieces apart.
+We **CANNOT SAY** <InlinePs opts={opts} ps={{ p: "❌ مونږ ستړي نه کېږو ❌", f: "❌ moonG stuRee nú keGoo ❌" }} /> because with the imperfective aspect <strong>the complement is welded together with the verb</strong> <InlinePs opts={opts} ps={{ p: "کېدل", f: "kedúl", e: "to become" }} /> 👨🏻‍🏭 and <em>nothing</em> can break those two pieces apart.
-<!--  -->
+
+<EditableVPEx opts={opts}>{
+    {"blocks":[{"key":0.8034429811171007,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":6,"distance":"far"}}}},{"key":0.19673719282869384,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become","ep":"_____"}},"verbTense":"presentVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"perfect","transitivity":"intransitive","isCompound":false,"voice":"active","negative":true,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527815306,"i":7598,"p":"ستړی","f":"stúRey","g":"stuRey","e":"tired","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
+}</EditableVPEx>
+
+We also **CANNOT SAY** <InlinePs opts={opts} ps={{ p: "❌ مونږ ستړی نه یو شوي ❌", f: "❌ moonG stúRey nú yoo shuwee ❌" }} /> because with the **past participle / perfect** the complement is welded together with the verb. 
+
+##### Splitting with the perfective ⛏️
+
+But when we use anything on the *perfective*, the complement stays seperate and sits in front of the verb as a <PerfectiveHead />.
+
+<EditableVPEx opts={opts}>{
+    {"blocks":[{"key":0.5930062917804333,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}},{"key":0.20242278752113463,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become"}},"verbTense":"perfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":false,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527812792,"i":5826,"p":"خوشاله","f":"khoshaala","g":"khoshaala","e":"happy, glad","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
+}</EditableVPEx>
+
+<EditableVPEx opts={opts}>{
+    {"blocks":[{"key":0.5930062917804333,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":0,"distance":"far"}}}},{"key":0.20242278752113463,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become"}},"verbTense":"perfectivePast","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":true,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527812798,"i":5645,"p":"خفه","f":"khufa","g":"khufa","e":"sad, upset, angry; choked, suffocated","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
+}</EditableVPEx>
+
+<EditableVPEx opts={opts}>{
+    {"blocks":[{"key":0.5930062917804333,"block":{"type":"subjectSelection","selection":{"type":"NP","selection":{"type":"pronoun","person":4,"distance":"far"}}}},{"key":0.20242278752113463,"block":{"type":"objectSelection","selection":"none"}}],"verb":{"type":"verb","verb":{"entry":{"ts":1581086654898,"i":10697,"p":"کېدل","f":"kedul","g":"kedul","e":"to become _____","c":"v. intrans. irreg.","ssp":"ش","ssf":"sh","prp":"شول","prf":"shwul","pprtp":"شوی","pprtf":"shúwey","noOo":true,"ec":"become"}},"verbTense":"subjunctiveVerb","perfectTense":"presentPerfect","imperativeTense":"imperfectiveImperative","tenseCategory":"basic","transitivity":"intransitive","isCompound":false,"voice":"active","negative":true,"canChangeTransitivity":false,"canChangeVoice":false,"canChangeStatDyn":false},"externalComplement":{"type":"complement","selection":{"type":"adjective","entry":{"ts":1527812798,"i":5645,"p":"خفه","f":"khufa","g":"khufa","e":"sad, upset, angry; choked, suffocated","c":"adj."}}},"form":{"removeKing":false,"shrinkServant":false}}
+}</EditableVPEx>
+
 ## کول vs. کول
 
-### کول - to make
+##### IN PROGRESS 🚧
-
-IN PROGRESS 🚧
-
-- used with stative componuds
-- doesn't take the <InlinePs opts={opts} ps={{ p: "و", f: "oo", e: "" }} /> prefix. The complement splits off as the perfective head
-- takes a subject, object and complement
 
 ### کول - to do
 
@@ -168,3 +195,9 @@ IN PROGRESS 🚧
 - has <InlinePs opts={opts} ps={{ p: "و", f: "oo", e: "" }} /> prefix as perfective head.
 - takes a subject and object
 
+### کول - to make
+
+- used with stative componuds
+- doesn't take the <InlinePs opts={opts} ps={{ p: "و", f: "oo", e: "" }} /> prefix. The complement splits off as the perfective head
+- takes a subject, object and complement
+

yarn.lock

@@ -1695,10 +1695,10 @@
     rambda "^6.7.0"
     react-select "^5.2.2"
 
-"@lingdocs/pashto-inflector@^3.3.5":
+"@lingdocs/pashto-inflector@^3.3.8":
-  version "3.3.5"
+  version "3.3.8"
-  resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.3.5.tgz#db86474ed05961c75ce246294fc14ac71d114bf8"
+  resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-3.3.8.tgz#a8bc553aeb672802f318cf46834ed309575b816a"
-  integrity sha512-nfLLyz5vO0f7xTvQJ1JYYjlz2gX64+RyyyEncznFeZnJtcnQ7zhJYe40vJA8qD5A1pRryfSERUDryzoT4qY0Yw==
+  integrity sha512-7NmiB/Samy7UzmQx5XYaopkopJfhLv+dKdT4blTEozuihpADA76F7xXOGahB4Rx/EUSJpeMX2z9dDc+ZdDCjGA==
   dependencies:
     "@formkit/auto-animate" "^1.0.0-beta.1"
     classnames "^2.2.6"