X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flayouts%2Fstdinsets.inc;h=8a248dfeac815e39c5d3d943f671c1e0ab697383;hb=79f428d201c4d3b216c369d1ced9ff9f5fe28825;hp=58e19a358c30424f00e8829e9bacbb80ecb7750c;hpb=d1e0a0e4ed238b17072ac821231a1698c419108b;p=lyx.git diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index 58e19a358c..8a248dfeac 100644 --- a/lib/layouts/stdinsets.inc +++ b/lib/layouts/stdinsets.inc @@ -2,9 +2,9 @@ # Author : Martin vermeer # Inset layouts definition # -# Detailled format description is available in the customization manual +# Detailed format description is available in the customization manual -Format 30 +Format 45 Provides stdinsets 1 @@ -23,10 +23,10 @@ InsetLayout Marginal NeedProtect true HTMLStyle div.marginal { - border: 2px solid black; - padding: 1ex; - margin: 1ex; - background-color: #F0F0F0; + border: 2px solid black; + padding: 1ex; + margin: 1ex; + background-color: #F0F0F0; float:right; font-size: small; font-weight: medium; @@ -58,8 +58,8 @@ InsetLayout Foot font-weight: bold; text-decoration: underline; } - div.foot { - display: inline; + div.foot { + display: inline; font-size: small; font-weight: medium; font-family: serif; @@ -67,9 +67,9 @@ InsetLayout Foot font-style: normal; } div.foot_inner { display: none; } - div.foot:hover div.foot_inner { - display: block; - border: 1px double black; + div.foot:hover div.foot_inner { + display: block; + border: 1px double black; margin: 0em 1em; padding: 1em; } @@ -86,8 +86,14 @@ InsetLayout Note:Comment Size Small EndFont MultiPar true - HTMLTag !-- - HTMLIsBlock false + Display false + HTMLTag div + HTMLIsBlock true + HTMLStyle + div.note_comment { + display: none; + } + EndHTMLStyle End @@ -119,10 +125,12 @@ InsetLayout Note:Greyedout Size Small EndFont MultiPar true + Display false + HTMLInnerTag div HTMLStyle - div.note_greyedout { + div.note_greyedout { display: inline; - color: #A0A0A0; + color: #A0A0A0; padding-left: 1ex; padding-right: 1ex; } @@ -162,8 +170,93 @@ InsetLayout Phantom 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 0em 0em 1em; + font-size: large; + font-weight: normal; + } + div.lyxtoc-3 { margin: 0em 0em 0em 0.5em; font-size: medium; } + div.lyxtoc-4 { margin: 0em 0em 0em 0.5em; } + div.lyxtoc-5 { margin: 0em 0em 0em 0.5em; } + div.lyxtoc-6 { margin: 0em 0em 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 + 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 +End + InsetLayout Listings - LabelString Listings + CopyStyle Include:Listings + LabelString Listings[[inset]] LatexType none Decoration minimalistic Font @@ -182,6 +275,7 @@ InsetLayout Listings FreeSpacing true ForceLTR true RefPrefix lst + HTMLTag pre End InsetLayout Branch @@ -217,18 +311,81 @@ InsetLayout Box Size Small EndFont MultiPar true +End + +InsetLayout Box:Frameless + CopyStyle Box HTMLStyle - div.Frameless { font-family: sans-serif; } + div.Frameless { margin: 1em; } EndHTMLStyle End InsetLayout Box:Shaded - BgColor shaded - LabelFont - Color foreground - Size Small - EndFont - MultiPar true + 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 @@ -253,7 +410,7 @@ InsetLayout Wrap MultiPar true RefPrefix wrap HTMLStyle - div.wrap { + div.wrap { float: right; border: 2px solid black; padding: 1ex; @@ -262,7 +419,7 @@ InsetLayout Wrap EndHTMLStyle End -InsetLayout URL +InsetLayout "Flex:URL" LyXType standard Decoration classic LabelString URL @@ -276,6 +433,7 @@ InsetLayout URL PassThru true FreeSpacing true ForceLTR true + ResetsFont false Font Family Typewriter Color urltext @@ -289,12 +447,13 @@ InsetLayout URL End InsetLayout Argument - LabelString opt + LabelString Argument LabelFont Color collapsable Size Small EndFont MultiPar false + ForceLocalFontSwitch 1 End InsetLayout Info @@ -302,8 +461,8 @@ InsetLayout Info HTMLStyle span.info { font-family: sans-serif; } EndHTMLStyle - HTMLTag span - MultiPar false + HTMLTag span + MultiPar false End InsetLayout Info:menu @@ -317,7 +476,7 @@ InsetLayout Info:menu Font Family sans EndFont - HTMLAttr "class='info menu'" + HTMLAttr "class='info menu'" HTMLStyle span.menu { font-family: sans-serif; } EndHTMLStyle @@ -334,7 +493,7 @@ InsetLayout Info:shortcut Font Family sans EndFont - HTMLAttr "class='info shortcut'" + HTMLAttr "class='info shortcut'" HTMLStyle span.shortcut { font-family: sans-serif; } EndHTMLStyle @@ -351,13 +510,20 @@ InsetLayout Info:shortcuts Font Family sans EndFont - HTMLAttr "class='info shortcut'" + HTMLAttr "class='info shortcut'" HTMLStyle span.shortcuts { font-family: sans-serif; } EndHTMLStyle End -InsetLayout Caption +InsetLayout Caption:Standard + LabelString standard + LaTeXType command + LatexName caption + Argument 1 + LabelString "Short Title|S" + Tooltip "The caption as it appears in the list of figures/tables" + EndArgument HTMLStyle div.float-caption { text-align: center; @@ -366,6 +532,17 @@ InsetLayout Caption margin: 1ex; } EndHTMLStyle + HTMLAttr "class='float-caption float-caption-standard'" +End + + +InsetLayout Caption:LongTableNoNumber + CopyStyle Caption:Standard + LatexName caption* + Argument 1 + LabelString "Long Table Caption (unnumbered)" + Tooltip "The caption as it appears in the list of tables" + EndArgument End @@ -374,3 +551,27 @@ InsetLayout 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