--- tcl/buffernavigation.tcl	Mon Dec 22 10:29:44 2008
+++ tcl/buffernavigation.tcl	Tue Dec 30 20:47:02 2008
@@ -23,6 +23,7 @@
 #
 # See the file scipad/license.txt
 #
+
 #####################################################################
 #
 # About the implementation of paned windows:
@@ -359,6 +360,7 @@
 # Set all the settings such that $textarea becomes the current one
     global pad Scheme ColorizeIt listoffile textareaid
     global buffermodifiedsincelastsearch
+    global currentencoding
 
     # clear the selection when leaving a buffer - check first that the
     # textarea still exists because it might have been destroyed when
@@ -377,6 +379,7 @@
     keyposn $textarea
     set Scheme $listoffile("$textarea",language)
     set ColorizeIt $listoffile("$textarea",colorize)
+    set currentencoding $listoffile("$textarea",encoding)
     schememenus $textarea
     highlighttextarea $textarea
     TextStyles $textarea
@@ -547,6 +550,7 @@
 # it creates a new empty textarea
     global winopened listoffile
     global listoftextarea pad
+    global defaultencoding
 
     # ensure that the cursor is changed to the default cursor
     event generate [gettextareacur] <Leave>
@@ -565,6 +569,7 @@
     set listoffile("$pad.new$winopened",undostackdepth) 0
     set listoffile("$pad.new$winopened",redostackdepth) 0
     set listoffile("$pad.new$winopened",progressbar_id) ""
+    set listoffile("$pad.new$winopened",encoding) $defaultencoding
     lappend listoftextarea $pad.new$winopened
 
     addwindowsmenuentry $winopened $listoffile("$pad.new$winopened",displayedname)
@@ -618,6 +623,7 @@
     set listoffile("$newta",undostackdepth) $listoffile("$ta",undostackdepth)
     set listoffile("$newta",redostackdepth) $listoffile("$ta",redostackdepth)
     set listoffile("$newta",progressbar_id) $listoffile("$ta",progressbar_id)
+    set listoffile("$newta",encoding) $listoffile("$ta",encoding)
     lappend listoftextarea $newta
 
     addwindowsmenuentry $winopened $listoffile("$pad.new$winopened",displayedname)
--- BUGS	Sat Dec 13 16:24:14 2008
+++ BUGS	Thu Dec 25 17:22:30 2008
@@ -534,7 +534,13 @@
 
 Misc notes:
 
-- Could find a use in the Scipad code (all are Tcl/Tk 8.5 features):
+- Tcl/Tk 8.5 features that could find their use in the Scipad code:
   font actual $font $char (to know whether $char is included in $font)
   text count
   text search -all
