The branch, feature/docbook, has been updated.
discards 69722a4f8f5eb7aa4ff589131d9364fa5f3b65d4 (commit)
discards f59d11169efbd034760a008916771f25125c29c8 (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 (69722a4f8f5eb7aa4ff589131d9364fa5f3b65d4)
\
N -- N -- N (c8e76e78e7db859455bfd91dc24af7a1a79257da)
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 c8e76e78e7db859455bfd91dc24af7a1a79257da
Author: Scott Kostyshak <skost...@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 e432855a30661e5e8a786b146cfb9aee2717e524
Author: Thibaut Cuvelier <tcuvel...@lyx.org>
Date: Sat Sep 12 03:21:08 2020 +0200
DocBook: fix output in Layout::write.
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())
-----------------------------------------------------------------------
Summary of changes:
lib/layouts/aastex.layout | 2 +-
lib/layouts/shapepar.module | 32 ++++++++++++++++----------------
2 files changed, 17 insertions(+), 17 deletions(-)
hooks/post-receive
--
Repository for new features
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
