[LyX/master] DocBook: fix output in Layout::write.

[Thibaut Cuvelier]

commit 6c51cabd35b48eb2245330cda49b2be5c9a2c223
Author: Thibaut Cuvelier <tcuvelier at lyx.org>
Date:   Sat Sep 12 03:21:08 2020 +0200

    DocBook: fix output in Layout::write.
---
 lib/layouts/aastex.layout       |    2 +-
 lib/layouts/shapepar.module     |   32 ++++++++++++++++----------------
 lib/layouts/stdstarsections.inc |   10 +++++-----
 src/Layout.cpp                  |    4 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 78089a4..37dbd07 100644
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -204,7 +204,7 @@ Style Altaffilation
 	  Color		green
 	EndFont
 	DocBookTag                        affiliation
-	DocBookAttr                       role="alternate"
+	DocBookAttr                       role='alternate'
 	DocBookWrapperTag                 author
 	DocBookWrapperMergeWithPrevious   true
 	DocBookItemTag                    orgname
diff --git a/lib/layouts/shapepar.module b/lib/layouts/shapepar.module
index 6b38cdf..2b2fbfe 100644
--- a/lib/layouts/shapepar.module
+++ b/lib/layouts/shapepar.module
@@ -36,50 +36,50 @@ Style "CD label"
 	Align		Block
 	LabelType	No_Label
 	DocBookWrapperTag  sidebar
-	DocBookWrapperAttr role="cd-label"
+	DocBookWrapperAttr role='cd-label'
 	DocBookTag  para
 End
 
 Style "Circle"
 	CopyStyle	"CD label"
 	LatexName	circlepar
-	DocBookWrapperAttr role="circle"
+	DocBookWrapperAttr role='circle'
 End
 
 Style "Diamond"
 	CopyStyle	"CD label"
 	LatexName	diamondpar
-	DocBookWrapperAttr role="diamond"
+	DocBookWrapperAttr role='diamond'
 End
 
 Style "Heart"
 	CopyStyle	"CD label"
 	LatexName	heartpar
-	DocBookWrapperAttr role="heart"
+	DocBookWrapperAttr role='heart'
 End
 
 Style "Hexagon"
 	CopyStyle	"CD label"
 	LatexName	hexagonpar
-	DocBookWrapperAttr role="hexagon"
+	DocBookWrapperAttr role='hexagon'
 End
 
 Style "Nut"
 	CopyStyle	"CD label"
 	LatexName	nutpar
-	DocBookWrapperAttr role="nut"
+	DocBookWrapperAttr role='nut'
 End
 
 Style "Square"
 	CopyStyle	"CD label"
 	LatexName	squarepar
-	DocBookWrapperAttr role="square"
+	DocBookWrapperAttr role='square'
 End
 
 Style "Star"
 	CopyStyle	"CD label"
 	LatexName	starpar
-	DocBookWrapperAttr role="star"
+	DocBookWrapperAttr role='star'
 End
 
 # now the shapes defined in the .def files
@@ -87,49 +87,49 @@ End
 Style "Candle"
 	CopyStyle	"CD label"
 	LatexName	shapepar{\candle}
-	DocBookWrapperAttr role="candle"
+	DocBookWrapperAttr role='candle'
 End
 
 Style "Drop down"
 	CopyStyle	"CD label"
 	LatexName	droppar
-	DocBookWrapperAttr role="drop-down"
+	DocBookWrapperAttr role='drop-down'
 End
 
 Style "Drop up"
 	CopyStyle	"CD label"
 	LatexName	dropuppar
-	DocBookWrapperAttr role="drop-up"
+	DocBookWrapperAttr role='drop-up'
 End
 
 Style "TeX"
 	CopyStyle	"CD label"
 	LatexName	shapepar{\TeXshape}
-	DocBookWrapperAttr role="tex"
+	DocBookWrapperAttr role='tex'
 End
 
 Style "Triangle up"
 	CopyStyle	"CD label"
 	LatexName	triangleuppar
-	DocBookWrapperAttr role="triangle-up"
+	DocBookWrapperAttr role='triangle-up'
 End
 
 Style "Triangle down"
 	CopyStyle	"CD label"
 	LatexName	triangledownpar
