annotate admin/unidata/Makefile.in @ 111851:dd83cbcddf69

Adjust parameter names and doc strings to resolve confusion over whether "bookmark" meant a bookmark name or a bookmark record. Along the way, shorten one function's name for similar reasons. (Issue #7548) * lisp/bookmark.el (bookmark-name-from-record): New name for `bookmark-name-from-full-record'. All callers changed. (bookmark-get-bookmark, bookmark-get-bookmark-record, bookmark-default-annotation-text, bookmark-prop-get, bookmark-prop-set, bookmark-get-annotation, bookmark-set-annotation, bookmark-get-filename, bookmark-set-filename, bookmark-get-position, bookmark-set-position, bookmark-get-front-context-string, bookmark-set-front-context-string, bookmark-get-rear-context-string, bookmark-set-rear-context-string, bookmark-get-handler, bookmark-edit-annotation, bookmark--jump-via, bookmark-handle-bookmark, bookmark-location, bookmark-show-annotation): Rename `bookmark' parameter to `bookmark-name-or-record', to clearly show its role, and shorten or adjust doc strings accordingly. (bookmark-set-name): Same, and pass the parameter directly to `bookmark-get-bookmark' instead of redundantly doing the callee's work. (bookmark-default-annotation-text, bookmark-send-edited-annotation, bookmark-relocate, bookmark-insert-location, bookmark-insert, bookmark-delete): Rename `bookmark' parameter to `bookmark-name', and in some cases shorten doc string accordingly. (bookmark-rename): Change `old' and `new' parameters to `old-name' and `new-name', and adjust an internal variable to avoid confusion. (bookmark-jump, bookmark-jump-noselect): Clarify `bookmark' parameter in doc string.
author Karl Fogel <kfogel@red-bean.com>
date Wed, 08 Dec 2010 03:09:27 -0500
parents ce960720ed3f
children 417b1e4d63cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
91461
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
1 # Makefile -- Makefile to generate character property tables.
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100971
diff changeset
2 # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
91461
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
3 # National Institute of Advanced Industrial Science and Technology (AIST)
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
4 # Registration Number H13PRO009
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
5 #
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
6 # This file is part of GNU Emacs.
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
7
94829
aeac1d771ae4 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 91873
diff changeset
8 # GNU Emacs is free software: you can redistribute it and/or modify
91461
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
9 # it under the terms of the GNU General Public License as published by
94829
aeac1d771ae4 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 91873
diff changeset
10 # the Free Software Foundation, either version 3 of the License, or
aeac1d771ae4 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 91873
diff changeset
11 # (at your option) any later version.
91461
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
12
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
13 # GNU Emacs is distributed in the hope that it will be useful,
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
16 # GNU General Public License for more details.
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
17
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
18 # You should have received a copy of the GNU General Public License
94829
aeac1d771ae4 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 91873
diff changeset
19 # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
aeac1d771ae4 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 91873
diff changeset
20
91461
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
21
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
22 EMACS = ../../src/emacs
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
23 DSTDIR = ../../lisp/international
109956
ce960720ed3f Make obsolete --unibyte argument do nothing (Bug#6886).
Chong Yidong <cyd@stupidchicken.com>
parents: 108983
diff changeset
24 RUNEMACS = ${EMACS} -Q -batch
91461
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
25
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
26 all: ${DSTDIR}/charprop.el ../../src/biditype.h ../../src/bidimirror.h
91461
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
27
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
28 .el.elc:
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
29 ${RUNEMACS} -batch -f batch-byte-compile $<
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
30
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
31 unidata.txt: UnicodeData.txt
91873
008f96c5e9bc (unidata.txt): Don't use $<, it's non-portable in this context.
Eli Zaretskii <eliz@gnu.org>
parents: 91539
diff changeset
32 sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < UnicodeData.txt > $@
91461
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
33
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
34 ${DSTDIR}/charprop.el: unidata-gen.elc unidata.txt
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
35 ELC=`/bin/pwd`/unidata-gen.elc; \
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
36 DATA=`/bin/pwd`/unidata.txt; \
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
37 cd ${DSTDIR}; \
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
38 ${RUNEMACS} -batch --load $${ELC} -f unidata-gen-files $${DATA}
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
39
108982
99288c087e4b Derive bidi type table from UnicodeData.txt.
Eli Zaretskii <eliz@gnu.org>
parents: 106815
diff changeset
40 ../../src/biditype.h: UnicodeData.txt
99288c087e4b Derive bidi type table from UnicodeData.txt.
Eli Zaretskii <eliz@gnu.org>
parents: 106815
diff changeset
41 gawk -F";" -f biditype.awk $< > $@
99288c087e4b Derive bidi type table from UnicodeData.txt.
Eli Zaretskii <eliz@gnu.org>
parents: 106815
diff changeset
42
108983
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
43 ../../src/bidimirror.h: BidiMirroring.txt
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
44 gawk -F"[; ]+" -f bidimirror.awk $< > $@
7e588bac2220 Use BidiMirroring.txt for mirroring characters in bidi context.
Eli Zaretskii <eliz@gnu.org>
parents: 108982
diff changeset
45
91461
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
46 install: charprop.el
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
47 cp charprop.el ${DSTDIR}
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
48 cp `sed -n 's/^;; FILE: //p' < charprop.el` ${DSTDIR}
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
49
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
50 clean:
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
51 if test -f charprop.el; then \
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
52 rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
53 fi
27d290bd441c Renamed Makefile to Makefile.in.
Eli Zaretskii <eliz@gnu.org>
parents:
diff changeset
54 rm -f charprop.el unidata-gen.elc unidata.txt