anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DocBook: new logic to handle the new lines, only used in output_docbook for now.

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-08-18 00:37:34 +02:00
parent 27a44f8e48
commit 9393ca74ba
7 changed files with 121 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/layouts/stdlayouts.inc
View File

@ -7,7 +7,7 @@
# quotations and such.
Format 82
Format 84
Style Quotation
Category MainText

2
lib/layouts/stdlists.inc
View File

@ -6,7 +6,7 @@
# This include files contains various standard environments for lists.
Format 82
Format 84
Input stdlyxlist.inc

2
lib/layouts/stdstruct.inc
View File

@ -8,7 +8,7 @@
# a document, like abstract, bibliography and such.
Format 82
Format 84
Style Abstract
Margin Static

6
lib/layouts/stdtitle.inc
View File

@ -8,7 +8,7 @@
# a document, like title, author and such.
Format 82
Format 84
Style Title
Margin Static
@ -29,6 +29,7 @@ Style Title
HTMLTag h1
HTMLTitle true
DocBookTag title
DocBookTagType paragraph
DocBookInInfo maybe
End
@ -50,7 +51,9 @@ Style Author
Size Large
EndFont
DocBookTag personname
DocBookTagType paragraph
DocBookWrapperTag author
DocBookWrapperTagType inline
DocBookInInfo always
End
@ -72,5 +75,6 @@ Style Date
Size Large
EndFont
DocBookTag date
DocBookTagType paragraph
DocBookInInfo always
End

2
src/insets/InsetNewline.cpp
View File

@ -181,7 +181,7 @@ void InsetNewline::docbook(XMLStream & xs, OutputParams const & runparams) const
// about the paragraph's layout... Good for now, though, this should not happen in DocBook, only maybe
// extensions.
xs << XMLStream::ESCAPE_NONE << from_utf8("<!-- Is para open? " + string((xs.isTagOpen(xml::StartTag("para"))) ? "yes" : "no") +" -->");
xs << XMLStream::ESCAPE_NONE << from_utf8("</para>\n<para");
xs << XMLStream::ESCAPE_NONE << from_utf8("</para>\n<para>");
// TODO: that's a hack...
// xs << xml::EndTag("para");
// xs << xml::CR();

231
src/output_docbook.cpp
View File

