[Emacs-diffs] master 6e70769 1/2: Add a Catalan language environment

[Lars Ingebrigtsen]

branch: master
commit 6e70769e311e5614ceeb2e66483b33af4ad432c6
Author: Ernest Adrogué <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    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).
---
 etc/NEWS                        |    4 ++++
 lisp/international/mule-cmds.el |    2 +-
 lisp/language/european.el       |   22 ++++++++++++++++++++++
 lisp/leim/quail/latin-pre.el    |    2 ++
 4 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 9695a55..d963dee 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -54,6 +54,10 @@ has been added.  They are: `file-attribute-type',
 `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
 history-less functions that use `read-string'
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index dc96990..5501fa1 100644
--- 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 a939719..11c5e03 100644
--- 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"))
+
+
 
 (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 078f9f9..138a97a 100644
--- 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 @@
  ("~<" ?\«)
  ("~!" ?¡)
  ("~?" ?¿)
+ ("~." ?·)
  ("~ " ?~)
 )