From f3c1a4fbeb38d39bbbee0cc748c15d3a85febfb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Wed, 27 May 2015 02:13:04 +0200
Subject: [PATCH] jss.layout: remove superfluous Appendix style

- remove also the new superfluous lyx2lyx code
- update the template file
---
 lib/layouts/jss.layout        | 21 ++-------------------
 lib/lyx2lyx/lyx_2_2.py        | 14 +-------------
 lib/templates/JSS-article.lyx | 25 +++++++++++++++----------
 3 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout
index cbb36e1613..0aab2aedb0 100644
--- a/lib/layouts/jss.layout
+++ b/lib/layouts/jss.layout
@@ -20,6 +20,8 @@ AddToPreamble
     %\usepackage{Sweave}
 EndPreamble
 
+NoStyle "Right Address"
+
 Style Section
 	LabelString			\thesection.
 End
@@ -227,22 +229,3 @@ Style "Code Output"
 	LatexName			CodeOutput
 	LabelString			"Code Output"
 End
-
-Style Appendix
-	LatexType			Environment
-	LatexName			appendix
-	Category			BackMatter
-	TopSep				0.6
-	BottomSep			0.6
-	Margin				First_Dynamic
-	Align				Block
-	NextNoIndent		1
-	LabelType			Above
-	LabelString			"Appendix"
-	LabelSep			M
-	LabelFont
-	  Series			Bold
-	  Shape				Up
-	  Size				large
-	EndFont
-End
diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py
index b977e69825..d9d64e6f8f 100644
--- a/lib/lyx2lyx/lyx_2_2.py
+++ b/lib/lyx2lyx/lyx_2_2.py
@@ -1375,8 +1375,7 @@ def revert_jss(document):
       m = 0
       j = 0
       k = 0
-      l = 0
-      while m != -1 or j != -1 or h != -1 or k != -1 or l != -1:
+      while m != -1 or j != -1 or h != -1 or k != -1:
         # \CodeChunk
         if h != -1:
           h = find_token(document.body, "\\begin_layout Code Chunk", h)
@@ -1423,17 +1422,6 @@ def revert_jss(document):
           document.body[k + 1 : k] = ["\\end_layout", "", "\\begin_layout Standard"]
           document.body[k : k + 1] = put_cmd_in_ert("\\begin{CodeOutput}")
           k = k + 1
-        if l != -1:
-          l = find_token(document.body, "\\begin_layout Appendix", l)
-        if l != -1:
-          endl = find_end_of_layout(document.body, l)
-          document.body[endl : endl + 1] = ["\\end_layout", "", "\\begin_layout Standard"]
-          document.body[endl + 3 : endl + 4] = put_cmd_in_ert("\\end{appendix}")
-          document.body[endl + 13 : endl + 13] = ["\\end_layout", ""]
-          document.body[l + 1 : l] = ["\\end_layout", "", "\\begin_layout Standard"]
-          document.body[l : l + 1] = put_cmd_in_ert("\\begin{appendix}")
-          document.body[l -1 : l] = ["", "\\begin_layout Standard"]
-          l = l + 1
 
 
 def convert_subref(document):
diff --git a/lib/templates/JSS-article.lyx b/lib/templates/JSS-article.lyx
index fce934cf04..3a257956ed 100644
--- a/lib/templates/JSS-article.lyx
+++ b/lib/templates/JSS-article.lyx
@@ -594,17 +594,14 @@ Writing several lines of code:
 
 \begin_deeper
 \begin_layout Standard Code
-
 first line of code
 \end_layout
 
 \begin_layout Standard Code
-
 second line of code
 \end_layout
 
 \begin_layout Standard Code
-
 third line of code
 \end_layout
 
@@ -619,27 +616,22 @@ Alternatively, you can distinguish between input and output code:
 
 \begin_deeper
 \begin_layout Code Input
-
 first line of input code
 \end_layout
 
 \begin_layout Code Input
-
 second line of input code
 \end_layout
 
 \begin_layout Code Output
-
 first line of output code
 \end_layout
 
 \begin_layout Code Output
-
 second line of output code
 \end_layout
 
 \begin_layout Code Output
-
 third line of output code
 \end_layout
 
@@ -652,8 +644,21 @@ Acknowledgments
 Here you can write some acknowledgments.
 \end_layout
 
-\begin_layout Appendix
-This is the appendix section
+\begin_layout Section
+\start_of_appendix
+This is the first appendix section
+\end_layout
+
+\begin_layout Subsection
+A subsection
+\end_layout
+
+\begin_layout Subsubsection
+A subsubsection
+\end_layout
+
+\begin_layout Standard
+some text
 \end_layout
 
 \end_body