Mercurial > emacs
annotate lisp/textmodes/po.el @ 100267:c851df8e004e
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-id.el (org-id-locations-file): Wrap file name with
`convert-standard-filename'.
(org-id-files): New variable.
(org-id-use-hash): New option.
(org-id-update-id-locations): Also search in all files current
listed in `org-id-files'. Convert the resulting alist to a hash
if the user customation says so.
(org-id-locations-save): Handle he case if `org-id-locations' is a
hash.
(org-id-locations-load): Convert the alist to a hash.
(org-id-add-location): Handle the hast case.
(kill-emacs-hook): Make sure id locations are saved when Emacs is
exited.
(org-id-hash-to-alist, org-id-alist-to-hash)
(org-id-paste-tracker): New functions.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-goto-calendar): Remove duplicate let
bindings of calendar variables.
* org-table.el (org-table-find-row-type): Renamed from
`org-find-row-type'.
(org-table-rewrite-old-row-references): Renamed from
`org-rewrite-old-row-references'.
(org-table-shift-refpart): Renamed from `org-shift-refpart'.
(org-table-cleanup-narrow-column-properties): Renamed from
`org-cleanup-narrow-column-properties'.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-find-row-type): New arguments DESC and CLINE,
for better error messages.
(org-table-get-descriptor-line): Supply the new arguments to
`org-find-row-type'.
(org-table-error-on-row-ref-crossing-hline): New option.
* org.el (org-target-link-regexp): Make buffer-local.
(org-move-subtree-down): Fix bug with trees at beginning of
buffer.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-faces.el (org-set-tag-faces): New function.
(org-tags-special-faces-re): New variable.
* org.el (org-font-lock-add-tag-faces, org-get-tag-face): New functions.
* org-faces.el (org-tag-faces): New option.
(org-tag): Mention `org-tag-faces' in the docstring.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-html-style-default): Implement new
quoting.
* org-jsinfo.el (org-infojs-template): Implement new quoting.
* org-w3m.el (w3m-minor-mode-hook): Also add the special copy
command to the `w3m-minor-mode-map'.
* org-archive.el (org-archive-to-archive-sibling): Protect
`this-command' to avoid appending kills during archiving.
* org-exp.el (org-export-with-priority): New variable.
(org-export-add-options-to-plist): Use `org-export-plist-vars'
instead of internal list of strings and properties.
(org-print-icalendar-entries): Retrieve the location property with
inheritance.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-with-todo-keywords): New option.
(org-export-plist-vars): Include also the keys for the #+OPTIONS
line.
(org-default-export-plist, org-export-add-options-to-plist)
(org-export-as-ascii, org-export-as-html): Use the new structure
of `org-export-plist-vars'.
* org.el (org-map-entries): Return all values.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-matcher-time): Recognize more special values.
* org-gnus.el (fboundp): Fix defvaralias for XEmacs.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-tags-exclude-from-inheritance): New option.
(org-tag-inherit-p, org-remove-uniherited-tags): Respect
`org-tags-exclude-from-inheritance'.
* org-agenda.el (org-agenda-show-inherited-tags): New option.
(org-format-agenda-item): Add inherited tags to the agenda line
string, and make sure that properties are kept when downcasing the
tags list.
(org-agenda-add-inherited-tags): New function.
(org-downcase-keep-props): New function.
* org.el (org-scan-tags): Mark inherited tags with a text
property.
(org-get-tags-at): Mark inherited tags with a text property.
(org-add-prop-inherited): New function.
* org-agenda.el (org-agenda-add-inherited-tags): New function.
(org-agenda-show-inherited-tags): New option.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-modules): Add org-w3m to the default modules.
* org-table.el (orgtbl-self-insert-command): Make S-SPC work in
orgtbl-mode.
(orgtabl-create-or-convert-from-region): New command.
* org-exp.el (org-export-as-ascii): Remove the handling of
targets.
(org-export-ascii-preprocess): Handle targets already in this
function.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-timer.el (org-timer-start-time): Define this variable.
(org-timer-item): Make argument optional.
* org-list.el (org-insert-item): Automatically insert a timer item
if the current list is a timer list.
* org-timer.el: New file.
* org-publish.el (org-publish-org-index): Only exclude the index
file in the main directory from being added to the site-map.
(org-publish-get-project-from-filename): If the current project is
a component, start publishing from the parent project.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (orgtbl-ret): Fix RET at beginning-of-buffer.
* org-publish.el (org-publish-org-index): Improve removal of
temporary buffers.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 07 Dec 2008 18:36:02 +0000 |
parents | f4a69fedbd46 |
children | a9dc0e7c3f2b |
rev | line source |
---|---|
43926 | 1 ;;; po.el --- basic support of PO translation files -*- coding: latin-1; -*- |
2 | |
64751
5b1a238fcbb4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
3 ;; Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, |
79719 | 4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
43926 | 5 |
6 ;; Authors: François Pinard <pinard@iro.umontreal.ca>, | |
7 ;; Greg McGary <gkm@magilla.cichlid.com>, | |
8 ;; Bruno Haible <bruno@clisp.org>. | |
9 ;; Keywords: i18n, files | |
10 | |
11 ;; This file is part of GNU Emacs. | |
12 | |
94670
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; GNU Emacs is free software: you can redistribute it and/or modify |
43926 | 14 ;; it under the terms of the GNU General Public License as published by |
94670
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
15 ;; the Free Software Foundation, either version 3 of the License, or |
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
16 ;; (at your option) any later version. |
43926 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
94670
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
43926 | 25 |
26 ;;; Commentary: | |
27 | |
28 ;; This package makes sure visiting PO files decodes them correctly, | |
29 ;; according to the Charset= header in the PO file. For more support | |
30 ;; for editing PO files, see po-mode.el. | |
31 | |
32 ;;; Code: | |
33 | |
34 (defconst po-content-type-charset-alist | |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
35 '(("ASCII" . undecided) |
43958
2479ec7d435b
(po-content-type-charset-alist): Convert the
Eli Zaretskii <eliz@gnu.org>
parents:
43954
diff
changeset
|
36 ("ANSI_X3.4-1968" . undecided) |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
37 ("US-ASCII" . undecided)) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
38 "Alist of coding system versus GNU libc/libiconv canonical charset name. |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
39 Contains canonical charset names that don't correspond to coding systems.") |
43926 | 40 |
41 (defun po-find-charset (filename) | |
70944
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
42 "Return PO charset value for FILENAME. |
72053 | 43 If FILENAME is a cons cell, its CDR is a buffer that already contains |
70944
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
44 the PO file (but not yet decoded)." |
43926 | 45 (let ((charset-regexp |
51890
9b78d0da1a28
(po-find-charset): White space at the start of the Content-Type field body is
Juanma Barranquero <lekktu@gmail.com>
parents:
48092
diff
changeset
|
46 "^\"Content-Type:[ \t]*text/plain;[ \t]*charset=\\(.*\\)\\\\n\"") |
70944
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
47 (buf (and (consp filename) (cdr filename))) |
43926 | 48 (short-read nil)) |
70944
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
49 (when buf |
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
50 (set-buffer buf) |
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
51 (goto-char (point-min))) |
43926 | 52 ;; Try the first 4096 bytes. In case we cannot find the charset value |
53 ;; within the first 4096 bytes (the PO file might start with a long | |
54 ;; comment) try the next 4096 bytes repeatedly until we'll know for sure | |
55 ;; we've checked the empty header entry entirely. | |
70944
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
56 (while (not (or short-read (re-search-forward "^msgid" nil t) buf)) |
43926 | 57 (save-excursion |
58 (goto-char (point-max)) | |
59 (let ((pair (insert-file-contents-literally filename nil | |
60 (1- (point)) | |
61 (1- (+ (point) 4096))))) | |
62 (setq short-read (< (nth 1 pair) 4096))))) | |
43952
bd36495e6ade
(po-find-charset): Search for Charset= header even if we've read less than
Eli Zaretskii <eliz@gnu.org>
parents:
43937
diff
changeset
|
63 (cond ((re-search-forward charset-regexp nil t) (match-string 1)) |
70944
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
64 ((or short-read buf) nil) |
43926 | 65 ;; We've found the first msgid; maybe, only a part of the msgstr |
66 ;; value was loaded. Load the next 1024 bytes; if charset still | |
67 ;; isn't available, give up. | |
68 (t (save-excursion | |
69 (goto-char (point-max)) | |
70 (insert-file-contents-literally filename nil | |
71 (1- (point)) | |
72 (1- (+ (point) 1024)))) | |
73 (if (re-search-forward charset-regexp nil t) | |
74 (match-string 1)))))) | |
75 | |
76 (defun po-find-file-coding-system-guts (operation filename) | |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
77 "Return a (DECODING . ENCODING) pair for OPERATION on PO file FILENAME. |
70944
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
78 Do so according to FILENAME's declared charset. |
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
79 FILENAME may be a cons (NAME . BUFFER). In that case, detect charset |
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
80 in BUFFER." |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
81 (and |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
82 (eq operation 'insert-file-contents) |
70944
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
83 (or (if (consp filename) (buffer-live-p (cdr filename))) |
2e73c646b9df
(po-find-charset): Pay attention to the case
Kenichi Handa <handa@m17n.org>
parents:
68648
diff
changeset
|
84 (file-exists-p filename)) |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
85 (with-temp-buffer |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
86 (let* ((coding-system-for-read 'no-conversion) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
87 (charset (or (po-find-charset filename) "ascii")) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
88 assoc) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
89 (list (cond |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
90 ((setq assoc |
62120
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
91 (assoc-string charset |
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
92 po-content-type-charset-alist |
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
93 t)) |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
94 (cdr assoc)) |
62120
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
95 ((or (setq assoc (assoc-string charset coding-system-alist t)) |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
96 (setq assoc |
62120
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
97 (assoc-string (subst-char-in-string ?_ ?- |
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
98 charset) |
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
99 coding-system-alist t))) |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
100 (intern (car assoc))) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
101 ;; In principle we should also check the `mime-charset' |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
102 ;; property of everything in the base coding system |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
103 ;; list, but there should always be a coding system |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
104 ;; corresponding to the MIME name. |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
105 ((featurep 'code-pages) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
106 ;; Give up. |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
107 'raw-text) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
108 (t |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
109 ;; Try again with code-pages loaded. Maybe it's best |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
110 ;; to require it initially? |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
111 (require 'code-pages nil t) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
112 (if (or |
62120
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
113 (setq assoc (assoc-string charset coding-system-alist t)) |
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
114 (setq assoc (assoc-string (subst-char-in-string |
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
115 ?_ ?- charset) |
912c2cf79005
(po-find-file-coding-system-guts): Replace `assoc-ignore-case' by
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
116 coding-system-alist t))) |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
117 (intern (car assoc)) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
118 'raw-text)))))))) |
43926 | 119 |
120 ;;;###autoload | |
121 (defun po-find-file-coding-system (arg-list) | |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
122 "Return a (DECODING . ENCODING) pair, according to PO file's charset. |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
123 Called through `file-coding-system-alist', before the file is visited for real." |
43926 | 124 (po-find-file-coding-system-guts (car arg-list) (car (cdr arg-list)))) |
125 ;; This is for XEmacs. | |
126 ;(defun po-find-file-coding-system (operation filename) | |
127 ; "\ | |
128 ;Return a Mule (DECODING . ENCODING) pair, according to PO file charset. | |
129 ;Called through file-coding-system-alist, before the file is visited for real." | |
130 ; (po-find-file-coding-system-guts operation filename)) | |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
131 |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
132 (provide 'po) |
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
133 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79719
diff
changeset
|
134 ;; arch-tag: 56748a57-d64c-4200-8f6b-c3a70496eb8c |
48092
10d4bf044393
(po-content-type-charset-alist): Delete most
Dave Love <fx@gnu.org>
parents:
47655
diff
changeset
|
135 ;;; po.el ends here |