[LyX/2.3.x] Disallow paragraph customization in some single-par charstyle insets

[Juergen Spitzmueller]

commit a359a53eb69b69dca05cd6b413555882353c83bb
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Fri May 11 13:47:27 2018 +0200

    Disallow paragraph customization in some single-par charstyle insets
    
    Fixes: #9192
    (cherry picked from commit 7a5184fd87e747b089acf4563ebacabe2e1f121a)
---
 lib/layouts/beamer.layout      |    9 +++++++++
 lib/layouts/logicalmkup.module |   12 ++++++++----
 status.23x                     |    3 +++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index ed15d26..1bf305e 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1399,6 +1399,7 @@ InsetLayout Flex:Bold
     PassThru       1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Emphasize
@@ -1418,6 +1419,7 @@ InsetLayout Flex:Emphasize
     PassThru       1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Alert
@@ -1437,6 +1439,7 @@ InsetLayout Flex:Alert
     PassThru       1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Structure
@@ -1456,6 +1459,7 @@ InsetLayout Flex:Structure
     PassThru       1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Only
@@ -1476,6 +1480,7 @@ InsetLayout Flex:Only
     AutoInsert     1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Uncover
@@ -1496,6 +1501,7 @@ InsetLayout Flex:Uncover
     AutoInsert     1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Visible
@@ -1516,6 +1522,7 @@ InsetLayout Flex:Visible
     AutoInsert     1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Invisible
@@ -1536,6 +1543,7 @@ InsetLayout Flex:Invisible
     AutoInsert     1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Alternative
@@ -1560,6 +1568,7 @@ InsetLayout Flex:Alternative
     Mandatory      1
   EndArgument
   ResetsFont       true
+  CustomPars       false
 End
 
 InsetLayout Flex:Beamer_Note
diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module
index 06d1696..afca29c 100644
--- a/lib/layouts/logicalmkup.module
+++ b/lib/layouts/logicalmkup.module
@@ -25,7 +25,8 @@ InsetLayout Flex:Noun
                        font-family: sans-serif;
                }
        EndHTMLStyle
-       ResetsFont true
+       ResetsFont            true
+       CustomPars            false
 End
 
 
@@ -39,7 +40,8 @@ InsetLayout Flex:Emph
        EndFont
        InToc                 true
        HTMLTag               em
-       ResetsFont true
+       ResetsFont            true
+       CustomPars            false
 End
 
 
@@ -56,7 +58,8 @@ InsetLayout Flex:Strong
        EndPreamble
        InToc                 true
        HTMLTag               strong
-       ResetsFont true
+       ResetsFont            true
+       CustomPars            false
 End
 
 
@@ -73,6 +76,7 @@ InsetLayout Flex:Code
        EndPreamble
        InToc                 true
        HTMLTag               code
-       ResetsFont true
+       ResetsFont            true
+       CustomPars            false
        Spellcheck            false
 End
diff --git a/status.23x b/status.23x
index 60faa62..1691a9c 100644
--- a/status.23x
+++ b/status.23x
@@ -61,6 +61,9 @@ What's new
 - When cloning a buffer, do not start from a parent if it is not the
   current master (e.g., when compiling a child alone).
 
+-  Disallow paragraph customization in some single-par charstyle insets
+   (bug 9192).
+
 
 * USER INTERFACE