X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdinsets.inc;h=89c8d6bdaec0d8d47a17e420d418f9a061179e1d;hb=39d569661a3f4411d4501f9a8db9c7360ef5d568;hp=79d008d22c605fa146a1fcda5bca44f561c98914;hpb=0a06e2a131d12157ae9efc38dcaa2f55e2c793ae;p=lyx.git diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index 79d008d22c..89c8d6bdae 100644 --- a/lib/layouts/stdinsets.inc +++ b/lib/layouts/stdinsets.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 - -Format 16 +# Detailled format description is available in the customization manual + +Format 35 Provides stdinsets 1 @@ -62,62 +13,63 @@ InsetLayout Marginal LatexType command LatexName marginpar Font - Color foreground Size Small - Family Roman - Shape Up - Series Medium - Misc No_Emph - Misc No_Noun - Misc No_Bar EndFont LabelFont Color marginlabel 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 - LatexName footnote Counter footnote Font - Color foreground Size Small - Family Roman - Shape Up - Series Medium - Misc No_Emph - Misc No_Noun - Misc No_Bar EndFont LabelFont Color footlabel Size Small EndFont MultiPar true - HTMLTag span - HTMLAttr class='footwrapper' - HTMLLabel "\arabic{footnote}" - HTMLInnerTag span - HTMLInnerAttr class='footnote' + RefPrefix fn + HTMLLabel \arabic{footnote} + HTMLInnerTag div HTMLStyle - span.notenum { - vertical-align: super; - font-size: smaller; + span.foot_label { + vertical-align: super; + font-size: smaller; + font-weight: bold; + text-decoration: underline; } - span.footnote { - display: none; - font-size: medium; - font-weight: normal; - font-style: normal; + div.foot { + display: inline; + font-size: small; + font-weight: medium; + font-family: serif; font-variant: normal; + font-style: normal; } - span.footwrapper:hover span.footnote { - display: block; - border: 1px double black; + div.foot_inner { display: none; } + div.foot:hover div.foot_inner { + display: block; + border: 1px double black; margin: 0em 1em; padding: 1em; } @@ -125,7 +77,7 @@ InsetLayout Foot End InsetLayout Note:Comment - LabelString comment + LabelString Comment LatexType environment LatexName comment BgColor commentbg @@ -134,12 +86,14 @@ InsetLayout Note:Comment Size Small EndFont MultiPar true + Display false HTMLTag !-- + HTMLIsBlock false End InsetLayout Note:Note - LabelString note + LabelString Note LatexType command LatexName note BgColor notebg @@ -148,23 +102,34 @@ InsetLayout Note:Note Size Small EndFont MultiPar true + HTMLIsBlock false +# FIXME HTML Need CSS End + InsetLayout Note:Greyedout - LabelString greyedout + LabelString Greyedout LatexType environment LatexName lyxgreyedout BgColor greyedoutbg + Font + Color greyedouttext + EndFont LabelFont Color greyedout Size Small EndFont MultiPar true - HTMLTag span - HTMLAttr class='notegrey' + Display false HTMLStyle - span.notegrey { color: gray; } + div.note_greyedout { + display: inline; + color: #A0A0A0; + padding-left: 1ex; + padding-right: 1ex; + } EndHTMLStyle + HTMLIsBlock false End InsetLayout ERT @@ -183,6 +148,7 @@ InsetLayout ERT CustomPars false ForcePlain true PassThru true + ParbreakIsNewline true KeepEmpty true FreeSpacing true ForceLTR true @@ -193,6 +159,7 @@ InsetLayout Phantom Font Color phantomtext EndFont + MultiPar false CustomPars false ForcePlain true End @@ -212,9 +179,11 @@ InsetLayout Listings BgColor listingsbg MultiPar true PassThru true + ParbreakIsNewline true KeepEmpty true FreeSpacing true ForceLTR true + RefPrefix lst End InsetLayout Branch @@ -225,22 +194,14 @@ InsetLayout Branch EndFont MultiPar true InToc true + HTMLIsBlock false End InsetLayout Index LabelString Idx - LatexType command - LatexName index Decoration classic Font - Color foreground Size Small - Family Roman - Shape Up - Series Medium - Misc No_Emph - Misc No_Noun - Misc No_Bar EndFont LabelFont Color indexlabel @@ -249,7 +210,7 @@ InsetLayout Index MultiPar false CustomPars false ForcePlain true - NeedProtect true + ContentAsLabel true End InsetLayout Box @@ -260,13 +221,79 @@ InsetLayout Box MultiPar true End +InsetLayout Box:Frameless + CopyStyle Box + HTMLStyle + 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 @@ -275,6 +302,12 @@ InsetLayout Float Size Small EndFont MultiPar true + HTMLStyle + div.float { + border: 2px solid black; + text-align: center; + } + EndHTMLStyle End InsetLayout Wrap @@ -283,15 +316,30 @@ InsetLayout Wrap Size Small EndFont MultiPar true + RefPrefix wrap + HTMLStyle + div.wrap { + float: right; + border: 2px solid black; + padding: 1ex; + margin: 1ex; + } + EndHTMLStyle End -InsetLayout URL +InsetLayout "Flex:URL" LyXType standard - LatexName url - LatexType command 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 @@ -302,10 +350,10 @@ InsetLayout URL Color urllabel Size Small EndFont - Requires url + HTMLIsBlock false End -InsetLayout OptArg +InsetLayout Argument LabelString opt LabelFont Color collapsable @@ -316,9 +364,15 @@ 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 @@ -328,9 +382,14 @@ InsetLayout Info:menu 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 @@ -340,9 +399,14 @@ InsetLayout Info:shortcut 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 @@ -352,10 +416,26 @@ InsetLayout Info:shortcuts Font Family sans EndFont + HTMLAttr "class='info shortcut'" + HTMLStyle + span.shortcuts { font-family: sans-serif; } + EndHTMLStyle End -InsetLayout Box +InsetLayout Caption HTMLStyle - span.Frameless { font-family: sans-serif; } + div.float-caption { + text-align: center; + border: 2px solid black; + padding: 1ex; + margin: 1ex; + } EndHTMLStyle End + + +InsetLayout Preview + LabelString Preview + Decoration minimalistic + MultiPar true +End