Mercurial > octave

comparison libinterp/corefcn/txt-eng-ft.cc @ 17269:5b088598df1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add simple TeX parser based on flex/bison. * libinterp/corefcn/oct-tex-lexer.ll, libinterp/corefcn/oct-tex-pareser.yy: New files. * libinterp/Makefile.am (BUILT_SOURCES): Add oct-tex-lexer.cc and oct-tex-parser.cc. * libinterp/corefcn/modules.mk (corefcn/oct-tex-lexer.cc, corefcn/oct-tex-parser.h): New rules. * libinterp/corefcn/txt-eng-ft.h (ft_render::text_to_pixels, ft_render::get_extent): Add interpreter argument. * libinterp/corefcn/txt-eng-ft.cc (ft_render::text_to_pixels, ft_render::get_extent): Likewise. Use text_parser::parse(). * libinterp/corefcn/gl-render.cc (opengl_renderer::text_to_pixels): Use new interpreter argument. * libinterp/corefcn/graphics.cc (axes::properties::get_ticklabel_extents): Likewise. (uicontrol::properties::update_text_extent): Use text_parser::parse. * libinterp/corefcn/txt-eng.h (memory, string, caseless-str.h, dMatrix.h): New includes. (class text_element_subscript): Renamed from text_subscript_element. (class text_element_supserscript): Renamed from text_superscript_element. (class text_element_symbol, class text_element_fontstyle, class text_element_fontname, class text_element_fontsize, class text_element_color): New classes. (text_element_list::text_element_list(text_element*)): New constructor. (text_element_subscript::text_element_subscript(text_element*), text_element_subscript::text_element::subscript(char)): New constructors. (text_element_subscript::elem): New member. (text_element_subscript::get_element): New method. Returns it. (text_element_subscript::~text_element_subscript): New destructor. Delete it. (text_element_subscript::text_element_subscript()): Make default constructor private. (text_element_superscript::text_element_superscript(text_element*), text_element_superscript::text_element::superscript(char)): New constructors. (text_element_superscript::elem): New member. (text_element_superscript::get_element): New method. Returns it. (text_element_superscript::~text_element_superscript): New destructor. Delete it. (text_element_superscript::text_element_superscript()): Make default constructor private. (text_processor::visit(text_element_symbol), text_processor::visit(text_element_fontstyle), text_processor::visit(text_element_fontname), text_processor::visit(text_element_fontsize), text_processor::visit(text_element_color)): New methods. (text_parser::parse): New static method. (class text_parser_tex): New class.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sun, 18 Aug 2013 16:36:38 -0400
parents 68fc671a9339
children ba865ea9c7e9
comparison
equal deleted inserted replaced
17268:1c21f264d26f 17269:5b088598df1d
592 592
593 return extent; 593 return extent;
594 } 594 }
595 595
596 Matrix 596 Matrix
597 ft_render::get_extent (const std::string& txt, double rotation) 597 ft_render::get_extent (const std::string& txt, double rotation,
598 { 598 const caseless_str& interpreter)
599 text_element *elt = text_parser_none ().parse (txt); 599 {
600 text_element *elt = text_parser::parse (txt, interpreter);
600 Matrix extent = get_extent (elt, rotation); 601 Matrix extent = get_extent (elt, rotation);
601 delete elt; 602 delete elt;
602 603
603 return extent; 604 return extent;
604 } 605 }
619 } 620 }
620 621
621 void 622 void
622 ft_render::text_to_pixels (const std::string& txt, 623 ft_render::text_to_pixels (const std::string& txt,
623 uint8NDArray& pixels_, Matrix& box, 624 uint8NDArray& pixels_, Matrix& box,
624 int halign, int valign, double rotation) 625 int halign, int valign, double rotation,
626 const caseless_str& interpreter)
625 { 627 {
626 // FIXME: clip "rotation" between 0 and 360 628 // FIXME: clip "rotation" between 0 and 360
627 int rot_mode = rotation_to_mode (rotation); 629 int rot_mode = rotation_to_mode (rotation);
628 630
629 multiline_halign = halign; 631 multiline_halign = halign;
630 632
631 text_element *elt = text_parser_none ().parse (txt); 633 text_element *elt = text_parser::parse (txt, interpreter);
632 pixels_ = render (elt, box, rot_mode); 634 pixels_ = render (elt, box, rot_mode);
633 delete elt; 635 delete elt;
634 636
635 if (pixels_.numel () == 0) 637 if (pixels_.numel () == 0)
636 { 638 {