Implement forced local layouts

These should be used if any new style needs to be introduced in the stable
2.1 series: If the ForceLocal flag of the style is set, it will always be
written to the document header, so that even older 2.1 versions can read
and correctly output the document.

diff --git a/development/FORMAT b/development/FORMAT
index a9d62bd62e9c017286e456d5d6e99836983e8d89..82bdc6ccc7f477530440763fa530c119873599cb 100644 (file)
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,11 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.
 
 -----------------------
 
+2013-05-15 Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+       * Format incremented to 470
+         forced local layouts for future layout backward compatibility:
+         \begin_forced_local_layout, \end_forced_local_layout
+
 2013-03-23 Georg Baum  <Georg.Baum@post.rwth-aachen.de>
        * Format incremented to 469
          support for \caption* in longtables (fix bug 3209)

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index aa72508d4554e975ea45c485133bb7ce7b52f8ed..6059c60aa6b1b3e14ecebac0ddfdfec10cbfb397 100644 (file)
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -1,5 +1,5 @@
 #LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass scrbook
@@ -11901,6 +11901,77 @@ LabelFont
 \end_inset
 
 .
+\change_inserted -195340706 1364753581
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -195340706 1364753581
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -195340706 1364753581
+ForceLocal n
+\end_layout
+
+\end_inset
+
+ Used for backporting new styles to stable LyX versions.
+ The first stable version that supports this tag is LyX 2.1.0.
+ 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -195340706 1364753581
+n
+\end_layout
+
+\end_inset
+
+ is a number which may either be 0 (this is the default if the tag is not
+ given), -1 or any value greater than zero.
+ If the 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -195340706 1364753581
+ForceLocal
+\end_layout
+
+\end_inset
+
+ flag of a style is greater than zero, it will always be written to the
+ document header.
+ If a .lyx file is read, the style definitions from the document header are
+ added to the document class.
+ Therefore even older versions can handle the style.
+ The argument of 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -195340706 1364753581
+ForceLocal
+\end_layout
+
+\end_inset
+
+ is a version number: If such a style is read, and the version number is
+ less than the version number of the already existing style in the document
+ class, the new style is ignored.
+ If the version number is higher, the new style replaces the existing style.
+ A value of -1 means an infinite version number, i.e.
+ it is always used.
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description

diff --git a/lib/doc/Development.lyx b/lib/doc/Development.lyx
index f16e8bba3d03446a55ab191ab21ee04fa42b1627..5ad3fc7620a740ed879cf75efdbe8fecfc65d690 100644 (file)
--- a/lib/doc/Development.lyx
+++ b/lib/doc/Development.lyx
@@ -1,5 +1,5 @@
 #LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 462
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass scrbook
@@ -68,6 +68,7 @@ End
 \use_geometry false
 \use_package amsmath 1
 \use_package amssymb 1
+\use_package cancel 0
 \use_package esint 0
 \use_package mathdots 1
 \use_package mathtools 0
@@ -435,6 +436,95 @@ src/tex2lyx/TODO.txt
  recommendation were related to mixed version syntax, not ERT.
 \end_layout
 
+\begin_layout Section
+Backporting new styles to the stable version
+\end_layout
+
+\begin_layout Standard
+Starting with the stable LyX 2.1 branch, there is a mechanism in place to
+ backport new styles to the stable version without the need to update the
+ file format.
+ The basic idea is that the new style definition is automatically copied
+ to the document preamble, so that it can even be used by older minor revisions
+ that did not yet include the style.
+ To backport a new style to the stable version, the following steps are
+ needed:
+\end_layout
+
+\begin_layout Enumerate
+Add the line 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForceLocal -1
+\end_layout
+
+\end_inset
+
+ to the style definition in the development version.
+\end_layout
+
+\begin_layout Enumerate
+Copy the style definition to the stable version, but use 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForceLocal 1
+\end_layout
+
+\end_inset
+
+ instead.
+ If needed adjust the format to the one used by the stable version (see
+ the customization manual for details of the layout file format).
+\end_layout
+
+\begin_layout Enumerate
+For each update of the style in a later stable version, increase the argument
+ of 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForceLocal
+\end_layout
+
+\end_inset
+
+ by one (in the stable version, the development version should not be touched).
+\end_layout
+
+\begin_layout Standard
+For details about the 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+ForceLocal
+\end_layout
+
+\end_inset
+
+ flag see the customization manual.
+ No 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+lyx2lyx
+\end_layout
+
+\end_inset
+
+ support is needed for backported styles: Since the style of the development
+ version has an infinite version number, it will always be used.
+ Furthermore, since its version number is less than one, the style will
+ not be written anymore to the document header for files saved by the new
+ version.
+\end_layout
+
 \begin_layout Chapter
 Tests
 \end_layout

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 8b51b2e2030516a2420086fd95d8a6cc600e1c2f..4143dda06cddb77660ddbb8db16847542f37a7a4 100644 (file)
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -4093,6 +4093,40 @@ def revert_starred_caption(document):
       i = i + 1
 
 
