anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DocBook: fix output in Layout::write.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-09-12 03:21:08 +02:00
parent 50f011e062
commit 6c51cabd35
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/layouts/aastex.layout
View File

@ -204,7 +204,7 @@ Style Altaffilation
Color green Color green
EndFont EndFont
DocBookTag affiliation DocBookTag affiliation
DocBookAttr role="alternate" DocBookAttr role='alternate'
DocBookWrapperTag author DocBookWrapperTag author
DocBookWrapperMergeWithPrevious true DocBookWrapperMergeWithPrevious true
DocBookItemTag orgname DocBookItemTag orgname

32
lib/layouts/shapepar.module
View File

@ -36,50 +36,50 @@ Style "CD label"
Align Block Align Block
LabelType No_Label LabelType No_Label
DocBookWrapperTag sidebar DocBookWrapperTag sidebar
DocBookWrapperAttr role="cd-label" DocBookWrapperAttr role='cd-label'
DocBookTag para DocBookTag para
End End
Style "Circle" Style "Circle"
CopyStyle "CD label" CopyStyle "CD label"
LatexName circlepar LatexName circlepar
DocBookWrapperAttr role="circle" DocBookWrapperAttr role='circle'
End End
Style "Diamond" Style "Diamond"
CopyStyle "CD label" CopyStyle "CD label"
LatexName diamondpar LatexName diamondpar
DocBookWrapperAttr role="diamond" DocBookWrapperAttr role='diamond'
End End
Style "Heart" Style "Heart"
CopyStyle "CD label" CopyStyle "CD label"
LatexName heartpar LatexName heartpar
DocBookWrapperAttr role="heart" DocBookWrapperAttr role='heart'
End End
Style "Hexagon" Style "Hexagon"
CopyStyle "CD label" CopyStyle "CD label"
LatexName hexagonpar LatexName hexagonpar
DocBookWrapperAttr role="hexagon" DocBookWrapperAttr role='hexagon'
End End
Style "Nut" Style "Nut"
CopyStyle "CD label" CopyStyle "CD label"
LatexName nutpar LatexName nutpar
DocBookWrapperAttr role="nut" DocBookWrapperAttr role='nut'
End End
Style "Square" Style "Square"
CopyStyle "CD label" CopyStyle "CD label"
LatexName squarepar LatexName squarepar
DocBookWrapperAttr role="square" DocBookWrapperAttr role='square'
End End
Style "Star" Style "Star"
CopyStyle "CD label" CopyStyle "CD label"
LatexName starpar LatexName starpar
DocBookWrapperAttr role="star" DocBookWrapperAttr role='star'
End End
# now the shapes defined in the .def files # now the shapes defined in the .def files
@ -87,49 +87,49 @@ End
Style "Candle" Style "Candle"
CopyStyle "CD label" CopyStyle "CD label"
LatexName shapepar{\candle} LatexName shapepar{\candle}
DocBookWrapperAttr role="candle" DocBookWrapperAttr role='candle'
End End
Style "Drop down" Style "Drop down"
CopyStyle "CD label" CopyStyle "CD label"
LatexName droppar LatexName droppar
DocBookWrapperAttr role="drop-down" DocBookWrapperAttr role='drop-down'
End End
Style "Drop up" Style "Drop up"
CopyStyle "CD label" CopyStyle "CD label"
LatexName dropuppar LatexName dropuppar
DocBookWrapperAttr role="drop-up" DocBookWrapperAttr role='drop-up'
End End
Style "TeX" Style "TeX"
CopyStyle "CD label" CopyStyle "CD label"
LatexName shapepar{\TeXshape} LatexName shapepar{\TeXshape}
DocBookWrapperAttr role="tex" DocBookWrapperAttr role='tex'
End End
Style "Triangle up" Style "Triangle up"
CopyStyle "CD label" CopyStyle "CD label"
LatexName triangleuppar LatexName triangleuppar
DocBookWrapperAttr role="triangle-up" DocBookWrapperAttr role='triangle-up'
End End
Style "Triangle down" Style "Triangle down"
CopyStyle "CD label" CopyStyle "CD label"
LatexName triangledownpar LatexName triangledownpar
DocBookWrapperAttr role="triangle-down" DocBookWrapperAttr role='triangle-down'
End End
Style "Triangle left" Style "Triangle left"
CopyStyle "CD label" CopyStyle "CD label"
LatexName triangleleftpar LatexName triangleleftpar
DocBookWrapperAttr role="triangle-left" DocBookWrapperAttr role='triangle-left'
End End
Style "Triangle right" Style "Triangle right"
CopyStyle "CD label" CopyStyle "CD label"
LatexName trianglerightpar LatexName trianglerightpar
DocBookWrapperAttr role="triangle-right" DocBookWrapperAttr role='triangle-right'
End End
# finally the low-level commands # finally the low-level commands

