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

[Scott Kostyshak]

The branch, feature/docbook, has been updated.
  discards  7dc72ef35dd5f119684cd97e195fc499640c0ee9 (commit)
  discards  6941db32e105967364ef14eac34b4990a5453f0f (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 (7dc72ef35dd5f119684cd97e195fc499640c0ee9)
            \
             N -- N -- N (472ecc4c8b2d18486c7a7140a03879a88f12e67e)

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 472ecc4c8b2d18486c7a7140a03879a88f12e67e
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 b2881c270bd7891d6d2f92559d8007e5a419a743
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/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:
 src/Layout.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Repository for new features