Mercurial > hg > octave-lyh
view scripts/java/module.mk @ 17280: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 | 7f2395651a1c |
children |
line wrap: on
line source
FCN_FILE_DIRS += java java_FCN_FILES = \ java/javaArray.m \ java/javaaddpath.m \ java/javaclasspath.m \ java/javamem.m \ java/javarmpath.m \ java/usejava.m FCN_FILES += $(java_FCN_FILES) PKG_ADD_FILES += java/PKG_ADD DIRSTAMP_FILES += java/$(octave_dirstamp) if AMCOND_HAVE_JAVA JAR_FILES += java/octave.jar endif org_octave_dir = org/octave if AMCOND_HAVE_JAVA JAVA_SRC = \ $(org_octave_dir)/ClassHelper.java \ $(org_octave_dir)/OctClassLoader.java \ $(org_octave_dir)/Octave.java \ $(org_octave_dir)/OctaveReference.java \ $(org_octave_dir)/Matrix.java \ $(org_octave_dir)/JDialogBox.java \ $(org_octave_dir)/DlgListener.java \ $(org_octave_dir)/TeXtranslator.java \ $(org_octave_dir)/TeXcode.java endif JAVA_CLASSES = $(JAVA_SRC:.java=.class) JAVA_IMAGES = \ $(org_octave_dir)/images/question.png \ $(org_octave_dir)/images/error.png \ $(org_octave_dir)/images/warning.png \ $(org_octave_dir)/images/information.png \ $(org_octave_dir)/images/octave.png java_JAVA_SRC = $(addprefix java/, $(JAVA_SRC)) java_JAVA_CLASSES = $(addprefix java/, $(JAVA_CLASSES)) java_JAVA_IMAGES = $(addprefix java/, $(JAVA_IMAGES)) srcdir_java_JAVA_IMAGES = $(addprefix $(srcdir)/java/, $(JAVA_IMAGES)) %.class : %.java $(MKDIR_P) java/$(org_octave_dir) ( cd $(srcdir)/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_builddir)/java $(org_octave_dir)/$(<F) ) java/images.stamp: $(srcdir_java_JAVA_IMAGES) if [ "x$(srcdir)" != "x." ]; then \ $(MKDIR_P) java/$(org_octave_dir)/images; \ cp $(srcdir_java_JAVA_IMAGES) java/$(org_octave_dir)/images; \ fi touch $@ if AMCOND_HAVE_JAVA java/octave.jar: java/images.stamp $(java_JAVA_CLASSES) ( cd java; "$(JAR)" cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) ) mv $@.t $@ endif EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES) CLEANFILES += $(JAR_FILES) $(java_JAVA_CLASSES) DISTCLEANFILES += java/images.stamp