tdf#123936 Formatting files in module i18npool with clang-format
Change-Id: I95fe065f4dcbe9d7bab105944ba4f835e80718ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105678
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
diff --git a/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx
index cbe1877..a988d31 100644
--- a/i18npool/inc/servicename.hxx
+++ b/i18npool/inc/servicename.hxx
@@ -53,12 +53,11 @@ Implementation Name
*/
#ifndef INCLUDED_I18NPOOL_INC_SERVICENAME_HXX
#define INCLUDED_I18NPOOL_INC_SERVICENAME_HXX
#define TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration"
#define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME ".l10n"
#define TRLT_SERVICELNAME_L10N TRLT_SERVICELNAME ".l10n"
#define TRLT_IMPLNAME_PREFIX "com.sun.star.i18n.Transliteration."
// 1...5...901...5...901...5...901..4 --> 34
diff --git a/i18npool/source/transliteration/hiraganaToKatakana.cxx b/i18npool/source/transliteration/hiraganaToKatakana.cxx
index 439ec583..80b6f14 100644
--- a/i18npool/source/transliteration/hiraganaToKatakana.cxx
+++ b/i18npool/source/transliteration/hiraganaToKatakana.cxx
@@ -22,12 +22,14 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
namespace i18npool {
namespace i18npool
{
// see http://charts.unicode.org/Web/U3040.html Hiragana (U+3040..U+309F)
// see http://charts.unicode.org/Web/U30A0.html Katakana (U+30A0..U+30FF)
static sal_Unicode toKatakana (const sal_Unicode c) {
if ( (0x3041 <= c && c <= 0x3096) || (0x309d <= c && c <= 0x309f) ) { // 3040 - 309F HIRAGANA LETTER
static sal_Unicode toKatakana(const sal_Unicode c)
{
if ((0x3041 <= c && c <= 0x3096) || (0x309d <= c && c <= 0x309f))
{ // 3040 - 309F HIRAGANA LETTER
// shift code point by 0x0060
return c + (0x30a0 - 0x3040);
}
@@ -41,7 +43,6 @@ hiraganaToKatakana::hiraganaToKatakana()
transliterationName = "hiraganaToKatakana";
implementationName = "com.sun.star.i18n.Transliteration.HIRAGANA_KATAKANA";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreKashida_CTL.cxx b/i18npool/source/transliteration/ignoreKashida_CTL.cxx
index 4dfb54d..e93ffd8 100644
--- a/i18npool/source/transliteration/ignoreKashida_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreKashida_CTL.cxx
@@ -9,12 +9,11 @@
#include <transliteration_Ignore.hxx>
namespace i18npool {
static sal_Unicode
ignoreKashida_CTL_translator (const sal_Unicode c)
namespace i18npool
{
if( c == 0x0640 ) // Check if it's Kashida
static sal_Unicode ignoreKashida_CTL_translator(const sal_Unicode c)
{
if (c == 0x0640) // Check if it's Kashida
return 0xffff; // Then skip this character
return c;
@@ -28,7 +27,6 @@ ignoreKashida_CTL::ignoreKashida_CTL()
transliterationName = "ignoreKashida_CTL";
implementationName = "com.sun.star.i18n.Transliteration.ignoreKashida_CTL";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
index b95a469..8b03275 100644
--- a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
@@ -19,16 +19,16 @@
#include <transliteration_Ignore.hxx>
namespace i18npool {
static sal_Unicode
ignoreMiddleDot_ja_JP_translator (const sal_Unicode c)
namespace i18npool
{
switch (c) {
static sal_Unicode ignoreMiddleDot_ja_JP_translator(const sal_Unicode c)
{
switch (c)
{
case 0x30FB: // KATAKANA MIDDLE DOT
case 0xFF65: // HALFWIDTH KATAKANA MIDDLE DOT
// no break;
return 0xffff; // Skip this character
// no break;
return 0xffff; // Skip this character
}
return c;
}
@@ -41,7 +41,6 @@ ignoreMiddleDot_ja_JP::ignoreMiddleDot_ja_JP()
transliterationName = "ignoreMiddleDot_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreMiddleDot_ja_JP";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
index 831d038..5817d15 100644
--- a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
@@ -19,12 +19,12 @@
#include <transliteration_Ignore.hxx>
namespace i18npool {
static sal_Unicode
ignoreMinusSign_ja_JP_translator (const sal_Unicode c)
namespace i18npool
{
switch (c) {
static sal_Unicode ignoreMinusSign_ja_JP_translator(const sal_Unicode c)
{
switch (c)
{
case 0x2212: // MINUS SIGN
case 0x002d: // HYPHEN-MINUS
case 0x2010: // HYPHEN
@@ -35,7 +35,7 @@ ignoreMinusSign_ja_JP_translator (const sal_Unicode c)
case 0x2015: // HORIZONTAL BAR
case 0xff0d: // FULLWIDTH HYPHEN-MINUS
case 0xff70: // HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
return 0x30fc; // KATAKANA-HIRAGANA PROLONGED SOUND MARK
return 0x30fc; // KATAKANA-HIRAGANA PROLONGED SOUND MARK
}
return c;
}
@@ -48,7 +48,6 @@ ignoreMinusSign_ja_JP::ignoreMinusSign_ja_JP()
transliterationName = "ignoreMinusSign_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreMinusSign_ja_JP";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
index 65378d86..1851a27 100644
--- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
@@ -22,8 +22,8 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
namespace i18npool {
namespace i18npool
{
const transliteration_Ignore::Mapping SeZe[] = {
// SI + E --> SE
{ 0x30B7, 0x30A7, 0x30BB, true },
@@ -45,7 +45,6 @@ ignoreSeZe_ja_JP::ignoreSeZe_ja_JP()
transliterationName = "ignoreSeZe_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreSeZe_ja_JP";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
index bf98d4f..572b934 100644
--- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
@@ -20,82 +20,82 @@
#include <transliteration_Ignore.hxx>
#include <i18nutil/oneToOneMapping.hxx>
namespace i18npool {
namespace i18npool
{
i18nutil::OneToOneMappingTable_t const ignoreSeparatorTable[] = {
{ 0x0021, 0xFFFF }, // EXCLAMATION MARK
{ 0x0023, 0xFFFF }, // NUMBER SIGN
{ 0x0024, 0xFFFF }, // DOLLAR SIGN
{ 0x0025, 0xFFFF }, // PERCENT SIGN
{ 0x0026, 0xFFFF }, // AMPERSAND
{ 0x002A, 0xFFFF }, // ASTERISK
{ 0x002B, 0xFFFF }, // PLUS SIGN
{ 0x002C, 0xFFFF }, // COMMA
{ 0x002D, 0xFFFF }, // HYPHEN-MINUS
{ 0x002E, 0xFFFF }, // FULL STOP
{ 0x002F, 0xFFFF }, // SOLIDUS
{ 0x003A, 0xFFFF }, // COLON
{ 0x003B, 0xFFFF }, // SEMICOLON
{ 0x003C, 0xFFFF }, // LESS-THAN SIGN
{ 0x003D, 0xFFFF }, // EQUALS SIGN
{ 0x003E, 0xFFFF }, // GREATER-THAN SIGN
{ 0x005C, 0xFFFF }, // REVERSE SOLIDUS
{ 0x005F, 0xFFFF }, // LOW LINE
{ 0x007B, 0xFFFF }, // LEFT CURLY BRACKET
{ 0x007C, 0xFFFF }, // VERTICAL LINE
{ 0x007D, 0xFFFF }, // RIGHT CURLY BRACKET
{ 0x007E, 0xFFFF }, // TILDE
{ 0x00A5, 0xFFFF }, // YEN SIGN
{ 0x3001, 0xFFFF }, // IDEOGRAPHIC COMMA
{ 0x3002, 0xFFFF }, // IDEOGRAPHIC FULL STOP
{ 0x3008, 0xFFFF }, // LEFT ANGLE BRACKET
{ 0x3009, 0xFFFF }, // RIGHT ANGLE BRACKET
{ 0x300A, 0xFFFF }, // LEFT DOUBLE ANGLE BRACKET
{ 0x300B, 0xFFFF }, // RIGHT DOUBLE ANGLE BRACKET
{ 0x300C, 0xFFFF }, // LEFT CORNER BRACKET
{ 0x300D, 0xFFFF }, // RIGHT CORNER BRACKET
{ 0x300E, 0xFFFF }, // LEFT WHITE CORNER BRACKET
{ 0x300F, 0xFFFF }, // RIGHT WHITE CORNER BRACKET
{ 0x3010, 0xFFFF }, // LEFT BLACK LENTICULAR BRACKET
{ 0x3011, 0xFFFF }, // RIGHT BLACK LENTICULAR BRACKET
{ 0x3014, 0xFFFF }, // LEFT TORTOISE SHELL BRACKET
{ 0x3015, 0xFFFF }, // RIGHT TORTOISE SHELL BRACKET
{ 0x3016, 0xFFFF }, // LEFT WHITE LENTICULAR BLACKET
{ 0x3017, 0xFFFF }, // RIGHT WHITE LENTICULAR BLACKET
{ 0x3018, 0xFFFF }, // LEFT WHITETORTOISE SHELL BLACKET
{ 0x3019, 0xFFFF }, // RIGHT WHITETORTOISE SHELL BLACKET
{ 0x301A, 0xFFFF }, // LEFT WHITE SQUARE BRACKET
{ 0x301B, 0xFFFF }, // RIGHT WHITE SQUARE BRACKET
{ 0x301C, 0xFFFF }, // WAVE DASH
{ 0x301D, 0xFFFF }, // REVERSED DOUBLE PRIME
{ 0x301E, 0xFFFF }, // DOUBLE PRIME QUOTATION MARK
{ 0x301F, 0xFFFF }, // LOW DOUBLE PRIME QUOTATION MARK
{ 0x3030, 0xFFFF }, // WAVY DASH
{ 0x30FB, 0xFFFF }, // KATAKANA MIDDLE DOT
{ 0x30FC, 0xFFFF }, // KATAKANA-HIRAHANA PROLONGED SOUND MARK
{ 0xFF01, 0xFFFF }, // FULLWIDTH EXCLAMATION MARK
{ 0xFF03, 0xFFFF }, // FULLWIDTH NUMBER SIGN
{ 0xFF04, 0xFFFF }, // FULLWIDTH DOLLAR SIGN
{ 0xFF05, 0xFFFF }, // FULLWIDTH PERCENT SIGN
{ 0xFF06, 0xFFFF }, // FULLWIDTH AMPERSAND
{ 0xFF0A, 0xFFFF }, // FULLWIDTH ASTERISK
{ 0xFF0B, 0xFFFF }, // FULLWIDTH PLUS SIGN
{ 0xFF0C, 0xFFFF }, // FULLWIDTH COMMA
{ 0xFF0D, 0xFFFF }, // FULLWIDTH HYPHEN-MINUS
{ 0xFF0E, 0xFFFF }, // FULLWIDTH FULL STOP
{ 0xFF0F, 0xFFFF }, // FULLWIDTH SOLIDUS
{ 0xFF1A, 0xFFFF }, // FULLWIDTH COLON
{ 0xFF1B, 0xFFFF }, // FULLWIDTH SEMICOLON
{ 0xFF1C, 0xFFFF }, // FULLWIDTH LESS-THAN SIGN
{ 0xFF1D, 0xFFFF }, // FULLWIDTH EQUALS SIGN
{ 0xFF1E, 0xFFFF }, // FULLWIDTH GREATER-THAN SIGN
{ 0xFF3C, 0xFFFF }, // FULLWIDTH REVERSE SOLIDUS
{ 0xFF3F, 0xFFFF }, // FULLWIDTH LOW LINE
{ 0xFF5B, 0xFFFF }, // FULLWIDTH LEFT CURLY BRACKET
{ 0xFF5C, 0xFFFF }, // FULLWIDTH VERTICAL LINE
{ 0xFF5D, 0xFFFF }, // FULLWIDTH RIGHT CURLY BRACKET
{ 0xFF5E, 0xFFFF }, // FULLWIDTH TILDE
{ 0xFFE5, 0xFFFF }, // FULLWIDTH YEN SIGN
{ 0x0021, 0xFFFF }, // EXCLAMATION MARK
{ 0x0023, 0xFFFF }, // NUMBER SIGN
{ 0x0024, 0xFFFF }, // DOLLAR SIGN
{ 0x0025, 0xFFFF }, // PERCENT SIGN
{ 0x0026, 0xFFFF }, // AMPERSAND
{ 0x002A, 0xFFFF }, // ASTERISK
{ 0x002B, 0xFFFF }, // PLUS SIGN
{ 0x002C, 0xFFFF }, // COMMA
{ 0x002D, 0xFFFF }, // HYPHEN-MINUS
{ 0x002E, 0xFFFF }, // FULL STOP
{ 0x002F, 0xFFFF }, // SOLIDUS
{ 0x003A, 0xFFFF }, // COLON
{ 0x003B, 0xFFFF }, // SEMICOLON
{ 0x003C, 0xFFFF }, // LESS-THAN SIGN
{ 0x003D, 0xFFFF }, // EQUALS SIGN
{ 0x003E, 0xFFFF }, // GREATER-THAN SIGN
{ 0x005C, 0xFFFF }, // REVERSE SOLIDUS
{ 0x005F, 0xFFFF }, // LOW LINE
{ 0x007B, 0xFFFF }, // LEFT CURLY BRACKET
{ 0x007C, 0xFFFF }, // VERTICAL LINE
{ 0x007D, 0xFFFF }, // RIGHT CURLY BRACKET
{ 0x007E, 0xFFFF }, // TILDE
{ 0x00A5, 0xFFFF }, // YEN SIGN
{ 0x3001, 0xFFFF }, // IDEOGRAPHIC COMMA
{ 0x3002, 0xFFFF }, // IDEOGRAPHIC FULL STOP
{ 0x3008, 0xFFFF }, // LEFT ANGLE BRACKET
{ 0x3009, 0xFFFF }, // RIGHT ANGLE BRACKET
{ 0x300A, 0xFFFF }, // LEFT DOUBLE ANGLE BRACKET
{ 0x300B, 0xFFFF }, // RIGHT DOUBLE ANGLE BRACKET
{ 0x300C, 0xFFFF }, // LEFT CORNER BRACKET
{ 0x300D, 0xFFFF }, // RIGHT CORNER BRACKET
{ 0x300E, 0xFFFF }, // LEFT WHITE CORNER BRACKET
{ 0x300F, 0xFFFF }, // RIGHT WHITE CORNER BRACKET
{ 0x3010, 0xFFFF }, // LEFT BLACK LENTICULAR BRACKET
{ 0x3011, 0xFFFF }, // RIGHT BLACK LENTICULAR BRACKET
{ 0x3014, 0xFFFF }, // LEFT TORTOISE SHELL BRACKET
{ 0x3015, 0xFFFF }, // RIGHT TORTOISE SHELL BRACKET
{ 0x3016, 0xFFFF }, // LEFT WHITE LENTICULAR BLACKET
{ 0x3017, 0xFFFF }, // RIGHT WHITE LENTICULAR BLACKET
{ 0x3018, 0xFFFF }, // LEFT WHITETORTOISE SHELL BLACKET
{ 0x3019, 0xFFFF }, // RIGHT WHITETORTOISE SHELL BLACKET
{ 0x301A, 0xFFFF }, // LEFT WHITE SQUARE BRACKET
{ 0x301B, 0xFFFF }, // RIGHT WHITE SQUARE BRACKET
{ 0x301C, 0xFFFF }, // WAVE DASH
{ 0x301D, 0xFFFF }, // REVERSED DOUBLE PRIME
{ 0x301E, 0xFFFF }, // DOUBLE PRIME QUOTATION MARK
{ 0x301F, 0xFFFF }, // LOW DOUBLE PRIME QUOTATION MARK
{ 0x3030, 0xFFFF }, // WAVY DASH
{ 0x30FB, 0xFFFF }, // KATAKANA MIDDLE DOT
{ 0x30FC, 0xFFFF }, // KATAKANA-HIRAHANA PROLONGED SOUND MARK
{ 0xFF01, 0xFFFF }, // FULLWIDTH EXCLAMATION MARK
{ 0xFF03, 0xFFFF }, // FULLWIDTH NUMBER SIGN
{ 0xFF04, 0xFFFF }, // FULLWIDTH DOLLAR SIGN
{ 0xFF05, 0xFFFF }, // FULLWIDTH PERCENT SIGN
{ 0xFF06, 0xFFFF }, // FULLWIDTH AMPERSAND
{ 0xFF0A, 0xFFFF }, // FULLWIDTH ASTERISK
{ 0xFF0B, 0xFFFF }, // FULLWIDTH PLUS SIGN
{ 0xFF0C, 0xFFFF }, // FULLWIDTH COMMA
{ 0xFF0D, 0xFFFF }, // FULLWIDTH HYPHEN-MINUS
{ 0xFF0E, 0xFFFF }, // FULLWIDTH FULL STOP
{ 0xFF0F, 0xFFFF }, // FULLWIDTH SOLIDUS
{ 0xFF1A, 0xFFFF }, // FULLWIDTH COLON
{ 0xFF1B, 0xFFFF }, // FULLWIDTH SEMICOLON
{ 0xFF1C, 0xFFFF }, // FULLWIDTH LESS-THAN SIGN
{ 0xFF1D, 0xFFFF }, // FULLWIDTH EQUALS SIGN
{ 0xFF1E, 0xFFFF }, // FULLWIDTH GREATER-THAN SIGN
{ 0xFF3C, 0xFFFF }, // FULLWIDTH REVERSE SOLIDUS
{ 0xFF3F, 0xFFFF }, // FULLWIDTH LOW LINE
{ 0xFF5B, 0xFFFF }, // FULLWIDTH LEFT CURLY BRACKET
{ 0xFF5C, 0xFFFF }, // FULLWIDTH VERTICAL LINE
{ 0xFF5D, 0xFFFF }, // FULLWIDTH RIGHT CURLY BRACKET
{ 0xFF5E, 0xFFFF }, // FULLWIDTH TILDE
{ 0xFFE5, 0xFFFF }, // FULLWIDTH YEN SIGN
};
ignoreSeparator_ja_JP::ignoreSeparator_ja_JP()
@@ -107,7 +107,6 @@ ignoreSeparator_ja_JP::ignoreSeparator_ja_JP()
transliterationName = "ignoreSeparator_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreSeparator_ja_JP";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
index 4d61d17..a3e6116 100644
--- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
@@ -22,8 +22,8 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
namespace i18npool {
namespace i18npool
{
const transliteration_Ignore::Mapping TiJi[] = {
// TU + I --> TI
{ 0x30C4, 0x30A3, 0x30C1, true },
@@ -49,7 +49,6 @@ ignoreTiJi_ja_JP::ignoreTiJi_ja_JP()
transliterationName = "ignoreTiJi_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreTiJi_ja_JP";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
index 78afd94..323a256 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
@@ -19,23 +19,22 @@
#include <transliteration_Ignore.hxx>
namespace i18npool {
static sal_Unicode
ignoreTraditionalKana_ja_JP_translator (const sal_Unicode c)
namespace i18npool
{
switch (c) {
case 0x3090: // HIRAGANA LETTER WI
static sal_Unicode ignoreTraditionalKana_ja_JP_translator(const sal_Unicode c)
{
switch (c)
{
case 0x3090: // HIRAGANA LETTER WI
return 0x3044; // HIRAGANA LETTER I
case 0x3091: // HIRAGANA LETTER WE
case 0x3091: // HIRAGANA LETTER WE
return 0x3048; // HIRAGANA LETTER E
case 0x30F0: // KATAKANA LETTER WI
case 0x30F0: // KATAKANA LETTER WI
return 0x30A4; // KATAKANA LETTER I
case 0x30F1: // KATAKANA LETTER WE
case 0x30F1: // KATAKANA LETTER WE
return 0x30A8; // KATAKANA LETTER E
}
return c;
@@ -49,7 +48,6 @@ ignoreTraditionalKana_ja_JP::ignoreTraditionalKana_ja_JP()
transliterationName = "ignoreTraditionalKana_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreTraditionalKana_ja_JP";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
index 029e335..baefa27 100644
--- a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
@@ -19,23 +19,22 @@
#include <transliteration_Ignore.hxx>
namespace i18npool {
static sal_Unicode
ignoreZiZu_ja_JP_translator (const sal_Unicode c)
namespace i18npool
{
switch (c) {
case 0x30C2: // KATAKANA LETTER DI
static sal_Unicode ignoreZiZu_ja_JP_translator(const sal_Unicode c)
{
switch (c)
{
case 0x30C2: // KATAKANA LETTER DI
return 0x30B8; // KATAKANA LETTER ZI
case 0x3062: // HIRAGANA LETTER DI
case 0x3062: // HIRAGANA LETTER DI
return 0x3058; // HIRAGANA LETTER ZI
case 0x30C5: // KATAKANA LETTER DU
case 0x30C5: // KATAKANA LETTER DU
return 0x30BA; // KATAKANA LETTER ZU
case 0x3065: // HIRAGANA LETTER DU
case 0x3065: // HIRAGANA LETTER DU
return 0x305A; // HIRAGANA LETTER ZU
}
return c;
@@ -49,7 +48,6 @@ ignoreZiZu_ja_JP::ignoreZiZu_ja_JP()
transliterationName = "ignoreZiZu_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreZiZu_ja_JP";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/katakanaToHiragana.cxx b/i18npool/source/transliteration/katakanaToHiragana.cxx
index 7b5f592..868040b 100644
--- a/i18npool/source/transliteration/katakanaToHiragana.cxx
+++ b/i18npool/source/transliteration/katakanaToHiragana.cxx
@@ -19,13 +19,14 @@
#include <transliteration_OneToOne.hxx>
namespace i18npool {
namespace i18npool
{
// see http://charts.unicode.org/Web/U3040.html Hiragana (U+3040..U+309F)
// see http://charts.unicode.org/Web/U30A0.html Katakana (U+30A0..U+30FF)
static sal_Unicode toHiragana (const sal_Unicode c)
static sal_Unicode toHiragana(const sal_Unicode c)
{
if ( (0x30a1 <= c && c <= 0x30f6) || (0x30fd <= c && c <= 0x30ff) ) { // 30A0 - 30FF KATAKANA LETTER
if ((0x30a1 <= c && c <= 0x30f6) || (0x30fd <= c && c <= 0x30ff))
{ // 30A0 - 30FF KATAKANA LETTER
// shift code point by 0x0060
return c - (0x30a0 - 0x3040);
}
@@ -39,7 +40,6 @@ katakanaToHiragana::katakanaToHiragana()
transliterationName = "katakanaToHiragana";
implementationName = "com.sun.star.i18n.Transliteration.KATAKANA_HIRAGANA";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
index 198100a..f6771fb 100644
--- a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
+++ b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
@@ -24,8 +24,8 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
namespace i18npool {
namespace i18npool
{
// ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
// ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.html
// http://charts.unicode.org/Web/U3040.html Hiragana (U+3040..U+309F)
@@ -33,37 +33,37 @@ namespace i18npool {
// http://charts.unicode.org/Web/UFF00.html
i18nutil::OneToOneMappingTable_t const large2small[] = {
{ 0x3041, 0x3042 }, // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A
{ 0x3043, 0x3044 }, // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I
{ 0x3045, 0x3046 }, // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U
{ 0x3047, 0x3048 }, // HIRAGANA LETTER SMALL E --> HIRAGANA LETTER E
{ 0x3049, 0x304A }, // HIRAGANA LETTER SMALL O --> HIRAGANA LETTER O
{ 0x3063, 0x3064 }, // HIRAGANA LETTER SMALL TU --> HIRAGANA LETTER TU
{ 0x3083, 0x3084 }, // HIRAGANA LETTER SMALL YA --> HIRAGANA LETTER YA
{ 0x3085, 0x3086 }, // HIRAGANA LETTER SMALL YU --> HIRAGANA LETTER YU
{ 0x3087, 0x3088 }, // HIRAGANA LETTER SMALL YO --> HIRAGANA LETTER YO
{ 0x308E, 0x308F }, // HIRAGANA LETTER SMALL WA --> HIRAGANA LETTER WA
{ 0x30A1, 0x30A2 }, // KATAKANA LETTER SMALL A --> KATAKANA LETTER A
{ 0x30A3, 0x30A4 }, // KATAKANA LETTER SMALL I --> KATAKANA LETTER I
{ 0x30A5, 0x30A6 }, // KATAKANA LETTER SMALL U --> KATAKANA LETTER U
{ 0x30A7, 0x30A8 }, // KATAKANA LETTER SMALL E --> KATAKANA LETTER E
{ 0x30A9, 0x30AA }, // KATAKANA LETTER SMALL O --> KATAKANA LETTER O
{ 0x30C3, 0x30C4 }, // KATAKANA LETTER SMALL TU --> KATAKANA LETTER TU
{ 0x30E3, 0x30E4 }, // KATAKANA LETTER SMALL YA --> KATAKANA LETTER YA
{ 0x30E5, 0x30E6 }, // KATAKANA LETTER SMALL YU --> KATAKANA LETTER YU
{ 0x30E7, 0x30E8 }, // KATAKANA LETTER SMALL YO --> KATAKANA LETTER YO
{ 0x30EE, 0x30EF }, // KATAKANA LETTER SMALL WA --> KATAKANA LETTER WA
{ 0x30F5, 0x30AB }, // KATAKANA LETTER SMALL KA --> KATAKANA LETTER KA
{ 0x30F6, 0x30B1 }, // KATAKANA LETTER SMALL KE --> KATAKANA LETTER KE
{ 0xFF67, 0xFF71 }, // HALFWIDTH KATAKANA LETTER SMALL A --> HALFWIDTH KATAKANA LETTER A
{ 0xFF68, 0xFF72 }, // HALFWIDTH KATAKANA LETTER SMALL I --> HALFWIDTH KATAKANA LETTER I
{ 0xFF69, 0xFF73 }, // HALFWIDTH KATAKANA LETTER SMALL U --> HALFWIDTH KATAKANA LETTER U
{ 0xFF6A, 0xFF74 }, // HALFWIDTH KATAKANA LETTER SMALL E --> HALFWIDTH KATAKANA LETTER E
{ 0xFF6B, 0xFF75 }, // HALFWIDTH KATAKANA LETTER SMALL O --> HALFWIDTH KATAKANA LETTER O
{ 0xFF6C, 0xFF94 }, // HALFWIDTH KATAKANA LETTER SMALL YA --> HALFWIDTH KATAKANA LETTER YA
{ 0xFF6D, 0xFF95 }, // HALFWIDTH KATAKANA LETTER SMALL YU --> HALFWIDTH KATAKANA LETTER YU
{ 0xFF6E, 0xFF96 }, // HALFWIDTH KATAKANA LETTER SMALL YO --> HALFWIDTH KATAKANA LETTER YO
{ 0xFF6F, 0xFF82 } // HALFWIDTH KATAKANA LETTER SMALL TU --> HALFWIDTH KATAKANA LETTER TU
{ 0x3041, 0x3042 }, // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A
{ 0x3043, 0x3044 }, // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I
{ 0x3045, 0x3046 }, // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U
{ 0x3047, 0x3048 }, // HIRAGANA LETTER SMALL E --> HIRAGANA LETTER E
{ 0x3049, 0x304A }, // HIRAGANA LETTER SMALL O --> HIRAGANA LETTER O
{ 0x3063, 0x3064 }, // HIRAGANA LETTER SMALL TU --> HIRAGANA LETTER TU
{ 0x3083, 0x3084 }, // HIRAGANA LETTER SMALL YA --> HIRAGANA LETTER YA
{ 0x3085, 0x3086 }, // HIRAGANA LETTER SMALL YU --> HIRAGANA LETTER YU
{ 0x3087, 0x3088 }, // HIRAGANA LETTER SMALL YO --> HIRAGANA LETTER YO
{ 0x308E, 0x308F }, // HIRAGANA LETTER SMALL WA --> HIRAGANA LETTER WA
{ 0x30A1, 0x30A2 }, // KATAKANA LETTER SMALL A --> KATAKANA LETTER A
{ 0x30A3, 0x30A4 }, // KATAKANA LETTER SMALL I --> KATAKANA LETTER I
{ 0x30A5, 0x30A6 }, // KATAKANA LETTER SMALL U --> KATAKANA LETTER U
{ 0x30A7, 0x30A8 }, // KATAKANA LETTER SMALL E --> KATAKANA LETTER E
{ 0x30A9, 0x30AA }, // KATAKANA LETTER SMALL O --> KATAKANA LETTER O
{ 0x30C3, 0x30C4 }, // KATAKANA LETTER SMALL TU --> KATAKANA LETTER TU
{ 0x30E3, 0x30E4 }, // KATAKANA LETTER SMALL YA --> KATAKANA LETTER YA
{ 0x30E5, 0x30E6 }, // KATAKANA LETTER SMALL YU --> KATAKANA LETTER YU
{ 0x30E7, 0x30E8 }, // KATAKANA LETTER SMALL YO --> KATAKANA LETTER YO
{ 0x30EE, 0x30EF }, // KATAKANA LETTER SMALL WA --> KATAKANA LETTER WA
{ 0x30F5, 0x30AB }, // KATAKANA LETTER SMALL KA --> KATAKANA LETTER KA
{ 0x30F6, 0x30B1 }, // KATAKANA LETTER SMALL KE --> KATAKANA LETTER KE
{ 0xFF67, 0xFF71 }, // HALFWIDTH KATAKANA LETTER SMALL A --> HALFWIDTH KATAKANA LETTER A
{ 0xFF68, 0xFF72 }, // HALFWIDTH KATAKANA LETTER SMALL I --> HALFWIDTH KATAKANA LETTER I
{ 0xFF69, 0xFF73 }, // HALFWIDTH KATAKANA LETTER SMALL U --> HALFWIDTH KATAKANA LETTER U
{ 0xFF6A, 0xFF74 }, // HALFWIDTH KATAKANA LETTER SMALL E --> HALFWIDTH KATAKANA LETTER E
{ 0xFF6B, 0xFF75 }, // HALFWIDTH KATAKANA LETTER SMALL O --> HALFWIDTH KATAKANA LETTER O
{ 0xFF6C, 0xFF94 }, // HALFWIDTH KATAKANA LETTER SMALL YA --> HALFWIDTH KATAKANA LETTER YA
{ 0xFF6D, 0xFF95 }, // HALFWIDTH KATAKANA LETTER SMALL YU --> HALFWIDTH KATAKANA LETTER YU
{ 0xFF6E, 0xFF96 }, // HALFWIDTH KATAKANA LETTER SMALL YO --> HALFWIDTH KATAKANA LETTER YO
{ 0xFF6F, 0xFF82 } // HALFWIDTH KATAKANA LETTER SMALL TU --> HALFWIDTH KATAKANA LETTER TU
};
largeToSmall_ja_JP::largeToSmall_ja_JP()
@@ -74,7 +74,6 @@ largeToSmall_ja_JP::largeToSmall_ja_JP()
transliterationName = "largeToSmall_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.largeToSmall_ja_JP";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
index 180db1d..47ddba1 100644
--- a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
+++ b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
@@ -24,8 +24,8 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
namespace i18npool {
namespace i18npool
{
// ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
// ftp://ftp.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.html
// http://charts.unicode.org/Web/U3040.html Hiragana (U+3040..U+309F)
@@ -33,37 +33,37 @@ namespace i18npool {
// http://charts.unicode.org/Web/UFF00.html
i18nutil::OneToOneMappingTable_t const small2large[] = {
{ 0x3041, 0x3042 }, // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A
{ 0x3043, 0x3044 }, // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I
{ 0x3045, 0x3046 }, // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U
{ 0x3047, 0x3048 }, // HIRAGANA LETTER SMALL E --> HIRAGANA LETTER E
{ 0x3049, 0x304A }, // HIRAGANA LETTER SMALL O --> HIRAGANA LETTER O
{ 0x3063, 0x3064 }, // HIRAGANA LETTER SMALL TU --> HIRAGANA LETTER TU
{ 0x3083, 0x3084 }, // HIRAGANA LETTER SMALL YA --> HIRAGANA LETTER YA
{ 0x3085, 0x3086 }, // HIRAGANA LETTER SMALL YU --> HIRAGANA LETTER YU
{ 0x3087, 0x3088 }, // HIRAGANA LETTER SMALL YO --> HIRAGANA LETTER YO
{ 0x308E, 0x308F }, // HIRAGANA LETTER SMALL WA --> HIRAGANA LETTER WA
{ 0x30A1, 0x30A2 }, // KATAKANA LETTER SMALL A --> KATAKANA LETTER A
{ 0x30A3, 0x30A4 }, // KATAKANA LETTER SMALL I --> KATAKANA LETTER I
{ 0x30A5, 0x30A6 }, // KATAKANA LETTER SMALL U --> KATAKANA LETTER U
{ 0x30A7, 0x30A8 }, // KATAKANA LETTER SMALL E --> KATAKANA LETTER E
{ 0x30A9, 0x30AA }, // KATAKANA LETTER SMALL O --> KATAKANA LETTER O
{ 0x30C3, 0x30C4 }, // KATAKANA LETTER SMALL TU --> KATAKANA LETTER TU
{ 0x30E3, 0x30E4 }, // KATAKANA LETTER SMALL YA --> KATAKANA LETTER YA
{ 0x30E5, 0x30E6 }, // KATAKANA LETTER SMALL YU --> KATAKANA LETTER YU
{ 0x30E7, 0x30E8 }, // KATAKANA LETTER SMALL YO --> KATAKANA LETTER YO
{ 0x30EE, 0x30EF }, // KATAKANA LETTER SMALL WA --> KATAKANA LETTER WA
{ 0x30F5, 0x30AB }, // KATAKANA LETTER SMALL KA --> KATAKANA LETTER KA
{ 0x30F6, 0x30B1 }, // KATAKANA LETTER SMALL KE --> KATAKANA LETTER KE
{ 0xFF67, 0xFF71 }, // HALFWIDTH KATAKANA LETTER SMALL A --> HALFWIDTH KATAKANA LETTER A
{ 0xFF68, 0xFF72 }, // HALFWIDTH KATAKANA LETTER SMALL I --> HALFWIDTH KATAKANA LETTER I
{ 0xFF69, 0xFF73 }, // HALFWIDTH KATAKANA LETTER SMALL U --> HALFWIDTH KATAKANA LETTER U
{ 0xFF6A, 0xFF74 }, // HALFWIDTH KATAKANA LETTER SMALL E --> HALFWIDTH KATAKANA LETTER E
{ 0xFF6B, 0xFF75 }, // HALFWIDTH KATAKANA LETTER SMALL O --> HALFWIDTH KATAKANA LETTER O
{ 0xFF6C, 0xFF94 }, // HALFWIDTH KATAKANA LETTER SMALL YA --> HALFWIDTH KATAKANA LETTER YA
{ 0xFF6D, 0xFF95 }, // HALFWIDTH KATAKANA LETTER SMALL YU --> HALFWIDTH KATAKANA LETTER YU
{ 0xFF6E, 0xFF96 }, // HALFWIDTH KATAKANA LETTER SMALL YO --> HALFWIDTH KATAKANA LETTER YO
{ 0xFF6F, 0xFF82 } // HALFWIDTH KATAKANA LETTER SMALL TU --> HALFWIDTH KATAKANA LETTER TU
{ 0x3041, 0x3042 }, // HIRAGANA LETTER SMALL A --> HIRAGANA LETTER A
{ 0x3043, 0x3044 }, // HIRAGANA LETTER SMALL I --> HIRAGANA LETTER I
{ 0x3045, 0x3046 }, // HIRAGANA LETTER SMALL U --> HIRAGANA LETTER U
{ 0x3047, 0x3048 }, // HIRAGANA LETTER SMALL E --> HIRAGANA LETTER E
{ 0x3049, 0x304A }, // HIRAGANA LETTER SMALL O --> HIRAGANA LETTER O
{ 0x3063, 0x3064 }, // HIRAGANA LETTER SMALL TU --> HIRAGANA LETTER TU
{ 0x3083, 0x3084 }, // HIRAGANA LETTER SMALL YA --> HIRAGANA LETTER YA
{ 0x3085, 0x3086 }, // HIRAGANA LETTER SMALL YU --> HIRAGANA LETTER YU
{ 0x3087, 0x3088 }, // HIRAGANA LETTER SMALL YO --> HIRAGANA LETTER YO
{ 0x308E, 0x308F }, // HIRAGANA LETTER SMALL WA --> HIRAGANA LETTER WA
{ 0x30A1, 0x30A2 }, // KATAKANA LETTER SMALL A --> KATAKANA LETTER A
{ 0x30A3, 0x30A4 }, // KATAKANA LETTER SMALL I --> KATAKANA LETTER I
{ 0x30A5, 0x30A6 }, // KATAKANA LETTER SMALL U --> KATAKANA LETTER U
{ 0x30A7, 0x30A8 }, // KATAKANA LETTER SMALL E --> KATAKANA LETTER E
{ 0x30A9, 0x30AA }, // KATAKANA LETTER SMALL O --> KATAKANA LETTER O
{ 0x30C3, 0x30C4 }, // KATAKANA LETTER SMALL TU --> KATAKANA LETTER TU
{ 0x30E3, 0x30E4 }, // KATAKANA LETTER SMALL YA --> KATAKANA LETTER YA
{ 0x30E5, 0x30E6 }, // KATAKANA LETTER SMALL YU --> KATAKANA LETTER YU
{ 0x30E7, 0x30E8 }, // KATAKANA LETTER SMALL YO --> KATAKANA LETTER YO
{ 0x30EE, 0x30EF }, // KATAKANA LETTER SMALL WA --> KATAKANA LETTER WA
{ 0x30F5, 0x30AB }, // KATAKANA LETTER SMALL KA --> KATAKANA LETTER KA
{ 0x30F6, 0x30B1 }, // KATAKANA LETTER SMALL KE --> KATAKANA LETTER KE
{ 0xFF67, 0xFF71 }, // HALFWIDTH KATAKANA LETTER SMALL A --> HALFWIDTH KATAKANA LETTER A
{ 0xFF68, 0xFF72 }, // HALFWIDTH KATAKANA LETTER SMALL I --> HALFWIDTH KATAKANA LETTER I
{ 0xFF69, 0xFF73 }, // HALFWIDTH KATAKANA LETTER SMALL U --> HALFWIDTH KATAKANA LETTER U
{ 0xFF6A, 0xFF74 }, // HALFWIDTH KATAKANA LETTER SMALL E --> HALFWIDTH KATAKANA LETTER E
{ 0xFF6B, 0xFF75 }, // HALFWIDTH KATAKANA LETTER SMALL O --> HALFWIDTH KATAKANA LETTER O
{ 0xFF6C, 0xFF94 }, // HALFWIDTH KATAKANA LETTER SMALL YA --> HALFWIDTH KATAKANA LETTER YA
{ 0xFF6D, 0xFF95 }, // HALFWIDTH KATAKANA LETTER SMALL YU --> HALFWIDTH KATAKANA LETTER YU
{ 0xFF6E, 0xFF96 }, // HALFWIDTH KATAKANA LETTER SMALL YO --> HALFWIDTH KATAKANA LETTER YO
{ 0xFF6F, 0xFF82 } // HALFWIDTH KATAKANA LETTER SMALL TU --> HALFWIDTH KATAKANA LETTER TU
};
smallToLarge_ja_JP::smallToLarge_ja_JP()
@@ -74,7 +74,6 @@ smallToLarge_ja_JP::smallToLarge_ja_JP()
transliterationName = "smallToLarge_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.smallToLarge_ja_JP";
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 484f427..d910ee5 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -4752,7 +4752,6 @@ i18npool/inc/numberformatcode.hxx
i18npool/inc/numtochar.hxx
i18npool/inc/numtotext_cjk.hxx
i18npool/inc/ordinalsuffix.hxx
i18npool/inc/servicename.hxx
i18npool/inc/textToPronounce_zh.hxx
i18npool/inc/textconversion.hxx
i18npool/inc/textconversionImpl.hxx
@@ -4823,32 +4822,20 @@ i18npool/source/textconversion/textconversion_zh.cxx
i18npool/source/transliteration/chartonum.cxx
i18npool/source/transliteration/fullwidthToHalfwidth.cxx
i18npool/source/transliteration/halfwidthToFullwidth.cxx
i18npool/source/transliteration/hiraganaToKatakana.cxx
i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
i18npool/source/transliteration/ignoreKana.cxx
i18npool/source/transliteration/ignoreKashida_CTL.cxx
i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
i18npool/source/transliteration/ignoreSize_ja_JP.cxx
i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
i18npool/source/transliteration/ignoreWidth.cxx
i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
i18npool/source/transliteration/katakanaToHiragana.cxx
i18npool/source/transliteration/largeToSmall_ja_JP.cxx
i18npool/source/transliteration/numtochar.cxx
i18npool/source/transliteration/numtotext_cjk.cxx
i18npool/source/transliteration/smallToLarge_ja_JP.cxx
i18npool/source/transliteration/textToPronounce_zh.cxx
i18npool/source/transliteration/texttonum.cxx
i18npool/source/transliteration/transliterationImpl.cxx
