Merge branch 'master' into releases

.clang-format

@@ -11,3 +11,4 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: true
 IndentCaseLabels: true
 AlignOperands: true
 AlignAfterOpenBracket: true
+SortIncludes: false

.editorconfig

@@ -5,4 +5,8 @@ end_of_line = lf
 insert_final_newline = true
 charset = utf-8
 indent_style = tab
-indent_size = 4
+indent_size = 4
+
+[**.{cmd,bat,ps1}]
+end_of_line = crlf
+insert_final_newline = false

.travis.yml

@@ -1,26 +1,27 @@
-language: c
-
-sudo: required
-dist: trusty
-
-compiler:
- - clang
- - gcc
-
-os:
- - linux
-
-addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - gcc-5
- - g++-5
-
-install:
- - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export PREMAKE5=dep/bin-linux/premake5; else export PREMAKE5=dep/bin-osx/premake5; fi
- - chmod +x $PREMAKE5
-
-script:
- - make linux-release-x64
+language: c
+
+sudo: required
+dist: trusty
+
+compiler:
+ - clang
+ - gcc
+
+os:
+ - linux
+
+addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - gcc-5
+ - g++-5
+
+install:
+ - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export PREMAKE5=dep/bin-linux/premake5; else export PREMAKE5=dep/bin-osx/premake5; fi
+ - chmod +x $PREMAKE5
+
+script:
+ - make linux-release-x64
+ - make test

README.md

@@ -17,15 +17,15 @@ otfccdump [OPTIONS] input.[otf|ttf|ttc]
 
  -h, --help : Display this help message and exit.
  -v, --version : Display version information and exit.
- -o <file> : Set output file path to <file>. When abasent
+ -o <file> : Set output file path to <file>. When absent,
  the dump will be written to STDOUT.
  -n <n>, --ttc-index <n> : Use the <n>th subfont within the input font.
  --pretty : Prettify the output JSON.
  --ugly : Force uglify the output JSON.
- --time : Time each substep.
+ --time : Time each sub-step.
  --glyph-name-prefix pfx : Add a prefix to the glyph names.
  --ignore-glyph-order : Do not export glyph order information.
- --ignore-hints : Do not export hingint information.
+ --ignore-hints : Do not export hinting information.
  --add-bom : Add BOM mark in the output. (This is default
  on Windows when redirecting to another program.
  Use --no-bom to turn it off.)
@@ -53,7 +53,7 @@ otfccbuild [OPTIONS] [input.json] -o output.[ttf|otf]
  --dummy-DSIG : Include an empty DSIG table in the font. For
  some Microsoft applications, a DSIG is required
  to enable OpenType features.
- --ship : Equalivent to the combination of these options:
+ --ship : Equivalent to the combination of these options:
  * --ignore-glyph-order
  * --short-post
  * --dummy-dsig

appveyor.yml

@@ -1,11 +1,11 @@
-environment:
- VS_VERSION: vs2015
-platform:
- - x64
-configuration:
- - Release
-install:
- - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
-build_script:
- - dep\bin-win\premake5.exe vs2015
- - cmd /c _vcbuild64.bat /property:Configuration=Release
+environment:
+ VS_VERSION: vs2015
+platform:
+ - x64
+configuration:
+ - Release
+install:
+ - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
+build_script:
+ - dep\bin-win\premake5.exe vs2015
+ - cmd /c _vcbuild64.bat /property:Configuration=Release

dep/extern/json-builder.c

@@ -669,9 +669,6 @@ size_t json_measure_ex (json_value * value, json_serialize_opts opts)
 
  total += snprintf (NULL, 0, "%g", value->u.dbl);
 
- if (value->u.dbl - floor (value->u.dbl) < 0.001)
- total += 2;
-
  break;
 
  case json_boolean:
@@ -894,12 +891,7 @@ void json_serialize_ex (json_char * buf, json_value * value, json_serialize_opts
  {
  *dot = '.';
  }
- else if (!strchr (ptr, '.'))
- {
- *buf ++ = '.';
- *buf ++ = '0';
- }
-
+
  break;
 
  case json_boolean: