officecfg/registry/data/org/openoffice/VCL.xcu | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
New commits: commit 735a1a17648071eee91099d73ef0a8000edf134f Author: Tomofumi Yagi <ya...@mknada.sakura.ne.jp> Date: Sat Nov 15 20:26:15 2014 +0900 fdo#77971 Writer:Better font selection in Japanese locale on Mac OSX. This patch resolves the problem that Basic fonts(Asian) are Arial Unicode MS in Japanese locale on Mac OSX. Expected behavior is that Basic fonts(Asian) are Hiragino Mincho ProN font. LibreOffice 4.1 and later, on Mac OS X, the font family names are kept without suffix(e.g. w3, w6) in the system font list. Some font names in VCL.xcu (font family name including the weight as suffix) doesn't match the font name kept in the system font list. This problem reproduces at the CJK fonts environment. This patch resolves this problem with Japanese fonts environment only. Change-Id: Iaf3eb2225fbc6375d1911976ac40a4d8f2fa0590 Reviewed-on: https://gerrit.libreoffice.org/12455 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index ec48498..457ac10 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -212,31 +212,31 @@ </node> <node oor:name="ja" oor:op="replace"> <prop oor:name="CJK_TEXT" oor:type="xs:string" oor:op="replace"> - <value>HG ææL Sun;HG MinchoL Sun;HG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG Pã´ã·ãã¯B;HG-PGothicB;HG Mincho Light J;ï¼ï¼³ ï¼°ææ;ãã©ã®ãææ ProN W3;ãã©ã®ãææ Pro W3;UmePlus P Gothic;TLPææ;LXææ;HGPMinchoL;IPA Pææ;æ±é¢¨ææ;Kochi Mincho;ãããªã¿ææ;Mincho;Serif</value> + <value>HG ææL Sun;HG MinchoL Sun;HG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG Pã´ã·ãã¯B;HG-PGothicB;HG Mincho Light J;ï¼ï¼³ ï¼°ææ;ãã©ã®ãææ ProN;ãã©ã®ãææ Pro;UmePlus P Gothic;TLPææ;LXææ;HGPMinchoL;IPA Pææ;æ±é¢¨ææ;Kochi Mincho;ãããªã¿ææ;Mincho;Serif</value> </prop> <prop oor:name="CJK_HEADING" oor:type="xs:string" oor:op="replace"> - <value>HG ææL Sun;HG ææL;HG Mincho Light J;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN W3;ãã©ã®ãè§ã´ Pro W3;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Gothic;ï¼ï¼³ ææ;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ï¼ï¼³ ï¼°ææ;HG Mincho Light J;ï¼ï¼³ ã´ã·ãã¯;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ï¼ï¼³ ï¼°ã´ã·ãã¯;UmePlus P Gothic</value> + <value>HG ææL Sun;HG ææL;HG Mincho Light J;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN;ãã©ã®ãè§ã´ Pro;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Gothic;ï¼ï¼³ ææ;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ï¼ï¼³ ï¼°ææ;HG Mincho Light J;ï¼ï¼³ ã´ã·ãã¯;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ï¼ï¼³ ï¼°ã´ã·ãã¯;UmePlus P Gothic</value> </prop> <prop oor:name="CJK_PRESENTATION" oor:type="xs:string" oor:op="replace"> - <value>HG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG Pã´ã·ãã¯B;ãã©ã®ãææ ProN W3;ãã©ã®ãææ Pro W3;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼ï¼³ ï¼°ã´ã·ãã¯;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;ï¼ï¼³ ã´ã·ãã¯;ï¼ï¼³ ï¼°ã´ã·ãã¯;HG Gothic;HG Gothic B;UmePlus P Gothic;Gothic</value> + <value>HG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG Pã´ã·ãã¯B;ãã©ã®ãææ ProN;ãã©ã®ãææ Pro;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼ï¼³ ï¼°ã´ã·ãã¯;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;ï¼ï¼³ ã´ã·ãã¯;ï¼ï¼³ ï¼°ã´ã·ãã¯;HG Gothic;HG Gothic B;UmePlus P Gothic;Gothic</value> </prop> <prop oor:name="LATIN_PRESENTATION" oor:type="xs:string" oor:op="replace"> <value>Andale;Arial</value> </prop> <prop oor:name="CJK_SPREADSHEET" oor:type="xs:string" oor:op="replace"> - <value>HG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG Pã´ã·ãã¯B;HG-PGothicB;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN W3;ãã©ã®ãè§ã´ Pro W3;TLPã´ã·ãã¯;LXã´ã·ãã¯;ãã©ã®ãææ ProN W3;ãã©ã®ãææ Pro W3;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;UmePlus P Gothic;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic</value> + <value>HG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG Pã´ã·ãã¯B;HG-PGothicB;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN;ãã©ã®ãè§ã´ Pro;TLPã´ã·ãã¯;LXã´ã·ãã¯;ãã©ã®ãææ ProN;ãã©ã®ãææ Pro;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;UmePlus P Gothic;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic</value> </prop> <prop oor:name="LATIN_SPREADSHEET" oor:type="xs:string" oor:op="replace"> - <value>HG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG Pã´ã·ãã¯B;HG-PGothicB;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN W3;ãã©ã®ãè§ã´ Pro W3;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;UmePlus P Gothic;Gothic</value> + <value>HG Pã´ã·ãã¯B Sun;HG-PGothicB Sun;HG Pã´ã·ãã¯B;HG-PGothicB;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN;ãã©ã®ãè§ã´ Pro;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Kochi Gothic;MS PGothic;UmePlus P Gothic;Gothic</value> </prop> <prop oor:name="UI_FIXED" oor:type="xs:string" oor:op="replace"> - <value>HG ã´ã·ãã¯B Sun;HG-GothicB Sun;HG Mincho Light J;ï¼ï¼³ ï¼°ã´ã·ãã¯;Osaka;ãã©ã®ãè§ã´ ProN W3;ãã©ã®ãè§ã´ Pro W3;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Kochi Gothic;UmePlus Gothic;Gothic</value> + <value>HG ã´ã·ãã¯B Sun;HG-GothicB Sun;HG Mincho Light J;ï¼ï¼³ ï¼°ã´ã·ãã¯;Osaka;ãã©ã®ãè§ã´ ProN;ãã©ã®ãè§ã´ Pro;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Kochi Gothic;UmePlus Gothic;Gothic</value> </prop> <prop oor:name="FIXED" oor:type="xs:string" oor:op="replace"> - <value>HG ã´ã·ãã¯B Sun;HG-GothicB Sun;HG ã´ã·ãã¯B;HG Mincho Light J;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN W3;ãã©ã®ãè§ã´ Pro W3;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Kochi Gothic;UmePlus Gothic;Gothic</value> + <value>HG ã´ã·ãã¯B Sun;HG-GothicB Sun;HG ã´ã·ãã¯B;HG Mincho Light J;ï¼ï¼³ ï¼°ã´ã·ãã¯;ãã©ã®ãè§ã´ ProN;ãã©ã®ãè§ã´ Pro;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Kochi Gothic;UmePlus Gothic;Gothic</value> </prop> <prop oor:name="UI_SANS" oor:type="xs:string" oor:op="replace"> - <value>HG Pã´ã·ãã¯B Sun;Osaka;ãã©ã®ãè§ã´ ProN W3;ãã©ã®ãè§ã´ Pro W3;HG-PGothicB Sun;HG Pã´ã·ãã¯B;HG-PGothicB;HG-GothicB;UmePlus P Gothic;HG Mincho Light J;æ¨æº;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Kochi Gothic;Gothic;Gnu-Unifont</value> + <value>HG Pã´ã·ãã¯B Sun;Osaka;ãã©ã®ãè§ã´ ProN;ãã©ã®ãè§ã´ Pro;HG-PGothicB Sun;HG Pã´ã·ãã¯B;HG-PGothicB;HG-GothicB;UmePlus P Gothic;HG Mincho Light J;æ¨æº;TLPã´ã·ãã¯;LXã´ã·ãã¯;HGPGothicB;IPA Pã´ã·ãã¯;æ±é¢¨ã´ã·ãã¯;ãããªã¿ã´ã·ãã¯;Kochi Gothic;Gothic;Gnu-Unifont</value> </prop> <prop oor:name="LATIN_FIXED" oor:type="xs:string" oor:op="replace"> <value>hgmincholightj;cumberlandamt;cumberland;couriernew;nimbusmonol;courier;lucidasanstypewriter;lucidatypewriter;monaco;monospaced</value>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits