[53_13] Fix for the tmfs_url removal from url_system

XmacsLabs · Oct 7, 2023 · 34c20ce · 34c20ce
1 parent d8465d2
commit 34c20ce
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/TeXmacs/progs/doc/tmdoc.scm b/TeXmacs/progs/doc/tmdoc.scm
@@ -284,7 +284,7 @@
     (when (string-starts? name "tmfs/help/")
       (set! name (string-drop name 10))
       (set! name (tmfs-cdr name)))
-    (load-document (string-append "tmfs://help/" type "/" name))))
+    (load-document (string->url (string-append "tmfs://help/" type "/" name)))))
 
 (tm-define (delayed-update nr cont)
   (system-wait "Generating automatic content" nr)

diff --git a/src/Scheme/L3/glue_lolly.lua b/src/Scheme/L3/glue_lolly.lua
@@ -492,7 +492,7 @@ function main()
             },
             {
                 scm_name = "string->url",
-                cpp_name = "url",
+                cpp_name = "tm_url",
                 ret_type = "url",
                 arg_list = {
                     "string"

diff --git a/src/Scheme/L3/init_glue_l3.cpp b/src/Scheme/L3/init_glue_l3.cpp
@@ -23,6 +23,7 @@
 #include "patch.hpp"
 #include "path.hpp"
 #include "sys_utils.hpp"
+#include "tm_url.hpp"
 #include "tmfs_url.hpp"
 #include "tree.hpp"
 #include "tree_cursor.hpp"

diff --git a/src/System/Classes/tm_url.cpp b/src/System/Classes/tm_url.cpp
@@ -70,6 +70,10 @@
 #include "analyze.hpp"
 #include "scheme.hpp"
 
+url tm_url (string name) {
+  if (starts (name, "tmfs://")) return tmfs_url (name (7, N (name)));
+  else return url_general (name, URL_UNIX);
+}
 
 bool url_test (url name, string filter) {
     if (filter == "") return true;

diff --git a/src/System/Classes/tm_url.hpp b/src/System/Classes/tm_url.hpp
@@ -15,6 +15,7 @@
 #include "tree.hpp"
 #include "tm_debug.hpp"
 
+url    tm_url (string name);
 bool   is_secure (url u);            // is u secure?
 
 /******************************************************************************

diff --git a/src/Texmacs/Data/new_view.cpp b/src/Texmacs/Data/new_view.cpp
@@ -18,7 +18,7 @@
 #include "dictionary.hpp"
 #include "new_document.hpp"
 #include "drd_std.hpp"
-#include "tmfs_url.hpp"
+#include "tm_url.hpp"
 
 #if defined(OS_MINGW) || defined(OS_WIN)
 #define WINPATHS
@@ -72,7 +72,7 @@ abstract_view (tm_view vw) {
   string name= encode_url (vw->buf->buf->name);
   //cout << vw->buf->buf->name << " -> " << name << "\n";
   string nr  = as_string (vw->nr);
-  return tmfs_url ("/view/" * nr * "/" * name);
+  return tm_url ("tmfs://view/" * nr * "/" * name);
 }
 
 tm_view

diff --git a/src/Texmacs/Window/tm_window.cpp b/src/Texmacs/Window/tm_window.cpp
@@ -17,7 +17,7 @@
 #include "iterator.hpp"
 #include "preferences.hpp"
 #include "drd_std.hpp"
-#include "tmfs_url.hpp"
+#include "tm_url.hpp"
 
 
 int geometry_w= 800, geometry_h= 600;
@@ -268,7 +268,7 @@ embedded_name (url name) {
   static int nr= 0;
   if (!is_none (name)) return name;
   nr++;
-  return tmfs_url (string ("tmfs://aux/TeXmacs-input-" * as_string (nr)));
+  return tm_url (string ("tmfs://aux/TeXmacs-input-" * as_string (nr)));
 }
 
 tree