summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/harfbuzz')
-rw-r--r--Build/source/libs/harfbuzz/ChangeLog5
-rwxr-xr-xBuild/source/libs/harfbuzz/configure22
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog123
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/NEWS10
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/configure.ac2
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc461
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc2
-rw-r--r--Build/source/libs/harfbuzz/version.ac2
10 files changed, 458 insertions, 176 deletions
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog
index 8347f1f1783..374d80dbc2c 100644
--- a/Build/source/libs/harfbuzz/ChangeLog
+++ b/Build/source/libs/harfbuzz/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Import harfbuzz-1.2.6.
+ * version.ac: Adjusted.
+
2016-04-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Import harfbuzz-1.2.5.
diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure
index f784a857cee..656b46ebceb 100755
--- a/Build/source/libs/harfbuzz/configure
+++ b/Build/source/libs/harfbuzz/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.2.5.
+# Generated by GNU Autoconf 2.69 for harfbuzz (TeX Live) 1.2.6.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='harfbuzz (TeX Live)'
PACKAGE_TARNAME='harfbuzz--tex-live-'
-PACKAGE_VERSION='1.2.5'
-PACKAGE_STRING='harfbuzz (TeX Live) 1.2.5'
+PACKAGE_VERSION='1.2.6'
+PACKAGE_STRING='harfbuzz (TeX Live) 1.2.6'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1312,7 +1312,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures harfbuzz (TeX Live) 1.2.5 to adapt to many kinds of systems.
+\`configure' configures harfbuzz (TeX Live) 1.2.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1383,7 +1383,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.2.5:";;
+ short | recursive ) echo "Configuration of harfbuzz (TeX Live) 1.2.6:";;
esac
cat <<\_ACEOF
@@ -1490,7 +1490,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-harfbuzz (TeX Live) configure 1.2.5
+harfbuzz (TeX Live) configure 1.2.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2080,7 +2080,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by harfbuzz (TeX Live) $as_me 1.2.5, which was
+It was created by harfbuzz (TeX Live) $as_me 1.2.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4003,7 +4003,7 @@ fi
# Define the identity of the package.
PACKAGE='harfbuzz--tex-live-'
- VERSION='1.2.5'
+ VERSION='1.2.6'
cat >>confdefs.h <<_ACEOF
@@ -4207,7 +4207,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
HB_VERSION_MAJOR=1
HB_VERSION_MINOR=2
HB_VERSION_MICRO=5
-HB_VERSION=1.2.5
+HB_VERSION=1.2.6
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -6866,7 +6866,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by harfbuzz (TeX Live) $as_me 1.2.5, which was
+This file was extended by harfbuzz (TeX Live) $as_me 1.2.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6932,7 +6932,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-harfbuzz (TeX Live) config.status 1.2.5
+harfbuzz (TeX Live) config.status 1.2.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog
index 5f5fce1f4a9..c100d86ddd0 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Imported harfbuzz-1.2.6 source tree from:
+ http://www.freedesktop.org/software/harfbuzz/release/
+
2016-04-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Imported harfbuzz-1.2.5 source tree from:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes
index a04daba7f83..3b1fd536f81 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes
+++ b/Build/source/libs/harfbuzz/harfbuzz-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the harfbuzz-1.2.5/ tree as obtained from:
+Changes applied to the harfbuzz-1.2.6/ tree as obtained from:
http://www.freedesktop.org/software/harfbuzz/release/
Removed:
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog
index b53b1bff1ef..0339f723f82 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/ChangeLog
@@ -1,11 +1,39 @@
-commit ba8370d07317e0103f1fd486524774d415056186
+commit 4f3d59a1877dcb94d09da48e9694a6c1b05a86fe
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Fri Apr 8 13:41:20 2016 -0700
+
+ Blacklist another set of timesi.ttf and timesbi.ttf
+
+ src/hb-ot-layout.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit ef476be80d773332e0c768a3465d99381d76edd9
+Merge: a0331b5 d3134a6
+Author: Behdad Esfahbod <behdad@behdad.org>
+Date: Fri Apr 8 13:16:33 2016 -0700
+
+ Merge pull request #239 from ebraminio/dwfix
+
+ Improve DirectWrite backend
+
+commit d3134a66ad551ded726db9528d3c25459088f105
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Tue Apr 5 21:01:05 2016 +0000
+
+ Fix when no feature is given
+
+ src/hb-directwrite.cc | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+commit a0331b55f7b45437980e1fc323251f4091bf2c4e
Author: Behdad Esfahbod <behdad@behdad.org>
Date: Mon Apr 4 16:25:32 2016 -0700
1.2.5
- NEWS | 7 +++++++
- 1 file changed, 7 insertions(+)
+ NEWS | 7 +++++++
+ configure.ac | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
commit 6e55199b5f097ac93bad38f32e9813e2da14c5a7
Author: Behdad Esfahbod <behdad@behdad.org>
@@ -42,6 +70,95 @@ Date: Mon Apr 4 14:34:25 2016 -0700
src/hb-open-type-private.hh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
+commit 4a104021697439fd21390a1f4cdc9310348882fa
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Sat Apr 2 13:47:59 2016 +0000
+
+ Hide justification behind HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION
+
+ src/hb-directwrite.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+commit 63ee9ca5d81b53eb035972754ed95572821c393c
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Fri Apr 1 15:47:07 2016 +0000
+
+ Use standard types instead Windows favourites ones
+
+ src/hb-directwrite.cc | 100
+ +++++++++++++++++++++++++-------------------------
+ 1 file changed, 50 insertions(+), 50 deletions(-)
+
+commit adf20ba0d18d1506e633dcd9b4827a6c93abcadd
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Fri Apr 1 15:36:40 2016 +0000
+
+ Limit GetJustifiedGlyphs only to scripts with custom justification
+ character
+
+ src/hb-directwrite.cc | 98
+ +++++++++++++++++++++++++++++++--------------------
+ 1 file changed, 60 insertions(+), 38 deletions(-)
+
+commit 32ae9d1b3ffbe7e26e654437a56a26a95fe9f5a6
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Fri Apr 1 06:39:57 2016 +0000
+
+ Add justification support
+
+ src/hb-directwrite.cc | 321
+ ++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 205 insertions(+), 116 deletions(-)
+
+commit 10c3d9e41520595c88dd2a8321590e03ce8fcf47
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Thu Mar 31 18:19:44 2016 +0000
+
+ Basic opentype features support
+
+ src/hb-directwrite.cc | 62
+ ++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 42 insertions(+), 20 deletions(-)
+
+commit d129897120d3ad414220d603557c15a60aa69fa6
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Thu Mar 31 13:45:37 2016 +0000
+
+ Refactor and remove dupe getglyphs call
+
+ src/hb-directwrite.cc | 106
+ ++++++++++++++++++++++++--------------------------
+ 1 file changed, 51 insertions(+), 55 deletions(-)
+
+commit 5f1a8961008b93f72acc47336109af3a64e248d0
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Thu Mar 31 12:26:16 2016 +0000
+
+ Better glyph offset support
+
+ src/hb-directwrite.cc | 44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+commit d691ba3f405738c6857450752b8cc0911dfcdb01
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Wed Mar 30 20:21:40 2016 +0000
+
+ Don't fail when language is not set
+
+ src/hb-directwrite.cc | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit 1c00a46c7a608ebc0b03c5abfcfe7f2b9881d0df
+Author: Ebrahim Byagowi <ebrahim@gnu.org>
+Date: Wed Mar 30 20:15:09 2016 +0000
+
+ Make DirectWrite backend to work with different font sizes
+
+ Actually copyedited same logic from Uniscribe to make it just work
+
+ src/hb-directwrite.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
commit 0251b0cc5c39272d2299d4b2ab802faaafe96837
Author: Behdad Esfahbod <behdad@behdad.org>
Date: Thu Mar 17 14:37:11 2016 -0700
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS
index 71036b3d76c..721d5282a3e 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/NEWS
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/NEWS
@@ -1,3 +1,13 @@
+Overview of changes leading to 1.2.6
+Friday, April 8, 2016
+====================================
+
+- Blacklist GDEF table of another set of Times New Roman (Bold) Italic.
+- DirectWrite backend improvements. Note: DirectWrite backend is
+ exclusively for our internal testing and should NOT be used in any
+ production system whatsoever.
+
+
Overview of changes leading to 1.2.5
Monday, April 4, 2016
====================================
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac
index e3eb2627d64..44621c9a86a 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([HarfBuzz],
- [1.2.5],
+ [1.2.6],
[http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz],
[harfbuzz],
[http://harfbuzz.org/])
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc
index af0fd3da0f7..96d1870a0fb 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-directwrite.cc
@@ -1,5 +1,5 @@
/*
- * Copyright © 2015 Ebrahim Byagowi
+ * Copyright © 2015-2016 Ebrahim Byagowi
*
* This is part of HarfBuzz, a text shaping library.
*
@@ -25,7 +25,11 @@
#define HB_SHAPER directwrite
#include "hb-shaper-impl-private.hh"
-#include <dwrite.h>
+#ifndef HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION
+ #include <DWrite.h>
+#else
+ #include <DWrite_1.h>
+#endif
#include "hb-directwrite.h"
@@ -176,7 +180,8 @@ _hb_rename_font(hb_blob_t *blob, wchar_t *new_name)
hb_directwrite_shaper_face_data_t *
_hb_directwrite_shaper_face_data_create(hb_face_t *face)
{
- hb_directwrite_shaper_face_data_t *data = (hb_directwrite_shaper_face_data_t *)calloc(1, sizeof (hb_directwrite_shaper_face_data_t));
+ hb_directwrite_shaper_face_data_t *data =
+ (hb_directwrite_shaper_face_data_t *) calloc (1, sizeof (hb_directwrite_shaper_face_data_t));
if (unlikely (!data))
return NULL;
@@ -244,26 +249,30 @@ _hb_directwrite_shaper_font_data_create (hb_font_t *font)
{
if (unlikely (!hb_directwrite_shaper_face_data_ensure (font->face))) return NULL;
- hb_directwrite_shaper_font_data_t *data = (hb_directwrite_shaper_font_data_t *) calloc (1, sizeof (hb_directwrite_shaper_font_data_t));
+ hb_directwrite_shaper_font_data_t *data =
+ (hb_directwrite_shaper_font_data_t *) calloc (1, sizeof (hb_directwrite_shaper_font_data_t));
if (unlikely (!data))
return NULL;
data->hdc = GetDC (NULL);
- if (unlikely (!populate_log_font (&data->log_font, font))) {
+ if (unlikely (!populate_log_font (&data->log_font, font)))
+ {
DEBUG_MSG (DIRECTWRITE, font, "Font populate_log_font() failed");
_hb_directwrite_shaper_font_data_destroy (data);
return NULL;
}
data->hfont = CreateFontIndirectW (&data->log_font);
- if (unlikely (!data->hfont)) {
+ if (unlikely (!data->hfont))
+ {
DEBUG_MSG (DIRECTWRITE, font, "Font CreateFontIndirectW() failed");
_hb_directwrite_shaper_font_data_destroy (data);
return NULL;
}
- if (!SelectObject (data->hdc, data->hfont)) {
+ if (!SelectObject (data->hdc, data->hfont))
+ {
DEBUG_MSG (DIRECTWRITE, font, "Font SelectObject() failed");
_hb_directwrite_shaper_font_data_destroy (data);
return NULL;
@@ -333,16 +342,16 @@ public:
// results.
struct Run
{
- UINT32 mTextStart; // starting text position of this run
- UINT32 mTextLength; // number of contiguous code units covered
- UINT32 mGlyphStart; // starting glyph in the glyphs array
- UINT32 mGlyphCount; // number of glyphs associated with this run of
+ uint32_t mTextStart; // starting text position of this run
+ uint32_t mTextLength; // number of contiguous code units covered
+ uint32_t mGlyphStart; // starting glyph in the glyphs array
+ uint32_t mGlyphCount; // number of glyphs associated with this run of
// text
DWRITE_SCRIPT_ANALYSIS mScript;
- UINT8 mBidiLevel;
+ uint8_t mBidiLevel;
bool mIsSideways;
- inline bool ContainsTextPosition(UINT32 aTextPosition) const
+ inline bool ContainsTextPosition(uint32_t aTextPosition) const
{
return aTextPosition >= mTextStart
&& aTextPosition < mTextStart + mTextLength;
@@ -353,7 +362,7 @@ public:
public:
TextAnalysis(const wchar_t* text,
- UINT32 textLength,
+ uint32_t textLength,
const wchar_t* localeName,
DWRITE_READING_DIRECTION readingDirection)
: mText(text)
@@ -367,7 +376,7 @@ public:
for (Run *run = mRunHead.nextRun; run;) {
Run *origRun = run;
run = run->nextRun;
- delete origRun;
+ free (origRun);
}
}
@@ -388,10 +397,7 @@ public:
mCurrentRun = &mRunHead;
// Call each of the analyzers in sequence, recording their results.
- if (SUCCEEDED(hr = textAnalyzer->AnalyzeScript(this,
- 0,
- mTextLength,
- this))) {
+ if (SUCCEEDED (hr = textAnalyzer->AnalyzeScript (this, 0, mTextLength, this))) {
*runHead = &mRunHead;
}
@@ -400,9 +406,9 @@ public:
// IDWriteTextAnalysisSource implementation
- IFACEMETHODIMP GetTextAtPosition(UINT32 textPosition,
- OUT WCHAR const** textString,
- OUT UINT32* textLength)
+ IFACEMETHODIMP GetTextAtPosition(uint32_t textPosition,
+ OUT wchar_t const** textString,
+ OUT uint32_t* textLength)
{
if (textPosition >= mTextLength) {
// No text at this position, valid query though.
@@ -416,9 +422,9 @@ public:
return S_OK;
}
- IFACEMETHODIMP GetTextBeforePosition(UINT32 textPosition,
- OUT WCHAR const** textString,
- OUT UINT32* textLength)
+ IFACEMETHODIMP GetTextBeforePosition(uint32_t textPosition,
+ OUT wchar_t const** textString,
+ OUT uint32_t* textLength)
{
if (textPosition == 0 || textPosition > mTextLength) {
// Either there is no text before here (== 0), or this
@@ -436,15 +442,15 @@ public:
IFACEMETHODIMP_(DWRITE_READING_DIRECTION)
GetParagraphReadingDirection() { return mReadingDirection; }
- IFACEMETHODIMP GetLocaleName(UINT32 textPosition,
- UINT32* textLength,
- WCHAR const** localeName) {
+ IFACEMETHODIMP GetLocaleName(uint32_t textPosition,
+ uint32_t* textLength,
+ wchar_t const** localeName) {
return S_OK;
}
IFACEMETHODIMP
- GetNumberSubstitution(UINT32 textPosition,
- OUT UINT32* textLength,
+ GetNumberSubstitution(uint32_t textPosition,
+ OUT uint32_t* textLength,
OUT IDWriteNumberSubstitution** numberSubstitution)
{
// We do not support number substitution.
@@ -457,8 +463,8 @@ public:
// IDWriteTextAnalysisSink implementation
IFACEMETHODIMP
- SetScriptAnalysis(UINT32 textPosition,
- UINT32 textLength,
+ SetScriptAnalysis(uint32_t textPosition,
+ uint32_t textLength,
DWRITE_SCRIPT_ANALYSIS const* scriptAnalysis)
{
SetCurrentRun(textPosition);
@@ -472,22 +478,22 @@ public:
}
IFACEMETHODIMP
- SetLineBreakpoints(UINT32 textPosition,
- UINT32 textLength,
+ SetLineBreakpoints(uint32_t textPosition,
+ uint32_t textLength,
const DWRITE_LINE_BREAKPOINT* lineBreakpoints) { return S_OK; }
- IFACEMETHODIMP SetBidiLevel(UINT32 textPosition,
- UINT32 textLength,
- UINT8 explicitLevel,
- UINT8 resolvedLevel) { return S_OK; }
+ IFACEMETHODIMP SetBidiLevel(uint32_t textPosition,
+ uint32_t textLength,
+ uint8_t explicitLevel,
+ uint8_t resolvedLevel) { return S_OK; }
IFACEMETHODIMP
- SetNumberSubstitution(UINT32 textPosition,
- UINT32 textLength,
+ SetNumberSubstitution(uint32_t textPosition,
+ uint32_t textLength,
IDWriteNumberSubstitution* numberSubstitution) { return S_OK; }
protected:
- Run *FetchNextRun(IN OUT UINT32* textLength)
+ Run *FetchNextRun(IN OUT uint32_t* textLength)
{
// Used by the sink setters, this returns a reference to the next run.
// Position and length are adjusted to now point after the current run
@@ -509,7 +515,7 @@ protected:
return origRun;
}
- void SetCurrentRun(UINT32 textPosition)
+ void SetCurrentRun(uint32_t textPosition)
{
// Move the current run to the given position.
// Since the analyzers generally return results in a forward manner,
@@ -530,7 +536,7 @@ protected:
// of our runs");
}
- void SplitCurrentRun(UINT32 splitPosition)
+ void SplitCurrentRun(uint32_t splitPosition)
{
if (!mCurrentRun) {
//NS_ASSERTION(false, "SplitCurrentRun called without current run.");
@@ -543,7 +549,7 @@ protected:
// or before it. Usually the first.
return;
}
- Run *newRun = new Run;
+ Run *newRun = (Run*) malloc (sizeof (Run));
*newRun = *mCurrentRun;
@@ -552,7 +558,7 @@ protected:
mCurrentRun->nextRun = newRun;
// Adjust runs' text positions and lengths.
- UINT32 splitPoint = splitPosition - mCurrentRun->mTextStart;
+ uint32_t splitPoint = splitPosition - mCurrentRun->mTextStart;
newRun->mTextStart += splitPoint;
newRun->mTextLength -= splitPoint;
mCurrentRun->mTextLength = splitPoint;
@@ -563,9 +569,9 @@ protected:
// Input
// (weak references are fine here, since this class is a transient
// stack-based helper that doesn't need to copy data)
- UINT32 mTextLength;
- const WCHAR* mText;
- const WCHAR* mLocaleName;
+ uint32_t mTextLength;
+ const wchar_t* mText;
+ const wchar_t* mLocaleName;
DWRITE_READING_DIRECTION mReadingDirection;
// Current processing state.
@@ -575,6 +581,10 @@ protected:
Run mRunHead;
};
+static inline uint16_t hb_uint16_swap (const uint16_t v)
+{ return (v >> 8) | (v << 8); }
+static inline uint32_t hb_uint32_swap (const uint32_t v)
+{ return (hb_uint16_swap(v) << 16) | hb_uint16_swap(v >> 16); }
/*
* shaper
@@ -592,20 +602,30 @@ _hb_directwrite_shape(hb_shape_plan_t *shape_plan,
hb_directwrite_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
// factory probably should be cached
+#ifndef HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION
IDWriteFactory* dwriteFactory;
- DWriteCreateFactory(
+#else
+ IDWriteFactory1* dwriteFactory;
+#endif
+ DWriteCreateFactory (
DWRITE_FACTORY_TYPE_SHARED,
- __uuidof(IDWriteFactory),
- reinterpret_cast<IUnknown**>(&dwriteFactory)
- );
+ __uuidof (IDWriteFactory),
+ (IUnknown**) &dwriteFactory
+ );
IDWriteGdiInterop *gdiInterop;
dwriteFactory->GetGdiInterop (&gdiInterop);
IDWriteFontFace* fontFace;
gdiInterop->CreateFontFaceFromHdc (font_data->hdc, &fontFace);
+#ifndef HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION
IDWriteTextAnalyzer* analyzer;
- dwriteFactory->CreateTextAnalyzer (&analyzer);
+ dwriteFactory->CreateTextAnalyzer(&analyzer);
+#else
+ IDWriteTextAnalyzer* analyzer0;
+ dwriteFactory->CreateTextAnalyzer (&analyzer0);
+ IDWriteTextAnalyzer1* analyzer = (IDWriteTextAnalyzer1*) analyzer0;
+#endif
unsigned int scratch_size;
hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size);
@@ -620,7 +640,7 @@ _hb_directwrite_shape(hb_shape_plan_t *shape_plan,
#define utf16_index() var1.u32
- ALLOCATE_ARRAY(WCHAR, pchars, buffer->len * 2);
+ ALLOCATE_ARRAY(wchar_t, textString, buffer->len * 2);
unsigned int chars_len = 0;
for (unsigned int i = 0; i < buffer->len; i++)
@@ -628,17 +648,17 @@ _hb_directwrite_shape(hb_shape_plan_t *shape_plan,
hb_codepoint_t c = buffer->info[i].codepoint;
buffer->info[i].utf16_index() = chars_len;
if (likely(c <= 0xFFFFu))
- pchars[chars_len++] = c;
+ textString[chars_len++] = c;
else if (unlikely(c > 0x10FFFFu))
- pchars[chars_len++] = 0xFFFDu;
+ textString[chars_len++] = 0xFFFDu;
else {
- pchars[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10);
- pchars[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1 << 10) - 1));
+ textString[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10);
+ textString[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1 << 10) - 1));
}
}
ALLOCATE_ARRAY(WORD, log_clusters, chars_len);
- if (num_features)
+ // if (num_features)
{
/* Need log_clusters to assign features. */
chars_len = 0;
@@ -664,164 +684,287 @@ _hb_directwrite_shape(hb_shape_plan_t *shape_plan,
* but we never attempt to shape a word longer than 64K characters
* in a single gfxShapedWord, so we cannot exceed that limit.
*/
- UINT32 length = buffer->len;
+ uint32_t textLength = buffer->len;
- TextAnalysis analysis(pchars, length, NULL, readingDirection);
+ TextAnalysis analysis(textString, textLength, NULL, readingDirection);
TextAnalysis::Run *runHead;
hr = analysis.GenerateResults(analyzer, &runHead);
- if (FAILED(hr)) {
- //NS_WARNING("Analyzer failed to generate results.");
+#define FAIL(...) \
+ HB_STMT_START { \
+ DEBUG_MSG (DIRECTWRITE, NULL, __VA_ARGS__); \
+ return false; \
+ } HB_STMT_END;
+
+ if (FAILED (hr))
+ {
+ FAIL ("Analyzer failed to generate results.");
return false;
}
- UINT32 maxGlyphs = 3 * length / 2 + 16;
+ uint32_t maxGlyphCount = 3 * textLength / 2 + 16;
+ uint32_t glyphCount;
+ bool isRightToLeft = HB_DIRECTION_IS_BACKWARD (buffer->props.direction);
+
+ const wchar_t localeName[20] = {0};
+ if (buffer->props.language != NULL)
+ {
+ mbstowcs ((wchar_t*) localeName,
+ hb_language_to_string (buffer->props.language), 20);
+ }
+
+ DWRITE_TYPOGRAPHIC_FEATURES singleFeatures;
+ singleFeatures.featureCount = num_features;
+ if (num_features)
+ {
+ DWRITE_FONT_FEATURE* dwfeatureArray = (DWRITE_FONT_FEATURE*)
+ malloc (sizeof (DWRITE_FONT_FEATURE) * num_features);
+ for (unsigned int i = 0; i < num_features; ++i)
+ {
+ dwfeatureArray[i].nameTag = (DWRITE_FONT_FEATURE_TAG)
+ hb_uint32_swap (features[i].tag);
+ dwfeatureArray[i].parameter = features[i].value;
+ }
+ singleFeatures.features = dwfeatureArray;
+ }
+ const DWRITE_TYPOGRAPHIC_FEATURES* dwFeatures =
+ (const DWRITE_TYPOGRAPHIC_FEATURES*) &singleFeatures;
+ const uint32_t featureRangeLengths[] = { textLength };
-#define INITIAL_GLYPH_SIZE 400
- UINT16* clusters = (UINT16*)malloc(INITIAL_GLYPH_SIZE * sizeof(UINT16));
- UINT16* glyphs = (UINT16*)malloc(INITIAL_GLYPH_SIZE * sizeof(UINT16));
+retry_getglyphs:
+ uint16_t* clusterMap = (uint16_t*) malloc (maxGlyphCount * sizeof (uint16_t));
+ uint16_t* glyphIndices = (uint16_t*) malloc (maxGlyphCount * sizeof (uint16_t));
DWRITE_SHAPING_TEXT_PROPERTIES* textProperties = (DWRITE_SHAPING_TEXT_PROPERTIES*)
- malloc(INITIAL_GLYPH_SIZE * sizeof(DWRITE_SHAPING_TEXT_PROPERTIES));
+ malloc (maxGlyphCount * sizeof (DWRITE_SHAPING_TEXT_PROPERTIES));
DWRITE_SHAPING_GLYPH_PROPERTIES* glyphProperties = (DWRITE_SHAPING_GLYPH_PROPERTIES*)
- malloc(INITIAL_GLYPH_SIZE * sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES));
-
- UINT32 actualGlyphs;
-
- bool backward = HB_DIRECTION_IS_BACKWARD(buffer->props.direction);
-
- wchar_t lang[4];
- mbstowcs(lang, hb_language_to_string(buffer->props.language), 4);
- hr = analyzer->GetGlyphs(pchars, length,
- fontFace, FALSE,
- buffer->props.direction,
- &runHead->mScript, (const wchar_t*)lang, NULL, NULL, NULL, 0,
- maxGlyphs, clusters, textProperties,
- glyphs, glyphProperties, &actualGlyphs);
-
- if (hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) {
- free(clusters);
- free(glyphs);
- free(textProperties);
- free(glyphProperties);
-
- clusters = (UINT16*)malloc(INITIAL_GLYPH_SIZE * sizeof(UINT16));
- glyphs = (UINT16*)malloc(INITIAL_GLYPH_SIZE * sizeof(UINT16));
- textProperties = (DWRITE_SHAPING_TEXT_PROPERTIES*)
- malloc(INITIAL_GLYPH_SIZE * sizeof(DWRITE_SHAPING_TEXT_PROPERTIES));
- glyphProperties = (DWRITE_SHAPING_GLYPH_PROPERTIES*)
- malloc(INITIAL_GLYPH_SIZE * sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES));
-
- hr = analyzer->GetGlyphs(pchars, length,
- fontFace, FALSE,
- buffer->props.direction,
- &runHead->mScript, (const wchar_t*)lang, NULL, NULL, NULL, 0,
- maxGlyphs, clusters, textProperties,
- glyphs, glyphProperties, &actualGlyphs);
- }
- if (FAILED(hr)) {
- //NS_WARNING("Analyzer failed to get glyphs.");
+ malloc (maxGlyphCount * sizeof (DWRITE_SHAPING_GLYPH_PROPERTIES));
+
+ hr = analyzer->GetGlyphs (textString, textLength, fontFace, FALSE,
+ isRightToLeft, &runHead->mScript, localeName, NULL, &dwFeatures,
+ featureRangeLengths, 1, maxGlyphCount, clusterMap, textProperties, glyphIndices,
+ glyphProperties, &glyphCount);
+
+ if (unlikely (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER)))
+ {
+ free (clusterMap);
+ free (glyphIndices);
+ free (textProperties);
+ free (glyphProperties);
+
+ maxGlyphCount *= 2;
+
+ goto retry_getglyphs;
+ }
+ if (FAILED (hr))
+ {
+ FAIL ("Analyzer failed to get glyphs.");
return false;
}
- FLOAT advances[400];
- DWRITE_GLYPH_OFFSET offsets[400];
-
+ float* glyphAdvances = (float*) malloc (maxGlyphCount * sizeof (float));
+ DWRITE_GLYPH_OFFSET* glyphOffsets = (DWRITE_GLYPH_OFFSET*)
+ malloc(maxGlyphCount * sizeof (DWRITE_GLYPH_OFFSET));
/* The -2 in the following is to compensate for possible
* alignment needed after the WORD array. sizeof(WORD) == 2. */
- unsigned int glyphs_size = (scratch_size * sizeof (int)-2)
- / (sizeof (WORD) +
- 4 + // sizeof (SCRIPT_GLYPHPROP) +
- sizeof (int) +
- 8 + // sizeof (GOFFSET) +
- sizeof (uint32_t));
- ALLOCATE_ARRAY(uint32_t, vis_clusters, glyphs_size);
+ unsigned int glyphs_size = (scratch_size * sizeof(int) - 2)
+ / (sizeof(WORD) +
+ sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES) +
+ sizeof(int) +
+ sizeof(DWRITE_GLYPH_OFFSET) +
+ sizeof(uint32_t));
+ ALLOCATE_ARRAY (uint32_t, vis_clusters, glyphs_size);
#undef ALLOCATE_ARRAY
- hr = analyzer->GetGlyphPlacements(pchars,
- clusters,
- textProperties,
- length,
- glyphs,
- glyphProperties,
- actualGlyphs,
- fontFace,
- face->get_upem(),
- FALSE,
- FALSE,
- &runHead->mScript,
- NULL,
- NULL,
- NULL,
- 0,
- advances,
- offsets);
-
- if (FAILED(hr)) {
- //NS_WARNING("Analyzer failed to get glyph placements.");
+ int fontEmSize = font->face->get_upem();
+ if (fontEmSize < 0)
+ fontEmSize = -fontEmSize;
+
+ if (fontEmSize < 0)
+ fontEmSize = -fontEmSize;
+ double x_mult = (double) font->x_scale / fontEmSize;
+ double y_mult = (double) font->y_scale / fontEmSize;
+
+ hr = analyzer->GetGlyphPlacements (textString,
+ clusterMap, textProperties, textLength, glyphIndices,
+ glyphProperties, glyphCount, fontFace, fontEmSize,
+ FALSE, isRightToLeft, &runHead->mScript, localeName,
+ &dwFeatures, featureRangeLengths, 1,
+ glyphAdvances, glyphOffsets);
+
+ if (FAILED (hr))
+ {
+ FAIL ("Analyzer failed to get glyph placements.");
return false;
}
- unsigned int glyphs_len = actualGlyphs;
+#ifdef HB_DIRECTWRITE_EXPERIMENTAL_JUSTIFICATION
+
+ DWRITE_JUSTIFICATION_OPPORTUNITY* justificationOpportunities =
+ (DWRITE_JUSTIFICATION_OPPORTUNITY*)
+ malloc (maxGlyphCount * sizeof (DWRITE_JUSTIFICATION_OPPORTUNITY));
+ hr = analyzer->GetJustificationOpportunities (fontFace, fontEmSize,
+ runHead->mScript, textLength, glyphCount, textString, clusterMap,
+ glyphProperties, justificationOpportunities);
+
+ if (FAILED (hr))
+ {
+ FAIL ("Analyzer failed to get justification opportunities.");
+ return false;
+ }
+
+ // TODO: get lineWith from somewhere
+ float lineWidth = 60000;
+
+ float* justifiedGlyphAdvances =
+ (float*) malloc (maxGlyphCount * sizeof (float));
+ DWRITE_GLYPH_OFFSET* justifiedGlyphOffsets = (DWRITE_GLYPH_OFFSET*)
+ malloc (glyphCount * sizeof (DWRITE_GLYPH_OFFSET));
+ hr = analyzer->JustifyGlyphAdvances (lineWidth, glyphCount, justificationOpportunities,
+ glyphAdvances, glyphOffsets, justifiedGlyphAdvances, justifiedGlyphOffsets);
+
+ if (FAILED (hr))
+ {
+ FAIL ("Analyzer failed to get justified glyph advances.");
+ return false;
+ }
+
+ DWRITE_SCRIPT_PROPERTIES scriptProperties;
+ hr = analyzer->GetScriptProperties (runHead->mScript, &scriptProperties);
+ if (FAILED (hr))
+ {
+ FAIL ("Analyzer failed to get script properties.");
+ return false;
+ }
+ uint32_t justificationCharacter = scriptProperties.justificationCharacter;
+
+ // if a script justificationCharacter is not space, it can have GetJustifiedGlyphs
+ if (justificationCharacter != 32)
+ {
+retry_getjustifiedglyphs:
+ uint16_t* modifiedClusterMap = (uint16_t*) malloc (maxGlyphCount * sizeof (uint16_t));
+ uint16_t* modifiedGlyphIndices = (uint16_t*) malloc (maxGlyphCount * sizeof (uint16_t));
+ float* modifiedGlyphAdvances = (float*) malloc (maxGlyphCount * sizeof (float));
+ DWRITE_GLYPH_OFFSET* modifiedGlyphOffsets = (DWRITE_GLYPH_OFFSET*)
+ malloc (maxGlyphCount * sizeof (DWRITE_GLYPH_OFFSET));
+ uint32_t actualGlyphsCount;
+ hr = analyzer->GetJustifiedGlyphs (fontFace, fontEmSize, runHead->mScript,
+ textLength, glyphCount, maxGlyphCount, clusterMap, glyphIndices,
+ glyphAdvances, justifiedGlyphAdvances, justifiedGlyphOffsets,
+ glyphProperties, &actualGlyphsCount, modifiedClusterMap, modifiedGlyphIndices,
+ modifiedGlyphAdvances, modifiedGlyphOffsets);
+
+ if (hr == HRESULT_FROM_WIN32 (ERROR_INSUFFICIENT_BUFFER))
+ {
+ maxGlyphCount = actualGlyphsCount;
+ free (modifiedClusterMap);
+ free (modifiedGlyphIndices);
+ free (modifiedGlyphAdvances);
+ free (modifiedGlyphOffsets);
+
+ maxGlyphCount = actualGlyphsCount;
+
+ goto retry_getjustifiedglyphs;
+ }
+ if (FAILED (hr))
+ {
+ FAIL ("Analyzer failed to get justified glyphs.");
+ return false;
+ }
+
+ free (clusterMap);
+ free (glyphIndices);
+ free (glyphAdvances);
+ free (glyphOffsets);
+
+ glyphCount = actualGlyphsCount;
+ clusterMap = modifiedClusterMap;
+ glyphIndices = modifiedGlyphIndices;
+ glyphAdvances = modifiedGlyphAdvances;
+ glyphOffsets = modifiedGlyphOffsets;
+
+ free(justifiedGlyphAdvances);
+ free(justifiedGlyphOffsets);
+ }
+ else
+ {
+ free(glyphAdvances);
+ free(glyphOffsets);
+
+ glyphAdvances = justifiedGlyphAdvances;
+ glyphOffsets = justifiedGlyphOffsets;
+ }
+
+ free(justificationOpportunities);
+
+#endif
/* Ok, we've got everything we need, now compose output buffer,
* very, *very*, carefully! */
/* Calculate visual-clusters. That's what we ship. */
- for (unsigned int i = 0; i < glyphs_len; i++)
+ for (unsigned int i = 0; i < glyphCount; i++)
vis_clusters[i] = -1;
- for (unsigned int i = 0; i < buffer->len; i++) {
- uint32_t *p = &vis_clusters[log_clusters[buffer->info[i].utf16_index()]];
- //*p = MIN (*p, buffer->info[i].cluster);
+ for (unsigned int i = 0; i < buffer->len; i++)
+ {
+ uint32_t *p =
+ &vis_clusters[log_clusters[buffer->info[i].utf16_index()]];
+ *p = MIN (*p, buffer->info[i].cluster);
}
- for (unsigned int i = 1; i < glyphs_len; i++)
+ for (unsigned int i = 1; i < glyphCount; i++)
if (vis_clusters[i] == -1)
vis_clusters[i] = vis_clusters[i - 1];
#undef utf16_index
- //if (unlikely (!buffer->ensure (glyphs_len)))
- // FAIL ("Buffer in error");
+ if (unlikely (!buffer->ensure (glyphCount)))
+ FAIL ("Buffer in error");
#undef FAIL
/* Set glyph infos */
buffer->len = 0;
- for (unsigned int i = 0; i < glyphs_len; i++)
+ for (unsigned int i = 0; i < glyphCount; i++)
{
hb_glyph_info_t *info = &buffer->info[buffer->len++];
- info->codepoint = glyphs[i];
+ info->codepoint = glyphIndices[i];
info->cluster = vis_clusters[i];
/* The rest is crap. Let's store position info there for now. */
- info->mask = advances[i];
- info->var1.u32 = offsets[i].ascenderOffset;
- info->var2.u32 = -offsets[i].advanceOffset;
+ info->mask = glyphAdvances[i];
+ info->var1.i32 = glyphOffsets[i].advanceOffset;
+ info->var2.i32 = glyphOffsets[i].ascenderOffset;
}
- free(clusters);
- free(glyphs);
- free(textProperties);
- free(glyphProperties);
-
/* Set glyph positions */
buffer->clear_positions ();
- for (unsigned int i = 0; i < glyphs_len; i++)
+ for (unsigned int i = 0; i < glyphCount; i++)
{
hb_glyph_info_t *info = &buffer->info[i];
hb_glyph_position_t *pos = &buffer->pos[i];
/* TODO vertical */
- pos->x_advance = info->mask;
- pos->x_offset = backward ? -info->var1.u32 : info->var1.u32;
- pos->y_offset = info->var2.u32;
+ pos->x_advance = x_mult * (int32_t) info->mask;
+ pos->x_offset =
+ x_mult * (isRightToLeft ? -info->var1.i32 : info->var1.i32);
+ pos->y_offset = y_mult * info->var2.i32;
}
- if (backward)
+ if (isRightToLeft)
hb_buffer_reverse (buffer);
+ free (clusterMap);
+ free (glyphIndices);
+ free (textProperties);
+ free (glyphProperties);
+ free (glyphAdvances);
+ free (glyphOffsets);
+
+ if (num_features)
+ free (singleFeatures.features);
+
/* Wow, done! */
return true;
}
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc
index 1071d073b83..5628ac34ee8 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout.cc
@@ -72,6 +72,8 @@ _hb_ot_layout_create (hb_face_t *face)
if (0
|| (442 == gdef_len && 42038 == gpos_len && 2874 == gsub_len) /* Windows 7 timesi.ttf */
|| (430 == gdef_len && 40662 == gpos_len && 2874 == gsub_len) /* Windows 7 timesbi.ttf */
+ || (442 == gdef_len && 39116 == gpos_len && 2874 == gsub_len) /* Windows ??? timesi.ttf */
+ || (430 == gdef_len && 39374 == gpos_len && 2874 == gsub_len) /* Windows ??? timesbi.ttf */
|| (490 == gdef_len && 41638 == gpos_len && 3046 == gsub_len) /* OS X 10.11.3 Times New Roman Italic.ttf */
|| (478 == gdef_len && 41902 == gpos_len && 3046 == gsub_len) /* OS X 10.11.3 Times New Roman Bold Italic.ttf */
)
diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac
index ec591229f95..269ce46918d 100644
--- a/Build/source/libs/harfbuzz/version.ac
+++ b/Build/source/libs/harfbuzz/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current harfbuzz version
-m4_define([harfbuzz_version], [1.2.5])
+m4_define([harfbuzz_version], [1.2.6])
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 23:14:04 +0000