update Vanya's features

LingConLab · Apr 11, 2024 · fcf2247 · fcf2247
1 parent ea9037b
commit fcf2247
Show file tree

Hide file tree

Showing 11 changed files with 400 additions and 283 deletions.
diff --git a/219_Exponence_of_«sequential»_temporal_semantics.qmd b/219_Exponence_of_«sequential»_temporal_semantics.qmd
@@ -26,7 +26,7 @@ villages |>
   
 ```
 
-The basic temporal semantics of sequence of events ("when X occured, Y occured") is expressed either with a dedicated converb affix or a separate construction.
+The basic temporal semantics of sequence of events ("when X occured, Y occured") is expressed either with a dedicated converb affix or a separate construction. Some constructions involve the participles combined with a locative case marker.
 
 
 ## IPFV

diff --git a/226_Realis_conditional_converb_suffix.qmd b/226_Realis_conditional_converb_suffix.qmd
@@ -4,7 +4,7 @@ author: Ivan Netkachev
 date: 'Last update: `r lubridate::make_datetime(year = 2024, month = 1, day = 10)`'
 output:
   html_document:
-    number_sections: false
+    number_sections: true
     anchor_sections: true
     pandoc_args: --shift-heading-level-by=-1
 ---
@@ -29,14 +29,15 @@ villages |>
 The converb suffix for a special series of conditional clauses - realis conditionals. They imply that the event described by the antecedent may have already happened in the past ("if X already happened"). In some cases, a specialized suffix is employed, while in others, the suffix for hypothetical conditionals may be used in this context as well.
 
 
-##
+## PFV
 
 ::: {.panel-tabset}
 
 ### Map
 
 ```{r}
 db |> 
+  filter(feature_lexeme == 'PFV')  |>
   filter(!is.na(value),
          value != 'NO DATA') |>
   mutate(value = str_split(value, ' ; ')) |> 
