[LyX/master] DocBook: bug fixes for JASA.
commit bd9dce374976ef8d8f9be0140217c2d92b950c66
Author: Thibaut Cuvelier
Date: Fri Nov 27 05:53:46 2020 +0100
DocBook: bug fixes for JASA.
Includes more consistent behaviour for bibliographies in appendix (do the
same as LyX shows the user, i.e. bibliography in appendix).
---
development/autotests/invertedTests |3 +--
lib/layouts/jasatex.layout |3 ++-
src/output_docbook.cpp |7 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/development/autotests/invertedTests
b/development/autotests/invertedTests
index de16240..6fb757b 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -504,8 +504,6 @@ export/templates/Articles/R_Journal_docbook5
export/templates/Articles/REVTeX_%28V._4.1%29_docbook5
# - Address at the end of the document (only allowed in abstract).
export/templates/Articles/Kluwer_docbook5
-# - Broken references, empty figures.
-export/templates/Articles/Journal_of_the_Acoustical_Society_of_America_%28JASA%29_docbook5
# - Broken references, empty figures, misplaced acknowledgements (template not
viable for DocBook).
export/templates/Articles/International_Union_of_Crystallography_%28IUCr%29_docbook5
# - Biographies after bibliography: DocBook does not allow content after a
bibliography.
@@ -513,6 +511,7 @@ export/templates/Articles/Mathematical_Monthly_docbook5
# - Empty figure, very custom table caption (maybe fixable?), strange
appendices (not in ToC).
export/templates/Articles/Int._Journal_of_Modern_Physics_(C|D)_docbook5
# - Broken references.
+export/templates/Articles/Journal_of_the_Acoustical_Society_of_America_%28JASA%29_docbook5
export/templates/Articles/Astronomy_%26_Astrophysics_docbook5
Sublabel: docbook poster
diff --git a/lib/layouts/jasatex.layout b/lib/layouts/jasatex.layout
index a20d905..c45716e 100644
--- a/lib/layouts/jasatex.layout
+++ b/lib/layouts/jasatex.layout
@@ -227,7 +227,7 @@ Style Abstract
SeriesBold
Size Large
EndFont
- DocBookTag NONE
+ DocBookTag para
DocBookAbstract true
End
@@ -297,6 +297,7 @@ Style Acknowledgments
DocBookTagpara
DocBookWrapperTag acknowledgements
DocBookSectiontrue
+ DocBookAbstract false
End
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 214c2a8..519d70e 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -1161,11 +1161,16 @@ void docbookParagraphs(Text const &text,
Inset const *firstInset = par->getInset(0);
if (firstInset && (firstInset->lyxCode() ==
BIBITEM_CODE || firstInset->lyxCode() == BIBTEX_CODE)) {
while (!headerLevels.empty()) {
+ // Don't close appendices before
bibliographies.
+ if (headerLevels.top().second ==
"appendix")
+ break;
+
+ // Pop the section from the stack.
int level = headerLevels.top().first;
docstring tag = from_utf8("");
headerLevels.pop();
- // Output the tag only if it
corresponds to a legit section.
+ // Output the tag only if it
corresponds to a legit section, as the rest of the code.
if (level != Layout::NOT_IN_TOC) {
xs << XMLStream::ESCAPE_NONE <<
tag;
xs << xml::CR();
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: AASTeX is still too complicated to be fully supported.
commit eea884aba2e64d7c0fdf1eee1ab4f2ba866bdc14 Author: Thibaut Cuvelier Date: Fri Nov 27 05:20:51 2020 +0100 DocBook: AASTeX is still too complicated to be fully supported. --- development/autotests/invertedTests |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index edf4c59..de16240 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -427,7 +427,7 @@ export/doc(|/de|/es|/fr|/ja)/Additional_docbook5 # The resulting documents should still be easy to fully convert into DocBook. # - AASTeX. export/export/docbook/bibliography_precooked_aastex_docbook5 -export/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.2%29_docbook5 +export/(examples|templates)/Articles/American_Astronomical_Society_%28AASTeX_v._6.2%29_docbook5 # - Springer. (The svmono_light should still pass.) export/templates/Books/Springer.*/.*_docbook5 !export/export/docbook/svmono_light_docbook5 -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: for empty figures, output a message.
commit 3f07ae9083ab7299f9bc63a8f7749ce94e9aea6e
Author: Thibaut Cuvelier
Date: Fri Nov 27 05:19:27 2020 +0100
DocBook: for empty figures, output a message.
This ensures that this part of the DocBook file is valid.
---
development/autotests/invertedTests |2 +-
src/insets/InsetFloat.cpp | 28 +---
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/development/autotests/invertedTests
b/development/autotests/invertedTests
index e40d0d8..edf4c59 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -498,7 +498,7 @@ export/examples/(es|fr)/Modules/Linguistics_docbook5
export/examples/ko/cjk-ko-doc_docbook5
# - Metadata in abstract paragraph.
export/templates/Articles/Springers_Global_Journal_Template_%28V._3%29_docbook5
-# - Sweave impossible to implement. Document irremediably wrong (no .bib file,
still referenced in the text).
+# - Sweave impossible to implement. Broken references (no .bib file, still
referenced in the text).
export/templates/Articles/R_Journal_docbook5
# - Forbidden inlines, equation in formatting, broken references, float in
paragraphs, videos.
export/templates/Articles/REVTeX_%28V._4.1%29_docbook5
diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 2dfd53c..e432fa0 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -731,6 +731,11 @@ void docbookNoSubfigures(XMLStream & xs, OutputParams
const & runparams, const I
if (ftype.docbookFloatType() == "table")
rpNoTitle.docbook_in_table = true;
+ // Generate the contents of the float (to check for emptiness).
+ odocstringstream os2;
+ XMLStream xs2(os2);
+ thisFloat->InsetText::docbook(xs, rpNoTitle);
+
// Organisation:
.
docstring attr = docstring();
if (label)
@@ -749,7 +754,24 @@ void docbookNoSubfigures(XMLStream & xs, OutputParams
const & runparams, const I
xs << xml::EndTag(titleTag);
xs << xml::CR();
}
- thisFloat->InsetText::docbook(xs, rpNoTitle);
+
+ if (!os2.str().empty()) {
+ xs << XMLStream::ESCAPE_NONE << os2.str();
+ } else {
+ xs << xml::StartTag("mediaobject");
+ xs << xml::CR();
+ xs << xml::StartTag("textobject");
+ xs << xml::CR();
+ xs << xml::StartTag("phrase");
+ xs << "This figure is empty.";
+ xs << xml::EndTag("phrase");
+ xs << xml::CR();
+ xs << xml::EndTag("textobject");
+ xs << xml::CR();
+ xs << xml::EndTag("mediaobject");
+ xs << xml::CR();
+ }
+
xs << xml::EndTag(ftype.docbookTag(caption != nullptr));
xs << xml::CR();
}
@@ -777,8 +799,8 @@ void InsetFloat::docbook(XMLStream & xs, OutputParams const
& runparams) const
}
// Gather a few things from global environment that are shared between
all following cases.
- FloatList const &floats = buffer().params().documentClass().floats();
- Floating const &ftype = floats.getType(params_.type);
+ FloatList const & floats = buffer().params().documentClass().floats();
+ Floating const & ftype = floats.getType(params_.type);
// Switch on subfigures.
if (!subfigures.empty())
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: implement title for layouts that previously missed it.
commit 2741d195e4653644bb25dfaa6bdc446f086cc386 Author: Thibaut Cuvelier Date: Fri Nov 27 04:34:33 2020 +0100 DocBook: implement title for layouts that previously missed it. --- lib/layouts/IEEEtran.layout |3 +++ lib/layouts/aa.layout |3 +++ lib/layouts/aapaper.layout |3 +++ lib/layouts/aastex.layout |3 +++ lib/layouts/acmart.layout |4 lib/layouts/acmsiggraph-0-92.layout |3 +++ lib/layouts/acmsiggraph.layout |3 +++ lib/layouts/agutex.layout |3 +++ lib/layouts/beamer.layout |4 lib/layouts/broadway.layout |3 +++ lib/layouts/cl2emult.layout |3 +++ lib/layouts/copernicus.layout |3 +++ lib/layouts/ectaart.layout |3 +++ lib/layouts/egs.layout |3 +++ lib/layouts/foils.layout|3 +++ lib/layouts/hollywood.layout|3 +++ lib/layouts/iopart.layout |3 +++ lib/layouts/isprs.layout|5 - lib/layouts/latex8.layout |3 +++ lib/layouts/llncs.layout|3 +++ lib/layouts/ltugboat.layout |3 +++ lib/layouts/paper.layout|3 +++ lib/layouts/powerdot.layout |3 +++ lib/layouts/siamltex.layout |3 +++ 24 files changed, 75 insertions(+), 1 deletions(-) diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 69eb9a6..815817b 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -82,6 +82,9 @@ Style Title Font Size Largest EndFont + DocBookTag title + DocBookTagType paragraph + DocBookInInfo maybe End diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index 1cb6dfb..f79ab80 100644 --- a/lib/layouts/aa.layout +++ b/lib/layouts/aa.layout @@ -227,6 +227,9 @@ Style Title FamilySans SeriesBold EndFont + DocBookTag title + DocBookTagType paragraph + DocBookInInfo maybe End diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout index 822f4b7..f8ce76b 100644 --- a/lib/layouts/aapaper.layout +++ b/lib/layouts/aapaper.layout @@ -177,6 +177,9 @@ Style Title Font Series Bold EndFont + DocBookTag title + DocBookTagType paragraph + DocBookInInfo maybe End diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index 114b2ed..fa9cc7a 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -143,6 +143,9 @@ Style Title SeriesBold Size Large EndFont + DocBookTag title + DocBookTagType paragraph + DocBookInInfo maybe End diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout index 2dd90df..7e0e85b 100644 --- a/lib/layouts/acmart.layout +++ b/lib/layouts/acmart.layout @@ -146,11 +146,15 @@ Style Title Argument 1 LabelString "Short title" Mandatory 0 + # TODO: In DocBook, output it in a titleabbrev outside this title. EndArgument Font Size Largest EndFont DependsOn Abstract + DocBookTag title + DocBookTagType paragraph + DocBookInInfo maybe End Style Subtitle diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout index 466d6ab..18a9392 100644 --- a/lib/layouts/acmsiggraph-0-92.layout +++ b/lib/layouts/acmsiggraph-0-92.layout @@ -168,6 +168,9 @@ Style Title Font FamilySans EndFont + DocBookTag title + DocBookTagType paragraph + DocBookInInfo maybe End diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout index fa0a2d4..21df19e 100644 --- a/lib/layouts/acmsiggraph.layout +++ b/lib/layouts/acmsiggraph.layout @@ -144,6 +144,9 @@ Style Title Font FamilySans EndFont + DocBookTag title + DocBookTagType paragraph + DocBookInInfo maybe End diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout index af58699..e436b72 100644 --- a/lib/layouts/agutex.layout +++ b/lib/layouts/agutex.layout @@ -68,6 +68,9 @@ Style Title Font Size Largest EndFont + DocBookTag title + DocBookTagType paragraph + DocBookInInfo maybe End diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 4a54280..e17380b 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -1002,12 +1002,16 @@ Style Title LabelString "Short Title|S" Tooltip "Short title which appears in the sidebar/header" InsertCotext 1 + # TODO: In DocBook, output it in a titleabbrev outside this title. EndArgument Font Size Huge Series Bold Color Blue EndFont + DocBookTag title + D
[LyX/master] DocBook: implement IJMP C/D.
commit 0e4d8a81596ef2fb21d369b4770060564934b3e1
Author: Thibaut Cuvelier
Date: Fri Nov 27 04:16:48 2020 +0100
DocBook: implement IJMP C/D.
---
development/autotests/invertedTests |2 +
lib/layouts/ijmpc.layout| 62 ++---
lib/layouts/ijmpd.layout| 65 ---
3 files changed, 119 insertions(+), 10 deletions(-)
diff --git a/development/autotests/invertedTests
b/development/autotests/invertedTests
index 7696822..6d5d4dd 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -510,6 +510,8 @@
export/templates/Articles/Journal_of_the_Acoustical_Society_of_America_%28JASA%2
export/templates/Articles/International_Union_of_Crystallography_%28IUCr%29_docbook5
# - Biographies after bibliography: DocBook does not allow content after a
bibliography.
export/templates/Articles/Mathematical_Monthly_docbook5
+# - Empty figure, very custom table caption (maybe fixable?), strange
appendices (not in ToC).
+export/templates/Articles/Int._Journal_of_Modern_Physics_(C|D)_docbook5
Sublabel: docbook poster
# Posters cannot be properly exported, the LyX documents are too far from
diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout
index e03c4d9..51b1d5b 100644
--- a/lib/layouts/ijmpc.layout
+++ b/lib/layouts/ijmpc.layout
@@ -30,6 +30,7 @@ Style Standard
AlignBlock
AlignPossibleBlock, Left, Right, Center
LabelTypeNo_Label
+ DocBookTag para
End
Input stdcounters.inc
@@ -83,6 +84,9 @@ Style MarkBoth
\DeclareRobustCommand{\foreign@language}[1]{%
\lowercase{\oldforeign@language{#1}}}
EndPreamble
+ DocBookTagIGNORE
+ # TODO: a mix of titleabbrev and authorinitials...
+ DocBookInInfo always
End
Style Catchline
@@ -102,6 +106,8 @@ Style Catchline
Series Bold
Color Green
EndFont
+ DocBookTagIGNORE
+ DocBookInInfo always
End
Style Title
@@ -121,6 +127,9 @@ Style Title
Font
Size Largest
EndFont
+ DocBookTag title
+ DocBookTagType paragraph
+ DocBookInInfo maybe
End
Style Author
@@ -139,6 +148,11 @@ Style Author
Font
Size Large
EndFont
+ DocBookTagpersonname
+ DocBookTagTypeparagraph
+ DocBookWrapperTag author
+ DocBookWrapperTagType inline
+ DocBookInInfo always
End
Style Address
@@ -154,6 +168,12 @@ Style Address
Shape Italic
SizeNormal
EndFont
+ DocBookTagaddress
+ DocBookTagTypeparagraph
+ DocBookWrapperTag author
+ DocBookWrapperTagType inline
+ DocBookWrapperMergeWithPrevious true
+ DocBookInInfo always
End
Style History
@@ -168,6 +188,8 @@ Style History
Font
Size Small
EndFont
+ DocBookTag releaseinfo
+ DocBookInInfo always
End
InsetLayout Flex:Received
@@ -185,7 +207,10 @@ InsetLayout Flex:Received
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag date
+ DocBookAttr role='received'
+ DocBookTagType inline
End
InsetLayout Flex:Revised
@@ -203,7 +228,10 @@ InsetLayout Flex:Revised
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag date
+ DocBookAttr role='revised'
+ DocBookTagType inline
End
Style Abstract
@@ -217,6 +245,11 @@ Style Abstract
Font
Size Small
EndFont
+ DocBookAbstract true
+ DocBookInInfo always
+ DocBookWrapperTag abstract
+ DocBookWrapperMergeWithPrevioustrue
+ DocBookTagpara
End
InsetLayout Flex:Keywords
@@ -234,7 +267,11 @@ InsetLayout Flex:Keywords
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag keyword
+ DocBookTagType paragraph
+ DocBookWrapperTag keywordset
+ DocBookInInfo always
End
Style Classification_Codes
@@ -259,7 +296,9 @@ InsetLayout Flex:TableCaption
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
+ DocBookTag caption
+ DocBookTagType paragraph
End
InsetLayout Flex:Refcite
@@ -277,7 +316,7 @@ InsetLayout Flex:Refcite
Color green
Size Small
EndFont
- ResetsFont true
+ ResetsFont true
End
Style ItemList
@@ -309,6 +348,9 @@ Style ItemList
HTMLTag ul
HTMLItem li
HTMLLabelNONE
+ DocBookTagitemizedlist
+ DocBookItemTaglistitem
+ DocBookItemInnerTag para
End
Style RomanList
@@ -347,6 +389,9 @@ Style RomanList
HTMLItem li
HTMLLabelNONE
RefPrefixenu
+ DocBookTagorderedlist
+ DocBookItemTaglistitem
+ DocBookItemInnerTag para
End
Style Proof
@@ -367,6 +412,8 @@ Style Proof
Series Bold
EndFont
EndLabelType Box
+ DocBookTagpara
+ DocBookAttr role='proo
[LyX/master] DocBook: implement author for layouts that previously missed it.
commit a397928f78de9c2e4dd1570d877a43beb4500f6e Author: Thibaut Cuvelier Date: Fri Nov 27 04:40:16 2020 +0100 DocBook: implement author for layouts that previously missed it. --- lib/layouts/IEEEtran.layout|5 + lib/layouts/aa.layout |5 + lib/layouts/aapaper.layout |5 + lib/layouts/aastex.layout |2 ++ lib/layouts/aastex62.layout|6 ++ lib/layouts/agutex.layout |5 + lib/layouts/beamer.layout |5 + lib/layouts/broadway.layout|5 + lib/layouts/cl2emult.layout|5 + lib/layouts/copernicus.layout |5 + lib/layouts/ectaart.layout |5 + lib/layouts/egs.layout |5 + lib/layouts/entcs.layout |5 + lib/layouts/iopart.layout |5 + lib/layouts/isprs.layout |5 + lib/layouts/llncs.layout |5 + lib/layouts/ltugboat.layout|5 + lib/layouts/powerdot.layout|5 + lib/layouts/siamltex.layout|5 + lib/layouts/sigplanconf.layout |5 + lib/layouts/spie.layout|5 + 21 files changed, 103 insertions(+), 0 deletions(-) diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index 815817b..62c573e 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -141,6 +141,11 @@ Style Author Font Size Large EndFont + DocBookTagpersonname + DocBookTagTypeparagraph + DocBookWrapperTag author + DocBookWrapperTagType inline + DocBookInInfo always End diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index f79ab80..059b679 100644 --- a/lib/layouts/aa.layout +++ b/lib/layouts/aa.layout @@ -241,6 +241,11 @@ Style Author Size Large SeriesMedium EndFont + DocBookTagpersonname + DocBookTagTypeparagraph + DocBookWrapperTag author + DocBookWrapperTagType inline + DocBookInInfo always End diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout index f8ce76b..0ee99ff 100644 --- a/lib/layouts/aapaper.layout +++ b/lib/layouts/aapaper.layout @@ -191,6 +191,11 @@ Style Author SizeNormal Series Bold EndFont + DocBookTagpersonname + DocBookTagTypeparagraph + DocBookWrapperTag author + DocBookWrapperTagType inline + DocBookInInfo always End diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index fa9cc7a..29b3171 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -159,7 +159,9 @@ Style Author Shape SmallCaps EndFont DocBookTagpersonname + DocBookTagTypeparagraph DocBookWrapperTag author + DocBookWrapperTagType inline DocBookInInfo always End diff --git a/lib/layouts/aastex62.layout b/lib/layouts/aastex62.layout index b30eab1..5fad17b 100644 --- a/lib/layouts/aastex62.layout +++ b/lib/layouts/aastex62.layout @@ -160,9 +160,15 @@ Style Author Argument 1 LabelString ORCID ToolTip "Enter the 16 digit ORCID as ---" + # TODO: In DocBook, this cannot be in the , it must be directly within . EndArgument Align Center Margin Dynamic + DocBookTagpersonname + DocBookTagTypeparagraph + DocBookWrapperTag author + DocBookWrapperTagType inline + DocBookInInfo always End Style Affiliation diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout index e436b72..604d655 100644 --- a/lib/layouts/agutex.layout +++ b/lib/layouts/agutex.layout @@ -89,6 +89,11 @@ Style Authors Font Size Large EndFont + DocBookTagpersonname + DocBookTagTypeparagraph + DocBookWrapperTag author + DocBookWrapperTagType inline + DocBookInInfo always End diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 6ba8b2e..5f0786c 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -1070,6 +1070,11 @@ Style Author Size Largest Color Blue EndFont + DocBookTagpersonname + DocBookTagTypeparagraph + DocBookWrapperTag author + DocBookWrapperTagType inline + DocBookInInfo always End Style Institute diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout index 62cb969..49116b7 100644 --- a/lib/layouts/broadway.layout +++ b/lib/layouts/broadway.layout @@ -218,6 +218,11 @@ Style Author ParSep1.5 Align Center AlignPossible Left, Right, Center + DocBookTagpersonname +
[LyX/master] DocBook: implement subtitle for layouts that previously missed it.
commit f52946e1433dc7723aa33702428ee668ce7d5abb Author: Thibaut Cuvelier Date: Fri Nov 27 04:35:54 2020 +0100 DocBook: implement subtitle for layouts that previously missed it. --- lib/layouts/aapaper.inc|2 ++ lib/layouts/acm-sigs.inc |2 ++ lib/layouts/acmart.layout |2 ++ lib/layouts/beamer.layout |2 ++ lib/layouts/llncs.layout |2 ++ lib/layouts/paper.layout |1 + lib/layouts/sigplanconf.layout |2 ++ 7 files changed, 13 insertions(+), 0 deletions(-) diff --git a/lib/layouts/aapaper.inc b/lib/layouts/aapaper.inc index 9c61410..3f99a4e 100644 --- a/lib/layouts/aapaper.inc +++ b/lib/layouts/aapaper.inc @@ -23,6 +23,8 @@ Style Subtitle SizeNormal Series Bold EndFont + DocBookTagsubtitle + DocBookInInfo maybe End diff --git a/lib/layouts/acm-sigs.inc b/lib/layouts/acm-sigs.inc index 70a357d..4a0b897 100644 --- a/lib/layouts/acm-sigs.inc +++ b/lib/layouts/acm-sigs.inc @@ -26,6 +26,8 @@ Style Subtitle Size Large Shape Italic EndFont + DocBookTagsubtitle + DocBookInInfo maybe End Style Terms diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout index 7e0e85b..3298a32 100644 --- a/lib/layouts/acmart.layout +++ b/lib/layouts/acmart.layout @@ -168,6 +168,8 @@ Style Subtitle Size Larger Family Roman EndFont + DocBookTagsubtitle + DocBookInInfo maybe End Style Email diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index e17380b..6ba8b2e 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -1045,6 +1045,8 @@ Style Subtitle Series Bold Color Blue EndFont + DocBookTag subtitle + DocBookInInfomaybe End Style Author diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout index bd4a012..6923cfa 100644 --- a/lib/layouts/llncs.layout +++ b/lib/layouts/llncs.layout @@ -150,6 +150,8 @@ Style Subtitle Series Bold SizeLarge EndFont + DocBookTagsubtitle + DocBookInInfo maybe End diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index bb07251..9a83dcd 100644 --- a/lib/layouts/paper.layout +++ b/lib/layouts/paper.layout @@ -162,6 +162,7 @@ Style SubTitle EndFont HTMLTitle false DocBookTagsubtitle + DocBookInInfo maybe End diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout index 20b1cac..2c7d0cb 100644 --- a/lib/layouts/sigplanconf.layout +++ b/lib/layouts/sigplanconf.layout @@ -141,6 +141,8 @@ Style Subtitle Font Size Larger EndFont + DocBookTagsubtitle + DocBookInInfo maybe End -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: implement standard for layouts that previously missed it.
commit 78d7f7d8f57c04da9dd724f1fb942a524fd88c91 Author: Thibaut Cuvelier Date: Fri Nov 27 04:29:40 2020 +0100 DocBook: implement standard for layouts that previously missed it. --- lib/layouts/IEEEtran.layout|1 + lib/layouts/beamer.layout |1 + lib/layouts/broadway.layout|1 + lib/layouts/cl2emult.layout|1 + lib/layouts/dtk.layout |1 + lib/layouts/egs.layout |1 + lib/layouts/foils.layout |1 + lib/layouts/iopart.layout |1 + lib/layouts/llncs.layout |1 + lib/layouts/ltugboat.layout|1 + lib/layouts/memoir.layout |1 + lib/layouts/paper.layout |1 + lib/layouts/powerdot.layout|1 + lib/layouts/siamltex.layout|1 + lib/layouts/sigplanconf.layout |1 + lib/layouts/slides.layout |1 + 16 files changed, 16 insertions(+), 0 deletions(-) diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index c40f959..69eb9a6 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -42,6 +42,7 @@ Style Standard AlignBlock AlignPossibleBlock, Left, Right, Center LabelTypeNo_Label + DocBookTagpara End Countertheorem diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 5c655fb..4a54280 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -71,6 +71,7 @@ Style Standard AlignLeft AlignPossibleBlock, Left, Right, Center LabelTypeNo_Label + DocBookTag para End diff --git a/lib/layouts/broadway.layout b/lib/layouts/broadway.layout index 733e1c7..2bfaef6 100644 --- a/lib/layouts/broadway.layout +++ b/lib/layouts/broadway.layout @@ -185,6 +185,7 @@ Style Standard Align Left AlignPossible Block, Left, Right, Center Labeltype No_Label + DocBookTagpara End diff --git a/lib/layouts/cl2emult.layout b/lib/layouts/cl2emult.layout index 7a387cf..5687cda 100644 --- a/lib/layouts/cl2emult.layout +++ b/lib/layouts/cl2emult.layout @@ -150,4 +150,5 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + DocBookTagpara End diff --git a/lib/layouts/dtk.layout b/lib/layouts/dtk.layout index 1584f3c..1a6ed58 100644 --- a/lib/layouts/dtk.layout +++ b/lib/layouts/dtk.layout @@ -39,6 +39,7 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label +DocBookTagpara End Input stdinsets.inc diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout index 0db0340..3374f40 100644 --- a/lib/layouts/egs.layout +++ b/lib/layouts/egs.layout @@ -26,6 +26,7 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + DocBookTagpara End diff --git a/lib/layouts/foils.layout b/lib/layouts/foils.layout index 5ac70c6..d6cb404 100644 --- a/lib/layouts/foils.layout +++ b/lib/layouts/foils.layout @@ -38,6 +38,7 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + DocBookTagpara End diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index e5d5675..b0a56ce 100644 --- a/lib/layouts/iopart.layout +++ b/lib/layouts/iopart.layout @@ -42,6 +42,7 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + DocBookTag para End diff --git a/lib/layouts/llncs.layout b/lib/layouts/llncs.layout index 7c5bc56..b968b2b 100644 --- a/lib/layouts/llncs.layout +++ b/lib/layouts/llncs.layout @@ -31,6 +31,7 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + DocBookTagpara End diff --git a/lib/layouts/ltugboat.layout b/lib/layouts/ltugboat.layout index c35a76f..aefa9a1 100644 --- a/lib/layouts/ltugboat.layout +++ b/lib/layouts/ltugboat.layout @@ -39,6 +39,7 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + DocBookTagpara End diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout index a8e6a56..3ebaddf 100644 --- a/lib/layouts/memoir.layout +++ b/lib/layouts/memoir.layout @@ -50,6 +50,7 @@ Style Standard text-align: left; } EndHTMLStyle + DocBookTagpara End diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index 2462ef2..8beb6ff 100644 --- a/lib/layouts/paper.layout +++ b/lib/layouts/p
[LyX/master] DocBook: implement keywords for layouts that previously missed it.
commit a456dac34001c7d989681f81df356c8284a5614d Author: Thibaut Cuvelier Date: Fri Nov 27 04:26:31 2020 +0100 DocBook: implement keywords for layouts that previously missed it. --- lib/layouts/AEA.layout |4 lib/layouts/IEEEtran-CompSoc.layout |4 lib/layouts/IEEEtran-TransMag.layout |4 lib/layouts/IEEEtran.layout |4 lib/layouts/iopart.layout|4 lib/layouts/isprs.layout |4 lib/layouts/jss.layout |4 lib/layouts/paper.layout |4 lib/layouts/siamltex.layout |4 lib/layouts/sigplanconf.layout |4 lib/layouts/spie.layout |4 lib/layouts/svjog.layout |4 lib/layouts/svprobth.layout |4 13 files changed, 52 insertions(+), 0 deletions(-) diff --git a/lib/layouts/AEA.layout b/lib/layouts/AEA.layout index e1674be..d94ebb3 100644 --- a/lib/layouts/AEA.layout +++ b/lib/layouts/AEA.layout @@ -96,6 +96,10 @@ Style Keywords CopyStyle Publication_Month LatexName Keywords LabelString "Keywords:" + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End Style Abstract diff --git a/lib/layouts/IEEEtran-CompSoc.layout b/lib/layouts/IEEEtran-CompSoc.layout index 07db5a5..de2f7ed 100644 --- a/lib/layouts/IEEEtran-CompSoc.layout +++ b/lib/layouts/IEEEtran-CompSoc.layout @@ -55,6 +55,10 @@ End Style Keywords InTitle 1 BottomSep0.1 + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End diff --git a/lib/layouts/IEEEtran-TransMag.layout b/lib/layouts/IEEEtran-TransMag.layout index 7ce82ba..7812654 100644 --- a/lib/layouts/IEEEtran-TransMag.layout +++ b/lib/layouts/IEEEtran-TransMag.layout @@ -33,6 +33,10 @@ End Style Keywords InTitle 1 BottomSep0.1 + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index da183ab..c40f959 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -282,6 +282,10 @@ Style Keywords CopyStyleAbstract LatexNameIEEEkeywords LabelString "Index Terms---" + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index 75f2764..e5d5675 100644 --- a/lib/layouts/iopart.layout +++ b/lib/layouts/iopart.layout @@ -219,6 +219,10 @@ Style Keywords Color Green SeriesBold EndFont + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End diff --git a/lib/layouts/isprs.layout b/lib/layouts/isprs.layout index 195b5b7..594369f 100644 --- a/lib/layouts/isprs.layout +++ b/lib/layouts/isprs.layout @@ -71,6 +71,10 @@ Style Keywords LabelFont Series Bold EndFont + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End # Author style definition diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout index 6c97d66..9265b49 100644 --- a/lib/layouts/jss.layout +++ b/lib/layouts/jss.layout @@ -102,6 +102,10 @@ Style Keywords Color Green SeriesBold EndFont + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End Style "Plain Keywords" diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index c07d5b9..2462ef2 100644 --- a/lib/layouts/paper.layout +++ b/lib/layouts/paper.layout @@ -178,4 +178,8 @@ Style Keywords CopyStyle Abstract LatexName keywords LabelString "Keywords:" + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End diff --git a/lib/layouts/siamltex.layout b/lib/layouts/siamltex.layout index 0a4ae81..a1d47ad 100644 --- a/lib/layouts/siamltex.layout +++ b/lib/layouts/siamltex.layout @@ -313,6 +313,10 @@ Style Keywords CopyStyle Abstract LatexName keywords LabelString "Key words:" + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout index 363a261..0c30bda 100644 --- a/lib/layouts/sigplanconf.layout +++ b/lib/layo
[LyX/master] DocBook: in aa, fix acknowledgements.
commit 185a62e69536b0bc20cf3970806981c6977563fa Author: Thibaut Cuvelier Date: Fri Nov 27 04:52:39 2020 +0100 DocBook: in aa, fix acknowledgements. --- development/autotests/invertedTests |2 ++ lib/layouts/aa.layout |1 + lib/layouts/aapaper.layout |4 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 6d5d4dd..e40d0d8 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -512,6 +512,8 @@ export/templates/Articles/International_Union_of_Crystallography_%28IUCr%29_docb export/templates/Articles/Mathematical_Monthly_docbook5 # - Empty figure, very custom table caption (maybe fixable?), strange appendices (not in ToC). export/templates/Articles/Int._Journal_of_Modern_Physics_(C|D)_docbook5 +# - Broken references. +export/templates/Articles/Astronomy_%26_Astrophysics_docbook5 Sublabel: docbook poster # Posters cannot be properly exported, the LyX documents are too far from diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index 059b679..ec9c3e9 100644 --- a/lib/layouts/aa.layout +++ b/lib/layouts/aa.layout @@ -189,6 +189,7 @@ Style Acknowledgement EndFont DocBookTagpara DocBookWrapperTag acknowledgements + DocBookSectiontrue End diff --git a/lib/layouts/aapaper.layout b/lib/layouts/aapaper.layout index 0ee99ff..a3936c5 100644 --- a/lib/layouts/aapaper.layout +++ b/lib/layouts/aapaper.layout @@ -224,6 +224,10 @@ Style Abstract Series Bold SizeNormal EndFont + DocBookTag para + DocBookWrapperTag abstract + DocBookWrapperMergeWithPrevious true + DocBookInInfo always End -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: implement Mathematical Monthly.
commit 587f1f5571ca0ef26bdef8201491475c1e69c91e Author: Thibaut Cuvelier Date: Fri Nov 27 01:54:00 2020 +0100 DocBook: implement Mathematical Monthly. --- autotests/export/docbook/maam.lyx | 174 +++ autotests/export/docbook/maam.xml | 27 ++ development/autotests/invertedTests |2 + lib/layouts/maa-monthly.layout | 94 --- src/output_docbook.cpp |3 + 5 files changed, 264 insertions(+), 36 deletions(-) diff --git a/autotests/export/docbook/maam.lyx b/autotests/export/docbook/maam.lyx new file mode 100644 index 000..406a95c --- /dev/null +++ b/autotests/export/docbook/maam.lyx @@ -0,0 +1,174 @@ +#LyX 2.4 created this file. For more info see https://www.lyx.org/ +\lyxformat 599 +\begin_document +\begin_header +\save_transient_properties true +\origin unavailable +\textclass maa-monthly +\use_default_options true +\maintain_unincluded_children no +\language english +\language_package default +\inputencoding utf8 +\fontencoding auto +\font_roman "default" "default" +\font_sans "default" "default" +\font_typewriter "default" "default" +\font_math "auto" "auto" +\font_default_family default +\use_non_tex_fonts false +\font_sc false +\font_roman_osf false +\font_sans_osf false +\font_typewriter_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures false +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry true +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 2 +\use_package esint 1 +\use_package mathdots 1 +\use_package mathtools 0 +\use_package mhchem 1 +\use_package stackrel 0 +\use_package stmaryrd 0 +\use_package undertilde 0 +\cite_engine basic +\cite_engine_type default +\biblio_style plain +\use_bibtopic false +\use_indices false +\paperorientation portrait +\suppress_date false +\justification true +\use_refstyle 1 +\use_minted 0 +\use_lineno 0 +\index Index +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style english +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tablestyle default +\tracking_changes false +\output_changes false +\change_bars false +\postpone_fragile_content false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\docbook_table_output 0 +\end_header + +\begin_body + +\begin_layout Title +Sample Article Title +\end_layout + +\begin_layout Author +Woodrow Wilson and Herbert Hoover +\end_layout + +\begin_layout Abstract +An abstract should not contain concrete mathematics. +\end_layout + +\begin_layout Section +First-level section heading. +\end_layout + +\begin_layout Standard +Section heading. +\end_layout + +\begin_layout Standard +\begin_inset Separator plain +\end_inset + + +\end_layout + +\begin_layout Biographies + +\end_layout + +\begin_deeper +\begin_layout Author Biography +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout +Woodrow Wilson +\end_layout + +\end_inset + +received his Ph.D. + in history and political science from Johns Hopkins University. + He held visiting positions at Cornell and Wesleyan before joining the faculty + at Princeton, where he was eventually appointed president of the university. + Among his proudest accomplishments was the abolition of eating clubs at + Princeton on the grounds that they were elitist. +\end_layout + +\begin_layout Affiliation +Office of the President, Princeton University, Princeton NJ 08544 +\begin_inset Newline newline +\end_inset + +twoodwil...@princeton.edu +\end_layout + +\begin_layout Author Biography +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout +Herbert Hoover +\end_layout + +\end_inset + +entered Stanford University in 1891, after failing all of the entrance exams + except mathematics. + He received his B.S. + degree in geology in 1895, spent time as a mining engineer, then was appointed + by his co-author to the U.S. + Food Administration and the Supreme Economic Council, where he orchestrated + the greatest famine relief efforts of all time. +\end_layout + +\begin_layout Affiliation +Hoover Institution, Stanford University, Stanford CA 94305 +\begin_inset Newline newline +\end_inset + +herbhoo...@stanford.edu +\end_layout + +\end_deeper +\end_body +\end_document diff --git a/autotests/export/docbook/maam.xml b/autotests/export/docbook/maam.xml new file mode 100644 index 000..0fbe638 --- /dev/null +++ b/autotests/export/docbook/maam.xml @@ -0,0 +1,27 @@ + + +http://docbook.org/ns/docbook"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:m="http://www.w3.org/1998/Math/MathML"; xmlns:xi="http://www.w3.org/2001/XInclude"; version="5.2"> + +Sample Article Title + +Woodr
[LyX/master] DocBook: implement iucr.
commit 77fa9a6c42b85e40eb636ffbd62fa649d20938a9 Author: Thibaut Cuvelier Date: Fri Nov 27 02:49:48 2020 +0100 DocBook: implement iucr. --- development/autotests/invertedTests |4 +++- lib/layouts/iucr.layout | 24 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 71ade13..7696822 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -504,8 +504,10 @@ export/templates/Articles/R_Journal_docbook5 export/templates/Articles/REVTeX_%28V._4.1%29_docbook5 # - Address at the end of the document (only allowed in abstract). export/templates/Articles/Kluwer_docbook5 -# - Empty bibliography, broken references, empty figures. +# - Broken references, empty figures. export/templates/Articles/Journal_of_the_Acoustical_Society_of_America_%28JASA%29_docbook5 +# - Broken references, empty figures, misplaced acknowledgements (template not viable for DocBook). +export/templates/Articles/International_Union_of_Crystallography_%28IUCr%29_docbook5 # - Biographies after bibliography: DocBook does not allow content after a bibliography. export/templates/Articles/Mathematical_Monthly_docbook5 diff --git a/lib/layouts/iucr.layout b/lib/layouts/iucr.layout index 6cfacc2..cdad371 100644 --- a/lib/layouts/iucr.layout +++ b/lib/layouts/iucr.layout @@ -27,6 +27,7 @@ Style Standard Align Block AlignPossible Block, Left, Right, Center LabelType No_Label + DocBookTag para End Input stdtitle.inc @@ -70,6 +71,7 @@ Style "Short Title" Font Size Small EndFont + DocBookTag titleabbrev End InsetLayout "Flex:City" @@ -116,16 +118,19 @@ Style "Main Author" Argument 1 LabelString "Affiliation Key" Tooltip "Affiliation key of the author" + # DocBookTagothername EndArgument Argument 2 Mandatory 1 LabelString "Forename" Tooltip "Forename" + # DocBookTagfirstname EndArgument Argument 3 Mandatory 1 LabelString "Surname" Tooltip "Surname" + # DocBookTagsurname EndArgument Argument 4 Mandatory 1 @@ -134,11 +139,18 @@ Style "Main Author" Font Shape Italic EndFont + # DocBookTagemail EndArgument BottomSep 0.5 ParSkip 0.4 Align Center LabelType No_Label + DocBookTagpersonname + DocBookTagTypeparagraph + DocBookWrapperTag author + DocBookWrapperTagType inline + DocBookInInfo always + # TODO: a lot of information is available, but the email would be output in the tag, and that does not make sense. The two first arguments should be grouped in , the rest must live outside . End Style "Co Author" @@ -170,6 +182,9 @@ Style "Short Author" SeriesBold Color Green EndFont + DocBookInInfo always + DocBookTag authorinitials + DocBookWrapperTag NONE End Style Affiliation @@ -195,6 +210,10 @@ Style Keyword CopyStyle "Short Author" LatexName keyword LabelString "Keyword:" + DocBookTag keyword + DocBookTagType paragraph + DocBookWrapperTag keywordset + DocBookInInfo always End Style Vita @@ -225,6 +244,7 @@ Style Synopsis LabelString "Synopsis" AlignLeft AlignPossibleLeft + DocBookAttr role='synopsis' End Style Acknowledgements @@ -234,6 +254,8 @@ Style Acknowledgements LabelString "Acknowledgements:" Category BackMatter TopSep 0.7 + DocBookTagpara + DocBookWrapperTag acknowledgements End Style References @@ -266,6 +288,8 @@ Style References LabelString"Reference" Mandatory 1 AutoInsert 1 + DocBookTag bibliomixed EndArgument AlignLeft + DocBookTagbibliography End -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: fix appendices.
commit 6201158e5d02e441debda9f55f10d41ef9c8e433
Author: Thibaut Cuvelier
Date: Fri Nov 27 02:50:03 2020 +0100
DocBook: fix appendices.
---
src/output_docbook.cpp |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 0deed24..214c2a8 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -1101,7 +1101,7 @@ void docbookParagraphs(Text const &text,
Layout const &style = par->layout();
// Think about adding and/or s.
- if (isLayoutSectioning(style)) {
+ if (isLayoutSectioning(style) ||
par->params().startOfAppendix()) {
int level = style.toclevel;
// Need to close a previous section if it has the same
level or a higher one (close if opening a
@@ -1122,8 +1122,7 @@ void docbookParagraphs(Text const &text,
}
// Open the new section: first push it onto the stack,
then output it in DocBook.
- string sectionTag = (currentlyInAppendix &&
style.docbooksectiontag() == "chapter") ?
- "appendix" :
style.docbooksectiontag();
+ string sectionTag = (par->params().startOfAppendix()) ?
"appendix" : style.docbooksectiontag();
headerLevels.push(std::make_pair(level, sectionTag));
// Some sectioning-like elements should not be output
(such as FrontMatter).
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: deploy fix for acknowledgements.
commit 5f488ed746ff18c2857b94377dc73d4b7f746a32 Author: Thibaut Cuvelier Date: Fri Nov 27 01:56:14 2020 +0100 DocBook: deploy fix for acknowledgements. --- development/autotests/invertedTests |4 +--- development/autotests/suspendedTests |1 - lib/layouts/acmart.layout|3 +++ lib/layouts/acmsiggraph-0-92.layout |3 +++ lib/layouts/acmsiggraph.layout |3 +++ lib/layouts/agutex.layout|1 + lib/layouts/apa.layout |1 + lib/layouts/apax.inc |1 + lib/layouts/iopart.layout|3 +++ lib/layouts/jasatex.layout |1 + lib/layouts/revtex4-x.inc|1 + lib/layouts/revtex4.layout |1 + lib/layouts/sigplanconf.layout |3 +++ lib/layouts/spie.layout |3 +++ 14 files changed, 25 insertions(+), 4 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 36682ea..71ade13 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -500,11 +500,9 @@ export/examples/ko/cjk-ko-doc_docbook5 export/templates/Articles/Springers_Global_Journal_Template_%28V._3%29_docbook5 # - Sweave impossible to implement. Document irremediably wrong (no .bib file, still referenced in the text). export/templates/Articles/R_Journal_docbook5 -# - Misplaced acknowledgements (fixable). -export/templates/Articles/REVTeX_%28V._4%29_docbook5 # - Forbidden inlines, equation in formatting, broken references, float in paragraphs, videos. export/templates/Articles/REVTeX_%28V._4.1%29_docbook5 -# - Address at the end of the document (only allowed in abstract), misplaced acknowledgements. +# - Address at the end of the document (only allowed in abstract). export/templates/Articles/Kluwer_docbook5 # - Empty bibliography, broken references, empty figures. export/templates/Articles/Journal_of_the_Acoustical_Society_of_America_%28JASA%29_docbook5 diff --git a/development/autotests/suspendedTests b/development/autotests/suspendedTests index 5fa5d0b..6d6e619 100644 --- a/development/autotests/suspendedTests +++ b/development/autotests/suspendedTests @@ -31,4 +31,3 @@ export/export/docbook/Hollywood_docbook5 export/templates/Letters/French_Letter_%28lettre%29_docbook5 export/templates/Letters/Letter_%28Standard_Class%29_docbook5 export/templates/Articles/Springers_Global_Journal_Template_%28V._3%29_docbook5 -export/templates/Articles/REVTeX_%28V._4%29_docbook5 diff --git a/lib/layouts/acmart.layout b/lib/layouts/acmart.layout index 397f686..2dd90df 100644 --- a/lib/layouts/acmart.layout +++ b/lib/layouts/acmart.layout @@ -661,6 +661,9 @@ Style Acknowledgments Series Bold Size Large EndFont + DocBookTagpara + DocBookWrapperTag acknowledgements + DocBookSectiontrue End InsetLayout Flex:Grant_Sponsor diff --git a/lib/layouts/acmsiggraph-0-92.layout b/lib/layouts/acmsiggraph-0-92.layout index dcac1a5..466d6ab 100644 --- a/lib/layouts/acmsiggraph-0-92.layout +++ b/lib/layouts/acmsiggraph-0-92.layout @@ -348,5 +348,8 @@ Style Acknowledgments LabelBottomsep 0 LabelType Above LabelString "Acknowledgments" + DocBookTagpara + DocBookWrapperTag acknowledgements + DocBookSectiontrue End diff --git a/lib/layouts/acmsiggraph.layout b/lib/layouts/acmsiggraph.layout index cffcc5e..fa0a2d4 100644 --- a/lib/layouts/acmsiggraph.layout +++ b/lib/layouts/acmsiggraph.layout @@ -304,5 +304,8 @@ Style Acknowledgments LabelBottomsep 0 LabelType Above LabelString "Acknowledgments" + DocBookTagpara + DocBookWrapperTag acknowledgements + DocBookSectiontrue End diff --git a/lib/layouts/agutex.layout b/lib/layouts/agutex.layout index 996aae7..af58699 100644 --- a/lib/layouts/agutex.layout +++ b/lib/layouts/agutex.layout @@ -204,6 +204,7 @@ Style Acknowledgments EndFont DocBookTagpara DocBookWrapperTag acknowledgements + DocBookSectiontrue End diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout index ad794e5..dcacaee 100644 --- a/lib/layouts/apa.layout +++ b/lib/layouts/apa.layout @@ -253,6 +253,7 @@ Style Acknowledgements EndFont DocBookTagpara DocBookWrapperTag acknowledgements + DocBookSectiontrue End diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc index d37cd2b..8edc84e 100644 --- a/lib/layouts/apax.inc +++ b/lib/layouts/apax.inc @@ -324,6 +324,7 @@ Style AuthorNote EndFont DocBookTagpara DocBookWrapperTag acknowledgements + DocBookSectiontrue End diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index 981a2d1..75f2764 100644 --- a/lib/layouts/iopart.layout +++ b/
[LyX/master] Cmake tests: Save the number of ignored tests in file for later review
commit 7e5b1d09f3dc27ff41c5b112e7e61da785765bb8
Author: Kornel Benko
Date: Fri Nov 27 00:49:03 2020 +0100
Cmake tests: Save the number of ignored tests in file for later review
---
CMakeLists.txt |6 ++
development/autotests/CMakeLists.txt|3 +++
development/autotests/ExportTests.cmake |9 +
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fedcbb1..808a0cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1279,4 +1279,10 @@ endif()
# can be run last
add_subdirectory(development/cmake/post_install)
+string(TIMESTAMP current_date "%Y-%m-%d %H:%M")
+execute_process(COMMAND ${LYX_GITVERSION} describe --tags
+ WORKING_DIRECTORY "${TOP_SRC_DIR}"
+ OUTPUT_VARIABLE current_version
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+file(APPEND "${TOP_BINARY_DIR}/Testing/IgnoredCount" "${current_date}
${current_version} Ignored tests = ${LYX_ignored_count}\n")
message(STATUS)
diff --git a/development/autotests/CMakeLists.txt
b/development/autotests/CMakeLists.txt
index 208e74b..4719229 100644
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -122,5 +122,8 @@ if(QT_USES_X11)
endif()
if (LYX_ENABLE_EXPORT_TESTS)
+ set(lyx_ignored_count 0)
include(${TOP_SRC_DIR}/development/autotests/ExportTests.cmake)
+ message(STATUS "Number of ignored export tests now ${lyx_ignored_count}")
+ set(LYX_ignored_count ${lyx_ignored_count} PARENT_SCOPE)
endif()
diff --git a/development/autotests/ExportTests.cmake
b/development/autotests/ExportTests.cmake
index e8ab4f5..18b98fd 100644
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -159,7 +159,11 @@ macro(maketestname testname inverted listinverted
listignored listunreliable lis
endif()
set(sublabel "${${listlabels}}")
findexpr(mfound ${testname} ${listignoredx} sublabel)
- if (NOT mfound)
+ if (mfound)
+MATH(EXPR lyx_ignored_count "${lyx_ignored_count}+1")
+# No testname because ignored
+set(${testname} "")
+ else()
set(sublabel2 "")
findexpr(foundunreliable ${testname} ${listunreliablex} sublabel2)
if (foundunreliable)
@@ -194,9 +198,6 @@ macro(maketestname testname inverted listinverted
listignored listunreliable lis
set(${testname} "${tmpprefix}${${testname}}")
set(${listlabels} ${sublabel})
endif()
- else()
-# No testname because ignored
-set(${testname} "")
endif()
endmacro()
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] amend dae064043682ea7dcf03899abaca067ee2245655
commit 46d90b3415de0f7b89368598261e0ffa5daaf539
Author: Thibaut Cuvelier
Date: Thu Nov 26 23:32:44 2020 +0100
amend dae064043682ea7dcf03899abaca067ee2245655
Fix a warning in the code.
---
src/output_docbook.cpp |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index c033239..bcd04bc 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -741,7 +741,8 @@ DocBookInfoTag getParagraphsWithInfo(ParagraphList const
¶graphs,
// Traverse everything that might belong to .
bool hasAbstractLayout = false;
- depth_type abstractDepth = -1;
+ static depth_type INVALID_DEPTH = 10;
+ depth_type abstractDepth = INVALID_DEPTH;
pit_type cpit = bpit;
for (; cpit < epit; ++cpit) {
// Skip paragraphs that don't generate anything in DocBook.
@@ -767,7 +768,7 @@ DocBookInfoTag getParagraphsWithInfo(ParagraphList const
¶graphs,
// Deeper paragraphs following the abstract must still be
considered as part of the abstract.
// For instance, this includes lists. There should not be any
other kind of paragraph in between.
- if (abstractDepth != -1 && style.docbookininfo() == "never") {
+ if (abstractDepth != INVALID_DEPTH && style.docbookininfo() ==
"never") {
if (par.getDepth() > abstractDepth) {
abstractWithLayout.emplace(cpit);
continue;
@@ -775,7 +776,7 @@ DocBookInfoTag getParagraphsWithInfo(ParagraphList const
¶graphs,
if (par.getDepth() == abstractDepth) {
// This is not an abstract paragraph and it
should not either be considered as part
// of it. It breaks the rule that abstract
paragraphs must follow each other.
- abstractDepth = -1;
+ abstractDepth = INVALID_DEPTH;
break;
}
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
Re: [LyX/master] Fix Clang warning about struct/class mismatch
Le 26/11/2020 à 19:21, Scott Kostyshak a écrit :
commit 9649e80c44f501d3ec758343c2eb0fd53a47d10f
Author: Scott Kostyshak
Date: Thu Nov 26 13:48:42 2020 -0500
Fix Clang warning about struct/class mismatch
CaretGeometry is defined as a struct, but was forward-declared as a
class. Now we forward-declare as a struct. This addresses the
following Clang warning (that does not appear with GCC):
Good catch.
JMarc
src/frontends/CaretGeometry.h:27:1: warning: 'CaretGeometry' defined
as a struct here but previously declared as a class; this is valid,
but may result in linker errors under the Microsoft C++ ABI
[-Wmismatched-tags]
---
src/BufferView.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/BufferView.h b/src/BufferView.h
index ca7b20b..1b76da2 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -26,7 +26,7 @@ namespace lyx {
namespace support { class FileName; }
-namespace frontend { class CaretGeometry; }
+namespace frontend { struct CaretGeometry; }
namespace frontend { class Painter; }
namespace frontend { class GuiBufferViewDelegate; }
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix Clang warning about struct/class mismatch
commit 9649e80c44f501d3ec758343c2eb0fd53a47d10f
Author: Scott Kostyshak
Date: Thu Nov 26 13:48:42 2020 -0500
Fix Clang warning about struct/class mismatch
CaretGeometry is defined as a struct, but was forward-declared as a
class. Now we forward-declare as a struct. This addresses the
following Clang warning (that does not appear with GCC):
src/frontends/CaretGeometry.h:27:1: warning: 'CaretGeometry' defined
as a struct here but previously declared as a class; this is valid,
but may result in linker errors under the Microsoft C++ ABI
[-Wmismatched-tags]
---
src/BufferView.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/BufferView.h b/src/BufferView.h
index ca7b20b..1b76da2 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -26,7 +26,7 @@ namespace lyx {
namespace support { class FileName; }
-namespace frontend { class CaretGeometry; }
+namespace frontend { struct CaretGeometry; }
namespace frontend { class Painter; }
namespace frontend { class GuiBufferViewDelegate; }
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: invert Greek LuaTeX texF tests
commit 5cf409328df37b8d92aadef4b4df3db542fb549c Author: Scott Kostyshak Date: Thu Nov 26 11:50:50 2020 -0500 ctests: invert Greek LuaTeX texF tests These tests fail on TeX Live 2020 after a babel-greek update. --- development/autotests/invertedTests |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 4da47d7..d494973 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -331,6 +331,11 @@ export/templates/Articles/Journal_of_the_Acoustical_Society_of_America_%28JASA%2 # export/templates/Articles/Journal_of_Statistical_Software_%28JSS%29_version_2_(lyx22|lyx23|pdf2) +# These fail on updated TL 2020 after an update to "babel-greek" because of +# missing symbols. I (Scott) checked the output of an older TL system and +# indeed the output looks good (no missing symbols). This issue was reported +# to the babel-greek maintainer and is being looked into. +export/.*/el/.*_(dvi3|pdf5)_texF # Sublabel: externalissues -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Improve some debug messages
commit c68be9a9be4b397825bf2b9844d25ad79f03dc96 Author: Jean-Marc Lasgouttes Date: Thu Nov 26 11:04:33 2020 +0100 Improve some debug messages The current code did not give much information. I am not sure why the
[LyX/master] Cmake build: Use the same warning flags at in automake
commit 4c58315d4b867cf5cce0fa05f168e448381f21d8
Author: Kornel Benko
Date: Thu Nov 26 11:04:48 2020 +0100
Cmake build: Use the same warning flags at in automake
---
CMakeLists.txt |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2e1e1f..fedcbb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -706,7 +706,7 @@ else()
# The following setting with LYX_GCC11_MODE is needed because cmake
does not honor
# CMAKE_CXX_STANDARD while performing tests like
# check_cxx_source_compiles("..." HAVE_DEF_MAKE_UNIQUE)
- set(LYX_CXX_FLAGS "-Wall -Wunused-parameter
${LYX_GCC11_MODE}${LYX_CXX_FLAGS}")
+ set(LYX_CXX_FLAGS "-Wall -Wextra -Wno-deprecated-copy
${LYX_GCC11_MODE}${LYX_CXX_FLAGS}")
if(LYX_STDLIB_DEBUG)
set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG
-D_GLIBCXX_DEBUG_PEDANTIC")
else()
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
