Stylesheets for (cic|content|presentation) theory now fully working

[helm.git] / helm / on-line / javascript / control.js

diff --git a/helm/on-line/javascript/control.js b/helm/on-line/javascript/control.js
index 4389be7d884b3180e418e3ab9cbceddb534df931..76dc7b768f450a43511e024b0147f32aab4c6d68 100644 (file)
--- a/helm/on-line/javascript/control.js
+++ b/helm/on-line/javascript/control.js
@@ -148,21 +148,39 @@ function makeURL(type,uri,cicflags,typesflags)
        "&param.keys=" + escape("C1,HC2,L") +
        "&param.interfaceURL=" + escape(interfaceURL);
     } else if (format == "html" && type == "theory") {
-      keys = escape("T1,T2,L,E")+"&param.processorURL=" + escape(processorURL) +
+      keys = escape("T1,T2,L,E")+
+       "&param.processorURL=" + escape(processorURL) +
        "&param.getterURL=" + escape(getterURL) +
-       "&param.thkeys=" + escape("TC1,HC2,L") +
+       "&param.keys=" + escape("C1,HC2,L") +
+       "&param.thkeys=" + escape("T1,T2,L,E") +
+       "&param.embedkeys=" + escape("TC1,HC2,L") +
        "&param.doctype-public="+escape("-//W3C//DTD XHTML 1.0 Transitional//EN")+
        "&param.encoding=iso-8859-1" +
+       "&param.thencoding=iso-8859-1" +
        "&param.media-type=text/html" +
-       "&param.keys=" + escape("C1,HC2,L") +
+       "&param.thmedia-type=text/html" +
        "&param.interfaceURL=" + escape(interfaceURL) +
        "&param.thinterfaceURL=" + escape(thinterfaceURL);
     } else if (format == "mml_cont" && type == "cic") {
       keys = "C1";
     } else if (format == "mml_cont" && type == "theory") {
-      keys = escape("T1,E")+"&param.keys=C1&param.thkeys=TC1";
+      keys = escape("T1,L,E")+
+       "&param.keys=C1" +
+       "&param.thkeys=T1,L,E" +
+       "&param.embedkeys=TC1" +
+
+       "&param.processorURL=" + escape(processorURL) +
+       "&param.getterURL=" + escape(getterURL) +
+       "&param.doctype-public=" +
+       "&param.encoding=" +
+       "&param.thencoding=iso-8859-1" +
+       "&param.media-type=text/xml" +
+       "&param.thmedia-type=text/html" +
+       "&param.interfaceURL=" + escape(interfaceURL) +
+       "&param.thinterfaceURL=" + escape(thinterfaceURL);
     } else if (format == "mml_pres" && type == "cic") {
-      keys = escape("C1,C2,L")+"&param.processorURL=" + escape(processorURL) +
+      keys = escape("C1,C2,L")+
+       "&param.processorURL=" + escape(processorURL) +
        "&param.getterURL=" + escape(getterURL) +
        "&prop.doctype-public="+
        "&prop.encoding=" +
@@ -173,12 +191,17 @@ function makeURL(type,uri,cicflags,typesflags)
        "&param.keys=" + escape("C1,C2,L") +
        "&param.interfaceURL=" + escape(interfaceURL);
     } else if (format == "mml_pres" && type == "theory") {
-      keys = escape("T1,T2,L,E")+"&param.keys=C1,C2,L&param.thkeys=TC1,C2,L" +
+      keys = escape("T1,T2,L,E")+
+       "&param.keys=C1,C2,L" +
+       "&param.thkeys=T1,T2,L,E" +
+       "&param.embedkeys=TC1,C2,L" +
        "&param.processorURL=" + escape(processorURL) +
        "&param.getterURL=" + escape(getterURL) +
        "&param.doctype-public=" +
        "&param.encoding=" +
+       "&param.thencoding=iso-8859-1" +
        "&param.media-type=text/xml" +
+       "&param.thmedia-type=text/html" +
        "&param.interfaceURL=" + escape(interfaceURL) +
        "&param.thinterfaceURL=" + escape(thinterfaceURL);
     }