Merge branch 'develop' of https://github.com/giellalt/lang-crk into d…

…evelop
giellalt · Dec 3, 2020 · 58a5b3b · 58a5b3b
2 parents 718b94f + cc5a3b1
commit 58a5b3b
Show file tree

Hide file tree

Showing 55 changed files with 48 additions and 13 deletions.
diff --git a/.github/workflows/spellers-selfhosted.yml b/.github/workflows/spellers-selfhosted.yml
@@ -2,7 +2,7 @@
 # manifest.toml needs to contain the manifest for the spellers
 # The Divvun CI encryption key 'DIVVUN_KEY' needs to be added as a secret 
 
-name: "Build Speller Archives and Bundles"
+name: "Speller CI+CD"
 on: push
 
 jobs:

diff --git a/.gut/delta.toml b/.gut/delta.toml
@@ -1,6 +1,6 @@
 template = "https://github.com/giellalt/template-lang-und"
-rev_id = 33
-template_sha = "aaac0e4299c8605a7b8d5446751bc79e9cf46be6"
+rev_id = 36
+template_sha = "56da3d5ff7bd29d8ffcc73b853ff7ccc8ef3d406"
 
 [replacements]
 __UND2C__ = "crk"

diff --git a/Makefile.am b/Makefile.am
@@ -3,7 +3,7 @@
 ## Licence: GPL v3+
 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = . src tools doc test
+SUBDIRS = . src tools docs test
 
 EXTRA_DIST = und.timestamp
 

diff --git a/configure.ac b/configure.ac
@@ -151,6 +151,7 @@ AC_SUBST([DEFAULT_XFST], [no])
 AC_SUBST([DEFAULT_HYPERMIN], [no])
 AC_SUBST([DEFAULT_REVERCI], [yes])
 AC_SUBST([DEFAULT_HFST_BACKEND], [foma])
+AC_SUBST([DEFAULT_SPELLER_MINIMISATION], [no])
 
 # Tests and sets up giella-core directories and scripts
 gt_PROG_SCRIPTS_PATHS

