summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorDaeHyun Sung <sungdh86@gmail.com>2019-06-01 21:43:07 +0900
committerCaolán McNamara <caolanm@redhat.com>2019-06-08 22:18:37 +0200
commit0fd3610979a3116ca15377f3450f7794e768d937 (patch)
tree27f913935ef499fbf1def5180ad85761a91ef17c /unotools
parentd9a31b8e164ad39e8b2f49b8e136cd9108ccac36 (diff)
tdf#125481 changed font order for Korean locale
- Set Noto Sans CJK KR as the 1st priority. - Set Nanum-series font as the 2nd priority, Such as NanumGothic(나눔고딕),NanumMyeongjo(나눔명조) - Set KoPub-series font that Korea Publisher Society(한국출판인회의) and Ministry of Culture, Sports and Tourism, Republic of Korea(문화체육관광부) are released - for Windows vista and later versions, Add default Korean font, Malgun Gothic(맑은고딕) - for Mac OSX, add default Korean font Apple SD Gothic Neo(Korean: 애플 SD 산돌고딕 Neo) - for Mac OSX, Also add Mac OSX fonts Apple Gothic(애플고딕),AppleMyungjo(애플명조) - remove Sun-style fonts(Maybe Sun StarOffice's legacy) - remove Hy(한양)-series fonts(Hancom HWP package's font, proprietary font-series) Modern Linux distribution's default Korean font-families are Noto Sans&Noto Serif-family Before Noto Sans font released, UnFont-family was Linux distribition default Korean font. Early Linux distribution's default Korean font: Baekmuk-family. Sun-series font rarely use in Korean Linux distribution. ps. Noto Fonts(Modern Korean All OS default fonts) https://www.google.co.kr/get/noto/ Source Han Sans https://fonts.adobe.com/fonts/source-han-sans-korean Source Han Serif https://source.typekit.com/source-han-serif/kr/ Nanum-series font https://hangeul.naver.com/font KoPub-series font http://www.kopus.org/biz/electronic/font.aspx UnFont(Many of Linux distribution's default Korean font) http://kldp.net/unfonts/release/ Baekmuk Font(Early Linux distribution's Korean default font http://kldp.net/baekmuk/ Change-Id: If5bbcf549cbe96240250e44396dce1ff714c88b8 Reviewed-on: https://gerrit.libreoffice.org/73307 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/fontcfg.cxx15
1 files changed, 2 insertions, 13 deletions
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index bddb6049911f..92b72799bcbb 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -247,7 +247,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const LanguageTag& rLan
#define FALLBACKFONT_UI_SANS_LATIN2 "Andale Sans UI;Albany;Albany AMT;Tahoma;Arial Unicode MS;Arial;Nimbus Sans L;Luxi Sans;Bitstream Vera Sans;Interface User;Geneva;WarpSans;Dialog;Swiss;Lucida;Helvetica;Charcoal;Chicago;MS Sans Serif;Helv;Times;Times New Roman;Interface System"
#define FALLBACKFONT_UI_SANS_ARABIC "Tahoma;Traditional Arabic;Simplified Arabic;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;clearlyU;Interface User;Arial Unicode MS;Lucida Sans Unicode;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif"
#define FALLBACKFONT_UI_SANS_THAI "OONaksit;Tahoma;Lucidasans;Arial Unicode MS"
- #define FALLBACKFONT_UI_SANS_KOREAN "SunGulim;BaekmukGulim;Gulim;Roundgothic;Arial Unicode MS;Lucida Sans Unicode;gnu-unifont;Andale Sans UI"
+ #define FALLBACKFONT_UI_SANS_KOREAN "Noto Sans CJK KR;Noto Sans KR;Source Han Sans KR;NanumGothic;NanumBarunGothic;NanumBarunGothic YetHangul;KoPubWorld Dotum;Malgun Gothic;Apple SD Gothic Neo;Dotum;Gulim;Apple Gothic;UnDotum;Baekmuk Gulim;Arial Unicode MS;Lucida Sans Unicode;gnu-unifont;Andale Sans UI"
#define FALLBACKFONT_UI_SANS_CHINSIM "Andale Sans UI;Arial Unicode MS;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Lucida Sans Unicode;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;"
#define FALLBACKFONT_UI_SANS_CHINTRD "Andale Sans UI;Arial Unicode MS;AR PL Mingti2L Big5;AR PL KaitiM Big5;Kai;PMingLiU;MingLiU;Ming;Lucida Sans Unicode;gnu-unifont;Interface User;"
@@ -264,18 +264,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const LanguageTag& rLan
}
else if ( aLanguage == "ko" )
{
- // we need localized names for korean fonts
- const sal_Unicode aSunGulim[] = { 0xC36C, 0xAD74, 0xB9BC, 0 };
- const sal_Unicode aBaekmukGulim[] = { 0xBC31, 0xBC35, 0xAD74, 0xB9BC, 0 };
-
- OUStringBuffer aFallBackKoreanLocalized;
- aFallBackKoreanLocalized.append(aSunGulim);
- aFallBackKoreanLocalized.append(';');
- aFallBackKoreanLocalized.append(aBaekmukGulim);
- aFallBackKoreanLocalized.append(";");
- aFallBackKoreanLocalized.append(FALLBACKFONT_UI_SANS_KOREAN);
-
- return aFallBackKoreanLocalized.makeStringAndClear();
+ return OUString(FALLBACKFONT_UI_SANS_KOREAN);
}
else if( aLanguage == "cs" ||
aLanguage == "hu" ||