+
+- Tcl/Tk 8.6 features that could find their use in the Scipad code:
+  file tempfile (TIP #210)
+  tk busy (TIP #321)
+  tk fontchooser (TIP #324)
+  -insertunfocussed for text widgets (TIP #197)
--- changelog.txt	Mon Dec 22 11:02:06 2008
+++ changelog.txt	Thu Jan 01 21:58:10 2009
@@ -1,3 +1,9 @@
+Francois VOGEL, 01/01/09
+ * Selection of the file encoding is now possible through a new option menu
+   (this is a request from Yung-Jang Lee) - This is the implementation
+   corresponding to SEP#12_V2.0
+ * version --> 7.12.SEP12_V2.0
+
 Francois VOGEL, 22/12/08
  * Fixed bug 3882 by using the grid geometry manager instead of pack in
    certain cases - See also:
--- tcl/db_debugsession.tcl	Sat Dec 13 16:24:14 2008
+++ tcl/db_debugsession.tcl	Thu Dec 25 17:19:46 2008
@@ -48,6 +48,7 @@
     global tmpdir
     global previousstopfun
     global bptsprops
+    global defaultencoding
 
     if {[isscilabbusy 5]} {return}
     showinfo $waitmessage
@@ -114,6 +115,7 @@
         if {[catch {
             set fname [file join $tmpdir "Scipad_execfile_bp_tempfile.sci"]
             set fid [open $fname w]
+            fconfigure $fid -encoding $defaultencoding
             puts $fid $allfuntexts
             close $fid
             ScilabEval_lt "exec(\"$fname\");" "sync" "seq"
--- tcl/defaults.tcl	Sat Dec 20 11:23:56 2008
+++ tcl/defaults.tcl	Thu Jan 01 22:01:02 2009
@@ -178,13 +178,13 @@
 # those are the preferences which are going to be saved
 set listofpref "$colorpref wordWrap \
        WMGEOMETRY WMSTATE printCommand indentspaces tabsizeinchars \
-       usekeywordindent \
-       filenamesdisplaytype maxrecentfiles scilabSingleQuotedStrings \
-       tabinserts lang completionbinding showContinuedLines \
-       filebackupdepth bindstyle doubleclickscheme colorizeenable \
-       windowsmenusorting linenumbersmargins ScilabErrorMessageBox \
-       colorizeuserfuns showclosureXcross exitwhenlastclosed"
-set listofpref_list { listofrecent textFont menuFont }
+       usekeywordindent filenamesdisplaytype maxrecentfiles maxrecentencodings \
+       scilabSingleQuotedStrings tabinserts lang completionbinding \
+       showContinuedLines filebackupdepth bindstyle doubleclickscheme \
+       colorizeenable windowsmenusorting linenumbersmargins \
+       ScilabErrorMessageBox colorizeuserfuns showclosureXcross \
+       exitwhenlastclosed autodetectencodinginxmlfiles"
+set listofpref_list { listofrecentfiles listofrecentencodings textFont menuFont }
 
 # default options which can be overriden
 set wordWrap "none"
@@ -220,7 +220,9 @@
 set usekeywordindent 1  ; # use smart keyword indentation: 0 (no) or 1 (yes)
 set filenamesdisplaytype "pruned"  ;# "pruned" or "full" or "fullifambig"
 set maxrecentfiles 15
-set listofrecent [list]    ;# always full filenames here
+set maxrecentencodings 5
+set listofrecentfiles [list]    ;# always full filenames here
+set listofrecentencodings [list]
 set scilabSingleQuotedStrings "yes"
 set tabinserts "spaces"    ;# "spaces" or "tabs"
 set completionbinding "Control-Tab"
@@ -235,6 +237,7 @@
 set colorizeuserfuns "yes"
 set showclosureXcross true
 set exitwhenlastclosed false
+set autodetectencodinginxmlfiles true
 
 # End of saved preferences
 #############
@@ -296,6 +299,10 @@
 # frame pathname in which $textarea is packed, or "none" if it is not packed
 array unset pwframe
 
+# default encoding is the system native encoding
+set defaultencoding [encoding system]
+set currentencoding $defaultencoding
+
 #############
 # source the user preferences file if any
 # this must happen after the locale selection from Scilab's getlanguage() above
@@ -604,6 +611,14 @@
 # Scilab matrix of strings or string (all with no continuation dots nor comments)
 set ssmsRE {}
 append ssmsRE {(?:} $smstRE_rep {)|(?:} $sstrRE {)}
+
+###
+
+# regular expression matching the start of an XML prolog and reporting
+# an encoding name in that prolog
+# see the XML specification http://www.w3.org/TR/xml
+# see also use of this RE in proc detectencoding
+set xml_prologstart_RE_rep {<\?xml[[:blank:]]+version[[:blank:]]*=[[:blank:]]*["']1.[[:digit:]]+["'][[:blank:]]+encoding[[:blank:]]*=[[:blank:]]*["']([[:alpha:]][\w.-]+)["']}
 
 ###
 
--- tcl/filecommands.tcl	Mon Dec 22 10:35:06 2008
+++ tcl/filecommands.tcl	Thu Jan 01 22:01:42 2009
@@ -111,6 +111,11 @@
 #       true: file gets colorized
 #       false: no colorization for this file
 #
+#     listoffile("$ta",encoding)
+#       name of the encoding in which the file is stored,
+#       e.g. utf-8 or euc-jp or cp1252 or a lot of other possibilities
+#       See SEP#12 for a more complete description of the encodings support in Scipad
+#
 #   The windows menu entries are radionbuttons, with the following
 #   properties:
 #     -value is $winopened
@@ -135,6 +140,7 @@
 proc filesetasnew {} {
     global winopened listoffile
     global listoftextarea pad
+    global defaultencoding
 
     # ensure that the cursor is changed to the default cursor
     event generate [gettextareacur] <Leave>
@@ -151,6 +157,7 @@
     set listoffile("$pad.new$winopened",undostackdepth) 0
     set listoffile("$pad.new$winopened",redostackdepth) 0
     set listoffile("$pad.new$winopened",progressbar_id) ""
+    set listoffile("$pad.new$winopened",encoding) $defaultencoding
     lappend listoftextarea $pad.new$winopened
 
     addwindowsmenuentry $winopened $listoffile("$pad.new$winopened",displayedname)
@@ -341,6 +348,7 @@
         unset listoffile("$textarea",undostackdepth)
         unset listoffile("$textarea",redostackdepth)
         unset listoffile("$textarea",progressbar_id)
+        unset listoffile("$textarea",encoding)
 
         # the rest of this proc is similar to proc hidetext,
         # but not identical
@@ -620,7 +628,7 @@
             # but unfortunately this does not work when used from the debugger
             # call stack area (the shell goes deeper one level and execution is
             # delayed), therefore a more complicated solution here
-            set fullcomm "TCL_EvalStr(\"openfile \"\"\"+strsubst(get_function_path(\"$nametoopen\"),\"\\\",\"/\")+\"\"\"\",\"scipad\");"
+            set fullcomm "TCL_EvalStr(\"openfile \"\"\"+strsubst(get_function_path(\"$nametoopen\"),\"\\\",\"/\")+\"\"\" currenttile iso8859-1\",\"scipad\");"
             ScilabEval_lt $fullcomm "seq"
         }
         "scicos" {
@@ -633,7 +641,7 @@
             # <TODO>: the line below does not need the ScilabEval(TCL_EvalStr...) construct
             #         because there is no Scilab instruction inside
             #         openfile $filetoopen      should be just enough - to be checked
-            ScilabEval_lt "TCL_EvalStr(\"openfile \"\"$filetoopen\"\"\",\"scipad\");" "seq"
+            ScilabEval_lt "TCL_EvalStr(\"openfile \"\"$filetoopen\"\" currenttile iso8859-1\",\"scipad\");" "seq"
         }
         "userfun" {
             set nameinitial [string range $nametoopen 0 0]
@@ -760,19 +768,20 @@
     }
 }
 
-proc openfile {file {tiledisplay "currenttile"}} {
+proc openfile {file {tiledisplay "currenttile"} {encodingtouse ""}} {
 # try to open a file with filename $file (no file selection through a dialog)
-# if file is not already open, open it
+# if file is not already open, open it using encoding $encodingtouse
 # otherwise just switch buffers to show it
 # return value:
 #    0 if file could not be open
 #    1 if file could be open or displayed (switched buffers)
     global pad winopened listoftextarea listoffile
     global closeinitialbufferallowed startdir
+    global currentencoding
 
-#hack for bringing up the chooser, if $file is a directory
-# on windows this has to precede the check for readable,
-#  because a directory is "unreadable"
+    # hack for bringing up the chooser, if $file is a directory
+    # on windows this has to precede the check for readable,
+    #  because a directory is "unreadable"
     if {[file isdirectory $file]} {
         set startdir $file
         showopenwin currenttile; 
@@ -793,7 +802,14 @@
             if {[file exists $file]} {
                 set listoffile("$pad.new$winopened",thetime) [file mtime $file]
                 set listoffile("$pad.new$winopened",new) 0
-                shownewbuffer $file $tiledisplay
+                # unless otherwise specified, use the encoding selected in the options/encoding menu
+                if {$encodingtouse eq ""} {
+                    set encodingtouse $currentencoding
+                }
+                shownewbuffer $file $tiledisplay $encodingtouse
+                # update the options menu and encoding property in listoffile
+                set currentencoding $encodingtouse
+                setencoding
             } else {
                 set listoffile("$pad.new$winopened",thetime) 0
                 set listoffile("$pad.new$winopened",new) 1
@@ -839,6 +855,8 @@
 # $file is not opened - this sets the $listoffile area values for that file
 # and adds an entry in the windows menu
     global winopened pad listoffile
+    global currentencoding autodetectencodinginxmlfiles
+
     incr winopened
     dupWidgetOption [gettextareacur] $pad.new$winopened
     set listoffile("$pad.new$winopened",fullname) [file normalize $file]
@@ -856,13 +874,24 @@
     set listoffile("$pad.new$winopened",redostackdepth) 0
     set listoffile("$pad.new$winopened",progressbar_id) ""
 
+    if {$autodetectencodinginxmlfiles} {
+        # automatic detection of encoding (for xml files)
+        set detenc [detectencoding $file]
+        set listoffile("$pad.new$winopened",encoding) $detenc
+        set currentencoding $detenc
+        setencoding
+    } else {
+        # no auto-detection of encoding, just use the current encoding
+        # selected in the options/encoding menu
+        set listoffile("$pad.new$winopened",encoding) $currentencoding
+    }
     addwindowsmenuentry $winopened $listoffile("$pad.new$winopened",displayedname)
 }
 
-proc shownewbuffer {file tiledisplay} {
+proc shownewbuffer {file tiledisplay encodingtouse} {
     global pad winopened closeinitialbufferallowed
     if {[fileunreadable $file]} {return}
-    openfileondisk $pad.new$winopened $file $tiledisplay
+    openfileondisk $pad.new$winopened $file $tiledisplay $encodingtouse
     resetmodified $pad.new$winopened "clearundoredostacks"
     # colorization must be launched before showing the textarea
     # so that foreground colorization while stepping into
@@ -896,7 +925,7 @@
       file to another name and reopen it from disk!"] ] -parent $pad
 }
 
-proc openfileondisk {textarea thefile tiledisplay} {
+proc openfileondisk {textarea thefile tiledisplay encodingtouse} {
 # really open/read a file from disk
 # all readability tests have normally been done before
     global listoftextarea pad closeinitialbufferallowed
@@ -908,9 +937,8 @@
         closefile $pad.new1
     }
     set newnamefile [open $thefile r]
-    while {![eof $newnamefile]} {
-        $textarea insert end [read -nonewline $newnamefile ]
-    }
+    fconfigure $newnamefile -encoding $encodingtouse
+    $textarea insert end [read -nonewline $newnamefile]
     close $newnamefile
 }
 
@@ -1138,7 +1166,7 @@
 # really write the file onto the disk
 # all writability tests have normally been done before
     global filebackupdepth tcl_platform
-    global pad
+    global pad listoffile
 
     if {$nobackupskip} {
         backupfile $nametosave $filebackupdepth
@@ -1187,6 +1215,7 @@
     }
 
     set FileNameToSave [open $nametosave w]
+    fconfigure $FileNameToSave -encoding $listoffile("$textarea",encoding)
     puts -nonewline $FileNameToSave [$pad.temptextwidget get 1.0 end]
     close $FileNameToSave
 
@@ -1199,9 +1228,14 @@
 
 proc savepreferences {} {
   global env listofpref listofpref_list
+  global defaultencoding
   set preffilename [file join $env(SCIHOME) .SciPadPreferences.tcl]
   catch {
     set preffile [open $preffilename w]
+    # the preferences file is always saved with the default platform system encoding
+    # this avoids to source it later in an encoding different than the platform
+    # native encoding, which is a feature available only from Tcl 8.5 onwards
+    fconfigure $preffile -encoding $defaultencoding
     foreach opt $listofpref {
         global $opt
         puts $preffile [concat "set $opt" \{[set $opt]\}]
@@ -1271,6 +1305,7 @@
         }
         if {$answer == yes} {
             set oldfile [open $thefile r]
+            fconfigure $oldfile -encoding $listoffile("$textarea",encoding)
             $textarea delete 1.0 end 
             while {![eof $oldfile]} {
                 $textarea insert end [read -nonewline $oldfile ] 
@@ -1333,6 +1368,82 @@
 }
 
 ##################################################
+# file encoding procs
+##################################################
+proc setencoding {} {
+# set the encoding property of the current buffer to be the encoding
+# currently selected in the encoding options menu
+# this proc is called when selecting any option of this menu
+    global currentencoding listoffile
+    set textarea [gettextareacur]
+    foreach ta [getfullpeerset $textarea] {
+        set listoffile("$ta",encoding) $currentencoding
+        modifiedtitle $ta
+    }
+    # this is mandatory because any system calls get mangled otherwise
+    # such as passing a filename to the system
+    encoding system $currentencoding
+    # add in the MRU list of encodings
+    AddRecentEncoding $currentencoding
+}
+
+proc detectencoding {filename} {
+# detect encoding of $filename if it is an xml file
+# this is done by looking for the encoding name in the prolog
+# of the file
+# if detection fails for any reason, the current encoding name is returned
+# if detection succeeds, then the returned string it is an encoding name
+# among the list of known encodings
+
+    global xml_prologstart_RE_rep currentencoding
+
+    # check that the filename extension is xml
+    if {[extenstolang $filename] ne "xml"} {
+        return $currentencoding
+    }
+    # extension is xml, read the file using the current encoding
+    # if anything fails then return $currentencoding
+    if {[catch { \
+                set fileid [open $filename r]; \
+                fconfigure $fileid -encoding $currentencoding; \
+                set allthetext [read -nonewline $fileid]; \
+                close $fileid \
+               } \
+         ]} {
+        return $currentencoding
+    }
+
+    # regexp match the encoding name in the prolog
+    set encodingwasfound [regexp -nocase $xml_prologstart_RE_rep $allthetext -> detectedencoding]
+    if {$encodingwasfound} {
+        # encoding name found, now contained in $detectedencoding
+        # the list of encoding is apparently returned in lower case by [encoding names]
+        # therefore the detected encoding name really is the lowercase conversion
+        # of what was found in the xml prolog
+        set detectedencoding [string tolower $detectedencoding]
+        if {[lsearch -exact [encoding names] $detectedencoding] != -1} {
+            # detected encoding name is known by Scipad
+            return $detectedencoding
+        } else {
+            # Scipad is not aware of the detected encoding
+            # try to remove the dash after iso and check again since
+            # iso8859-1 is part of [encoding system] while iso-8859-1 is mentioned
+            # in Scilab xml help files
+            set detectedencoding [string map {iso- iso} $detectedencoding]
+            if {[lsearch -exact [encoding names] $detectedencoding] != -1} {
+                # detected encoding name is now known by Scipad
+                return $detectedencoding
+            } else {
+                return $currentencoding
+            }
+        }
+    } else {
+        # no match in the xml prolog
+        return $currentencoding
+    }
+}
+
+##################################################
 # ancillaries for file commands
 ##################################################
 proc getpathandext {ta} {
@@ -1881,134 +1992,5 @@
             set newname [file join $newname $tojoin]
         }
         set listoffile("$ta",displayedname) $newname
-    }
-}
-
-##################################################
-# procedures dealing with the recent files list
-# displayed in the file menu
-##################################################
-proc AddRecentFile {filename} {
-# add a new recent file item to the file menu
-# if there is already the max number of entries, then shift them
-# one line down and insert $filename at the top
-    global pad listofrecent maxrecentfiles nbrecentfiles
-    if {$maxrecentfiles == 0} {return}
-    # first check if the new entry is already present
-    set present "false"
-    for {set i 0} {$i<$nbrecentfiles} {incr i} {
-        if {[lindex $listofrecent $i] == $filename} {
-            set present "true"
-            set pospresent $i
-        }
-    }
-    set rec1ind [GetFirstRecentInd]
-    if {$present == "false"} {
-        # add the new entry
-        if {$nbrecentfiles == 0} {
-            incr rec1ind
-            $pad.filemenu.files insert $rec1ind separator
-        }
-        # update the file menu
-        if {$nbrecentfiles < $maxrecentfiles} {
-            incr nbrecentfiles
-            # insert new entry
-            set listofrecent [linsert $listofrecent 0 $filename]
-            # [list [lindex $listofrecent $i]] automatically escapes special characters
-            $pad.filemenu.files insert $rec1ind command \
-                       -label [file tail [lindex $listofrecent 0] ] \
-                       -command "openfileifexists [list [lindex $listofrecent 0]]"
-            # update menu entries (required to update the numbers)
-            UpdateRecentLabels $rec1ind
-        } else {
-            # forget last entry of the list and insert new entry
-            set listofrecent [lreplace $listofrecent end end]
-            set listofrecent [linsert $listofrecent 0 $filename]
-            # update menu entries
-            UpdateRecentLabels $rec1ind
-        }
-    } else {
-        # move the existing entry to the top of the list
-        set listofrecent [lreplace $listofrecent $pospresent $pospresent]
-        set listofrecent [linsert $listofrecent 0 $filename]
-        UpdateRecentLabels $rec1ind
-    }
-}
-
-proc GetFirstRecentInd {} {
-# get index of first recent file item in the file menu
-    global FirstMRUFileNameInFileMenu nbrecentfiles
-    if {$nbrecentfiles == 0} {
-        return [expr {$FirstMRUFileNameInFileMenu - 1}]
-    } else {
-        return $FirstMRUFileNameInFileMenu
-    }
-}
-
-proc UpdateRecentLabels {rec1ind} {
-# update labels of recent files entries with file tail preceded by a number
-    global pad listofrecent nbrecentfiles
-    for {set i 0} {$i<$nbrecentfiles} {incr i} {
-        if {$i<9} {
-            set lab [concat [expr {$i + 1}] [file tail [lindex $listofrecent $i] ] ]
-        } else {
-            set lab [file tail [lindex $listofrecent $i] ]
-        }
-        set ind [expr {$rec1ind + $i}]
-        # [list [lindex $listofrecent $i]] automatically escapes special characters
-        $pad.filemenu.files entryconfigure $ind \
-                   -label $lab \
-                   -command "openfileifexists [list [lindex $listofrecent $i]]"
-        if {$i<9} {
-            $pad.filemenu.files entryconfigure $ind -underline 0
-        } else {
-            $pad.filemenu.files entryconfigure $ind -underline -1
-        }
-    }
-}
-
-proc BuildInitialRecentFilesList {} {
-    global pad listofrecent nbrecentfiles
-    set nbrecentfiles [llength $listofrecent]
-    for {set i 0} {$i<$nbrecentfiles} {incr i} {
-        if {$i<9} {
-            set lab [concat [expr {$i + 1}] [file tail [lindex $listofrecent $i] ] ]
-        } else {
-            set lab [file tail [lindex $listofrecent $i] ]
-        }
-        # [list [lindex $listofrecent $i]] automatically escapes special characters
-        $pad.filemenu.files add command \
-                   -label $lab \
-                   -command "openfileifexists [list [lindex $listofrecent $i]]"
-        if {$i<9} {
-            set ind [$pad.filemenu.files index end]
-            $pad.filemenu.files entryconfigure $ind \
-                   -underline 0
-        }
-    }
-    if {$nbrecentfiles > 0} {
-        $pad.filemenu.files add separator
-    }
-}
-
-proc UpdateRecentFilesList {} {
-    global pad listofrecent maxrecentfiles nbrecentfiles
-    if {$maxrecentfiles >= [llength $listofrecent]} {
-        # nothing to do, maxrecentfiles was just increased
-        # this is handled by AddRecentFile
-        return
-    } else {
-        # maxrecentfiles was decreased
-        # forget the entries in listofrecent, and update the file menu
-        set rec1ind [GetFirstRecentInd]
-        set firstind [expr {$rec1ind + $maxrecentfiles}]
-        set lastind  [expr {$rec1ind + [llength $listofrecent] - 1}]
-        $pad.filemenu.files delete $firstind $lastind
-        set listofrecent [lreplace $listofrecent $maxrecentfiles end]
-        incr nbrecentfiles [expr {- ($lastind - $firstind + 1)}]
-        if {$maxrecentfiles == 0} {
-            # remove the separator
-            $pad.filemenu.files delete $firstind
-        }
     }
 }
--- tcl/msg_files/fr_fr.msg	Thu Dec 18 18:54:54 2008
+++ tcl/msg_files/fr_fr.msg	Thu Jan 01 22:06:55 2009
@@ -25,7 +25,7 @@
 #
 
 # Scipad texts in French by Francois Vogel
-# in sync at least with v7.11
+# in sync at least with v7.12.SEP12_V2.0
 
 
 # commons
@@ -640,6 +640,10 @@
     ::msgcat::mcset fr_fr "Execution &errors" "E&rreurs d'exécution"
         ::msgcat::mcset fr_fr "In Scilab &shell only" "Dans la fenêtre &Scilab seulement"
         ::msgcat::mcset fr_fr "Copied in a &message box" "Recopiées dans une &boîte de dialogue"
+    ::msgcat::mcset fr_fr "Enc&oding" "Encod&age"
+        ::msgcat::mcset fr_fr "More enc&odings" "Plus d'encod&ages"
+        ::msgcat::mcset fr_fr "&Recent encodings" "Encodages &récents"
+        ::msgcat::mcset fr_fr "&Auto-detect encoding when loading XML files" "&Auto-detection de l'encodage à l'ouverture des fichiers XML"
     ::msgcat::mcset fr_fr "E&xit options" "Option&s de fermeture"
         ::msgcat::mcset fr_fr "Show closure &X" "Afficher le bouton &X de fermeture"
         ::msgcat::mcset fr_fr "Exit on &last file close" "Quitte si &dernier fichier fermé"
--- tcl/helps.tcl	Thu Nov 13 21:23:20 2008
+++ tcl/helps.tcl	Thu Dec 25 17:20:50 2008
@@ -97,6 +97,7 @@
 # a generic scrollable messagewindow, which displays the content of a text file
 proc textbox {textfile {wtitle ""}} {
     global pad menuFont textFont
+    global defaultencoding
     if {$wtitle == ""} {set wtitle $textfile}
     set tbox $pad.textbox
     catch {destroy $tbox}
@@ -107,6 +108,7 @@
     frame $tbox.f1
     text $tbox.text -font $textFont
     set newnamefile [open $textfile r]
+    fconfigure $newnamefile -encoding $defaultencoding
     while {![eof $newnamefile]} {
             $tbox.text insert end [read -nonewline $newnamefile ] 
     }
--- tcl/infomessages.tcl	Thu Dec 18 18:54:54 2008
+++ tcl/infomessages.tcl	Thu Dec 25 17:21:02 2008
@@ -173,24 +173,30 @@
 
 proc modifiedtitle {textarea {panesonly "false"}} {
 # Set the Scipad window title to the name of the file displayed in $textarea
-# and add tags (modified, readonly)
+# and add tags (modified, readonly, encoding (if different from the system
+# encoding at Scipad startup))
 # Do the same for the pane title if it exists (i.e. if not maximized)
 # Update also the visual indications of the modified state of the buffer.
 # This includes title bar, colorization of the windows menu entry and
 # colorization of an area in the status bar
     global pad winTitle ScipadVersion listoffile
     global MenuEntryId
-    set fname $listoffile("$textarea",displayedname)
-    set ind [extractindexfromlabel $pad.filemenu.wind $fname]
-    set mod1 ""; set mod2 ""
+    global defaultencoding
+
     if {$listoffile("$textarea",readonly) == 1} { 
         set mod1 [mc " \[ReadOnly\]"]
+    } else {
+        set mod1 ""
     }
+
     if {[isanymodified]} {
         $pad.statusind configure -background PeachPuff
     } else {
         $pad.statusind configure -background [$pad.filemenu cget -background]
     }
+
+    set fname $listoffile("$textarea",displayedname)
+    set ind [extractindexfromlabel $pad.filemenu.wind $fname]
     if {[ismodified $textarea]} {
         set mod2 [mc " (modified)"]
         if {$ind !=-1} {
@@ -199,24 +205,34 @@
         }
         $pad.statusind configure -background Salmon
     } else {  
+        set mod2 "" 
         if {$ind !=-1} {
             $pad.filemenu.wind entryconfigure $ind -background "" \
                -activebackground ""
         }
     }
+
+    if {$listoffile("$textarea",encoding) != $defaultencoding} {
+        set mod3 " ($listoffile("$textarea",encoding))"
+    } else {
+        set mod3 ""
+    }
+
     if {$panesonly == "false"} {
         # catched because scan will fail when launched from wish
         if {[catch {
             scan $ScipadVersion "%s - %s" ScipadVersionNumber ScipadVersionString
-            wm title $pad "$winTitle $ScipadVersionNumber - $fname$mod1$mod2"
+            wm title $pad "$winTitle $ScipadVersionNumber - $fname$mod1$mod2$mod3"
                    }] } {
-            wm title $pad "$winTitle - $fname$mod1$mod2"
+            wm title $pad "$winTitle - $fname$mod1$mod2$mod3"
         }
     }
+
     if {[isdisplayed $textarea]} {
         [getpaneframename $textarea].panetitle configure \
-          -text "$fname$mod1$mod2"
+          -text "$fname$mod1$mod2$mod3"
     }
+
     if {[ismodified $textarea] && \
           $listoffile("$textarea",thetime) !=0} { 
         $pad.filemenu.files entryconfigure \
--- tcl/mainwindow.tcl	Thu Dec 18 18:54:54 2008
+++ tcl/mainwindow.tcl	Thu Dec 25 17:21:12 2008
@@ -23,6 +23,7 @@
 #
 # See the file scipad/license.txt
 #
+
 toplevel $pad
 setscipadicon $pad
 
@@ -42,6 +43,7 @@
 set listoffile("$pad.new$winopened",undostackdepth) 0; # used to enable/disable the undo menu entry
 set listoffile("$pad.new$winopened",redostackdepth) 0; # used to enable/disable the redo menu entry
 set listoffile("$pad.new$winopened",progressbar_id) ""; # colorization progressbar identifier
+set listoffile("$pad.new$winopened",encoding) $defaultencoding
 
 set chset()                 {} 
 set words()                 {}  
--- Makefile.am	Thu Nov 13 21:23:20 2008
+++ Makefile.am	Tue Dec 30 23:22:55 2008
@@ -48,6 +48,7 @@
 tcl/mainwindow.tcl \
 tcl/menues.tcl \
 tcl/modselection.tcl \
+tcl/MRUlist.tcl \
 tcl/platformbind.tcl \
 tcl/popupmenus.tcl \
 tcl/print.tcl \
--- tcl/menues.tcl	Sat Dec 20 23:16:56 2008
+++ tcl/menues.tcl	Thu Jan 01 20:46:35 2009
@@ -30,9 +30,12 @@
     global listoffile listoftextarea bindset
     global FirstBufferNameInWindowsMenu
     global FirstMRUFileNameInFileMenu
+    global FirstMRUEncodingInOptEncMenu
     global Shift_Tab
     foreach c1 "$bgcolors $fgcolors" {global $c1}
     global Tk85
+    global currentencoding defaultencoding nbrecentencodings
+    global autodetectencodinginxmlfiles
 
     #destroy old menues (used when changing language)
     foreach w [winfo children $pad.filemenu] {
@@ -358,12 +361,12 @@
         eval "$pad.filemenu.options.windmenusort add radiobutton \
                  [me "&Most recently used"] -command {sortwindowsmenuentries}\
                  -value MRUorder -variable windowsmenusorting"
-    set recentnumbmenu [tk_optionMenu $pad.filemenu.options.recent \
+    set recentfilesnumbmenu [tk_optionMenu $pad.filemenu.options.recentf \
                     maxrecentfiles 0 1 2 3 4 5 6 7 8 9 10 15 20 50]
     eval "$pad.filemenu.options add cascade  [me "&Recent files"]\
-               -menu $recentnumbmenu"
-    for {set i 0} {$i<=[$recentnumbmenu index last]} {incr i} {
-        $recentnumbmenu entryconfigure $i -command {UpdateRecentFilesList}
+               -menu $recentfilesnumbmenu"
+    for {set i 0} {$i<=[$recentfilesnumbmenu index last]} {incr i} {
+        $recentfilesnumbmenu entryconfigure $i -command {UpdateRecentFilesList}
     }
     eval "$pad.filemenu.options add cascade  [me "&Backup files depth"]\
                -menu [tk_optionMenu $pad.filemenu.options.backup \
@@ -380,7 +383,7 @@
                 -variable lang -value $l -command relocalize"
         }
     }
-# feature temporary disabled as not yet 100% ok (see bindings/issues.txt)
+# feature enabled yet not 100% ok (see bindings/issues.txt) - teasing!
     menu $pad.filemenu.options.bindings -tearoff 0
     eval "$pad.filemenu.options add cascade [me "&Bindings style"] \
            -menu $pad.filemenu.options.bindings "
@@ -405,6 +408,34 @@
         eval "$pad.filemenu.options.messageboxes add radiobutton \
             [me "Copied in a &message box"] \
              -value true -variable ScilabErrorMessageBox"
+    eval "$pad.filemenu.options add cascade [me "Enc&oding"] \
+               -menu $pad.filemenu.options.encodings"
+        menu $pad.filemenu.options.encodings -tearoff 1
+        set FirstMRUEncodingInOptEncMenu [expr {[$pad.filemenu.options.encodings index last] + 1}]
+        BuildInitialRecentEncodingsList
+        # if the MRU list of encodings is empty, then add platform system encoding, iso8859-1 and utf-8
+        # these encodings are supposed to exist (distributed with Tcl)
+        if {$nbrecentencodings == 0} {
+            AddRecentEncoding "utf-8"
+            AddRecentEncoding "iso8859-1"
+            AddRecentEncoding $defaultencoding
+        }
+        eval "$pad.filemenu.options.encodings add cascade [me "More enc&odings"] \
+                   -menu $pad.filemenu.options.encodings.more"
+            menu $pad.filemenu.options.encodings.more -tearoff 1
+            foreach en [lsort -dictionary [encoding names]] {
+                $pad.filemenu.options.encodings.more add radiobutton -label $en \
+                    -command {setencoding} -value $en -variable currentencoding
+            }
+        set recentencodingsnumbmenu [tk_optionMenu $pad.filemenu.options.encodings.recente \
+                        maxrecentencodings 0 1 2 3 4 5 6 7 8 9 10]
+        eval "$pad.filemenu.options.encodings add cascade  [me "&Recent encodings"]\
+                   -menu $recentencodingsnumbmenu"
+        for {set i 0} {$i<=[$recentencodingsnumbmenu index last]} {incr i} {
+            $recentencodingsnumbmenu entryconfigure $i -command {UpdateRecentEncodingsList}
+        }
+        eval "$pad.filemenu.options.encodings add check [me "&Auto-detect encoding when loading XML files"] \
+          -offvalue false -onvalue true -variable autodetectencodinginxmlfiles"
     menu $pad.filemenu.options.exitopts -tearoff 0
     eval "$pad.filemenu.options add cascade [me "E&xit options"] \
            -menu $pad.filemenu.options.exitopts "
@@ -497,7 +528,7 @@
     global Tk85
     set tileprocalreadyrunning true
     # File/Close
-    set iClose [expr {[GetFirstRecentInd] + $nbrecentfiles + 1}]
+    set iClose [expr {[GetFirstRecentFileInd] + $nbrecentfiles + 1}]
     $pad.filemenu.files entryconfigure $iClose -state disabled
     binddisable $pad {closecurfile yesnocancel}
     # Windows menu entries
@@ -527,7 +558,7 @@
     global tileprocalreadyrunning
     global Tk85
     # File/Close
-    set iClose [expr {[GetFirstRecentInd] + $nbrecentfiles + 1}]
+    set iClose [expr {[GetFirstRecentFileInd] + $nbrecentfiles + 1}]
     $pad.filemenu.files entryconfigure $iClose -state normal
     bindenable $pad {closecurfile yesnocancel}
     # Windows menu entries
@@ -772,13 +803,13 @@
 proc showinfo_menu_file {w} {
 # display full pathname of a recent file entry of the file menu
 # as a showinfo
-    global pad nbrecentfiles listofrecent
+    global pad nbrecentfiles listofrecentfiles
     if {$nbrecentfiles > 0} {
-        set rec1ind [GetFirstRecentInd]
+        set rec1ind [GetFirstRecentFileInd]
         set recnind [expr {$rec1ind + $nbrecentfiles - 1}]
         set mouseentry [$w index active]
         if {$rec1ind<=$mouseentry && $mouseentry<=$recnind} {
-            showinfo [lindex $listofrecent [expr {$mouseentry - $rec1ind}]]
+            showinfo [lindex $listofrecentfiles [expr {$mouseentry - $rec1ind}]]
         }
     }
 }
--- tcl/print.tcl	Mon Dec 22 10:38:12 2008
+++ tcl/print.tcl	Thu Dec 25 17:22:18 2008
@@ -94,6 +94,7 @@
     if {[ismodified $textarea] ||
         ![file exists $listoffile("$textarea",fullname)]} {
         set TempPrintFile [open /tmp/SciPadtmpfile w]
+        fconfigure $TempPrintFile -encoding $listoffile("$textarea",encoding)
         puts -nonewline $TempPrintFile [$textarea get 1.0 end]
         close $TempPrintFile
         catch {eval exec "$printCommand /tmp/SciPadtmpfile"} result
@@ -120,6 +121,7 @@
         ![file exists $listoffile("$textarea",fullname)]} {
         set fname [file join $tmpdir SciPadtmpfile]
         set TempPrintFile [open $fname w]
+        fconfigure $TempPrintFile -encoding $listoffile("$textarea",encoding)
         puts -nonewline $TempPrintFile [$textarea get 1.0 end]
         close $TempPrintFile
         ScilabEval_lt "toprint(\"$fname\")" "sync"
--- tcl/scilabexec.tcl	Sat Dec 13 16:24:14 2008
+++ tcl/scilabexec.tcl	Thu Dec 25 17:22:22 2008
@@ -366,6 +366,7 @@
 
     global tmpdir
     global pad
+    global defaultencoding
 
     set bsiz_1  4095   ;# Must be consistent with bsiz defined in stack.h
     set lsiz_1 65535   ;# Must be consistent with lsiz defined in stack.h
@@ -384,6 +385,7 @@
             set splitsize 4000 ;# arbitrary but works up to approx. 4095
             set nbparts [expr {[string length $comm] / $splitsize + 1}]
             set fid [open $fname w]
+            fconfigure $fid -encoding $defaultencoding
             set startpos 0
             for {set i 1} {$i < $nbparts} {incr i} {
                 set stoppos  [expr {$i * $splitsize - 1}]
--- tcl/scipad.tcl	Thu Nov 13 21:23:20 2008
+++ tcl/scipad.tcl	Sat Dec 27 11:03:20 2008
@@ -90,6 +90,7 @@
     source [file join $sourcedir tooltips.tcl]
     source [file join $sourcedir progressbar.tcl]
     source [file join $sourcedir scrollableframe.tcl]
+    source [file join $sourcedir MRUlist.tcl]
 
     # now all the pure main level code
     source [file join $sourcedir defaults.tcl]
--- tcl/scipaddebug1.tcl	Thu Nov 13 21:23:20 2008
+++ tcl/scipaddebug1.tcl	Wed Dec 31 15:39:00 2008
@@ -296,6 +296,7 @@
     # and this one is never erased by Scipad (a new filename is used for each
     # bgerror)
         global Scipaddebuglogfileid Scipaddebuglogfilename env debuglog loginafile
+        global defaultencoding
         if {!$debuglog} {return}
         timestamp sec mil
         puts "[clock format $sec -format "%d/%m/%y|%T"].[format %03d $mil]|$value"
@@ -308,6 +309,7 @@
             } else {
                 set Scipaddebuglogfileid [open $Scipaddebuglogfilename a]
             }
+            fconfigure $Scipaddebuglogfileid -encoding $defaultencoding
             puts $Scipaddebuglogfileid "[clock format $sec -format "%d/%m/%y|%T"].[format %03d $mil]|$value"
             close $Scipaddebuglogfileid
         }
--- tcl/scipaddebug2.tcl	Thu Nov 13 21:23:20 2008
+++ tcl/scipaddebug2.tcl	Sat Dec 27 18:59:02 2008
@@ -45,7 +45,7 @@
     mc amp mcra mcmax mcmaxra bl \
     keyposn dokeyposn ismodified whichfun modifiedtitle \
     showinfo delinfo showinfo_menu_file showinfo_menu_wind \
-    GetFirstRecentInd extractindexfromlabel \
+    GetFirstRecentFileInd GetFirstRecentEncodingInd extractindexfromlabel \
     checkifanythingchangedondisk checkiffilechangedondisk \
     TextStyles managescroll \
     schememenus setdbmenuentriesstates_bp getdbstate pbind \
--- version.xml	Sat Dec 20 17:37:26 2008
+++ version.xml	Tue Dec 30 23:24:00 2008
@@ -15,5 +15,5 @@
 -->
 <!-- =================== -->
 
-<VERSION major="7" minor="12" maintenance="0" revision="0" string="SciPad unstable-svn" />
+<VERSION major="7" minor="12" maintenance="SEP12_V2.0" revision="0" string="SciPad unstable-svn" />
 </MODULE_VERSION>