diff --git a/doc/LemmaGenerationTests.jspwiki → docs/LemmaGenerationTests.jspwiki b/doc/LemmaGenerationTests.jspwiki → docs/LemmaGenerationTests.jspwiki
diff --git a/doc/Links.jspwiki → docs/Links.jspwiki b/doc/Links.jspwiki → docs/Links.jspwiki
diff --git a/doc/Makefile.am → docs/Makefile.am b/doc/Makefile.am → docs/Makefile.am
diff --git a/doc/Notes.jspwiki → docs/Notes.jspwiki b/doc/Notes.jspwiki → docs/Notes.jspwiki
diff --git a/doc/PlainsCreeDisambiguation.jspwiki → docs/PlainsCreeDisambiguation.jspwiki b/doc/PlainsCreeDisambiguation.jspwiki → docs/PlainsCreeDisambiguation.jspwiki
diff --git a/doc/PlainsCreeDocumentation.jspwiki → docs/PlainsCreeDocumentation.jspwiki b/doc/PlainsCreeDocumentation.jspwiki → docs/PlainsCreeDocumentation.jspwiki
diff --git a/doc/VTA-YAML.jspwiki → docs/VTA-YAML.jspwiki b/doc/VTA-YAML.jspwiki → docs/VTA-YAML.jspwiki
diff --git a/doc/WhatIsThis.jspwiki → docs/WhatIsThis.jspwiki b/doc/WhatIsThis.jspwiki → docs/WhatIsThis.jspwiki
diff --git a/doc/WorkPlan.jspwiki → docs/WorkPlan.jspwiki b/doc/WorkPlan.jspwiki → docs/WorkPlan.jspwiki
diff --git a/doc/crk.jspwiki → docs/crk.jspwiki b/doc/crk.jspwiki → docs/crk.jspwiki
diff --git a/doc/cwil2015_fst_notes.jspwiki → docs/cwil2015_fst_notes.jspwiki b/doc/cwil2015_fst_notes.jspwiki → docs/cwil2015_fst_notes.jspwiki
diff --git a/doc/data/grammarambiguity.jspwiki → docs/data/grammarambiguity.jspwiki b/doc/data/grammarambiguity.jspwiki → docs/data/grammarambiguity.jspwiki
diff --git a/doc/data/marywells.grammarhomonymy.txt → docs/data/marywells.grammarhomonymy.txt b/doc/data/marywells.grammarhomonymy.txt → docs/data/marywells.grammarhomonymy.txt
diff --git a/doc/data/pct.grammar.jspwiki → docs/data/pct.grammar.jspwiki b/doc/data/pct.grammar.jspwiki → docs/data/pct.grammar.jspwiki
diff --git a/doc/data/pct.words.jspwiki → docs/data/pct.words.jspwiki b/doc/data/pct.words.jspwiki → docs/data/pct.words.jspwiki
diff --git a/doc/data/wordambiguity.jspwiki → docs/data/wordambiguity.jspwiki b/doc/data/wordambiguity.jspwiki → docs/data/wordambiguity.jspwiki
diff --git a/doc/developingwork.jspwiki → docs/developingwork.jspwiki b/doc/developingwork.jspwiki → docs/developingwork.jspwiki
diff --git a/doc/diminutive.jspwiki → docs/diminutive.jspwiki b/doc/diminutive.jspwiki → docs/diminutive.jspwiki
diff --git a/doc/dogbisc_missing.txt → docs/dogbisc_missing.txt b/doc/dogbisc_missing.txt → docs/dogbisc_missing.txt
diff --git a/doc/forrest.properties → docs/forrest.properties b/doc/forrest.properties → docs/forrest.properties
diff --git a/doc/index.xml → docs/index.xml b/doc/index.xml → docs/index.xml
diff --git a/doc/link-header.jspwiki → docs/link-header.jspwiki b/doc/link-header.jspwiki → docs/link-header.jspwiki
diff --git a/doc/locative.jspwiki → docs/locative.jspwiki b/doc/locative.jspwiki → docs/locative.jspwiki
diff --git a/doc/meetings/140110.jspwiki → docs/meetings/140110.jspwiki b/doc/meetings/140110.jspwiki → docs/meetings/140110.jspwiki
diff --git a/doc/meetings/140116.jspwiki → docs/meetings/140116.jspwiki b/doc/meetings/140116.jspwiki → docs/meetings/140116.jspwiki
diff --git a/doc/meetings/150622.jspwiki → docs/meetings/150622.jspwiki b/doc/meetings/150622.jspwiki → docs/meetings/150622.jspwiki
diff --git a/doc/noun_stems-stems.jspwiki → docs/noun_stems-stems.jspwiki b/doc/noun_stems-stems.jspwiki → docs/noun_stems-stems.jspwiki
diff --git a/doc/nouns-affixes.jspwiki → docs/nouns-affixes.jspwiki b/doc/nouns-affixes.jspwiki → docs/nouns-affixes.jspwiki
diff --git a/doc/nouns-stems.jspwiki → docs/nouns-stems.jspwiki b/doc/nouns-stems.jspwiki → docs/nouns-stems.jspwiki
diff --git a/doc/numerals-stems.jspwiki → docs/numerals-stems.jspwiki b/doc/numerals-stems.jspwiki → docs/numerals-stems.jspwiki
diff --git a/doc/particles-stems.jspwiki → docs/particles-stems.jspwiki b/doc/particles-stems.jspwiki → docs/particles-stems.jspwiki
diff --git a/doc/phonology-morphology.jspwiki → docs/phonology-morphology.jspwiki b/doc/phonology-morphology.jspwiki → docs/phonology-morphology.jspwiki
diff --git a/doc/preamble.jspwiki → docs/preamble.jspwiki b/doc/preamble.jspwiki → docs/preamble.jspwiki
diff --git a/doc/pronouns-stems.jspwiki → docs/pronouns-stems.jspwiki b/doc/pronouns-stems.jspwiki → docs/pronouns-stems.jspwiki
diff --git a/doc/punctuation-stems.jspwiki → docs/punctuation-stems.jspwiki b/doc/punctuation-stems.jspwiki → docs/punctuation-stems.jspwiki
diff --git a/doc/resources/images/group.png → docs/resources/images/group.png b/doc/resources/images/group.png → docs/resources/images/group.png
diff --git a/doc/resources/images/project.png → docs/resources/images/project.png b/doc/resources/images/project.png → docs/resources/images/project.png
diff --git a/doc/root-morphology.jspwiki → docs/root-morphology.jspwiki b/doc/root-morphology.jspwiki → docs/root-morphology.jspwiki
diff --git a/doc/site.xml → docs/site.xml b/doc/site.xml → docs/site.xml
diff --git a/doc/sitemap.xmap → docs/sitemap.xmap b/doc/sitemap.xmap → docs/sitemap.xmap
diff --git a/doc/skinconf.xml → docs/skinconf.xml b/doc/skinconf.xml → docs/skinconf.xml
diff --git a/doc/tabs.xml → docs/tabs.xml b/doc/tabs.xml → docs/tabs.xml
diff --git a/doc/variation.jspwiki → docs/variation.jspwiki b/doc/variation.jspwiki → docs/variation.jspwiki
diff --git a/doc/verb_stems-stems.jspwiki → docs/verb_stems-stems.jspwiki b/doc/verb_stems-stems.jspwiki → docs/verb_stems-stems.jspwiki
diff --git a/doc/verbs-affixes.jspwiki → docs/verbs-affixes.jspwiki b/doc/verbs-affixes.jspwiki → docs/verbs-affixes.jspwiki
diff --git a/doc/verbs-stems.jspwiki → docs/verbs-stems.jspwiki b/doc/verbs-stems.jspwiki → docs/verbs-stems.jspwiki
diff --git a/m4/giella-config-files.m4 b/m4/giella-config-files.m4
@@ -16,7 +16,7 @@ AC_CONFIG_FILES([Makefile \
                  src/cg3/Makefile \
                  src/tagsets/Makefile \
                  src/transcriptions/Makefile \
-                 doc/Makefile \
+                 docs/Makefile \
                  test/Makefile \
                  test/tools/Makefile \
                  test/tools/hyphenators/Makefile \

diff --git a/m4/giella-macros.m4 b/m4/giella-macros.m4
@@ -337,6 +337,23 @@ AS_IF([test "x$GAWK" != x], [
 AC_MSG_RESULT([$giellalt_forrest_validation])
 AM_CONDITIONAL([CAN_FORREST_VALIDATE], [test "x$giellalt_forrest_validation" != xno])
 
+# Check for npm etc. stuff for divvunspell stats
+AC_ARG_WITH([npm],
+            [AS_HELP_STRING([--with-npm=DIRECTORY],
+                            [search npm in DIRECTORY @<:@default=PATH@:>@])],
+            [with_npm=$withval],
+            [with_npm=no])
+AC_PATH_PROG([NPM], [npm], [], [$PATH$PATH_SEPARATOR$with_npm])
+AC_PATH_PROG([R], [R], [], [$PATH$PATH_SEPARATOR$with_R])
+AC_ARG_WITH([divvunspell],
+            [AS_HELP_STRING([--with-divvunspell=DIRECTORY],
+                            [search divvunspell in DIRECTORY @<:@default=PATH@:>@])],
+            [with_divvunspell=$withval],
+            [with_divvunspell=no])
+AC_PATH_PROG([DIVVUN_ACCURACY], [accuracy], [], [$PATH$PATH_SEPARATOR$with_divvunspell])
+
+
+
 ################ can rsync oxt template? ################
 AC_PATH_PROG([RSYNC], [rsync], [no], [$PATH$PATH_SEPARATOR$with_rsync])
 AC_PATH_PROG([WGET],  [wget],  [no], [$PATH$PATH_SEPARATOR$with_wget])
@@ -772,14 +789,14 @@ AM_CONDITIONAL([WANT_HFST_DESKTOP_SPELLER], [test "x$enable_desktop_hfstspellers
 # Enable minimised fst-spellers by default:
 AC_ARG_ENABLE([minimised-spellers],
               [AS_HELP_STRING([--enable-minimised-spellers],
-                              [minimise hfst spellers @<:@default=yes@:>@])],
+                              [minimise hfst spellers @<:@default=$DEFAULT_SPELLER_MINIMISATION@:>@])],
               [enable_minimised_spellers=$enableval],
-              [enable_minimised_spellers=yes])
+              [enable_minimised_spellers=$DEFAULT_SPELLER_MINIMISATION])
 AS_IF([test "x$enable_minimised_spellers" != "xyes"],
-      [AC_SUBST([HFST_MINIMIZE_SPELLER], ["$ac_cv_path_HFST_REMOVE_EPSILONS \$(HFST_FLAGS)  "])],
-      [AC_SUBST([HFST_MINIMIZE_SPELLER], ["$ac_cv_path_HFST_REMOVE_EPSILONS \$(HFST_FLAGS) \
-                                         | $ac_cv_path_HFST_DETERMINIZE --encode-weights \$(HFST_FLAGS) \
-                                         | $ac_cv_path_HFST_MINIMIZE    --encode-weights \$(HFST_FLAGS) "])])
+      [AC_SUBST([HFST_MINIMIZE_SPELLER], ["$ac_cv_path_HFST_REMOVE_EPSILONS \$(HFST_FLAGS) \$(MORE_VERBOSITY) "])],
+      [AC_SUBST([HFST_MINIMIZE_SPELLER], ["$ac_cv_path_HFST_REMOVE_EPSILONS \$(HFST_FLAGS) \$(MORE_VERBOSITY) \
+                                         | $ac_cv_path_HFST_DETERMINIZE --encode-weights \$(HFST_FLAGS) \$(MORE_VERBOSITY) \
+                                         | $ac_cv_path_HFST_MINIMIZE    --encode-weights \$(HFST_FLAGS) \$(MORE_VERBOSITY) "])])
 
 # Enable Foma-based spellers, requires gzip - default is no
 AC_ARG_ENABLE([fomaspeller],

diff --git a/src/README.md b/src/README.md
@@ -0,0 +1,16 @@
+How to use the alternative Makefile
+===================================
+
+    make -j -f quick.mk
+
+This will create:
+
+ - `crk-strict-analyzer.hfstol` -- reads Plains Cree wordforms and
+   outputs analyses. Wordforms must be written in _perfect_ SRO.
+ - `crk-descriptive-analyzer.hfstol` -- reads Plains Cree wordforms, and
+   outputs possible analyses. Wordforms can be written with known
+   spelling variations, including long vowel relaxation.
+ - `crk-normative-generator.hfstol` -- given a morphological analyses,
+   produces Plains Cree wordforms in SRO.
+ - `crk-normative-generator-with-morpheme-boundaries.hfstol` -- same as
+   above, but includes `<` and `>` to indicate morpheme boundaries
diff --git a/src/fst/Makefile.am b/src/fst/Makefile.am
@@ -106,7 +106,8 @@ generated_files/eng-$(GTLANG)-propernouns.lexc: \
 # easily get updates from the template dir through svn merge.
 clean-local:
 	-rm -f *.all.* *fst *.foma *.script generated_files/*.lexc lexicon.*
-	-rm -f url.lexc *.tmp.*
+	-rm -f url.lexc *.tmp*
+	-rm -f *.relabel lexicon-tags.* lexicon-sigma.*
 
 include $(srcdir)/Makefile.modifications-phon.am
 include $(top_srcdir)/../giella-core/am-shared/src-morphology-dir-include.am

diff --git a/src/fst/stems/noun_vocatives.lexc b/src/fst/stems/noun_vocatives.lexc
@@ -7,7 +7,7 @@ nikâwiy+N+A+D+Voc+Sg:nêkâ # ; ! "mother!"
 nicâhkos+N+A+D+Voc+Sg:nicâhkosê # ; ! "female cross-cousin!; sister-in-law! [used by female speaker only]"
 niciwâm+N+A+D+Voc+Sg:niciwâ # ; ! "brother!; male parallel cousin!; friend!; rival!"
 nikâwiy+N+A+D+Voc+Sg:nikâ # ; ! "mother!"
-nikosisx+N+A+D+Voc+Sg:nikosê # ; ! "son!"
+nikosis+N+A+D+Voc+Sg:nikosê # ; ! "son!"
 nikwêmês+N+A+D+Voc+Sg:nikwêmê # ; ! "namesake! [kinship term: addressing one whom you are named after, one who is named after you, or simply one who shares the same name]"
 nimâmâw+N+A+D+Voc+Sg:nimâmâ # ; ! "my mom, my mother"
 nimis+N+A+D+Voc+Sg:nimisê # ; ! "older sister!"