#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/textutils.h"
+#include "output_docbook.h"
#include <atomic>
#include <sstream>
bool needPar = false;
bool closeLanguage = arabtex
|| basefont.isRightToLeft() == running_font.isRightToLeft();
+ // We pass non_inherit_inset = true here since size switches
+ // ought not to be terminated here (#8384).
unsigned int count = running_font.latexWriteEndChanges(os,
bparams, runparams, basefont, basefont,
- needPar, closeLanguage);
+ needPar, closeLanguage, true);
column += count;
// if any font properties were closed, update the running_font,
// making sure, however, to leave the language as it was
running_font = basefont;
if (!closeLanguage)
running_font.setLanguage(copy_font.language());
+ basefont.fontInfo().setSize(copy_font.fontInfo().size());
// leave font open if language is still open
- open_font = (running_font.language() == basefont.language());
+ open_font = (running_font.language() == basefont.language()
+ || running_font.fontInfo().size() == basefont.fontInfo().size());
if (closeLanguage)
runparams.local_font = &basefont;
}
}
-docstring Paragraph::expandDocBookLabel(Layout const & layout,
- BufferParams const & bparams) const
-{
- return expandParagraphLabel(layout, bparams, false);
-}
-
-
docstring Paragraph::expandParagraphLabel(Layout const & layout,
BufferParams const & bparams, bool process_appendix) const
{
pos_type body_pos = beginOfBody();
unsigned int column = 0;
+ // If we are inside an inset, the real outerfont is local_font
+ Font const real_outerfont = (runparams.local_font != nullptr)
+ ? Font(runparams.local_font->fontInfo()) : outerfont;
+
if (body_pos > 0) {
// the optional argument is kept in curly brackets in
// case it contains a ']'
// braces when it parses \item.
os << "[{";
column += 2;
- basefont = getLabelFont(bparams, outerfont);
+ basefont = getLabelFont(bparams, real_outerfont);
} else {
- basefont = getLayoutFont(bparams, outerfont);
+ basefont = getLayoutFont(bparams, real_outerfont);
}
// Which font is currently active?
basefont, basefont, needPar);
open_font = false;
}
- basefont = getLayoutFont(bparams, outerfont);
+ basefont = getLayoutFont(bparams, real_outerfont);
running_font = basefont;
column += Changes::latexMarkChange(os, bparams,
basefont, needPar);
open_font = false;
}
- basefont = (body_pos > i) ? getLabelFont(bparams, outerfont)
- : getLayoutFont(bparams, outerfont);
+ basefont = (body_pos > i) ? getLabelFont(bparams, real_outerfont)
+ : getLayoutFont(bparams, real_outerfont);
running_font = basefont;
column += Changes::latexMarkChange(os, bparams,
Change(Change::INSERTED), change, rp);
basefont, basefont, needPar);
open_font = false;
}
- basefont = (body_pos > i) ? getLabelFont(bparams, outerfont)
- : getLayoutFont(bparams, outerfont);
+ basefont = (body_pos > i) ? getLabelFont(bparams, real_outerfont)
+ : getLayoutFont(bparams, real_outerfont);
running_font = basefont;
column += Changes::latexMarkChange(os, bparams, runningChange,
change, runparams);
pit < 0 || pars[pit].empty()
? pars[pit].getLayoutFont(
bparams,
- outerfont)
+ real_outerfont)
: pars[pit].getFont(bparams,
pars[pit].size() - 1,
- outerfont);
+ real_outerfont);
if (lastfont.fontInfo().size() !=
basefont.fontInfo().size()) {
++parInline;
}
}
d->latexInset(bparams, os, rp, running_font,
- basefont, outerfont, open_font,
+ basefont, real_outerfont, open_font,
runningChange, style, i, column);
if (incremented)
--parInline;
// command is ever executed but its opening was recorded.
runparams.inulemcmd = rp.inulemcmd;
+ // These need to be passed upstream as well
+ runparams.need_maketitle = rp.need_maketitle;
+ runparams.have_maketitle = rp.have_maketitle;
+
// And finally, pass the post_macros upstream
runparams.post_macro = rp.post_macro;
}
// since this produces unwanted whitespace.
Font const font = empty()
- ? getLayoutFont(bparams, outerfont)
- : getFont(bparams, size() - 1, outerfont);
+ ? getLayoutFont(bparams, real_outerfont)
+ : getFont(bparams, size() - 1, real_outerfont);
InsetText const * textinset = inInset().asInsetText();
}
-pos_type Paragraph::firstWordDocBook(odocstream & os, OutputParams const & runparams)
- const
+pos_type Paragraph::firstWordDocBook(XMLStream & xs, OutputParams const & runparams) const
{
pos_type i;
for (i = 0; i < size(); ++i) {
if (Inset const * inset = getInset(i)) {
- inset->docbook(os, runparams);
+ inset->docbook(xs, runparams);
} else {
char_type c = d->text_[i];
if (c == ' ')
break;
- os << xml::escapeChar(c, XMLStream::ESCAPE_ALL);
+ xs << c;
}
}
return i;
}
+namespace {
+
+void doFontSwitchDocBook(vector<xml::FontTag> & tagsToOpen,
+ vector<xml::EndFontTag> & tagsToClose,
+ bool & flag, FontState curstate, xml::FontTypes type)
+{
+ if (curstate == FONT_ON) {
+ tagsToOpen.push_back(docbookStartFontTag(type));
+ flag = true;
+ } else if (flag) {
+ tagsToClose.push_back(docbookEndFontTag(type));
+ flag = false;
+ }
+}
+
+class OptionalFontType {
+public:
+ bool has_value;
+ xml::FontTypes ft;
+
+ OptionalFontType(): has_value(false), ft(xml::FT_EMPH) {} // A possible value at random for ft.
+ OptionalFontType(xml::FontTypes ft): has_value(true), ft(ft) {}
+};
+
+OptionalFontType fontShapeToXml(FontShape fs)
+{
+ switch (fs) {
+ case ITALIC_SHAPE:
+ return {xml::FT_ITALIC};
+ case SLANTED_SHAPE:
+ return {xml::FT_SLANTED};
+ case SMALLCAPS_SHAPE:
+ return {xml::FT_SMALLCAPS};
+ case UP_SHAPE:
+ case INHERIT_SHAPE:
+ return {};
+ default:
+ // the other tags are for internal use
+ LATTEST(false);
+ return {};
+ }
+}
+
+OptionalFontType fontFamilyToXml(FontFamily fm)
+{
+ switch (fm) {
+ case ROMAN_FAMILY:
+ return {xml::FT_ROMAN};
+ break;
+ case SANS_FAMILY:
+ return {xml::FT_SANS};
+ break;
+ case TYPEWRITER_FAMILY:
+ return {xml::FT_TYPE};
+ break;
+ case INHERIT_FAMILY:
+ return {};
+ default:
+ // the other tags are for internal use
+ LATTEST(false);
+ return {};
+ }
+}
+
+OptionalFontType fontSizeToXml(FontSize fs)
+{
+ switch (fs) {
+ case TINY_SIZE:
+ return {xml::FT_SIZE_TINY};
+ case SCRIPT_SIZE:
+ return {xml::FT_SIZE_SCRIPT};
+ case FOOTNOTE_SIZE:
+ return {xml::FT_SIZE_FOOTNOTE};
+ case SMALL_SIZE:
+ return {xml::FT_SIZE_SMALL};
+ case LARGE_SIZE:
+ return {xml::FT_SIZE_LARGE};
+ case LARGER_SIZE:
+ return {xml::FT_SIZE_LARGER};
+ case LARGEST_SIZE:
+ return {xml::FT_SIZE_LARGEST};
+ case HUGE_SIZE:
+ return {xml::FT_SIZE_HUGE};
+ case HUGER_SIZE:
+ return {xml::FT_SIZE_HUGER};
+ case INCREASE_SIZE:
+ return {xml::FT_SIZE_INCREASE};
+ case DECREASE_SIZE:
+ return {xml::FT_SIZE_DECREASE};
+ case INHERIT_SIZE:
+ case NORMAL_SIZE:
+ return {};
+ default:
+ // the other tags are for internal use
+ LATTEST(false);
+ return {};
+ }
+}
+
+}// anonymous namespace
+
+
void Paragraph::simpleDocBookOnePar(Buffer const & buf,
- odocstream & os,
- OutputParams const & runparams,
- Font const & outerfont,
- pos_type initial) const
+ XMLStream & xs,
+ OutputParams const & runparams,
+ Font const & outerfont,
+ bool start_paragraph, bool close_paragraph,
+ pos_type initial) const
{
+ // track whether we have opened these tags
bool emph_flag = false;
+ bool bold_flag = false;
+ bool noun_flag = false;
+ bool ubar_flag = false;
+ bool dbar_flag = false;
+ bool sout_flag = false;
+ bool wave_flag = false;
+ // shape tags
+ bool shap_flag = false;
+ // family tags
+ bool faml_flag = false;
+ // size tags
+ bool size_flag = false;
Layout const & style = *d->layout_;
+
+ if (start_paragraph)
+ xs.startDivision(allowEmpty());
+
FontInfo font_old =
- style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
+ style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
- if (style.pass_thru && !d->onlyText(buf, outerfont, initial))
- os << "]]>";
+ FontShape curr_fs = INHERIT_SHAPE;
+ FontFamily curr_fam = INHERIT_FAMILY;
+ FontSize curr_size = INHERIT_SIZE;
+
+ string const default_family =
+ buf.masterBuffer()->params().fonts_default_family;
+
+ vector<xml::FontTag> tagsToOpen;
+ vector<xml::EndFontTag> tagsToClose;
// parsing main loop
for (pos_type i = initial; i < size(); ++i) {
- Font font = getFont(buf.params(), i, outerfont);
-
- // handle <emphasis> tag
- if (font_old.emph() != font.fontInfo().emph()) {
- if (font.fontInfo().emph() == FONT_ON) {
- os << "<emphasis>";
- emph_flag = true;
- } else if (i != initial) {
- os << "</emphasis>";
- emph_flag = false;
+ // let's not show deleted material in the output
+ if (isDeleted(i))
+ continue;
+
+ Font const font = getFont(buf.masterBuffer()->params(), i, outerfont);
+
+ if (start_paragraph) {
+ // emphasis
+ FontState curstate = font.fontInfo().emph();
+ if (font_old.emph() != curstate)
+ doFontSwitchDocBook(tagsToOpen, tagsToClose, emph_flag, curstate, xml::FT_EMPH);
+
+ // noun
+ curstate = font.fontInfo().noun();
+ if (font_old.noun() != curstate)
+ doFontSwitchDocBook(tagsToOpen, tagsToClose, noun_flag, curstate, xml::FT_NOUN);
+
+ // underbar
+ curstate = font.fontInfo().underbar();
+ if (font_old.underbar() != curstate)
+ doFontSwitchDocBook(tagsToOpen, tagsToClose, ubar_flag, curstate, xml::FT_UBAR);
+
+ // strikeout
+ curstate = font.fontInfo().strikeout();
+ if (font_old.strikeout() != curstate)
+ doFontSwitchDocBook(tagsToOpen, tagsToClose, sout_flag, curstate, xml::FT_SOUT);
+
+ // double underbar
+ curstate = font.fontInfo().uuline();
+ if (font_old.uuline() != curstate)
+ doFontSwitchDocBook(tagsToOpen, tagsToClose, dbar_flag, curstate, xml::FT_DBAR);
+
+ // wavy line
+ curstate = font.fontInfo().uwave();
+ if (font_old.uwave() != curstate)
+ doFontSwitchDocBook(tagsToOpen, tagsToClose, wave_flag, curstate, xml::FT_WAVE);
+
+ // bold
+ // a little hackish, but allows us to reuse what we have.
+ curstate = (font.fontInfo().series() == BOLD_SERIES ? FONT_ON : FONT_OFF);
+ if (font_old.series() != font.fontInfo().series())
+ doFontSwitchDocBook(tagsToOpen, tagsToClose, bold_flag, curstate, xml::FT_BOLD);
+
+ // Font shape
+ curr_fs = font.fontInfo().shape();
+ FontShape old_fs = font_old.shape();
+ if (old_fs != curr_fs) {
+ if (shap_flag) {
+ OptionalFontType tag = fontShapeToXml(old_fs);
+ if (tag.has_value) {
+ tagsToClose.push_back(docbookEndFontTag(tag.ft));
+ }
+ shap_flag = false;
+ }
+
+ OptionalFontType tag = fontShapeToXml(curr_fs);
+ if (tag.has_value) {
+ tagsToOpen.push_back(docbookStartFontTag(tag.ft));
+ }
+ }
+
+ // Font family
+ curr_fam = font.fontInfo().family();
+ FontFamily old_fam = font_old.family();
+ if (old_fam != curr_fam) {
+ if (faml_flag) {
+ OptionalFontType tag = fontFamilyToXml(old_fam);
+ if (tag.has_value) {
+ tagsToClose.push_back(docbookEndFontTag(tag.ft));
+ }
+ faml_flag = false;
+ }
+ switch (curr_fam) {
+ case ROMAN_FAMILY:
+ // we will treat a "default" font family as roman, since we have
+ // no other idea what to do.
+ if (default_family != "rmdefault" && default_family != "default") {
+ tagsToOpen.push_back(docbookStartFontTag(xml::FT_ROMAN));
+ faml_flag = true;
+ }
+ break;
+ case SANS_FAMILY:
+ if (default_family != "sfdefault") {
+ tagsToOpen.push_back(docbookStartFontTag(xml::FT_SANS));
+ faml_flag = true;
+ }
+ break;
+ case TYPEWRITER_FAMILY:
+ if (default_family != "ttdefault") {
+ tagsToOpen.push_back(docbookStartFontTag(xml::FT_TYPE));
+ faml_flag = true;
+ }
+ break;
+ case INHERIT_FAMILY:
+ break;
+ default:
+ // the other tags are for internal use
+ LATTEST(false);
+ break;
+ }
}
+
+ // Font size
+ curr_size = font.fontInfo().size();
+ FontSize old_size = font_old.size();
+ if (old_size != curr_size) {
+ if (size_flag) {
+ OptionalFontType tag = fontSizeToXml(old_size);
+ if (tag.has_value) {
+ tagsToClose.push_back(docbookEndFontTag(tag.ft));
+ }
+ size_flag = false;
+ }
+
+ OptionalFontType tag = fontSizeToXml(curr_size);
+ if (tag.has_value) {
+ tagsToOpen.push_back(docbookStartFontTag(tag.ft));
+ size_flag = true;
+ }
+ }
+
+ // FIXME XHTML
+ // Other such tags? What about the other text ranges?
+
+ vector<xml::EndFontTag>::const_iterator cit = tagsToClose.begin();
+ vector<xml::EndFontTag>::const_iterator cen = tagsToClose.end();
+ for (; cit != cen; ++cit)
+ xs << *cit;
+
+ vector<xml::FontTag>::const_iterator sit = tagsToOpen.begin();
+ vector<xml::FontTag>::const_iterator sen = tagsToOpen.end();
+ for (; sit != sen; ++sit)
+ xs << *sit;
+
+ tagsToClose.clear();
+ tagsToOpen.clear();
}
if (Inset const * inset = getInset(i)) {
- inset->docbook(os, runparams);
+ if (!runparams.for_toc || inset->isInToc()) {
+ OutputParams np = runparams;
+ np.local_font = &font;
+ // If the paragraph has size 1, then we are in the "special
+ // case" where we do not output the containing paragraph info.
+ // This "special case" is defined in more details in output_docbook.cpp, makeParagraphs. The results
+ // of that brittle logic is passed to this function through open_par.
+ if (!inset->getLayout().htmlisblock() && size() != 1) // TODO: htmlisblock here too!
+ np.docbook_in_par = true;
+ inset->docbook(xs, np);
+ }
} else {
- char_type c = d->text_[i];
-
- if (style.pass_thru)
- os.put(c);
- else
- os << xml::escapeChar(c, XMLStream::EscapeSettings::ESCAPE_ALL);
+ char_type c = getUChar(buf.masterBuffer()->params(), runparams, i);
+ xs << c;
}
font_old = font.fontInfo();
}
- if (emph_flag) {
- os << "</emphasis>";
- }
-
- if (style.free_spacing)
- os << '\n';
- if (style.pass_thru && !d->onlyText(buf, outerfont, initial))
- os << "<
projects / features.git / blobdiff