X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetIPAMacro.cpp;h=4e8afcfa7ecac8384f60063beb82bbe691918f52;hb=8ae0841826d90b8cdee1922f91fd6ccc5009f5ef;hp=0d7a41b0fb1f325aeb479a77435fccde5933f1e0;hpb=670efa8f646218f2a378f0cc614c4c37a9f6b89a;p=features.git diff --git a/src/insets/InsetIPAMacro.cpp b/src/insets/InsetIPAMacro.cpp index 0d7a41b0fb..4e8afcfa7e 100644 --- a/src/insets/InsetIPAMacro.cpp +++ b/src/insets/InsetIPAMacro.cpp @@ -22,7 +22,7 @@ #include "LaTeXFeatures.h" #include "Lexer.h" #include "MetricsInfo.h" -#include "output_xhtml.h" +#include "xml.h" #include "texstream.h" #include "frontends/FontMetrics.h" @@ -94,7 +94,7 @@ IPACharTranslator const & ipachartranslator() return chartranslator; } -} // anon +} // namespace InsetIPADecoParams::InsetIPADecoParams() @@ -125,7 +125,7 @@ void InsetIPADecoParams::read(Lexer & lex) ///////////////////////////////////////////////////////////////////// InsetIPADeco::InsetIPADeco(Buffer * buf, string const & label) - : InsetCollapsable(buf) + : InsetCollapsible(buf) { setDrawFrame(true); setFrameColor(Color_insetframe); @@ -146,7 +146,7 @@ docstring InsetIPADeco::layoutName() const void InsetIPADeco::metrics(MetricsInfo & mi, Dimension & dim) const { InsetText::metrics(mi, dim); - + if (params_.type == InsetIPADecoParams::Toptiebar) { // consider width of the inset label FontInfo font(getLayout().labelfont()); @@ -173,21 +173,18 @@ void InsetIPADeco::metrics(MetricsInfo & mi, Dimension & dim) const theFontMetrics(font).rectText(label, w, a, d); dim.des += int(d * 1.5); } - - // cache the inset dimension - setDimCache(mi, dim); } 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); - Dimension const dim = Inset::dimension(*pi.base.bv); + Dimension const dim = dimension(*pi.base.bv); if (params_.type == InsetIPADecoParams::Toptiebar) { FontInfo font(getLayout().labelfont()); @@ -226,14 +223,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); } @@ -280,7 +277,7 @@ 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 << "}"; } @@ -289,11 +286,11 @@ int InsetIPADeco::plaintext(odocstringstream & os, OutputParams const & runparams, size_t max_length) const { odocstringstream ods; - int h = (int)(InsetCollapsable::plaintext(ods, runparams, max_length) / 2); + int h = (int)(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()); - + if (params_.type == InsetIPADecoParams::Toptiebar) { os << before; os.put(0x0361); @@ -308,19 +305,31 @@ int InsetIPADeco::plaintext(odocstringstream & os, } -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. + odocstringstream ods; + int h = (int)(InsetText::plaintext(ods, runparams) / 2); + docstring result = ods.str(); + docstring const before = result.substr(0, h); + docstring const after = result.substr(h, result.size()); + + 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); + return InsetCollapsible::xhtml(xs, runparams); } @@ -413,7 +422,6 @@ void InsetIPAChar::metrics(MetricsInfo & mi, Dimension & dim) const } docstring ds(s.begin(), s.end()); dim.wid = fm.width(ds); - setDimCache(mi, dim); } @@ -544,45 +552,57 @@ int InsetIPAChar::plaintext(odocstringstream & os, OutputParams const &, size_t) } -int InsetIPAChar::docbook(odocstream & /*os*/, OutputParams const &) const +void InsetIPAChar::docbook(XMLStream & xs, OutputParams const &) const { switch (kind_) { - // FIXME - LYXERR0("IPA tone macros not yet implemented with DocBook!"); case TONE_FALLING: + xs << XMLStream::ESCAPE_NONE << "˥"; + xs << XMLStream::ESCAPE_NONE << "˩"; + break; case TONE_RISING: + xs << XMLStream::ESCAPE_NONE << "˩"; + xs << XMLStream::ESCAPE_NONE << "˥"; + break; case TONE_HIGH_RISING: + xs << XMLStream::ESCAPE_NONE << "˧"; + xs << XMLStream::ESCAPE_NONE << "˥"; + break; case TONE_LOW_RISING: + xs << XMLStream::ESCAPE_NONE << "˩"; + xs << XMLStream::ESCAPE_NONE << "˧"; + break; case TONE_HIGH_RISING_FALLING: + xs << XMLStream::ESCAPE_NONE << "˨"; + xs << XMLStream::ESCAPE_NONE << "˥"; + xs << XMLStream::ESCAPE_NONE << "˨"; break; } - return 0; } -docstring InsetIPAChar::xhtml(XHTMLStream & xs, OutputParams const &) const +docstring InsetIPAChar::xhtml(XMLStream & xs, OutputParams const &) const { switch (kind_) { case TONE_FALLING: - xs << XHTMLStream::ESCAPE_NONE << "˥" - << XHTMLStream::ESCAPE_NONE << "˩"; + xs << XMLStream::ESCAPE_NONE << "˥" + << XMLStream::ESCAPE_NONE << "˩"; break; case TONE_RISING: - xs << XHTMLStream::ESCAPE_NONE << "˩" - << XHTMLStream::ESCAPE_NONE << "˥"; + xs << XMLStream::ESCAPE_NONE << "˩" + << XMLStream::ESCAPE_NONE << "˥"; break; case TONE_HIGH_RISING: - xs << XHTMLStream::ESCAPE_NONE << "˧" - << XHTMLStream::ESCAPE_NONE << "˥"; + xs << XMLStream::ESCAPE_NONE << "˧" + << XMLStream::ESCAPE_NONE << "˥"; break; case TONE_LOW_RISING: - xs << XHTMLStream::ESCAPE_NONE << "˩" - << XHTMLStream::ESCAPE_NONE << "˧"; + xs << XMLStream::ESCAPE_NONE << "˩" + << XMLStream::ESCAPE_NONE << "˧"; break; case TONE_HIGH_RISING_FALLING: - xs << XHTMLStream::ESCAPE_NONE << "˨" - << XHTMLStream::ESCAPE_NONE << "˥" - << XHTMLStream::ESCAPE_NONE << "˨"; + xs << XMLStream::ESCAPE_NONE << "˨" + << XMLStream::ESCAPE_NONE << "˥" + << XMLStream::ESCAPE_NONE << "˨"; break; } return docstring();