Mercurial > octave-nkf
diff libinterp/corefcn/oct-tex-parser.yy @ 17272:8ce6cdd272eb
Support TeX elements in FreeType renderer.
* libinterp/corefcn/txt-eng.cc: New file. Contains mapping from symbol
name to character code, in Unicode and MS symbol.
* libinterp/corefcn/modules.mk (COREFCN_SRC): Add txt-eng.cc.
* libinterp/corefcn/oct-tex-lexer.ll: Add "\n" to rules applicable to
".", as
the latter does not include new line characters.
* libinterp/corefcn/oct-tex-parser.yy: Remove debug statements.
* libinterp/corefcn/txt-eng.ft.cc (gripe_missing_glyph,
gripe_glyph_render): Change signature from char to FT_ULong.
(ft_render::ft_render): Adapt to new/removed members.
(ft_render::~ft_render): Remove use of fonts member.
(ft_render::set_font): Likewise. Use font instead.
(ft_render::push_new_line): Likewise. Change meaning of yoffset and
initialize line_yoffset.
(ft_render::update_line_bbox): New method.
(ft_render::set_mode): Change meaning of yoffset and initialize
line_yoffset.
(ft_render::process_character): New method.
(ft_render::visit(text_element_string)): Use it.
(ft_render::visit(text_element_list),
ft_render::visit(text_element_subscript),
ft_render::visit(text_element_superscript),
ft_render::visit(text_element_color),
ft_render::visit(text_element_fontsize),
ft_render::visit(text_element_fontname),
ft_render::visit(text_element_fontstyle),
ft_render::visit(text_element_symbol)): New methods.
(ft_render::set_color): Use color member instead of red/green/blue.
* libinterp/corefcn/txt-eng-ft.h (ft_render::visit(text_element_list),
ft_render::visit(text_element_subscript),
ft_render::visit(text_element_superscript),
ft_render::visit(text_element_color),
ft_render::visit(text_element_fontsize),
ft_render::visit(text_element_fontname),
ft_render::visit(text_element_fontstyle),
ft_render::visit(text_element_symbol)): New methods.
(ft_render::update_line_bbox, ft_render::process_character): New
methods.
(ft_render::current_face): Removed method.i
(ft_render::font): New member, replaces obsolete ft_render::fonts.
(ft_render::line_yoffset): New member.
(ft_render::color): New member, replaces obsolete red, green and blue.
(ft_render::ft_font::ft_font()): Implement default constructor.
(ft_render::ft_font::operator=): Fix incorrect use of FT_Reference_Face
return value.
(ft_render::ft_font::is_valid): New method.
* libinterp/corefcn/txt-eng.h (class text_element_symbol, class
text_element_fontname, class text_element_fontsize, class
text_element_fontname, class text_element_fontstyle, class
text_element_color): Add forward definition.
(text_element_symbol::invalid_code): New enum.
(text_element_symbol::code): New member.
(text_element_symbol::text_element_symbol): Initialize it.
(text_element_symbol::get_symbol_code): New method.
(text_element_fontstyle::get_fontstyle): New method.
(text_element_fontname::get_fontname): Renamed from fontname.
(text_element_fontsize::get_fontsize): Renamed from fontsize.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Sun, 18 Aug 2013 16:36:46 -0400 |
parents | 5b088598df1d |
children | 0a09d4b40767 |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-tex-parser.yy Sun Aug 18 16:36:44 2013 -0400 +++ b/libinterp/corefcn/oct-tex-parser.yy Sun Aug 18 16:36:46 2013 -0400 @@ -94,7 +94,6 @@ symbol_element : CMD identifier { - printf ("symbol: %s\n", $2->c_str ()); $$ = new text_element_symbol (*$2); delete $2; } @@ -116,7 +115,6 @@ fontname_element : FONTNAME START simple_string END { - printf ("fontname: %s\n", $3->c_str ()); $$ = new text_element_fontname (*$3); delete $3; } @@ -124,20 +122,17 @@ color_element : COLOR START simple_string END { - printf ("color: %s\n", $3->c_str ()); $$ = new text_element_color (*$3); delete $3; } | COLOR_RGB START NUM NUM NUM END { - printf ("color: %g %g %g\n", $3, $4, $5); $$ = new text_element_color ($3, $4, $5); } ; string_element : simple_string %prec STR { - printf ("string: \"%s\"\n", $1->c_str ()); $$ = new text_element_string (*$1); delete $1; } @@ -202,5 +197,5 @@ static void yyerror (text_parser_tex&, const char *s) { - fprintf (stderr, "parse error: %s\n", s); + fprintf (stderr, "TeX parse error: %s\n", s); }