+def revert_forced_local_layout(document):
+    i = 0
+    while True:
+        i = find_token(document.header, "\\begin_forced_local_layout", i)
+        if i == -1:
+            return
+        j = find_end_of(document.header, i, "\\begin_forced_local_layout", "\\end_forced_local_layout")
+        if j == -1:
+            # this should not happen
+            break
+        regexp = re.compile(r'\s*forcelocal', re.IGNORECASE)
+        k = find_re(document.header, regexp, i, j)
+        while k != -1:
+            del document.header[k]
+            j = j - 1
+            k = find_re(document.header, regexp, i, j)
+        k = find_token(document.header, "\\begin_local_layout", 0)
+        if k == -1:
+            document.header[i] = "\\begin_local_layout"
+            document.header[j] = "\\end_local_layout"
+        else:
+            l = find_end_of(document.header, k, "\\begin_local_layout", "\\end_local_layout")
+            if j == -1:
+                # this should not happen
+                break
+            lines = document.header[i+1 : j]
+            if k > i:
+                document.header[k+1 : k+1] = lines
+                document.header[i   : j  ] = []
+            else:
+                document.header[i   : j  ] = []
+                document.header[k+1 : k+1] = lines
+
+
 ##
 # Conversion hub
 #
@@ -4154,10 +4188,12 @@ convert = [
            [466, []],
            [467, []],
            [468, []],
-           [469, []]
+           [469, []],
+           [470, []] 
           ]
 
 revert =  [
+           [469, [revert_forced_local_layout]],
            [468, [revert_starred_caption]],
            [467, [revert_mbox_fbox]],
            [466, [revert_iwona_fonts]],

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index b1224a497dff04e0c9c91b6557138d631e3b1f7a..1a39618f61cb94a7d25696c3b6deb3363544efef 100644 (file)
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -154,6 +154,9 @@ import os, re, string, sys
 # Incremented to format 45, 12 February 2013 by rgh
 # New Tag "NoInsetLayout"
 
+# Incremented to format 46, 15 May 2013 by gb
+# New Tag "ForceLocal"
+
 # Do not forget to document format change in Customization
 # Manual (section "Declaring a new text class").
 
@@ -161,7 +164,7 @@ import os, re, string, sys
 # development/tools/updatelayouts.sh script to update all
 # layout files to the new format.
 
-currentFormat = 45
+currentFormat = 46
 
 
 def usage(prog_name):
@@ -355,7 +358,7 @@ def convert(lines):
                     # nothing to do
                     return format
                 else:
-                    error('Cannot convert file format %s' % format)
+                    error('Cannot convert file format %s to %s' % (format, currentFormat))
             else:
                 lines.insert(i, "Format 2")
                 only_comment = 0
@@ -378,7 +381,7 @@ def convert(lines):
                 i += 1
             continue
 
-        if format == 44:
+        if format == 44 or format == 45:
             # nothing to do.
             i += 1
             continue

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 43b5ecd792f76065950c61e4439f156426260392..3cb28da1267bf4b7394e3bffeebc9f07068f9d71 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -836,7 +836,8 @@ int Buffer::readHeader(Lexer & lex)
        params().html_latex_end.clear();
        params().html_math_img_scale = 1.0;
        params().output_sync_macro.erase();
-       params().local_layout.clear();
+       params().setLocalLayout(string(), false);
+       params().setLocalLayout(string(), true);
 
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index bb2391ca115926533f3487f9fd6c511f0ebb8dba..b02b3708ba1f9dcce9e6276fedd15c6d120a0f35 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -627,7 +627,9 @@ string BufferParams::readToken(Lexer & lex, string const & token,
        } else if (token == "\\begin_preamble") {
                readPreamble(lex);
        } else if (token == "\\begin_local_layout") {
-               readLocalLayout(lex);
+               readLocalLayout(lex, false);
+       } else if (token == "\\begin_forced_local_layout") {
+               readLocalLayout(lex, true);
        } else if (token == "\\begin_modules") {
                readModules(lex);
        } else if (token == "\\begin_removed_modules") {
@@ -990,6 +992,7 @@ void BufferParams::writeFile(ostream & os) const
           << convert<string>(maintain_unincluded_children) << '\n';
 
        // local layout information
+       string const local_layout = getLocalLayout(false);
        if (!local_layout.empty()) {
                // remove '\n' from the end
                string const tmplocal = rtrim(local_layout, "\n");
@@ -997,6 +1000,14 @@ void BufferParams::writeFile(ostream & os) const
                   << tmplocal
                   << "\n\\end_local_layout\n";
        }
+       string const forced_local_layout = getLocalLayout(true);
+       if (!forced_local_layout.empty()) {
+               // remove '\n' from the end
+               string const tmplocal = rtrim(forced_local_layout, "\n");
+               os << "\\begin_forced_local_layout\n"
+                  << tmplocal
+                  << "\n\\end_forced_local_layout\n";
+       }
 
        // then the text parameters
        if (language != ignore_language)
@@ -2102,13 +2113,15 @@ void BufferParams::makeDocumentClass()
 
        doc_class_ = getDocumentClass(*baseClass(), mods);
 
-       if (!local_layout.empty()) {
-               TextClass::ReturnValues success =
-                       doc_class_->read(local_layout, TextClass::MODULE);
-               if (success != TextClass::OK && success != TextClass::OK_OLDFORMAT) {
-                       docstring const msg = _("Error reading internal layout information");
-                       frontend::Alert::warning(_("Read Error"), msg);
-               }
+       TextClass::ReturnValues success = TextClass::OK;
+       if (!forced_local_layout_.empty())
+               success = doc_class_->read(forced_local_layout_, TextClass::MODULE);
+       if (!local_layout_.empty() &&
+           (success == TextClass::OK || success == TextClass::OK_OLDFORMAT))
+               success = doc_class_->read(local_layout_, TextClass::MODULE);
+       if (success != TextClass::OK && success != TextClass::OK_OLDFORMAT) {
+               docstring const msg = _("Error reading internal layout information");
+               frontend::Alert::warning(_("Read Error"), msg);
        }
 }
 
@@ -2125,6 +2138,24 @@ bool BufferParams::citationModuleCanBeAdded(string const & modName) const
 }
 
 
+std::string BufferParams::getLocalLayout(bool forced) const
+{
+       if (forced)
+               return doc_class_->forcedLayouts();
+       else
+               return local_layout_;
+}
+
+
+void BufferParams::setLocalLayout(string const & layout, bool forced)
+{
+       if (forced)
+               forced_local_layout_ = layout;
+       else
+               local_layout_ = layout;
+}
+
+
 bool BufferParams::addLayoutModule(string const & modName)
 {
        LayoutModuleList::const_iterator it = layout_modules_.begin();
@@ -2342,13 +2373,19 @@ void BufferParams::readPreamble(Lexer & lex)
 }
 
 
-void BufferParams::readLocalLayout(Lexer & lex)
+void BufferParams::readLocalLayout(Lexer & lex, bool forced)
 {
-       if (lex.getString() != "\\begin_local_layout")
+       string const expected = forced ? "\\begin_forced_local_layout" :
+                                        "\\begin_local_layout";
+       if (lex.getString() != expected)
                lyxerr << "Error (BufferParams::readLocalLayout):"
                        "consistency check failed." << endl;
 
-       local_layout = lex.getLongString("\\end_local_layout");
+       if (forced)
+               forced_local_layout_ =
+                       lex.getLongString("\\end_forced_local_layout");
+       else
+               local_layout_ = lex.getLongString("\\end_local_layout");
 }
 
 

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 2a669d0ac167b8b8867a318789389363bdb533d6..9c558a6f5e2afaa58d15ada0b3fcf79886eaeb45 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -162,6 +162,10 @@ public:
        void clearLayoutModules() { layout_modules_.clear(); }
        /// Clear the removed module list
        void clearRemovedModules() { removed_modules_.clear(); }
+       /// Get the local layouts
+       std::string getLocalLayout(bool) const;
+       /// Set the local layouts
+       void setLocalLayout(std::string const &, bool);
 
        /// returns \c true if the buffer contains a LaTeX document
        bool isLatex() const;
@@ -305,8 +309,6 @@ public:
        ///
        std::string preamble;
        ///
-       std::string local_layout;
-       ///
        std::string options;
        /// use the class options defined in the layout?
        bool use_default_options;
@@ -483,7 +485,7 @@ private:
        ///
        void readPreamble(Lexer &);
        ///
-       void readLocalLayout(Lexer &);
+       void readLocalLayout(Lexer &, bool);
        ///
        void readLanguage(Lexer &);
        ///
@@ -513,6 +515,10 @@ private:
        /// this is for modules that are required by the document class but that
        /// the user has chosen not to use
        std::list<std::string> removed_modules_;
+       /// The local layouts without the forced ones
+       std::string local_layout_;
+       /// Forced local layouts only for reading (use getLocalLayout() instead)
+       std::string forced_local_layout_;
 
        /// the list of included children (for includeonly)
        std::list<std::string> included_children_;

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 5ac163a532fd1d9e51611645bba72787bd62b32f..46035513c7bd163a28d15c6505941f48c2001d12 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -104,6 +104,7 @@ enum LayoutTags {
        LT_REFPREFIX,
        LT_RESETARGS,
        LT_RIGHTDELIM,
+       LT_FORCELOCAL,
        LT_INTITLE // keep this last!
 };
 
@@ -145,11 +146,32 @@ Layout::Layout()
        htmlforcecss_ = false;
        htmltitle_ = false;
        spellcheck = true;
+       forcelocal = 0;
        itemcommand_ = "item";
 }
 
 
 bool Layout::read(Lexer & lex, TextClass const & tclass)
