=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox_toolkit.h,v retrieving revision 1.42 retrieving revision 1.44 diff -u -p -r1.42 -r1.44 --- OpenXM/src/ox_toolkit/ox_toolkit.h 2016/07/14 08:16:19 1.42 +++ OpenXM/src/ox_toolkit/ox_toolkit.h 2018/04/03 09:58:30 1.44 @@ -1,5 +1,5 @@ /* -*- mode: C -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.41 2016/04/01 18:12:39 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/ox_toolkit.h,v 1.43 2016/08/23 02:24:19 ohara Exp $ */ #ifndef _OX_TOOLKIT_H_ #define _OX_TOOLKIT_H_ @@ -42,6 +42,7 @@ typedef struct { typedef struct mathcap { table *cmotbl; table *smtbl; + char **opts; } mathcap; /* OpenXM File Descripter */ @@ -231,6 +232,7 @@ cmo_distributed_polynomial* new_cmo_distributed_polyno cmo_dms_generic* new_cmo_dms_generic(); cmo_ring_by_name* new_cmo_ring_by_name(cmo* ob); cmo_indeterminate* new_cmo_indeterminate(cmo* ob); +cmo_indeterminate* new_cmo_indeterminate_set_name(char *s); cmo_polynomial_in_one_variable* new_cmo_polynomial_in_one_variable(int var); cmo_recursive_polynomial* new_cmo_recursive_polynomial(cmo_list* ringdef, cmo* coef); cmo_tree* new_cmo_tree(cmo_string* name, cmo_list *attributes, cmo_list *leaves); @@ -286,6 +288,7 @@ cmo_list* list_appendl(cmo_list*, ...); int list_length(cmo_list* ); cmo* list_nth(cmo_list* , int n); cmo* list_first_cmo(cmo_list *); +char* cmo_indeterminate_get_name(cmo_indeterminate *); int cmolen_cmo(cmo* m); void dump_buffer_init(char *s); @@ -318,6 +321,7 @@ char* get_symbol_by_tag(int tag); /* for mathcap database */ mathcap *new_mathcap(); void mathcap_init(int ver, char *vstr, char *sysname, int cmos[], int sms[]); +void mathcap_init2(int ver, char *vstr, char *sysname, int cmos[], int sms[], char *options[]); cmo_mathcap* mathcap_get(mathcap *); mathcap *mathcap_update(mathcap *, cmo_mathcap *mc); int mathcap_allowQ_cmo(mathcap *, cmo *ob);