############################################################################### # Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), # to deal in the Software without restriction, including without limitation # the rights to use, copy, modify, merge, publish, distribute, sublicense, # and/or sell copies of the Software, and to permit persons to whom the # Software is furnished to do so, subject to the following conditions: # # The above copyright notice and this permission notice (including the next # paragraph) shall be included in all copies or substantial portions of the # Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. # --- libX11-1.8.13/nls/ja_JP.UTF-8/XLC_LOCALE.pre.orig 2026-02-07 23:26:26.000000000 +0100 +++ libX11-1.8.13/nls/ja_JP.UTF-8/XLC_LOCALE.pre 2026-04-04 14:40:40.042783478 +0200 @@ -17,7 +17,7 @@ name ISO8859-1:GL } font { - primary ISO8859-1:GL + JISX0201.1976-0:GL;ISO8859-1:GL vertical_rotate all } } @@ -41,18 +41,29 @@ } } -XCOMM fs3 class (Korean Character) +XCOMM fs3 class (Supplementary Kanji) fs3 { + charset { + name JISX0212.1990-0:GL + udc_area \x7521,\x7e7e + } + font { + primary JISX0212.1990-0:GL + } +} + +XCOMM fs4 class (Korean Character) +fs4 { charset { - name KSC5601.1987-0:GL + name KSC5601.1992-3:GLGR } font { - primary KSC5601.1987-0:GL + primary KSC5601.1992-3:GLGR } } -XCOMM fs4 class (Chinese Han Character) -fs4 { +XCOMM fs5 class (Chinese Han Character) +fs5 { charset { name GB2312.1980-0:GL } @@ -60,13 +71,13 @@ primary GB2312.1980-0:GL } } -XCOMM fs5 class (Half Kana) -fs5 { +XCOMM fs6 class (Half Kana) +fs6 { charset { name JISX0201.1976-0:GR } font { - primary JISX0201.1976-0:GR + primary JISX0201.1976-0:GR vertical_rotate all } } @@ -75,12 +86,13 @@ XCOMM Moreover, some iso10646-1 fonts don't have any glyph at all XCOMM in ISO8859-X ranges. -XCOMM fs6 class -fs6 { +XCOMM fs7 class +fs7 { charset { name ISO10646-1 } font { + load_option delay_ nocheck primary ISO10646-1 } } @@ -100,7 +112,7 @@ cs0 { side GL:Default length 1 - ct_encoding ISO8859-1:GL + ct_encoding ISO8859-1:GL;JISX0201.1976-0:GL } XCOMM cs1 class @@ -115,33 +127,38 @@ side GR length 2 ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR; JISX0208.1983-1:GL; JISX0208.1983-1:GR - } XCOMM cs3 class cs3 { side GL length 2 - ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR; KSC5601.1987-1:GL; KSC5601.1987-1:GR - + ct_encoding JISX0212.1990-0:GL; JISX0212.1990-0:GR } XCOMM cs4 class cs4 { + side GL + length 2 + ct_encoding KSC5601.1992-3:GLGR +} + +XCOMM cs5 class +cs5 { side GR length 2 ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR } -XCOMM cs5 class -cs5 { +XCOMM cs6 class +cs6 { side GR length 1 ct_encoding JISX0201.1976-0:GR } -XCOMM cs6 class -cs6 { +XCOMM cs7 class +cs7 { side none ct_encoding ISO10646-1 }