X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdinsets.inc;h=4a7cfc308f45a3b53f4b43983cf8c91244b0671f;hb=edaf28fdd6a64ce277a1c5f39d99a6568485887f;hp=c5bf68df38e665b813d3884a31644c1ae50daf09;hpb=f697faf370aee0e59fdc07b74dea65886b1e6ada;p=lyx.git diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index c5bf68df38..4a7cfc308f 100644 --- a/lib/layouts/stdinsets.inc +++ b/lib/layouts/stdinsets.inc @@ -4,12 +4,19 @@ # # Detailed format description is available in the customization manual -Format 60 +Format 100 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 + LabelString Margin LatexType command LatexName marginpar Font @@ -29,16 +36,19 @@ InsetLayout Marginal background-color: #F0F0F0; float:right; font-size: small; - font-weight: medium; + font-weight: normal; font-family: serif; font-variant: normal; font-style: normal; } EndHTMLStyle + AddToToc marginalnote + IsTocCaption true + DocBookTag para End InsetLayout Foot - LabelString foot + LabelString Foot LatexType Command LatexName footnote Counter footnote @@ -63,7 +73,7 @@ InsetLayout Foot div.foot { display: inline; font-size: small; - font-weight: medium; + font-weight: normal; font-family: serif; font-variant: normal; font-style: normal; @@ -76,6 +86,10 @@ InsetLayout Foot padding: 1em; } EndHTMLStyle + AddToToc footnote + IsTocCaption true + DocBookTag footnote + DocBookTagType inline End InsetLayout Foot:InTitle @@ -96,7 +110,7 @@ InsetLayout Foot:InTitle span.foot_intitle { display: inline; font-size: small; - font-weight: medium; + font-weight: normal; font-family: serif; font-variant: normal; font-style: normal; @@ -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 @@ -129,6 +151,9 @@ InsetLayout Note:Comment display: none; } EndHTMLStyle + AddToToc note + IsTocCaption true + NeedCProtect true End @@ -143,6 +168,8 @@ InsetLayout Note:Note EndFont MultiPar true # Not output for XHTML + AddToToc note + IsTocCaption true End @@ -150,8 +177,10 @@ InsetLayout Note:Greyedout LabelString Greyedout LatexType environment LatexName lyxgreyedout + Requires color,lyxgreyedout BgColor greyedoutbg Font + Size Normal Color greyedouttext EndFont LabelFont @@ -170,6 +199,9 @@ InsetLayout Note:Greyedout } EndHTMLStyle HTMLIsBlock false + AddToToc note + IsTocCaption true + NeedCProtect true End InsetLayout ERT @@ -192,6 +224,7 @@ InsetLayout ERT KeepEmpty true FreeSpacing true ForceLTR true + EditExternal true End InsetLayout Phantom @@ -235,11 +268,11 @@ InsetLayout TOC font-weight: bold; } div.lyxtoc-2 { - margin: 0em 0.1em 0em 1em; + margin: 0.5em 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-3 { margin: 0.2em 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; } @@ -277,6 +310,29 @@ InsetLayout TOC:Listings 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 { + margin: 0em 0em 0em 1em; + font-size: large; + font-weight: normal; + } + EndHTMLStyle +End + InsetLayout Include:Listings BabelPreamble \addto\captions$$lang{\renewcommand{\lstlistingname}{_(Listing)}} @@ -310,7 +366,10 @@ InsetLayout Listings KeepEmpty true FreeSpacing true ForceLTR true + ForcePlain true + NeedCProtect true RefPrefix lst + EditExternal true HTMLTag pre HTMLStyle div.float-listings { @@ -325,6 +384,21 @@ InsetLayout Listings 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 @@ -336,6 +410,8 @@ InsetLayout Branch MultiPar true InToc true HTMLIsBlock false + AddToToc branch + IsTocCaption true End InsetLayout Index @@ -352,6 +428,37 @@ InsetLayout Index CustomPars false ForcePlain true ContentAsLabel true + PassThruChars @|! +End + +InsetLayout IndexMacro:see + LabelString See + Decoration classic + Font + Size Small + EndFont + LabelFont + Color indexlabel + Size Small + EndFont + MultiPar false + CustomPars false + ForcePlain true +End + +InsetLayout IndexMacro:seealso + CopyStyle IndexMacro:see + LabelString "See also" +End + +InsetLayout IndexMacro:sortkey + CopyStyle IndexMacro:see + LabelString "Sort as" +End + +InsetLayout IndexMacro:subentry + CopyStyle IndexMacro:see + LabelString "Subentry" End InsetLayout Box @@ -360,6 +467,8 @@ InsetLayout Box Size Small EndFont MultiPar true + DocBookWrapperTag sidebar + DocBookTag para End InsetLayout Box:Frameless @@ -367,6 +476,9 @@ InsetLayout Box:Frameless HTMLStyle div.Frameless { margin: 1em; } EndHTMLStyle + DocBookWrapperTag sidebar + DocBookTag para + DocBookWrapperAttr role='frameless' End InsetLayout Box:Shaded @@ -378,6 +490,9 @@ InsetLayout Box:Shaded padding: 0.5ex; } EndHTMLStyle + DocBookWrapperTag sidebar + DocBookTag para + DocBookWrapperAttr role='shaded' End InsetLayout Box:Boxed @@ -388,6 +503,9 @@ InsetLayout Box:Boxed padding: 0.5ex; } EndHTMLStyle + DocBookWrapperTag sidebar + DocBookTag para + DocBookWrapperAttr role='boxed' End InsetLayout Box:Framed @@ -398,6 +516,9 @@ InsetLayout Box:Framed padding: 0.5ex; } EndHTMLStyle + DocBookWrapperTag sidebar + DocBookTag para + DocBookWrapperAttr role='framed' End InsetLayout Box:ovalbox @@ -408,6 +529,9 @@ InsetLayout Box:ovalbox padding: 0.5ex; } EndHTMLStyle + DocBookWrapperTag sidebar + DocBookTag para + DocBookWrapperAttr role='ovalbox' End InsetLayout Box:Ovalbox @@ -418,6 +542,9 @@ InsetLayout Box:Ovalbox padding: 0.5ex; } EndHTMLStyle + DocBookWrapperTag sidebar + DocBookTag para + DocBookWrapperAttr role='ovalbox-var' End InsetLayout Box:Shadowbox @@ -425,6 +552,9 @@ InsetLayout Box:Shadowbox HTMLStyle div.Shadowbox { border: solid gray medium; border-bottom: solid black 1ex; border-right: solid black 1ex; padding: 0.5ex; } EndHTMLStyle + DocBookWrapperTag sidebar + DocBookTag para + DocBookWrapperAttr role='shadowbox' End InsetLayout Box:Doublebox @@ -435,11 +565,15 @@ InsetLayout Box:Doublebox padding: 0.5ex; } EndHTMLStyle + DocBookWrapperTag sidebar + DocBookTag para + DocBookWrapperAttr role='doublebox' End InsetLayout Float + LaTeXType environment LabelFont - Color collapsable + Color collapsible Size Small EndFont MultiPar true @@ -451,9 +585,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 @@ -482,6 +620,7 @@ InsetLayout "Flex:URL" PassThru true FreeSpacing true ForceLTR true + NeedCProtect true Font Family Typewriter Color urltext @@ -492,12 +631,14 @@ InsetLayout "Flex:URL" Size Small EndFont HTMLIsBlock false + DocBookTag link + DocBookTagType inline End InsetLayout Argument LabelString Argument LabelFont - Color collapsable + Color collapsible Size Small EndFont MultiPar false @@ -511,6 +652,7 @@ InsetLayout Info EndHTMLStyle HTMLTag span MultiPar false + SpellCheck false End InsetLayout Info:menu @@ -524,10 +666,12 @@ InsetLayout Info:menu Font Family sans EndFont - HTMLAttr "class='info menu'" + HTMLClass "info menu" HTMLStyle span.menu { font-family: sans-serif; } EndHTMLStyle + DocBookTag guimenu + DocBookTagType inline End InsetLayout Info:shortcut @@ -541,10 +685,14 @@ InsetLayout Info:shortcut Font Family sans EndFont - HTMLAttr "class='info shortcut'" + HTMLClass "info shortcut" HTMLStyle span.shortcut { font-family: sans-serif; } EndHTMLStyle + DocBookWrapperTag keycombo + DocBookWrapperTagType inline + DocBookTag keycap + DocBookTagType inline End InsetLayout Info:shortcuts @@ -558,10 +706,14 @@ InsetLayout Info:shortcuts Font Family sans EndFont - HTMLAttr "class='info shortcut'" + HTMLClass "info shortcut" HTMLStyle span.shortcuts { font-family: sans-serif; } EndHTMLStyle + DocBookWrapperTag keycombo + DocBookWrapperTagType inline + DocBookTag keycap + DocBookTagType inline End InsetLayout Caption:Standard @@ -574,6 +726,8 @@ InsetLayout Caption:Standard LabelString "Short Title|S" Tooltip "The caption as it appears in the list of figures/tables" InsertCotext 1 + DocBookTag titleabbrev + DocBookArgumentAfterMainTag true EndArgument HTMLStyle div.float-caption { @@ -583,7 +737,7 @@ InsetLayout Caption:Standard margin: 1ex; } EndHTMLStyle - HTMLAttr "class='float-caption float-caption-standard'" + HTMLClass "float-caption float-caption-standard" End @@ -628,7 +782,21 @@ 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 @@ -638,7 +806,6 @@ InsetLayout Tabular display: inline-block; } td { - border: 1px solid black; padding: 0.5ex; } EndHTMLStyle