[Libreoffice-commits] core.git: filter/source

DaeHyun Sung (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 26 15:43:18 UTC 2021


 filter/source/xslt/export/wordml/ooo2wordml_list.xsl     |    6 ++++--
 filter/source/xslt/export/wordml/ooo2wordml_settings.xsl |    8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit c216777e8add833be5ee49bc98197ea21cbb4da0
Author:     DaeHyun Sung <sungdh86+git at gmail.com>
AuthorDate: Sun Aug 15 22:44:23 2021 +0900
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Aug 26 17:42:43 2021 +0200

    tdf#143526 Korean numbering import/export support
    
    add support for the new NUMBER_LEGAL_KO(korean-legal) numbering format to various import and export filters.
    fix support for the HANGUL_SYLLABLE_KO(korean-counting) numbering format.
    
    Change-Id: I7b7dafe7305da910784ae537e307f9bfd05319a9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120509
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/filter/source/xslt/export/wordml/ooo2wordml_list.xsl b/filter/source/xslt/export/wordml/ooo2wordml_list.xsl
index 4b30aef6823c..5ebf0e6ac460 100644
--- a/filter/source/xslt/export/wordml/ooo2wordml_list.xsl
+++ b/filter/source/xslt/export/wordml/ooo2wordml_list.xsl
@@ -281,8 +281,10 @@
                 <w:nfc w:val="21"/>
             </xsl:when>
             <xsl:when test="$number-format = '일, 이, 삼, ...'">
-                <!-- '일, 이, 삼, ...' also seems: korean-counting -->
-                <w:nfc w:val="41"/>
+                <w:nfc w:val="42"/>
+            </xsl:when>
+            <xsl:when test="$number-format = '하나, 둘, 셋, ...'">
+                <w:nfc w:val="43"/>
             </xsl:when>
             <xsl:when test="$number-format = 'ㄱ, ㄴ, ㄷ, ...' or $number-format = '㉠, ㉡, ㉢, ...'">
                 <!-- mapping circled to uncircled -->
diff --git a/filter/source/xslt/export/wordml/ooo2wordml_settings.xsl b/filter/source/xslt/export/wordml/ooo2wordml_settings.xsl
index c3ab20eebd4f..2130db508b22 100644
--- a/filter/source/xslt/export/wordml/ooo2wordml_settings.xsl
+++ b/filter/source/xslt/export/wordml/ooo2wordml_settings.xsl
@@ -244,8 +244,10 @@
                 <w:numFmt w:val="iroha"/>
             </xsl:when>
             <xsl:when test="$number-format = '일, 이, 삼, ...'">
-                <!-- '일, 이, 삼, ...' also seems: korean-counting -->
-                <w:numFmt w:val="korean-digital"/>
+                <w:numFmt w:val="korean-counting"/>
+            </xsl:when>
+            <xsl:when test="$number-format = '하나, 둘, 셋, ...'">
+                <w:numFmt w:val="korean-legal"/>
             </xsl:when>
             <xsl:when test="$number-format = 'ㄱ, ㄴ, ㄷ, ...' or $number-format = '㉠, ㉡, ㉢, ...'">
                 <!-- mapping circled to uncircled -->
@@ -297,7 +299,7 @@
                 </xsl:choose>
             </xsl:when>
             <!-- unsupported: ordinal, cardinal-text, ordinal-text, hex, chicago, bullet, ideograph-zodiac-traditional,
-            chinese-not-impl, korean-legal -->
+            chinese-not-impl -->
             <xsl:otherwise>
                 <w:numFmt w:val="decimal"/>
             </xsl:otherwise>


More information about the Libreoffice-commits mailing list