Now on revision 107808. ------------------------------------------------------------ revno: 107808 fixes bug(s): http://debbugs.gnu.org/910 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-04-08 23:58:41 -0700 message: Look for leim-list.el files in fewer places at startup * lisp/startup.el (normal-top-level): Don't look for leim-list.el in places where it will not be found. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-04-07 19:51:51 +0000 +++ etc/NEWS 2012-04-09 06:58:41 +0000 @@ -24,6 +24,11 @@ * Installation Changes in Emacs 24.2 * Startup Changes in Emacs 24.2 + +** Emacs no longer searches for `leim-list.el' files beneath the standard +lisp/ directory. There should not be any there anyway. If you have +been adding them there, put them somewhere else, eg site-lisp. + * Changes in Emacs 24.2 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-09 00:58:00 +0000 +++ lisp/ChangeLog 2012-04-09 06:58:41 +0000 @@ -1,5 +1,8 @@ 2012-04-09 Glenn Morris + * startup.el (normal-top-level): Don't look for leim-list.el + in places where it will not be found. (Bug#910) + * international/mule-cmds.el (set-default-coding-systems): * files.el (normal-mode): Remove guarded calls to ucs-set-table-for-input. (Bug#9821) === modified file 'lisp/startup.el' --- lisp/startup.el 2012-03-27 06:45:12 +0000 +++ lisp/startup.el 2012-04-09 06:58:41 +0000 @@ -490,13 +490,20 @@ ;; of that dir into load-path, ;; Look for a leim-list.el file too. Loading it will register ;; available input methods. - (let ((tail load-path) dir) + (let ((tail load-path) + (lispdir (expand-file-name "../lisp" data-directory)) + ;; For out-of-tree builds, leim-list is generated in the build dir. +;;; (leimdir (expand-file-name "../leim" doc-directory)) + dir) (while tail (setq dir (car tail)) (let ((default-directory dir)) (load (expand-file-name "subdirs.el") t t t)) - (let ((default-directory dir)) - (load (expand-file-name "leim-list.el") t t t)) + ;; Do not scan standard directories that won't contain a leim-list.el. + ;; http://lists.gnu.org/archive/html/emacs-devel/2009-10/msg00502.html + (or (string-match (concat "\\`" lispdir) dir) + (let ((default-directory dir)) + (load (expand-file-name "leim-list.el") t t t))) ;; We don't use a dolist loop and we put this "setq-cdr" command at ;; the end, because the subdirs.el files may add elements to the end ;; of load-path and we want to take it into account. ------------------------------------------------------------ revno: 107807 committer: Paul Eggert branch nick: trunk timestamp: Sun 2012-04-08 23:52:40 -0700 message: composite.c: use 'double' consistently * composite.c (get_composition_id): Use 'double' consistently instead of converting 'float' to 'double' and vice versa; this is easier to understand and avoids a GCC warning. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-09 06:47:33 +0000 +++ src/ChangeLog 2012-04-09 06:52:40 +0000 @@ -1,3 +1,10 @@ +2012-04-09 Paul Eggert + + composite.c: use 'double' consistently + * composite.c (get_composition_id): Use 'double' consistently + instead of converting 'float' to 'double' and vice versa; this is + easier to understand and avoids a GCC warning. + 2012-04-09 Glenn Morris * Makefile.in: Generate leim-list with bootstrap-emacs, in === modified file 'src/composite.c' --- src/composite.c 2012-01-19 07:21:25 +0000 +++ src/composite.c 2012-04-09 06:52:40 +0000 @@ -355,7 +355,7 @@ else { /* Rule-base composition. */ - float leftmost = 0.0, rightmost; + double leftmost = 0.0, rightmost; ch = XINT (key_contents[0]); rightmost = ch != '\t' ? CHAR_WIDTH (ch) : 1; @@ -364,7 +364,7 @@ { int rule, gref, nref; int this_width; - float this_left; + double this_left; rule = XINT (key_contents[i]); ch = XINT (key_contents[i + 1]); ------------------------------------------------------------ revno: 107806 fixes bug(s): http://debbugs.gnu.org/4789 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-04-08 23:47:33 -0700 message: Generate leim-list with bootstrap-emacs, in prep for dumping it with emacs * src/Makefile.in: (leimdir): New variable. ($(leimdir)/leim-list.el): New rule. (emacs$(EXEEXT)): Depend on leim-list.el. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-09 00:58:00 +0000 +++ src/ChangeLog 2012-04-09 06:47:33 +0000 @@ -1,5 +1,11 @@ 2012-04-09 Glenn Morris + * Makefile.in: Generate leim-list with bootstrap-emacs, in + preparation for dumping it with emacs. (Bug#4789) + (leimdir): New variable. + ($(leimdir)/leim-list.el): New rule. + (emacs$(EXEEXT)): Depend on leim-list.el. + * buffer.c (Qucs_set_table_for_input): Remove. (Bug#9821) (Fget_buffer_create): Don't call Qucs_set_table_for_input. (init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input. === modified file 'src/Makefile.in' --- src/Makefile.in 2012-01-19 07:21:25 +0000 +++ src/Makefile.in 2012-04-09 06:47:33 +0000 @@ -49,6 +49,7 @@ lib = ../lib libsrc = ../lib-src etc = ../etc +leimdir = ../leim oldXMenudir = ../oldXMenu lwlibdir = ../lwlib lispdir = ../lisp @@ -393,13 +394,16 @@ all: emacs$(EXEEXT) $(OTHER_FILES) +$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) + cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el BUILT_EMACS=$(bootstrap_exe) + ## Does anyone ever pay attention to the load-path-shadows output here? ## The dumped Emacs is as functional and more efficient than ## bootstrap-emacs, so we replace the latter with the former. ## Strictly speaking, emacs does not depend directly on all of $lisp, ## since not all pieces are used on all platforms. But DOC depends ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. -emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) +emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) $(leimdir)/leim-list.el if test "$(CANNOT_DUMP)" = "yes"; then \ ln -f temacs$(EXEEXT) emacs$(EXEEXT); \ EMACSLOADPATH=$(lispsource) ./emacs -batch \ ------------------------------------------------------------ revno: 107805 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-04-08 23:40:20 -0700 message: Small changes for top-level Makefile * Makefile.in (leim): Check cd return value. Pass fewer variables. (install-leim): Check cd return value. Pass $MFLAGS. (install-strip): Pass $MFLAGS. diff: === modified file 'ChangeLog' --- ChangeLog 2012-04-09 00:50:17 +0000 +++ ChangeLog 2012-04-09 06:40:20 +0000 @@ -1,5 +1,9 @@ 2012-04-09 Glenn Morris + * Makefile.in (leim): Check cd return value. Pass fewer variables. + (install-leim): Check cd return value. Pass $MFLAGS. + (install-strip): Pass $MFLAGS. + * configure.in: Require makeinfo >= 4.7. (Bug#10910) Eg org.texi has been using 4.7 functions for some time. === modified file 'Makefile.in' --- Makefile.in 2012-02-04 22:27:28 +0000 +++ Makefile.in 2012-04-09 06:40:20 +0000 @@ -2,7 +2,7 @@ # DIST: make most of the changes to this file you might want, so try # DIST: that first. -# Copyright (C) 1992-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -309,9 +309,7 @@ # running more than 1 process in the leim directory, especially for # the $TIT files there. leim: src Makefile FRC - (export PARALLEL; PARALLEL=0; cd $@; $(MAKE) all $(MFLAGS) \ - CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' MAKE='${MAKE}') + cd leim && PARALLEL=0 $(MAKE) all $(MFLAGS) lib-src src: lib @@ -670,11 +668,11 @@ ### `install-arch-indep'. People who extracted LEIM files after they ### installed Emacs itself can install only LEIM files by this target. install-leim: leim/Makefile mkdir - cd leim; $(MAKE) install + cd leim && $(MAKE) $(MFLAGS) install ### Build Emacs and install it, stripping binaries while installing them. install-strip: - $(MAKE) INSTALL_STRIP=-s install + $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install ### Build all the directories we're going to install Emacs in. Since ### we may be creating several layers of directories (for example, ------------------------------------------------------------ revno: 107804 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-04-08 23:34:21 -0700 message: Make leim/Makefile compute the list of .el files like lisp/Makefile * leim/Makefile.in: (TIT_GB, TIT_BIG5, CHINESE_TIT, MISC, TIT_MISC): Make them store the .el files rather than the .elc files. (NON_TIT_GB, NON_TIT_BIG5, CHINESE_NON_TIT, CHINESE_GB) (CHINESE_GB, CHINESE_BIG5, JAPANESE, KOREAN, THAI, VIETNAMESE) (LAO, INDIAN, TIBETAN, LATIN, UNICODE, SLAVIC, GREEK, RUSSIAN) (OTHERS, CHINESE, EASTASIA, ASIA, EUROPEAN, WORLD, NON_TIT_MISC): Remove variables listing the non-generated .el files. (.el.elc): Add explicit load-path for quail. (all): Depend on compile-main rule rather than $WORLD. (changed.tit, changed.misc): Also depend on $SUBDIRS. (leim-list.el): Don't depend on changed.tit or changed.misc. Remove unnecessary compilation check. (setwins, compile-targets, compile-main): New. (clean, mostlyclean): Update for change in TIT_MISC contents. (bootstrap-clean): Use a glob match to delete .elc, not a fixed list. diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2012-04-09 02:53:51 +0000 +++ leim/ChangeLog 2012-04-09 06:34:21 +0000 @@ -1,3 +1,23 @@ +2012-04-09 Glenn Morris + + * Makefile.in: Compute the list of .el files to be compiled dynamically, + as the lisp/ directory does, rather than hard-coding it. + (TIT_GB, TIT_BIG5, CHINESE_TIT, MISC, TIT_MISC): + Make them store the .el files rather than the .elc files. + (NON_TIT_GB, NON_TIT_BIG5, CHINESE_NON_TIT, CHINESE_GB) + (CHINESE_GB, CHINESE_BIG5, JAPANESE, KOREAN, THAI, VIETNAMESE) + (LAO, INDIAN, TIBETAN, LATIN, UNICODE, SLAVIC, GREEK, RUSSIAN) + (OTHERS, CHINESE, EASTASIA, ASIA, EUROPEAN, WORLD, NON_TIT_MISC): + Remove variables listing the non-generated .el files. + (.el.elc): Add explicit load-path for quail. + (all): Depend on compile-main rule rather than $WORLD. + (changed.tit, changed.misc): Also depend on $SUBDIRS. + (leim-list.el): Don't depend on changed.tit or changed.misc. + Remove unnecessary compilation check. + (setwins, compile-targets, compile-main): New. + (clean, mostlyclean): Update for change in TIT_MISC contents. + (bootstrap-clean): Use a glob match to delete .elc, not a fixed list. + 2012-04-09 Stefan Monnier * quail/latin-ltx.el: Auto-generate some of the entries. === modified file 'leim/Makefile.in' --- leim/Makefile.in 2012-01-19 07:21:25 +0000 +++ leim/Makefile.in 2012-04-09 06:34:21 +0000 @@ -1,6 +1,6 @@ # Makefile for leim subdirectory in GNU Emacs. -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2012 Free Software Foundation, Inc. # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, # 2006, 2007, 2008, 2009, 2010, 2011 # National Institute of Advanced Industrial Science and Technology (AIST) @@ -55,110 +55,48 @@ # Files generated from TIT dictionaries for Chinese GB character set. TIT_GB=\ - quail/CCDOSPY.elc \ - quail/Punct.elc \ - quail/QJ.elc \ - quail/SW.elc \ - quail/TONEPY.elc + quail/CCDOSPY.el \ + quail/Punct.el \ + quail/QJ.el \ + quail/SW.el \ + quail/TONEPY.el # Files generated from TIT dictionaries for Chinese BIG5 character set. TIT_BIG5=\ - quail/4Corner.elc \ - quail/ARRAY30.elc \ - quail/ECDICT.elc \ - quail/ETZY.elc \ - quail/Punct-b5.elc \ - quail/PY-b5.elc \ - quail/QJ-b5.elc \ - quail/ZOZY.elc + quail/4Corner.el \ + quail/ARRAY30.el \ + quail/ECDICT.el \ + quail/ETZY.el \ + quail/Punct-b5.el \ + quail/PY-b5.el \ + quail/QJ-b5.el \ + quail/ZOZY.el CHINESE_TIT=${TIT_GB} ${TIT_BIG5} -NON_TIT_GB=${srcdir}/quail/py-punct.elc - -NON_TIT_BIG5=${srcdir}/quail/pypunct-b5.elc - -CHINESE_NON_TIT=${NON_TIT_GB} ${NON_TIT_BIG5} - -CHINESE_GB=${TIT_GB} ${NON_TIT_GB} - -CHINESE_BIG5=${TIT_BIG5} ${NON_TIT_BIG5} - -JAPANESE=${srcdir}/quail/japanese.elc ${srcdir}/ja-dic/ja-dic.elc - -KOREAN= ${srcdir}/quail/hangul.elc \ - ${srcdir}/quail/hanja.elc \ - ${srcdir}/quail/hanja3.elc \ - ${srcdir}/quail/hanja-jis.elc \ - ${srcdir}/quail/symbol-ksc.elc - -THAI=${srcdir}/quail/thai.elc - -VIETNAMESE=${srcdir}/quail/viqr.elc ${srcdir}/quail/vntelex.elc - -LAO=${srcdir}/quail/lao.elc ${srcdir}/quail/lrt.elc - -INDIAN=${srcdir}/quail/indian.elc - -TIBETAN=${srcdir}/quail/tibetan.elc - -LATIN= ${srcdir}/quail/latin-pre.elc \ - ${srcdir}/quail/latin-post.elc \ - ${srcdir}/quail/latin-alt.elc \ - ${srcdir}/quail/latin-ltx.elc \ - ${srcdir}/quail/welsh.elc - -UNICODE=${srcdir}/quail/sgml-input.elc ${srcdir}/quail/rfc1345.elc \ - ${srcdir}/quail/uni-input.elc - -SLAVIC= \ - ${srcdir}/quail/czech.elc \ - ${srcdir}/quail/croatian.elc \ - ${srcdir}/quail/slovak.elc - -GREEK=${srcdir}/quail/greek.elc - -RUSSIAN=${srcdir}/quail/cyrillic.elc ${srcdir}/quail/cyril-jis.elc - -OTHERS= \ - ${srcdir}/quail/arabic.elc \ - ${srcdir}/quail/ethiopic.elc \ - ${srcdir}/quail/ipa.elc \ - ${srcdir}/quail/ipa-praat.elc \ - ${srcdir}/quail/hebrew.elc \ - ${srcdir}/quail/georgian.elc \ - $(srcdir)/quail/persian.elc \ - ${srcdir}/quail/sisheng.elc - MISC= \ - quail/tsang-b5.elc \ - quail/quick-b5.elc \ - quail/tsang-cns.elc \ - quail/quick-cns.elc \ - quail/PY.elc \ - quail/ZIRANMA.elc \ - quail/CTLau.elc \ - quail/CTLau-b5.elc - -CHINESE=${CHINESE_GB} ${CHINESE_BIG5} -EASTASIA=${CHINESE} ${JAPANESE} ${KOREAN} -ASIA=${EASTASIA} ${THAI} ${VIETNAMESE} ${LAO} ${INDIAN} ${TIBETAN} -EUROPEAN=${LATIN} ${SLAVIC} ${GREEK} ${RUSSIAN} -WORLD=${ASIA} ${EUROPEAN} ${OTHERS} ${MISC} ${UNICODE} - + quail/tsang-b5.el \ + quail/quick-b5.el \ + quail/tsang-cns.el \ + quail/quick-cns.el \ + quail/PY.el \ + quail/ZIRANMA.el \ + quail/CTLau.el \ + quail/CTLau-b5.el + +## The generated .el files. TIT_MISC=${CHINESE_TIT} ${MISC} -NON_TIT_MISC=${CHINESE_NON_TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${OTHERS} .SUFFIXES: .elc .el .el.elc: @echo Compiling $< - @${RUN_EMACS} -f batch-byte-compile $< + @${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $< -all: ${BUILT_EMACS} ${SUBDIRS} leim-list.el ${WORLD} +all: ${BUILT_EMACS} ${SUBDIRS} leim-list.el compile-main # To ensure that we can run Emacs. This target is ignored (never -# being hit) if a user changes default value of EMACS. +# being hit) if a user changes default value of BUILT_EMACS. ../src/emacs: cd ../src; ${MAKE} ${MFLAGS} emacs @@ -181,10 +119,12 @@ ${srcdir}/CXTERM-DIC/TONEPY.tit \ ${srcdir}/CXTERM-DIC/ZOZY.tit -${CHINESE_TIT:.elc=.el}: changed.tit +${CHINESE_TIT}: changed.tit @true -changed.tit: ${TIT_SOURCES} +## FIXME remove subdirs if poss - time-stamping. +## Emacs should make the directory if it does not exist. +changed.tit: ${SUBDIRS} ${TIT_SOURCES} ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \ -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \ echo "changed" > $@ @@ -197,18 +137,16 @@ ${srcdir}/MISC-DIC/pinyin.map \ ${srcdir}/MISC-DIC/ziranma.cin -${MISC:.elc=.el}: changed.misc +${MISC}: changed.misc @true -changed.misc: ${MISC_SOURCES} +changed.misc: ${SUBDIRS} ${MISC_SOURCES} ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \ -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \ echo "changed" > $@ -leim-list.el: ${SUBDIRS} ${TIT_MISC} changed.tit changed.misc ${srcdir}/leim-ext.el +leim-list.el: ${SUBDIRS} ${TIT_MISC} ${srcdir}/leim-ext.el rm -f leim-list.el - ${RUN_EMACS} -l ${buildlisppath}/international/quail \ - -f batch-byte-compile-if-not-done ${TIT_MISC:.elc=.el} if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \ ${RUN_EMACS} -l ${buildlisppath}/international/quail \ --eval "(update-leim-list-file \".\")" ; \ @@ -218,6 +156,29 @@ fi sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@ +## Following adapted from lisp/Makefile.in. +setwins=wins="${srcdir}/ja-dic quail"; \ + [ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && \ + wins="$$wins ${srcdir}/quail" + +.PHONY: compile-targets +# TARGETS is set dynamically in the recursive call from `compile-main'. +compile-targets: $(TARGETS) + +# Compile all the Elisp files that need it. Beware: it approximates +# `no-byte-compile', so watch out for false-positives! +compile-main: ${TIT_MISC} + @($(setwins); \ + els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \ + for el in $$els; do \ + test -f $$el || continue; \ + test ! -f $${el}c && GREP_OPTIONS= grep '^;.*no-byte-compile: t' $$el > /dev/null && continue; \ + echo "$${el}c"; \ + done | xargs echo) | \ + while read chunk; do \ + $(MAKE) $(MFLAGS) compile-targets BUILT_EMACS="$(BUILT_EMACS)" TARGETS="$$chunk"; \ + done + MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done install: all @@ -266,16 +227,14 @@ else true ; fi clean mostlyclean: - rm -f ${TIT_MISC} ${TIT_MISC:.elc=.el} \ + rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \ leim-list.el changed.tit changed.misc # The following target is needed because the `clean' target only removes # TIT-generated files and doesn't touch compiled Quail packages. But # bootstrapping should not leave non-fresh .elc files behind. bootstrap-clean: clean - rm -f ${WORLD} -## FIXME some compiled files go to srcdir, some don't? -# cd ${srcdir}; rm -f *.elc */*.elc + $(setwins); for w in $$wins; do rm -f $$w/*.elc; done distclean: clean if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi ------------------------------------------------------------ revno: 107803 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2012-04-08 22:53:51 -0400 message: * leim/quail/latin-ltx.el: Auto-generate some of the entries. (latin-ltx--ascii-p): New function. (latin-ltx--define-rules): New macro. (define-rules): Use it. diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2012-03-25 18:17:46 +0000 +++ leim/ChangeLog 2012-04-09 02:53:51 +0000 @@ -1,3 +1,10 @@ +2012-04-09 Stefan Monnier + + * quail/latin-ltx.el: Auto-generate some of the entries. + (latin-ltx--ascii-p): New function. + (latin-ltx--define-rules): New macro. + (define-rules): Use it. + 2012-03-25 Eli Zaretskii * makefile.w32-in (install): Use $(DIRNAME)_same-dir.tst instead === modified file 'leim/quail/latin-ltx.el' --- leim/quail/latin-ltx.el 2012-01-19 07:21:25 +0000 +++ leim/quail/latin-ltx.el 2012-04-09 02:53:51 +0000 @@ -42,484 +42,264 @@ '(("\t" . quail-completion)) t t nil nil nil nil nil nil nil t) -(quail-define-rules +(eval-when-compile + (defun latin-ltx--ascii-p (char) + (and (characterp char) (< char 128))) + + (defmacro latin-ltx--define-rules (&rest rules) + (load "uni-name") + (let ((newrules ())) + (dolist (rule rules) + (pcase rule + (`(,_ ,(pred characterp)) (push rule newrules)) ;; Normal quail rule. + (`(,seq ,re) + (let ((count 0)) + (dolist (pair (ucs-names)) + (let ((name (car pair)) + (char (cdr pair))) + (when (and (characterp char) ;; Ignore char-ranges. + (string-match re name)) + (let ((keys (if (stringp seq) + (replace-match seq nil nil name) + (funcall seq name char)))) + (if (listp keys) + (dolist (x keys) + (setq count (1+ count)) + (push (list x char) newrules)) + (setq count (1+ count)) + (push (list keys char) newrules)))))) + (message "latin-ltx: %d mapping for %S" count re))))) + `(quail-define-rules ,@(nreverse (delete-dups newrules)))))) + +(latin-ltx--define-rules ("!`" ?¡) ("\\pounds" ?£) ;; ("{\\pounds}" ?£) ("\\S" ?§) ;; ("{\\S}" ?§) - ("\\\"{}" ?¨) - ("\\copyright" ?©) ;; ("{\\copyright}" ?©) ("$^a$" ?ª) - ("\\={}" ?¯) ("$\\pm$" ?±) ("\\pm" ?±) ("$^2$" ?²) ("$^3$" ?³) - ("\\'{}" ?´) ("\\P" ?¶) ;; ("{\\P}" ?¶) ;; Fixme: Yudit has the equivalent of ("\\cdot" ?⋅), for U+22C5, DOT ;; OPERATOR, whereas · is MIDDLE DOT. JadeTeX translates both to ;; \cdot. ("$\\cdot$" ?·) ("\\cdot" ?·) - ("\\c{}" ?¸) ("$^1$" ?¹) ("$^o$" ?º) ("?`" ?¿) - ("\\`{A}" ?À) ("\\`A" ?À) - ("\\'{A}" ?Á) ("\\'A" ?Á) - ("\\^{A}" ?Â) ("\\^A" ?Â) - ("\\~{A}" ?Ã) ("\\~A" ?Ã) - ("\\\"{A}" ?Ä) ("\\\"A" ?Ä) - ("\\\k{A}" ?Ą) + ("\\`" ?̀) + ("\\`{}" ?`) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\`{%s}" c) (format "\\`%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH GRAVE") + + ("\\'" ?́) + ("\\'{}" ?´) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\'{%s}" c) (format "\\'%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH ACUTE") + + ("\\^" ?̂) + ("\\^{}" ?^) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\^{%s}" c) (format "\\^%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH CIRCUMFLEX") + + ("\\~" ?̃) + ("\\~{}" ?˜) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\~{%s}" c) (format "\\~%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH TILDE") + + ("\\\"" ?̈) + ("\\\"{}" ?¨) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\\"{%s}" c) (format "\\\"%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DIAERESIS") + + ("\\k" ?̨) + ("\\k{}" ?˛) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\k{%s}" c) ;; (format "\\k%s" c) + ))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH OGONEK") + + ("\\c" ?̧) + ("\\c{}" ?¸) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\c{%s}" c) (format "\\c%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH CEDILLA") + ("\\AA" ?Å) ;; ("{\\AA}" ?Å) ("\\AE" ?Æ) ;; ("{\\AE}" ?Æ) - ("\\c{C}" ?Ç) ("\\cC" ?Ç) - ("\\`{E}" ?È) ("\\`E" ?È) - ("\\'{E}" ?É) ("\\'E" ?É) - ("\\^{E}" ?Ê) ("\\^E" ?Ê) - ("\\\"{E}" ?Ë) ("\\\"E" ?Ë) - ("\\\k{E}" ?Ę) - ("\\`{I}" ?Ì) ("\\`I" ?Ì) - ("\\'{I}" ?Í) ("\\'I" ?Í) - ("\\^{I}" ?Î) ("\\^I" ?Î) - ("\\\"{I}" ?Ï) ("\\\"I" ?Ï) - ("\\\k{I}" ?Į) - ("\\~{N}" ?Ñ) ("\\~N" ?Ñ) - ("\\`{O}" ?Ò) ("\\`O" ?Ò) - ("\\'{O}" ?Ó) ("\\'O" ?Ó) - ("\\^{O}" ?Ô) ("\\^O" ?Ô) - ("\\~{O}" ?Õ) ("\\~O" ?Õ) - ("\\\"{O}" ?Ö) ("\\\"O" ?Ö) - ("\\\k{O}" ?Ǫ) ("$\\times$" ?×) ("\\times" ?×) ("\\O" ?Ø) ;; ("{\\O}" ?Ø) - ("\\`{U}" ?Ù) ("\\`U" ?Ù) - ("\\'{U}" ?Ú) ("\\'U" ?Ú) - ("\\^{U}" ?Û) ("\\^U" ?Û) - ("\\\"{U}" ?Ü) ("\\\"U" ?Ü) - ("\\\k{U}" ?Ų) - ("\\'{Y}" ?Ý) ("\\'Y" ?Ý) ("\\ss" ?ß) ;; ("{\\ss}" ?ß) - ("\\`{a}" ?à) ("\\`a" ?à) - ("\\'{a}" ?á) ("\\'a" ?á) - ("\\^{a}" ?â) ("\\^a" ?â) - ("\\~{a}" ?ã) ("\\~a" ?ã) - ("\\\"{a}" ?ä) ("\\\"a" ?ä) - ("\\\k{a}" ?ą) ("\\aa" ?å) ;; ("{\\aa}" ?å) ("\\ae" ?æ) ;; ("{\\ae}" ?æ) - ("\\c{c}" ?ç) ("\\cc" ?ç) - ("\\`{e}" ?è) ("\\`e" ?è) - ("\\'{e}" ?é) ("\\'e" ?é) - ("\\^{e}" ?ê) ("\\^e" ?ê) - ("\\\"{e}" ?ë) ("\\\"e" ?ë) - ("\\\k{e}" ?ę) - ("\\`{\\i}" ?ì) ("\\`i" ?ì) - ("\\'{\\i}" ?í) ("\\'i" ?í) - ("\\^{\\i}" ?î) ("\\^i" ?î) - ("\\\"{\\i}" ?ï) ("\\\"i" ?ï) - ("\\\k{i}" ?į) - ("\\~{n}" ?ñ) ("\\~n" ?ñ) - ("\\`{o}" ?ò) ("\\`o" ?ò) - ("\\'{o}" ?ó) ("\\'o" ?ó) - ("\\^{o}" ?ô) ("\\^o" ?ô) - ("\\~{o}" ?õ) ("\\~o" ?õ) - ("\\\"{o}" ?ö) ("\\\"o" ?ö) - ("\\\k{o}" ?ǫ) ("$\\div$" ?÷) ("\\div" ?÷) ("\\o" ?ø) ;; ("{\\o}" ?ø) - ("\\`{u}" ?ù) ("\\`u" ?ù) - ("\\'{u}" ?ú) ("\\'u" ?ú) - ("\\^{u}" ?û) ("\\^u" ?û) - ("\\\"{u}" ?ü) ("\\\"u" ?ü) - ("\\\k{u}" ?ų) - ("\\'{y}" ?ý) ("\\'y" ?ý) - ("\\\"{y}" ?ÿ) ("\\\"y" ?ÿ) - - ("\\={A}" ?Ā) ("\\=A" ?Ā) - ("\\={a}" ?ā) ("\\=a" ?ā) - ("\\u{A}" ?Ă) ("\\uA" ?Ă) - ("\\u{a}" ?ă) ("\\ua" ?ă) - ("\\'{C}" ?Ć) ("\\'C" ?Ć) - ("\\'{c}" ?ć) ("\\'c" ?ć) - ("\\^{C}" ?Ĉ) ("\\^C" ?Ĉ) - ("\\^{c}" ?ĉ) ("\\^c" ?ĉ) - ("\\.{C}" ?Ċ) ("\\.C" ?Ċ) - ("\\.{c}" ?ċ) ("\\.c" ?ċ) - ("\\v{C}" ?Č) ("\\vC" ?Č) - ("\\v{c}" ?č) ("\\vc" ?č) - ("\\v{D}" ?Ď) ("\\vD" ?Ď) - ("\\v{d}" ?ď) ("\\vd" ?ď) - - ("\\={E}" ?Ē) ("\\=E" ?Ē) - ("\\={e}" ?ē) ("\\=e" ?ē) - ("\\u{E}" ?Ĕ) ("\\uE" ?Ĕ) - ("\\u{e}" ?ĕ) ("\\ue" ?ĕ) - ("\\.{E}" ?Ė) ("\\.E" ?Ė) - ("\\e{e}" ?ė) ("\\ee" ?ė) - ("\\v{E}" ?Ě) ("\\vE" ?Ě) - ("\\v{e}" ?ě) ("\\ve" ?ě) - ("\\^{G}" ?Ĝ) ("\\^G" ?Ĝ) - ("\\^{g}" ?ĝ) ("\\^g" ?ĝ) - ("\\u{G}" ?Ğ) ("\\uG" ?Ğ) - ("\\u{g}" ?ğ) ("\\ug" ?ğ) - - ("\\.{G}" ?Ġ) ("\\.G" ?Ġ) - ("\\.{g}" ?ġ) ("\\.g" ?ġ) - ("\\c{G}" ?Ģ) ("\\cG" ?Ģ) - ("\\c{g}" ?ģ) ("\\cg" ?ģ) - ("\\^{H}" ?Ĥ) ("\\^H" ?Ĥ) - ("\\^{h}" ?ĥ) ("\\^h" ?ĥ) - ("\\~{I}" ?Ĩ) ("\\~I" ?Ĩ) - ("\\~{\\i}" ?ĩ) ("\\~i" ?ĩ) - ("\\={I}" ?Ī) ("\\=I" ?Ī) - ("\\={\\i}" ?ī) ("\\=i" ?ī) - ("\\u{I}" ?Ĭ) ("\\uI" ?Ĭ) - ("\\u{\\i}" ?ĭ) ("\\ui" ?ĭ) - - ("\\.{I}" ?İ) ("\\.I" ?İ) + + ("\\=" ?̄) + ("\\={}" ?¯) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\={%s}" c) (format "\\=%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH MACRON") + + ("\\u" ?̆) + ("\\u{}" ?˘) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\u{%s}" c) (format "\\u%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH BREVE") + + ("\\." ?̇) + ("\\.{}" ?˙) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\.{%s}" c) (format "\\.%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DOT ABOVE") + + ("\\v" ?̌) + ("\\v{}" ?ˇ) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\v{%s}" c) (format "\\v%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH CARON") + + ("\\~{\\i}" ?ĩ) + ("\\={\\i}" ?ī) + ("\\u{\\i}" ?ĭ) + ("\\i" ?ı) ;; ("{\\i}" ?ı) - ("\\^{J}" ?Ĵ) ("\\^J" ?Ĵ) - ("\\^{\\j}" ?ĵ) ("\\^j" ?ĵ) - ("\\c{K}" ?Ķ) ("\\cK" ?Ķ) - ("\\c{k}" ?ķ) ("\\ck" ?ķ) - ("\\'{L}" ?Ĺ) ("\\'L" ?Ĺ) - ("\\'{l}" ?ĺ) ("\\'l" ?ĺ) - ("\\c{L}" ?Ļ) ("\\cL" ?Ļ) - ("\\c{l}" ?ļ) ("\\cl" ?ļ) + ("\\^{\\j}" ?ĵ) ("\\L" ?Ł) ;; ("{\\L}" ?Ł) ("\\l" ?ł) ;; ("{\\l}" ?ł) - ("\\'{N}" ?Ń) ("\\'N" ?Ń) - ("\\'{n}" ?ń) ("\\'n" ?ń) - ("\\c{N}" ?Ņ) ("\\cN" ?Ņ) - ("\\c{n}" ?ņ) ("\\cn" ?ņ) - ("\\v{N}" ?Ň) ("\\vN" ?Ň) - ("\\v{n}" ?ň) ("\\vn" ?ň) - ("\\={O}" ?Ō) ("\\=O" ?Ō) - ("\\={o}" ?ō) ("\\=o" ?ō) - ("\\u{O}" ?Ŏ) ("\\uO" ?Ŏ) - ("\\u{o}" ?ŏ) ("\\uo" ?ŏ) - ("\\H{O}" ?Ő) ("\\HO" ?Ő) - ("\\U{o}" ?ő) ("\\Uo" ?ő) + ("\\H" ?̋) + ("\\H{}" ?˝) + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\H{%s}" c) (format "\\H%s" c)))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DOUBLE ACUTE") + ("\\U{o}" ?ő) ("\\Uo" ?ő) ;; FIXME: Was it just a typo? + ("\\OE" ?Œ) ;; ("{\\OE}" ?Œ) ("\\oe" ?œ) ;; ("{\\oe}" ?œ) - ("\\'{R}" ?Ŕ) ("\\'R" ?Ŕ) - ("\\'{r}" ?ŕ) ("\\'r" ?ŕ) - ("\\c{R}" ?Ŗ) ("\\cR" ?Ŗ) - ("\\c{r}" ?ŗ) ("\\cr" ?ŗ) - ("\\v{R}" ?Ř) ("\\vR" ?Ř) - ("\\v{r}" ?ř) ("\\vr" ?ř) - ("\\'{S}" ?Ś) ("\\'S" ?Ś) - ("\\'{s}" ?ś) ("\\'s" ?ś) - ("\\^{S}" ?Ŝ) ("\\^S" ?Ŝ) - ("\\^{s}" ?ŝ) ("\\^s" ?ŝ) - ("\\c{S}" ?Ş) ("\\cS" ?Ş) - ("\\c{s}" ?ş) ("\\cs" ?ş) - - ("\\v{S}" ?Š) ("\\vS" ?Š) - ("\\v{s}" ?š) ("\\vs" ?š) - ("\\c{T}" ?Ţ) ("\\cT" ?Ţ) - ("\\c{t}" ?ţ) ("\\ct" ?ţ) - ("\\v{T}" ?Ť) ("\\vT" ?Ť) - ("\\v{t}" ?ť) ("\\vt" ?ť) - ("\\~{U}" ?Ũ) ("\\~U" ?Ũ) - ("\\~{u}" ?ũ) ("\\~u" ?ũ) - ("\\={U}" ?Ū) ("\\=U" ?Ū) - ("\\={u}" ?ū) ("\\=u" ?ū) - ("\\u{U}" ?Ŭ) ("\\uU" ?Ŭ) - ("\\u{u}" ?ŭ) ("\\uu" ?ŭ) - - ("\\H{U}" ?Ű) ("\\HU" ?Ű) - ("\\H{u}" ?ű) ("\\Hu" ?ű) - ("\\^{W}" ?Ŵ) ("\\^W" ?Ŵ) - ("\\^{w}" ?ŵ) ("\\^w" ?ŵ) - ("\\^{Y}" ?Ŷ) ("\\^Y" ?Ŷ) - ("\\^{y}" ?ŷ) ("\\^y" ?ŷ) - ("\\\"{Y}" ?Ÿ) ("\\\"Y" ?Ÿ) - ("\\'{Z}" ?Ź) ("\\'Z" ?Ź) - ("\\'{z}" ?ź) ("\\'z" ?ź) - ("\\.{Z}" ?Ż) ("\\.Z" ?Ż) - ("\\.{z}" ?ż) ("\\.z" ?ż) - ("\\v{Z}" ?Ž) ("\\vZ" ?Ž) - ("\\v{z}" ?ž) ("\\vz" ?ž) - - ("\\v{A}" ?Ǎ) ("\\vA" ?Ǎ) - ("\\v{a}" ?ǎ) ("\\va" ?ǎ) - ("\\v{I}" ?Ǐ) ("\\vI" ?Ǐ) - ("\\v{\\i}" ?ǐ) ("\\vi" ?ǐ) - ("\\v{O}" ?Ǒ) ("\\vO" ?Ǒ) - ("\\v{o}" ?ǒ) ("\\vo" ?ǒ) - ("\\v{U}" ?Ǔ) ("\\vU" ?Ǔ) - ("\\v{u}" ?ǔ) ("\\vu" ?ǔ) + + ("\\v{\\i}" ?ǐ) ("\\={\\AE}" ?Ǣ) ("\\=\\AE" ?Ǣ) ("\\={\\ae}" ?ǣ) ("\\=\\ae" ?ǣ) - ("\\v{G}" ?Ǧ) ("\\vG" ?Ǧ) - ("\\v{g}" ?ǧ) ("\\vg" ?ǧ) - ("\\v{K}" ?Ǩ) ("\\vK" ?Ǩ) - ("\\v{k}" ?ǩ) ("\\vk" ?ǩ) - ("\\v{\\j}" ?ǰ) ("\\vj" ?ǰ) - ("\\'{G}" ?Ǵ) ("\\'G" ?Ǵ) - ("\\'{g}" ?ǵ) ("\\'g" ?ǵ) - ("\\`{N}" ?Ǹ) ("\\`N" ?Ǹ) - ("\\`{n}" ?ǹ) ("\\`n" ?ǹ) + ("\\v{\\j}" ?ǰ) ("\\'{\\AE}" ?Ǽ) ("\\'\\AE" ?Ǽ) ("\\'{\\ae}" ?ǽ) ("\\'\\ae" ?ǽ) ("\\'{\\O}" ?Ǿ) ("\\'\\O" ?Ǿ) ("\\'{\\o}" ?ǿ) ("\\'\\o" ?ǿ) - ("\\v{H}" ?Ȟ) ("\\vH" ?Ȟ) - ("\\v{h}" ?ȟ) ("\\vh" ?ȟ) - ("\\.{A}" ?Ȧ) ("\\.A" ?Ȧ) - ("\\.{a}" ?ȧ) ("\\.a" ?ȧ) - ("\\c{E}" ?Ȩ) ("\\cE" ?Ȩ) - ("\\c{e}" ?ȩ) ("\\ce" ?ȩ) - ("\\.{O}" ?Ȯ) ("\\.O" ?Ȯ) - ("\\.{o}" ?ȯ) ("\\.o" ?ȯ) - ("\\={Y}" ?Ȳ) ("\\=Y" ?Ȳ) - ("\\={y}" ?ȳ) ("\\=y" ?ȳ) - - ("\\v{}" ?ˇ) - ("\\u{}" ?˘) - ("\\.{}" ?˙) - ("\\~{}" ?˜) - ("\\H{}" ?˝) - - ("\\'" ?́) - ("\\'K" ?Ḱ) - ("\\'M" ?Ḿ) - ("\\'P" ?Ṕ) - ("\\'W" ?Ẃ) - ("\\'k" ?ḱ) - ("\\'m" ?ḿ) - ("\\'p" ?ṕ) - ("\\'w" ?ẃ) ("\\," ? ) - ("\\." ?̇) - ("\\.B" ?Ḃ) - ("\\.D" ?Ḋ) - ("\\.F" ?Ḟ) - ("\\.H" ?Ḣ) - ("\\.M" ?Ṁ) - ("\\.N" ?Ṅ) - ("\\.P" ?Ṗ) - ("\\.R" ?Ṙ) - ("\\.S" ?Ṡ) - ("\\.T" ?Ṫ) - ("\\.W" ?Ẇ) - ("\\.X" ?Ẋ) - ("\\.Y" ?Ẏ) - ("\\.b" ?ḃ) - ("\\.d" ?ḋ) - ("\\.e" ?ė) - ("\\.f" ?ḟ) - ("\\.h" ?ḣ) - ("\\.m" ?ṁ) - ("\\.n" ?ṅ) - ("\\.p" ?ṗ) - ("\\.r" ?ṙ) - ("\\.s" ?ṡ) - ("\\.t" ?ṫ) - ("\\.w" ?ẇ) - ("\\.x" ?ẋ) - ("\\.y" ?ẏ) ("\\/" ?‌) ("\\:" ? ) ("\\;" ? ) - ("\\=" ?̄) - ("\\=G" ?Ḡ) - ("\\=g" ?ḡ) - - ("^(" ?⁽) - ("^)" ?⁾) - ("^+" ?⁺) - ("^-" ?⁻) - ("^0" ?⁰) - ("^1" ?¹) - ("^2" ?²) - ("^3" ?³) - ("^4" ?⁴) - ("^5" ?⁵) - ("^6" ?⁶) - ("^7" ?⁷) - ("^8" ?⁸) - ("^9" ?⁹) - ("^=" ?⁼) + + ((lambda (name char) + (let* ((base (concat (match-string 1 name) (match-string 3 name))) + (basechar (cdr (assoc base (ucs-names))))) + (when (latin-ltx--ascii-p basechar) + (string (if (match-end 2) ?^ ?_) basechar)))) + "\\(.*\\)SU\\(?:B\\|\\(PER\\)\\)SCRIPT \\(.*\\)") + ("^\\gamma" ?ˠ) - ;; FIXME: It'd be nicer to generate some of these rules via something like - ;; (map (lambda (name char) - ;; (cond ((string-match "MODIFIER SMALL LETTER \\(.\\)" name) - ;; (list (string ?^ (downcase (aref name (match-beginning 1)))) - ;; char))) - ;; ...))) - ("^a" ?ᵃ) - ("^b" ?ᵇ) - ("^c" ?ᶜ) - ("^d" ?ᵈ) - ("^e" ?ᵉ) - ("^f" ?ᶠ) - ("^g" ?ᵍ) - ("^h" ?ʰ) - ;; ("^i" ?) ;; FIXME: can't find MODIFIER SMALL LETTER I !?! - ("^j" ?ʲ) - ("^k" ?ᵏ) - ("^l" ?ˡ) - ("^m" ?ᵐ) - ("^n" ?ⁿ) - ("^o" ?ᵒ) + + ((lambda (name char) + (let* ((base (format "LATIN %s LETTER %s" + (match-string 1 name) (match-string 2 name))) + (basechar (cdr (assoc base (ucs-names))))) + (when (latin-ltx--ascii-p basechar) + (string ?^ basechar)))) + "MODIFIER LETTER \\(SMALL\\|CAPITAL\\) \\(.*\\)") + + ;; ((lambda (name char) (format "^%s" (downcase (match-string 1 name)))) + ;; "\\`MODIFIER LETTER SMALL \\(.\\)\\'") + ;; ("^\\1" "\\`MODIFIER LETTER CAPITAL \\(.\\)\\'") ("^o_" ?º) - ("^p" ?ᵖ) - ;; ("^q" ?) ;; FIXME: can't find MODIFIER SMALL LETTER Q !?! - ("^r" ?ʳ) - ("^s" ?ˢ) - ("^t" ?ᵗ) - ("^u" ?ᵘ) - ("^v" ?ᵛ) - ("^w" ?ʷ) - ("^x" ?ˣ) - ("^y" ?ʸ) - ("^z" ?ᶻ) - ("^A" ?ᴬ) - ("^B" ?ᴮ) - ;; ("^C" ?) ;; FIXME: can't find MODIFIER CAPITAL LETTER C !?! - ("^D" ?ᴰ) - ("^E" ?ᴱ) - ;; ("^F" ?) ;; FIXME: can't find MODIFIER CAPITAL LETTER F !?! - ("^G" ?ᴳ) - ("^H" ?ᴴ) - ("^I" ?ᴵ) - ("^J" ?ᴶ) - ("^K" ?ᴷ) - ("^L" ?ᴸ) - ("^M" ?ᴹ) - ("^N" ?ᴺ) - ("^O" ?ᴼ) - ("^P" ?ᴾ) - ;; ("^Q" ?) ;; FIXME: can't find MODIFIER CAPITAL LETTER Q !?! - ("^R" ?ᴿ) - ;; ("^S" ?) ;; FIXME: can't find MODIFIER CAPITAL LETTER S !?! - ("^T" ?ᵀ) - ("^U" ?ᵁ) - ("^V" ?ⱽ) - ("^W" ?ᵂ) - ;; ("^X" ?) ;; FIXME: can't find MODIFIER CAPITAL LETTER X !?! - ;; ("^Y" ?) ;; FIXME: can't find MODIFIER CAPITAL LETTER Y !?! - ;; ("^Z" ?) ;; FIXME: can't find MODIFIER CAPITAL LETTER Z !?! ("^{SM}" ?℠) ("^{TEL}" ?℡) ("^{TM}" ?™) - ("_(" ?₍) - ("_)" ?₎) - ("_+" ?₊) - ("_-" ?₋) - ("_0" ?₀) - ("_1" ?₁) - ("_2" ?₂) - ("_3" ?₃) - ("_4" ?₄) - ("_5" ?₅) - ("_6" ?₆) - ("_7" ?₇) - ("_8" ?₈) - ("_9" ?₉) - ("_=" ?₌) - - ("\\~" ?̃) - ("\\~E" ?Ẽ) - ("\\~V" ?Ṽ) - ("\\~Y" ?Ỹ) - ("\\~e" ?ẽ) - ("\\~v" ?ṽ) - ("\\~y" ?ỹ) - - ("\\\"" ?̈) - ("\\\"H" ?Ḧ) - ("\\\"W" ?Ẅ) - ("\\\"X" ?Ẍ) - ("\\\"h" ?ḧ) - ("\\\"t" ?ẗ) - ("\\\"w" ?ẅ) - ("\\\"x" ?ẍ) - ("\\^" ?̂) - ("\\^Z" ?Ẑ) - ("\\^z" ?ẑ) - ("\\`" ?̀) - ("\\`W" ?Ẁ) - ("\\`Y" ?Ỳ) - ("\\`w" ?ẁ) - ("\\`y" ?ỳ) + ("\\b" ?̱) - ("\\c" ?̧) - ("\\c{D}" ?Ḑ) - ("\\c{H}" ?Ḩ) - ("\\c{d}" ?ḑ) - ("\\c{h}" ?ḩ) + ("\\d" ?̣) - ("\\d{A}" ?Ạ) - ("\\d{B}" ?Ḅ) - ("\\d{D}" ?Ḍ) - ("\\d{E}" ?Ẹ) - ("\\d{H}" ?Ḥ) - ("\\d{I}" ?Ị) - ("\\d{K}" ?Ḳ) - ("\\d{L}" ?Ḷ) - ("\\d{M}" ?Ṃ) - ("\\d{N}" ?Ṇ) - ("\\d{O}" ?Ọ) - ("\\d{R}" ?Ṛ) - ("\\d{S}" ?Ṣ) - ("\\d{T}" ?Ṭ) - ("\\d{U}" ?Ụ) - ("\\d{V}" ?Ṿ) - ("\\d{W}" ?Ẉ) - ("\\d{Y}" ?Ỵ) - ("\\d{Z}" ?Ẓ) - ("\\d{a}" ?ạ) - ("\\d{b}" ?ḅ) - ("\\d{d}" ?ḍ) - ("\\d{e}" ?ẹ) - ("\\d{h}" ?ḥ) - ("\\d{i}" ?ị) - ("\\d{k}" ?ḳ) - ("\\d{l}" ?ḷ) - ("\\d{m}" ?ṃ) - ("\\d{n}" ?ṇ) - ("\\d{o}" ?ọ) - ("\\d{r}" ?ṛ) - ("\\d{s}" ?ṣ) - ("\\d{t}" ?ṭ) - ("\\d{u}" ?ụ) - ("\\d{v}" ?ṿ) - ("\\d{w}" ?ẉ) - ("\\d{y}" ?ỵ) - ("\\d{z}" ?ẓ) + ;; ("\\d{}" ?) ;; FIXME: can't find the DOT BELOW character. + ((lambda (name char) + (let ((c (if (match-end 1) + (downcase (match-string 2 name)) + (match-string 2 name)))) + (list (format "\\d{%s}" c) ;; (format "\\d%s" c) + ))) + "\\(?:CAPITAL\\|SMAL\\(L\\)\\) LETTER \\(.\\) WITH DOT BELOW") + ("\\rq" ?’) - ("\\u" ?̆) - ("\\v" ?̌) - ("\\v{L}" ?Ľ) - ("\\v{i}" ?ǐ) - ("\\v{j}" ?ǰ) - ("\\v{l}" ?ľ) - ("\\yen" ?¥) + + ;; FIXME: Provides some useful entries (yen, euro, copyright, registered, + ;; currency, minus, micro), but also a lot of dubious ones. + ((lambda (name char) + (unless (latin-ltx--ascii-p char) + (concat "\\" (downcase (match-string 1 name))))) + "\\`\\([^- ]+\\) SIGN\\'") + + ((lambda (name char) + (concat "\\" (funcall (if (match-end 1) #' capitalize #'downcase) + (match-string 2 name)))) + "\\`GREEK \\(?:SMALL\\|CAPITA\\(L\\)\\) LETTER \\([^- ]+\\)\\'") ("\\Box" ?□) ("\\Bumpeq" ?≎) ("\\Cap" ?⋒) ("\\Cup" ?⋓) - ("\\Delta" ?Δ) ("\\Diamond" ?◇) ("\\Downarrow" ?⇓) - ("\\Gamma" ?Γ) - ("\\H" ?̋) ("\\H{o}" ?ő) ("\\Im" ?ℑ) ("\\Join" ?⋈) - ("\\Lambda" ?Λ) ("\\Leftarrow" ?⇐) ("\\Leftrightarrow" ?⇔) ("\\Ll" ?⋘) @@ -528,27 +308,18 @@ ("\\Longleftrightarrow" ?⇔) ("\\Longrightarrow" ?⇒) ("\\Lsh" ?↰) - ("\\Omega" ?Ω) - ("\\Phi" ?Φ) - ("\\Pi" ?Π) - ("\\Psi" ?Ψ) ("\\Re" ?ℜ) ("\\Rightarrow" ?⇒) ("\\Rrightarrow" ?⇛) ("\\Rsh" ?↱) - ("\\Sigma" ?Σ) ("\\Subset" ?⋐) ("\\Supset" ?⋑) - ("\\Theta" ?Θ) ("\\Uparrow" ?⇑) ("\\Updownarrow" ?⇕) - ("\\Upsilon" ?Υ) ("\\Vdash" ?⊩) ("\\Vert" ?‖) ("\\Vvdash" ?⊪) - ("\\Xi" ?Ξ) ("\\aleph" ?ℵ) - ("\\alpha" ?α) ("\\amalg" ?∐) ("\\angle" ?∠) ("\\approx" ?≈) @@ -563,7 +334,6 @@ ("\\backslash" ?\\) ("\\barwedge" ?⊼) ("\\because" ?∵) - ("\\beta" ?β) ("\\beth" ?ℶ) ("\\between" ?≬) ("\\bigcap" ?⋂) @@ -602,7 +372,7 @@ ("\\circledcirc" ?⊚) ("\\circleddash" ?⊝) ("\\clubsuit" ?♣) - ("\\colon" ?:) + ("\\colon" ?:) ;FIXME: Conflict with "COLON SIGN" ₡. ("\\coloneq" ?≔) ("\\complement" ?∁) ("\\cong" ?≅) @@ -623,7 +393,6 @@ ("\\ddag" ?‡) ("\\ddagger" ?‡) ("\\ddots" ?⋱) - ("\\delta" ?δ) ("\\diamond" ?⋄) ("\\diamondsuit" ?♢) ("\\digamma" ?Ϝ) @@ -638,14 +407,11 @@ ("\\downrightharpoon" ?⇂) ("\\ell" ?ℓ) ("\\emptyset" ?∅) - ("\\epsilon" ?ε) ("\\eqcirc" ?≖) ("\\eqcolon" ?≕) ("\\eqslantgtr" ?⋝) ("\\eqslantless" ?⋜) ("\\equiv" ?≡) - ("\\eta" ?η) - ("\\euro" ?€) ("\\exists" ?∃) ("\\fallingdotseq" ?≒) ("\\flat" ?♭) @@ -667,7 +433,6 @@ ("\\frac58" ?⅝) ("\\frac78" ?⅞) ("\\frown" ?⌢) - ("\\gamma" ?γ) ("\\ge" ?≥) ("\\geq" ?≥) ("\\geqq" ?≧) @@ -697,9 +462,6 @@ ("\\infty" ?∞) ("\\int" ?∫) ("\\intercal" ?⊺) - ("\\iota" ?ι) - ("\\kappa" ?κ) - ("\\lambda" ?λ) ("\\langle" ?〈) ("\\lbrace" ?{) ("\\lbrack" ?\[) @@ -783,7 +545,7 @@ ("\\nleqslant" ?≰) ("\\nless" ?≮) ("\\nmid" ?∤) - ("\\not" ?̸) + ("\\not" ?̸) ;FIXME: conflict with "NOT SIGN" ¬. ("\\notin" ?∉) ("\\nparallel" ?∦) ("\\nprec" ?⊀) @@ -805,13 +567,11 @@ ("\\ntrianglelefteq" ?⋬) ("\\ntriangleright" ?⋫) ("\\ntrianglerighteq" ?⋭) - ("\\nu" ?ν) ("\\nvDash" ?⊭) ("\\nvdash" ?⊬) ("\\nwarrow" ?↖) ("\\odot" ?⊙) ("\\oint" ?∮) - ("\\omega" ?ω) ("\\ominus" ?⊖) ("\\oplus" ?⊕) ("\\oslash" ?⊘) @@ -820,8 +580,6 @@ ("\\parallel" ?∥) ("\\partial" ?∂) ("\\perp" ?⊥) - ("\\phi" ?φ) - ("\\pi" ?π) ("\\pitchfork" ?⋔) ("\\prec" ?≺) ("\\precapprox" ?≾) @@ -832,7 +590,6 @@ ("\\prime" ?′) ("\\prod" ?∏) ("\\propto" ?∝) - ("\\psi" ?ψ) ("\\qed" ?∎) ("\\quad" ? ) ("\\rangle" ?〉) @@ -857,7 +614,6 @@ ("\\sharp" ?♯) ("\\shortmid" ?∣) ("\\shortparallel" ?∥) - ("\\sigma" ?σ) ("\\sim" ?∼) ("\\simeq" ?≃) ("\\smallamalg" ?∐) @@ -896,9 +652,7 @@ ("\\supsetneqq" ?⊋) ("\\surd" ?√) ("\\swarrow" ?↙) - ("\\tau" ?τ) ("\\therefore" ?∴) - ("\\theta" ?θ) ("\\thickapprox" ?≈) ("\\thicksim" ?∼) ("\\to" ?→) @@ -918,19 +672,18 @@ ("\\upleftharpoon" ?↿) ("\\uplus" ?⊎) ("\\uprightharpoon" ?↾) - ("\\upsilon" ?υ) ("\\upuparrows" ?⇈) ("\\urcorner" ?⌝) ("\\u{i}" ?ĭ) ("\\vDash" ?⊨) - ("\\varkappa" ?ϰ) - ("\\varphi" ?ϕ) - ("\\varpi" ?ϖ) + + ((lambda (name char) + (concat "\\var" (downcase (match-string 1 name)))) + "\\`GREEK \\([^- ]+\\) SYMBOL\\'") + ("\\varprime" ?′) ("\\varpropto" ?∝) - ("\\varrho" ?ϱ) - ("\\varsigma" ?ς) - ("\\vartheta" ?ϑ) + ("\\varsigma" ?ς) ;FIXME: Looks reversed with the non\var. ("\\vartriangleleft" ?⊲) ("\\vartriangleright" ?⊳) ("\\vdash" ?⊢) @@ -941,8 +694,6 @@ ("\\wedge" ?∧) ("\\wp" ?℘) ("\\wr" ?≀) - ("\\xi" ?ξ) - ("\\zeta" ?ζ) ("\\Bbb{N}" ?ℕ) ; AMS commands for blackboard bold ("\\Bbb{P}" ?ℙ) ; Also sometimes \mathbb. @@ -954,8 +705,6 @@ ;; a bug where the user finds his ~ key doesn't insert a ~ any more. ("\\ " ? ) ("\\\\" ?\\) - ("\\mu" ?μ) - ("\\rho" ?ρ) ("\\mathscr{I}" ?ℐ) ; moment of inertia ("\\Smiley" ?☺) ("\\blacksmiley" ?☻) @@ -980,13 +729,10 @@ ;; ("\\Writinghand" ?✍) ;; ("\\Yinyang" ?☯) ;; ("\\Heart" ?♡) - ("\\registered" ?®) - ("\\currency" ?¤) ("\\dh" ?ð) ("\\DH" ?Ð) ("\\th" ?þ) ("\\TH" ?Þ) - ("\\micro" ?µ) ("\\lnot" ?¬) ("\\ordfeminine" ?ª) ("\\ordmasculine" ?º) @@ -995,7 +741,6 @@ ;; by analogy with lq, rq: ("\\ldq" ?\“) ("\\rdq" ?\”) - ("\\minus" ?−) ("\\defs" ?≙) ; per fuzz/zed ;; ("\\sqrt[3]" ?∛) ("\\llbracket" ?\〚) ; stmaryrd ------------------------------------------------------------ revno: 107802 fixes bug(s): http://debbugs.gnu.org/9821 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-04-08 17:58:00 -0700 message: Remove ucs-set-table-for-input dead code This function was removed with ucs-tables.el in 2008. * lisp/international/mule-cmds.el (set-default-coding-systems): * lisp/files.el (normal-mode): Remove guarded calls to ucs-set-table-for-input. * src/buffer.c (Qucs_set_table_for_input): Remove. (Fget_buffer_create): Don't call Qucs_set_table_for_input. (init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-08 17:09:03 +0000 +++ lisp/ChangeLog 2012-04-09 00:58:00 +0000 @@ -1,3 +1,10 @@ +2012-04-09 Glenn Morris + + * international/mule-cmds.el (set-default-coding-systems): + * files.el (normal-mode): + Remove guarded calls to ucs-set-table-for-input. (Bug#9821) + This function was removed with ucs-tables.el in 2008. + 2012-04-08 Eli Zaretskii * textmodes/ispell.el (ispell-check-version): For hunspell, set === modified file 'lisp/files.el' --- lisp/files.el 2012-04-01 02:44:24 +0000 +++ lisp/files.el 2012-04-09 00:58:00 +0000 @@ -2205,10 +2205,7 @@ (boundp 'font-lock-keywords) (eq (car font-lock-keywords) t)) (setq font-lock-keywords (cadr font-lock-keywords)) - (font-lock-mode 1)) - - (if (fboundp 'ucs-set-table-for-input) ; don't lose when building - (ucs-set-table-for-input))) + (font-lock-mode 1))) (defcustom auto-mode-case-fold t "Non-nil means to try second pass through `auto-mode-alist'. === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2012-02-22 23:35:07 +0000 +++ lisp/international/mule-cmds.el 2012-04-09 00:58:00 +0000 @@ -353,10 +353,6 @@ if CODING-SYSTEM is ASCII-compatible" (check-coding-system coding-system) (setq-default buffer-file-coding-system coding-system) - (if (fboundp 'ucs-set-table-for-input) - (dolist (buffer (buffer-list)) - (or (local-variable-p 'buffer-file-coding-system buffer) - (ucs-set-table-for-input buffer)))) (if (eq system-type 'darwin) ;; The file-name coding system on Darwin systems is always utf-8. === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-08 21:14:30 +0000 +++ src/ChangeLog 2012-04-09 00:58:00 +0000 @@ -1,3 +1,9 @@ +2012-04-09 Glenn Morris + + * buffer.c (Qucs_set_table_for_input): Remove. (Bug#9821) + (Fget_buffer_create): Don't call Qucs_set_table_for_input. + (init_buffer_once, syms_of_buffer): Remove Qucs_set_table_for_input. + 2012-04-08 Andreas Schwab * lisp.h (struct Lisp_Symbol): Add explicit padding to ensure === modified file 'src/buffer.c' --- src/buffer.c 2012-03-12 08:27:25 +0000 +++ src/buffer.c 2012-04-09 00:58:00 +0000 @@ -128,7 +128,6 @@ Lisp_Object Qfirst_change_hook; Lisp_Object Qbefore_change_functions; Lisp_Object Qafter_change_functions; -static Lisp_Object Qucs_set_table_for_input; static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; static Lisp_Object Qpermanent_local_hook; @@ -402,13 +401,6 @@ if (!NILP (Vrun_hooks)) call1 (Vrun_hooks, Qbuffer_list_update_hook); - /* An error in calling the function here (should someone redefine it) - can lead to infinite regress until you run out of stack. rms - says that's not worth protecting against. */ - if (!NILP (Ffboundp (Qucs_set_table_for_input))) - /* buffer is on buffer-alist, so no gcpro. */ - call1 (Qucs_set_table_for_input, buffer); - return buffer; } @@ -5043,8 +5035,6 @@ Qkill_buffer_hook = intern_c_string ("kill-buffer-hook"); Fput (Qkill_buffer_hook, Qpermanent_local, Qt); - Qucs_set_table_for_input = intern_c_string ("ucs-set-table-for-input"); - /* super-magic invisible buffer */ Vprin1_to_string_buffer = Fget_buffer_create (make_pure_c_string (" prin1")); Vbuffer_alist = Qnil; @@ -5200,9 +5190,6 @@ DEFSYM (Qafter_change_functions, "after-change-functions"); DEFSYM (Qkill_buffer_query_functions, "kill-buffer-query-functions"); - /* The next one is initialized in init_buffer_once. */ - staticpro (&Qucs_set_table_for_input); - Fput (Qprotected_field, Qerror_conditions, pure_cons (Qprotected_field, pure_cons (Qerror, Qnil))); Fput (Qprotected_field, Qerror_message, ------------------------------------------------------------ revno: 107801 fixes bug(s): http://debbugs.gnu.org/10910 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-04-08 17:50:17 -0700 message: * configure.in: Require makeinfo >= 4.7. Eg org.texi has been using 4.7 functions for some time. diff: === modified file 'ChangeLog' --- ChangeLog 2012-04-07 20:45:36 +0000 +++ ChangeLog 2012-04-09 00:50:17 +0000 @@ -1,3 +1,8 @@ +2012-04-09 Glenn Morris + + * configure.in: Require makeinfo >= 4.7. (Bug#10910) + Eg org.texi has been using 4.7 functions for some time. + 2012-04-07 Paul Eggert Check pkg-config exit status when configuring (Bug#10626). === modified file 'configure.in' --- configure.in 2012-04-07 20:45:36 +0000 +++ configure.in 2012-04-09 00:50:17 +0000 @@ -758,12 +758,12 @@ AC_PATH_PROG(GZIP_PROG, gzip) -## Need makeinfo >= 4.6 (?) to build the manuals. +## Need makeinfo >= 4.7 (?) to build the manuals. AC_PATH_PROG(MAKEINFO, makeinfo, no) dnl By this stage, configure has already checked for egrep and set EGREP, dnl or exited with an error if no egrep was found. if test "$MAKEINFO" != "no" && \ - test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[6-9]]|4\.[[1-5]][[0-9]]+)'`" = x; then + test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[7-9]]|4\.[[1-6]][[0-9]]+)'`" = x; then MAKEINFO=no fi @@ -783,7 +783,7 @@ if test "x${with_makeinfo}" = "xno"; then HAVE_MAKEINFO=no elif test ! -e $srcdir/info/emacs; then - AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.6, and your + AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your source tree does not seem to have pre-built manuals in the `info' directory. Either install a suitable version of makeinfo, or re-run configure with the `--without-makeinfo' option to build without the manuals.] ) ------------------------------------------------------------ revno: 107800 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2012-04-08 23:14:30 +0200 message: * lisp.h (struct Lisp_Symbol): Add explicit padding to ensure proper alignment. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-07 20:54:50 +0000 +++ src/ChangeLog 2012-04-08 21:14:30 +0000 @@ -1,3 +1,8 @@ +2012-04-08 Andreas Schwab + + * lisp.h (struct Lisp_Symbol): Add explicit padding to ensure + proper alignment. + 2012-04-07 Juanma Barranquero * xml.c (init_libxml2_functions) [WINDOWSNT]: === modified file 'src/lisp.h' --- src/lisp.h 2012-04-07 13:57:36 +0000 +++ src/lisp.h 2012-04-08 21:14:30 +0000 @@ -1134,6 +1134,8 @@ special (with `defvar' etc), and shouldn't be lexically bound. */ unsigned declared_special : 1; + unsigned spacer : 23; + /* The symbol's name, as a Lisp string. The name "xname" is used to intentionally break code referring to the old field "name" of type pointer to struct Lisp_String. */ ------------------------------------------------------------ revno: 107799 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2012-04-08 20:09:03 +0300 message: Fix invocation of Hunspell by ispell.el. lisp/textmodes/ispell.el (ispell-check-version): For hunspell, set ispell-encoding8-command to "-i", without a trailing space. (ispell-start-process): For hunspell, use '("-i" ENCODING), in 2 separate command-line arguments, to specify the encoding, since that's how hunspell expects it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-08 01:54:52 +0000 +++ lisp/ChangeLog 2012-04-08 17:09:03 +0000 @@ -1,3 +1,11 @@ +2012-04-08 Eli Zaretskii + + * textmodes/ispell.el (ispell-check-version): For hunspell, set + ispell-encoding8-command to "-i", without a trailing space. + (ispell-start-process): For hunspell, use '("-i" ENCODING), in 2 + separate command-line arguments, to specify the encoding, since + that's how hunspell expects it. + 2012-04-08 Glenn Morris * loadup.el: Load bindings before cus-start. === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2012-03-30 09:45:11 +0000 +++ lisp/textmodes/ispell.el 2012-04-08 17:09:03 +0000 @@ -874,7 +874,7 @@ (setq ispell-really-aspell nil))) (ispell-really-hunspell (if (ispell-check-minver hunspell8-minver ispell-really-hunspell) - (setq ispell-encoding8-command "-i ") + (setq ispell-encoding8-command "-i") (setq ispell-really-hunspell nil)))))) result)) @@ -2618,9 +2618,12 @@ ;; right encoding for communication. ispell or older aspell/hunspell ;; does not support this. (if ispell-encoding8-command - (list - (concat ispell-encoding8-command - (symbol-name (ispell-get-coding-system))))) + (if ispell-really-hunspell + (list ispell-encoding8-command + (upcase (symbol-name (ispell-get-coding-system)))) + (list + (concat ispell-encoding8-command + (symbol-name (ispell-get-coding-system)))))) ispell-extra-args))) ;; Initially we don't know any buffer's local words. ------------------------------------------------------------ revno: 107798 committer: Glenn Morris branch nick: trunk timestamp: Sun 2012-04-08 06:18:45 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2012-04-07 20:02:14 +0000 +++ autogen/configure 2012-04-08 10:18:45 +0000 @@ -8313,22 +8313,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ALSA_MODULES" >&5 $as_echo_n "checking for $ALSA_MODULES... " >&6; } - if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5 && + ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES" 2>&5` && + ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES" 2>&5`; then + + ALSA_CFLAGS=`$as_echo "$ALSA_CFLAGS" | sed -e 's,///*,/,g'` + ALSA_LIBS=`$as_echo "$ALSA_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$ALSA_CFLAGS' LIBS='$ALSA_LIBS'" >&5 +$as_echo "yes CFLAGS='$ALSA_CFLAGS' LIBS='$ALSA_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_CFLAGS" >&5 -$as_echo_n "checking ALSA_CFLAGS... " >&6; } - ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5 -$as_echo "$ALSA_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_LIBS" >&5 -$as_echo_n "checking ALSA_LIBS... " >&6; } - ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5 -$as_echo "$ALSA_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -10756,22 +10749,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $RSVG_MODULE" >&5 $as_echo_n "checking for $RSVG_MODULE... " >&6; } - if $PKG_CONFIG --exists "$RSVG_MODULE" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "$RSVG_MODULE" 2>&5 && + RSVG_CFLAGS=`$PKG_CONFIG --cflags "$RSVG_MODULE" 2>&5` && + RSVG_LIBS=`$PKG_CONFIG --libs "$RSVG_MODULE" 2>&5`; then + + RSVG_CFLAGS=`$as_echo "$RSVG_CFLAGS" | sed -e 's,///*,/,g'` + RSVG_LIBS=`$as_echo "$RSVG_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$RSVG_CFLAGS' LIBS='$RSVG_LIBS'" >&5 +$as_echo "yes CFLAGS='$RSVG_CFLAGS' LIBS='$RSVG_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking RSVG_CFLAGS" >&5 -$as_echo_n "checking RSVG_CFLAGS... " >&6; } - RSVG_CFLAGS=`$PKG_CONFIG --cflags "$RSVG_MODULE"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RSVG_CFLAGS" >&5 -$as_echo "$RSVG_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking RSVG_LIBS" >&5 -$as_echo_n "checking RSVG_LIBS... " >&6; } - RSVG_LIBS=`$PKG_CONFIG --libs "$RSVG_MODULE"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RSVG_LIBS" >&5 -$as_echo "$RSVG_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -10870,22 +10856,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $IMAGEMAGICK_MODULE" >&5 $as_echo_n "checking for $IMAGEMAGICK_MODULE... " >&6; } - if $PKG_CONFIG --exists "$IMAGEMAGICK_MODULE" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "$IMAGEMAGICK_MODULE" 2>&5 && + IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE" 2>&5` && + IMAGEMAGICK_LIBS=`$PKG_CONFIG --libs "$IMAGEMAGICK_MODULE" 2>&5`; then + + IMAGEMAGICK_CFLAGS=`$as_echo "$IMAGEMAGICK_CFLAGS" | sed -e 's,///*,/,g'` + IMAGEMAGICK_LIBS=`$as_echo "$IMAGEMAGICK_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$IMAGEMAGICK_CFLAGS' LIBS='$IMAGEMAGICK_LIBS'" >&5 +$as_echo "yes CFLAGS='$IMAGEMAGICK_CFLAGS' LIBS='$IMAGEMAGICK_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking IMAGEMAGICK_CFLAGS" >&5 -$as_echo_n "checking IMAGEMAGICK_CFLAGS... " >&6; } - IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IMAGEMAGICK_CFLAGS" >&5 -$as_echo "$IMAGEMAGICK_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking IMAGEMAGICK_LIBS" >&5 -$as_echo_n "checking IMAGEMAGICK_LIBS... " >&6; } - IMAGEMAGICK_LIBS=`$PKG_CONFIG --libs "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IMAGEMAGICK_LIBS" >&5 -$as_echo "$IMAGEMAGICK_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -10996,22 +10975,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GTK_MODULES" >&5 $as_echo_n "checking for $GTK_MODULES... " >&6; } - if $PKG_CONFIG --exists "$GTK_MODULES" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "$GTK_MODULES" 2>&5 && + GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES" 2>&5` && + GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES" 2>&5`; then + + GTK_CFLAGS=`$as_echo "$GTK_CFLAGS" | sed -e 's,///*,/,g'` + GTK_LIBS=`$as_echo "$GTK_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$GTK_CFLAGS' LIBS='$GTK_LIBS'" >&5 +$as_echo "yes CFLAGS='$GTK_CFLAGS' LIBS='$GTK_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5 -$as_echo_n "checking GTK_CFLAGS... " >&6; } - GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5 -$as_echo "$GTK_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5 -$as_echo_n "checking GTK_LIBS... " >&6; } - GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 -$as_echo "$GTK_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -11106,22 +11078,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $GTK_MODULES" >&5 $as_echo_n "checking for $GTK_MODULES... " >&6; } - if $PKG_CONFIG --exists "$GTK_MODULES" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "$GTK_MODULES" 2>&5 && + GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES" 2>&5` && + GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES" 2>&5`; then + + GTK_CFLAGS=`$as_echo "$GTK_CFLAGS" | sed -e 's,///*,/,g'` + GTK_LIBS=`$as_echo "$GTK_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$GTK_CFLAGS' LIBS='$GTK_LIBS'" >&5 +$as_echo "yes CFLAGS='$GTK_CFLAGS' LIBS='$GTK_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5 -$as_echo_n "checking GTK_CFLAGS... " >&6; } - GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5 -$as_echo "$GTK_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5 -$as_echo_n "checking GTK_LIBS... " >&6; } - GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 -$as_echo "$GTK_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -11308,22 +11273,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-1 >= 1.0" >&5 $as_echo_n "checking for dbus-1 >= 1.0... " >&6; } - if $PKG_CONFIG --exists "dbus-1 >= 1.0" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "dbus-1 >= 1.0" 2>&5 && + DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0" 2>&5` && + DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0" 2>&5`; then + + DBUS_CFLAGS=`$as_echo "$DBUS_CFLAGS" | sed -e 's,///*,/,g'` + DBUS_LIBS=`$as_echo "$DBUS_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$DBUS_CFLAGS' LIBS='$DBUS_LIBS'" >&5 +$as_echo "yes CFLAGS='$DBUS_CFLAGS' LIBS='$DBUS_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5 -$as_echo_n "checking DBUS_CFLAGS... " >&6; } - DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5 -$as_echo "$DBUS_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5 -$as_echo_n "checking DBUS_LIBS... " >&6; } - DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5 -$as_echo "$DBUS_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -11425,22 +11383,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.26" >&5 $as_echo_n "checking for gio-2.0 >= 2.26... " >&6; } - if $PKG_CONFIG --exists "gio-2.0 >= 2.26" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "gio-2.0 >= 2.26" 2>&5 && + GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26" 2>&5` && + GSETTINGS_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26" 2>&5`; then + + GSETTINGS_CFLAGS=`$as_echo "$GSETTINGS_CFLAGS" | sed -e 's,///*,/,g'` + GSETTINGS_LIBS=`$as_echo "$GSETTINGS_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$GSETTINGS_CFLAGS' LIBS='$GSETTINGS_LIBS'" >&5 +$as_echo "yes CFLAGS='$GSETTINGS_CFLAGS' LIBS='$GSETTINGS_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_CFLAGS" >&5 -$as_echo_n "checking GSETTINGS_CFLAGS... " >&6; } - GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_CFLAGS" >&5 -$as_echo "$GSETTINGS_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_LIBS" >&5 -$as_echo_n "checking GSETTINGS_LIBS... " >&6; } - GSETTINGS_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_LIBS" >&5 -$as_echo "$GSETTINGS_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -11530,22 +11481,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gconf-2.0 >= 2.13" >&5 $as_echo_n "checking for gconf-2.0 >= 2.13... " >&6; } - if $PKG_CONFIG --exists "gconf-2.0 >= 2.13" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "gconf-2.0 >= 2.13" 2>&5 && + GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.13" 2>&5` && + GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.13" 2>&5`; then + + GCONF_CFLAGS=`$as_echo "$GCONF_CFLAGS" | sed -e 's,///*,/,g'` + GCONF_LIBS=`$as_echo "$GCONF_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$GCONF_CFLAGS' LIBS='$GCONF_LIBS'" >&5 +$as_echo "yes CFLAGS='$GCONF_CFLAGS' LIBS='$GCONF_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_CFLAGS" >&5 -$as_echo_n "checking GCONF_CFLAGS... " >&6; } - GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.13"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_CFLAGS" >&5 -$as_echo "$GCONF_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_LIBS" >&5 -$as_echo_n "checking GCONF_LIBS... " >&6; } - GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.13"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_LIBS" >&5 -$as_echo "$GCONF_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -11713,22 +11657,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 2.6.6" >&5 $as_echo_n "checking for gnutls >= 2.6.6... " >&6; } - if $PKG_CONFIG --exists "gnutls >= 2.6.6" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "gnutls >= 2.6.6" 2>&5 && + LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.6.6" 2>&5` && + LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.6.6" 2>&5`; then + + LIBGNUTLS_CFLAGS=`$as_echo "$LIBGNUTLS_CFLAGS" | sed -e 's,///*,/,g'` + LIBGNUTLS_LIBS=`$as_echo "$LIBGNUTLS_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$LIBGNUTLS_CFLAGS' LIBS='$LIBGNUTLS_LIBS'" >&5 +$as_echo "yes CFLAGS='$LIBGNUTLS_CFLAGS' LIBS='$LIBGNUTLS_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_CFLAGS" >&5 -$as_echo_n "checking LIBGNUTLS_CFLAGS... " >&6; } - LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.6.6"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_CFLAGS" >&5 -$as_echo "$LIBGNUTLS_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_LIBS" >&5 -$as_echo_n "checking LIBGNUTLS_LIBS... " >&6; } - LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.6.6"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_LIBS" >&5 -$as_echo "$LIBGNUTLS_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12367,22 +12304,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig >= 2.2.0" >&5 $as_echo_n "checking for fontconfig >= 2.2.0... " >&6; } - if $PKG_CONFIG --exists "fontconfig >= 2.2.0" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "fontconfig >= 2.2.0" 2>&5 && + FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.2.0" 2>&5` && + FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.2.0" 2>&5`; then + + FONTCONFIG_CFLAGS=`$as_echo "$FONTCONFIG_CFLAGS" | sed -e 's,///*,/,g'` + FONTCONFIG_LIBS=`$as_echo "$FONTCONFIG_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$FONTCONFIG_CFLAGS' LIBS='$FONTCONFIG_LIBS'" >&5 +$as_echo "yes CFLAGS='$FONTCONFIG_CFLAGS' LIBS='$FONTCONFIG_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking FONTCONFIG_CFLAGS" >&5 -$as_echo_n "checking FONTCONFIG_CFLAGS... " >&6; } - FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig >= 2.2.0"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_CFLAGS" >&5 -$as_echo "$FONTCONFIG_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking FONTCONFIG_LIBS" >&5 -$as_echo_n "checking FONTCONFIG_LIBS... " >&6; } - FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig >= 2.2.0"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FONTCONFIG_LIBS" >&5 -$as_echo "$FONTCONFIG_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12469,22 +12399,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xft >= 0.13.0" >&5 $as_echo_n "checking for xft >= 0.13.0... " >&6; } - if $PKG_CONFIG --exists "xft >= 0.13.0" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "xft >= 0.13.0" 2>&5 && + XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0" 2>&5` && + XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0" 2>&5`; then + + XFT_CFLAGS=`$as_echo "$XFT_CFLAGS" | sed -e 's,///*,/,g'` + XFT_LIBS=`$as_echo "$XFT_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$XFT_CFLAGS' LIBS='$XFT_LIBS'" >&5 +$as_echo "yes CFLAGS='$XFT_CFLAGS' LIBS='$XFT_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFT_CFLAGS" >&5 -$as_echo_n "checking XFT_CFLAGS... " >&6; } - XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFT_CFLAGS" >&5 -$as_echo "$XFT_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking XFT_LIBS" >&5 -$as_echo_n "checking XFT_LIBS... " >&6; } - XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFT_LIBS" >&5 -$as_echo "$XFT_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12680,22 +12603,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5 $as_echo_n "checking for freetype2... " >&6; } - if $PKG_CONFIG --exists "freetype2" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "freetype2" 2>&5 && + FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>&5` && + FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>&5`; then + + FREETYPE_CFLAGS=`$as_echo "$FREETYPE_CFLAGS" | sed -e 's,///*,/,g'` + FREETYPE_LIBS=`$as_echo "$FREETYPE_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$FREETYPE_CFLAGS' LIBS='$FREETYPE_LIBS'" >&5 +$as_echo "yes CFLAGS='$FREETYPE_CFLAGS' LIBS='$FREETYPE_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_CFLAGS" >&5 -$as_echo_n "checking FREETYPE_CFLAGS... " >&6; } - FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_CFLAGS" >&5 -$as_echo "$FREETYPE_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_LIBS" >&5 -$as_echo_n "checking FREETYPE_LIBS... " >&6; } - FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIBS" >&5 -$as_echo "$FREETYPE_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12784,22 +12700,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libotf" >&5 $as_echo_n "checking for libotf... " >&6; } - if $PKG_CONFIG --exists "libotf" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "libotf" 2>&5 && + LIBOTF_CFLAGS=`$PKG_CONFIG --cflags "libotf" 2>&5` && + LIBOTF_LIBS=`$PKG_CONFIG --libs "libotf" 2>&5`; then + + LIBOTF_CFLAGS=`$as_echo "$LIBOTF_CFLAGS" | sed -e 's,///*,/,g'` + LIBOTF_LIBS=`$as_echo "$LIBOTF_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$LIBOTF_CFLAGS' LIBS='$LIBOTF_LIBS'" >&5 +$as_echo "yes CFLAGS='$LIBOTF_CFLAGS' LIBS='$LIBOTF_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBOTF_CFLAGS" >&5 -$as_echo_n "checking LIBOTF_CFLAGS... " >&6; } - LIBOTF_CFLAGS=`$PKG_CONFIG --cflags "libotf"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBOTF_CFLAGS" >&5 -$as_echo "$LIBOTF_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBOTF_LIBS" >&5 -$as_echo_n "checking LIBOTF_LIBS... " >&6; } - LIBOTF_LIBS=`$PKG_CONFIG --libs "libotf"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBOTF_LIBS" >&5 -$as_echo "$LIBOTF_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12936,22 +12845,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for m17n-flt" >&5 $as_echo_n "checking for m17n-flt... " >&6; } - if $PKG_CONFIG --exists "m17n-flt" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "m17n-flt" 2>&5 && + M17N_FLT_CFLAGS=`$PKG_CONFIG --cflags "m17n-flt" 2>&5` && + M17N_FLT_LIBS=`$PKG_CONFIG --libs "m17n-flt" 2>&5`; then + + M17N_FLT_CFLAGS=`$as_echo "$M17N_FLT_CFLAGS" | sed -e 's,///*,/,g'` + M17N_FLT_LIBS=`$as_echo "$M17N_FLT_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$M17N_FLT_CFLAGS' LIBS='$M17N_FLT_LIBS'" >&5 +$as_echo "yes CFLAGS='$M17N_FLT_CFLAGS' LIBS='$M17N_FLT_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking M17N_FLT_CFLAGS" >&5 -$as_echo_n "checking M17N_FLT_CFLAGS... " >&6; } - M17N_FLT_CFLAGS=`$PKG_CONFIG --cflags "m17n-flt"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $M17N_FLT_CFLAGS" >&5 -$as_echo "$M17N_FLT_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking M17N_FLT_LIBS" >&5 -$as_echo_n "checking M17N_FLT_LIBS... " >&6; } - M17N_FLT_LIBS=`$PKG_CONFIG --libs "m17n-flt"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $M17N_FLT_LIBS" >&5 -$as_echo "$M17N_FLT_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13663,22 +13565,15 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 > 2.6.17" >&5 $as_echo_n "checking for libxml-2.0 > 2.6.17... " >&6; } - if $PKG_CONFIG --exists "libxml-2.0 > 2.6.17" 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if $PKG_CONFIG --exists "libxml-2.0 > 2.6.17" 2>&5 && + LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 > 2.6.17" 2>&5` && + LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 > 2.6.17" 2>&5`; then + + LIBXML2_CFLAGS=`$as_echo "$LIBXML2_CFLAGS" | sed -e 's,///*,/,g'` + LIBXML2_LIBS=`$as_echo "$LIBXML2_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$LIBXML2_CFLAGS' LIBS='$LIBXML2_LIBS'" >&5 +$as_echo "yes CFLAGS='$LIBXML2_CFLAGS' LIBS='$LIBXML2_LIBS'" >&6; } succeeded=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML2_CFLAGS" >&5 -$as_echo_n "checking LIBXML2_CFLAGS... " >&6; } - LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 > 2.6.17"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_CFLAGS" >&5 -$as_echo "$LIBXML2_CFLAGS" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML2_LIBS" >&5 -$as_echo_n "checking LIBXML2_LIBS... " >&6; } - LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 > 2.6.17"|sed -e 's,///*,/,g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_LIBS" >&5 -$as_echo "$LIBXML2_LIBS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ------------------------------------------------------------ revno: 107797 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-04-07 18:54:52 -0700 message: * lisp/loadup.el: Load bindings before cus-start. This reduces somewhat the number of "rogue" settings in emacs -Q. Ref: http://lists.gnu.org/archive/html/emacs-devel/2008-06/msg00083.html diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-07 20:26:01 +0000 +++ lisp/ChangeLog 2012-04-08 01:54:52 +0000 @@ -1,3 +1,8 @@ +2012-04-08 Glenn Morris + + * loadup.el: Load bindings before cus-start. + This reduces somewhat the number of "rogue" settings in emacs -Q. + 2012-04-07 Glenn Morris * version.el (emacs-bzr-get-version): New function. === modified file 'lisp/loadup.el' --- lisp/loadup.el 2012-04-07 19:51:51 +0000 +++ lisp/loadup.el 2012-04-08 01:54:52 +0000 @@ -89,12 +89,12 @@ (load "widget") (load "custom") (load "emacs-lisp/map-ynp") -(load "cus-start") (load "international/mule") (load "international/mule-conf") (load "env") (load "format") (load "bindings") +(load "cus-start") (load "window") ; Needed here for `replace-buffer-in-windows'. (setq load-source-file-function 'load-with-code-conversion) (load "files")