+{
+       // If this is an empty layout, or if no force local version is set,
+       // we know that we will not discard the stuff to read
+       if (forcelocal == 0)
+               return readIgnoreForcelocal(lex, tclass);
+       Layout tmp(*this);
+       tmp.forcelocal = 0;
+       bool const ret = tmp.readIgnoreForcelocal(lex, tclass);
+       // Keep the stuff if
+       // - the read version is higher
+       // - both versions are infinity (arbitrary decision)
+       // - the file did not contain any local version (needed for not
+       //   skipping user defined local layouts)
+       if (tmp.forcelocal <= 0 || tmp.forcelocal > forcelocal)
+               *this = tmp;
+       return ret;
+}
+
+
+bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass)
 {
        // This table is sorted alphabetically [asierra 30March96]
        LexerKeyword layoutTags[] = {
@@ -166,6 +188,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                { "endlabelstring", LT_ENDLABELSTRING },
                { "endlabeltype",   LT_ENDLABELTYPE },
                { "font",           LT_FONT },
+               { "forcelocal",     LT_FORCELOCAL },
                { "freespacing",    LT_FREE_SPACING },
                { "htmlattr",       LT_HTMLATTR },
                { "htmlforcecss",   LT_HTMLFORCECSS },
@@ -582,6 +605,10 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                case LT_SPELLCHECK:
                        lex >> spellcheck;
                        break;
+
+               case LT_FORCELOCAL:
+                       lex >> forcelocal;
+                       break;
                }
        }
        lex.popTable();
