achemso.layout: add a flex inset

- this one is in achemso since version 3.8

- fileformat change

diff --git a/development/FORMAT b/development/FORMAT
index c7af47a1f84d4251ccc0218b15b257eeb094d5c5..7ec9be71bffacb7b721d937de53ad3ac0fa64d0c 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,12 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.
 
 -----------------------
 
+2015-11-04 Uwe Stöhr <uwestoehr@web.de>
+       * Format incremented to 500
+         No new parameters.
+         achemso layout improvement:
+         - new flex inset Latin
+
 2015-10-27 Uwe Stöhr <uwestoehr@web.de>
        * Format incremented to 499
          No new parameters.

diff --git a/lib/examples/achemso.lyx b/lib/examples/achemso.lyx
index 512c894a3694264be201227fc25dd7f50fc2aa92..c4af5975b0b433879fad313725cd885f6e9e2b9e 100644 (file)
--- a/lib/examples/achemso.lyx
+++ b/lib/examples/achemso.lyx
@@ -1,7 +1,8 @@
-#LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 474
+#LyX 2.2 created this file. For more info see http://www.lyx.org/
+\lyxformat 500
 \begin_document
 \begin_header
+\origin /systemlyxdir/examples/
 \textclass achemso
 \begin_preamble
 % If issues arise when submitting your manuscript, you may want to
@@ -84,8 +85,9 @@ theorems-ams
 status open
 
 \begin_layout Plain Layout
-This is an example LyX file for articles to be submitted to journals of
- the American Chemistry Society (ACS).
+This is an example \SpecialChar LyX
+ file for articles to be submitted to journals of the
+ American Chemistry Society (ACS).
  For general infos see 
 \begin_inset Flex URL
 status open
@@ -124,7 +126,8 @@ Note:
 \end_layout
 
 \begin_layout Title
-A demonstration of the achemso LaTeX class
+A demonstration of the achemso \SpecialChar LaTeX
+ class
 \begin_inset Argument 1
 status open
 
@@ -257,7 +260,8 @@ IR,NMR,UV
 \end_layout
 
 \begin_layout Keywords
-American Chemical Society, LaTeX
+American Chemical Society, \SpecialChar LaTeX
+
 \end_layout
 
 \begin_layout Abstract
@@ -363,6 +367,25 @@ key "Pople2003"
 \end_inset
 
 .
+ Notice that 
+\begin_inset Quotes eld
+\end_inset
+
+
+\begin_inset Flex Latin
+status open
+
+\begin_layout Plain Layout
+et al.
+\end_layout
+
+\end_inset
+
+
+\begin_inset Quotes erd
+\end_inset
+
+ is auto-formatted.
 \end_layout
 
 \begin_layout Standard
@@ -392,7 +415,7 @@ status open
 This is a bibnote; its text will be moved the the references section.
  Bibnotes are inserted with the menu 
 \family sans
-Insert\SpecialChar \menuseparator
+Insert\SpecialChar menuseparator
 Custom Insets
 \family default
 .
@@ -422,7 +445,8 @@ Some Infos
 \end_layout
 
 \begin_layout Standard
-Besides the standard figure and table floats, the achemso LaTeX-class provides
+Besides the standard figure and table floats, the achemso \SpecialChar LaTeX
+-class provides
  scheme, chart, and graph floats.
 \end_layout
 

diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout
index 28d065a737500ca8e67df973c7cd6b256cc972a0..d11b2741ab1bbcb2b7f97528faf1bc5f0b0ad50b 100644 (file)
--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@@ -1,7 +1,7 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass[achemso,caption.sty,courier.sty,cleveref.sty,float.sty,helvet.sty,mathptmx.sty,mciteplus.sty,natbib.sty,natmove.sty,setspace.sty,xkeyval.sty]{American Chemical Society (ACS)}
 #  \DeclareCategory{Articles}
-# textclass definition file for achemso 3.7c
+# textclass definition file for achemso 3.8 and 3.9
 # Author: Uwe Stöhr (uwestoehr@web.de)
 
 Format 54
@@ -295,3 +295,10 @@ InsetLayout Flex:Chemistry
        EndFont
        MultiPar                false
 End
+
+InsetLayout Flex:Latin
+       CopyStyle               Flex:Bibnote
+       LatexName               latin
+       LabelString             "Latin"
+       MultiPar                false
+End

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 5346eec2541c01fe23813951a72d17f1ab40db73..ad13afe224ce9bda6e03e8b1de70d987e07e17fe 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,500)), minor_versions("2.2" , 0))
+                   ("2_2", list(range(475,501)), minor_versions("2.2" , 0))
                   ]
 
 ####################################################################

diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index 7dd051377d15ab930ad2978099d03109b1f8fe2b..47bed398414818463d202a4c5c00032148411f42 100644 (file)
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -1992,6 +1992,30 @@ def convert_moderncv(document):
     i1 += 1
     i2 += 1
 
