Merge branch 'master' into omd

Sapphire-Lilith · Oct 9, 2018 · e7a06f3 · e7a06f3
2 parents 43e024d + 4e5eb43
commit e7a06f3
Show file tree

Hide file tree

Showing 10 changed files with 477 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.0.3] - 2018-10-09
 ### Fixed
-- Does NOT insert spacing between different scripts when the line breaking class of the posterior charcter is CL, CP, QU, NS, JLCP, JLNS, JLCM, or JLFS
+- Does NOT insert spacing between different scripts when the [line breaking class](http://unicode.org/reports/tr14/) of the posterior charcter is CL, CP, QU, NS, JLCP, JLNS, JLCM, or JLFS.
 
-# Changed
-- Supports the application of math commands to optional arguments
-- Add `set-space-ratio-between-scripts` and `get-space-ratio-between-scripts`
+# Added
+- Supports the application of math commands to optional arguments.
+- Provides primitives `set-space-ratio-between-scripts` and `get-space-ratio-between-scripts`.
 
 ## [0.0.2] - 2018-08-09
 ### Fixed

diff --git a/Makefile b/Makefile
@@ -76,20 +76,6 @@ install: $(TARGET)
 #preliminary:
 #	[ -d .git ] && git submodule update -i || echo "Skip git submodule update -i"
 
-lib:
-# -- downloads fonts --
-	mkdir -p temp/
-	if [ -x "$$(command -v curl)" ]; then \
-	  curl -R -o temp/lm2.004otf.zip http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip; \
-	  curl -R -o temp/latinmodern-math-1959.zip http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip; \
-	else \
-	  wget -N http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip -P temp/; \
-	  wget -N http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip -P temp/; \
-        fi
-	unzip -o temp/lm2.004otf.zip -d lib-satysfi/dist/fonts/
-	unzip -o temp/latinmodern-math-1959.zip -d temp/
-	cp temp/latinmodern-math-1959/otf/latinmodern-math.otf lib-satysfi/dist/fonts/
-
 uninstall:
 	rm -rf $(BINDIR)/$(TARGET)
 	rm -rf $(LIBDIR)

diff --git a/README-ja.md b/README-ja.md
@@ -31,7 +31,7 @@ $ brew install --HEAD nyuichi/satysfi/satysfi
 * unzip
 * wget or curl
 * ruby
-* [opam](https://opam.ocaml.org/) 1.2 （インストール手順は[こちら](https://opam.ocaml.org/doc/Install.html)。）
+* [opam](https://opam.ocaml.org/) 2.0 （インストール手順は[こちら](https://opam.ocaml.org/doc/Install.html)。）
 * ocaml 4.06.0 （OPAM からインストールします）
 
 また，ビルドには外部 OPAM リポジトリの追加が必要です。これは以下のコマンドでできます。
@@ -45,14 +45,15 @@ opam update
 
 ```sh
 sudo apt-get update
-sudo apt-get install build-essential git m4 unzip wget
+sudo apt-get install build-essential git m4 unzip curl
+
+sh <(curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh)
 
 # 以下のコマンドは OPAM がファイルに追記してもよいか聞いてきます。
 # 必ず説明を読み，環境変数を適切に設定してください。
-wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh -O - | sh -s /usr/local/bin
+opam init --comp 4.06.0
 
-opam switch 4.06.0
-eval `opam config env`
+eval $(opam env)
 
 opam repository add satysfi-external https://github.com/gfngfn/satysfi-external-repo.git
 opam update
@@ -69,10 +70,9 @@ brew install opam
 
 # 以下のコマンドは OPAM が（~/.bash_profile などの）ファイルに環境変数に関する設定を追記してもよいか聞いてきます。
 # 必ず説明を読み，環境変数を適切に設定してください。
-opam init
+opam init --comp 4.06.0
 
-opam switch 4.06.0
-eval `opam config env`
+eval $(opam env)
 
 opam repository add satysfi-external https://github.com/gfngfn/satysfi-external-repo.git
 opam update

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ Here is a list of minimally required softwares.
 * unzip
 * wget or curl
 * ruby
-* [opam](https://opam.ocaml.org/) 1.2 (Installation instructions are [here](https://opam.ocaml.org/doc/Install.html).)
+* [opam](https://opam.ocaml.org/) 2.0 (Installation instructions are [here](https://opam.ocaml.org/doc/Install.html).)
 * ocaml 4.06.0 (installed by OPAM)
 
 Also, we must add an external OPAM repo to build. This can be done by the following command.
@@ -44,14 +44,15 @@ opam update
 
 ```sh
 sudo apt-get update
-sudo apt-get install build-essential git m4 unzip wget
+sudo apt-get install build-essential git m4 unzip curl
+
+sh <(curl -sL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh)
 
 # The following command will ask if you allow OPAM to modify some files (e.g. ~/.bash_profile).
 # Be sure to read its instructions. Otherwise, some environment variables won't be set.
-wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh -O - | sh -s /usr/local/bin
+opam init --comp 4.06.0
 
-opam switch 4.06.0
-eval `opam config env`
+eval $(opam env)
 
 opam repository add satysfi-external https://github.com/gfngfn/satysfi-external-repo.git
 opam update
@@ -68,10 +69,9 @@ brew install opam
 
 # The following command will ask if OPAM modifies some files.
 # Be sure to read their instructions. Otherwise, some environment variables won't be set.
-opam init
+opam init --comp 4.06.0
 
-opam switch 4.06.0
-eval `opam config env`
+eval $(opam env)
 
 opam repository add satysfi-external https://github.com/gfngfn/satysfi-external-repo.git
 opam update

diff --git a/lib-satysfi/dist/packages/standalone.satyh b/lib-satysfi/dist/packages/standalone.satyh
@@ -6,6 +6,7 @@ let standalone bt =
   let ctx =
     get-initial-context 440pt (command \math)
       |> set-dominant-narrow-script Latin
+      |> set-dominant-wide-script Kana
   in
   let bb = read-block ctx bt in
   page-break A4Paper