@@ -1093,17 +1120,17 @@ void Layout::write(ostream & os) const
        if (!preamble_.empty())
                os << "\tPreamble\n\t"
                   << to_utf8(subst(rtrim(preamble_, "\n"),
-                                         from_ascii("\n"), from_ascii("\n\t")))
+                                   from_ascii("\n"), from_ascii("\n\t")))
                   << "\n\tEndPreamble\n";
        if (!langpreamble_.empty())
                os << "\tLangPreamble\n\t"
                   << to_utf8(subst(rtrim(langpreamble_, "\n"),
-                                         from_ascii("\n"), from_ascii("\n\t")))
+                                   from_ascii("\n"), from_ascii("\n\t")))
                   << "\n\tEndLangPreamble\n";
        if (!babelpreamble_.empty())
                os << "\tBabelPreamble\n\t"
                   << to_utf8(subst(rtrim(babelpreamble_, "\n"),
-                                         from_ascii("\n"), from_ascii("\n\t")))
+                                   from_ascii("\n"), from_ascii("\n\t")))
                   << "\n\tEndBabelPreamble\n";
        switch (labeltype) {
        case LABEL_ABOVE:
@@ -1290,6 +1317,7 @@ void Layout::write(ostream & os) const
                   << "\n\tEndPreamble\n";
        os << "\tHTMLTitle " << htmltitle_ << "\n"
              "\tSpellcheck " << spellcheck << "\n"
+             "\tForceLocal " << forcelocal << "\n"
              "End\n";
 }
 