@@ -95,6 +96,91 @@ map.feature(languages = 'Rutul',
 
 ```{r}
 db |> 
+  filter(feature_lexeme == 'PFV') |> 
+  select(settlement, value, stimuli, answer, collected) |> 
+  DT::datatable(class = 'cell-border stripe', 
+    rownames = FALSE, 
+    filter = 'top', 
+    extensions = 'Buttons',
+    options = list(pageLength = 42, 
+                   autoWidth = TRUE, 
+                   info = FALSE,
+                   dom = 'fBltp',
+                   buttons = list(list(extend = 'collection',
+                                       buttons = c('csv', 'excel', 'pdf'),
+                                       text = '<i class="fas fa-download"></i>')),
+                   paginate = TRUE))
+```
+:::
+
+## IPFV
+
+::: {.panel-tabset}
+
+### Map
+
+```{r}
+db |> 
+  filter(feature_lexeme == 'IPFV')  |>
+  filter(!is.na(value),
+         value != 'NO DATA') |>
+  mutate(value = str_split(value, ' ; ')) |> 
+  unnest_longer(value) |> 
+  distinct(settlement, value) |> 
+  mutate(n = 1) |> 
+  pivot_wider(names_from = value, values_from = n, values_fill = 0) |> 
+  left_join(villages[,c('village', 'lat', 'lon')], c('settlement' = 'village')) |> 
+  mutate(language = 'Rutul') ->
+  for_map
+  
+if(length(for_map) == 5){
+map.feature(languages = 'Rutul',
+            latitude = villages4map$lat,
+            longitude = villages4map$lon,
+            label = villages4map$village,
+            label.position = 'top',
+            label.hide = FALSE,
+            width = 10,
+            color = 'gray',
+            tile = 'OpenStreetMap.HOT',
+            opacity = 0.4) |> 
+  map.feature(languages = for_map$language,
+              latitude = for_map$lat,
+              longitude = for_map$lon,
+              label = for_map$settlement,
+              label.position = 'top',
+              label.hide = FALSE,
+              width = 10,
+              tile = 'OpenStreetMap.HOT',
+              features = colnames(for_map)[2],
+              pipe.data = _)  
+} else {
+map.feature(languages = 'Rutul',
+            latitude = villages4map$lat,
+            longitude = villages4map$lon,
+            label = villages4map$village,
+            label.position = 'top',
+            label.hide = FALSE,
+            width = 10,
+            color = 'gray',
+            tile = 'OpenStreetMap.HOT',
+            opacity = 0.4) |> 
+  map.feature(languages = for_map$language,
+            latitude = for_map$lat,
+            longitude = for_map$lon,
+            minichart.data = for_map |> select(-settlement, -lat, -lon, -language),
+            minichart = 'pie', 
+            width = 3,
+            tile = 'OpenStreetMap.HOT',
+            pipe.data = _)
+}
+```
+
+### Data
+
+```{r}
+db |> 
+  filter(feature_lexeme == 'IPFV') |> 
   select(settlement, value, stimuli, answer, collected) |> 
   DT::datatable(class = 'cell-border stripe', 
     rownames = FALSE, 

diff --git a/data/database.csv b/data/database.csv
diff --git a/data/database.xlsx b/data/database.xlsx
diff --git a/docs/218_Disjunction_marker.html b/docs/218_Disjunction_marker.html
diff --git a/docs/219_Exponence_of_«sequential»_temporal_semantics.html b/docs/219_Exponence_of_«sequential»_temporal_semantics.html
diff --git a/docs/222_Limitative_converb.html b/docs/222_Limitative_converb.html
diff --git a/docs/226_Realis_conditional_converb_suffix.html b/docs/226_Realis_conditional_converb_suffix.html
diff --git a/docs/features.html b/docs/features.html
diff --git a/docs/ru/features.html b/docs/ru/features.html
diff --git a/docs/search.json b/docs/search.json
@@ -2580,7 +2580,7 @@
     "href": "219_Exponence_of_«sequential»_temporal_semantics.html",
     "title": "Exponence of «sequential» temporal semantics",
     "section": "",
-    "text": "The basic temporal semantics of sequence of events (“when X occured, Y occured”) is expressed either with a dedicated converb affix or a separate construction."
+    "text": "The basic temporal semantics of sequence of events (“when X occured, Y occured”) is expressed either with a dedicated converb affix or a separate construction. Some constructions involve the participles combined with a locative case marker."
   },
   {
     "objectID": "219_Exponence_of_«sequential»_temporal_semantics.html#ipfv",
@@ -4130,11 +4130,18 @@
     "text": "The converb suffix for a special series of conditional clauses - realis conditionals. They imply that the event described by the antecedent may have already happened in the past (“if X already happened”). In some cases, a specialized suffix is employed, while in others, the suffix for hypothetical conditionals may be used in this context as well."
   },
   {
-    "objectID": "226_Realis_conditional_converb_suffix.html#section",
-    "href": "226_Realis_conditional_converb_suffix.html#section",
+    "objectID": "226_Realis_conditional_converb_suffix.html#pfv",
+    "href": "226_Realis_conditional_converb_suffix.html#pfv",
     "title": "Realis conditional converb suffix",
-    "section": "",
-    "text": "MapData"
+    "section": "PFV",
+    "text": "PFV\n\nMapData"
+  },
+  {
+    "objectID": "226_Realis_conditional_converb_suffix.html#ipfv",
+    "href": "226_Realis_conditional_converb_suffix.html#ipfv",
+    "title": "Realis conditional converb suffix",
+    "section": "IPFV",
+    "text": "IPFV\n\nMapData"
   },
   {
     "objectID": "317_Basic_lexicon_item_‘know’.html",
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ villages |> @@
     ```
-    The basic temporal semantics of sequence of events ("when X occured, Y occured") is expressed either with a dedicated converb affix or a separate construction.
+    The basic temporal semantics of sequence of events ("when X occured, Y occured") is expressed either with a dedicated converb affix or a separate construction. Some constructions involve the participles combined with a locative case marker.
     ## IPFV
@@ Expand Down @@