summaryrefslogtreecommitdiff
path: root/src/pugixml.cpp
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2011-12-20 09:45:10 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2011-12-20 09:45:10 +0000
commita0769dfe380ad7e4bb3c47dc6b32099e3a4918be (patch)
tree41072780c1afaa7a16797ed73aece4cab3eeec28 /src/pugixml.cpp
parent5a312a8ea8ab78c9cf8eba7cb299dafb6985800c (diff)
Introduced encoding_latin1 support (conversion on loading, conversion on saving, encoding name in declaration in document::save)
git-svn-id: http://pugixml.googlecode.com/svn/trunk@829 99668b35-9821-0410-8761-19e4c4f06640
Diffstat (limited to 'src/pugixml.cpp')
-rw-r--r--src/pugixml.cpp127
1 files changed, 126 insertions, 1 deletions
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index a6196dc..eb924a2 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -754,6 +754,27 @@ namespace
}
};
+ struct latin1_writer
+ {
+ typedef uint8_t* value_type;
+
+ static value_type low(value_type result, uint32_t ch)
+ {
+ *result = static_cast<uint8_t>(ch > 255 ? '?' : ch);
+
+ return result + 1;
+ }
+
+ static value_type high(value_type result, uint32_t ch)
+ {
+ (void)ch;
+
+ *result = '?';
+
+ return result + 1;
+ }
+ };
+
template <size_t size> struct wchar_selector;
template <> struct wchar_selector<2>
@@ -904,6 +925,16 @@ namespace
return result;
}
+
+ static inline typename Traits::value_type decode_latin1_block(const uint8_t* data, size_t size, typename Traits::value_type result)
+ {
+ for (size_t i = 0; i < size; ++i)
+ {
+ result = Traits::low(result, data[i]);
+ }
+
+ return result;
+ }
};
template <typename T> inline void convert_utf_endian_swap(T* result, const T* data, size_t length)
@@ -1172,6 +1203,27 @@ namespace
return true;
}
+ bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size)
+ {
+ const uint8_t* data = static_cast<const uint8_t*>(contents);
+
+ // get length in wchar_t units
+ out_length = size;
+
+ // allocate buffer of suitable length
+ out_buffer = static_cast<char_t*>(global_allocate((out_length > 0 ? out_length : 1) * sizeof(char_t)));
+ if (!out_buffer) return false;
+
+ // convert latin1 input to wchar_t
+ wchar_writer::value_type out_begin = reinterpret_cast<wchar_writer::value_type>(out_buffer);
+ wchar_writer::value_type out_end = utf_decoder<wchar_writer>::decode_latin1_block(data, size, out_begin);
+
+ assert(out_end == out_begin + out_length);
+ (void)!out_end;
+
+ return true;
+ }
+
bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
{
// get native encoding
@@ -1206,6 +1258,9 @@ namespace
convert_buffer_utf32(out_buffer, out_length, contents, size, opt_true());
}
+ // source encoding is latin1
+ if (encoding == encoding_latin1) return convert_buffer_latin1(out_buffer, out_length, contents, size);
+
assert(!"Invalid encoding");
return false;
}
@@ -1254,6 +1309,48 @@ namespace
return true;
}
+ size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size)
+ {
+ for (size_t i = 0; i < size; ++i)
+ if (data[i] > 127)
+ return i;
+
+ return size;
+ }
+
+ bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+ {
+ const uint8_t* data = static_cast<const uint8_t*>(contents);
+
+ // get size of prefix that does not need utf8 conversion
+ size_t prefix_length = get_latin1_7bit_prefix_length(data, size);
+ assert(prefix_length <= size);
+
+ const uint8_t* postfix = data + prefix_length;
+ size_t postfix_length = size - prefix_length;
+
+ // if no conversion is needed, just return the original buffer
+ if (postfix_length == 0) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+ // first pass: get length in utf8 units
+ out_length = prefix_length + utf_decoder<utf8_counter>::decode_latin1_block(postfix, postfix_length, 0);
+
+ // allocate buffer of suitable length
+ out_buffer = static_cast<char_t*>(global_allocate((out_length > 0 ? out_length : 1) * sizeof(char_t)));
+ if (!out_buffer) return false;
+
+ // second pass: convert latin1 input to utf8
+ memcpy(out_buffer, data, prefix_length);
+
+ uint8_t* out_begin = reinterpret_cast<uint8_t*>(out_buffer);
+ uint8_t* out_end = utf_decoder<utf8_writer>::decode_latin1_block(postfix, postfix_length, out_begin + prefix_length);
+
+ assert(out_end == out_begin + out_length);
+ (void)!out_end;
+
+ return true;
+ }
+
bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
{
// fast path: no conversion required
@@ -1279,6 +1376,9 @@ namespace
convert_buffer_utf32(out_buffer, out_length, contents, size, opt_true());
}
+ // source encoding is latin1
+ if (encoding == encoding_latin1) return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable);
+
assert(!"Invalid encoding");
return false;
}
@@ -2580,6 +2680,18 @@ namespace
return static_cast<size_t>(end - dest) * sizeof(uint32_t);
}
+ // convert to latin1
+ if (encoding == encoding_latin1)
+ {
+ uint8_t* dest = reinterpret_cast<uint8_t*>(result);
+
+ uint8_t* end = sizeof(wchar_t) == 2 ?
+ utf_decoder<latin1_writer>::decode_utf16_block(reinterpret_cast<const uint16_t*>(data), length, dest) :
+ utf_decoder<latin1_writer>::decode_utf32_block(reinterpret_cast<const uint32_t*>(data), length, dest);
+
+ return static_cast<size_t>(end - dest);
+ }
+
assert(!"Invalid encoding");
return 0;
}
@@ -2632,6 +2744,14 @@ namespace
return static_cast<size_t>(end - dest) * sizeof(uint32_t);
}
+ if (encoding == encoding_latin1)
+ {
+ uint8_t* dest = reinterpret_cast<uint8_t*>(result);
+ uint8_t* end = utf_decoder<latin1_writer>::decode_utf8_block(reinterpret_cast<const uint8_t*>(data), length, dest);
+
+ return static_cast<size_t>(end - dest);
+ }
+
assert(!"Invalid encoding");
return 0;
}
@@ -2822,6 +2942,9 @@ namespace
writer.write("\xff\xfe\x00\x00", 4);
break;
+ case encoding_latin1:
+ break;
+
default:
assert(!"Invalid encoding");
}
@@ -4806,7 +4929,9 @@ namespace pugi
if (!(flags & format_no_declaration) && !has_declaration(*this))
{
- buffered_writer.write(PUGIXML_TEXT("<?xml version=\"1.0\"?>"));
+ buffered_writer.write(PUGIXML_TEXT("<?xml version=\"1.0\""));
+ if (encoding == encoding_latin1) buffered_writer.write(PUGIXML_TEXT(" encoding=\"ISO-8859-1\""));
+ buffered_writer.write('?', '>');
if (!(flags & format_raw)) buffered_writer.write('\n');
}