stdlayouts.inc: support for verbatim*

fileformat change

diff --git a/development/FORMAT b/development/FORMAT
index d41b8b52de05986e87546c1f7592a8b3780863af..c4d9b4d02f31ff57115491a92245a16de60100ac 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,11 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.
 
 -----------------------
 
+2015-11-24 Uwe Stöhr <uwestoehr@web.de>
+       * Format incremented to 503
+         No new parameters.
+         Add environment "verbatim*" to stdlayouts.inc.
+
 2015-11-18 Uwe Stöhr <uwestoehr@web.de>
        * Format incremented to 502
          No new parameters.

diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc
index f8367ebd2c7b87db610cd3693303203214ebcdc5..4612cbdf2dfa81af5aaa886d787eb28ef4900c59 100644 (file)
--- a/lib/layouts/stdlayouts.inc
+++ b/lib/layouts/stdlayouts.inc
@@ -95,3 +95,8 @@ Style Verbatim
        HTMLItem              p
 End
 
+
+Style Verbatim*
+       CopyStyle             Verbatim
+       LatexName             verbatim*
+End

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 6916184e585aa0d9160475db4c9f3cb795d02217..d9ad0d6e41b1bf0b809be9ab49210af3328c3540 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -85,7 +85,7 @@ format_relation = [("0_06",    [200], minor_versions("0.6" , 4)),
                    ("1_6", list(range(277,346)), minor_versions("1.6" , 10)),
                    ("2_0", list(range(346,414)), minor_versions("2.0" , 8)),
                    ("2_1", list(range(414,475)), minor_versions("2.1" , 0)),
-                   ("2_2", list(range(475,503)), minor_versions("2.2" , 0))
+                   ("2_2", list(range(475,504)), minor_versions("2.2" , 0))
                   ]
 
 ####################################################################

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 074433f1260a6a40f29324e45092745517dc54ae..d986493e856703e4ad044613514b9ea5caa5bede 100644 (file)
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -814,8 +814,8 @@ def revert_cancel(document):
     revert_use_package(document, "cancel", cancel_commands, False)
 
 
-def revert_verbatim(document):
-    " Revert verbatim einvironments completely to TeX-code. "
+def revert_verbatim(document, starred):
+    " Revert verbatim environments completely to TeX-code. "
     i = 0
     consecutive = False
     subst_end = ['\end_layout', '', '\\begin_layout Plain Layout',
@@ -830,14 +830,32 @@ def revert_verbatim(document):
                    '\\begin_layout Plain Layout', '', '', '\\backslash',
                    'begin{verbatim}',
                    '\\end_layout', '', '\\begin_layout Plain Layout', '']
+    if starred:
+        subst_end = ['\end_layout', '', '\\begin_layout Plain Layout',
+                '\end_layout', '',
+                 '\\begin_layout Plain Layout', '', '',
+                 '\\backslash', '',
+                 'end{verbatim*}',
+                 '\\end_layout', '', '\\end_inset',
+                 '', '', '\\end_layout']
+        subst_begin = ['\\begin_layout Standard', '\\noindent',
+                       '\\begin_inset ERT', 'status open', '',
+                       '\\begin_layout Plain Layout', '', '', '\\backslash',
+                       'begin{verbatim*}',
+                       '\\end_layout', '', '\\begin_layout Plain Layout', '']
+
+    layout_name = "Verbatim"
+    if starred:
+        layout_name = "Verbatim*"
 
     while 1:
-        i = find_token(document.body, "\\begin_layout Verbatim", i)
+        i = find_token(document.body, "\\begin_layout %s" % (layout_name), i)
         if i == -1:
             return
         j = find_end_of_layout(document.body, i)
         if j == -1:
-            document.warning("Malformed LyX document: Can't find end of Verbatim layout")
+            document.warning("Malformed LyX document: Can't find end of %s layout" \
+              % (layout_name))
             i += 1
             continue
         # delete all line breaks insets (there are no other insets)

diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index e4d5387d661d4b7322070a16a5689c38d6bebbb5..b9ea26038282b47cc893af11477fb7e1d6067a8c 100644 (file)
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -31,7 +31,7 @@ import sys, os
 #  del_token, check_token, get_option_value
 
 from lyx2lyx_tools import add_to_preamble, put_cmd_in_ert, lyx2latex, \
-  length_in_bp#, \
+  length_in_bp
 #  insert_to_preamble, latex_length, revert_flex_inset, \
 #  revert_font_attrs, hex2ratio, str2bool
 
@@ -2156,6 +2156,11 @@ def revert_solution(document):
         i = j
 
 
+def revert_verbatim_star(document):
+    from lyx_2_1 import revert_verbatim
+    revert_verbatim(document, True)
+
+
 ##
 # Conversion hub
 #
