diff --git a/espdclass.inc b/espdclass.inc index 646f320..f58b4e9 100644 --- a/espdclass.inc +++ b/espdclass.inc @@ -1,17 +1,8 @@ -# Standard textclass definition file. Taken from initial LyX source code -# Author : Matthias Ettrich -# Transposed by Pascal André -# Heavily modifed and enhanced by several developers. - -# This is a base layout which is designed to be included from other -# ``standard'' layouts, like article and friends. - - -Format 11 +Format 60 Columns 1 Sides 1 -SecNumDepth 5 -TocDepth 5 +SecNumDepth 4 +TocDepth 4 DefaultStyle Standard # This is just to show how to declare the default font. @@ -35,19 +26,24 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + # FIXME This ought to be set dynamically. + HTMLStyle + div.standard { + margin-bottom: 2ex; + } + EndHTMLStyle End #Input stdcharstyles.inc #Input stdcustom.inc -Input stdinsets.inc -Input stdfloats.inc Input espdcounters.inc +Input espdfloats.inc Input espdinsets.inc +Input espdlayouts.inc Input espdlists.inc +Input espdnum.inc Input espdsections.inc Input espdstarsections.inc -Input stdtitle.inc -Input stdstruct.inc -Input lyxmacros.inc -Input stdlayouts.inc +Input espdstruct.inc +Input espdtitle.inc diff --git a/espdcounters.inc b/espdcounters.inc index 03efe29..17232ec 100644 --- a/espdcounters.inc +++ b/espdcounters.inc @@ -4,20 +4,14 @@ # in most LyX layouts. -Format 11 -#Counter part -# LabelString "\Roman{part}" -#End - -#Counter chapter -#End - -Counter section -End +Format 60 Counter appendix End +Counter section +End + Counter subsection Within section End @@ -46,21 +40,23 @@ Counter subpointIV Within pointIII End - - Counter enumi + LabelString "\arabic{enumi})" End Counter enumii Within enumi + LabelString "\asbuk{enumii})" End Counter enumiii Within enumii + LabelString "\roman{enumiii}." End Counter enumiv Within enumiii + LabelString "\Alph{enumiv}." End Counter bibitem @@ -74,4 +70,3 @@ End Counter footnote End - diff --git a/espdfloats.inc b/espdfloats.inc index 98e838c..429d1a7 100644 --- a/espdfloats.inc +++ b/espdfloats.inc @@ -4,7 +4,8 @@ # in most LyX layouts. -Format 4 +Format 60 + Float Type table GuiName Table @@ -13,7 +14,10 @@ Float NumberWithin none Style plain ListName "Список таблиц" - LaTeXBuiltin true + IsPredefined true + UsesFloatPkg false + ListCommand listoftables + RefPrefix tab End @@ -25,7 +29,10 @@ Float NumberWithin none Style plain ListName "Список рисунков" - LaTeXBuiltin true + IsPredefined true + UsesFloatPkg false + ListCommand listoffigures + RefPrefix fig End @@ -37,5 +44,24 @@ Float NumberWithin none Style ruled ListName "Список алгоритмов" - LaTeXBuiltin false + IsPredefined false + UsesFloatPkg true + RefPrefix alg +End + + +InsetLayout FloatList + HTMLTag h2 + HTMLStyle + a.lyxtoc-floats { + text-decoration: none; + color: black; + } + a.lyxtoc-floats:visited { color: black; } + div.lyxtoc-floats { + margin: 0em 0em 0.1em 1em; + font-size: large; + font-weight: normal; + } + EndHTMLStyle End diff --git a/espdinsets.inc b/espdinsets.inc index 1c60867..23fa361 100644 --- a/espdinsets.inc +++ b/espdinsets.inc @@ -2,58 +2,9 @@ # Author : Martin vermeer # Inset layouts definition # -# More detailled format description is available in the customization manual -# FIXME: create the contents in the manual and put the link here. -# -#InsetLayout -# LabelString used for the inset decoration (either the inset button -# or the text underneath the inset). -# LatexType associated LateX type: command, environment, or none. -# LatexName associated LateX command. -# BgColor Color of the inset background within LyX. -# FIXME: link to a doc file describing the different -# color codes as defined in 'ColorCode.h' -# Font Nothing to put here, below are descriptions of the different -# allowable adjustments for the font used to draw the text -# appearing within the inset text. All these items are optional. -# Color Color of text -# Size Font size of the textallowed value: Small, Smaller, ... -# FIXME defined in FontSize in FontEnums.h -# Family FIXME defined in FontFamily in FontEnums.h -# Shape FIXME defined in FontShape in FontEnums.h -# Series FIXME defined in FontSeries in FontEnums.h -# Misc FIXME defined in FontMisc in FontEnums.h -# EndFont Nothing to put here, it's just a markup to indicate that we are -# finished with the Font definition. -# LabelFont Nothing to put here, below are descriptions of the different -# allowable adjustments for the font used to draw the text -# appearing within the inset decoration. All these items are -# optional. -# Color see definition above (in the Font node). -# Size see definition above (in the Font node). -# -# EndFont Nothing to put here, it's just a markup to indicate that we are -# finished with the LabelFont definition. -# MultiPar Indicates that multiple paragraphs are allowed within the inset -# or not. Defaults to false. Sets CustomPars, as well, to the same -# value, and sets ForcePlain to the opposite value. If you want -# those to be different, then, you must set them after you set -# MultiPar. -# CustomPars Whether to allow the use of the Paragraph Settings dialog. Default is -# false. -# ForcePlain Whether to force the PlainLayout. Default is true. -# Decoration: Classic, Minimalistic, Conglomerate. Decoration styles -# PassThru Do not do various LaTeX conversions, like the phrases -# LaTeX, LyX, quote commands, etc. -# KeepEmpty Do not delete empty paragraphs (?) -# FreeSpacing Preserve multiple spaces etc. -# ForceLTR Force the "latex" language, leading to Left-to-Right -# (latin) output, e.g., in ERT or URL. A kludge. -# Requires Require a given (supported) feature. Multiple features must -# be comma-separated. -#End +# Detailed format description is available in the customization manual -Format 11 +Format 60 Provides stdinsets 1 @@ -69,12 +20,28 @@ InsetLayout Marginal Size Small EndFont MultiPar true + NeedProtect true + HTMLStyle + div.marginal { + border: 2px solid black; + padding: 1ex; + margin: 1ex; + background-color: #F0F0F0; + float:right; + font-size: small; + font-weight: medium; + font-family: serif; + font-variant: normal; + font-style: normal; + } + EndHTMLStyle End InsetLayout Foot LabelString foot - LatexType command + LatexType Command LatexName footnote + Counter footnote Font Size Small EndFont @@ -83,10 +50,69 @@ InsetLayout Foot Size Small EndFont MultiPar true + RefPrefix fn + HTMLLabel \arabic{footnote} + HTMLInnerTag div + HTMLStyle + span.foot_label { + vertical-align: super; + font-size: smaller; + font-weight: bold; + text-decoration: underline; + } + div.foot { + display: inline; + font-size: small; + font-weight: medium; + font-family: serif; + font-variant: normal; + font-style: normal; + } + div.foot_inner { display: none; } + div.foot:hover div.foot_inner { + display: block; + border: 1px double black; + margin: 0em 1em; + padding: 1em; + } + EndHTMLStyle +End + +InsetLayout Foot:InTitle + CopyStyle Foot + LatexName thanks + NeedProtect true + Counter thanks + MultiPar false + HTMLLabel \fnsymbol{thanks} + HTMLInnerTag span + HTMLStyle + span.foot_intitle_label { + vertical-align: super; + font-size: smaller; + font-weight: bold; + text-decoration: underline; + } + span.foot_intitle { + display: inline; + font-size: small; + font-weight: medium; + font-family: serif; + font-variant: normal; + font-style: normal; + } + span.foot_intitle_inner { display: none; } + span.foot_intitle:hover span.foot_intitle_inner { + display: block; + border: 1px double black; + margin: 0em 1em; + padding: 1em; + } + EndHTMLStyle End InsetLayout Note:Comment - LabelString comment + LabelString Comment LatexType environment LatexName comment BgColor commentbg @@ -95,8 +121,505 @@ InsetLayout Note:Comment Size Small EndFont MultiPar true + Display false + HTMLTag div + HTMLIsBlock true + HTMLStyle + div.note_comment { + display: none; + } + EndHTMLStyle End + +InsetLayout Note:Note + LabelString Note + LatexType command + LatexName note + BgColor notebg + LabelFont + Color note + Size Small + EndFont + MultiPar true + HTMLIsBlock false +# FIXME HTML Need CSS +End + + +InsetLayout Note:Greyedout + LabelString Greyedout + LatexType environment + LatexName lyxgreyedout + BgColor greyedoutbg + Font + Color greyedouttext + EndFont + LabelFont + Color greyedout + Size Small + EndFont + MultiPar true + Display false + HTMLInnerTag div + HTMLStyle + div.note_greyedout { + display: inline; + color: #A0A0A0; + padding-left: 1ex; + padding-right: 1ex; + } + EndHTMLStyle + HTMLIsBlock false +End + +InsetLayout ERT + LabelString ERT + LatexType none + Decoration minimalistic + Font + Color latex + Family typewriter + EndFont + LabelFont + Color latex + Size Small + EndFont + MultiPar true + CustomPars false + ForcePlain true + PassThru true + ParbreakIsNewline true + KeepEmpty true + FreeSpacing true + ForceLTR true +End + +InsetLayout Phantom + Decoration minimalistic + Font + Color phantomtext + EndFont + MultiPar false + CustomPars false + ForcePlain true +End + +InsetLayout IPADeco + Decoration minimalistic + Font + Color foreground + EndFont + MultiPar false + CustomPars false + ForcePlain true +End + +InsetLayout TOC + HTMLTag h2 + HTMLStyle + div.toc { + margin: 2em 0em; + border-style: solid; + border-width: 2px 0px; + padding: 1em 0em; + } + h2.tochead { font-size: x-large; font-weight: bold; } + div.lyxtoc-0 { + margin: 2em 0em 0em 0em; + font-size: xx-large; + font-weight: bold; + } + div.lyxtoc-1 { + margin: 1em 0em 0em 0em; + font-size: x-large; + font-weight: bold; + } + div.lyxtoc-2 { + margin: 0em 0.1em 0em 1em; + font-size: large; + font-weight: normal; + } + div.lyxtoc-3 { margin: 0em 0.1em 0em 0.5em; font-size: medium; } + div.lyxtoc-4 { margin: 0em 0.1em 0em 0.5em; } + div.lyxtoc-5 { margin: 0em 0.1em 0em 0.5em; } + div.lyxtoc-6 { margin: 0em 0.1em 0em 0.5em; } + a.tocentry { + text-decoration: none; + color: black; + } + a.tocentry:visited { color: black; } + EndHTMLStyle +End + +InsetLayout TOC:Listings + # We need the [[List of Listings]] context, since "Listings" is also + # the name of the inset and translated differently. + # "Listings[[List of Listings]]" is the name of the "List of listings" + # ("Listings" is the predefined english name) in listings.sty, so it + # must be used here as well. + BabelPreamble + \addto\captions$$lang{\renewcommand{\lstlistlistingname}{_(Listings[[List of Listings]])}} + EndBabelPreamble + # The command does not need to be defined in LangPreamble, since + # listings.sty does that already. However it needs to be redefined + # in order to be used for non-english single-language documents. + LangPreamble + \renewcommand{\lstlistlistingname}{_(Listings[[List of Listings]])} + EndLangPreamble + FixedWidthPreambleEncoding true + HTMLTag h2 + HTMLStyle + div.lyxtoc-flat { + margin: 0em 0em 0em 1em; + font-size: large; + font-weight: normal; + } + EndHTMLStyle +End + +InsetLayout Include:Listings + BabelPreamble + \addto\captions$$lang{\renewcommand{\lstlistingname}{_(Listing)}} + EndBabelPreamble + # The command does not need to be defined in LangPreamble, since + # listings.sty does that already. However it needs to be redefined + # in order to be used for non-english single-language documents. + LangPreamble + \renewcommand{\lstlistingname}{_(Listing)} + EndLangPreamble + FixedWidthPreambleEncoding true +End + +InsetLayout Listings + CopyStyle Include:Listings + LabelString Listings[[inset]] + LatexType none + Decoration minimalistic + Font + Color foreground + Family typewriter + EndFont + LabelFont + Color foreground + Size Small + EndFont + BgColor listingsbg + MultiPar true + PassThru true + ParbreakIsNewline true + KeepEmpty true + FreeSpacing true + ForceLTR true + RefPrefix lst + HTMLTag pre +End + +InsetLayout Branch + Decoration classic + LabelFont + Color branchlabel + Size Small + EndFont + MultiPar true + InToc true + HTMLIsBlock false +End + +InsetLayout Index + LabelString Idx + Decoration classic + Font + Size Small + EndFont + LabelFont + Color indexlabel + Size Small + EndFont + MultiPar false + CustomPars false + ForcePlain true + ContentAsLabel true +End + +InsetLayout Box + LabelFont + Color foreground + Size Small + EndFont + MultiPar true +End + +InsetLayout Box:Frameless + CopyStyle Box + HTMLStyle + div.Frameless { margin: 1em; } + EndHTMLStyle +End + +InsetLayout Box:Shaded + CopyStyle Box + BgColor shaded + HTMLStyle + div.Shaded { + background-color: gray; + padding: 0.5ex; + } + EndHTMLStyle +End + +InsetLayout Box:Boxed + CopyStyle Box + HTMLStyle + div.Boxed { + border: solid thick black; + padding: 0.5ex; + } + EndHTMLStyle +End + +InsetLayout Box:Framed + CopyStyle Box + HTMLStyle + div.Framed { + border: solid thick black; + padding: 0.5ex; + } + EndHTMLStyle +End + +InsetLayout Box:ovalbox + CopyStyle Box + HTMLStyle + div.ovalbox { + border: groove medium black; + padding: 0.5ex; + } + EndHTMLStyle +End + +InsetLayout Box:Ovalbox + CopyStyle Box + HTMLStyle + div.Ovalbox { + border: ridge thick black; + padding: 0.5ex; + } + EndHTMLStyle +End + +InsetLayout Box:Shadowbox + CopyStyle Box + HTMLStyle + div.Shadowbox { border: solid gray medium; border-bottom: solid black 1ex; border-right: solid black 1ex; padding: 0.5ex; } + EndHTMLStyle +End + +InsetLayout Box:Doublebox + CopyStyle Box + HTMLStyle + div.Doublebox { + border: double thick black; + padding: 0.5ex; + } + EndHTMLStyle +End + +InsetLayout Float + LabelFont + Color collapsable + Size Small + EndFont + MultiPar true + HTMLStyle + div.float { + border: 2px solid black; + text-align: center; + } + EndHTMLStyle +End + +InsetLayout Wrap + LabelFont + Color collapsable + Size Small + EndFont + MultiPar true + RefPrefix wrap + HTMLStyle + div.wrap { + float: right; + border: 2px solid black; + padding: 1ex; + margin: 1ex; + } + EndHTMLStyle +End + +InsetLayout "Flex:URL" + LyXType standard + Decoration classic + LabelString URL + ContentAsLabel true + LatexName url + LatexType command + Requires url + MultiPar false + CustomPars false + ForcePlain true + PassThru true + FreeSpacing true + ForceLTR true + Font + Family Typewriter + Color urltext + EndFont + LabelFont + Family Typewriter + Color urllabel + Size Small + EndFont + HTMLIsBlock false +End + +InsetLayout Argument + LabelString Argument + LabelFont + Color collapsable + Size Small + EndFont + MultiPar false + ForceLocalFontSwitch 1 +End + +InsetLayout Info + Decoration conglomerate + HTMLStyle + span.info { font-family: sans-serif; } + EndHTMLStyle + HTMLTag span + MultiPar false +End + +InsetLayout Info:menu + CopyStyle Info + LatexType command + LatexName menuitem + Preamble + \providecommand{\menuitem}[1]{\textsf{#1}} + EndPreamble + Decoration conglomerate + Font + Family sans + EndFont + HTMLAttr "class='info menu'" + HTMLStyle + span.menu { font-family: sans-serif; } + EndHTMLStyle +End + +InsetLayout Info:shortcut + CopyStyle Info + LatexType command + LatexName shortcut + Preamble + \providecommand{\shortcut}[1]{\mbox{\textsf{#1}}} + EndPreamble + Decoration conglomerate + Font + Family sans + EndFont + HTMLAttr "class='info shortcut'" + HTMLStyle + span.shortcut { font-family: sans-serif; } + EndHTMLStyle +End + +InsetLayout Info:shortcuts + CopyStyle Info + LatexType command + LatexName shortcut + Preamble + \providecommand{\shortcut}[1]{\textsf{#1}} + EndPreamble + Decoration conglomerate + Font + Family sans + EndFont + HTMLAttr "class='info shortcut'" + HTMLStyle + span.shortcuts { font-family: sans-serif; } + EndHTMLStyle +End + +InsetLayout Caption:Standard + LabelString standard + LaTeXType command + LatexName caption + NeedProtect 1 + MultiPar false + Argument 1 + LabelString "Short Title|S" + Tooltip "The caption as it appears in the list of figures/tables" + InsertCotext 1 + EndArgument + HTMLStyle + div.float-caption { + text-align: center; + border: 2px solid black; + padding: 1ex; + margin: 1ex; + } + EndHTMLStyle + HTMLAttr "class='float-caption float-caption-standard'" +End + + +InsetLayout Caption:Unnumbered + CopyStyle Caption:Standard + LabelString unlabelled + LatexName caption* + ResetArgs 1 +End + + +InsetLayout Preview + LabelString Preview + Decoration minimalistic + MultiPar true +End + + +InsetLayout Script + LatexType command + MultiPar false + ForcePlain 1 + CustomPars 0 + InToc 1 + HTMLIsBlock 0 +End + + +InsetLayout Script:superscript + CopyStyle Script + LaTeXName textsuperscript + HTMLTag sup +End + + +InsetLayout Script:subscript + CopyStyle Script + Requires subscript + LaTeXName textsubscript + HTMLTag sub +End + + +InsetLayout PrintNomencl + HTMLTag h2 +End + + InsetLayout Flex:TightCentered LyXType custom LabelString TightCentered @@ -117,198 +640,6 @@ InsetLayout Flex:TightCentered EndFont End -InsetLayout Note:Note - LabelString note - LatexType command - LatexName note - BgColor notebg - LabelFont - Color note - Size Small - EndFont - MultiPar true -End - -InsetLayout Note:Greyedout - LabelString greyedout - LatexType environment - LatexName lyxgreyedout - BgColor greyedoutbg - LabelFont - Color greyedout - Size Small - EndFont - MultiPar true -End - -InsetLayout ERT - LabelString ERT - LatexType none - Decoration minimalistic - Font - Color latex - Family typewriter - EndFont - LabelFont - Color latex - Size Small - EndFont - MultiPar true - CustomPars false - ForcePlain true - PassThru true - KeepEmpty true - FreeSpacing true - ForceLTR true -End - -InsetLayout Listings - LabelString Listings - LatexType none - Decoration minimalistic - Font - Color foreground - Family typewriter - EndFont - LabelFont - Color foreground - Size Small - EndFont - BgColor listingsbg - MultiPar true - PassThru true - KeepEmpty true - FreeSpacing true - ForceLTR true -End - -InsetLayout Branch - Decoration classic - LabelFont - Color branchlabel - Size Small - EndFont - MultiPar true -End - -InsetLayout Index - LabelString Idx - LatexType command - LatexName index - Decoration classic - Font - Size Small - EndFont - LabelFont - Color indexlabel - Size Small - EndFont - MultiPar false - CustomPars false - ForcePlain true - NeedProtect true -End - -InsetLayout Box - LabelFont - Color foreground - Size Small - EndFont - MultiPar true -End - -InsetLayout Box:Shaded - BgColor shaded - LabelFont - Color foreground - Size Small - EndFont - MultiPar true -End - -InsetLayout Float - LabelFont - Color collapsable - Size Small - EndFont - MultiPar true -End - -InsetLayout Wrap - LabelFont - Color collapsable - Size Small - EndFont - MultiPar true -End - -InsetLayout URL - LyXType standard - LatexName url - LatexType command - Decoration classic - LabelString URL - PassThru true - ForceLTR true - Font - Family Typewriter - Color urltext - EndFont - LabelFont - Family Typewriter - Color urllabel - Size Small - EndFont - Requires url -End - -InsetLayout OptArg - LabelString opt - LabelFont - Color collapsable - Size Small - EndFont - MultiPar false -End - -InsetLayout Info - Decoration conglomerate -End - -InsetLayout Info:menu - LatexType command - LatexName menuitem - Preamble - \providecommand{\menuitem}[1]{\textsf{#1}} - EndPreamble - Decoration conglomerate - Font - Family sans - EndFont -End - -InsetLayout Info:shortcut - LatexType command - LatexName shortcut - Preamble - \providecommand{\shortcut}[1]{\mbox{\textsf{#1}}} - EndPreamble - Decoration conglomerate - Font - Family sans - EndFont -End - -InsetLayout Info:shortcuts - LatexType command - LatexName shortcut - Preamble - \providecommand{\shortcut}[1]{\textsf{#1}} - EndPreamble - Decoration conglomerate - Font - Family sans - EndFont InsetLayout Flex:Code LyxType charstyle @@ -328,6 +659,7 @@ InsetLayout Flex:Code ResetsFont true End + InsetLayout Flex:Code-Bold LyxType charstyle LabelString code-bold diff --git a/espdlayouts.inc b/espdlayouts.inc index 3811021..fcf1e52 100644 --- a/espdlayouts.inc +++ b/espdlayouts.inc @@ -7,13 +7,15 @@ # quotations and such. -Format 11 +Format 60 + Style Quotation Category MainText Margin Static LatexType Environment LatexName quotation NextNoIndent 1 + ToggleIndent Always LeftMargin MMM RightMargin MMM ParIndent MM @@ -24,6 +26,8 @@ Style Quotation ParSep 0 Align Block AlignPossible Block, Left, Right, Center + HTMLTag blockquote + HTMLItem div End @@ -33,6 +37,7 @@ Style Quote LatexType Environment LatexName quote NextNoIndent 1 + ToggleIndent Never LeftMargin MMM RightMargin MMM TopSep 0.5 @@ -41,6 +46,8 @@ Style Quote Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + HTMLTag blockquote + HTMLItem div End @@ -61,23 +68,36 @@ Style Verse Align Block AlignPossible Block, Left LabelType No_Label + HTMLTag blockquote + HTMLItem p End -Style --Separator-- +Style Verbatim Category MainText + LatexType Environment + LatexName verbatim + NextNoIndent 1 + ParbreakIsNewline 1 + FreeSpacing 1 + PassThru 1 KeepEmpty 1 - Margin Dynamic - LatexType Paragraph - LatexName dummy - ParIndent MM + NewLine 0 + TopSep 0.7 + BottomSep 0.7 Align Block - LabelType Static - LabelString "--- Separate Environment ---" - LabelFont - Family Roman - Series Medium - Size Normal - Color Blue + AlignPossible Block + LabelType No_Label + Font + Family Typewriter EndFont + HTMLTag 

