[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Orgmode] [PATCH 01/16] Decode single byte sequence if decoding unicode
From: |
David Maus |
Subject: |
[Orgmode] [PATCH 01/16] Decode single byte sequence if decoding unicode failed. |
Date: |
Sun, 13 Feb 2011 13:01:03 +0100 |
From: Sebastian Rose <address@hidden>
* org-protocol.el (org-protocol-unhex-single-byte-sequence): New
function. Decode hex-encoded singly byte sequences.
(org-protocol-unhex-compound): Use new function if decoding sequence
as unicode character failed.
---
lisp/org-protocol.el | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index 1c501f3..33878a8 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -305,7 +305,7 @@ part."
(defun org-protocol-unhex-string(str)
"Unhex hexified unicode strings as returned from the JavaScript function
-encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'."
+encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ö'."
(setq str (or str ""))
(let ((tmp "")
(case-fold-search t))
@@ -321,7 +321,9 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'."
(defun org-protocol-unhex-compound (hex)
- "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `ü'."
+ "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `ö'.
+Note: this function also decodes single byte encodings like
+`%E1' (\"á\") if not followed by another `%[A-F0-9]{2}' group."
(let* ((bytes (remove "" (split-string hex "%")))
(ret "")
(eat 0)
@@ -353,12 +355,30 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut
`ü'."
(setq val (logxor val xor))
(setq sum (+ (lsh sum shift) val))
(if (> eat 0) (setq eat (- eat 1)))
- (when (= 0 eat)
+ (cond
+ ((= 0 eat) ;multi byte
(setq ret (concat ret (org-protocol-char-to-string sum)))
(setq sum 0))
+ ((not bytes) ; single byte(s)
+ (setq ret (org-protocol-unhex-single-byte-sequence hex))))
)) ;; end (while bytes
ret ))
+(defun org-protocol-unhex-single-byte-sequence(hex)
+ "Unhexify hex-encoded single byte character sequences."
+ (let ((bytes (remove "" (split-string hex "%")))
+ (ret ""))
+ (while bytes
+ (let* ((b (pop bytes))
+ (a (elt b 0))
+ (b (elt b 1))
+ (c1 (if (> a ?9) (+ 10 (- a ?A)) (- a ?0)))
+ (c2 (if (> b ?9) (+ 10 (- b ?A)) (- b ?0))))
+ (setq ret
+ (concat ret (char-to-string
+ (+ (lsh c1 4) c2))))))
+ ret))
+
(defun org-protocol-flatten-greedy (param-list &optional strip-path
replacement)
"Greedy handlers might receive a list like this from emacsclient:
'( (\"/dir/org-protocol:/greedy:/~/path1\" (23 . 12)) (\"/dir/param\")
--
1.7.2.3
- Re: [Orgmode] Improve percent escaping links in Org mode (pull request / OK to push), Bastien, 2011/02/12
- [Orgmode] [PATCH 01/16] Decode single byte sequence if decoding unicode failed.,
David Maus <=
- [Orgmode] [PATCH 02/16] New unicode aware percent encoding algorithm, David Maus, 2011/02/13
- [Orgmode] [PATCH 03/16] New format of percent escape table, David Maus, 2011/02/13
- [Orgmode] [PATCH 04/16] Fixup doc string, David Maus, 2011/02/13
- [Orgmode] [PATCH 05/16] New optional argument: Merge user table with default table, David Maus, 2011/02/13
- [Orgmode] [PATCH 06/16] Inline function to properly decode utf8 characters in Emacs 22, David Maus, 2011/02/13
- [Orgmode] [PATCH 08/16] Declare obsolete & alias to respective org-link-unescape-* functions, David Maus, 2011/02/13
- [Orgmode] [PATCH 09/16] Remove obsolete argument in call to org-link-unescape, David Maus, 2011/02/13
- [Orgmode] [PATCH 07/16] Unescape functions moved and renamed from org-protocol.el, David Maus, 2011/02/13
- [Orgmode] [PATCH 10/16] Use new percent escape character table format, David Maus, 2011/02/13
- [Orgmode] [PATCH 11/16] Add percent sign to list of escape chars, David Maus, 2011/02/13