summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-10-03 11:46:26 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-10-03 11:46:26 +0000
commit166d14c272ba66dce4bbe38caf289969687311ac (patch)
tree4ec432aa57c375a1fd94993d851305f944e83d35
parentf7d72e64e43f4379cd04ca0885b7dc9ad87c6f28 (diff)
xetexdir/XeTeXOTMath.cpp: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@42194 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp8
2 files changed, 11 insertions, 1 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 9f661c4f6e2..598c92efd55 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-03 Akira Kakuto <kakuto@fuk.kinidai.ac.jp>
+
+ * XeTeXOTMath.cpp: Sync with the upstream..
+
2016-09-25 Akira Kakuto <kakuto@fuk.kinidai.ac.jp>
* MathTable.h, XeTeXOTMath.cpp: Sync with the upstream..
diff --git a/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp b/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp
index 9892157336f..a10cc21d236 100644
--- a/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp
+++ b/Build/source/texk/web2c/xetexdir/XeTeXOTMath.cpp
@@ -34,6 +34,7 @@ authorization from the copyright holders.
#include <w2c/config.h>
#include <assert.h>
+#include <algorithm>
#include "XeTeXOTMath.h"
@@ -150,8 +151,13 @@ get_native_mathsy_param(int f, int n)
{
int rval = 0;
- if (n == math_quad || n == delim2)
+ if (n == math_quad) {
rval = fontsize[f];
+ }
+ else if (n == delim2) { // XXX not sure what OT parameter we should use here;
+ // for now we use 1.5em, clamped to delim1 height
+ rval = std::min<int>(1.5 * fontsize[f], get_native_mathsy_param(f, delim1));
+ }
else {
if (n < sizeof(TeX_sym_to_OT_map) / sizeof(mathConstantIndex)) {
mathConstantIndex ot_index = TeX_sym_to_OT_map[n];