Implement hanja counter styles

Source/core/layout/LayoutListMarker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 352 matching lines @@
         AbstractCJKChar* group = &buffer[(3 - i) * groupLength];
 
         if (groupValue && i) {
             group[8] = static_cast<AbstractCJKChar>(SecondGroupMarker + i);
             group[7] = static_cast<AbstractCJKChar>(SecondGroupMarker - 1 + i);
         }
 
         // Put in the four digits and digit markers for any non-zero digits.
         int digitValue = (groupValue % 10);
         bool trailingZero = table[Lang] == Chinese && !digitValue;
-        if (digitValue)
-            group[6] = static_cast<AbstractCJKChar>(Digit0 + (groupValue % 10));
+        if (digitValue) {
+            bool dropOne = table[Lang] == Korean && cjkStyle == Informal && digitValue == 1 && i > 0;
+            if (!dropOne)
+                group[6] = static_cast<AbstractCJKChar>(Digit0 + (groupValue % 10));
+        }
         if (number != 0 || groupValue > 9) {
             digitValue = ((groupValue / 10) % 10);
-            if (digitValue || !trailingZero)
+            bool dropOne = table[Lang] == Korean && cjkStyle == Informal && digitValue == 1;
+            if ((digitValue && !dropOne) || (!digitValue && !trailingZero))
                 group[4] = static_cast<AbstractCJKChar>(Digit0 + digitValue);
             trailingZero &= !digitValue;
             if (digitValue)
                 group[5] = SecondDigitMarker;
         }
         if (number != 0 || groupValue > 99) {
             digitValue = ((groupValue / 100) % 10);
-            if (digitValue || !trailingZero)
+            bool dropOne = table[Lang] == Korean && cjkStyle == Informal && digitValue == 1;
+            if ((digitValue && !dropOne) || (!digitValue && !trailingZero))
                 group[2] = static_cast<AbstractCJKChar>(Digit0 + digitValue);
             trailingZero &= !digitValue;
             if (digitValue)
                 group[3] = ThirdDigitMarker;
         }
         if (number != 0 || groupValue > 999) {
             digitValue = groupValue / 1000;
-            if (digitValue || !trailingZero)
+            bool dropOne = table[Lang] == Korean && cjkStyle == Informal && digitValue == 1;
+            if ((digitValue && !dropOne) || (!digitValue && !trailingZero))
                 group[0] = static_cast<AbstractCJKChar>(Digit0 + digitValue);
             if (digitValue)
                 group[1] = FourthDigitMarker;
         }
 
         if (trailingZero && i > 0) {
             group[6] = group[7];
             group[7] = group[8];
             group[8] = Digit0;
         }
@@ skipping 62 matching lines @@
     case Myanmar:
     case NoneListStyle:
     case Oriya:
     case Persian:
     case Square:
     case Telugu:
     case Thai:
     case Tibetan:
     case Urdu:
     case KoreanHangulFormal:
+    case KoreanHanjaFormal:
+    case KoreanHanjaInformal:
     case CJKIdeographic:
     case SimpChineseFormal:
     case SimpChineseInformal:
     case TradChineseFormal:
     case TradChineseInformal:
         return type; // Can represent all ordinals.
     case Armenian:
     case LowerArmenian:
     case UpperArmenian:
         return (value < 1 || value > 99999999) ? DecimalListStyle : type;
@@ skipping 87 matching lines @@
     case UpperArmenian:
     case UpperLatin:
     case UpperRoman:
     case Urdu:
         return '.';
     case SimpChineseFormal:
     case SimpChineseInformal:
     case TradChineseFormal:
     case TradChineseInformal:
     case KoreanHangulFormal:
+    case KoreanHanjaFormal:
+    case KoreanHanjaInformal:
         return 0x3001;
     }
 
     ASSERT_NOT_REACHED();
     return '.';
 }
 
 String listMarkerText(EListStyleType type, int value)
 {
     // If the list-style-type, say hebrew, cannot represent |value| because it's outside
@@ skipping 266 matching lines @@
         static const UChar koreanHangulFormalTable[26] = {
             Korean,
             0xB9CC, 0x0000, 0xC5B5, 0x0000, 0xC870, 0x0000,
             0xC2ED, 0xBC31, 0xCC9C,
             0xC601, 0xC77C, 0xC774, 0xC0BC, 0xC0AC,
             0xC624, 0xC721, 0xCE60, 0xD314, 0xAD6C,
             0xB9C8, 0xC774, 0xB108, 0xC2A4, 0x0020, 0x0000
         };
         return toCJKIdeographic(value, koreanHangulFormalTable, Formal);
     }
