WebSVN – wimsdev – Diff – /trunk/wims/src/rawmath.c

       string_modify(p,pp,pp+1,"&gt;");
+   }
+}
 /* exponents or indices :
-    all digits or + or - following a ^ or _ are considered as in exponent/subscript
+ *  all digits or + or - following a ^ or _ are considered as in exponent/subscript
-    expression with ( ) following a ^ or _ are  considered as in exponent/subscript
+ *  expression with ( ) following a ^ or _ are  considered as in exponent/subscript
-    the parenthesis are suppressed except in case of exponent and only digits.
+ *  the parenthesis are suppressed except in case of exponent and only digits.
-*/
+ *  if int n != 0, use html code, else use tex code */
-void __replace_exponent(char *p)
+void __replace_exponent(char *p, int n)
+{
    char *p1;
    char *SUPBEG, *SUPEND;
-   if (mathalign_base < 2) { SUPBEG = "<sup>"; SUPEND = "</sup>";}
+   if (n) { SUPBEG = "<sup>"; SUPEND = "</sup>";}
    else { SUPBEG = "^{"; SUPEND = "}";}
     for(p1=strchr(p,'^');p1!=NULL;p1=strchr(p1+1,'^')) {
         char *p2, *p3, *pp;
         char c;
         /* replace ^<exponent group>. Add back missing character 'c' */
         string_modify(p,p1,p2, "%s%s%s%c",SUPBEG,p3,SUPEND,c);
+    }
+}
+/* if int n != 0, use html code, else use tex code */
-void __replace_subscript(char *p)
+void __replace_subscript(char *p, int n)
+{
    char *p1, *p2;
    char *SUBBEG, *SUBEND;
-   if (mathalign_base < 2) {SUBBEG = "<sub>"; SUBEND = "</sub>";}
+   if (n) {SUBBEG = "<sub>"; SUBEND = "</sub>";}
    else {SUBBEG = "_{"; SUBEND = "}";}
    for(p1=strchr(p,'_');p1!=NULL;p1=strchr(p1+1,'_')) {
      char buff[256];
      p2=p1+1;
      if(*p2=='(') p2=find_matching(p2+1,')');
         ovlstrcpy(p1,p1+1);p1--;
+    }
+  }
+}
-    /* <=, >=, ->, =>, <=> */
+/* <=, >=, ->, =>, <=>
+ * if int n != 0, use html code, else use tex code */
-void __replace_arrow ( char *p)
+void __replace_arrow ( char *p, int n)
 {   char *p1, *p2, *m_prefix;
-    if (mathalign_base < 2) m_prefix="$m_"; else m_prefix="\\";
+    if (n) m_prefix="$m_"; else m_prefix="\\";
     for(p1=strstr(p,"&lt;="); p1!=NULL; p1=strstr(p1+1,"&lt;=")) {
       if(*(p1+5)!='&' && *(p1+5)!='=')
         string_modify(p,p1,p1+5, "%sle",m_prefix);
       else {
+}
 /* why <tt> is used sometimes ? replace single characters by italics one
  * is it useful in mathml ?
 */
-void __replace_italics (char *p)
+void __replace_italics (char *p, int n)
 { char *p1, *p2, *p3, pbuf[16];
   char *ITBEG, *ITEND, *ITtBEG, *ITtEND;
-   if (mathalign_base < 2) {
+   if (n) {
      ITBEG = "<i>";ITtBEG = "<i><tt>";
      ITEND = "</i>";ITtEND = "</tt></i>";
   } else {;
      ITBEG = "" ; ITtBEG = "";
      ITEND = ""; ITtEND = "";
     string_modify(p,p1,p2,"%s%s%s",ITBEG,pbuf,ITEND);
     p1=p2+strlen(ITBEG)+strlen(ITEND)-1;
+    }
+}
 /* float (1.2 E-03) : 3E+021 -> 3 × 10^{21} - 3E-21 -> 3 × 10^{-21}
- * or replace variable name (alpha) */
+ * or replace variable name (alpha)
+ * if int n != 0, use html code, else use tex code */
-void __replace_mathvar(char *p)
+void __replace_mathvar(char *p,int n)
 { char *p1, *p2, *p3;
   char *EXPBEG, *EXPEND, *EXPBEGMINUS, *SUBBEG, *SUBEND, *m_prefix;
-  if (mathalign_base < 2) {
+  if ( n ) {
      EXPBEG = " &times; 10<sup>";
      EXPBEGMINUS = " &times; 10<sup>-";
      EXPEND = "</sup>";
      SUBBEG = "<sub>";
      SUBEND = "</sub>";
      EXPBEGMINUS = " \\times 10^{-" ;
      EXPEND = "}";
      SUBBEG = "_{";
      SUBEND = "}";
      m_prefix="\\";
   }
   for (p1=find_mathvar_start(p);*p1!=0;p1=find_mathvar_start(p2)) {
     char buf[MAX_LINELEN+1];
     /* if the variable is preceded by \ do nothing - in fact this should not arrive
     */
     if (p1>p && *(p1-1) == '\\' ) break ;
+            }
+        }
+  }
+}
-/* translate raw math expression coming from calculators into best html way */
+/* translate raw math expression coming from calculators into best html way
+ * if int n != 0, use html code, else use tex code */
-void __htmlmath(char *p)
+void __htmlmath(char *p,int n)
+{
     if(!rawmath_easy) { rawmath_easy=1; rawmath(p); rawmath_easy=0;}
     __replace_htmlmath_gtlt(p); //only used in deductio
-    __replace_exponent(p);
+    __replace_exponent(p,n);
-    __replace_subscript(p);
+    __replace_subscript(p,n);
     __replace_getrid1(p);
-    __replace_mathvar(p);
+    __replace_mathvar(p,n);
     __replace_getridstar(p);
-    __replace_arrow(p);
+    __replace_arrow(p,n);
 /* Now make substitutions */
     substit(p);
 /* Make single names italic - done automatically by mathml */
-   __replace_italics(p);
+   __replace_italics(p,n);
    strip_trailing_spaces(p);
+}
 void htmlmath(char *p)
+{
-__htmlmath(p) ;
+ __htmlmath(p,1) ;
+}
 /* if mathml is closed, it will be just htmlmath*/
 void mathmlmath(char *p)
 {
-  __htmlmath(p) ;  if (mathalign_base == 2) { mathml(p,1);}
+    if (mathalign_base == 2) { __htmlmath(p,0) ; mathml(p,1);} else { __htmlmath(p,1) ;}
+}

Subversion Repositories wimsdev

(root)/trunk/wims/src/rawmath.c – Rev 5544 → 5551