From 68e55d598fe93e54ade2fc27248aeb3fab940f05 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 5 Jun 2019 23:00:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B8=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- espdclass.inc | 10 +++++----- espdcounters.inc | 2 +- espdfloats.inc | 2 +- espdinsets.inc | 8 ++++---- espdlayouts.inc | 4 ++-- espdlists.inc | 2 +- espdsections.inc | 2 +- espdstarsections.inc | 2 +- espdstruct.inc | 2 +- espdtitle.inc | 10 ++++++---- stdsections.inc | 2 +- 12 files changed, 25 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index b7e8e86..541e133 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Установка: ``` -git clone https://git.246060.ru:/f1x1t/lyx-layout-espdx.git ~/.lyx/layouts +git clone https://git.246060.ru/f1x1t/lyx-layout-espdx ~/.lyx/layouts ``` В LyX: Инструменты - Обновить конфигурацию. diff --git a/espdclass.inc b/espdclass.inc index 833822b..eb49451 100644 --- a/espdclass.inc +++ b/espdclass.inc @@ -1,4 +1,4 @@ -Format 60 +Format 66 Columns 1 Sides 1 SecNumDepth 4 @@ -53,14 +53,14 @@ End #Input stdcharstyles.inc #Input stdcustom.inc -Input espdcounters.inc Input espdfloats.inc +Input espdcounters.inc Input espdinsets.inc -Input espdlayouts.inc Input espdlists.inc -Input espdnum.inc Input espdsections.inc Input espdstarsections.inc -Input espdstruct.inc Input espdtitle.inc +Input espdstruct.inc +Input espdlayouts.inc +Input espdnum.inc diff --git a/espdcounters.inc b/espdcounters.inc index 17232ec..124f9c4 100644 --- a/espdcounters.inc +++ b/espdcounters.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 60 +Format 66 Counter appendix End diff --git a/espdfloats.inc b/espdfloats.inc index 429d1a7..bc10ed5 100644 --- a/espdfloats.inc +++ b/espdfloats.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 60 +Format 66 Float Type table diff --git a/espdinsets.inc b/espdinsets.inc index 3c251d7..8ddab5d 100644 --- a/espdinsets.inc +++ b/espdinsets.inc @@ -4,7 +4,7 @@ # # Detailed format description is available in the customization manual -Format 60 +Format 66 Provides stdinsets 1 @@ -427,7 +427,7 @@ End InsetLayout Float LabelFont - Color collapsable + Color collapsible Size Small EndFont MultiPar true @@ -441,7 +441,7 @@ End InsetLayout Wrap LabelFont - Color collapsable + Color collapsible Size Small EndFont MultiPar true @@ -485,7 +485,7 @@ End InsetLayout Argument LabelString Argument LabelFont - Color collapsable + Color collapsible Size Small EndFont MultiPar false diff --git a/espdlayouts.inc b/espdlayouts.inc index 2a40144..38b0da5 100644 --- a/espdlayouts.inc +++ b/espdlayouts.inc @@ -7,7 +7,7 @@ # quotations and such. -Format 60 +Format 66 Style Quotation Category MainText @@ -91,7 +91,7 @@ Style Verbatim Font Family Typewriter EndFont - HTMLTag 

+	HTMLTag               pre
 	HTMLItem              p
 End
 
diff --git a/espdlists.inc b/espdlists.inc
index 6cc1c53..16c930a 100644
--- a/espdlists.inc
+++ b/espdlists.inc
@@ -6,7 +6,7 @@
 # This include files contains various standard environments for lists.
 
 
-Format 60
+Format 66
 
 Input stdlyxlist.inc
 
diff --git a/espdsections.inc b/espdsections.inc
index be56c36..7211ec5 100644
--- a/espdsections.inc
+++ b/espdsections.inc
@@ -7,7 +7,7 @@
 # commands that are useful for article-like document classes, but not
 # for letters.
 
-Format 60
+Format 66
 
 Style "Раздел"
 	Category              "Раздел"
diff --git a/espdstarsections.inc b/espdstarsections.inc
index 06f7086..f225be2 100644
--- a/espdstarsections.inc
+++ b/espdstarsections.inc
@@ -9,7 +9,7 @@
 # modifying the style of the regular sectioning layouts.
 
 
-Format 60
+Format 66
 
 Style "Раздел в содерж. (б/н)"
 	CopyStyle             "Раздел"
diff --git a/espdstruct.inc b/espdstruct.inc
index 3bd56c8..be8fbb4 100644
--- a/espdstruct.inc
+++ b/espdstruct.inc
@@ -8,7 +8,7 @@
 # a document, like abstract, bibliography and such.
 
 
-Format 60
+Format 66
 Style Abstract
 	Margin                Static
 	LatexType             Environment
diff --git a/espdtitle.inc b/espdtitle.inc
index 40909d5..699cd63 100644
--- a/espdtitle.inc
+++ b/espdtitle.inc
@@ -2,13 +2,15 @@
 # Author : Matthias Ettrich 
 # Transposed by Pascal André 
 # Heavily modifed and enhanced by several developers.
-# Title definitions moved to stdtitle.inc by Hartmut Goebel 
+# Split from stdstruct.inc by Hartmut Goebel 
 
-# This include files contains all layouts that handle the structure of
-# a document, like abstract, bibliography and such.
+# This include files contains all layouts that handle the title area
+# a document, like title, author and such.
+
+
+Format 66
 
 
-Format 60
 Style Title
 	Margin                Static
 	LatexType             Command
diff --git a/stdsections.inc b/stdsections.inc
index 31db669..f1a5351 100644
--- a/stdsections.inc
+++ b/stdsections.inc
@@ -7,7 +7,7 @@
 # commands that are useful for article-like document classes, but not
 # for letters.
 
-Format 60
+Format 66
 
 Style Section
 	Category              Sectioning