Merge pull request #436 from gfngfn/dev-how-to-load-files-in-packages

Develop how to load files in packages and use it for handling hyphenation dictionaries

check-packages.sh

@@ -3,8 +3,15 @@
 SAPHE="${1:-saphe}"
 
 FAILED=0
+FIRST=1
 for FILE in $(find lib-satysfi -name saphe.yaml); do
     DIR="$(dirname "$FILE")"
+    if [ $FIRST -eq 1 ]; then
+        echo "UPDATING..."
+        "$SAPHE" update "$DIR"
+        FIRST=0
+        echo "UPDATED."
+    fi
     echo " ==== $DIR ===="
     "$SAPHE" solve "$DIR"
     if [ $? -ne 0 ]; then
@@ -30,5 +37,6 @@ for FILE in $(find lib-satysfi -name saphe.yaml); do
     fi
 done
 if [ $FAILED -ne 0 ]; then
+    echo "! some test has failed."
     exit 1
 fi

default-registry-commit-hash.txt

@@ -1 +1 @@
-fd0685fc3be78942759bbf95ff66b0d037a79f6e	refs/heads/temp-dev-saphe
+ce6060ddaf44efc0f6a9ac6609450e855b7afa0c	refs/heads/temp-dev-saphe

demo/demo.saphe.lock.yaml.expected

@@ -57,6 +57,13 @@ locks:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
     package_name: footnote-scheme
     version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: hyph-english
+    version: 0.0.1
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.itemize.0.0.1
   dependencies:
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
@@ -104,6 +111,8 @@ locks:
     used_as: FontIpaEx
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern-math.0.0.1
     used_as: FontLatinModernMath
+  - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+    used_as: HyphEnglish
   test_only: false
   registered:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3

doc/doc-lang.saphe.lock.yaml.expected

@@ -48,6 +48,13 @@ locks:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
     package_name: font-latin-modern-math
     version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: hyph-english
+    version: 0.0.1
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.itemize.0.0.1
   dependencies:
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
@@ -84,6 +91,8 @@ locks:
     used_as: FontIpaEx
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern-math.0.0.1
     used_as: FontLatinModernMath
+  - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+    used_as: HyphEnglish
   test_only: false
   registered:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3

doc/doc-primitives.saphe.lock.yaml.expected

@@ -57,6 +57,13 @@ locks:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
     package_name: footnote-scheme
     version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: hyph-english
+    version: 0.0.1
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.itemize.0.0.1
   dependencies:
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
@@ -95,6 +102,8 @@ locks:
     used_as: FontIpaEx
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern-math.0.0.1
     used_as: FontLatinModernMath
+  - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+    used_as: HyphEnglish
   test_only: false
   registered:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3

doc/math1.saphe.lock.yaml.expected

@@ -48,6 +48,13 @@ locks:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
     package_name: font-latin-modern-math
     version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: hyph-english
+    version: 0.0.1
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
   dependencies:
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
@@ -84,6 +91,8 @@ locks:
     used_as: FontIpaEx
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern-math.0.0.1
     used_as: FontLatinModernMath
+  - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+    used_as: HyphEnglish
   test_only: false
   registered:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3

install-libs.sh

