File format update after 418016bf792

Removing unsupported encoding "pt254" from \inputencoding values makes documents using this value invalid (J.S.).

diff --git a/development/FORMAT b/development/FORMAT
index d0985168b68ba6c6b5940eab0e03da855942647d..225d5caaa3a47d6c60b8696c41c1e5b7a5554175 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,9 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.
 
 -----------------------
 
+2016-12-07 Günter Milde <milde@lyx.org>
+       * Format incremented to 516: Removed \inputenc value "pt254"
+
 2016-10-28 Uwe Stöhr <uwestoehr@web.de>
        * Format incremented to 515: support for Urdu and Syriac:
          \lang urdu

diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 65b5188652d10c2ecd551a49d1ac888f7eec8cdf..804d0e62c290dbf8f136dd32ded9ac61b09c23cd 100644 (file)
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -96,6 +96,15 @@ def convert_dateinset(document):
         continue
 
 
+def convert_inputenc(document):
+    " Replace no longer supported input encoding settings. "
+    i = find_token(document.header, "\\inputenc", 0)
+    if i == -1:
+        return
+    if get_value(document.header, "\\inputencoding", i) == "pt254":
+        document.header[i] = "\\inputencoding pt154"
+    
+
 def convert_ibranches(document):
     ' Add "inverted 0" to branch insets'
     i = 0
@@ -212,21 +221,21 @@ def revert_beamer_article_styles(document):
                                           "Provides geometry 0",
                                           "Provides hyperref 0",
                                           "DefaultFont",
-                                          "    Family                Roman",
-                                          "    Series                Medium",
-                                          "    Shape                 Up",
-                                          "    Size                  Normal",
-                                          "    Color                 None",
+                                          "     Family                Roman",
+                                          "     Series                Medium",
+                                          "     Shape                 Up",
+                                          "     Size                  Normal",
+                                          "     Color                 None",
                                           "EndFont",
                                           "Preamble",
-                                          "    \\usepackage{beamerarticle,pgf}",
-                                          "    % this default might be overridden by plain title style",
-                                          "    \\newcommand\makebeamertitle{\\frame{\\maketitle}}%",
-                                          "    \\AtBeginDocument{",
-                                          "            \\let\\origtableofcontents=\\tableofcontents",
-                                          "            \\def\\tableofcontents{\\@ifnextchar[{\\origtableofcontents}{\\gobbletableofcontents}}",
-                                          "            \\def\\gobbletableofcontents#1{\\origtableofcontents}",
-                                          "    }",
+                                          "     \\usepackage{beamerarticle,pgf}",
+                                          "     % this default might be overridden by plain title style",
+                                          "     \\newcommand\makebeamertitle{\\frame{\\maketitle}}%",
+                                          "     \\AtBeginDocument{",
+                                          "             \\let\\origtableofcontents=\\tableofcontents",
+                                          "             \\def\\tableofcontents{\\@ifnextchar[{\\origtableofcontents}{\\gobbletableofcontents}}",
+                                          "             \\def\\gobbletableofcontents#1{\\origtableofcontents}",
+                                          "     }",
                                           "EndPreamble",
                                           "### End of insertion by lyx2lyx (more [scr]article styles) ###"]
         return