@ -43,8 +43,6 @@
#include <algorithm>
#include <sstream>
// #define DOCBOOK_DEBUG_NEWLINES
using namespace std;
using namespace lyx::support;
@ -189,14 +187,100 @@ xml::EndFontTag docbookEndFontTag(xml::FontTypes type)
namespace {
// convenience functions
// Convenience functions to open and close tags. First, very low-level ones to ensure a consistent new-line behaviour.
// Block style:
// Content before
// <blocktag>
// Contents of the block.
// </blocktag>
// Content after
// Paragraph style:
// Content before
// <paratag>Contents of the paragraph.</paratag>
// Content after
// Inline style:
// Content before<inlinetag>Contents of the paragraph.</inlinetag>Content after
void openInlineTag(XMLStream & xs, const std::string & tag, const std::string & attr)
{
xs << xml::StartTag(tag, attr);
}
void closeInlineTag(XMLStream & xs, const std::string & tag)
{
xs << xml::EndTag(tag);
}
void openParTag(XMLStream & xs, const std::string & tag, const std::string & attr)
{
if (!xs.isLastTagCR())
xs << xml::CR();
xs << xml::StartTag(tag, attr);
}
void closeParTag(XMLStream & xs, const std::string & tag)
{
xs << xml::EndTag(tag);
xs << xml::CR();
}
void openBlockTag(XMLStream & xs, const std::string & tag, const std::string & attr)
{
if (!xs.isLastTagCR())
xs << xml::CR();
xs << xml::StartTag(tag, attr);
xs << xml::CR();
}
void closeBlockTag(XMLStream & xs, const std::string & tag)
{
xs << xml::CR();
xs << xml::EndTag(tag);
xs << xml::CR();
}
void openTag(XMLStream & xs, const std::string & tag, const std::string & attr, const std::string & tagtype)
{
if (tag.empty() || tag == "NONE")
return;
if (tag == "para" || tagtype == "paragraph") // Special case for <para>: always considered as a paragraph.
openParTag(xs, tag, attr);
else if (tagtype == "block")
openBlockTag(xs, tag, attr);
else if (tagtype == "inline")
openInlineTag(xs, tag, attr);
else
xs.writeError("Unrecognised tag type '" + tagtype + "' for '" + tag + " " + attr + "'");
}
void closeTag(XMLStream & xs, const std::string & tag, const std::string & tagtype)
{
if (tag.empty() || tag == "NONE")
return;
if (tag == "para" || tagtype == "paragraph") // Special case for <para>: always considered as a paragraph.
closeParTag(xs, tag);
else if (tagtype == "block")
closeBlockTag(xs, tag);
else if (tagtype == "inline")
closeInlineTag(xs, tag);
else
xs.writeError("Unrecognised tag type '" + tagtype + "' for '" + tag + "'");
}
// Higher-level convenience functions.
void openParTag(XMLStream & xs, const Paragraph * par, const Paragraph * prevpar)
{
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- openParTag -->";
#endif
Layout const & lay = par->layout();
if (par == prevpar)
@ -218,38 +302,25 @@ void openParTag(XMLStream & xs, const Paragraph * par, const Paragraph * prevpar
}
// Main logic.
if (openWrapper) {
xs << xml::StartTag(lay.docbookwrappertag(), lay.docbookwrapperattr());
xs << xml::CR();
}
if (openWrapper)
openTag(xs, lay.docbookwrappertag(), lay.docbookwrapperattr(), lay.docbookwrappertagtype());
string tag = lay.docbooktag();
const string & tag = lay.docbooktag();
if (tag != "NONE") {
auto xmltag = xml::ParTag(tag, lay.docbookattr());
if (!xs.isTagOpen(xmltag, 1)) // Don't nest a paragraph directly in a paragraph. TODO: required or not?
xs << xmltag;
if (!xs.isTagOpen(xmltag, 1)) // Don't nest a paragraph directly in a paragraph.
// TODO: required or not?
// TODO: avoid creating a ParTag object just for this query...
openTag(xs, lay.docbooktag(), lay.docbookattr(), lay.docbooktagtype());
}
if (lay.docbookitemtag() != "NONE") {
xs << xml::StartTag(lay.docbookitemtag(), lay.docbookitemattr());
xs << xml::CR();
}
if (lay.docbookiteminnertag() != "NONE")
xs << xml::StartTag(lay.docbookiteminnertag(), lay.docbookiteminnerattr());
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- /openParTag -->";
#endif
openTag(xs, lay.docbookitemtag(), lay.docbookitemattr(), lay.docbookitemtagtype());
openTag(xs, lay.docbookiteminnertag(), lay.docbookiteminnerattr(), lay.docbookiteminnertagtype());
}
void closeParTag(XMLStream & xs, Paragraph const * par, Paragraph const * nextpar)
{
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- closeParTag -->";
#endif
if (par == nextpar)
nextpar = nullptr;
@ -265,119 +336,35 @@ void closeParTag(XMLStream & xs, Paragraph const * par, Paragraph const * nextpa
}
// Main logic.
if (lay.docbookiteminnertag() != "NONE") {
xs << xml::EndTag(lay.docbookiteminnertag());
xs << xml::CR();
}
if (lay.docbookitemtag() != "NONE") {
xs << xml::EndTag(lay.docbookitemtag());
xs << xml::CR();
}
if (lay.docbooktag() != "NONE") {
xs << xml::EndTag(lay.docbooktag());
xs << xml::CR();
}
if (closeWrapper) {
xs << xml::EndTag(lay.docbookwrappertag());
xs << xml::CR();
}
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- /closeParTag -->";
#endif
}
void openBlockTag(XMLStream & xs, const Paragraph * par, const Paragraph * prevpar)
{
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- openBlockTag -->";
#endif
// Similar as openParTag, but with a line feed after.
openParTag(xs, par, prevpar);
xs << xml::CR();
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- /openBlockTag -->";
#endif
}
void closeBlockTag(XMLStream & xs, const Paragraph * par, const Paragraph * prevpar)
{
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- closeBlockTag -->";
#endif
// Similar as closeParTag, but with a line feed before.
xs << xml::CR();
closeParTag(xs, par, prevpar);
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- /closeBlockTag -->";
#endif
closeTag(xs, lay.docbookiteminnertag(), lay.docbookiteminnertagtype());
closeTag(xs, lay.docbookitemtag(), lay.docbookitemtagtype());
closeTag(xs, lay.docbooktag(), lay.docbooktagtype());
if (closeWrapper)
closeTag(xs, lay.docbookwrappertag(), lay.docbookwrappertagtype());
}
void openLabelTag(XMLStream & xs, Layout const & lay) // Mostly for definition lists.
{
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- openLabelTag -->";
#endif
xs << xml::StartTag(lay.docbookitemlabeltag(), lay.docbookitemlabelattr());
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- /openLabelTag -->";
#endif
openTag(xs, lay.docbookitemlabeltag(), lay.docbookitemlabelattr(), lay.docbookitemlabeltagtype());
}
void closeLabelTag(XMLStream & xs, Layout const & lay)
{
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- closeLabelTag -->";
#endif
xs << xml::EndTag(lay.docbookitemlabeltag());
xs << xml::CR();
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- closeLabelTag -->";
#endif
closeTag(xs, lay.docbookitemlabeltag(), lay.docbookitemlabeltagtype());
}
void openItemTag(XMLStream & xs, Layout const & lay)
{
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- openItemTag -->";
#endif
xs << xml::StartTag(lay.docbookitemtag(), lay.docbookitemattr());
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- /openItemTag -->";
#endif
openTag(xs, lay.docbookitemtag(), lay.docbookitemattr(), lay.docbookitemtagtype());
}
void closeItemTag(XMLStream & xs, Layout const & lay)
{
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- closeItemTag -->";
#endif
xs << xml::EndTag(lay.docbookitemtag());
xs << xml::CR();
#ifdef DOCBOOK_DEBUG_NEWLINES
xs << XMLStream::ESCAPE_NONE << "<!-- /closeItemTag -->";
#endif
closeTag(xs, lay.docbookitemtag(), lay.docbookitemtagtype());
}

6
src/xml.h
View File

@ -100,13 +100,13 @@ public:
bool isTagPending(xml::StartTag const &, int maxdepth = -1) const;
///
bool isLastTagCR() const { return is_last_tag_cr_; };
private:
///
void clearTagDeque();
///
void writeError(std::string const &) const;
///
void writeError(docstring const &) const;
private:
///
void clearTagDeque();
///
odocstream & os_;
///