10
lib/layouts/stdstarsections.inc
View File

@ -49,7 +49,7 @@ Style Section*
LabelCounter "" LabelCounter ""
ResetArgs 1 ResetArgs 1
DocBookTag bridgehead DocBookTag bridgehead
DocBookAttr renderas="sect1" DocBookAttr renderas='sect1'
DocBookSectionTag NONE DocBookSectionTag NONE
DocBookForceAbstractTag NONE DocBookForceAbstractTag NONE
End End
@ -64,7 +64,7 @@ Style Subsection*
LabelCounter "" LabelCounter ""
ResetArgs 1 ResetArgs 1
DocBookTag bridgehead DocBookTag bridgehead
DocBookAttr renderas="sect2" DocBookAttr renderas='sect2'
DocBookSectionTag NONE DocBookSectionTag NONE
DocBookForceAbstractTag NONE DocBookForceAbstractTag NONE
End End
@ -79,7 +79,7 @@ Style Subsubsection*
LabelCounter "" LabelCounter ""
ResetArgs 1 ResetArgs 1
DocBookTag bridgehead DocBookTag bridgehead
DocBookAttr renderas="sect3" DocBookAttr renderas='sect3'
DocBookSectionTag NONE DocBookSectionTag NONE
DocBookForceAbstractTag NONE DocBookForceAbstractTag NONE
End End
@ -94,7 +94,7 @@ Style Paragraph*
LabelCounter "" LabelCounter ""
ResetArgs 1 ResetArgs 1
DocBookTag bridgehead DocBookTag bridgehead
DocBookAttr renderas="sect4" DocBookAttr renderas='sect4'
DocBookSectionTag NONE DocBookSectionTag NONE
DocBookForceAbstractTag NONE DocBookForceAbstractTag NONE
End End
@ -109,7 +109,7 @@ Style Subparagraph*
LabelCounter "" LabelCounter ""
ResetArgs 1 ResetArgs 1
DocBookTag bridgehead DocBookTag bridgehead
DocBookAttr renderas="sect5" DocBookAttr renderas='sect5'
DocBookSectionTag NONE DocBookSectionTag NONE
DocBookForceAbstractTag NONE DocBookForceAbstractTag NONE
End End

4
src/Layout.cpp
View File

@ -1643,7 +1643,7 @@ void Layout::write(ostream & os) const
if(!docbooktag_.empty()) if(!docbooktag_.empty())
os << "\tDocBookTag " << docbooktag_ << '\n'; os << "\tDocBookTag " << docbooktag_ << '\n';
if(!docbookattr_.empty()) if(!docbookattr_.empty())
os << "\tDocBookAttr " << docbookattr_ << '\n'; os << "\tDocBookAttr \"" << docbookattr_ << "\"\n";
if(!docbooktagtype_.empty()) if(!docbooktagtype_.empty())
os << "\tDocBookTagType " << docbooktagtype_ << '\n'; os << "\tDocBookTagType " << docbooktagtype_ << '\n';
if(!docbookininfo_.empty()) if(!docbookininfo_.empty())
@ -1669,7 +1669,7 @@ void Layout::write(ostream & os) const
os << "\tDocBookItemWrapperAttr " << docbookitemwrapperattr_ << '\n'; os << "\tDocBookItemWrapperAttr " << docbookitemwrapperattr_ << '\n';
if(!docbookitemwrappertagtype_.empty()) if(!docbookitemwrappertagtype_.empty())
os << "\tDocBookItemWrapperTagType " << docbookitemwrappertagtype_ << '\n'; os << "\tDocBookItemWrapperTagType " << docbookitemwrappertagtype_ << '\n';
os << "\tDocBookItemWrapperMergeWithPrevious " << docbookwrappermergewithprevious_ << '\n'; os << "\tDocBookWrapperMergeWithPrevious " << docbookwrappermergewithprevious_ << '\n';
if(!docbookitemlabeltag_.empty()) if(!docbookitemlabeltag_.empty())
os << "\tDocBookItemLabelTag " << docbookitemlabeltag_ << '\n'; os << "\tDocBookItemLabelTag " << docbookitemlabeltag_ << '\n';
if(!docbookitemlabelattr_.empty()) if(!docbookitemlabelattr_.empty())