[LyX features/feature/docbook] ru Beamer: make absolute path relative

[Scott Kostyshak]

The branch, feature/docbook, has been updated.
  discards  472ecc4c8b2d18486c7a7140a03879a88f12e67e (commit)
  discards  b2881c270bd7891d6d2f92559d8007e5a419a743 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (472ecc4c8b2d18486c7a7140a03879a88f12e67e)
            \
             N -- N -- N (69722a4f8f5eb7aa4ff589131d9364fa5f3b65d4)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

- Log -----------------------------------------------------------------

commit 69722a4f8f5eb7aa4ff589131d9364fa5f3b65d4
Author: Scott Kostyshak <skostysh at lyx.org>
Date:   Fri Sep 11 00:51:10 2020 -0400

    ru Beamer: make absolute path relative
    
    (cherry picked from commit 6a5f1f380e5e988367fdb0ffa86e5177ff88e3ff)

diff --git a/lib/examples/ru/Presentations/Beamer.lyx b/lib/examples/ru/Presentations/Beamer.lyx
index 3a8acc3..d91272e 100644
--- a/lib/examples/ru/Presentations/Beamer.lyx
+++ b/lib/examples/ru/Presentations/Beamer.lyx
@@ -124,7 +124,7 @@ status collapsed
 
 \begin_layout TitleGraphic
 \begin_inset Graphics
-	filename C:/Program Files (x86)/LyX 2.3/Resources/doc/clipart/3D-structure-distort.pdf
+	filename ../../../doc/clipart/3D-structure-distort.pdf
 	lyxscale 30
 	scale 10
 

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

    DocBook: fix output in Layout::write.

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())

-----------------------------------------------------------------------

Summary of changes:
 lib/layouts/stdstarsections.inc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Repository for new features