Mercurial > hg > octave-lyh

annotate libinterp/corefcn/data.h @ 17335:fe6518a1d87c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move TeX symbol decoding into the lexer (bug #39831). * libinterp/Makefile.am (BUILT_SOURCES): Add corefcn/oct-tex-symbols.cc. (BUILT_DISTFILES): Add corefcn/oct-tex-lexer.ll and corefcn/oct-tex-symbols.cc. (EXTRA_DIST): Add corefcn/oct-tex-lexer.in.ll and corefcn/oct-tex-symbols.in. (ULT_DIST_SRC): Filter out corefcn/oct-tex-lexer.ll from DIST_SRC and add corefcn/oct-tex-lexer.in.ll instead. (CLEAN_FILES): Add corefcn/oct-tex-parser.output. * libinterp/corefcn/modules.mk (corefcn/oct-tex-lexer.ll, corefcn/oct-tex-symbols.cc): New rules to build the TeX lexer. (corefcn/txt-eng.cc): Add dependency on corefcn/oct-tex-symbols.cc. * libinterp/corefcn/oct-tex-lexer.in.ll: Renamed from oct-tex.lexer.ll. Remove COMMAND state. Remove ID regex. Replace rules for symbols with tag @SYMBOL_RULES@. * libinterp/corefcn/oct-tex-parser.yy (ID, CMD, identifier): Remove tokens. (SYM, sym): New token and value. (symbol_element): Build from SYM. * libinterp/corefcn/oct-tex-symbols.in: New file with supported TeX symbols and corresponding codes (unicode and MS symbols). * libinterp/corefcn/txt-eng.h (class text_element_symbol): Make it inherit from text_element. (text_element_symbol::code): Removed member. (text_element_symbol::symbol): New member. (text_element_symbol::text_element_symbol): Adapt constructor. (text_element_symbol::get_symbol): New method. (text_element_symbol::get_symbol_code): Make const. * libinterp/corefcn/txt-eng.cc (symbol_names, symbol_codes): Remove static variables, now auto-generated from oct-tex-symbols.in. (oct-tex-symbols.cc): New include. (text_element_symbol::get_symbol_code): Change implementation to simply index into auto-generated symbol_codes array. * libinterp/corefcn/txt-eng-ft.cc (ft_render::visit(text_element_symbol)): Don't use text_element_symbol::string_value(), use text_element_symbol::get_symbol() instead.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sat, 24 Aug 2013 14:27:09 -0400
parents 68fc671a9339
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13294
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 /*
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 13294
diff changeset
3 Copyright (C) 2012 John W. Eaton
13294
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 This file is part of Octave.
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 Octave is free software; you can redistribute it and/or modify it
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 option) any later version.
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 Octave is distributed in the hope that it will be useful, but WITHOUT
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 for more details.
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 along with Octave; see the file COPYING. If not, see
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 <http://www.gnu.org/licenses/>.
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 */
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 #if !defined (octave_data_h)
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 #define octave_data_h 1
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 #include <string>
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 class octave_value;
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 class octave_value_list;
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 extern OCTINTERP_API octave_value
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 do_class_concat (const octave_value_list& ovl, std::string cattype, int dim);
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33
7dce7e110511 make concatenation of class objects work
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 #endif