support for Serbian with Latin letters

- fileformat change

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22143 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/FORMAT b/development/FORMAT
index d1ad96bd12480a5ab48bd0f725f3b71da075aabb..30a70641f8bcb2af603f89b9d1e43d64004b67d6 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -1,6 +1,9 @@
 LyX file-format changes
 -----------------------
 
+2007-12-15 Uwe Stöhr <uwestoehr@web.de>
+       * Format incremented to 308: support for Serbian (Latin)
+
 2007-12-05 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
        * Format incremented to 307: support for \slash and \nobreakdash.
 

diff --git a/lib/languages b/lib/languages
index dfa803d4e3181d4f1928a6d883dc1fa2d0d97626..47d7d655318c37004e7a4be35d311e17e6d26c53 100644 (file)
--- a/lib/languages
+++ b/lib/languages
@@ -67,6 +67,7 @@ russian     russian   "Russian"       false  koi8       ru_RU  ""
 samin       samin      "North Sami"    false  iso8859-15 se_NO  ""
 scottish    scottish   "Scottish"      false  iso8859-15 gd_GB  ""
 serbian     serbian    "Serbian"       false  iso8859-5  sr_RS  ""
+serbian-latin     serbian      "Serbian (Latin)"       false  iso8859-2  sr_RS  ""
 slovak      slovak     "Slovak"        false  iso8859-2  sk_SK  ""
 slovene     slovene    "Slovene"       false  iso8859-2  sl_SI  ""
 spanish     spanish    "Spanish"       false  iso8859-15 es_ES  "\deactivatetilden\renewcommand\shorthandsspanish{}"

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index cf434e108e7c5272a622de43fa5fe1fbde5f63a2..01fc767102bd9b9e690bbe5b7c6a1a85ac1405de 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -80,7 +80,7 @@ format_relation = [("0_06",    [200], minor_versions("0.6" , 4)),
                    ("1_3",     [221], minor_versions("1.3" , 7)),
                    ("1_4", range(222,246), minor_versions("1.4" , 5)),
                    ("1_5", range(246,277), minor_versions("1.5" , 2)),
-                   ("1_6", range(277,308), minor_versions("1.6" , 0))]
+                   ("1_6", range(277,309), minor_versions("1.6" , 0))] # Uwe: Serbian-Latin
 
 
 def formats_list():

diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index a32090d42932b40849c29e00bc5fcb35009c4753..1817b0bb667d063207c6a1ff21e7cac36bbeb6c3 100644 (file)
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -979,6 +979,23 @@ def revert_interlingua(document):
         j = j + 1
 
 
+def revert_serbianlatin(document):
+    "Set language Serbian-Latin to Croatian"
+    i = 0
+    if document.language == "serbian-latin":
+        document.language = "croatian"
+        i = find_token(document.header, "\\language", 0)
+        if i != -1:
+            document.header[i] = "\\language croatian"
+    j = 0
+    while True:
+        j = find_token(document.body, "\\lang serbian-latin", j)
+        if j == -1:
+            return
+        document.body[j] = document.body[j].replace("\\lang serbian-latin", "\\lang croatian")
+        j = j + 1
+
+
 ##
 # Conversion hub
 #
@@ -1014,10 +1031,12 @@ convert = [[277, [fix_wrong_tables]],
            [304, [convert_framed_notes]],
            [305, []],
            [306, []],
-           [307, []]
+           [307, []],
+           [308, []]
           ]
 
-revert =  [[306, [revert_slash, revert_nobreakdash]],
+revert =  [[307, [revert_serbianlatin]],
+           [306, [revert_slash, revert_nobreakdash]],
            [305, [revert_interlingua]],
            [304, [revert_bahasam]],
            [303, [revert_framed_notes]],

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index ad4a0e92aba75aeded71a86b4dd84f85d34785b5..2d0a3ad84dbaed39d12d29c98852bc6400315a1a 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -116,7 +116,7 @@ namespace os = support::os;
 
 namespace {
 
-int const LYX_FORMAT = 307; // JSpitzm: support for \slash
+int const LYX_FORMAT = 308; // Uwe: Serbian-Latin
 
 } // namespace anon