diff options
| author | Jun NOGATA <nogajun@gmail.com> | 2021-06-04 19:44:43 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-12 11:04:23 +0200 |
| commit | c2fb518a6889fa9beac2d7e512ce3dcbf06c6d85 (patch) | |
| tree | 594eec89558f4493a21037595657da45983c7548 /unotools/source/misc/fontdefs.cxx | |
| parent | da59686672fd2bc98f8cb28d5f04dc978b50ac13 (diff) | |
update Japanese font order list
* Fix tdf#137393 changed Noto CJK font order (Noto Sans/Serif CJK JP has priority)
* Add Adobe Genno Kaku Gothic(Source han sans JP) and Genno minecho(Source han serif JP).
* Add macOS version Yu Gothic and Yu Mincho fonts.
* Add IPAex Gothic, IPAex Mincho and IPAmj Mincho.
Japanese fonts are compiled in a TDF wiki.
* https://wiki.documentfoundation.org/JA/Fonts
Change-Id: I6dec9b5deba19d3272e53a4c73031acd231635f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116712
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unotools/source/misc/fontdefs.cxx')
| -rw-r--r-- | unotools/source/misc/fontdefs.cxx | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index d32f6ad7397e..214c8946e553 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -178,6 +178,18 @@ sal_Unicode const aHiraginoKakuGothicPro[] = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, sal_Unicode const aHiraginoKakuGothicProN[] = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x89D2, 0x30B4, 'p','r','o','n',0}; sal_Unicode const aHiraginoMaruGothicPro[] = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x4E38, 0x30B4, 'p','r','o',0}; sal_Unicode const aHiraginoMaruGothicProN[] = { 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x4E38, 0x30B4, 'p','r','o','n',0}; +sal_Unicode const aYuGothic[] = { 0x6E38, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; +sal_Unicode const aYuGothicTai[] = { 0x6E38, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0x4F53, 0}; +sal_Unicode const aYuMincho[] = { 0x6E38, 0x660E, 0x671D, 0}; +sal_Unicode const aYuMinchoTai[] = { 0x6E38, 0x660E, 0x671D, 0x4F53, 0}; +sal_Unicode const aGennoKakuGothic[] = { 0x6E90, 0x30CE, 0x89D2, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; +sal_Unicode const aGennoKakuGothicJP[] = { 0x6E90, 0x30CE, 0x89D2, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'j', 'p', 0}; +sal_Unicode const aGennoKakuGothicHW[] = { 0x6E90, 0x30CE, 0x89D2, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 'h','w', 0}; +sal_Unicode const aGennoMincho[] = { 0x6E90, 0x30CE, 0x660E, 0x671D, 0}; +sal_Unicode const aGennoMinchoJP[] = { 0x6E90, 0x30CE, 0x660E, 0x671D, 'j', 'p', 0}; +sal_Unicode const aIPAmjMincho[] = { 'i', 'p', 'a', 'm', 'j', 0x660E, 0x671D, 0}; +sal_Unicode const aIPAexGothic[] = { 'i', 'p', 'a', 'e', 'x', 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0}; +sal_Unicode const aIPAexMincho[] = { 'i', 'p', 'a', 'e', 'x', 0x660E, 0x671D, 0}; OUString StripScriptFromName(const OUString& _aName) { @@ -422,7 +434,20 @@ OUString GetEnglishSearchFontName(const OUString& rInName) {aHiraginoKakuGothicPro, "hiraginokakugothicpro"}, {aHiraginoKakuGothicProN, "hiraginokakugothicpron"}, {aHiraginoMaruGothicPro, "hiraginomarugothicpro"}, - {aHiraginoMaruGothicProN, "hiraginomarugothicpron"}}; + {aHiraginoMaruGothicProN, "hiraginomarugothicpron"}, + {aHiraginoMaruGothicProN, "hiraginomarugothicpron"}, + {aYuGothic, "yugothic"}, + {aYuGothicTai, "yugothictai"}, + {aYuMincho, "yumincho"}, + {aYuMinchoTai, "yuminchotai"}, + {aGennoKakuGothic, "sourcehansans"}, + {aGennoKakuGothicJP, "sourcehansansjp"}, + {aGennoKakuGothicHW, "sourcehansanshw"}, + {aGennoMincho, "sourcehanserif"}, + {aGennoMinchoJP, "sourcehanserifjp"}, + {aIPAmjMincho, "ipamjmincho"}, + {aIPAexGothic, "ipaexgothic"}, + {aIPAexMincho, "ipaexmimcho"}}; FontNameDictionary::const_iterator it = aDictionary.find( rNameStr ); if( it != aDictionary.end() ) |