ICU 56 update step 1

source/i18n/csr2022.cpp

 /*
  **********************************************************************
- *   Copyright (C) 2005-2012, International Business Machines
+ *   Copyright (C) 2005-2015, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_CONVERSION
 
 #include "cstring.h"
 
@@ skipping 98 matching lines @@
     {0x1b, 0x24, 0x42, 0x00, 0x00},   // JIS X 208-1983
     {0x1b, 0x26, 0x40, 0x00, 0x00},   // JIS X 208 1990, 1997
     {0x1b, 0x28, 0x42, 0x00, 0x00},   // ASCII
     {0x1b, 0x28, 0x48, 0x00, 0x00},   // JIS-Roman
     {0x1b, 0x28, 0x49, 0x00, 0x00},   // Half-width katakana
     {0x1b, 0x28, 0x4a, 0x00, 0x00},   // JIS-Roman
     {0x1b, 0x2e, 0x41, 0x00, 0x00},   // ISO 8859-1
     {0x1b, 0x2e, 0x46, 0x00, 0x00}    // ISO 8859-7
 };
 
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_ONLY_HTML_CONVERSION
 static const uint8_t escapeSequences_2022KR[][5] = {
     {0x1b, 0x24, 0x29, 0x43, 0x00}   
 };
 
 static const uint8_t escapeSequences_2022CN[][5] = {
     {0x1b, 0x24, 0x29, 0x41, 0x00},   // GB 2312-80
     {0x1b, 0x24, 0x29, 0x47, 0x00},   // CNS 11643-1992 Plane 1
     {0x1b, 0x24, 0x2A, 0x48, 0x00},   // CNS 11643-1992 Plane 2
     {0x1b, 0x24, 0x29, 0x45, 0x00},   // ISO-IR-165
     {0x1b, 0x24, 0x2B, 0x49, 0x00},   // CNS 11643-1992 Plane 3
@@ skipping 14 matching lines @@
 
 UBool CharsetRecog_2022JP::match(InputText *textIn, CharsetMatch *results) const {
     int32_t confidence = match_2022(textIn->fInputBytes, 
                                     textIn->fInputLen, 
                                     escapeSequences_2022JP, 
                                     ARRAY_SIZE(escapeSequences_2022JP));
     results->set(textIn, this, confidence);
     return (confidence > 0);
 }
 
-#if !UCONFIG_NO_NON_HTML5_CONVERSION
+#if !UCONFIG_ONLY_HTML_CONVERSION
 CharsetRecog_2022KR::~CharsetRecog_2022KR() {}
 
 const char *CharsetRecog_2022KR::getName() const {
     return "ISO-2022-KR";
 }
 
 UBool CharsetRecog_2022KR::match(InputText *textIn, CharsetMatch *results) const {
     int32_t confidence = match_2022(textIn->fInputBytes, 
                                     textIn->fInputLen, 
                                     escapeSequences_2022KR, 
@@ skipping 17 matching lines @@
     return (confidence > 0);
 }
 #endif
 
 CharsetRecog_2022::~CharsetRecog_2022() {
     // nothing to do
 }
 
 U_NAMESPACE_END
 #endif