On Tue, Dec 30, 2014 at 7:33 AM, Georg Baum <b...@lyx.org> wrote: > commit 33b059bd9d98e725500c48cccc855d89986223b3 > Author: Georg Baum <b...@lyx.org> > Date: Tue Dec 30 13:30:40 2014 +0100 > > Make macro xhtml export more secure > > Actually I wanted to do that in cc87f8100 but forgot to adjust the > original > solution completely. Now we do not search for an arbitrary latexkeys > instance > which just happens to have the same name as the macro, but we only use the > symbol that was explicitly set for global macros. >
This seems to have broken export of the Math manual to LyXhtml for me. A git bisect run based on the exit code of ctest -R "doc/Math_xhtml" lead me to this commit. On current master, I get the following if I export to LyXHTML: support/lassert.cpp (51): ASSERTION macro_ VIOLATED IN /home/scott/lyxbuilds/master/repo/src/mathed/MathMacro.cpp:796 ( 1) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::doAssertWithCallstack(bool) ( 2) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::doAssert(char const*, char const*, long) ( 3) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::MathMacro::mathmlize(lyx::MathStream&) const ( 4) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::mathmlize(lyx::MathData const&, lyx::MathStream&) ( 5) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::operator<<(lyx::MathStream&, lyx::MathData const&) ( 6) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::InsetMathHull::mathmlize(lyx::MathStream&) const ( 7) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::InsetMathHull::xhtml(lyx::XHTMLStream&, lyx::OutputParams const&) const ( 8) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::Paragraph::simpleLyXHTMLOnePar(lyx::Buffer const&, lyx::XHTMLStream&, lyx::OutputParams const&, lyx::Font const&, long) const ( 9) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2() [0xb7b4ab] ( 10) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::xhtmlParagraphs(lyx::Text const&, lyx::Buffer const&, lyx::XHTMLStream&, lyx::OutputParams const&) ( 11) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::InsetText::insetAsXHTML(lyx::XHTMLStream&, lyx::OutputParams const&, lyx::InsetText::XHTMLOptions) const ( 12) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::InsetTableCell::xhtml(lyx::XHTMLStream&, lyx::OutputParams const&) const ( 13) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::Tabular::xhtmlRow(lyx::XHTMLStream&, unsigned long, lyx::OutputParams const&, bool) const ( 14) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::Tabular::xhtml(lyx::XHTMLStream&, lyx::OutputParams const&) const ( 15) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::InsetTabular::xhtml(lyx::XHTMLStream&, lyx::OutputParams const&) const ( 16) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::Paragraph::simpleLyXHTMLOnePar(lyx::Buffer const&, lyx::XHTMLStream&, lyx::OutputParams const&, lyx::Font const&, long) const ( 17) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2() [0xb7b4ab] ( 18) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::xhtmlParagraphs(lyx::Text const&, lyx::Buffer const&, lyx::XHTMLStream&, lyx::OutputParams const&) ( 19) /home/scott/lyxbuilds/master/CMakeBuild/bin/lyx2.2: lyx::Buffer::writeLyXHTMLSource(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >&, lyx::OutputParams const&, lyx::Buffer::OutputWhat) const Scott
