Scipad 6.153

 * Avoid Tcl error due to bug 3015 in Scilab5 environment. Compile as help
   page cannot work in Scilab 5 because no incremental mode is available
   so far (only the entire help system can be rebuilt, and not a single file)

diff --git a/scilab/modules/scipad/BUGS b/scilab/modules/scipad/BUGS
index 43c16c9..7aa11ec 100644 (file)
--- a/scilab/modules/scipad/BUGS
+++ b/scilab/modules/scipad/BUGS
@@ -9,6 +9,9 @@ Bugs:
  http://wiki.scilab.org/Tcl_Thread
  http://wiki.scilab.org/Scipad_debugger_inner_beauties
 
+-other open Scipad bugs reported in the Siclab bugzilla:
+http://bugzilla.scilab.org/buglist.cgi?&component=Scipad+Editor&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED
+
 -issues related with non colorizing single quoted text:
   . code lines such as mprintf("%s",'this is a function') break the line
     number counting in functions if not properly colorized as textquoted.
@@ -478,3 +481,4 @@ https://sourceforge.net/tracker/?func=detail&atid=312997&aid=1477426&group_id=12
 This is patch 1477426, with already a number of implementation proposals.
 Might be far better to make use of the Tcl-designed selection font, keeping mine
 as a default fallback whenever the user has an old Tk version.
+See also TIP #213 and TIP #324, and discussions on them on [TCLCORE].

diff --git a/scilab/modules/scipad/changelog.txt b/scilab/modules/scipad/changelog.txt
index 011e2bd..eb5d6fd 100644 (file)
--- a/scilab/modules/scipad/changelog.txt
+++ b/scilab/modules/scipad/changelog.txt
@@ -1,3 +1,9 @@
+Francois VOGEL, 18/08/08
+ * Avoid Tcl error due to bug 3015 in Scilab5 environment. Compile as help
+   page cannot work in Scilab 5 because no incremental mode is available
+   so far (only the entire help system can be rebuilt, and not a single file)
+ * version --> 6.153
+
 Francois VOGEL, 26/07/08
  * All language names (and therefore message file names) are in lowercase
    because this is needed on Linux since ::msgcat::mclocale stores the locale

diff --git a/scilab/modules/scipad/tcl/msg_files/fr_fr.msg b/scilab/modules/scipad/tcl/msg_files/fr_fr.msg
index 0ba5541..8c07c37 100644 (file)
--- a/scilab/modules/scipad/tcl/msg_files/fr_fr.msg
+++ b/scilab/modules/scipad/tcl/msg_files/fr_fr.msg
@@ -25,7 +25,7 @@
 #
 
 # Scipad texts in French by Francois Vogel
-# in sync at least with v6.151
+# in sync at least with v6.153
 
 
 # commons
@@ -696,6 +696,11 @@
     ::msgcat::mcset fr_fr "already exists: open the old file instead?" "existe déjà : Ouvrir le fichier existant ?"
 ::msgcat::mcset fr_fr "Existing file" "Fichier existant"
 ::msgcat::mcset fr_fr "New skeleton" "Nouveau squelette d'aide"
+::msgcat::mcset fr_fr "This feature is no longer available in Scilab 5 due to bug 3015." "Cette fonction n'est plus disponible dans Scilab 5 à cause du bug 3015."
+::msgcat::mcset fr_fr "See details at " "Plus d'infos: "
+::msgcat::mcset fr_fr "Note: Scilab 4.x and Scilab-gtk are offering this feature." "Nota: Scilab 4.x et Scilab-gtk proposent cette fonctionnalité."
+::msgcat::mcset fr_fr "A solution is to use a backported version of Scipad inside one of these environments, for instance:" "Une solution est d'utiliser une version dite \"backport\" de Scipad à l'intérieur d'un de ces environnements, par exemple:"
+::msgcat::mcset fr_fr "Feature missing from Scilab 5" "Fonctionnalité manquante dans Scilab 5"
 ::msgcat::mcset fr_fr "ScilabEval command cannot be passed to Scilab!" "Une commande ScilabEval ne peut pas être passée à Scilab!"
 ::msgcat::mcset fr_fr impossibleScilabEval_message \
                    "ATTENTION : Une commande n'a pas pu être passée à Scilab et a été ignorée.\n\n \

diff --git a/scilab/modules/scipad/tcl/scilabexec.tcl b/scilab/modules/scipad/tcl/scilabexec.tcl
index 6059c14..4ca47e4 100644 (file)
--- a/scilab/modules/scipad/tcl/scilabexec.tcl
+++ b/scilab/modules/scipad/tcl/scilabexec.tcl
@@ -23,6 +23,7 @@
 #
 # See the file scipad/license.txt
 #
+
 proc execfile {{buf "current"}} {
 # return argument: 0=success, 1=scilab busy, 2=cancel overwrite, -1=fail
     global listoffile pad
@@ -255,19 +256,37 @@ proc helpskeleton {} {
 }
 
 proc xmlhelpfile {} {
-# save the file and call xmlfiletohtml. Catch and popup the error messages.
+# save the file and call xmlfiletohtml (in Scilab 4), or do nothing
+# (in Scilab 5) because of bug 3015
+
     global listoffile
+    global Scilab5 ScilabBugzillaURL
 
     if {[isscilabbusy 4]} {return}
 
-    filetosavecur
-    set filetocomp $listoffile("[gettextareacur]",fullname)
-    set filename [file tail    $filetocomp]
-    set filepath [file dirname $filetocomp]
-    set cwd [pwd]
-    cd $filepath
-    ScilabEval_lt "xmlfiletohtml(\"$filename\")" sync
-    cd $cwd
+    if {$Scilab5} {
+        set bugzillabugURL {}
+        append bugzillabugURL $ScilabBugzillaURL "show_bug.cgi?id=3015"
+        # this link points to Scipad_6.143.BP1
+        set backportedscipadversionURL {http://www.scilab.org/contrib/index_contrib.php?page=displayContribution&fileID=1111}
+        set mes {}
+        append mes [mc "This feature is no longer available in Scilab 5 due to bug 3015."] "\n\n" \
+                   [mc "See details at "] $bugzillabugURL "\n\n" \
+                   [mc "Note: Scilab 4.x and Scilab-gtk are offering this feature."] "\n" \
+                   [mc "A solution is to use a backported version of Scipad inside one of these environments, for instance:"] "\n" $backportedscipadversionURL
+        set tit [mc "Feature missing from Scilab 5"]
+        tk_messageBox -message $mes -icon error -title $tit
+    
+    } else {
+        filetosavecur
+        set filetocomp $listoffile("[gettextareacur]",fullname)
+        set filename [file tail    $filetocomp]
+        set filepath [file dirname $filetocomp]
+        set cwd [pwd]
+        cd $filepath
+        ScilabEval_lt "xmlfiletohtml(\"$filename\")" sync
+        cd $cwd
+    }
 }
 
 proc ScilabEval_lt {comm {opt1 ""} {opt2 ""}} {

diff --git a/scilab/modules/scipad/version.xml b/scilab/modules/scipad/version.xml
index a445a2a..394437a 100644 (file)
--- a/scilab/modules/scipad/version.xml
+++ b/scilab/modules/scipad/version.xml
@@ -15,5 +15,5 @@
 -->
 <!-- =================== -->
 
-<VERSION major="6" minor="152" maintenance="0" revision="0" string="SciPad unstable-svn" />
+<VERSION major="6" minor="153" maintenance="0" revision="0" string="SciPad unstable-svn" />
 </MODULE_VERSION>