@@ -269,16 +278,16 @@ def revert_bosnian(document):
         document.language = "english"
         i = find_token(document.header, "\\language bosnian", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package babel"
+            document.header[j] = "\\language_package babel"
         k = find_token(document.header, "\\options", 0)
         if k != -1:
-           document.header[k] = document.header[k].replace("\\options", "\\options bosnian,")
+            document.header[k] = document.header[k].replace("\\options", "\\options bosnian,")
         else:
-           l = find_token(document.header, "\\use_default_options", 0)
-           document.header.insert(l + 1, "\\options bosnian")
+            l = find_token(document.header, "\\use_default_options", 0)
+            document.header.insert(l + 1, "\\options bosnian")
 
 
 def revert_friulan(document):
@@ -288,16 +297,16 @@ def revert_friulan(document):
         document.language = "english"
         i = find_token(document.header, "\\language friulan", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package babel"
+            document.header[j] = "\\language_package babel"
         k = find_token(document.header, "\\options", 0)
         if k != -1:
-           document.header[k] = document.header[k].replace("\\options", "\\options friulan,")
+            document.header[k] = document.header[k].replace("\\options", "\\options friulan,")
         else:
-           l = find_token(document.header, "\\use_default_options", 0)
-           document.header.insert(l + 1, "\\options friulan")
+            l = find_token(document.header, "\\use_default_options", 0)
+            document.header.insert(l + 1, "\\options friulan")
 
 
 def revert_macedonian(document):
@@ -307,16 +316,16 @@ def revert_macedonian(document):
         document.language = "english"
         i = find_token(document.header, "\\language macedonian", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package babel"
+            document.header[j] = "\\language_package babel"
         k = find_token(document.header, "\\options", 0)
         if k != -1:
-           document.header[k] = document.header[k].replace("\\options", "\\options macedonian,")
+            document.header[k] = document.header[k].replace("\\options", "\\options macedonian,")
         else:
-           l = find_token(document.header, "\\use_default_options", 0)
-           document.header.insert(l + 1, "\\options macedonian")
+            l = find_token(document.header, "\\use_default_options", 0)
+            document.header.insert(l + 1, "\\options macedonian")
 
 
 def revert_piedmontese(document):
@@ -326,16 +335,16 @@ def revert_piedmontese(document):
         document.language = "english"
         i = find_token(document.header, "\\language piedmontese", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package babel"
+            document.header[j] = "\\language_package babel"
         k = find_token(document.header, "\\options", 0)
         if k != -1:
-           document.header[k] = document.header[k].replace("\\options", "\\options piedmontese,")
+            document.header[k] = document.header[k].replace("\\options", "\\options piedmontese,")
         else:
-           l = find_token(document.header, "\\use_default_options", 0)
-           document.header.insert(l + 1, "\\options piedmontese")
+            l = find_token(document.header, "\\use_default_options", 0)
+            document.header.insert(l + 1, "\\options piedmontese")
 
 
 def revert_romansh(document):
@@ -345,16 +354,16 @@ def revert_romansh(document):
         document.language = "english"
         i = find_token(document.header, "\\language romansh", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package babel"
+            document.header[j] = "\\language_package babel"
         k = find_token(document.header, "\\options", 0)
         if k != -1:
-           document.header[k] = document.header[k].replace("\\options", "\\options romansh,")
+            document.header[k] = document.header[k].replace("\\options", "\\options romansh,")
         else:
-           l = find_token(document.header, "\\use_default_options", 0)
-           document.header.insert(l + 1, "\\options romansh")
+            l = find_token(document.header, "\\use_default_options", 0)
+            document.header.insert(l + 1, "\\options romansh")
 
 
 def revert_amharic(document):
@@ -364,10 +373,10 @@ def revert_amharic(document):
         document.language = "english"
         i = find_token(document.header, "\\language amharic", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package default"
+            document.header[j] = "\\language_package default"
         add_to_preamble(document, ["\\AtBeginDocument{\setotherlanguage{amharic}}"])
         document.body[2 : 2] = ["\\begin_layout Standard",
                                 "\\begin_inset ERT", "status open", "",
@@ -385,10 +394,10 @@ def revert_asturian(document):
         document.language = "english"
         i = find_token(document.header, "\\language asturian", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package default"
+            document.header[j] = "\\language_package default"
         add_to_preamble(document, ["\\AtBeginDocument{\setotherlanguage{asturian}}"])
         document.body[2 : 2] = ["\\begin_layout Standard",
                                 "\\begin_inset ERT", "status open", "",
@@ -406,10 +415,10 @@ def revert_kannada(document):
         document.language = "english"
         i = find_token(document.header, "\\language kannada", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package default"
+            document.header[j] = "\\language_package default"
         add_to_preamble(document, ["\\AtBeginDocument{\setotherlanguage{kannada}}"])
         document.body[2 : 2] = ["\\begin_layout Standard",
                                 "\\begin_inset ERT", "status open", "",
@@ -427,10 +436,10 @@ def revert_khmer(document):
         document.language = "english"
         i = find_token(document.header, "\\language khmer", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package default"
+            document.header[j] = "\\language_package default"
         add_to_preamble(document, ["\\AtBeginDocument{\setotherlanguage{khmer}}"])
         document.body[2 : 2] = ["\\begin_layout Standard",
                                 "\\begin_inset ERT", "status open", "",
@@ -448,10 +457,10 @@ def revert_urdu(document):
         document.language = "english"
         i = find_token(document.header, "\\language urdu", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package default"
+            document.header[j] = "\\language_package default"
         add_to_preamble(document, ["\\AtBeginDocument{\setotherlanguage{urdu}}"])
         document.body[2 : 2] = ["\\begin_layout Standard",
                                 "\\begin_inset ERT", "status open", "",
@@ -469,10 +478,10 @@ def revert_syriac(document):
         document.language = "english"
         i = find_token(document.header, "\\language syriac", 0)
         if i != -1:
-           document.header[i] = "\\language english"
+            document.header[i] = "\\language english"
         j = find_token(document.header, "\\language_package default", 0)
         if j != -1:
-           document.header[j] = "\\language_package default"
+            document.header[j] = "\\language_package default"
         add_to_preamble(document, ["\\AtBeginDocument{\setotherlanguage{syriac}}"])
         document.body[2 : 2] = ["\\begin_layout Standard",
                                 "\\begin_inset ERT", "status open", "",
@@ -495,10 +504,12 @@ convert = [
            [512, [convert_beamer_article_styles]],
            [513, []],
            [514, []],
-           [515, []]
+           [515, []],
+           [516, [convert_inputenc]],
           ]
 
 revert =  [
+           [516, []],
            [514, [revert_urdu, revert_syriac]],
            [513, [revert_amharic, revert_asturian, revert_kannada, revert_khmer]],
            [512, [revert_bosnian, revert_friulan, revert_macedonian, revert_piedmontese, revert_romansh]],

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index b0ec0d8b06219114169ed2c5d4f3539c0383e548..dccd11ddf80f004b90ffcd777b8d9c56cf1f3e21 100644 (file)
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index ad8d5b89e50ef8a0b734576c8c1c24fe7a9f8716..8fafb01f42e30318f3943bd61cb19b71af1f44f2 100644 (file)
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index 72181dfd759e643123f75d98c1e3ea55968b6e88..9047cd2c1c3cbf36096729537086c7bd6375b753 100644 (file)
--- a/src/tex2lyx/test/DummyDocument.lyx.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index 34a3fcb19de97cf1b0d22859d8a8e396c979f56d..0a65b4b58460e2385d59127ae2b4cce21bd1ddc0 100644 (file)
--- a/src/tex2lyx/test/Dummy~Document.lyx.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index d4fab857f7cfe1c94c066fbf67ce29eec84e901d..a3df25e67f7c0cba59790b773113274808aae9ea 100644 (file)
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index f8cce47d005c053500370bea9873d417a9c8d856..3b61d8b6ee039e1e82b4ae3102716ef950ac6f5d 100644 (file)
--- a/src/tex2lyx/test/algo2e.lyx.lyx
+++ b/src/tex2lyx/test/algo2e.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index 0ab6e5880bda8b415c304508ad3fe7a0af50ad0e..3588f93892067b9fe003fee52c1442fce6fa28dc 100644 (file)
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 89b81ff04011878c68799504be48b9d06abd8c29..382501b5868690f2791761dc738a5b8d115abb80 100644 (file)
--- a/src/tex2lyx/test/test-insets-basic.lyx.lyx
+++ b/src/tex2lyx/test/test-insets-basic.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index afe286b0747da0c00291b747406b024f3e0f9ca7..0bd282a3c377a2a4dfa3abf076956e4fa31ca631 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-memoir.lyx.lyx b/src/tex2lyx/test/test-memoir.lyx.lyx
index 8f834c542d4af8cbab347dfd2c1bf1a2cc98fc09..d992154a330d1cee74450c18b4deceaa98c1664f 100644 (file)
--- a/src/tex2lyx/test/test-memoir.lyx.lyx
+++ b/src/tex2lyx/test/test-memoir.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index 8653d742bee22d60877c56c54b6d162b616459be..9c44aa606bea24721d1d14513df666254ecf3325 100644 (file)
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/src/tex2lyx/test/test-modules.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index d301f7994966552441db5ffa5035f8f3a280da08..69d70215dacf054cfd6455b1df3c12945a628819 100644 (file)
--- a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
+++ b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-scr.lyx.lyx b/src/tex2lyx/test/test-scr.lyx.lyx
index 66536c2dfa7b17a383018a7906e940e383db7d3b..c87c474a43175c48ee4fd4b1987444a48216d4ed 100644 (file)
--- a/src/tex2lyx/test/test-scr.lyx.lyx
+++ b/src/tex2lyx/test/test-scr.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index b4f7823144890e4dbb628b228dcbf347da90e75e..6634c8f1379b15295c903daf628b501768a3fd10 100644 (file)
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index 77d8e19c23368b39ae26a33cff9a3e6c385c0d72..f943f10b07d3ce75523b1d9b3d9bf856a76e59e0 100644 (file)
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index 9b2e2b99bfe2306d94ff73aa1f166fdf3892fd23..9dca25cc9268dd66937cbaee04ab4c621bcc49a7 100644 (file)
--- a/src/tex2lyx/test/verbatim.lyx.lyx
+++ b/src/tex2lyx/test/verbatim.lyx.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.3
-\lyxformat 515
+\lyxformat 516
 \begin_document
 \begin_header
 \save_transient_properties true

diff --git a/src/version.h b/src/version.h
index 46c2ebc6f9f621a763a865310d4919a8c95431cd..15f687c1359280a6a79ad78f6927c9ebc78c3e2d 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 515 // uwestoehr: support for Urdu and Syriac
-#define LYX_FORMAT_TEX2LYX 515
+#define LYX_FORMAT_LYX 516 // Removed \inputenc value "pt254"
+#define LYX_FORMAT_TEX2LYX 516
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER