X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetIPAMacro.cpp;h=2d4b1fb13c2d25e516f66fb462f5862c2dde3bd1;hb=8124e6c02ea1fd6779bb6c47ffe2bca2c8bd2d97;hp=cbc3abf525bb491d0b2b8e0d573c521895fa49d3;hpb=e30f3d76d2bee0011ceaeb5f0cc221156458cbad;p=lyx.git diff --git a/src/insets/InsetIPAMacro.cpp b/src/insets/InsetIPAMacro.cpp index cbc3abf525..2d4b1fb13c 100644 --- a/src/insets/InsetIPAMacro.cpp +++ b/src/insets/InsetIPAMacro.cpp @@ -16,13 +16,14 @@ #include "BufferParams.h" #include "Dimension.h" #include "Encoding.h" -#include "Font.h" +#include "FontInfo.h" #include "FuncRequest.h" #include "FuncStatus.h" +#include "InsetLayout.h" #include "LaTeXFeatures.h" #include "Lexer.h" #include "MetricsInfo.h" -#include "output_xhtml.h" +#include "xml.h" #include "texstream.h" #include "frontends/FontMetrics.h" @@ -125,7 +126,7 @@ void InsetIPADecoParams::read(Lexer & lex) ///////////////////////////////////////////////////////////////////// InsetIPADeco::InsetIPADeco(Buffer * buf, string const & label) - : InsetCollapsable(buf) + : InsetCollapsible(buf) { setDrawFrame(true); setFrameColor(Color_insetframe); @@ -179,7 +180,7 @@ void InsetIPADeco::metrics(MetricsInfo & mi, Dimension & dim) const void InsetIPADeco::draw(PainterInfo & pi, int x, int y) const { // draw the text - InsetCollapsable::draw(pi, x, y); + InsetCollapsible::draw(pi, x, y); // draw the inset marker drawMarkers(pi, x, y); @@ -223,14 +224,14 @@ void InsetIPADeco::draw(PainterInfo & pi, int x, int y) const void InsetIPADeco::write(ostream & os) const { params_.write(os); - InsetCollapsable::write(os); + InsetCollapsible::write(os); } void InsetIPADeco::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(lex); + InsetCollapsible::read(lex); } @@ -277,19 +278,32 @@ void InsetIPADeco::latex(otexstream & os, OutputParams const & runparams) const os << "\\texttoptiebar{"; else if (params_.type == InsetIPADecoParams::Bottomtiebar) os << "\\textbottomtiebar{"; - InsetCollapsable::latex(os, runparams); + InsetCollapsible::latex(os, runparams); os << "}"; } -int InsetIPADeco::plaintext(odocstringstream & os, - OutputParams const & runparams, size_t max_length) const +namespace { +std::pair splitPlainTextInHalves( + const InsetIPADeco * inset, OutputParams const & runparams, + size_t max_length = INT_MAX) { odocstringstream ods; - int h = (int)(InsetCollapsable::plaintext(ods, runparams, max_length) / 2); + int h = inset->InsetCollapsible::plaintext(ods, runparams, max_length) / 2; docstring result = ods.str(); docstring const before = result.substr(0, h); docstring const after = result.substr(h, result.size()); + return {before, after}; +} +} + + +int InsetIPADeco::plaintext(odocstringstream & os, + OutputParams const & runparams, size_t max_length) const +{ + docstring before; + docstring after; + tie(before, after) = splitPlainTextInHalves(this, runparams, max_length); if (params_.type == InsetIPADecoParams::Toptiebar) { os << before; @@ -301,23 +315,33 @@ int InsetIPADeco::plaintext(odocstringstream & os, os.put(0x035c); os << after; } - return result.size(); + return before.size() + after.size(); } -int InsetIPADeco::docbook(odocstream & os, OutputParams const & runparams) const +void InsetIPADeco::docbook(XMLStream & xs, OutputParams const & runparams) const { - // FIXME: Any docbook option here? - return InsetCollapsable::docbook(os, runparams); + // The special combining character must be put in the middle, between the two other characters. + // It will not work if there is anything else than two pure characters, so going back to plaintext. + docstring before; + docstring after; + tie(before, after) = splitPlainTextInHalves(this, runparams); + + xs << XMLStream::ESCAPE_NONE << before; + if (params_.type == InsetIPADecoParams::Toptiebar) + xs << XMLStream::ESCAPE_NONE << "͡"; + else if (params_.type == InsetIPADecoParams::Bottomtiebar) + xs << XMLStream::ESCAPE_NONE << "͜"; + xs << XMLStream::ESCAPE_NONE << after; } -docstring InsetIPADeco::xhtml(XHTMLStream & xs, OutputParams const & runparams) const +docstring InsetIPADeco::xhtml(XMLStream & xs, OutputParams const & runparams) const { - // FIXME: Like in plaintext, the combining characters "͡" (toptiebar) - // or "͜" (bottomtiebar) would need to be inserted just in the mid - // of the text string. (How) can this be done with the xhtml stream? - return InsetCollapsable::xhtml(xs, runparams); + // The DocBook encoding for this inset has no DocBook tag, but sheer XML (relying on a plaintext + // transformation of the inset). + docbook(xs, runparams); + return docstring(); } @@ -381,7 +405,7 @@ bool InsetIPADeco::insetAllowed(InsetCode code) const InsetIPAChar::InsetIPAChar(Kind k) - : Inset(0), kind_(k) + : Inset(nullptr), kind_(k) {} @@ -540,47 +564,34 @@ int InsetIPAChar::plaintext(odocstringstream & os, OutputParams const &, size_t) } -int InsetIPAChar::docbook(odocstream & /*os*/, OutputParams const &) const -{ - switch (kind_) { - case TONE_FALLING: - case TONE_RISING: - case TONE_HIGH_RISING: - case TONE_LOW_RISING: - case TONE_HIGH_RISING_FALLING: - // FIXME - LYXERR0("IPA tone macros not yet implemented with DocBook!"); - break; +namespace { +std::string ipaCharToXMLEntity(InsetIPAChar::Kind kind) { + switch (kind) { + case InsetIPAChar::Kind::TONE_FALLING: + return "˥˩"; + case InsetIPAChar::Kind::TONE_RISING: + return "˩˥"; + case InsetIPAChar::Kind::TONE_HIGH_RISING: + return "˧˥"; + case InsetIPAChar::Kind::TONE_LOW_RISING: + return "˩˧"; + case InsetIPAChar::Kind::TONE_HIGH_RISING_FALLING: + return "˨˥˨"; } - return 0; + return ""; +} } -docstring InsetIPAChar::xhtml(XHTMLStream & xs, OutputParams const &) const +void InsetIPAChar::docbook(XMLStream & xs, OutputParams const &) const { - switch (kind_) { - case TONE_FALLING: - xs << XHTMLStream::ESCAPE_NONE << "˥" - << XHTMLStream::ESCAPE_NONE << "˩"; - break; - case TONE_RISING: - xs << XHTMLStream::ESCAPE_NONE << "˩" - << XHTMLStream::ESCAPE_NONE << "˥"; - break; - case TONE_HIGH_RISING: - xs << XHTMLStream::ESCAPE_NONE << "˧" - << XHTMLStream::ESCAPE_NONE << "˥"; - break; - case TONE_LOW_RISING: - xs << XHTMLStream::ESCAPE_NONE << "˩" - << XHTMLStream::ESCAPE_NONE << "˧"; - break; - case TONE_HIGH_RISING_FALLING: - xs << XHTMLStream::ESCAPE_NONE << "˨" - << XHTMLStream::ESCAPE_NONE << "˥" - << XHTMLStream::ESCAPE_NONE << "˨"; - break; - } + xs << XMLStream::ESCAPE_NONE << from_ascii(ipaCharToXMLEntity(kind())); +} + + +docstring InsetIPAChar::xhtml(XMLStream & xs, OutputParams const &) const +{ + xs << XMLStream::ESCAPE_NONE << from_ascii(ipaCharToXMLEntity(kind())); return docstring(); }