+
+def revert_achemso(document):
+  " Reverts the flex inset Latin to TeX code "
+  i = 0
+  j = 0
+  while True:
+    i = find_token(document.body, "\\begin_inset Flex Latin", i)
+    if i != -1:
+      j = find_end_of_inset(document.body, i)
+    else:
+      return
+    if j != -1:
+      beginPlain = find_token(document.body, "\\begin_layout Plain Layout", i)
+      endPlain = find_end_of_layout(document.body, beginPlain)
+      content = lyx2latex(document, document.body[beginPlain : endPlain])
+      #content = lyx2latex(document, document.body[i : j + 1])
+      document.body[i:j + 1] = put_cmd_in_ert("\\latin{" + content + "}")
+      #del document.body[i : j + 1]
+    else:
+      document.warning("Malformed LyX document: Can't find end of flex inset Latin")
+      return
+    i += 1
+
+
 ##
 # Conversion hub
 #
@@ -2025,10 +2049,12 @@ convert = [
            [496, [convert_nounzip]],
            [497, [convert_external_bbox]],
            [498, []],
-           [499, [convert_moderncv]]
+           [499, [convert_moderncv]],
+           [500, []]
           ]
 
 revert =  [
+           [499, [revert_achemso]],
            [498, [revert_moderncv_1, revert_moderncv_2]],
            [497, [revert_tcolorbox_1, revert_tcolorbox_2,
                   revert_tcolorbox_3, revert_tcolorbox_4, revert_tcolorbox_5,

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 8c6724fbd688ee91f63b488e169dd73e9bef659b..552ca215684da1b50ec0e347ef14a49e373fa352 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 499
+\lyxformat 500
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 355a3ee232e6ae5a1bb3633ad616f0571d6e2ced..f6c071123f0402f62247b35249d2640a01da4e01 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 499
+\lyxformat 500
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index a105c6ac7d5fd0fe7971e919a93cdee86386b06e..bd0b641574e0e62e4b1c0aa71f6db1367c470234 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 499
+\lyxformat 500
 \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 85d416a5c05613d91e83aaed92d01767ab08d216..89a02ed0cb53b4d1aea7e270fa7d3948f5d3c88f 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 499
+\lyxformat 500
 \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 0fb0377ad6ba8b3c40862c2d279ab3e011422391..64d4d2116b8b60d04328be195712c0d6482777dd 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 499
+\lyxformat 500
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index fe6ec09cd117c5e308e2b291fc08ba826ec4188d..5a32462cf32fdc759754827aa88278d0a1a34fa8 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 499
+\lyxformat 500
 \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 35e6bd41bccc9f633c90e8f9c46cddc717b6ea98..d91072a8cca5ad8f1b055fd98407f821804a03e1 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 499
+\lyxformat 500
 \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 4c9e136d378af1830f72ff61a19eafd4bcae83b4..e0d6e73b17862d4d272d717461ae51ef2315378f 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 499
+\lyxformat 500
 \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 f754e351d3f00c77d4d892f614a851c06c17a15f..2ebeb1bb71f2b8c344b29152159dd91a1772ae23 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 499
+\lyxformat 500
 \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 7f0e210e6fc1cfa8e0f4d75166186da6dfd7e842..32fa929c03b0d5e12fc050da36eebb69c487c0b6 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 499
+\lyxformat 500
 \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 16d4845d27cbf0d93167f52d4458181d6e9b471e..a56bfb3c85582638c1c87006cefac05432c4a832 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 499
+\lyxformat 500
 \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 52bc01a730d7abfad00b8ca645339f9e8051b79d..5bcf213e6736a644a9ac61750ac0b4d1f450df33 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 499
+\lyxformat 500
 \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 555267b649ece5df6137eabaa90d9064f04346ab..2f02590e9840630718bca07dd69dcc296df65122 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 499
+\lyxformat 500
 \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 2a60201eb44835b0fa9584852fe17dc1ccac7fd4..45d10356257d6d1a79042fe33ef0a6d410e79437 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 499
+\lyxformat 500
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index 27dee5eb28a0bacaed859ed20f2af12c97bfdf76..4b219a67471e0f9bb119c1955f745b31f9d91eb1 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 499
+\lyxformat 500
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index 568b5d5c95be918014235b8f549abbcde9b3229f..d6a05c3532287075e48c8688968e20fdeb70af1b 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 499
+\lyxformat 500
 \begin_document
 \begin_header
 \origin roundtrip

diff --git a/src/version.h b/src/version.h
index 7fb1e552aaa8ffa3c94afc080e1a5024c30165f6..04f4b82b1f1d04d94c65f8e43288f12b91b2eac2 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 499 // uwestoehr: moderncv module improvements
-#define LYX_FORMAT_TEX2LYX 499
+#define LYX_FORMAT_LYX 500 // uwestoehr: achemso layout improvement
+#define LYX_FORMAT_TEX2LYX 500
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER