X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdinsets.inc;h=04c464a1e3b4ca01541ca73fbb6e00dceb21417a;hb=761648b1f7d1df9de87921143b8004b6d3dd21e9;hp=bd6114dfad5852cfd72850f6a71f24678789db02;hpb=1e18ab586e0cd4abd171b63c55e6b91c0f0d424a;p=lyx.git diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index bd6114dfad..04c464a1e3 100644 --- a/lib/layouts/stdinsets.inc +++ b/lib/layouts/stdinsets.inc @@ -4,10 +4,17 @@ # # Detailed format description is available in the customization manual -Format 53 +Format 82 Provides stdinsets 1 +OutlinerName marginalnote "Marginal notes" +OutlinerName footnote "Footnotes" +OutlinerName note "Notes" +OutlinerName branch "Branches" +OutlinerName index "Index Entries" #no AddToToc (built-in) +OutlinerName listing "Listings" #no AddToToc (built-in) + InsetLayout Marginal LabelString margin LatexType command @@ -35,6 +42,10 @@ InsetLayout Marginal font-style: normal; } EndHTMLStyle + AddToToc marginalnote + IsTocCaption true + DocBookTag sidebar + DocBookAttr role="margin" End InsetLayout Foot @@ -76,6 +87,9 @@ InsetLayout Foot padding: 1em; } EndHTMLStyle + AddToToc footnote + IsTocCaption true + DocBookTag footnote End InsetLayout Foot:InTitle @@ -111,10 +125,18 @@ InsetLayout Foot:InTitle EndHTMLStyle End +InsetLayout Foot:InFloatTable + CopyStyle Foot + LatexName tablefootnote + Requires tablefootnote +End + + InsetLayout Note:Comment LabelString Comment LatexType environment LatexName comment + Requires verbatim BgColor commentbg LabelFont Color comment @@ -124,11 +146,14 @@ InsetLayout Note:Comment Display false HTMLTag div HTMLIsBlock true - HTMLStyle - div.note_comment { - display: none; - } - EndHTMLStyle + HTMLStyle + div.note_comment { + display: none; + } + EndHTMLStyle + AddToToc note + IsTocCaption true + NeedCProtect true End @@ -142,8 +167,9 @@ InsetLayout Note:Note Size Small EndFont MultiPar true - HTMLIsBlock false -# FIXME HTML Need CSS + # Not output for XHTML + AddToToc note + IsTocCaption true End @@ -151,6 +177,7 @@ InsetLayout Note:Greyedout LabelString Greyedout LatexType environment LatexName lyxgreyedout + Requires color,lyxgreyedout BgColor greyedoutbg Font Color greyedouttext @@ -171,6 +198,9 @@ InsetLayout Note:Greyedout } EndHTMLStyle HTMLIsBlock false + AddToToc note + IsTocCaption true + NeedCProtect true End InsetLayout ERT @@ -193,6 +223,7 @@ InsetLayout ERT KeepEmpty true FreeSpacing true ForceLTR true + EditExternal true End InsetLayout Phantom @@ -267,6 +298,30 @@ InsetLayout TOC:Listings 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 TOC:MintedListings + # "List of Listings" is the name of the "List of listings" + # in minted.sty so it must be used here as well. + BabelPreamble + \addto\captions$$lang{\renewcommand{\listoflistingscaption}{_(List of Listings)}} + EndBabelPreamble + # The command does not need to be defined in LangPreamble, since + # minted.sty does that already. However it needs to be redefined + # in order to be used for non-english single-language documents. + LangPreamble + \renewcommand{\listoflistingscaption}{_(List of Listings)} + EndLangPreamble + FixedWidthPreambleEncoding false HTMLTag h2 HTMLStyle div.lyxtoc-flat { @@ -287,6 +342,7 @@ InsetLayout Include:Listings LangPreamble \renewcommand{\lstlistingname}{_(Listing)} EndLangPreamble + FixedWidthPreambleEncoding true End InsetLayout Listings @@ -309,8 +365,38 @@ InsetLayout Listings KeepEmpty true FreeSpacing true ForceLTR true + ForcePlain true + NeedCProtect true RefPrefix lst HTMLTag pre + HTMLStyle + div.float-listings { + border: 2px solid black; + padding: 1ex; + margin: 1ex; + } + div.listings-caption { + text-align: center; + border: 2px solid black; + padding: 1ex; + margin: 1ex; + } + EndHTMLStyle + DocBookTag programlisting +End + +InsetLayout MintedListings + CopyStyle Listings + BabelPreamble + \addto\captions$$lang{\renewcommand{\listingscaption}{_(Listing)}} + EndBabelPreamble + # The command does not need to be defined in LangPreamble, since + # minted.sty does that already. However it needs to be redefined + # in order to be used for non-english single-language documents. + LangPreamble + \renewcommand{\listingscaption}{_(Listing)} + EndLangPreamble + FixedWidthPreambleEncoding false End InsetLayout Branch @@ -322,6 +408,8 @@ InsetLayout Branch MultiPar true InToc true HTMLIsBlock false + AddToToc branch + IsTocCaption true End InsetLayout Index @@ -338,6 +426,7 @@ InsetLayout Index CustomPars false ForcePlain true ContentAsLabel true + PassThruChars @|! End InsetLayout Box @@ -424,8 +513,9 @@ InsetLayout Box:Doublebox End InsetLayout Float + LaTeXType environment LabelFont - Color collapsable + Color collapsible Size Small EndFont MultiPar true @@ -437,9 +527,13 @@ InsetLayout Float EndHTMLStyle End +#InsetWrap requires these, independently of whether stdfloats.inc is included +OutlinerName table "Tables" #no AddToToc (built-in) +OutlinerName figure "Figures" #no AddToToc (built-in) + InsetLayout Wrap LabelFont - Color collapsable + Color collapsible Size Small EndFont MultiPar true @@ -468,6 +562,7 @@ InsetLayout "Flex:URL" PassThru true FreeSpacing true ForceLTR true + NeedCProtect true Font Family Typewriter Color urltext @@ -478,12 +573,13 @@ InsetLayout "Flex:URL" Size Small EndFont HTMLIsBlock false + DocBookTag link End InsetLayout Argument LabelString Argument LabelFont - Color collapsable + Color collapsible Size Small EndFont MultiPar false @@ -555,9 +651,11 @@ InsetLayout Caption: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 { @@ -571,7 +669,7 @@ InsetLayout Caption:Standard End -InsetLayout Caption:LongTableNoNumber +InsetLayout Caption:Unnumbered CopyStyle Caption:Standard LabelString unlabelled LatexName caption* @@ -612,5 +710,32 @@ End InsetLayout PrintNomencl - HTMLTag h2 + BabelPreamble + \addto\captions$$lang{% + \def\eqdeclaration#1{, _(see equation[[nomencl]])\nobreakspace(#1)}% + \def\pagedeclaration#1{, _(page[[nomencl]])\nobreakspace#1}% + \def\nomname{_(Nomenclature[[output]])}% + } + EndBabelPreamble + # The command is defined for several languages in nomencl.sty. However, we need to define + # it anyway for the other, non suppported languages. + LangPreamble + \def\eqdeclaration#1{, _(see equation[[nomencl]])\nobreakspace(#1)} + \def\pagedeclaration#1{, _(page[[nomencl]])\nobreakspace#1} + \def\nomname{_(Nomenclature[[output]])} + EndLangPreamble + HTMLTag h2 +End + +InsetLayout Tabular + HTMLStyle + table { + border-collapse: collapse; + display: inline-block; + } + td { + border: 1px solid black; + padding: 0.5ex; + } + EndHTMLStyle End