mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Allow utf8x \inputencoding
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17164 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
65b1b08a5c
commit
9fd8a86961
@ -1,6 +1,10 @@
|
||||
LyX file-format changes
|
||||
-----------------------§
|
||||
|
||||
2007-02-13 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||
|
||||
* format incremented to 260: Allow utf8x \inputencoding
|
||||
|
||||
2007-02-12 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||
|
||||
* format incremented to 259:
|
||||
|
@ -6,6 +6,11 @@
|
||||
Encoding utf8 utf8 UTF-8
|
||||
End
|
||||
|
||||
# This one is used by many CJK packages. utf8 is supposed to be the successor,
|
||||
# but does not have all features of utf8x yet.
|
||||
Encoding utf8x utf8x UTF-8
|
||||
End
|
||||
|
||||
Encoding iso8859-1 latin1 ISO-8859-1
|
||||
End
|
||||
|
||||
|
@ -74,7 +74,7 @@ format_relation = [("0_06", [200], generate_minor_versions("0.6" , 4)),
|
||||
("1_2", [220], generate_minor_versions("1.2" , 4)),
|
||||
("1_3", [221], generate_minor_versions("1.3" , 7)),
|
||||
("1_4", range(222,246), generate_minor_versions("1.4" , 3)),
|
||||
("1_5", range(246,260), generate_minor_versions("1.5" , 0))]
|
||||
("1_5", range(246,261), generate_minor_versions("1.5" , 0))]
|
||||
|
||||
|
||||
def formats_list():
|
||||
|
@ -1181,6 +1181,19 @@ def normalize_font_whitespace(document):
|
||||
|
||||
i = i + 1
|
||||
|
||||
|
||||
def revert_utf8x(document):
|
||||
" Set utf8x encoding to utf8. "
|
||||
i = find_token(document.header, "\\inputencoding", 0)
|
||||
if i == -1:
|
||||
document.header.append("\\inputencoding auto")
|
||||
else:
|
||||
inputenc = get_value(document.header, "\\inputencoding", i)
|
||||
if inputenc == "utf8x":
|
||||
document.header[i] = "\\inputencoding utf8"
|
||||
document.inputencoding = get_value(document.header, "\\inputencoding", 0)
|
||||
|
||||
|
||||
##
|
||||
# Conversion hub
|
||||
#
|
||||
@ -1199,9 +1212,11 @@ convert = [[246, []],
|
||||
[256, []],
|
||||
[257, [convert_caption]],
|
||||
[258, [convert_lyxline]],
|
||||
[259, [convert_accent, normalize_font_whitespace]]]
|
||||
[259, [convert_accent, normalize_font_whitespace]],
|
||||
[260, []]]
|
||||
|
||||
revert = [[258, []],
|
||||
revert = [[259, [revert_utf8x]],
|
||||
[258, []],
|
||||
[257, []],
|
||||
[256, [revert_caption]],
|
||||
[255, [revert_encodings]],
|
||||
|
@ -141,7 +141,7 @@ using std::string;
|
||||
|
||||
namespace {
|
||||
|
||||
int const LYX_FORMAT = 259;
|
||||
int const LYX_FORMAT = 260;
|
||||
|
||||
} // namespace anon
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user