@@ -2192,10 +2197,12 @@ convert = [
            [499, [convert_moderncv]],
            [500, []],
            [501, [convert_fontsettings]],
-           [502, []]
+           [502, []],
+           [503, []]
           ]
 
 revert =  [
+           [502, [revert_verbatim_star]],
            [501, [revert_solution]],
            [500, [revert_fontsettings]],
            [499, [revert_achemso]],

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 49c8dd517b930ed50be01937f36f77cb5dfd84ac..46b602a0f90e48dfcc26c13fdf4d3a1a989f122d 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 3da93b9c77f1b1a636891b0cebc534f79266cc66..1db5855838dc7f2c90eb539d7dd4026c1f6773d8 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index 10c82581d3cd4a0731c18c78f9c5d5fa5c48704c..effaf8b8255be040f3e738e1c55d7b33ccc94576 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index b590ee9470f02b63144bc10b8b84dd84315c62b0..cf3acba83c5d0743815815601d004ba4a67e1039 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index f5fe7ea80882fad9c4ff3b5794855f74b46e28ac..6685a0338e4d47702d5b9216d1c2d0a9889ae260 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index 59fd2b068d600a2f0bc18f21c212d22e6edf9df4..9bbecd3aeb16e197287cd21495b8d0a0aa03cfd3 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

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 649220448e16326a9cf35776f6e1567a3d0dea0a..5f56411a0597cdd1fad22496c9c980dfc26002a6 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/test-insets-basic.lyx.lyx b/src/tex2lyx/test/test-insets-basic.lyx.lyx
index 984660ad658a8f38414cd810cbc0484348ece2f5..366f7fb23fe707183de65258241e49c8e64ed01f 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index d8bac4e343b6d95379345ae79b90819bffbc96be..5b125a3e7a4aab0b786571c7580628dab0931455 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/test-memoir.lyx.lyx b/src/tex2lyx/test/test-memoir.lyx.lyx
index d05a2e20617ee878aeec14469d44a415017b1294..9be82a501375cf52d0fe66d6552a5c7d84be4052 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index 1a2dca71523eeb846fa5913df0d74983ec4065c5..fb49a443af20327b2860a2a47481aad02b609c7b 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index 22e57d7a9cacf27a7c5fbcef6e5ea80994d663a1..4a99ba8367ce2b3e201b75b900b93426141d3ed5 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/test-scr.lyx.lyx b/src/tex2lyx/test/test-scr.lyx.lyx
index a97578c813a26592a0a9aa6dfbe60698271c0692..ac150e635922cdbc9e0065c40202cfa9e8f4b908 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index 2f9c0954d0ffa499998a65dcd48b8e010974bbb9..d167f37fabf3aa8c8e6731212c68b4811bd93dc8 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index 68b2dc678a3798e071f007cf6bee6fd9f5b23239..935bced123e685b7f9981bc2ebe30b85e9a16d35 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index 3d1f60cce8e6719171eb54b2cbc41214c98f2d88..4a430493593ce6a54ed6fd4adfe6e9b9eb92da1a 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.2
-\lyxformat 502
+\lyxformat 503
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index ab4c75fc4d64ffc0de9ea6e7dd8babc3eea17c23..ecf6bf211055a19e8456a8cbe4fd3ccb015896d9 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -1555,15 +1555,25 @@ void parse_environment(Parser & p, ostream & os, bool outer,
                preamble.registerAutomaticallyLoadedPackage("verbatim");
        }
 
-       else if (name == "verbatim") {
+       else if (unstarred_name == "verbatim" || name == "verbatim*") {
                // FIXME: this should go in the generic code that
                // handles environments defined in layout file that
                // have "PassThru 1". However, the code over there is
                // already too complicated for my taste.
+               string ascii_name;
+               string env_name;
+               if (unstarred_name == "verbatim") {
+                       ascii_name = "Verbatim";
+                       env_name = "verbatim";
+               }
+               if (name == "verbatim*") {
+                       ascii_name = "Verbatim*";
+                       env_name = name;
+               }
                parent_context.new_paragraph(os);
                Context context(true, parent_context.textclass,
-                               &parent_context.textclass[from_ascii("Verbatim")]);
-               string s = p.verbatimEnvironment("verbatim");
+                               &parent_context.textclass[from_ascii(ascii_name)]);
+               string s = p.verbatimEnvironment(env_name);
                output_ert(os, s, context);
                p.skip_spaces();
        }

diff --git a/src/version.h b/src/version.h
index 0871b0a01eb07e27732b812187894ea545265f0d..fff8c5a0784357c826542303f70a6d9e464e7f1f 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 502 // uwestoehr: new environment "solution" in theorems
-#define LYX_FORMAT_TEX2LYX 502
+#define LYX_FORMAT_LYX 503 // uwestoehr: support for verbatim* environment
+#define LYX_FORMAT_TEX2LYX 503
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER