From 1ec87298ff499386a1276cdde6ba113dd191c1e6 Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Fri, 10 May 2019 02:16:56 +0200 Subject: [PATCH] Migrate the existing layouts to the new DocBook attributes. --- lib/layouts/agu_stdclass.inc | 49 ++++++++---------------- lib/layouts/agu_stdtitle.inc | 49 +++++++++--------------- lib/layouts/amsbook.layout | 3 +- lib/layouts/article.layout | 3 +- lib/layouts/book.layout | 8 ++-- lib/layouts/recipebook.layout | 3 +- lib/layouts/scrbook.layout | 3 +- lib/layouts/stdclass.inc | 3 +- lib/layouts/stdfloats.inc | 5 ++- lib/layouts/stdinsets.inc | 7 +++- lib/layouts/stdlayouts.inc | 9 ++++- lib/layouts/stdlists.inc | 13 ++++++- lib/layouts/stdsections.inc | 9 ++++- lib/layouts/stdstarsections.inc | 30 ++++++++++++++- lib/layouts/stdstruct.inc | 7 +++- lib/layouts/stdtitle.inc | 10 ++++- lib/layouts/theorems-ams-bytype.inc | 4 +- lib/layouts/theorems-ams-chap-bytype.inc | 4 +- lib/layouts/theorems-ams.inc | 4 +- lib/layouts/theorems-bytype.inc | 4 +- lib/layouts/tufte-book.layout | 3 +- 21 files changed, 145 insertions(+), 85 deletions(-) diff --git a/lib/layouts/agu_stdclass.inc b/lib/layouts/agu_stdclass.inc index 3dbc5bc9b3..a699bedf9f 100644 --- a/lib/layouts/agu_stdclass.inc +++ b/lib/layouts/agu_stdclass.inc @@ -6,7 +6,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 81 +Format 82 OutputType docbook Columns 1 @@ -33,10 +33,9 @@ End InsetLayout Flex:Firstname - LyXType element LabelString Firstname LatexType Command - LatexName firstname + DocBookTag firstname Font Shape SmallCaps EndFont @@ -48,10 +47,9 @@ InsetLayout Flex:Firstname End InsetLayout Flex:Fname - LyXType element LabelString Fname LatexType Command - LatexName fname + DocBookTag fname Font Shape SmallCaps EndFont @@ -64,10 +62,9 @@ End InsetLayout Flex:Surname - LyXType element LabelString Surname LatexType Command - LatexName surname + DocBookTag surname Font Shape SmallCaps EndFont @@ -80,10 +77,9 @@ End InsetLayout Flex:Filename - LyXType element LabelString Filename LatexType Command - LatexName filename + DocBookTag filename Font Family Typewriter EndFont @@ -96,10 +92,9 @@ End InsetLayout Flex:Literal - LyXType element LabelString Literal LatexType Command - LatexName literal + DocBookTag literal Font Family Typewriter EndFont @@ -112,11 +107,10 @@ End InsetLayout Flex:Emph - LyXType element LabelString Emph LatexType Command - LatexName emph - LatexParam "type=" + DocBookTag emph + DocBookAttr "type='italic'" Font Shape Italic EndFont @@ -129,10 +123,9 @@ End InsetLayout Flex:Abbrev - LyXType element LabelString Abbrev LatexType Command - LatexName abbrev + DocBookTag abbrev LabelFont Color blue EndFont @@ -141,10 +134,9 @@ End InsetLayout Flex:Citation-number - LyXType element LabelString Citation-number LatexType Command - LatexName citation-number + DocBookTag citation-number LabelFont Color blue EndFont @@ -153,10 +145,9 @@ End InsetLayout Flex:Volume - LyXType element LabelString Volume LatexType Command - LatexName volume + DocBookTag volume LabelFont Color blue EndFont @@ -165,10 +156,9 @@ End InsetLayout Flex:Day - LyXType element LabelString Day LatexType Command - LatexName day + DocBookTag day LabelFont Color blue EndFont @@ -177,10 +167,9 @@ End InsetLayout Flex:Month - LyXType element LabelString Month LatexType Command - LatexName month + DocBookTag month LabelFont Color blue EndFont @@ -189,10 +178,9 @@ End InsetLayout Flex:Year - LyXType element LabelString Year LatexType Command - LatexName year + DocBookTag year LabelFont Color blue EndFont @@ -201,10 +189,9 @@ End InsetLayout Flex:Issue-number - LyXType element LabelString Issue-number LatexType Command - LatexName issue-number + DocBookTag issue-number LabelFont Color blue EndFont @@ -213,10 +200,9 @@ End InsetLayout Flex:Issue-day - LyXType element LabelString Issue-day LatexType Command - LatexName issue-day + DocBookTag issue-day LabelFont Color blue EndFont @@ -225,10 +211,9 @@ End InsetLayout Flex:Issue-months - LyXType element LabelString Issue-months LatexType Command - LatexName issue-months + DocBookTag issue-months LabelFont Color blue EndFont diff --git a/lib/layouts/agu_stdtitle.inc b/lib/layouts/agu_stdtitle.inc index dcd0441017..949f63f57b 100644 --- a/lib/layouts/agu_stdtitle.inc +++ b/lib/layouts/agu_stdtitle.inc @@ -6,7 +6,7 @@ # It is desirable, as far as possible, to have the same look and feel for # related layouts in latex and docbook. -Format 81 +Format 82 Input stdtitle.inc @@ -320,10 +320,10 @@ End # Inside AGU-journal: InsetLayout Flex:ISSN - LyXType element LabelString ISSN LatexType Command - LatexName ISSN + DocBookTag biblioid + DocBookAttr "class='issn'" LabelFont Color blue EndFont @@ -332,10 +332,10 @@ End InsetLayout Flex:CODEN - LyXType element LabelString CODEN LatexType Command - LatexName CODEN + DocBookTag biblioid + DocBookAttr "class='coden'" LabelFont Color blue EndFont @@ -345,10 +345,9 @@ End # Inside Special-section: InsetLayout Flex:SS-Code - LyXType element LabelString SS-Code LatexType Command - LatexName ss-code + DocBookTag ss-code LabelFont Color blue EndFont @@ -357,10 +356,9 @@ End InsetLayout Flex:SS-Title - LyXType element LabelString SS-Title LatexType Command - LatexName ss-title + DocBookTag ss-title LabelFont Color blue EndFont @@ -370,10 +368,9 @@ End # Inside Copyright: InsetLayout Flex:CCC-Code - LyXType element LabelString CCC-Code LatexType Command - LatexName CCCcode + DocBookTag CCCcode LabelFont Color blue EndFont @@ -384,10 +381,9 @@ End # Inside Index-term: InsetLayout Flex:Code - LyXType element LabelString Code LatexType Command - LatexName code + DocBookTag code LabelFont Color blue EndFont @@ -396,10 +392,9 @@ End InsetLayout Flex:Dscr - LyXType element LabelString Dscr LatexType Command - LatexName dscr + DocBookTag dscr LabelFont Color blue EndFont @@ -409,10 +404,9 @@ End # Inside Keywords: InsetLayout Flex:Keyword - LyXType element LabelString Keyword LatexType Command - LatexName keyword + DocBookTag keyword LabelFont Color blue EndFont @@ -422,10 +416,9 @@ End #inside Affiliation: InsetLayout Flex:Orgdiv - LyXType element LabelString Orgdiv LatexType Command - LatexName orgdiv + DocBookTag orgdiv LabelFont Color blue EndFont @@ -434,10 +427,9 @@ End InsetLayout Flex:Orgname - LyXType element LabelString Orgname LatexType Command - LatexName orgname + DocBookTag orgname LabelFont Color blue EndFont @@ -446,10 +438,9 @@ End InsetLayout Flex:Street - LyXType element LabelString Street LatexType Command - LatexName street + DocBookTag street LabelFont Color blue EndFont @@ -458,10 +449,9 @@ End InsetLayout Flex:City - LyXType element LabelString City LatexType Command - LatexName city + DocBookTag city LabelFont Color blue EndFont @@ -470,10 +460,9 @@ End InsetLayout Flex:State - LyXType element LabelString State LatexType Command - LatexName state + DocBookTag state LabelFont Color blue EndFont @@ -482,10 +471,9 @@ End InsetLayout Flex:Postcode - LyXType element LabelString Postcode LatexType Command - LatexName postcode + DocBookTag postcode LabelFont Color blue EndFont @@ -494,10 +482,9 @@ End InsetLayout Flex:Country - LyXType element LabelString Country LatexType Command - LatexName country + DocBookTag country LabelFont Color blue EndFont diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout index 465fbade64..995d7ea3a3 100644 --- a/lib/layouts/amsbook.layout +++ b/lib/layouts/amsbook.layout @@ -12,11 +12,12 @@ # Moved "number within sections" to modules Aug '09 (Paul Rubin ) -Format 81 +Format 82 Columns 1 Sides 2 PageStyle Headers +DocBookRoot book Provides amsmath 1 Provides makeidx 1 diff --git a/lib/layouts/article.layout b/lib/layouts/article.layout index bf8b247701..56c4101f81 100644 --- a/lib/layouts/article.layout +++ b/lib/layouts/article.layout @@ -6,11 +6,12 @@ # Transposed by Pascal André # Heavily modifed and enhanced by serveral developers. -Format 81 +Format 82 Input stdclass.inc SecNumDepth 3 TocDepth 3 +DocBookRoot article NoStyle Chapter NoCounter chapter diff --git a/lib/layouts/book.layout b/lib/layouts/book.layout index 4ed513f50e..5940fd2f90 100644 --- a/lib/layouts/book.layout +++ b/lib/layouts/book.layout @@ -7,13 +7,15 @@ # Heavily modifed and enhanced by serveral developers. -Format 81 +Format 82 Input stdclass.inc Input numreport.inc -Sides 2 -PageStyle Headings +Sides 2 +PageStyle Headings +DocBookRoot book +DocBookForceAbstract true NoStyle Abstract diff --git a/lib/layouts/recipebook.layout b/lib/layouts/recipebook.layout index 56068348a5..bba29736e4 100644 --- a/lib/layouts/recipebook.layout +++ b/lib/layouts/recipebook.layout @@ -27,7 +27,7 @@ # Another command, \ingred{...}, is defined to typeset a # list of ingredients. -Format 81 +Format 82 Input scrclass.inc Input numreport.inc @@ -35,6 +35,7 @@ Input numreport.inc SecNumDepth 2 TocDepth 3 PageStyle Headings +DocBookRoot book # There is no abstract environment in scrbook.cls NoStyle Abstract diff --git a/lib/layouts/scrbook.layout b/lib/layouts/scrbook.layout index 7b22e66049..cf5a7a15d9 100644 --- a/lib/layouts/scrbook.layout +++ b/lib/layouts/scrbook.layout @@ -4,12 +4,13 @@ # KOMA scrbook textclass definition file. # Bernd Rellermeyer <100.41728@germanynet.de>, 1998/7/11. -Format 81 +Format 82 Input scrclass.inc Input numreport.inc Sides 2 PageStyle Headings +DocBookRoot book NoStyle Abstract diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc index c03389c99f..ba7229c4b1 100644 --- a/lib/layouts/stdclass.inc +++ b/lib/layouts/stdclass.inc @@ -7,7 +7,7 @@ # ``standard'' layouts, like article and friends. -Format 81 +Format 82 Columns 1 Sides 1 SecNumDepth 2 @@ -41,6 +41,7 @@ Style Standard margin-bottom: 2ex; } EndHTMLStyle + DocBookTag para End #Input stdcharstyles.inc diff --git a/lib/layouts/stdfloats.inc b/lib/layouts/stdfloats.inc index a74c0b5478..cd6614a8da 100644 --- a/lib/layouts/stdfloats.inc +++ b/lib/layouts/stdfloats.inc @@ -4,7 +4,7 @@ # in most LyX layouts. -Format 81 +Format 82 Input stdfloatnames.inc @@ -20,6 +20,7 @@ Float UsesFloatPkg false ListCommand listoftables RefPrefix tab + DocBookTag table End @@ -35,6 +36,7 @@ Float UsesFloatPkg false ListCommand listoffigures RefPrefix fig + DocBookTag figure End @@ -49,6 +51,7 @@ Float IsPredefined false UsesFloatPkg true RefPrefix alg + DocBookTag figure # TODO: No DocBook tag really corresponds... End diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index 695d562757..04c464a1e3 100644 --- a/lib/layouts/stdinsets.inc +++ b/lib/layouts/stdinsets.inc @@ -4,7 +4,7 @@ # # Detailed format description is available in the customization manual -Format 81 +Format 82 Provides stdinsets 1 @@ -44,6 +44,8 @@ InsetLayout Marginal EndHTMLStyle AddToToc marginalnote IsTocCaption true + DocBookTag sidebar + DocBookAttr role="margin" End InsetLayout Foot @@ -87,6 +89,7 @@ InsetLayout Foot EndHTMLStyle AddToToc footnote IsTocCaption true + DocBookTag footnote End InsetLayout Foot:InTitle @@ -379,6 +382,7 @@ InsetLayout Listings margin: 1ex; } EndHTMLStyle + DocBookTag programlisting End InsetLayout MintedListings @@ -569,6 +573,7 @@ InsetLayout "Flex:URL" Size Small EndFont HTMLIsBlock false + DocBookTag link End InsetLayout Argument diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc index c7f2be4411..3b10ff4143 100644 --- a/lib/layouts/stdlayouts.inc +++ b/lib/layouts/stdlayouts.inc @@ -7,7 +7,7 @@ # quotations and such. -Format 81 +Format 82 Style Quotation Category MainText @@ -28,6 +28,8 @@ Style Quotation AlignPossible Block, Left, Right, Center HTMLTag blockquote HTMLItem div + DocBookTag blockquote + DocBookItemTag para End @@ -48,6 +50,8 @@ Style Quote LabelType No_Label HTMLTag blockquote HTMLItem div + DocBookTag blockquote + DocBookItemTag para End @@ -70,6 +74,8 @@ Style Verse LabelType No_Label HTMLTag blockquote HTMLItem p + DocBookTag literallayout + DocBookItemTag para End @@ -94,6 +100,7 @@ Style Verbatim EndFont HTMLTag pre HTMLItem p + DocBookTag programlisting End diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc index a101c30de6..0eef65c665 100644 --- a/lib/layouts/stdlists.inc +++ b/lib/layouts/stdlists.inc @@ -6,7 +6,7 @@ # This include files contains various standard environments for lists. -Format 81 +Format 82 Input stdlyxlist.inc @@ -43,6 +43,9 @@ Style Itemize Color latex EndFont EndArgument + DocBookTag itemizedlist + DocBookItemTag listitem + DocBookItemInnerTag para End @@ -82,6 +85,9 @@ Style Enumerate Color latex EndFont EndArgument + DocBookTag orderedlist + DocBookItemTag listitem + DocBookItemInnerTag para End Style Description @@ -121,6 +127,11 @@ Style Description Color latex EndFont EndArgument + DocBookTag variablelist + DocBookItemWrapperTag varlistentry + DocBookItemTag listitem + DocBookItemInnerTag para + DocBookItemLabelTag term End diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc index 33ef621749..fa42eacb28 100644 --- a/lib/layouts/stdsections.inc +++ b/lib/layouts/stdsections.inc @@ -7,7 +7,7 @@ # commands that are useful for article-like document classes, but not # for letters. -Format 81 +Format 82 Style Part Category Sectioning @@ -39,6 +39,9 @@ Style Part Size Huge EndFont HTMLTag h1 + DocBookTag title + DocBookSectionTag part + DocBookForceAbstractTag partintro End @@ -71,6 +74,8 @@ Style Chapter Size Huge EndFont HTMLTag h1 + DocBookTag title + DocBookSectionTag chapter End @@ -102,6 +107,8 @@ Style Section Size Larger EndFont HTMLTag h2 + DocBookTag title + DocBookSectionTag section End diff --git a/lib/layouts/stdstarsections.inc b/lib/layouts/stdstarsections.inc index 65da20a63e..7d6865fe36 100644 --- a/lib/layouts/stdstarsections.inc +++ b/lib/layouts/stdstarsections.inc @@ -9,7 +9,7 @@ # modifying the style of the regular sectioning layouts. -Format 81 +Format 82 Style Part* CopyStyle Part Category Unnumbered @@ -18,6 +18,10 @@ Style Part* LabelType No_Label LabelCounter "" ResetArgs 1 + DocBookTag bridgehead + DocBookAttr renderas="part" + DocBookSectionTag NONE + DocBookForceAbstractTag NONE End @@ -29,6 +33,10 @@ Style Chapter* LabelType No_Label LabelCounter "" ResetArgs 1 + DocBookTag bridgehead + DocBookAttr renderas="chapter" + DocBookSectionTag NONE + DocBookForceAbstractTag NONE End @@ -40,6 +48,10 @@ Style Section* LabelType No_Label LabelCounter "" ResetArgs 1 + DocBookTag bridgehead + DocBookAttr renderas="sect1" + DocBookSectionTag NONE + DocBookForceAbstractTag NONE End @@ -51,6 +63,10 @@ Style Subsection* LabelType No_Label LabelCounter "" ResetArgs 1 + DocBookTag bridgehead + DocBookAttr renderas="sect2" + DocBookSectionTag NONE + DocBookForceAbstractTag NONE End @@ -62,6 +78,10 @@ Style Subsubsection* LabelType No_Label LabelCounter "" ResetArgs 1 + DocBookTag bridgehead + DocBookAttr renderas="sect3" + DocBookSectionTag NONE + DocBookForceAbstractTag NONE End @@ -73,6 +93,10 @@ Style Paragraph* LabelType No_Label LabelCounter "" ResetArgs 1 + DocBookTag bridgehead + DocBookAttr renderas="sect4" + DocBookSectionTag NONE + DocBookForceAbstractTag NONE End @@ -84,4 +108,8 @@ Style Subparagraph* LabelType No_Label LabelCounter "" ResetArgs 1 + DocBookTag bridgehead + DocBookAttr renderas="sect5" + DocBookSectionTag NONE + DocBookForceAbstractTag NONE End diff --git a/lib/layouts/stdstruct.inc b/lib/layouts/stdstruct.inc index 419073a6f6..83d46e9935 100644 --- a/lib/layouts/stdstruct.inc +++ b/lib/layouts/stdstruct.inc @@ -8,7 +8,8 @@ # a document, like abstract, bibliography and such. -Format 81 +Format 82 + Style Abstract Margin Static LatexType Environment @@ -48,6 +49,9 @@ Style Abstract font-weight: bold; } EndHTMLStyle + DocBookTag abstract + DocBookItemTag para + DocBookInInfo always End @@ -93,4 +97,5 @@ Style Bibliography Color latex EndFont EndArgument + DocBookTag bibliography End diff --git a/lib/layouts/stdtitle.inc b/lib/layouts/stdtitle.inc index ee3184ce4b..ad989a6767 100644 --- a/lib/layouts/stdtitle.inc +++ b/lib/layouts/stdtitle.inc @@ -8,8 +8,7 @@ # a document, like title, author and such. -Format 81 - +Format 82 Style Title Margin Static @@ -29,6 +28,8 @@ Style Title EndFont HTMLTag h1 HTMLTitle true + DocBookTag title + DocBookInInfo maybe End @@ -48,6 +49,9 @@ Style Author Font Size Large EndFont + DocBookTag personname + DocBookWrapperTag author + DocBookInInfo always End @@ -67,4 +71,6 @@ Style Date Font Size Large EndFont + DocBookTag date + DocBookInInfo always End diff --git a/lib/layouts/theorems-ams-bytype.inc b/lib/layouts/theorems-ams-bytype.inc index f6bc7838ed..a306f15962 100644 --- a/lib/layouts/theorems-ams-bytype.inc +++ b/lib/layouts/theorems-ams-bytype.inc @@ -22,7 +22,7 @@ # - Case (by inclusion) # We need separate counters for each theorem-like style. -Format 81 +Format 82 Counter theorem GuiName Theorem End @@ -327,6 +327,8 @@ Style Remark \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}} EndBabelPreamble LabelCounter remark + DocBookTag note + DocBookItemTag para End diff --git a/lib/layouts/theorems-ams-chap-bytype.inc b/lib/layouts/theorems-ams-chap-bytype.inc index 54eb17c4de..ffca387af0 100644 --- a/lib/layouts/theorems-ams-chap-bytype.inc +++ b/lib/layouts/theorems-ams-chap-bytype.inc @@ -24,7 +24,7 @@ # We need separate counters for each theorem-like style. -Format 81 +Format 82 Counter theorem GuiName Theorem End @@ -377,6 +377,8 @@ Style Remark \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}} EndBabelPreamble LabelCounter remark + DocBookTag note + DocBookItemTag para End diff --git a/lib/layouts/theorems-ams.inc b/lib/layouts/theorems-ams.inc index 64cc9ecde5..99fcbf9149 100644 --- a/lib/layouts/theorems-ams.inc +++ b/lib/layouts/theorems-ams.inc @@ -20,7 +20,7 @@ # - Proof # - Case (by inclusion) -Format 81 +Format 82 OutlinerName thm "Definitions & Theorems" @@ -278,6 +278,8 @@ Style Remark BabelPreamble \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}} EndBabelPreamble + DocBookTag note + DocBookItemTag para End diff --git a/lib/layouts/theorems-bytype.inc b/lib/layouts/theorems-bytype.inc index 38af08d63d..a61a4dfb8f 100644 --- a/lib/layouts/theorems-bytype.inc +++ b/lib/layouts/theorems-bytype.inc @@ -22,7 +22,7 @@ # - Proof # - Case (by inclusion) -Format 81 +Format 82 Style Theorem Category Reasoning @@ -283,6 +283,8 @@ Style Remark \addto\captions$$lang{\renewcommand{\remarkname}{_(Remark)}} EndBabelPreamble LabelCounter remark + DocBookTag note + DocBookItemTag para End diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout index 8f66941cdc..e374f845ad 100644 --- a/lib/layouts/tufte-book.layout +++ b/lib/layouts/tufte-book.layout @@ -5,13 +5,14 @@ # Jason Waskiewicz , 2009/10/18 # Modified by Uwe Stöhr , 2009/11/15 -Format 81 +Format 82 Provides geometry 1 Provides natbib-internal 1 Sides 2 PageStyle Headings +DocBookRoot book ClassOptions Other nohyper -- 2.39.2