Allow Insetlayout for Branch inset (#8106).

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg173659.html

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 892261caa7b5e3bb88d0c41b1f6c2f6bdc61f294..644ca47b527e5e3ab2324d94649676f0ea9e27a3 100644 (file)
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -132,6 +132,7 @@ End
 \html_css_as_file 0
 \html_be_strict true
 \author -195340706 "Georg Baum" 
+\author 5863208 "ab" 
 \end_header
 
 \begin_body
@@ -14037,7 +14038,12 @@ status collapsed
 
 \end_inset
 
- indicates the inset whose layout is being defined, and here there are two
+ indicates the inset whose layout is being defined, and here there are 
+\change_inserted 5863208 1334489266
+three
+\change_deleted 5863208 1334489267
+two
+\change_unchanged
  cases.
 \end_layout
 
@@ -14314,6 +14320,65 @@ LyXType
 \end_inset
 
  entry, declaring which type of inset it defines.
+\change_inserted 5863208 1334489312
+
+\end_layout
+
+\begin_layout Enumerate
+
+\change_inserted 5863208 1334492248
+The layout for user specific branch is being defined.
+ In this case, 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted 5863208 1334489384
+<Type>
+\end_layout
+
+\end_inset
+
+ must be of the form 
+\begin_inset Quotes eld
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted 5863208 1334489392
+Branch:<name>
+\end_layout
+
+\end_inset
+
+
+\begin_inset Quotes erd
+\end_inset
+
+, where 
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted 5863208 1334489384
+name
+\end_layout
+
+\end_inset
+
+ may be be any valid identifier of branch defined in user's document.
+ The identifier may include spaces, but in that case the whole thing must
+ be wrapped in quotes.
+ The main purpose of this feature is to allow LaTeX wrapping around specific
+ branches as user needs.
+\change_unchanged
+
 \end_layout
 
 \begin_layout Standard

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index b34971507a2821a35fe59d18ae03eb8ee5987f40..8f8982fdfd822395ecf2e7dff9bd7d253dcfec78 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -134,7 +134,7 @@ enumitem
 \html_math_output 0
 \html_css_as_file 0
 \html_be_strict true
-\author 424524441 "rgheck" 
+\author 5863208 "ab" 
 \author 2090807402 "usti" 
 \end_header
 
@@ -29285,6 +29285,28 @@ Inside math, the same effect can be achieved using math macros, see the
 Math
 \emph default
  manual.
+\change_inserted 5863208 1334492666
+
+\end_layout
+
+\begin_layout Standard
+
+\change_inserted 5863208 1334493356
+Each type of branch is allowed to have its specific style defined in layout
+ files (e.g.
+ any branch inset can be automatically wrapped by your own LaTeX commands.).
+ For this advanced usage, please study Customization manual (in particular
+ section 
+\begin_inset Quotes eld
+\end_inset
+
+Flex insets and InsetLayout
+\begin_inset Quotes erd
+\end_inset
+
+).
+\change_unchanged
+
 \end_layout
 
 \begin_layout Section

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index 6eebac565b81942bc83887099c77fb6cf745c1ab..585538d2edaf62006897255a2071c0c6b0cf2fdf 100644 (file)
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -132,6 +132,9 @@ import os, re, string, sys
 # Incremented to format 38, 08 April 2012 by gb
 # Introduce LangPreamble and BabelPreamble for InsetLayout.
 
+# Incremented to format 39, 15 April 2012 by sanda
+# Introduce styling of branches via "InsetLayout Branch:".
+
 # Do not forget to document format change in Customization
 # Manual (section "Declaring a new text class").
 
@@ -139,7 +142,7 @@ import os, re, string, sys
 # development/tools/updatelayouts.sh script to update all
 # layout files to the new format.
 
-currentFormat = 38
+currentFormat = 39
 
 
 def usage(prog_name):
@@ -325,6 +328,10 @@ def convert(lines):
                 i += 1
             continue
 
+        if format == 38:
+          i += 1
+          continue
+
         if format == 37:
           i += 1
           continue

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 82740cba429dcd5bd371ed443ce45198892b2614..ee4181c7de74d7a40118dab2baf0bb4cfc512ab2 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -60,7 +60,7 @@ namespace lyx {
 // development/tools/updatelayouts.sh script, to update the format of
 // all of our layout files.
 //
-int const LAYOUT_FORMAT = 38; //gb : LangPreamble and BabelPreamble for InsetLayout
+int const LAYOUT_FORMAT = 39; //sanda branch styling
 
 namespace {
 

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 64029c0193dbb2faca889f7438d46478f8fa462b..6cc64ec8b28ec2b230d56b710047279f7306affe 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -109,7 +109,7 @@ private:
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
-       docstring layoutName() const { return from_ascii("Branch"); }
+       docstring layoutName() const { return from_ascii("Branch:") + branch(); }
        ///
        Inset * clone() const { return new InsetBranch(*this); }