diff --git a/src/Layout.h b/src/Layout.h
index b7c6e708cd1f1c02db73fb28ec3a8b6ce212ee16..913546fd744c37e3f993b13390e1f01f017cb871 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -310,9 +310,23 @@ public:
 
        /// Is this spellchecked?
        bool spellcheck;
+       /**
+        * Should this layout definition always be written to the document preamble?
+        * Possible values are:
+        *   0: Do not enforce local layout
+        * >=1: Enforce local layout with version forcelocal
+        *  -1: Enforce local layout with infinite version
+        * On reading, the forced local layout is only used if its version
+        * number is greater than the version number of the same layout in the
+        * document class. Otherwise, it is ignored.
+        */
+       int forcelocal;
 
 
 private:
+       /// Reads a layout definition from file
+       /// \return true on success.
+       bool readIgnoreForcelocal(Lexer &, TextClass const &);
        /// generates the default CSS for this layout
        void makeDefaultCSS() const;
        ///

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index b55e8a2f0a4863acad97e02bd82e38059dcf4dab..8ebe0e32f278edb73b3f98148d8c294c8cb4efeb 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -61,7 +61,7 @@ namespace lyx {
 // development/tools/updatelayouts.sh script, to update the format of
 // all of our layout files.
 //
-int const LAYOUT_FORMAT = 45; // rgh: New Tag "NoInsetLayout"
+int const LAYOUT_FORMAT = 46; // gb: New Tag "ForceLocal"
 
 namespace {
 
@@ -1376,6 +1376,24 @@ bool DocumentClass::addLayoutIfNeeded(docstring const & n) const
 }
 
 
+string DocumentClass::forcedLayouts() const
+{
+       ostringstream os;
+       bool first = true;
+       const_iterator const e = end();
+       for (const_iterator i = begin(); i != e; ++i) {
+               if (i->forcelocal > 0) {
+                       if (first) {
+                               os << "Format " << LAYOUT_FORMAT << '\n';
+                               first = false;
+                       }
+                       i->write(os);
+               }
+       }
+       return os.str();
+}
+
+
 InsetLayout const & DocumentClass::insetLayout(docstring const & name) const
 {
        // FIXME The fix for the InsetLayout part of 4812 would be here:

diff --git a/src/TextClass.h b/src/TextClass.h
index 9475b621e573786ebbaacaf66679859c1a3dba5e..e4c2461543af7fb4af979a4ba0590b503b77aa65 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -399,6 +399,8 @@ public:
        /// add a new layout \c name if it does not exist in layoutlist_
        /// \return whether we had to add one.
        bool addLayoutIfNeeded(docstring const & name) const;
+       /// Forced layouts in layout file syntax
+       std::string forcedLayouts() const;
 
        ///////////////////////////////////////////////////////////////////
        // accessors

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index e74c1934c4f78c0baa5e58b5b53291d68ad3b66b..e763aad4a9c7b95a922285862c3c132393cacba6 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -517,7 +517,7 @@ LocalLayout::LocalLayout() : current_id_(0), validated_(false)
 
 void LocalLayout::update(BufferParams const & params, BufferId id)
 {
-       QString layout = toqstr(params.local_layout);
+       QString layout = toqstr(params.getLocalLayout(false));
        // Nothing to do if the params and preamble are unchanged.
        if (id == current_id_
                && layout == locallayoutTE->document()->toPlainText())
@@ -533,7 +533,7 @@ void LocalLayout::update(BufferParams const & params, BufferId id)
 void LocalLayout::apply(BufferParams & params)
 {
        string const layout = fromqstr(locallayoutTE->document()->toPlainText());
-       params.local_layout = layout;
+       params.setLocalLayout(layout, false);
 }
 
 

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 0c3968a676cff230e2ab1089f23c567a1877df4a..014de532324a72770b16deadb707ff64bfa95469 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index d62a98a9660b9077c1562801a8c1e9930ff88072..35fdfe4fb9df1af9c0e682b5e8fbc9587b3f3b5a 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/Dummy Document.lyx b/src/tex2lyx/test/Dummy Document.lyx
index f5f506eb92be96484b7817b4cb368988818b4355..7e4ee7e45f2ebb6d7f29216ec4210057b2dc50e5 100644 (file)
--- a/src/tex2lyx/test/Dummy Document.lyx
+++ b/src/tex2lyx/test/Dummy Document.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/DummyDocument.lyx b/src/tex2lyx/test/DummyDocument.lyx
index 9cdbd3bfa8a0b0cb030bc1fe17daac0c92a3c066..dfd8ff65d240bc24d2a129a88e6c6dfe176630cd 100644 (file)
--- a/src/tex2lyx/test/DummyDocument.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/Dummy~Document.lyx b/src/tex2lyx/test/Dummy~Document.lyx
index 22e3d7fb56e3002915e51dcb92ad8aa0acb9f0db..c0cfb533c472aa2cac18283c353e2ac317b2106c 100644 (file)
--- a/src/tex2lyx/test/Dummy~Document.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index 5561d4bf9b93061784eaa36505ed7d487e013485..6efcae67d0523c5c64564cc92d5d0bc3c6fdcab3 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

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 720143a253b4f7ce42ed08068089cff3e7c52206..e7bb882aad389fa0d75bae351775924bcae28f6f 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 6e79b6af5139694e7bf4af7316c9f243fa93c185..0c37bf351f7b2682a18cc8689d59616c7c048f2d 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index 40bab9519949ea3f1f27515c786f509a590d3509..7242b14d8d1bfaffca27d5e40fb783ee4723eea4 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass amsart

diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index c072e31b2347650d6e90069dd893aebf60d8999e..7f4e9509ad7a5e426f670aa5092368aa410951c1 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass book

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index cbddc698887dfbd2fc544500527f5e02e5fe7707..61be9cf687f5b35c8bacc412295e0f4450d38906 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index b86ec8fb6900ddb2523ca8a1cc285163455712de..9f6d70dbb1491063f91f98cdacda96bb41527f83 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index 9e13dccdca11d0f9406df720e918821a0e99298c..e28e6131438315aa4b4a076eb8707a13d068dfe3 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.1.0dev
-\lyxformat 469
+\lyxformat 470
 \begin_document
 \begin_header
 \textclass article

diff --git a/src/version.h b/src/version.h
index 0aee452a278c6f6a7d197dd466525ed9717c63ee..66aa0519d352abd082da86fe31f22ecc328fbe71 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -30,8 +30,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 469 // gb: \caption*{}
-#define LYX_FORMAT_TEX2LYX 469 // gb: \caption*{}
+#define LYX_FORMAT_LYX 470 // gb: new tag begin_forced_local_layout/end_forced_local_layout
+#define LYX_FORMAT_TEX2LYX 470 // gb: new tag begin_forced_local_layout/end_forced_local_layout
 
 #if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
 #ifndef _MSC_VER