+	HTMLItem              p
 End
+
+
+Style Verbatim*
+	CopyStyle             Verbatim
+	LatexName             verbatim*
+End
+
diff --git a/espdlists.inc b/espdlists.inc
index 48d5a9b..6cc1c53 100644
--- a/espdlists.inc
+++ b/espdlists.inc
@@ -1,4 +1,3 @@
-
 # Standard textclass definition file. Taken from initial LyX source code
 # Author : Matthias Ettrich 
 # Transposed by Pascal André 
@@ -7,13 +6,17 @@
 # This include files contains various standard environments for lists.
 
 
-Format 11
+Format 60
+
+Input stdlyxlist.inc
+
 Style Itemize
 	Category              List
 	Margin                Static
 	LatexType             Item_Environment
 	LatexName             itemize
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MMN
 	LabelSep              xx
 	ItemSep               0.2
@@ -24,6 +27,14 @@ Style Itemize
 	AlignPossible         Block, Left
 	LabelType             Itemize
 	LabelString           "*"
+
+	HTMLTag               ul
+	HTMLItem              li
+	HTMLLabel             NONE
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
 End
 
 
@@ -33,6 +44,7 @@ Style Enumerate
 	LatexType             Item_Environment
 	LatexName             enumerate
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MMN
 	LabelSep              xx
 	ParSkip               0.0