-	DocBookWrapperAttr role="triangle-down"
+	DocBookWrapperAttr role='triangle-down'
 End
 
 Style "Triangle left"
 	CopyStyle	"CD label"
 	LatexName	triangleleftpar
-	DocBookWrapperAttr role="triangle-left"
+	DocBookWrapperAttr role='triangle-left'
 End
 
 Style "Triangle right"
 	CopyStyle	"CD label"
 	LatexName	trianglerightpar
-	DocBookWrapperAttr role="triangle-right"
+	DocBookWrapperAttr role='triangle-right'
 End
 
 # finally the low-level commands
diff --git a/lib/layouts/stdstarsections.inc b/lib/layouts/stdstarsections.inc
index 60354b1..0159b07 100644
--- a/lib/layouts/stdstarsections.inc
+++ b/lib/layouts/stdstarsections.inc
@@ -49,7 +49,7 @@ Style Section*
 	LabelCounter	""
 	ResetArgs       1
 	DocBookTag            bridgehead
-	DocBookAttr           renderas="sect1"
+	DocBookAttr           renderas='sect1'
 	DocBookSectionTag     NONE
 	DocBookForceAbstractTag	NONE
 End
@@ -64,7 +64,7 @@ Style Subsection*
 	LabelCounter	""
 	ResetArgs       1
 	DocBookTag            bridgehead
-	DocBookAttr           renderas="sect2"
+	DocBookAttr           renderas='sect2'
 	DocBookSectionTag     NONE
 	DocBookForceAbstractTag	NONE
 End
@@ -79,7 +79,7 @@ Style Subsubsection*
 	LabelCounter	""
 	ResetArgs       1
 	DocBookTag            bridgehead
-	DocBookAttr           renderas="sect3"
+	DocBookAttr           renderas='sect3'
 	DocBookSectionTag     NONE
 	DocBookForceAbstractTag	NONE
 End
@@ -94,7 +94,7 @@ Style Paragraph*
 	LabelCounter	""
 	ResetArgs       1
 	DocBookTag            bridgehead
-	DocBookAttr           renderas="sect4"
+	DocBookAttr           renderas='sect4'
 	DocBookSectionTag     NONE
 	DocBookForceAbstractTag	NONE
 End
@@ -109,7 +109,7 @@ Style Subparagraph*
 	LabelCounter	""
 	ResetArgs       1
 	DocBookTag            bridgehead
-	DocBookAttr           renderas="sect5"
+	DocBookAttr           renderas='sect5'
 	DocBookSectionTag     NONE
 	DocBookForceAbstractTag	NONE
 End
diff --git a/src/Layout.cpp b/src/Layout.cpp
index 102410d..f5e6f77 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -1643,7 +1643,7 @@ void Layout::write(ostream & os) const
 	if(!docbooktag_.empty())
 		os << "\tDocBookTag " << docbooktag_ << '\n';
 	if(!docbookattr_.empty())
-		os << "\tDocBookAttr " << docbookattr_ << '\n';
+		os << "\tDocBookAttr \"" << docbookattr_ << "\"\n";
 	if(!docbooktagtype_.empty())
 		os << "\tDocBookTagType " << docbooktagtype_ << '\n';
 	if(!docbookininfo_.empty())
@@ -1669,7 +1669,7 @@ void Layout::write(ostream & os) const
 		os << "\tDocBookItemWrapperAttr " << docbookitemwrapperattr_ << '\n';
 	if(!docbookitemwrappertagtype_.empty())
 		os << "\tDocBookItemWrapperTagType " << docbookitemwrappertagtype_ << '\n';
-	os << "\tDocBookItemWrapperMergeWithPrevious " << docbookwrappermergewithprevious_ << '\n';
+	os << "\tDocBookWrapperMergeWithPrevious " << docbookwrappermergewithprevious_ << '\n';
 	if(!docbookitemlabeltag_.empty())
 		os << "\tDocBookItemLabelTag " << docbookitemlabeltag_ << '\n';
 	if(!docbookitemlabelattr_.empty())