bug#13460: Issue to change dictionary when using hunspell on emacs

[Jochen Schmitt <Jochen@herr-schmitt.de>]

[-- Attachment #1: Type: text/plain, Size: 1209 bytes --]

On Fri, Jan 18, 2013 at 06:05:01PM +0100, Agustin Martin wrote:

> I have been playing with this. Please see attached patch for current status.
> There are a couple of minor things I would like to think about first.
> 
> Current changes explicitly set "english" to one of the two main choices
> ("en_GB"). This  is not something I like very much and I am aware that
> people is sensitive about this. I'd prefer to associate it with plain "en",
> but hunspell has some pending issues regarding fallback values.
> 
> Since there should be mapppings for all (but nil) default dict definitions, 
> and this is only done for those dicts I am also considering to show an error
> if an expected mappping is not found, but this is a really minor internal
> issue just to help finding missing mappings early.
> 
> I will test these changes a bit more and if no problems appear will commit
> early next week. Feedback is welcome.

I have add a monor change to your suggested patch to generate
an error message, if a language doesn't exist in ispell-hunspell-equivs-alist.

My tests show, that this parch works as expected.

I have attached the modified version of the patch on this mail.

Best Regards:

Jochen Schmitt

[-- Attachment #2: emacs-24.2-hunspell.patch --]
[-- Type: text/plain, Size: 4375 bytes --]

diff -up emacs-24.2/lisp/textmodes/ispell.el.hunspell emacs-24.2/lisp/textmodes/ispell.el
--- emacs-24.2/lisp/textmodes/ispell.el.hunspell	2013-01-19 12:38:21.365802034 +0100
+++ emacs-24.2/lisp/textmodes/ispell.el	2013-01-19 14:32:10.527026717 +0100
@@ -572,6 +572,40 @@ re-start Emacs."
 		       (coding-system :tag "Coding System")))
   :group 'ispell)
 
+(defvar ispell-hunspell-dictionary-equivs-alist
+  '(("american"      "en_US")
+    ("brasileiro"    "pt_BR")
+    ("british"       "en_GB")
+    ("castellano"    "es_ES")
+    ("castellano8"   "es_ES")
+    ("czech"         "cs_CZ")
+    ("dansk"         "da_DK")
+    ("deutsch"       "de_DE")
+    ("deutsch8"      "de_DE")
+    ("english"       "en_GB,en_US")
+    ("esperanto"     "eo")
+    ("esperanto-tex" "eo")
+    ("finnish"       "fi_FI")
+    ("francais7"     "fr_FR")
+    ("francais"      "fr_FR")
+    ("francais-tex"  "fr_FR")
+    ("german"        "de_DE")
+    ("german8"       "de_DE")
+    ("italiano"      "it_IT")
+    ("nederlands"    "nl_NL")
+    ("nederlands8"   "nl_NL")
+    ("norsk"         "nn_NO")
+    ("norsk7-tex"    "nn_NO")
+    ("polish"        "pl_PL")
+    ("portugues"     "pt_PT")
+    ("russian"       "ru_RU")
+    ("russianw"      "ru_RU")
+    ("slovak"        "sk_SK")
+    ("slovenian"     "sl_SI")
+    ("svenska"       "sv_SE")
+    ("hebrew"        "he_IL"))
+  "Alist with matching hunspell dict names for standard dict names in
+  `ispell-dictionary-base-alist'.")
 
 (defvar ispell-dictionary-base-alist
   '((nil
@@ -1077,9 +1111,15 @@ time, before `ispell-dictionary-alist' i
 sysadmins to override entries in `ispell-dictionary-base-alist'
 by putting those overrides in `ispell-base-dicts-override-alist', which is
 a dynamically scoped var with same format as `ispell-dictionary-alist'.
-This alist will not override the auto-detected values (e.g. if a recent
+This alist will no<<<<<<<<<<<<<t override the auto-detected values (e.g. if a recent
 aspell is used along with Emacs).")
 
+(defun ispell-hunspell-dictionary-option (dict)
+  (let ((ret (cadr (assoc dict ispell-hunspell-dictionary-equivs-alist))))
+       (list "-d" (if (null ret) 
+		      (error "Hunspell doesn't sopport dictionary '%s'" dict)
+		      ret))))
+
 (defun ispell-set-spellchecker-params ()
   "Initialize some spellchecker parameters when changed or first used."
   (unless (eq ispell-last-program-name ispell-program-name)
@@ -1106,9 +1146,47 @@ aspell is used along with Emacs).")
 		    ispell-encoding8-command)
 	       ispell-aspell-dictionary-alist
 	     nil))
+	  (ispell-dictionary-base-alist ispell-dictionary-base-alist)
 	  ispell-base-dicts-override-alist ; Override only base-dicts-alist
 	  all-dicts-alist)
 
+      ;; While ispell and aspell (through aliases) use the traditional
+      ;; dict naming originally expected by ispell.el, hunspell
+      ;; uses locale based names with no alias.  We need to map
+      ;; standard names to locale based names to make default dict
+      ;; definitions available for hunspell.
+      (if ispell-really-hunspell
+	  (let (tmp-dicts-alist)
+	    (dolist (adict ispell-dictionary-base-alist)
+	      (let* ((dict-name (nth 0 adict))
+		     (ispell-args (nth 5 adict))
+		     (ispell-args-has-d (member "-d" ispell-args)))
+		;; Remove "-d" option from `ispell-args' if present
+		(if ispell-args-has-d
+		    (let ((ispell-args-after-d
+			   (cdr (cdr ispell-args-has-d)))
+			  (ispell-args-before-d
+			   (butlast ispell-args (length ispell-args-has-d))))
+		      (setq ispell-args
+			    (nconc ispell-args-before-d
+				   ispell-args-after-d))))
+		;; Unless default dict, re-add "-d" option with the mapped value
+		(if dict-name 
+		    (nconc ispell-args
+			   (ispell-hunspell-dictionary-option dict-name)))
+		(add-to-list 'tmp-dicts-alist
+			     (list
+			      dict-name      ; dict name
+			      (nth 1 adict)  ; casechars
+			      (nth 2 adict)  ; not-casechars
+			      (nth 3 adict)  ; otherchars
+			      (nth 4 adict)  ; many-otherchars-p
+			      ispell-args    ; ispell-args
+			      (nth 6 adict)  ; extended-character-mode
+			      (nth 7 adict)  ; dict encoding
+			      )))
+	      (setq ispell-dictionary-base-alist tmp-dicts-alist))))
+
       (run-hooks 'ispell-initialize-spellchecker-hook)
 
       ;; Add dicts to ``ispell-dictionary-alist'' unless already present.