@@ -43,6 +55,15 @@ Style Enumerate
 	Align                 Block
 	AlignPossible         Block, Left
 	LabelType             Enumerate
+	LabelCounter          "enum"
+	HTMLTag               ol
+	HTMLItem              li
+	HTMLLabel             NONE
+	RefPrefix             enu
+	Argument item:1
+		LabelString   "Custom Item|s"
+		Tooltip       "A customized item string"
+	EndArgument
 End
 
 
@@ -66,83 +87,21 @@ Style Description
 	LabelFont
 	  Series              Bold
 	EndFont
+	HTMLTag               dl
+	HTMLAttr              class='description'
+	HTMLItem              dd
+	HTMLLabel             dt
+	HTMLLabelFirst        1
+	HTMLStyle
+		dl.description dt { font-weight: bold; }
+	EndHTMLStyle
 End
 
 
 Style List
-	Category              List
-	Margin                Manual
-	LatexType             Environment
-	LatexName             lyxlist
-	NextNoindent          1
-	LabelSep              xxx
-	ParSkip               0.4
-	TopSep                0.7
-	BottomSep             0.7
-	ParSep                0.5
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Manual
-	LabelString           "00.00.0000"
-
-	#define the environment lyxlist
-	Preamble
-		\newenvironment{lyxlist}[1]
-			{\begin{list}{}
-				{\settowidth{\labelwidth}{#1}
-				 \setlength{\leftmargin}{\labelwidth}
-				 \addtolength{\leftmargin}{\labelsep}
-				 \renewcommand{\makelabel}[1]{##1\hfil}}}
-			{\end{list}}
-	EndPreamble
+  Obsoletedby           Labeling
 End
 
-# Новое окружение для составления листа регистрации изменений.
-# Тут считаю необходимым переопределить item, с команды без параметров в команду с одним параметром.
-# Буду передавать в \item{} строку и парсить её, используя пакет stringstrings.
-# Лист регистрации изменений есть таблица, состаящая из десяти колонок.
-# Необходимо отделять содержимое колонок друг от друга. В качество разделителя будем использоваться
-# символ "\&".
-# Алгоритм следующий:
-# 1) Выхватить первое слово из строки, используя \getaword{}
-# 2) Получить индекс символа \&, используя \whereischar{} - пусть это будем число i
-# 3) Удалить первые i символов строки, используя \gobblechars{}
-# Повторить с пункта 1 для оставшихся девяти слов.
-# Поскольку некоторые колонки могут быть пустыми предлагаю использовать специальное слово для
-# пустых колонок - nop. использовать \if и если слово - nop, заменять его пустым словом (пробелом)
-
-Style ESCList
-	Category              List
-	Margin                Manual
-	LatexType             List_Environment
-	LatexName             ecslist
-	NextNoindent          1
-	LabelSep              xxx
-	ParSkip               0.4
-	TopSep                0.7
-	BottomSep             0.7
-	ParSep                0.5
-	Align                 Block
-	AlignPossible         Block, Left
-	LabelType             Static
-
-	#define the environment ecslist
-	Preamble
-		\newenvironment{ecslist}%
-			{%
-				\newcounter{ecscounter}%
-				\setcounter{ecscounter}{1}%
-				\let\olditem\item%
-				\renewcommand{\item}[9]{%
-					\arabic{ecscounter} & ##1 & ##2 & ##3 & ##4 & ##5 & ##6 & ##7 & ##8 & ##9 \\%
-					\addtocounter{ecscounter}{1}}
-				\begin{ESPDchangeSheet}%
-			}%
-			{\end{ESPDchangeSheet}}
-	EndPreamble
-End
-
-
 Style Explanation
 	Category              List
 	Margin                First_Dynamic
diff --git a/espdnum.inc b/espdnum.inc
new file mode 100644
index 0000000..b716735
--- /dev/null
+++ b/espdnum.inc
@@ -0,0 +1,33 @@
+Format 60
+
+Counter section
+	Within                ""
+	LabelString	          "\arabic{section}"
+	LabelStringAppendix   "\asbuk{section}"
+End
+
+Float
+	Type                  table
+	NumberWithin          ""
+End
+
+
+Float
+	Type                  figure
+	NumberWithin          ""
+End
+
+
+Float
+	Type                  algorithm
+	NumberWithin          ""
+End
+
+Counter listing
+	Within		      ""
+End
+
+Counter footnote
+	Within		      ""
+	LabelString	      "\arabic{footnote}"
+End
diff --git a/espdsections.inc b/espdsections.inc
index 523944c..98c4b1c 100644
--- a/espdsections.inc
+++ b/espdsections.inc
@@ -1,66 +1,18 @@
-# Standard textclass definition file. Taken from initial LyX source code
+# Standard textclass definition file. Taken from initial LyX source code
 # Author : Matthias Ettrich 
 # Transposed by Pascal André 
 # Heavily modifed and enhanced by several developers.
 
-# This include files contains all numbered sectionning-related
+# This include file contains all numbered sectionning-related
 # commands that are useful for article-like document classes, but not
 # for letters.
 
-Format 11
-#Style Part
-#	Category              Section
-#	Margin                Dynamic
-#	LabelString	          "Part \thepart"
-#	LabelType	            Counter
-#	TocLevel              0
-#	LabelCounter	        part
-#	LatexType             Command
-#	LatexName             part
-#	NeedProtect           1
-#	NextNoIndent          1
-#	Labelsep              xxx
-#	ParSkip               0.4
-#	TopSep                4
-#	BottomSep             4
-#	ParSep                0.8
-#	Align                 Center
-#	Alignpossible         Center
-#	Font
-#	  Series              Bold
-#	  Size                Huge
-#	EndFont
-#End
-
-#Style Chapter
-#	Margin                Static
-#	Category              Section
-#	LabelString	          "Chapter \thechapter"
-#	LabelStringAppendix   "Appendix \thechapter"
-#	LabelType	            Counter
-#	LabelCounter	        chapter
-#	TocLevel              0
-#	LatexType             Command
-#	LatexName             chapter
-#	NeedProtect           1
-#	NextNoIndent          1
-#	ParSkip               0.4
-#	TopSep                4
-#	BottomSep             0.8
-#	ParSep                0.8
-#	Align                 Block
-#	OptionalArgs          1
-#	Font
-#	  Series              Bold
-#	  Size                Huge
-#	EndFont
-#End
-
+Format 60
 
 Style "Раздел"
 	Category              "Раздел"
 	Margin                Dynamic
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          section
 	LabelString           \thesection.
 	TocLevel              1
@@ -68,19 +20,24 @@ Style "Раздел"
 	LatexName             ESPDsection
 	NeedProtect           1
 	NextNoIndent          0
+	ToggleIndent          Never
 	LabelSep              xxx
 	ParSkip               0.4
 	TopSep                1.3
-    LeftMargin            "MMMMM"
+	LeftMargin            "MMMMM"
 	BottomSep             0.7
 	ParSep                0.7
 	Align                 Block
-	AlignPossible         Block, Left
-	OptionalArgs          1
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The section as it appears in the table of contents/running headers"
+		InsertCotext  1
+	EndArgument
 	Font
 	  Series              Bold
 	  Size                Larger
 	EndFont
+	HTMLTag               h2
 	Preamble
 		\newcommand{\ESPDsection}[1]{
 			\section{#1}
@@ -97,7 +54,8 @@ Style "Подраздел"
 	LabelString           \thesubsection.
 	TocLevel              2
 	LatexName             ESPDsubsection
-    LeftMargin            "MMMMM"
+	LeftMargin            "MMMMM"
+	NextNoIndent          0
 	TopSep                0.9
 	BottomSep             0.5
 	ParSep                0.5
@@ -105,7 +63,7 @@ Style "Подраздел"
 	  Series              Bold
 	  Size                Large
 	EndFont
-	
+	HTMLTag               h3
 	Preamble
 		\newcommand{\ESPDsubsection}[1]{
 			\subsection{#1}
@@ -113,7 +71,6 @@ Style "Подраздел"
 			\setcounter{subpoint}{0}
 		} 
 	EndPreamble
-
 End
 
 
@@ -123,15 +80,15 @@ Style "Подподраздел"
 	LabelString           \thesubsubsection.
 	TocLevel              3
 	LatexName             ESPDsubsubsection
-    LeftMargin            "MMMMM"
-	TopSep                0.5
-	BottomSep             0.3
-	ParSep                0.3
+	LeftMargin            "MMMMM"
+	NextNoIndent          0
+	TopSep                0.7
+	BottomSep             0.4
 	Font
-	  Series              Medium
+	  Series              Bold
 	  Size                Normal
 	EndFont
-	
+	HTMLTag               h4
 	Preamble
 		\newcommand{\ESPDsubsubsection}[1]{
 			\subsubsection{#1}
@@ -139,29 +96,12 @@ Style "Подподраздел"
 			\setcounter{subpoint}{0}
 		} 
 	EndPreamble
-
 End
 
-# Поскольку в ЕСКД могут быть документы как с подразделами, так и без подразделов
-# считаю логичным ввести 2 типа пунктов/подпунктов:
-# 1) Для документов БЕЗ подразделов - начинаются префиксом woss(without subsections) 
-#  (wossPoint, wossSubPoint)
-# 2) Для документов ИМЕЮЩИХ подраздела - начинаются прфексом wss(with subsections)
-#  (wssPoint, wssSubPoint)
-#  так же необходимо разнести и в разные категории, чтобы в UI Lyx можно было выбрать их
-# без лишней путаницы. 
-# Для woss - "Без подразделов"
-# Для wss - "С подразделами"
-# Само собой они будут использоваться разные счетчики: 
-# 1) 2 и 3 уровня для wss - subsection и point
-# 2) 3 и 4 уровня для woss - point и subpoint
-# Так же необходимо выделять заголовки для SubSection и не выбелять для point и subpoint,
-# но выводить нумерацию.
-
 Style "Пункт 2 уровень"
 	Category              "Пункты после разделов"
 	Margin                First_Dynamic
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          pointII
 	LabelString           \thepointII.
 	KeepEmpty             1
@@ -179,7 +119,7 @@ End
 Style "Пункт 3 уровень"
 	Category              "Пункты после разделов"
 	Margin                First_Dynamic
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          pointIII
 	LabelString           \thepointIII.
 	KeepEmpty             1
@@ -197,7 +137,7 @@ End
 Style "Пункт 4 уровень"
 	Category              "Пункты после разделов"
 	Margin                First_Dynamic
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          pointIV
 	LabelString           \thepointIV.
 	KeepEmpty             1
@@ -215,7 +155,7 @@ End
 Style "Подпункт 3 уровень"
 	Category              "Подпункты после пунктов"
 	Margin                First_Dynamic
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          subpointIII
 	LabelString           \thesubpointIII.
 	KeepEmpty             1
@@ -233,7 +173,7 @@ End
 Style "Подпункт 4 уровень"
 	Category              "Подпункты после пунктов"
 	Margin                First_Dynamic
-	LabelType             Counter
+	LabelType             Static
 	LabelCounter          subpointIV
 	LabelString           \thesubpointIV.
 	KeepEmpty             1
@@ -248,24 +188,6 @@ Style "Подпункт 4 уровень"
 End
 
 
-# Поскольку команда ESPDappendix содержит 2 параметра, а передать в команду через Lyx
-# мы можем только один документ, то необходимо применить одну старую рыбацкую хитрость,
-# которую практиковал мой дедушка.
-# Объявим в преамбуле новую команду ESPDappendixOP и будем передавать в неё строку следующего
-# вида:
-# "{обязательное|рекомендуемое|справочное} Заголовок приложения" 
-# Используем пакет stringstrings. 
-# 1) Используя макрос \getaword выхватим первое слово из входящей строки будем использовать его как
-#  первый параметр для функции ESPDappendix.
-# 2) Потом удалить из входящей строки первое слово (которое уже извлечено ранее) и остатки строки 
-#  использовать как второй аргумент ESPDappendix.
-# Вот такой я умник.
-
-#%	Category              Section
-#%	Margin                Dynamic
-#%	LabelType             Counter
-#%	LabelCounter          section
-
 Style "Обязательное"
     Category              "Приложение"
     Margin                Dynamic
@@ -284,7 +206,6 @@ Style "Обязательное"
     ParSep                0.7
     Align                 Block
     AlignPossible         Block, Left
-    OptionalArgs          2
     Font
       Series              Bold
       Size                Larger
@@ -320,5 +241,3 @@ Style "Рекомендуемое"
     EndPreamble
 End
 
-
-Input numarticle.inc
diff --git a/espdstarsections.inc b/espdstarsections.inc
index 4c860a4..06f7086 100644
--- a/espdstarsections.inc
+++ b/espdstarsections.inc
@@ -9,104 +9,43 @@
 # modifying the style of the regular sectioning layouts.
 
 
-Format 11
-#Style Part*
-#	CopyStyle             Part
-#	Category              Unnumbered
-#	Margin                Static
-#	LatexName             part*
-#	LabelType             No_Label
-#	LabelCounter	      ""	
-#End
+Format 60
 
-
-#Style Chapter*
-#	CopyStyle             Chapter
-#	Category              Unnumbered
-#	Margin                Static
-#	LatexName             chapter*
-#	LabelType             No_Label
-#	LabelCounter	      ""	
-#End
-
-
-Style "Раздел без номера в огл."
+Style "Раздел в содерж. (б/н)"
 	CopyStyle             "Раздел"
-	Category              Unnumbered
+	Category              "Без номера"
 	Margin                Static
 	LatexName             ESPDstarsectiontoc
 	LabelType             No_Label
 	LabelCounter	      ""
-	OptionalArgs          0
+	ResetArgs             1
 
 	Preamble
 		\newcommand{\ESPDstarsectiontoc}[1]{
-			\section*{#1}
-            \pdfbookmark[1]{#1}{toc}
-			\addcontentsline{toc}{section}{#1}
-		} 
+                  \section*{#1}
+                  \pdfbookmark[1]{#1}{toc}
+                  \addcontentsline{toc}{section}{#1}
+                } 
 	EndPreamble
 
 End
 
 
-Style "Раздел без номера"
+Style "Раздел (б/н)"
 	CopyStyle             "Раздел"
-	Category              Unnumbered
+	Category              "Без номера"
 	Margin                Static
 	LatexName             ESPDstarsection
 	LabelType             No_Label
 	LabelCounter	      ""
-	OptionalArgs          0
+	ResetArgs             1
 
 	Preamble
-		\newcommand{\ESPDstarsection}[1]{
-			\section*{#1}
-		} 
+                \newcommand{\ESPDstarsection}[1]{
+                  \section*{#1}
+                } 
 	EndPreamble
 
 End
 
 
-#Style Subsection*
-#	CopyStyle             Subsection
-#	Category              Unnumbered
-#	Margin                Static
-#	LatexName             subsection*
-#	LabelType             No_Label
-#	LabelCounter	      ""	
-#	OptionalArgs          0
-#End
-
-
-#Style Subsubsection*
-#	CopyStyle             Subsubsection
-#	Category              Unnumbered
-#	Margin                Static
-#	LatexName             subsubsection*
-#	LabelType             No_Label
-#	LabelCounter	      ""	
-#	OptionalArgs          0
-#End
-
-
-#Style Paragraph*
-#	CopyStyle             Paragraph
-#	Category              Unnumbered
-#	Margin                Static
-#	LatexName             paragraph*
-#	LabelType             No_Label
-#	LabelCounter	      ""	
-#	OptionalArgs          0
-#End
-
-
-#Style Subparagraph*
-#	CopyStyle             Subparagraph
-#	Category              Unnumbered
-#	Margin                Static
-#	LatexName             subparagraph*
-#	LabelType             No_Label
-#	LabelCounter	      ""	
-#	OptionalArgs          0
-#End
diff --git a/espdstruct.inc b/espdstruct.inc
index 2819776..3bd56c8 100644
--- a/espdstruct.inc
+++ b/espdstruct.inc
@@ -8,13 +8,14 @@
 # a document, like abstract, bibliography and such.
 
 
-Format 11
+Format 60
 Style Abstract
 	Margin                Static
 	LatexType             Environment
 	LatexName             abstract
 	Category              FrontMatter
 	NextNoIndent          1
+	ToggleIndent          Always
 	LeftMargin            MMM
 	RightMargin           MMM
 	ParIndent             MM
@@ -23,9 +24,9 @@ Style Abstract
 	BottomSep             0.7
 	ParSep                0
 	Align                 Block
-	LabelType             Centered_Top_Environment
+	LabelType             Centered
 	LabelString           "Abstract"
-	LabelBottomSep    0.5
+	LabelBottomSep        0.5
 	Font
 	  Size                Small
 	EndFont
@@ -33,6 +34,20 @@ Style Abstract
 	  Series              Bold
 	  Size                Large
 	EndFont
+	HTMLLabelFirst        1
+	HTMLForceCSS          1
+	HTMLStyle
+		div.abstract {
+			margin: 4ex;
+		}
+		div.abstract_item {
+			font-size: small;
+			padding-top: 1ex;
+		}
+		div.abstract_label {
+			font-weight: bold;
+		}
+	EndHTMLStyle
 End
 
 
@@ -42,6 +57,7 @@ Style Bibliography
 	LatexName             thebibliography
 	Category              BackMatter
 	NextNoIndent          1
+	ToggleIndent          Never
 	LeftMargin            MM
 	ParSkip               0.4
 	ItemSep               0
@@ -57,4 +73,12 @@ Style Bibliography
 	  Series              Bold
 	  Size                Larger
 	EndFont
+	HTMLStyle
+		div.bibliography {
+			margin-left: 2em;
+			text-indent: -2em;
+		}
+		span.bibitemlabel:before { content: "["; }
+		span.bibitemlabel:after { content: "] "; }
+	EndHTMLStyle
 End
diff --git a/espdtext.layout b/espdtext.layout
index a849c08..2db39a5 100644
--- a/espdtext.layout
+++ b/espdtext.layout
@@ -1,23 +1,16 @@
 #% Do not delete the line below; configure depends on this
 # \LoadClass{espdtext}
 # \DeclareLaTeXClass[espdtext]{espdtext}
-# espd textclass definition file. 
+# \DeclareCategory{Article}
 
-Format 11
+Format 60
 Input espdclass.inc
+#Input espdnum.inc
 
-SecNumDepth             5
-TocDepth                5
+SecNumDepth             4
+TocDepth                4
 
+NoStyle Part
 NoStyle Chapter
 
-
-Style Part
-	Align                 Left
-	AlignPossible         Left
-	TopSep                2
-	BottomSep             1.5
-	Font
-	  Size                Larger
-	EndFont
-End
+Sides                   1
diff --git a/espdtitle.inc b/espdtitle.inc
index ee92a41..40909d5 100644
--- a/espdtitle.inc
+++ b/espdtitle.inc
@@ -2,13 +2,13 @@
 # Author : Matthias Ettrich 
 # Transposed by Pascal André 
 # Heavily modifed and enhanced by several developers.
-# Split from stdstruct.inc by Hartmut Goebel 
+# Title definitions moved to stdtitle.inc by Hartmut Goebel 
 
-# This include files contains all layouts that handle the title area
-# a document, like title, author and such.
+# This include files contains all layouts that handle the structure of
+# a document, like abstract, bibliography and such.
 
 
-Format 11
+Format 60
 Style Title
 	Margin                Static
 	LatexType             Command
@@ -18,13 +18,15 @@ Style Title
 	ParSkip               0.4
 	ItemSep               0
 	TopSep                0
-	BottomSep             1
-	ParSep                1
+	BottomSep             0.2
+	ParSep                0.2
 	Align                 Center
 	LabelType             No_Label
 	Font
 	  Size                Largest
 	EndFont
+	HTMLTag               h1
+	HTMLTitle             true
 End
 
 
diff --git a/stdsections.inc b/stdsections.inc
new file mode 100644
index 0000000..31db669
--- /dev/null
+++ b/stdsections.inc
@@ -0,0 +1,95 @@
+# Standard textclass definition file. Taken from initial LyX source code
+# Author : Matthias Ettrich 
+# Transposed by Pascal André 
+# Heavily modifed and enhanced by several developers.
+
+# This include file contains all numbered sectionning-related
+# commands that are useful for article-like document classes, but not
+# for letters.
+
+Format 60
+
+Style Section
+	Category              Sectioning
+	Margin                Dynamic
+	LabelType             Static
+	LabelCounter          section
+	TocLevel              1
+	LatexType             Command
+	LatexName             section
+	NeedProtect           1
+	NextNoIndent          1
+	ToggleIndent          Never
+	LabelSep              xxx
+	ParSkip               0.4
+	TopSep                1.3
+	BottomSep             0.7
+	ParSep                0.7
+	Align                 Block
+	Argument 1
+		LabelString   "Short Title|S"
+		Tooltip       "The section as it appears in the table of contents/running headers"
+		InsertCotext  1
+	EndArgument
+	Font
+	  Series              Bold
+	  Size                Larger
+	EndFont
+	HTMLTag               h2
+End
+
+
+Style Subsection
+	CopyStyle             Section
+	LabelCounter          subsection
+	TocLevel              2
+	LatexName             subsection
+	TopSep                0.9
+	BottomSep             0.5
+	ParSep                0.5
+	Font
+	  Series              Bold
+	  Size                Large
+	EndFont
+	HTMLTag               h3
+End
+
+
+Style Subsubsection
+	CopyStyle             Subsection
+	LabelCounter          subsubsection
+	TocLevel              3
+	LatexName             subsubsection
+	TopSep                0.7
+	BottomSep             0.4
+	Font
+	  Series              Bold
+	  Size                Normal
+	EndFont
+	HTMLTag               h4
+End
+
+
+Style Paragraph
+	CopyStyle             Subsubsection
+	LabelCounter          paragraph
+	TocLevel              4
+	LatexName             paragraph
+	TopSep                0.4
+	BottomSep             0
+	HTMLTag               h5
+End
+
+
+Style Subparagraph
+	CopyStyle             Paragraph
+	LabelCounter          subparagraph
+	TocLevel              5
+	LatexName             subparagraph
+	NextNoIndent          0
+	LeftMargin            MM
+	HTMLTag               h6
+End
+
+Input stdrefprefix.inc
+Input numarticle.inc