Mercurial > octave-nkf
comparison libinterp/corefcn/txt-eng.h @ 17787:175b392e91fe
Use GNU style coding conventions for code in libinterp/
* libinterp/corefcn/Cell.h, libinterp/corefcn/__contourc__.cc,
libinterp/corefcn/__dispatch__.cc, libinterp/corefcn/__lin_interpn__.cc,
libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc,
libinterp/corefcn/balance.cc, libinterp/corefcn/besselj.cc,
libinterp/corefcn/betainc.cc, libinterp/corefcn/bitfcns.cc,
libinterp/corefcn/bsxfun.cc, libinterp/corefcn/c-file-ptr-stream.cc,
libinterp/corefcn/c-file-ptr-stream.h, libinterp/corefcn/cellfun.cc,
libinterp/corefcn/colloc.cc, libinterp/corefcn/comment-list.h,
libinterp/corefcn/conv2.cc, libinterp/corefcn/daspk.cc,
libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc,
libinterp/corefcn/data.cc, libinterp/corefcn/debug.cc,
libinterp/corefcn/defaults.cc, libinterp/corefcn/defaults.in.h,
libinterp/corefcn/defun-int.h, libinterp/corefcn/defun.cc,
libinterp/corefcn/det.cc, libinterp/corefcn/dirfns.cc,
libinterp/corefcn/display.cc, libinterp/corefcn/dlmread.cc,
libinterp/corefcn/dot.cc, libinterp/corefcn/dynamic-ld.cc,
libinterp/corefcn/dynamic-ld.h, libinterp/corefcn/eig.cc,
libinterp/corefcn/ellipj.cc, libinterp/corefcn/error.cc,
libinterp/corefcn/error.h, libinterp/corefcn/event-queue.h,
libinterp/corefcn/fft.cc, libinterp/corefcn/fft2.cc, libinterp/corefcn/fftn.cc,
libinterp/corefcn/file-io.cc, libinterp/corefcn/filter.cc,
libinterp/corefcn/find.cc, libinterp/corefcn/gammainc.cc,
libinterp/corefcn/gcd.cc, libinterp/corefcn/getgrent.cc,
libinterp/corefcn/getpwent.cc, libinterp/corefcn/getrusage.cc,
libinterp/corefcn/givens.cc, libinterp/corefcn/gl-render.cc,
libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/gl2ps-renderer.h,
libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h,
libinterp/corefcn/gripes.cc, libinterp/corefcn/gripes.h,
libinterp/corefcn/help.cc, libinterp/corefcn/hess.cc,
libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc,
libinterp/corefcn/input.h, libinterp/corefcn/inv.cc,
libinterp/corefcn/jit-ir.h, libinterp/corefcn/jit-typeinfo.cc,
libinterp/corefcn/jit-typeinfo.h, libinterp/corefcn/jit-util.h,
libinterp/corefcn/kron.cc, libinterp/corefcn/load-path.cc,
libinterp/corefcn/load-path.h, libinterp/corefcn/load-save.cc,
libinterp/corefcn/load-save.h, libinterp/corefcn/lookup.cc,
libinterp/corefcn/ls-ascii-helper.cc, libinterp/corefcn/ls-hdf5.cc,
libinterp/corefcn/ls-hdf5.h, libinterp/corefcn/ls-mat-ascii.cc,
libinterp/corefcn/ls-mat-ascii.h, libinterp/corefcn/ls-mat4.cc,
libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-mat5.h,
libinterp/corefcn/ls-oct-ascii.cc, libinterp/corefcn/lsode.cc,
libinterp/corefcn/lu.cc, libinterp/corefcn/luinc.cc,
libinterp/corefcn/mappers.cc, libinterp/corefcn/matrix_type.cc,
libinterp/corefcn/max.cc, libinterp/corefcn/md5sum.cc,
libinterp/corefcn/mex.cc, libinterp/corefcn/mexproto.h,
libinterp/corefcn/mgorth.cc, libinterp/corefcn/mxarray.in.h,
libinterp/corefcn/nproc.cc, libinterp/corefcn/oct-hist.cc,
libinterp/corefcn/oct-lvalue.h, libinterp/corefcn/oct-map.cc,
libinterp/corefcn/oct-map.h, libinterp/corefcn/oct-obj.h,
libinterp/corefcn/oct-prcstrm.h, libinterp/corefcn/oct-stdstrm.h,
libinterp/corefcn/oct-stream.cc, libinterp/corefcn/oct-stream.h,
libinterp/corefcn/octave-link.cc, libinterp/corefcn/octave-link.h,
libinterp/corefcn/pager.cc, libinterp/corefcn/pinv.cc,
libinterp/corefcn/pr-output.cc, libinterp/corefcn/procstream.h,
libinterp/corefcn/profiler.cc, libinterp/corefcn/pt-jit.cc,
libinterp/corefcn/pt-jit.h, libinterp/corefcn/quad.cc,
libinterp/corefcn/quadcc.cc, libinterp/corefcn/qz.cc,
libinterp/corefcn/rand.cc, libinterp/corefcn/rcond.cc,
libinterp/corefcn/regexp.cc, libinterp/corefcn/schur.cc,
libinterp/corefcn/sighandlers.cc, libinterp/corefcn/sighandlers.h,
libinterp/corefcn/sparse-xdiv.cc, libinterp/corefcn/sparse-xdiv.h,
libinterp/corefcn/sparse-xpow.cc, libinterp/corefcn/sparse.cc,
libinterp/corefcn/spparms.cc, libinterp/corefcn/sqrtm.cc,
libinterp/corefcn/str2double.cc, libinterp/corefcn/strfind.cc,
libinterp/corefcn/strfns.cc, libinterp/corefcn/sub2ind.cc,
libinterp/corefcn/svd.cc, libinterp/corefcn/syl.cc,
libinterp/corefcn/symtab.cc, libinterp/corefcn/symtab.h,
libinterp/corefcn/syscalls.cc, libinterp/corefcn/sysdep.cc,
libinterp/corefcn/sysdep.h, libinterp/corefcn/time.cc,
libinterp/corefcn/toplev.cc, libinterp/corefcn/toplev.h,
libinterp/corefcn/tril.cc, libinterp/corefcn/txt-eng-ft.cc,
libinterp/corefcn/txt-eng-ft.h, libinterp/corefcn/txt-eng.h,
libinterp/corefcn/typecast.cc, libinterp/corefcn/urlwrite.cc,
libinterp/corefcn/utils.cc, libinterp/corefcn/variables.cc,
libinterp/corefcn/variables.h, libinterp/corefcn/xdiv.cc,
libinterp/corefcn/xdiv.h, libinterp/corefcn/xnorm.h, libinterp/corefcn/xpow.cc,
libinterp/corefcn/xpow.h, libinterp/corefcn/zfstream.cc,
libinterp/corefcn/zfstream.h, libinterp/dldfcn/__delaunayn__.cc,
libinterp/dldfcn/__dsearchn__.cc, libinterp/dldfcn/__eigs__.cc,
libinterp/dldfcn/__fltk_uigetfile__.cc, libinterp/dldfcn/__glpk__.cc,
libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__init_gnuplot__.cc,
libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/__voronoi__.cc,
libinterp/dldfcn/amd.cc, libinterp/dldfcn/ccolamd.cc, libinterp/dldfcn/chol.cc,
libinterp/dldfcn/colamd.cc, libinterp/dldfcn/convhulln.cc,
libinterp/dldfcn/dmperm.cc, libinterp/dldfcn/fftw.cc, libinterp/dldfcn/qr.cc,
libinterp/dldfcn/symbfact.cc, libinterp/dldfcn/symrcm.cc,
libinterp/dldfcn/tsearch.cc, libinterp/octave-value/ov-base-diag.cc,
libinterp/octave-value/ov-base-diag.h, libinterp/octave-value/ov-base-int.cc,
libinterp/octave-value/ov-base-int.h, libinterp/octave-value/ov-base-mat.h,
libinterp/octave-value/ov-base-scalar.cc,
libinterp/octave-value/ov-base-scalar.h,
libinterp/octave-value/ov-base-sparse.cc,
libinterp/octave-value/ov-base-sparse.h, libinterp/octave-value/ov-base.cc,
libinterp/octave-value/ov-base.h, libinterp/octave-value/ov-bool-mat.cc,
libinterp/octave-value/ov-bool-mat.h, libinterp/octave-value/ov-bool-sparse.cc,
libinterp/octave-value/ov-bool-sparse.h, libinterp/octave-value/ov-bool.cc,
libinterp/octave-value/ov-bool.h, libinterp/octave-value/ov-builtin.cc,
libinterp/octave-value/ov-builtin.h, libinterp/octave-value/ov-cell.cc,
libinterp/octave-value/ov-cell.h, libinterp/octave-value/ov-ch-mat.cc,
libinterp/octave-value/ov-ch-mat.h, libinterp/octave-value/ov-class.cc,
libinterp/octave-value/ov-class.h, libinterp/octave-value/ov-colon.h,
libinterp/octave-value/ov-complex.cc, libinterp/octave-value/ov-complex.h,
libinterp/octave-value/ov-cx-diag.cc, libinterp/octave-value/ov-cx-diag.h,
libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-cx-mat.h,
libinterp/octave-value/ov-cx-sparse.cc, libinterp/octave-value/ov-cx-sparse.h,
libinterp/octave-value/ov-dld-fcn.h, libinterp/octave-value/ov-fcn-handle.cc,
libinterp/octave-value/ov-fcn-handle.h,
libinterp/octave-value/ov-fcn-inline.cc,
libinterp/octave-value/ov-fcn-inline.h, libinterp/octave-value/ov-fcn.h,
libinterp/octave-value/ov-float.cc, libinterp/octave-value/ov-float.h,
libinterp/octave-value/ov-flt-complex.cc,
libinterp/octave-value/ov-flt-complex.h,
libinterp/octave-value/ov-flt-cx-diag.cc,
libinterp/octave-value/ov-flt-cx-diag.h,
libinterp/octave-value/ov-flt-cx-mat.cc,
libinterp/octave-value/ov-flt-cx-mat.h,
libinterp/octave-value/ov-flt-re-diag.cc,
libinterp/octave-value/ov-flt-re-diag.h,
libinterp/octave-value/ov-flt-re-mat.cc,
libinterp/octave-value/ov-flt-re-mat.h, libinterp/octave-value/ov-int16.cc,
libinterp/octave-value/ov-int32.cc, libinterp/octave-value/ov-int64.cc,
libinterp/octave-value/ov-int8.cc, libinterp/octave-value/ov-intx.h,
libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov-lazy-idx.h,
libinterp/octave-value/ov-mex-fcn.cc, libinterp/octave-value/ov-mex-fcn.h,
libinterp/octave-value/ov-null-mat.cc, libinterp/octave-value/ov-null-mat.h,
libinterp/octave-value/ov-oncleanup.cc, libinterp/octave-value/ov-perm.cc,
libinterp/octave-value/ov-perm.h, libinterp/octave-value/ov-range.cc,
libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-diag.cc,
libinterp/octave-value/ov-re-diag.h, libinterp/octave-value/ov-re-mat.cc,
libinterp/octave-value/ov-re-mat.h, libinterp/octave-value/ov-re-sparse.cc,
libinterp/octave-value/ov-re-sparse.h, libinterp/octave-value/ov-scalar.cc,
libinterp/octave-value/ov-scalar.h, libinterp/octave-value/ov-str-mat.cc,
libinterp/octave-value/ov-str-mat.h, libinterp/octave-value/ov-struct.cc,
libinterp/octave-value/ov-struct.h, libinterp/octave-value/ov-type-conv.h,
libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov-typeinfo.h,
libinterp/octave-value/ov-uint16.cc, libinterp/octave-value/ov-uint32.cc,
libinterp/octave-value/ov-uint64.cc, libinterp/octave-value/ov-uint8.cc,
libinterp/octave-value/ov-usr-fcn.cc, libinterp/octave-value/ov-usr-fcn.h,
libinterp/octave-value/ov.cc, libinterp/octave-value/ov.h, libinterp/octave.cc,
libinterp/operators/op-b-bm.cc, libinterp/operators/op-b-sbm.cc,
libinterp/operators/op-bm-b.cc, libinterp/operators/op-bm-bm.cc,
libinterp/operators/op-cdm-cdm.cc, libinterp/operators/op-chm.cc,
libinterp/operators/op-class.cc, libinterp/operators/op-cm-cm.cc,
libinterp/operators/op-cm-cs.cc, libinterp/operators/op-cm-s.cc,
libinterp/operators/op-cm-scm.cc, libinterp/operators/op-cm-sm.cc,
libinterp/operators/op-cs-cm.cc, libinterp/operators/op-cs-cs.cc,
libinterp/operators/op-cs-scm.cc, libinterp/operators/op-cs-sm.cc,
libinterp/operators/op-dm-dm.cc, libinterp/operators/op-dm-scm.cc,
libinterp/operators/op-double-conv.cc, libinterp/operators/op-fcdm-fcdm.cc,
libinterp/operators/op-fcm-fcm.cc, libinterp/operators/op-fcm-fcs.cc,
libinterp/operators/op-fcm-fm.cc, libinterp/operators/op-fcm-fs.cc,
libinterp/operators/op-fcs-fcm.cc, libinterp/operators/op-fcs-fcs.cc,
libinterp/operators/op-fcs-fm.cc, libinterp/operators/op-fcs-fs.cc,
libinterp/operators/op-fdm-fdm.cc, libinterp/operators/op-float-conv.cc,
libinterp/operators/op-fm-fcm.cc, libinterp/operators/op-fm-fcs.cc,
libinterp/operators/op-fm-fm.cc, libinterp/operators/op-fm-fs.cc,
libinterp/operators/op-fs-fcm.cc, libinterp/operators/op-fs-fcs.cc,
libinterp/operators/op-fs-fm.cc, libinterp/operators/op-fs-fs.cc,
libinterp/operators/op-m-cm.cc, libinterp/operators/op-m-cs.cc,
libinterp/operators/op-m-m.cc, libinterp/operators/op-m-s.cc,
libinterp/operators/op-m-scm.cc, libinterp/operators/op-m-sm.cc,
libinterp/operators/op-pm-scm.cc, libinterp/operators/op-range.cc,
libinterp/operators/op-s-cm.cc, libinterp/operators/op-s-cs.cc,
libinterp/operators/op-s-scm.cc, libinterp/operators/op-sbm-b.cc,
libinterp/operators/op-sbm-bm.cc, libinterp/operators/op-sbm-sbm.cc,
libinterp/operators/op-scm-cm.cc, libinterp/operators/op-scm-cs.cc,
libinterp/operators/op-scm-m.cc, libinterp/operators/op-scm-s.cc,
libinterp/operators/op-scm-scm.cc, libinterp/operators/op-scm-sm.cc,
libinterp/operators/op-sm-cm.cc, libinterp/operators/op-sm-m.cc,
libinterp/operators/op-sm-s.cc, libinterp/operators/op-sm-scm.cc,
libinterp/operators/op-sm-sm.cc, libinterp/operators/op-str-m.cc,
libinterp/operators/op-str-s.cc, libinterp/operators/op-str-str.cc,
libinterp/operators/ops.h, libinterp/parse-tree/lex.h,
libinterp/parse-tree/parse.h, libinterp/parse-tree/pt-arg-list.cc,
libinterp/parse-tree/pt-arg-list.h, libinterp/parse-tree/pt-assign.cc,
libinterp/parse-tree/pt-assign.h, libinterp/parse-tree/pt-binop.cc,
libinterp/parse-tree/pt-binop.h, libinterp/parse-tree/pt-bp.h,
libinterp/parse-tree/pt-cbinop.cc, libinterp/parse-tree/pt-check.cc,
libinterp/parse-tree/pt-colon.cc, libinterp/parse-tree/pt-colon.h,
libinterp/parse-tree/pt-const.cc, libinterp/parse-tree/pt-decl.cc,
libinterp/parse-tree/pt-decl.h, libinterp/parse-tree/pt-eval.cc,
libinterp/parse-tree/pt-except.h, libinterp/parse-tree/pt-exp.h,
libinterp/parse-tree/pt-fcn-handle.cc, libinterp/parse-tree/pt-id.cc,
libinterp/parse-tree/pt-id.h, libinterp/parse-tree/pt-idx.cc,
libinterp/parse-tree/pt-idx.h, libinterp/parse-tree/pt-loop.h,
libinterp/parse-tree/pt-mat.cc, libinterp/parse-tree/pt-misc.cc,
libinterp/parse-tree/pt-misc.h, libinterp/parse-tree/pt-pr-code.cc,
libinterp/parse-tree/pt-select.h, libinterp/parse-tree/pt-stmt.h,
libinterp/parse-tree/token.h, libinterp/version.cc:
Use GNU style coding conventions for code in libinterp/
author | Rik <rik@octave.org> |
---|---|
date | Mon, 28 Oct 2013 19:51:46 -0700 |
parents | d63878346099 |
children | 4197fc428c7d |
comparison
equal
deleted
inserted
replaced
17786:34d9812a943b | 17787:175b392e91fe |
---|---|
103 int symbol; | 103 int symbol; |
104 }; | 104 }; |
105 | 105 |
106 class | 106 class |
107 OCTINTERP_API | 107 OCTINTERP_API |
108 text_element_list : | 108 text_element_list |
109 public text_element, | 109 : public text_element, public octave_base_list<text_element *> |
110 public octave_base_list<text_element *> | |
111 { | 110 { |
112 public: | 111 public: |
113 text_element_list (void) | 112 text_element_list (void) |
114 : text_element (), octave_base_list<text_element*> () { } | 113 : text_element (), octave_base_list<text_element*> () { } |
115 | 114 |
116 text_element_list (text_element* e) | 115 text_element_list (text_element* e) |
117 : text_element (), octave_base_list<text_element*> () | 116 : text_element (), octave_base_list<text_element*> () |
118 { push_back (e); } | 117 { push_back (e); } |
119 | 118 |
120 ~text_element_list (void) | 119 ~text_element_list (void) |
121 { | 120 { |
122 while (! empty ()) | 121 while (! empty ()) |
123 { | 122 { |
124 iterator it = begin (); | 123 iterator it = begin (); |
125 delete (*it); | 124 delete (*it); |
126 erase (it); | 125 erase (it); |
127 } | 126 } |
128 } | 127 } |
129 | 128 |
130 void accept (text_processor& p); | 129 void accept (text_processor& p); |
131 }; | 130 }; |
132 | 131 |
133 class | 132 class |
138 text_element_subscript (text_element* e) | 137 text_element_subscript (text_element* e) |
139 : text_element (), elem (e) { } | 138 : text_element (), elem (e) { } |
140 | 139 |
141 text_element_subscript (char c) | 140 text_element_subscript (char c) |
142 : text_element () | 141 : text_element () |
143 { elem = new text_element_string (std::string (1, c)); } | 142 { elem = new text_element_string (std::string (1, c)); } |
144 | 143 |
145 ~text_element_subscript (void) | 144 ~text_element_subscript (void) |
146 { delete elem; } | 145 { delete elem; } |
147 | 146 |
148 void accept (text_processor& p); | 147 void accept (text_processor& p); |
149 | 148 |
150 text_element* get_element (void) { return elem; } | 149 text_element* get_element (void) { return elem; } |
151 | 150 |
164 text_element_superscript (text_element* e) | 163 text_element_superscript (text_element* e) |
165 : text_element (), elem (e) { } | 164 : text_element (), elem (e) { } |
166 | 165 |
167 text_element_superscript (char c) | 166 text_element_superscript (char c) |
168 : text_element () | 167 : text_element () |
169 { elem = new text_element_string (std::string (1, c)); } | 168 { elem = new text_element_string (std::string (1, c)); } |
170 | 169 |
171 ~text_element_superscript (void) | 170 ~text_element_superscript (void) |
172 { delete elem; } | 171 { delete elem; } |
173 | 172 |
174 void accept (text_processor& p); | 173 void accept (text_processor& p); |
175 | 174 |
176 text_element* get_element (void) { return elem; } | 175 text_element* get_element (void) { return elem; } |
177 | 176 |
190 text_element_combined (text_element* e) | 189 text_element_combined (text_element* e) |
191 : text_element_list (e) { } | 190 : text_element_list (e) { } |
192 | 191 |
193 text_element_combined (text_element* e1, text_element* e2) | 192 text_element_combined (text_element* e1, text_element* e2) |
194 : text_element_list(e1) | 193 : text_element_list(e1) |
195 { push_back (e2); } | 194 { push_back (e2); } |
196 | 195 |
197 void accept (text_processor& p); | 196 void accept (text_processor& p); |
198 }; | 197 }; |
199 | 198 |
200 class | 199 class |
201 OCTINTERP_API | 200 OCTINTERP_API |
202 text_element_fontstyle : public text_element | 201 text_element_fontstyle : public text_element |
203 { | 202 { |
204 public: | 203 public: |
205 enum fontstyle | 204 enum fontstyle |
206 { | 205 { |
207 normal, | 206 normal, |
208 bold, | 207 bold, |
209 italic, | 208 italic, |
210 oblique | 209 oblique |
211 }; | 210 }; |
212 | 211 |
213 text_element_fontstyle (fontstyle st) | 212 text_element_fontstyle (fontstyle st) |
214 : text_element (), style (st) { } | 213 : text_element (), style (st) { } |
215 | 214 |
216 ~text_element_fontstyle (void) { } | 215 ~text_element_fontstyle (void) { } |
273 text_element_color : public text_element | 272 text_element_color : public text_element |
274 { | 273 { |
275 public: | 274 public: |
276 text_element_color (double r, double g, double b) | 275 text_element_color (double r, double g, double b) |
277 : text_element (), rgb (1, 3, 0.0) | 276 : text_element (), rgb (1, 3, 0.0) |
278 { | 277 { |
279 rgb(0) = r; | 278 rgb(0) = r; |
280 rgb(1) = g; | 279 rgb(1) = g; |
281 rgb(2) = b; | 280 rgb(2) = b; |
282 } | 281 } |
283 | 282 |
284 text_element_color (const std::string& cname) | 283 text_element_color (const std::string& cname) |
285 : text_element (), rgb (1, 3, 0.0) | 284 : text_element (), rgb (1, 3, 0.0) |
286 { | 285 { |
287 #define ASSIGN_COLOR(r,g,b) { rgb(0) = r; rgb(1) = g; rgb(2) = b; } | 286 #define ASSIGN_COLOR(r,g,b) { rgb(0) = r; rgb(1) = g; rgb(2) = b; } |
288 if (cname == "red") ASSIGN_COLOR(1, 0, 0) | 287 if (cname == "red") ASSIGN_COLOR(1, 0, 0) |
289 else if (cname == "green") ASSIGN_COLOR(0, 1, 0) | 288 else if (cname == "green") ASSIGN_COLOR(0, 1, 0) |
290 else if (cname == "yellow") ASSIGN_COLOR(1, 1, 0) | 289 else if (cname == "yellow") ASSIGN_COLOR(1, 1, 0) |
291 else if (cname == "magenta") ASSIGN_COLOR(1, 0, 1) | 290 else if (cname == "magenta") ASSIGN_COLOR(1, 0, 1) |
292 else if (cname == "blue") ASSIGN_COLOR(0, 0, 1) | 291 else if (cname == "blue") ASSIGN_COLOR(0, 0, 1) |
293 else if (cname == "black") ASSIGN_COLOR(0, 0, 0) | 292 else if (cname == "black") ASSIGN_COLOR(0, 0, 0) |
294 else if (cname == "white") ASSIGN_COLOR(1, 1, 1) | 293 else if (cname == "white") ASSIGN_COLOR(1, 1, 1) |
295 else if (cname == "gray") ASSIGN_COLOR(.5, .5, .5) | 294 else if (cname == "gray") ASSIGN_COLOR(.5, .5, .5) |
296 else if (cname == "darkGreen") ASSIGN_COLOR(0, .5, 0) | 295 else if (cname == "darkGreen") ASSIGN_COLOR(0, .5, 0) |
297 else if (cname == "orange") ASSIGN_COLOR(1, .65, 0) | 296 else if (cname == "orange") ASSIGN_COLOR(1, .65, 0) |
298 else if (cname == "lightBlue") ASSIGN_COLOR(0.68, .85, .9) | 297 else if (cname == "lightBlue") ASSIGN_COLOR(0.68, .85, .9) |
299 #undef ASSIGN_COLOR | 298 #undef ASSIGN_COLOR |
300 } | 299 } |
301 | 300 |
302 ~text_element_color (void) { } | 301 ~text_element_color (void) { } |
303 | 302 |
304 Matrix get_color (void) { return rgb; } | 303 Matrix get_color (void) { return rgb; } |
305 | 304 |
317 virtual void visit (text_element_string& e) = 0; | 316 virtual void visit (text_element_string& e) = 0; |
318 | 317 |
319 virtual void visit (text_element_symbol&) { } | 318 virtual void visit (text_element_symbol&) { } |
320 | 319 |
321 virtual void visit (text_element_list& e) | 320 virtual void visit (text_element_list& e) |
322 { | 321 { |
323 for (text_element_list::iterator it = e.begin (); | 322 for (text_element_list::iterator it = e.begin (); |
324 it != e.end (); ++it) | 323 it != e.end (); ++it) |
325 { | 324 { |
326 (*it)->accept (*this); | 325 (*it)->accept (*this); |
327 } | 326 } |
328 } | 327 } |
329 | 328 |
330 virtual void visit (text_element_subscript& e) | 329 virtual void visit (text_element_subscript& e) |
331 { e.get_element ()->accept (*this); } | 330 { e.get_element ()->accept (*this); } |
332 | 331 |
333 virtual void visit (text_element_superscript& e) | 332 virtual void visit (text_element_superscript& e) |
334 { e.get_element ()->accept (*this); } | 333 { e.get_element ()->accept (*this); } |
335 | 334 |
336 virtual void visit (text_element_combined&) { } | 335 virtual void visit (text_element_combined&) { } |
337 | 336 |
338 virtual void visit (text_element_fontstyle&) { } | 337 virtual void visit (text_element_fontstyle&) { } |
339 | 338 |
396 // memory for the object returned by the text parser? That would be | 395 // memory for the object returned by the text parser? That would be |
397 // preferable to having to know when and where to delete the object it | 396 // preferable to having to know when and where to delete the object it |
398 // creates... | 397 // creates... |
399 | 398 |
400 text_element* parse (const std::string& s) | 399 text_element* parse (const std::string& s) |
401 { | 400 { |
402 return new text_element_string (s); | 401 return new text_element_string (s); |
403 } | 402 } |
404 }; | 403 }; |
405 | 404 |
406 class | 405 class |
407 OCTINTERP_API | 406 OCTINTERP_API |
408 text_parser_tex : public text_parser | 407 text_parser_tex : public text_parser |
409 { | 408 { |
410 public: | 409 public: |
411 text_parser_tex (void) | 410 text_parser_tex (void) |
412 : text_parser (), scanner (0), buffer_state (0), result (0) | 411 : text_parser (), scanner (0), buffer_state (0), result (0) |
413 { } | 412 { } |
414 | 413 |
415 ~text_parser_tex (void) | 414 ~text_parser_tex (void) |
416 { destroy_lexer (); } | 415 { destroy_lexer (); } |
417 | 416 |
418 text_element* parse (const std::string& s); | 417 text_element* parse (const std::string& s); |
419 | 418 |
420 void* get_scanner (void) { return scanner; } | 419 void* get_scanner (void) { return scanner; } |
421 | 420 |