Add a Catalan language environment

* international/mule-cmds.el (locale-language-names): Map locale
  language name `ca' to language environment `Catalan'.

* language/european.el: Add definition of language environment for
  the Catalan language.

* leim/quail/latin-pre.el: Add quail rule to the `catalan-prefix'
  input method to support input of middle dot characters through
  composition (bug#18279).

diff --git a/etc/NEWS b/etc/NEWS
index 9695a55c4f872a09ea680eae535515c72d3ec99f..d963dee2c6368bc6786a8cd8343ea5a020884c95 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -53,6 +53,10 @@ has been added.  They are: `file-attribute-type',
 `file-attribute-modes', `file-attribute-inode-number', and
 `file-attribute-device-number'
 
+---
+** The locale language name `ca' is now mapped to the language
+environment `Catalan', which has been added.
+
 ---
 ** `align-regexp' has a separate history for its interactive argument
 `align-regexp' no longer shares its history with all other

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index dc9699099e872f74cec7c921a5b81805a3600264..5501fa1afc4e0108ae1fcc58b257d16eea296830 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2235,7 +2235,7 @@ See `set-language-info-alist' for use in programs."
     ("br" . "Latin-1") ; Breton
     ("bs" . "Latin-2") ; Bosnian
     ("byn" . "UTF-8")  ; Bilin; Blin
-    ("ca" . "Latin-1") ; Catalan
+    ("ca" "Catalan" iso-8859-1) ; Catalan
     ; co Corsican
     ("cs" "Czech" iso-8859-2)
     ("cy" "Welsh" iso-8859-14)

diff --git a/lisp/language/european.el b/lisp/language/european.el
index a939719ec426614b19e480e3c7a4d921956202eb..11c5e03c97f779c019558159a73034ff71b3a0b2 100644 (file)
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -614,6 +614,28 @@ method and applying Turkish case rules for the characters i, I, ı, İ.")))
            (documentation . "Support for Brazilian Portuguese."))
  '("European"))
 
+(set-language-info-alist
+ "Catalan" '((charset iso-8859-1)
+            (coding-system iso-8859-1 iso-8859-15)
+            (coding-priority iso-8859-1)
+            (input-method . "catalan-prefix")
+            (nonascii-translation . iso-8859-1)
+            (unibyte-display . iso-8859-1)
+            (setup-function
+             . (lambda ()
+                 (modify-syntax-entry ?· "w" (standard-syntax-table))))
+            (exit-function
+             . (lambda ()
+                 (modify-syntax-entry ?· "_" (standard-syntax-table))))
+            (sample-text . "\
+Catalan (Català)  Avui demà i ahir s'esfullarà una rosa.")
+            (documentation . "\
+This language environment uses the ISO-8859-1 character set,
+sets the default input method to \"catalan-prefix\", and sets
+the syntax of the middle dot character `·' to word."))
+  '("European"))
+
+
 \f
 (define-coding-system 'mac-roman
   "Mac Roman Encoding (MIME:MACINTOSH)."

diff --git a/lisp/leim/quail/latin-pre.el b/lisp/leim/quail/latin-pre.el
index 078f9f99fabe4f9d76c8d3a3886ecdf577236b66..138a97ac28a9bc03dae4c3d815bd63fa100c26cc 100644 (file)
--- a/lisp/leim/quail/latin-pre.el
+++ b/lisp/leim/quail/latin-pre.el
@@ -188,6 +188,7 @@
   diaeresis  |   \"    | \"i -> ï   \"\" -> ¨
     tilde    |   ~    | ~n -> ñ
    cedilla   |   ~    | ~c -> ç
+  middle dot |   ~    | ~. -> ·
    symbol    |   ~    | ~> -> »   ~< -> «   ~! -> ¡   ~? -> ¿
 " nil t nil nil nil nil nil nil nil nil t)
 
@@ -223,6 +224,7 @@
  ("~<" ?\«)
  ("~!" ?¡)
  ("~?" ?¿)
+ ("~." ?·)
  ("~ " ?~)
 )