summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Hua <plateauwolf@qq.com>2020-11-18 09:02:26 +0100
committerMike Kaganski <mike.kaganski@collabora.com>2020-11-19 16:14:36 +0100
commit52f1115571469f210192cbce6b52e8b7d1d85dc0 (patch)
treeb72c9235d2df74bb2d20a94867f741c8cdd8b85d
parent21cdfa82b6f1e4adf8c4020fc06cfc28e21c7495 (diff)
tdf#132938 Add glyphs U+F030-U+F039 to OpenSymbol
Add glyphs U+F030-U+F039 (in Private Use Area) as references to U+0030-U+0039 (digits 0-9), because font Symbol.ttf has these glyphs and they are necessary for compatibility with MS Office file formats. Change-Id: If66ac3ee6fda9c161b36fd6eb459c99646e87541 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105997 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins
-rwxr-xr-xbin/oss-fuzz-build.sh2
-rw-r--r--configure.ac2
-rw-r--r--download.lst2
-rw-r--r--extras/source/truetype/symbol/OpenSymbol.sfd98
-rw-r--r--solenv/flatpak-manifest.in6
5 files changed, 100 insertions, 10 deletions
diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index ce4d110ce48a..4ebecd6f3c11 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -31,7 +31,7 @@ for a in *fuzzer; do
#some minimal fonts required
mv $a $OUT
mkdir -p $OUT/$a.fonts
- cp $SRC/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf ../share/fonts/truetype/Liberation* $OUT/$a.fonts
+ cp $SRC/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf ../share/fonts/truetype/Liberation* $OUT/$a.fonts
#minimal runtime requirements
cp templateservices.rdb $OUT/$a.services.rdb
cp types.rdb $OUT/$a.types.rdb
diff --git a/configure.ac b/configure.ac
index abaceb94ee0b..031308058854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12701,7 +12701,7 @@ if test "$enable_build_opensymbol" = "yes"; then
fi
else
AC_MSG_RESULT([no])
- OPENSYMBOL_TTF=884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
+ OPENSYMBOL_TTF=f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
BUILD_TYPE="$BUILD_TYPE OPENSYMBOL"
fi
AC_SUBST(OPENSYMBOL_TTF)
diff --git a/download.lst b/download.lst
index 1c932acc04f8..aa49f99d3e33 100644
--- a/download.lst
+++ b/download.lst
@@ -272,4 +272,4 @@ export ZMF_TARBALL := libzmf-0.0.2.tar.xz
NUMBERTEXT_EXTENSION_SHA256SUM := 1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
UNOWINREG_SHA256SUM := eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
-OPENSYMBOL_SHA256SUM := 884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
+OPENSYMBOL_SHA256SUM := f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd b/extras/source/truetype/symbol/OpenSymbol.sfd
index c9e9baad1707..32885c1baf1e 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -3,8 +3,8 @@ FontName: OpenSymbol
FullName: OpenSymbol
FamilyName: OpenSymbol
Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, eight, nine, question, underscore, copyright, registered, uni2215, angle, therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi Abe
-Version: 102.11
+Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, eight, nine, question, underscore, copyright, registered, uni2215, angle, therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi Abe\nuniF030 <-> uniF039 (c) 2020 Ming Hua
+Version: 102.12
ItalicAngle: 0
UnderlinePosition: -143
UnderlineWidth: 20
@@ -20,7 +20,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1144938807
-ModificationTime: 1558881510
+ModificationTime: 1605567303
PfmFamily: 81
TTFWeight: 400
TTFWidth: 5
@@ -784,7 +784,7 @@ FitToEm: 1
WinInfo: 0 34 12
BeginPrivate: 0
EndPrivate
-BeginChars: 1053 1053
+BeginChars: 1063 1063
StartChar: Alpha
Encoding: 0 913 0
@@ -108724,5 +108724,95 @@ SplineSet
98 1313 l 1,0,-1
EndSplineSet
EndChar
+
+StartChar: uniF030
+Encoding: 1053 61488 1053
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1031 48 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF031
+Encoding: 1054 61489 1054
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1032 49 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF032
+Encoding: 1055 61490 1055
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1033 50 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF033
+Encoding: 1056 61491 1056
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1034 51 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF034
+Encoding: 1057 61492 1057
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1035 52 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF035
+Encoding: 1058 61493 1058
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1036 53 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF036
+Encoding: 1059 61494 1059
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1037 54 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF037
+Encoding: 1060 61495 1060
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1038 55 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF038
+Encoding: 1061 61496 1061
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1039 56 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF039
+Encoding: 1062 61497 1062
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1040 57 N 1 0 0 1 0 0 2
+EndChar
EndChars
EndSplineFont
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c0d7eac66335..d1529d4768f1 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -597,10 +597,10 @@
"dest-filename": "external/tarballs/box2d-2.3.1.tar.gz"
},
{
- "url": "https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf",
- "sha256": "884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc",
+ "url": "https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf",
+ "sha256": "f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140",
"type": "file",
- "dest-filename": "external/tarballs/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf"
+ "dest-filename": "external/tarballs/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf"
}
],
"buildsystem": "simple",