+    case KoreanHanjaFormal: {
+        static const UChar koreanHanjaFormalTable[26] = {
+            Korean,
+            0x842C, 0x0000, 0x5104, 0x0000, 0x5146, 0x0000,
+            0x62FE, 0x767E, 0x4EDF,
+            0x96F6, 0x58F9, 0x8CB3, 0x53C3, 0x56DB,
+            0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D,
+            0xB9C8, 0xC774, 0xB108, 0xC2A4, 0x0020, 0x0000
+        };
+        return toCJKIdeographic(value, koreanHanjaFormalTable, Formal);
+    }
+    case KoreanHanjaInformal: {
+        static const UChar koreanHanjaInformalTable[26] = {
+            Korean,
+            0x842C, 0x0000, 0x5104, 0x0000, 0x5146, 0x0000,
+            0x5341, 0x767E, 0x5343,
+            0x96F6, 0x4E00, 0x4E8C, 0x4E09, 0x56DB,
+            0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D,
+            0xB9C8, 0xC774, 0xB108, 0xC2A4, 0x0020, 0x0000
+        };
+        return toCJKIdeographic(value, koreanHanjaInformalTable, Informal);
+    }
     case CJKIdeographic:
     case TradChineseInformal: {
         static const UChar traditionalChineseInformalTable[22] = {
             Chinese,
             0x842C, 0x0000, 0x5104, 0x0000, 0x5146, 0x0000,
             0x5341, 0x767E, 0x5343,
             0x96F6, 0x4E00, 0x4E8C, 0x4E09, 0x56DB,
             0x4E94, 0x516D, 0x4E03, 0x516B, 0x4E5D,
             0x8CA0, 0x0000
         };
@@ skipping 220 matching lines @@
     case EthiopicHalehame:
     case EthiopicHalehameAm:
     case EthiopicHalehameTiEr:
     case EthiopicHalehameTiEt:
     case Georgian:
     case Gujarati:
     case Gurmukhi:
     case Hangul:
     case HangulConsonant:
     case KoreanHangulFormal:
+    case KoreanHanjaFormal:
+    case KoreanHanjaInformal:
     case Hebrew:
     case Hiragana:
     case HiraganaIroha:
     case Kannada:
     case Katakana:
     case KatakanaIroha:
     case Khmer:
     case Lao:
     case LowerAlpha:
     case LowerArmenian:
@@ skipping 60 matching lines @@
     case EthiopicHalehame:
     case EthiopicHalehameAm:
     case EthiopicHalehameTiEr:
     case EthiopicHalehameTiEt:
     case Georgian:
     case Gujarati:
     case Gurmukhi:
     case Hangul:
     case HangulConsonant:
     case KoreanHangulFormal:
+    case KoreanHanjaFormal:
+    case KoreanHanjaInformal:
     case Hebrew:
     case Hiragana:
     case HiraganaIroha:
     case Kannada:
     case Katakana:
     case KatakanaIroha:
     case Khmer:
     case Lao:
     case LowerAlpha:
     case LowerArmenian:
@@ skipping 155 matching lines @@
     case Devanagari:
     case EthiopicHalehame:
     case EthiopicHalehameAm:
     case EthiopicHalehameTiEr:
     case EthiopicHalehameTiEt:
     case Georgian:
     case Gujarati:
     case Gurmukhi:
     case Hangul:
     case KoreanHangulFormal:
+    case KoreanHanjaFormal:
+    case KoreanHanjaInformal:
     case HangulConsonant:
     case Hebrew:
     case Hiragana:
     case HiraganaIroha:
     case Kannada:
     case Katakana:
     case KatakanaIroha:
     case Khmer:
     case Lao:
     case LowerAlpha:
@@ skipping 69 matching lines @@
     if (style()) {
         // Reuse the current margins. Otherwise resetting the margins to initial values
         // would trigger unnecessary layout.
         newStyle->setMarginStart(style()->marginStart());
         newStyle->setMarginEnd(style()->marginRight());
     }
     setStyle(newStyle.release());
 }
 
 } // namespace blink