@@ -6,11 +6,11 @@ INSTALL=${2:-install}
 "${INSTALL}" -d "${LIBDIR}"
 "${INSTALL}" -d "${LIBDIR}/unidata"
 "${INSTALL}" -m 644 lib-satysfi/unidata/*.txt "${LIBDIR}/unidata"
-"${INSTALL}" -d "${LIBDIR}/hyph"
-"${INSTALL}" -m 644 lib-satysfi/hyph/* "${LIBDIR}/hyph"
 
 # It is no longer necessary to install packages beforehand due to the package system:
 #
+# "${INSTALL}" -d "${LIBDIR}/hyph"
+# "${INSTALL}" -m 644 lib-satysfi/hyph/* "${LIBDIR}/hyph"
 # "${INSTALL}" -d "${LIBDIR}/packages"
 # (cd lib-satysfi && find packages -type f -exec "${INSTALL}" -Dm 644 "{}" "${LIBDIR}/{}" \;)
 # "${INSTALL}" -d "${LIBDIR}/registries"

lib-satysfi/packages/hyph-english/hyph-english.0.0.1/saphe.lock.yaml.expected

@@ -0,0 +1,4 @@
+saphe: ^0.0.1
+locks: []
+dependencies: []
+test_dependencies: []

lib-satysfi/packages/hyph-english/hyph-english.0.0.1/saphe.yaml

@@ -0,0 +1,11 @@
+saphe: "^0.0.1"
+satysfi: "^0.1.0"
+name: "hyph-english"
+authors:
+  - "Takashi Suwa <@gfngfn>"
+contents:
+  library:
+    main_module: "HyphEnglish"
+    source_directories:
+      - "./src"
+dependencies: []

lib-satysfi/packages/hyph-english/hyph-english.0.0.1/satysfi-envelope.yaml.expected

@@ -0,0 +1,5 @@
+library:
+  main_module: HyphEnglish
+  source_directories:
+  - ./src
+  test_directories: []

lib-satysfi/packages/hyph-english/hyph-english.0.0.1/src/hyph-english.satyh

@@ -0,0 +1,7 @@
+module HyphEnglish :> sig
+  val hyphenation : hyphenation
+end = struct
+  val hyphenation =
+    load-hyphenation-dictionary
+      (here ^ `/../hyph/english.satysfi-hyph`)
+end

lib-satysfi/packages/md-ja/md-ja.0.0.1/saphe.lock.yaml.expected

@@ -57,6 +57,13 @@ locks:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
     package_name: footnote-scheme
     version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: hyph-english
+    version: 0.0.1
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.itemize.0.0.1
   dependencies:
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
@@ -97,6 +104,8 @@ dependencies:
   used_as: FontLatinModernMath
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.footnote-scheme.0.0.1
   used_as: FootnoteScheme
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  used_as: HyphEnglish
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.itemize.0.0.1
   used_as: Itemize
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1

lib-satysfi/packages/md-ja/md-ja.0.0.1/saphe.yaml

@@ -85,3 +85,8 @@ dependencies:
       registry: "default"
       name: "font-latin-modern-math"
       requirement: "^0.0.1"
+  - used_as: "HyphEnglish"
+    registered:
+      registry: "default"
+      name: "hyph-english"
+      requirement: "^0.0.1"

lib-satysfi/packages/md-ja/md-ja.0.0.1/src/md-ja.satyh

@@ -4,6 +4,8 @@ use package Code
 use package Itemize
 use package Annot
 
+use package HyphEnglish
+
 use package FontJunicode
 use package FontIpaEx
 use package FontLatinModern
@@ -88,6 +90,7 @@ end = struct
 
   val initial-context =
     get-initial-context text-width (command \Math.math)
+      |> set-hyphenation-dictionary HyphEnglish.hyphenation
       |> set-dominant-narrow-script Latin
       |> set-dominant-wide-script Kana
       |> set-latin-font font-latin-roman

lib-satysfi/packages/std-ja-book/std-ja-book.0.0.1/saphe.lock.yaml.expected

@@ -57,6 +57,13 @@ locks:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
     package_name: footnote-scheme
     version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: hyph-english
+    version: 0.0.1
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
   dependencies:
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
@@ -88,6 +95,8 @@ dependencies:
   used_as: FontLatinModernMath
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.footnote-scheme.0.0.1
   used_as: FootnoteScheme
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  used_as: HyphEnglish
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
   used_as: Math
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1

lib-satysfi/packages/std-ja-book/std-ja-book.0.0.1/saphe.yaml

@@ -62,3 +62,8 @@ dependencies:
       registry: "default"
       name: "font-latin-modern-math"
       requirement: "^0.0.1"
+  - used_as: "HyphEnglish"
+    registered:
+      registry: "default"
+      name: "hyph-english"
+      requirement: "^0.0.1"

lib-satysfi/packages/std-ja-book/std-ja-book.0.0.1/src/std-ja-book.satyh

@@ -4,6 +4,8 @@ use package Annot
 use package Code
 use package FootnoteScheme
 
+use package HyphEnglish
+
 use package FontJunicode
 use package FontIpaEx
 use package FontLatinModern
@@ -132,6 +134,7 @@ end = struct
   val get-standard-context wid =
     get-initial-context wid (command \Math.math)
       |> set-code-text-command (command \Code.code)
+      |> set-hyphenation-dictionary HyphEnglish.hyphenation
       |> set-dominant-wide-script Kana
       |> set-language Kana Japanese
       |> set-language HanIdeographic Japanese

lib-satysfi/packages/std-ja-report/std-ja-report.0.0.1/saphe.lock.yaml.expected

@@ -57,6 +57,13 @@ locks:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
     package_name: footnote-scheme
     version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: hyph-english
+    version: 0.0.1
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
   dependencies:
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
@@ -88,6 +95,8 @@ dependencies:
   used_as: FontLatinModernMath
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.footnote-scheme.0.0.1
   used_as: FootnoteScheme
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  used_as: HyphEnglish
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
   used_as: Math
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1

lib-satysfi/packages/std-ja-report/std-ja-report.0.0.1/saphe.yaml

@@ -63,3 +63,8 @@ dependencies:
       registry: "default"
       name: "font-latin-modern-math"
       requirement: "^0.0.1"
+  - used_as: "HyphEnglish"
+    registered:
+      registry: "default"
+      name: "hyph-english"
+      requirement: "^0.0.1"

lib-satysfi/packages/std-ja-report/std-ja-report.0.0.1/src/std-ja-report.satyh

@@ -4,6 +4,8 @@ use package Code
 use package Annot
 use package FootnoteScheme
 
+use package HyphEnglish
+
 use package FontJunicode
 use package FontIpaEx
 use package FontLatinModern
@@ -130,6 +132,7 @@ end = struct
   val get-standard-context wid =
     get-initial-context wid (command \Math.math)
       |> set-code-text-command (command \Code.code)
+      |> set-hyphenation-dictionary HyphEnglish.hyphenation
       |> set-dominant-wide-script Kana
       |> set-language Kana Japanese
       |> set-language HanIdeographic Japanese

lib-satysfi/packages/std-ja/std-ja.0.0.1/saphe.lock.yaml.expected

@@ -48,6 +48,13 @@ locks:
     registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
     package_name: font-latin-modern-math
     version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: hyph-english
+    version: 0.0.1
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
   dependencies:
   - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
@@ -77,6 +84,8 @@ dependencies:
   used_as: FontLatinModern
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern-math.0.0.1
   used_as: FontLatinModernMath
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.hyph-english.0.0.1
+  used_as: HyphEnglish
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
   used_as: Math
 - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1

lib-satysfi/packages/std-ja/std-ja.0.0.1/saphe.yaml

@@ -57,3 +57,8 @@ dependencies:
       registry: "default"
       name: "font-latin-modern-math"
       requirement: "^0.0.1"
+  - used_as: "HyphEnglish"
+    registered:
+      registry: "default"
+      name: "hyph-english"
+      requirement: "^0.0.1"

lib-satysfi/packages/std-ja/std-ja.0.0.1/src/std-ja.satyh

@@ -3,6 +3,8 @@ use package Math
 use package Code
 use package Annot
 
+use package HyphEnglish
+
 use package FontJunicode
 use package FontIpaEx
 use package FontLatinModern
@@ -113,6 +115,7 @@ end = struct
   val get-standard-context wid =
     get-initial-context wid (command \Math.math)
       |> set-code-text-command (command \Code.code)
+      |> set-hyphenation-dictionary HyphEnglish.hyphenation
       |> set-dominant-wide-script Kana
       |> set-language Kana Japanese
       |> set-language HanIdeographic Japanese

src/frontend/display.ml

@@ -225,6 +225,7 @@ let show_base_type = function
   | RegExpType      -> "regexp"
   | TextInfoType    -> "text-info"
   | InputPosType    -> "input-position"
+  | HyphenationType -> "hyphenation"
 
 
 type paren_level =

src/frontend/evalUtil.ml

@@ -462,6 +462,11 @@ let get_prepath (value : syntactic_value) : PrePath.t =
   | _                                -> report_bug_value "get_prepath" value
 
 
+let get_hyphenation : syntactic_value -> LoadHyph.t = function
+  | BaseConstant(BCHyphenation(hyph)) -> hyph
+  | value                             -> report_bug_value "get_hyphenation" value
+
+
 let get_outline (value : syntactic_value) =
   match value with
   | Tuple([