diff -Nru texmacs-1.0.7.13/configure texmacs-1.0.7.14/configure --- texmacs-1.0.7.13/configure 2011-09-16 11:27:09.000000000 +0000 +++ texmacs-1.0.7.14/configure 2011-10-17 18:44:06.000000000 +0000 @@ -2732,7 +2732,7 @@ PACKAGE="TeXmacs" DEBIAN_NAME="texmacs" -DEVEL_VERSION="1.0.7.13" +DEVEL_VERSION="1.0.7.14" DEVEL_RELEASE="1" STABLE_VERSION="1.0.7" STABLE_RELEASE="1" diff -Nru texmacs-1.0.7.13/configure.in texmacs-1.0.7.14/configure.in --- texmacs-1.0.7.13/configure.in 2011-09-16 11:27:04.000000000 +0000 +++ texmacs-1.0.7.14/configure.in 2011-10-17 18:44:02.000000000 +0000 @@ -17,7 +17,7 @@ PACKAGE="TeXmacs" DEBIAN_NAME="texmacs" -DEVEL_VERSION="1.0.7.13" +DEVEL_VERSION="1.0.7.14" DEVEL_RELEASE="1" STABLE_VERSION="1.0.7" STABLE_RELEASE="1" diff -Nru texmacs-1.0.7.13/debian/changelog texmacs-1.0.7.14/debian/changelog --- texmacs-1.0.7.13/debian/changelog 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/changelog 2012-01-03 03:13:08.000000000 +0000 @@ -1,3 +1,12 @@ +texmacs (1:1.0.7.14-1) unstable; urgency=low + + * New Upstream Release. + * Converted from dpatch to quilt. Thanks to lintian. Also cleaned up + some lintian warnings. + * Added README.source and updated 01_american.patch and 08_gzipbest.patch + + -- Atsuhito KOHDA Fri, 16 Dec 2011 09:22:46 +0900 + texmacs (1:1.0.7.13-1) unstable; urgency=low * New Upstream Release. diff -Nru texmacs-1.0.7.13/debian/control texmacs-1.0.7.14/debian/control --- texmacs-1.0.7.13/debian/control 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/control 2012-01-03 03:13:08.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Atsuhito KOHDA Homepage: http://www.texmacs.org -Build-Depends: debhelper (>= 7.0), cdbs (>= 0.4), dpatch, guile-1.8-dev [!ia64], guile-1.6-dev [ia64], libxt-dev, libx11-dev, x11proto-core-dev, libltdl-dev | libltdl7-dev, libfreetype6-dev, autotools-dev, r-base-core (>= 2.0), libimlib2-dev, netpbm, libjpeg-progs, libtiff-tools, ispell, librsvg2-bin, xfig, imagemagick, ghostscript, libqt4-dev +Build-Depends: debhelper (>= 7.0), cdbs (>= 0.4), quilt, guile-1.8-dev [!ia64], guile-1.6-dev [ia64], libxt-dev, libx11-dev, x11proto-core-dev, libltdl-dev | libltdl7-dev, libfreetype6-dev, autotools-dev, r-base-core (>= 2.0), libimlib2-dev, netpbm, libjpeg-progs, libtiff-tools, ispell, librsvg2-bin, xfig, imagemagick, ghostscript, libqt4-dev Standards-Version: 3.9.1 Package: texmacs diff -Nru texmacs-1.0.7.13/debian/patches/00list texmacs-1.0.7.14/debian/patches/00list --- texmacs-1.0.7.13/debian/patches/00list 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -01_american.dpatch -02_man.dpatch -03_mupad.dpatch -04_axiom.dpatch -05_fixRd.dpatch -#06_rebuild-r.dpatch -07_fig2ps.dpatch -08_gzipbest.dpatch -#09_ipa.dpatch -10_tex-files.cpp.dpatch -11_desktop-file.dpatch -#12_mupad.dpatch diff -Nru texmacs-1.0.7.13/debian/patches/01_american.dpatch texmacs-1.0.7.14/debian/patches/01_american.dpatch --- texmacs-1.0.7.13/debian/patches/01_american.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/01_american.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_american.dpatch by Ralf Treinen -## -## DP: replace "english" by "american" in menus. #161588 -## DP: -## DP: Kamaraju Kusumanchi updated this patch to merge with texmacs 1.0.6.14's -## DP: source. -## DP: Updated for 1.0.7.9 by Atsuhito Kohda :2011-1-26(Wed) - -@DPATCH@ -diff -ru texmacs-1.0.6.14~/src/System/Language/dictionary.cpp texmacs-1.0.6.14/src/System/Language/dictionary.cpp ---- texmacs-1.0.6.14~/src/System/Language/dictionary.cpp 2008-03-19 13:16:37.000000000 -0400 -+++ texmacs-1.0.6.14/src/System/Language/dictionary.cpp 2008-04-03 19:37:51.000000000 -0400 -@@ -62,6 +62,8 @@ - - dictionary - load_dictionary (string from, string to) { -+ if (to == "british" || to == "american") -+ to = "english"; - string name= from * "-" * to; - if (dictionary::instances -> contains (name)) - return dictionary (name); -diff -ru texmacs-1.0.6.14~/src/System/Language/text_language.cpp texmacs-1.0.6.14/src/System/Language/text_language.cpp ---- texmacs-1.0.6.14~/src/System/Language/text_language.cpp 2008-03-19 13:16:37.000000000 -0400 -+++ texmacs-1.0.6.14/src/System/Language/text_language.cpp 2008-04-03 19:42:41.000000000 -0400 -@@ -205,6 +205,7 @@ - if (N(s) > 5) s= s (0, 5); - if (s == "en_GB") return "british"; - if (s == "zh_TW") return "taiwanese"; -+ if (s == "en_US") return "american"; - if (N(s) > 2) s= s (0, 2); - if (s == "bg") return "bulgarian"; - if (s == "zh") return "chinese"; -@@ -227,7 +228,7 @@ - if (s == "es") return "spanish"; - if (s == "sv") return "swedish"; - if (s == "uk") return "ukrainian"; -- return "english"; -+ return "american"; - } - - string -@@ -272,7 +273,7 @@ - if (env_lan != "") return locale_to_language (env_lan); - env_lan= get_env ("GDM_LANG"); - if (env_lan != "") return locale_to_language (env_lan); -- return "english"; -+ return "american"; - #endif - } - -diff -ru texmacs-1.0.6.14~/TeXmacs/progs/generic/document-menu.scm texmacs-1.0.6.14/TeXmacs/progs/generic/document-menu.scm ---- texmacs-1.0.6.14~/TeXmacs/progs/generic/document-menu.scm 2008-03-19 13:16:36.000000000 -0400 -+++ texmacs-1.0.6.14/TeXmacs/progs/generic/document-menu.scm 2008-04-03 19:43:49.000000000 -0400 -@@ -83,6 +83,10 @@ - ("Minimal" (init-env "src-close" "minimal")))) - - (menu-bind global-language-menu -+ ("American" -+ (begin -+ (init-language "american") -+ (set-output-language "american"))) - ("British" - (begin - (init-language "british") -@@ -108,10 +112,6 @@ - (begin - (init-language "dutch") - (set-output-language "dutch"))) -- ("English" -- (begin -- (init-language "english") -- (set-output-language "english"))) - ("Finnish" - (begin - (init-language "finnish") -@@ -442,6 +442,7 @@ - (-> "Language" - ("Default" (init-default "language")) - --- -+ ("American" (init-language "american")) - ("British" (init-language "british")) - ("Bulgarian" (init-language "bulgarian")) - (when (supports-chinese?) -@@ -449,7 +450,6 @@ - ("Czech" (init-language "czech")) - ("Danish" (init-language "danish")) - ("Dutch" (init-language "dutch")) -- ("English" (init-language "english")) - ("Finnish" (init-language "finnish")) - ("French" (init-language "french")) - ("German" (init-language "german")) -diff -ru texmacs-1.0.6.14~/TeXmacs/progs/texmacs/menus/preferences-menu.scm texmacs-1.0.6.14/TeXmacs/progs/texmacs/menus/preferences-menu.scm ---- texmacs-1.0.6.14~/TeXmacs/progs/texmacs/menus/preferences-menu.scm 2008-03-19 13:16:36.000000000 -0400 -+++ texmacs-1.0.6.14/TeXmacs/progs/texmacs/menus/preferences-menu.scm 2008-04-03 19:43:49.000000000 -0400 -@@ -86,13 +86,13 @@ - "1" "2" "3" "4" "5" "7" "10" *)) - --- - (enum ("Language" "language") -+ ("American" "american") - ("British" "british") - ("Bulgarian" "bulgarian") - ("Chinese" "chinese") - ("Czech" "czech") - ("Dutch" "dutch") - ("Danish" "danish") -- ("English" "english") - ("Finnish" "finnish") - ("French" "french") - ("German" "german") -diff -ru texmacs-1.0.6.14~/TeXmacs/progs/text/format-text-menu.scm texmacs-1.0.6.14/TeXmacs/progs/text/format-text-menu.scm ---- texmacs-1.0.6.14~/TeXmacs/progs/text/format-text-menu.scm 2008-03-19 13:16:36.000000000 -0400 -+++ texmacs-1.0.6.14/TeXmacs/progs/text/format-text-menu.scm 2008-04-03 19:43:49.000000000 -0400 -@@ -306,6 +306,7 @@ - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - (menu-bind text-language-menu -+ ("American" (make-with "language" "american")) - ("British" (make-with "language" "british")) - ("Bulgarian" - (begin -@@ -319,7 +320,6 @@ - ("Czech" (make-with "language" "czech")) - ("Danish" (make-with "language" "danish")) - ("Dutch" (make-with "language" "dutch")) -- ("English" (make-with "language" "english")) - ("Finnish" (make-with "language" "finnish")) - ("French" (make-with "language" "french")) - ("German" (make-with "language" "german")) diff -Nru texmacs-1.0.7.13/debian/patches/01_american.patch texmacs-1.0.7.14/debian/patches/01_american.patch --- texmacs-1.0.7.13/debian/patches/01_american.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/01_american.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,128 @@ +#! /bin/sh +## 01_american.dpatch by Ralf Treinen +## +## DP: replace "english" by "american" in menus. #161588 +## DP: +## DP: Kamaraju Kusumanchi updated this patch to merge with texmacs 1.0.6.14's +## DP: source. +## DP: Updated for 1.0.7.9 by Atsuhito Kohda :2011-1-26(Wed) + +diff -ru texmacs-1.0.6.14~/src/System/Language/dictionary.cpp texmacs-1.0.6.14/src/System/Language/dictionary.cpp +--- texmacs-1.0.6.14~/src/System/Language/dictionary.cpp 2008-03-19 13:16:37.000000000 -0400 ++++ texmacs-1.0.6.14/src/System/Language/dictionary.cpp 2008-04-03 19:37:51.000000000 -0400 +@@ -62,6 +62,8 @@ + + dictionary + load_dictionary (string from, string to) { ++ if (to == "british" || to == "american") ++ to = "english"; + string name= from * "-" * to; + if (dictionary::instances -> contains (name)) + return dictionary (name); +diff -ru texmacs-1.0.6.14~/src/System/Language/text_language.cpp texmacs-1.0.6.14/src/System/Language/text_language.cpp +--- texmacs-1.0.6.14~/src/System/Language/text_language.cpp 2008-03-19 13:16:37.000000000 -0400 ++++ texmacs-1.0.6.14/src/System/Language/text_language.cpp 2008-04-03 19:42:41.000000000 -0400 +@@ -207,6 +207,7 @@ + if (N(s) > 5) s= s (0, 5); + if (s == "en_GB") return "british"; + if (s == "zh_TW") return "taiwanese"; ++ if (s == "en_US") return "american"; + if (N(s) > 2) s= s (0, 2); + if (s == "bg") return "bulgarian"; + if (s == "zh") return "chinese"; +@@ -229,7 +230,7 @@ + if (s == "es") return "spanish"; + if (s == "sv") return "swedish"; + if (s == "uk") return "ukrainian"; +- return "english"; ++ return "american"; + } + + string +@@ -274,7 +275,7 @@ + if (env_lan != "") return locale_to_language (env_lan); + env_lan= get_env ("GDM_LANG"); + if (env_lan != "") return locale_to_language (env_lan); +- return "english"; ++ return "american"; + #endif + } + +diff -ru texmacs-1.0.6.14~/TeXmacs/progs/generic/document-menu.scm texmacs-1.0.6.14/TeXmacs/progs/generic/document-menu.scm +--- texmacs-1.0.6.14~/TeXmacs/progs/generic/document-menu.scm 2008-03-19 13:16:36.000000000 -0400 ++++ texmacs-1.0.6.14/TeXmacs/progs/generic/document-menu.scm 2008-04-03 19:43:49.000000000 -0400 +@@ -84,6 +84,10 @@ + ("Minimal" (init-env "src-close" "minimal")))) + + (menu-bind global-language-menu ++ ("American" ++ (begin ++ (init-language "american") ++ (set-output-language "american"))) + ("British" + (begin + (init-language "british") +@@ -109,10 +113,6 @@ + (begin + (init-language "dutch") + (set-output-language "dutch"))) +- ("English" +- (begin +- (init-language "english") +- (set-output-language "english"))) + ("Finnish" + (begin + (init-language "finnish") +@@ -446,6 +446,7 @@ + (-> "Language" + ("Default" (init-default "language")) + --- ++ ("American" (init-language "american")) + ("British" (init-language "british")) + ("Bulgarian" (init-language "bulgarian")) + (when (supports-chinese?) +@@ -453,7 +454,6 @@ + ("Czech" (init-language "czech")) + ("Danish" (init-language "danish")) + ("Dutch" (init-language "dutch")) +- ("English" (init-language "english")) + ("Finnish" (init-language "finnish")) + ("French" (init-language "french")) + ("German" (init-language "german")) +diff -ru texmacs-1.0.6.14~/TeXmacs/progs/texmacs/menus/preferences-menu.scm texmacs-1.0.6.14/TeXmacs/progs/texmacs/menus/preferences-menu.scm +--- texmacs-1.0.6.14~/TeXmacs/progs/texmacs/menus/preferences-menu.scm 2008-03-19 13:16:36.000000000 -0400 ++++ texmacs-1.0.6.14/TeXmacs/progs/texmacs/menus/preferences-menu.scm 2008-04-03 19:43:49.000000000 -0400 +@@ -86,13 +86,13 @@ + "1" "2" "3" "4" "5" "7" "10" *)) + --- + (enum ("Language" "language") ++ ("American" "american") + ("British" "british") + ("Bulgarian" "bulgarian") + ("Chinese" "chinese") + ("Czech" "czech") + ("Dutch" "dutch") + ("Danish" "danish") +- ("English" "english") + ("Finnish" "finnish") + ("French" "french") + ("German" "german") +diff -ru texmacs-1.0.6.14~/TeXmacs/progs/text/format-text-menu.scm texmacs-1.0.6.14/TeXmacs/progs/text/format-text-menu.scm +--- texmacs-1.0.6.14~/TeXmacs/progs/text/format-text-menu.scm 2008-03-19 13:16:36.000000000 -0400 ++++ texmacs-1.0.6.14/TeXmacs/progs/text/format-text-menu.scm 2008-04-03 19:43:49.000000000 -0400 +@@ -305,6 +305,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + (menu-bind text-language-menu ++ ("American" (make-with "language" "american")) + ("British" (make-with "language" "british")) + ("Bulgarian" + (begin +@@ -318,7 +319,6 @@ + ("Czech" (make-with "language" "czech")) + ("Danish" (make-with "language" "danish")) + ("Dutch" (make-with "language" "dutch")) +- ("English" (make-with "language" "english")) + ("Finnish" (make-with "language" "finnish")) + ("French" (make-with "language" "french")) + ("German" (make-with "language" "german")) diff -Nru texmacs-1.0.7.13/debian/patches/02_man.dpatch texmacs-1.0.7.14/debian/patches/02_man.dpatch --- texmacs-1.0.7.13/debian/patches/02_man.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/02_man.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_man.dpatch by Atsuhito Kohda -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fixed manual to erase a lintian warning. - -@DPATCH@ ---- texmacs-1.0.7.4/misc/man/texmacs.1.in~ 2010-03-25 07:58:02.000000000 +0900 -+++ texmacs-1.0.7.4/misc/man/texmacs.1.in 2010-04-22 15:32:24.000000000 +0900 -@@ -1,6 +1,6 @@ - .TH texmacs 1 "12Sep2005" @PACKAGE@-@DEVEL_VERSION@ - .SH NAME --GNU TeXmacs - a WYSIWYG mathematical text editor -+GNU TeXmacs \- a WYSIWYG mathematical text editor - .PP - .SH SYNOPSIS - texmacs [\fIOPTION\fR]... [\fISOURCE\fR]... diff -Nru texmacs-1.0.7.13/debian/patches/02_man.patch texmacs-1.0.7.14/debian/patches/02_man.patch --- texmacs-1.0.7.13/debian/patches/02_man.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/02_man.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,16 @@ +#! /bin/sh +## 02_man.dpatch by Atsuhito Kohda +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fixed manual to erase a lintian warning. + +--- texmacs-1.0.7.4/misc/man/texmacs.1.in~ 2010-03-25 07:58:02.000000000 +0900 ++++ texmacs-1.0.7.4/misc/man/texmacs.1.in 2010-04-22 15:32:24.000000000 +0900 +@@ -1,6 +1,6 @@ + .TH texmacs 1 "12Sep2005" @PACKAGE@-@DEVEL_VERSION@ + .SH NAME +-GNU TeXmacs - a WYSIWYG mathematical text editor ++GNU TeXmacs \- a WYSIWYG mathematical text editor + .PP + .SH SYNOPSIS + texmacs [\fIOPTION\fR]... [\fISOURCE\fR]... diff -Nru texmacs-1.0.7.13/debian/patches/03_mupad.dpatch texmacs-1.0.7.14/debian/patches/03_mupad.dpatch --- texmacs-1.0.7.13/debian/patches/03_mupad.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/03_mupad.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_mupad.dpatch by Ralf Treinen -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: proper invocation of perl - -@DPATCH@ - ---- texmacs-1.0.5.9~/plugins/mupad/bin/tm_mupad -+++ texmacs-1.0.5.9/plugins/mupad/bin/tm_mupad -@@ -1,5 +1,4 @@ --: --#!/bin/bash -- # -*- perl -*- -+#!/usr/bin/perl - # $Id: tm_mupad 2463 2008-12-14 21:03:24Z vdhoeven $ - # - # MuPAD <-> TeXmacs communication link. diff -Nru texmacs-1.0.7.13/debian/patches/03_mupad.patch texmacs-1.0.7.14/debian/patches/03_mupad.patch --- texmacs-1.0.7.13/debian/patches/03_mupad.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/03_mupad.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,15 @@ +#! /bin/sh +## 03_mupad.dpatch by Ralf Treinen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: proper invocation of perl + +--- texmacs-1.0.5.9~/plugins/mupad/bin/tm_mupad ++++ texmacs-1.0.5.9/plugins/mupad/bin/tm_mupad +@@ -1,5 +1,4 @@ +-: +-#!/bin/bash -- # -*- perl -*- ++#!/usr/bin/perl + # $Id: tm_mupad 2463 2008-12-14 21:03:24Z vdhoeven $ + # + # MuPAD <-> TeXmacs communication link. diff -Nru texmacs-1.0.7.13/debian/patches/04_axiom.dpatch texmacs-1.0.7.14/debian/patches/04_axiom.dpatch --- texmacs-1.0.7.13/debian/patches/04_axiom.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/04_axiom.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -#!/bin/sh -e -## 04_axiom.dpatch by Ralf Treinen -## and modified by Atsuhito Kohda -## All lines beginning with `## DP:' are a description of the patch. -## DP: modify the axiom plugin to use /usr/bin/axiom instead of AXIOMsys -## DP: #229172 and also #567339 - -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad /home/rt/debian/own/texmacs/texmacs-1.0.3/plugins/axiom/src/tm_axiom.c texmacs-1.0.3/plugins/axiom/src/tm_axiom.c ---- /home/rt/debian/own/texmacs/texmacs-1.0.3/plugins/axiom/src/tm_axiom.c 2004-01-13 21:00:39.000000000 +0100 -+++ texmacs-1.0.3/plugins/axiom/src/tm_axiom.c 2004-01-23 21:12:20.000000000 +0100 -@@ -298,8 +298,8 @@ - case 0: /* Axiom */ - dup2(p1[1],1); close(p1[1]); close(p1[0]); - dup2(p2[0],0); close(p2[0]); close(p2[1]); -- execlp("AXIOMsys","AXIOMsys","-noclef",NULL); -- fatal("exec AXIOMsys"); -+ execlp("/usr/bin/axiom","/usr/bin/axiom","-noclef","-noht","-nogr",0); -+ fatal("exec /usr/bin/axiom"); - default: /* parent */ - close(p1[1]); close(p2[0]); - axin=fdopen(p2[1],"w"); axout=fdopen(p1[0],"r"); ---- texmacs-1.0.7.3/plugins/axiom/progs/init-axiom.scm~ 2009-11-27 03:55:20.000000000 +0900 -+++ texmacs-1.0.7.3/plugins/axiom/progs/init-axiom.scm 2010-02-17 07:35:44.000000000 +0900 -@@ -16,7 +16,7 @@ - (lazy-input-converter (axiom-input) axiom)) - - (plugin-configure axiom -- (:require (url-exists-in-path? "AXIOMsys")) -+ (:require (url-exists-in-path? "axiom")) - (:initialize (axiom-initialize)) - (:launch "tm_axiom") - (:session "Axiom")) diff -Nru texmacs-1.0.7.13/debian/patches/04_axiom.patch texmacs-1.0.7.14/debian/patches/04_axiom.patch --- texmacs-1.0.7.13/debian/patches/04_axiom.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/04_axiom.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,32 @@ +#!/bin/sh -e +## 04_axiom.dpatch by Ralf Treinen +## and modified by Atsuhito Kohda +## All lines beginning with `## DP:' are a description of the patch. +## DP: modify the axiom plugin to use /usr/bin/axiom instead of AXIOMsys +## DP: #229172 and also #567339 + +diff -urNad /home/rt/debian/own/texmacs/texmacs-1.0.3/plugins/axiom/src/tm_axiom.c texmacs-1.0.3/plugins/axiom/src/tm_axiom.c +--- /home/rt/debian/own/texmacs/texmacs-1.0.3/plugins/axiom/src/tm_axiom.c 2004-01-13 21:00:39.000000000 +0100 ++++ texmacs-1.0.3/plugins/axiom/src/tm_axiom.c 2004-01-23 21:12:20.000000000 +0100 +@@ -298,8 +298,8 @@ + case 0: /* Axiom */ + dup2(p1[1],1); close(p1[1]); close(p1[0]); + dup2(p2[0],0); close(p2[0]); close(p2[1]); +- execlp("AXIOMsys","AXIOMsys","-noclef",NULL); +- fatal("exec AXIOMsys"); ++ execlp("/usr/bin/axiom","/usr/bin/axiom","-noclef","-noht","-nogr",0); ++ fatal("exec /usr/bin/axiom"); + default: /* parent */ + close(p1[1]); close(p2[0]); + axin=fdopen(p2[1],"w"); axout=fdopen(p1[0],"r"); +--- texmacs-1.0.7.3/plugins/axiom/progs/init-axiom.scm~ 2009-11-27 03:55:20.000000000 +0900 ++++ texmacs-1.0.7.3/plugins/axiom/progs/init-axiom.scm 2010-02-17 07:35:44.000000000 +0900 +@@ -16,7 +16,7 @@ + (lazy-input-converter (axiom-input) axiom)) + + (plugin-configure axiom +- (:require (url-exists-in-path? "AXIOMsys")) ++ (:require (url-exists-in-path? "axiom")) + (:initialize (axiom-initialize)) + (:launch "tm_axiom") + (:session "Axiom")) diff -Nru texmacs-1.0.7.13/debian/patches/05_fixRd.dpatch texmacs-1.0.7.14/debian/patches/05_fixRd.dpatch --- texmacs-1.0.7.13/debian/patches/05_fixRd.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/05_fixRd.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## fixRd.dpatch by Atsuhito Kohda -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: replace obsolete TeXmacs.Rd with TeXmacs.Rd and view.Rd -## DP: suggested by Dirk Eddelbuettel - -@DPATCH@ ---- texmacs-1.0.7.3/plugins/r/r/TeXmacs/man/TeXmacs.Rd.orig 2010-02-11 15:07:05.000000000 +0900 -+++ texmacs-1.0.7.3/plugins/r/r/TeXmacs/man/TeXmacs.Rd 2010-02-11 15:02:28.000000000 +0900 -@@ -4,7 +4,7 @@ - %- Also NEED an '\alias' for EACH other topic documented here. - \title{ function to start postscript TeXmacs interface } - \description{ -- Usually one uses the X11 device when interacting with TeXmacs. When -+ Usually one uses the X11 device when interacting with TeXmacs. When - X11 is not available (for example in a remote login, start.view() will - open a postscript file with all defaults set correctly. end.view() - will close that file. While working, use v() to insert the current -@@ -16,11 +16,10 @@ - } - %- maybe also 'usage' for other objects documented here. - \details{ -- -+ - } - \author{ Michael Lachmann Tamarlin } -- --Make other sections like Warning with \section{Warning }{....} -+% Make other sections like Warning with \section{Warning }{....} - \seealso{ See also \code{\link{TeXmacs}}, } - \examples{ - ##---- Should be DIRECTLY executable !! ---- -@@ -41,44 +40,3 @@ - \keyword{ view }% __ONLY ONE__ keyword per line - \keyword{ device } - \keyword{ graphics } --\eof --\name{view} --\alias{v} --\alias{plotv} --\alias{pointsv} --\alias{linev} --\title{ Insert current graphic into TeXmacs } --\description{ -- Once a graph is plotted and ready to go into the TeXmacs buffer, -- you insert it into the buffer using the v() function. The plotv, -- linev, and pointsv are just shortcuts for plot and then v. --} --\usage{ --v(width = 4, height = 4, ...) --plotv(...) --pointsv(...) --linev(...) --} --%- maybe also 'usage' for other objects documented here. --\arguments{ -- \item{width}{ Width of graph in inches. } -- \item{height}{ Height of graph in inches. } -- \item{\dots}{ Additional arguments for postscript. } --} --\author{ Michael Lachmann Tamarlin } -- --\seealso{ See Also \code{\link{TeXmacs}}, } --\examples{ --x<-(0:600)/100; --plot(x,sin(x),type="l"); --lines(x,cos(x),col=2); --legend(0,-0.5,c("sin(x)","cos(x)"),lty=1,col=c(1:2)); --v(); --plotv(x,sin(60/x),type="l"); --} --\keyword{ TeXmacs }% at least one, from doc/KEYWORDS --\keyword{ graphics }% __ONLY ONE__ keyword per line --\keyword{ view }% __ONLY ONE__ keyword per line --\keyword{ device }% __ONLY ONE__ keyword per line --\keyword{ plot }% __ONLY ONE__ keyword per line --\eof ---- texmacs-1.0.7.3/plugins/r/r/TeXmacs/man/view.Rd.orig 1970-01-01 09:00:00.000000000 +0900 -+++ texmacs-1.0.7.3/plugins/r/r/TeXmacs/man/view.Rd 2010-02-11 15:02:34.000000000 +0900 -@@ -0,0 +1,39 @@ -+\name{view} -+\alias{v} -+\alias{plotv} -+\alias{pointsv} -+\alias{linev} -+\title{ Insert current graphic into TeXmacs } -+\description{ -+ Once a graph is plotted and ready to go into the TeXmacs buffer, -+ you insert it into the buffer using the v() function. The plotv, -+ linev, and pointsv are just shortcuts for plot and then v. -+} -+\usage{ -+v(width = 4, height = 4, ...) -+plotv(...) -+pointsv(...) -+linev(...) -+} -+%- maybe also 'usage' for other objects documented here. -+\arguments{ -+ \item{width}{ Width of graph in inches. } -+ \item{height}{ Height of graph in inches. } -+ \item{\dots}{ Additional arguments for postscript. } -+} -+\author{ Michael Lachmann Tamarlin } -+ -+\seealso{ See Also \code{\link{TeXmacs}}, } -+\examples{ -+x<-(0:600)/100; -+plot(x,sin(x),type="l"); -+lines(x,cos(x),col=2); -+legend(0,-0.5,c("sin(x)","cos(x)"),lty=1,col=c(1:2)); -+v(); -+plotv(x,sin(60/x),type="l"); -+} -+\keyword{ TeXmacs }% at least one, from doc/KEYWORDS -+\keyword{ graphics }% __ONLY ONE__ keyword per line -+\keyword{ view }% __ONLY ONE__ keyword per line -+\keyword{ device }% __ONLY ONE__ keyword per line -+\keyword{ plot }% __ONLY ONE__ keyword per line diff -Nru texmacs-1.0.7.13/debian/patches/05_fixRd.patch texmacs-1.0.7.14/debian/patches/05_fixRd.patch --- texmacs-1.0.7.13/debian/patches/05_fixRd.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/05_fixRd.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,119 @@ +#! /bin/sh +## fixRd.dpatch by Atsuhito Kohda +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: replace obsolete TeXmacs.Rd with TeXmacs.Rd and view.Rd +## DP: suggested by Dirk Eddelbuettel + +--- texmacs-1.0.7.3/plugins/r/r/TeXmacs/man/TeXmacs.Rd.orig 2010-02-11 15:07:05.000000000 +0900 ++++ texmacs-1.0.7.3/plugins/r/r/TeXmacs/man/TeXmacs.Rd 2010-02-11 15:02:28.000000000 +0900 +@@ -4,7 +4,7 @@ + %- Also NEED an '\alias' for EACH other topic documented here. + \title{ function to start postscript TeXmacs interface } + \description{ +- Usually one uses the X11 device when interacting with TeXmacs. When ++ Usually one uses the X11 device when interacting with TeXmacs. When + X11 is not available (for example in a remote login, start.view() will + open a postscript file with all defaults set correctly. end.view() + will close that file. While working, use v() to insert the current +@@ -16,11 +16,10 @@ + } + %- maybe also 'usage' for other objects documented here. + \details{ +- ++ + } + \author{ Michael Lachmann Tamarlin } +- +-Make other sections like Warning with \section{Warning }{....} ++% Make other sections like Warning with \section{Warning }{....} + \seealso{ See also \code{\link{TeXmacs}}, } + \examples{ + ##---- Should be DIRECTLY executable !! ---- +@@ -41,44 +40,3 @@ + \keyword{ view }% __ONLY ONE__ keyword per line + \keyword{ device } + \keyword{ graphics } +-\eof +-\name{view} +-\alias{v} +-\alias{plotv} +-\alias{pointsv} +-\alias{linev} +-\title{ Insert current graphic into TeXmacs } +-\description{ +- Once a graph is plotted and ready to go into the TeXmacs buffer, +- you insert it into the buffer using the v() function. The plotv, +- linev, and pointsv are just shortcuts for plot and then v. +-} +-\usage{ +-v(width = 4, height = 4, ...) +-plotv(...) +-pointsv(...) +-linev(...) +-} +-%- maybe also 'usage' for other objects documented here. +-\arguments{ +- \item{width}{ Width of graph in inches. } +- \item{height}{ Height of graph in inches. } +- \item{\dots}{ Additional arguments for postscript. } +-} +-\author{ Michael Lachmann Tamarlin } +- +-\seealso{ See Also \code{\link{TeXmacs}}, } +-\examples{ +-x<-(0:600)/100; +-plot(x,sin(x),type="l"); +-lines(x,cos(x),col=2); +-legend(0,-0.5,c("sin(x)","cos(x)"),lty=1,col=c(1:2)); +-v(); +-plotv(x,sin(60/x),type="l"); +-} +-\keyword{ TeXmacs }% at least one, from doc/KEYWORDS +-\keyword{ graphics }% __ONLY ONE__ keyword per line +-\keyword{ view }% __ONLY ONE__ keyword per line +-\keyword{ device }% __ONLY ONE__ keyword per line +-\keyword{ plot }% __ONLY ONE__ keyword per line +-\eof +--- texmacs-1.0.7.3/plugins/r/r/TeXmacs/man/view.Rd.orig 1970-01-01 09:00:00.000000000 +0900 ++++ texmacs-1.0.7.3/plugins/r/r/TeXmacs/man/view.Rd 2010-02-11 15:02:34.000000000 +0900 +@@ -0,0 +1,39 @@ ++\name{view} ++\alias{v} ++\alias{plotv} ++\alias{pointsv} ++\alias{linev} ++\title{ Insert current graphic into TeXmacs } ++\description{ ++ Once a graph is plotted and ready to go into the TeXmacs buffer, ++ you insert it into the buffer using the v() function. The plotv, ++ linev, and pointsv are just shortcuts for plot and then v. ++} ++\usage{ ++v(width = 4, height = 4, ...) ++plotv(...) ++pointsv(...) ++linev(...) ++} ++%- maybe also 'usage' for other objects documented here. ++\arguments{ ++ \item{width}{ Width of graph in inches. } ++ \item{height}{ Height of graph in inches. } ++ \item{\dots}{ Additional arguments for postscript. } ++} ++\author{ Michael Lachmann Tamarlin } ++ ++\seealso{ See Also \code{\link{TeXmacs}}, } ++\examples{ ++x<-(0:600)/100; ++plot(x,sin(x),type="l"); ++lines(x,cos(x),col=2); ++legend(0,-0.5,c("sin(x)","cos(x)"),lty=1,col=c(1:2)); ++v(); ++plotv(x,sin(60/x),type="l"); ++} ++\keyword{ TeXmacs }% at least one, from doc/KEYWORDS ++\keyword{ graphics }% __ONLY ONE__ keyword per line ++\keyword{ view }% __ONLY ONE__ keyword per line ++\keyword{ device }% __ONLY ONE__ keyword per line ++\keyword{ plot }% __ONLY ONE__ keyword per line diff -Nru texmacs-1.0.7.13/debian/patches/06_rebuild-r.dpatch texmacs-1.0.7.14/debian/patches/06_rebuild-r.dpatch --- texmacs-1.0.7.13/debian/patches/06_rebuild-r.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/06_rebuild-r.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#! /bin/sh -e - -## DP: #295715 - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -if [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -case "$1" in - -patch) - if ! [ -e r-plugin.save ]; then - cp -r plugins/r/r r-plugin.save - fi - - cd plugins/r/r/TeXmacs; - sed -e "/^Built/d" < DESCRIPTION > DESCRIPTION.cut; - mv DESCRIPTION.cut DESCRIPTION; - cd ..; - R CMD build --force TeXmacs; - R CMD INSTALL -l `pwd` TeXmacs_0.1.tar.gz - - ;; - - -unpatch) - if [ -e r-plugin.save ]; then - rm -r plugins/r/r && mv r-plugin.save plugins/r/r - fi - ;; - - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 diff -Nru texmacs-1.0.7.13/debian/patches/06_rebuild-r.patch texmacs-1.0.7.14/debian/patches/06_rebuild-r.patch --- texmacs-1.0.7.13/debian/patches/06_rebuild-r.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/06_rebuild-r.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,39 @@ +#! /bin/sh -e + +## DP: #295715 + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +case "$1" in + -patch) + if ! [ -e r-plugin.save ]; then + cp -r plugins/r/r r-plugin.save + fi + + cd plugins/r/r/TeXmacs; + sed -e "/^Built/d" < DESCRIPTION > DESCRIPTION.cut; + mv DESCRIPTION.cut DESCRIPTION; + cd ..; + R CMD build --force TeXmacs; + R CMD INSTALL -l `pwd` TeXmacs_0.1.tar.gz + + ;; + + -unpatch) + if [ -e r-plugin.save ]; then + rm -r plugins/r/r && mv r-plugin.save plugins/r/r + fi + ;; + + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 diff -Nru texmacs-1.0.7.13/debian/patches/07_fig2ps.dpatch texmacs-1.0.7.14/debian/patches/07_fig2ps.dpatch --- texmacs-1.0.7.13/debian/patches/07_fig2ps.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/07_fig2ps.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#! /bin/sh -e -## 07_fig2ps.dpatch by Ralf Treinen -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fig2ps from the fig2ps package writes to standard output, -## DP: instead of to the file given as second argument - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ ---- TeXmacs-1.0.6.1-src/TeXmacs/progs/convert/images/init-images.scm 2006-05-12 22:23:09.000000000 +0200 -+++ texmacs-1.0.6.1/TeXmacs/progs/convert/images/init-images.scm 2006-05-12 22:21:23.000000000 +0200 -@@ -36,7 +36,7 @@ - (:suffix "fig")) - - (converter xfig-file postscript-file -- (:shell "fig2ps" from to)) -+ (:shell "/usr/lib/texmacs/TeXmacs/bin/fig2ps" from to)) - - (define-format xmgrace - (:name "Xmgrace") diff -Nru texmacs-1.0.7.13/debian/patches/07_fig2ps.patch texmacs-1.0.7.14/debian/patches/07_fig2ps.patch --- texmacs-1.0.7.13/debian/patches/07_fig2ps.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/07_fig2ps.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,18 @@ +#! /bin/sh -e +## 07_fig2ps.dpatch by Ralf Treinen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fig2ps from the fig2ps package writes to standard output, +## DP: instead of to the file given as second argument + +--- TeXmacs-1.0.6.1-src/TeXmacs/progs/convert/images/init-images.scm 2006-05-12 22:23:09.000000000 +0200 ++++ texmacs-1.0.6.1/TeXmacs/progs/convert/images/init-images.scm 2006-05-12 22:21:23.000000000 +0200 +@@ -36,7 +36,7 @@ + (:suffix "fig")) + + (converter xfig-file postscript-file +- (:shell "fig2ps" from to)) ++ (:shell "/usr/lib/texmacs/TeXmacs/bin/fig2ps" from to)) + + (define-format xmgrace + (:name "Xmgrace") diff -Nru texmacs-1.0.7.13/debian/patches/08_gzipbest.dpatch texmacs-1.0.7.14/debian/patches/08_gzipbest.dpatch --- texmacs-1.0.7.13/debian/patches/08_gzipbest.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/08_gzipbest.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -#! /bin/sh -e -## 08_gzipbest.dpatch by Ralf Treinen -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: use gzip with maximal compression level -## DP: Updated for 1.0.7.9 by Atsuhito Kohda :2011-1-26(Wed) - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ ---- texmacs-1.0.7.9/Makefile.in.orig 2004-01-13 21:00:38.000000000 +0100 -+++ texmacs-1.0.7.9/Makefile.in 2004-04-04 19:16:33.000000000 +0200 -@@ -32,7 +32,7 @@ - MV = mv -f - LN = ln -f - CHMOD = @CONFIG_CHMOD@ --GZIP = gzip -f -+GZIP = gzip -f --best - STRIP = @CONFIG_STRIP@ - TOUCH = touch - diff -Nru texmacs-1.0.7.13/debian/patches/08_gzipbest.patch texmacs-1.0.7.14/debian/patches/08_gzipbest.patch --- texmacs-1.0.7.13/debian/patches/08_gzipbest.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/08_gzipbest.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,18 @@ +#! /bin/sh -e +## 08_gzipbest.dpatch by Ralf Treinen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use gzip with maximal compression level +## DP: Updated for 1.0.7.9 by Atsuhito Kohda :2011-1-26(Wed) + +--- texmacs-1.0.7.9/Makefile.in.orig 2004-01-13 21:00:38.000000000 +0100 ++++ texmacs-1.0.7.9/Makefile.in 2004-04-04 19:16:33.000000000 +0200 +@@ -38,7 +38,7 @@ + MV = mv -f + LN = ln -f + CHMOD = @CONFIG_CHMOD@ +-GZIP = gzip -f ++GZIP = gzip -f --best + STRIP = @CONFIG_STRIP@ + TOUCH = touch + diff -Nru texmacs-1.0.7.13/debian/patches/09_ipa.dpatch texmacs-1.0.7.14/debian/patches/09_ipa.dpatch --- texmacs-1.0.7.13/debian/patches/09_ipa.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/09_ipa.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## ipa.dpatch by Atsuhito Kohda -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: replace "ipa" fonts to "ttf-japanese-mincho/-gothic" fonts -## DP: because ipa fonts are not in Debian and ttf-japanese-mincho/-gothic -## DP: are more robust/reasonable candidates. - -@DPATCH@ - ---- texmacs-1.0.7.2.orig/TeXmacs/progs/fonts/fonts-truetype.scm -+++ texmacs-1.0.7.2/TeXmacs/progs/fonts/fonts-truetype.scm -@@ -68,6 +68,8 @@ - ((batang $v $a $b $s $d) (unicode Batang $s $d)) - ((fireflysung $v $a $b $s $d) (unicode fireflysung $s $d)) - ((gulim $v $a $b $s $d) (unicode Gulim $s $d)) -+ ((jpns $v bold $b $s $d) (unicode ttf-japanese-gothic $s $d)) -+ ((jpns $v $a $b $s $d) (unicode ttf-japanese-mincho $s $d)) - ((ipa ss $a $b $s $d) (unicode ipagui $s $d)) - ((ipa $v bold proportional $s $d) (unicode ipagp $s $d)) - ((ipa $v bold $b $s $d) (unicode ipag $s $d)) ---- texmacs-1.0.7.2/TeXmacs/progs/text/format-text-menu.scm.orig 2009-06-04 16:25:22.000000000 +0900 -+++ texmacs-1.0.7.2/TeXmacs/progs/text/format-text-menu.scm 2009-06-04 16:28:24.000000000 +0900 -@@ -144,6 +144,8 @@ - ("Hiragino Kaku" (make-with "font" "kaku"))) - (if (font-exists-in-tt? "ipam") - ("Ipa" (make-with "font" "ipa"))) -+ (if (font-exists-in-tt? "ttf-japanese-mincho") -+ ("Japanese" (make-with "font" "jpns"))) - (if (font-exists-in-tt? "kochi-mincho") - ("Kochi" (make-with "font" "kochi"))) - (if (font-exists-in-tt? "儷黑 Pro") ---- texmacs-1.0.7.2.orig/TeXmacs/progs/fonts/fonts-composite.scm -+++ texmacs-1.0.7.2/TeXmacs/progs/fonts/fonts-composite.scm -@@ -37,5 +37,5 @@ - (negate (virtual negate $s $d)) - (misc (virtual misc $s $d)) - (hangul (unbatang $v $a $b $s $d)) -- (oriental (ipa $v $a $b $s $d)) -+ (oriental (jpns $v $a $b $s $d)) - (any (roman $v $a $b $s $d)))))) diff -Nru texmacs-1.0.7.13/debian/patches/09_ipa.patch texmacs-1.0.7.14/debian/patches/09_ipa.patch --- texmacs-1.0.7.13/debian/patches/09_ipa.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/09_ipa.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,39 @@ +#! /bin/sh +## ipa.dpatch by Atsuhito Kohda +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: replace "ipa" fonts to "ttf-japanese-mincho/-gothic" fonts +## DP: because ipa fonts are not in Debian and ttf-japanese-mincho/-gothic +## DP: are more robust/reasonable candidates. + +--- texmacs-1.0.7.2.orig/TeXmacs/progs/fonts/fonts-truetype.scm ++++ texmacs-1.0.7.2/TeXmacs/progs/fonts/fonts-truetype.scm +@@ -68,6 +68,8 @@ + ((batang $v $a $b $s $d) (unicode Batang $s $d)) + ((fireflysung $v $a $b $s $d) (unicode fireflysung $s $d)) + ((gulim $v $a $b $s $d) (unicode Gulim $s $d)) ++ ((jpns $v bold $b $s $d) (unicode ttf-japanese-gothic $s $d)) ++ ((jpns $v $a $b $s $d) (unicode ttf-japanese-mincho $s $d)) + ((ipa ss $a $b $s $d) (unicode ipagui $s $d)) + ((ipa $v bold proportional $s $d) (unicode ipagp $s $d)) + ((ipa $v bold $b $s $d) (unicode ipag $s $d)) +--- texmacs-1.0.7.2/TeXmacs/progs/text/format-text-menu.scm.orig 2009-06-04 16:25:22.000000000 +0900 ++++ texmacs-1.0.7.2/TeXmacs/progs/text/format-text-menu.scm 2009-06-04 16:28:24.000000000 +0900 +@@ -144,6 +144,8 @@ + ("Hiragino Kaku" (make-with "font" "kaku"))) + (if (font-exists-in-tt? "ipam") + ("Ipa" (make-with "font" "ipa"))) ++ (if (font-exists-in-tt? "ttf-japanese-mincho") ++ ("Japanese" (make-with "font" "jpns"))) + (if (font-exists-in-tt? "kochi-mincho") + ("Kochi" (make-with "font" "kochi"))) + (if (font-exists-in-tt? "儷黑 Pro") +--- texmacs-1.0.7.2.orig/TeXmacs/progs/fonts/fonts-composite.scm ++++ texmacs-1.0.7.2/TeXmacs/progs/fonts/fonts-composite.scm +@@ -37,5 +37,5 @@ + (negate (virtual negate $s $d)) + (misc (virtual misc $s $d)) + (hangul (unbatang $v $a $b $s $d)) +- (oriental (ipa $v $a $b $s $d)) ++ (oriental (jpns $v $a $b $s $d)) + (any (roman $v $a $b $s $d)))))) diff -Nru texmacs-1.0.7.13/debian/patches/10_tex-files.cpp.dpatch texmacs-1.0.7.14/debian/patches/10_tex-files.cpp.dpatch --- texmacs-1.0.7.13/debian/patches/10_tex-files.cpp.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/10_tex-files.cpp.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## tex_files.cpp.diff.dpatch by René van Bevern -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ ---- texmacs-1.0.6.orig/src/Plugins/Metafont/tex_files.cpp -+++ texmacs-1.0.6/src/Plugins/Metafont/tex_files.cpp -@@ -132,8 +132,7 @@ - if (get_setting ("MAKETFM") == "maketfm"){ - if (name(N(name) - 4, N(name)) == ".tfm") - name = name (0, N(name) - 4); -- s = "maketfm --dest-dir \"" * get_env("$TEXMACS_HOME_PATH") -- * "\\fonts\\tfm\" " * name; -+ s = "maketfm "* name; - if (DEBUG_VERBOSE) cout << "TeXmacs] Executing " << s << "\n"; - system (s); - } -@@ -150,12 +149,10 @@ - system (s); - } - if (get_setting ("MAKEPK") == "mktexpk") { -- url pk_dir ("$TEXMACS_HOME_PATH/fonts/pk"); - s="mktexpk " * - string ("--dpi ") * as_string (dpi) * " " * - string ("--bdpi ") * as_string (design_dpi) * " " * - string ("--mag ") * as_string (dpi) *"/"* as_string (design_dpi) * " " * -- string ("--destdir ") * as_string (pk_dir) * " " * - name; - if (DEBUG_VERBOSE) cout << "TeXmacs] Executing " << s << "\n"; - system (s); -@@ -167,8 +164,7 @@ - * name * " " * as_string(dpi) * " " * as_string(design_dpi) - * " " * as_string(dpi) * "%//" * as_string(design_dpi); - #else -- s = "makepk --dest-dir \"" -- * get_env("$TEXMACS_HOME_PATH") * "\\fonts\\pk\" " -+ s = "makepk " - * name * " " * as_string(dpi) * " " * as_string(design_dpi) - * " " * as_string(dpi) * "/" * as_string(design_dpi); - #endif diff -Nru texmacs-1.0.7.13/debian/patches/10_tex-files.cpp.patch texmacs-1.0.7.14/debian/patches/10_tex-files.cpp.patch --- texmacs-1.0.7.13/debian/patches/10_tex-files.cpp.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/10_tex-files.cpp.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,41 @@ +#! /bin/sh +## tex_files.cpp.diff.dpatch by René van Bevern +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +--- texmacs-1.0.6.orig/src/Plugins/Metafont/tex_files.cpp ++++ texmacs-1.0.6/src/Plugins/Metafont/tex_files.cpp +@@ -132,8 +132,7 @@ + if (get_setting ("MAKETFM") == "maketfm"){ + if (name(N(name) - 4, N(name)) == ".tfm") + name = name (0, N(name) - 4); +- s = "maketfm --dest-dir \"" * get_env("$TEXMACS_HOME_PATH") +- * "\\fonts\\tfm\" " * name; ++ s = "maketfm "* name; + if (DEBUG_VERBOSE) cout << "TeXmacs] Executing " << s << "\n"; + system (s); + } +@@ -150,12 +149,10 @@ + system (s); + } + if (get_setting ("MAKEPK") == "mktexpk") { +- url pk_dir ("$TEXMACS_HOME_PATH/fonts/pk"); + s="mktexpk " * + string ("--dpi ") * as_string (dpi) * " " * + string ("--bdpi ") * as_string (design_dpi) * " " * + string ("--mag ") * as_string (dpi) *"/"* as_string (design_dpi) * " " * +- string ("--destdir ") * as_string (pk_dir) * " " * + name; + if (DEBUG_VERBOSE) cout << "TeXmacs] Executing " << s << "\n"; + system (s); +@@ -167,8 +164,7 @@ + * name * " " * as_string(dpi) * " " * as_string(design_dpi) + * " " * as_string(dpi) * "%//" * as_string(design_dpi); + #else +- s = "makepk --dest-dir \"" +- * get_env("$TEXMACS_HOME_PATH") * "\\fonts\\pk\" " ++ s = "makepk " + * name * " " * as_string(dpi) * " " * as_string(design_dpi) + * " " * as_string(dpi) * "/" * as_string(design_dpi); + #endif diff -Nru texmacs-1.0.7.13/debian/patches/11_desktop-file.dpatch texmacs-1.0.7.14/debian/patches/11_desktop-file.dpatch --- texmacs-1.0.7.13/debian/patches/11_desktop-file.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/11_desktop-file.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11-desktop-file.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ ---- texmacs-1.0.6.orig/TeXmacs/misc/mime/texmacs.desktop -+++ texmacs-1.0.6/TeXmacs/misc/mime/texmacs.desktop -@@ -1,13 +1,13 @@ - [Desktop Entry] --Name=GNU TeXmacs -+Version=1.0 -+Encoding=UTF-8 -+Name=GNU TeXmacs Editor -+GenericName=TeXmacs Editor - Comment=A structured wysiwyg scientific text editor --BinaryPattern=texmacs --Protocols= - MimeType=text/x-texmacs;text/plain;text/x-tex; - Exec=texmacs %f - Icon=TeXmacs --TerminalOptions= - Path= - Type=Application --Terminal=0 --MapNotify=false -+Terminal=false -+Categories=Application;Science;Utility; diff -Nru texmacs-1.0.7.13/debian/patches/11_desktop-file.patch texmacs-1.0.7.14/debian/patches/11_desktop-file.patch --- texmacs-1.0.7.13/debian/patches/11_desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/11_desktop-file.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,28 @@ +#! /bin/sh +## 11-desktop-file.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +--- texmacs-1.0.6.orig/TeXmacs/misc/mime/texmacs.desktop ++++ texmacs-1.0.6/TeXmacs/misc/mime/texmacs.desktop +@@ -1,13 +1,13 @@ + [Desktop Entry] +-Name=GNU TeXmacs ++Version=1.0 ++Encoding=UTF-8 ++Name=GNU TeXmacs Editor ++GenericName=TeXmacs Editor + Comment=A structured wysiwyg scientific text editor +-BinaryPattern=texmacs +-Protocols= + MimeType=text/x-texmacs;text/plain;text/x-tex; + Exec=texmacs %f + Icon=TeXmacs +-TerminalOptions= + Path= + Type=Application +-Terminal=0 +-MapNotify=false ++Terminal=false ++Categories=Application;Science;Utility; diff -Nru texmacs-1.0.7.13/debian/patches/12_mupad.dpatch texmacs-1.0.7.14/debian/patches/12_mupad.dpatch --- texmacs-1.0.7.13/debian/patches/12_mupad.dpatch 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/12_mupad.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## mupad.dpatch by Etienne Millon . -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixed an insecure change to LD_LIBRARY_PATH - -@DPATCH@ - ---- texmacs-1.0.7.7~/misc/bundle/TeXmacs 2010-10-22 21:38:06.000000000 +0200 -+++ texmacs-1.0.7.7/misc/bundle/TeXmacs 2010-12-04 20:39:43.000000000 +0100 -@@ -7,12 +7,12 @@ - RESOURCES_DIR="$LAUNCH_DIR/../Resources" - #PATH=/opt/local/bin:$PATH - PATH="$RESOURCES_DIR/bin:$PATH" --DYLD_LIBRARY_PATH="$RESOURCES_DIR/lib${DYLD_LIBRARY_PATH+":$DYLD_LIBRARY_PATH"}" -+DYLD_LIBRARY_PATH="$RESOURCES_DIR/lib"${DYLD_LIBRARY_PATH:+":$DYLD_LIBRARY_PATH"} - export RESOURCES_DIR PATH DYLD_LIBRARY_PATH - - TEXMACS_PATH="$RESOURCES_DIR/share/TeXmacs" - PATH="$TEXMACS_PATH/bin:$PATH" --DYLD_LIBRARY_PATH="$TEXMACS_PATH/lib${DYLD_LIBRARY_PATH+":$DYLD_LIBRARY_PATH"}" -+DYLD_LIBRARY_PATH="$TEXMACS_PATH/lib"${DYLD_LIBRARY_PATH:+":$DYLD_LIBRARY_PATH"} - export TEXMACS_PATH PATH DYLD_LIBRARY_PATH - - #GS_LIB=".:$RESOURCES_DIR/ghostscript/8.61/lib:$RESOURCES_DIR/ghostscript/8.61/Resource:$RESOURCES_DIR/ghostscript/fonts:$RESOURCES_DIR/fonts/default/ghostscript:$RESOURCES_DIR/fonts/default/Type1:$RESOURCES_DIR/fonts/default/TrueType:/usr/lib/DPS/outline/base:/usr/openwin/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/TrueType:/usr/share/cups/fonts" ---- texmacs-1.0.7.7~/plugins/mupad/bin/tm_mupad_help 2010-10-22 21:38:00.000000000 +0200 -+++ texmacs-1.0.7.7/plugins/mupad/bin/tm_mupad_help 2010-12-04 20:35:31.000000000 +0100 -@@ -26,7 +26,7 @@ - - SYSINFO=`$MuPAD_ROOT_PATH/share/bin/sysinfo` - export SYSINFO --LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${MuPAD_ROOT_PATH}/${SYSINFO}/lib:/usr/local/X11R6/motif-2.0/lib:/usr/local/X11R6/lib:$MuPAD_ROOT_PATH/$SYSINFO/bin -+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${MuPAD_ROOT_PATH}/${SYSINFO}/lib:/usr/local/X11R6/motif-2.0/lib:/usr/local/X11R6/lib:$MuPAD_ROOT_PATH/$SYSINFO/bin - export LD_LIBRARY_PATH - - XKEYSYMDB=$MuPAD_ROOT_PATH/share/unix/XKeysymDB diff -Nru texmacs-1.0.7.13/debian/patches/12_mupad.patch texmacs-1.0.7.14/debian/patches/12_mupad.patch --- texmacs-1.0.7.13/debian/patches/12_mupad.patch 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/12_mupad.patch 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,34 @@ +#! /bin/sh +## mupad.dpatch by Etienne Millon . +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixed an insecure change to LD_LIBRARY_PATH + +--- texmacs-1.0.7.7~/misc/bundle/TeXmacs 2010-10-22 21:38:06.000000000 +0200 ++++ texmacs-1.0.7.7/misc/bundle/TeXmacs 2010-12-04 20:39:43.000000000 +0100 +@@ -7,12 +7,12 @@ + RESOURCES_DIR="$LAUNCH_DIR/../Resources" + #PATH=/opt/local/bin:$PATH + PATH="$RESOURCES_DIR/bin:$PATH" +-DYLD_LIBRARY_PATH="$RESOURCES_DIR/lib${DYLD_LIBRARY_PATH+":$DYLD_LIBRARY_PATH"}" ++DYLD_LIBRARY_PATH="$RESOURCES_DIR/lib"${DYLD_LIBRARY_PATH:+":$DYLD_LIBRARY_PATH"} + export RESOURCES_DIR PATH DYLD_LIBRARY_PATH + + TEXMACS_PATH="$RESOURCES_DIR/share/TeXmacs" + PATH="$TEXMACS_PATH/bin:$PATH" +-DYLD_LIBRARY_PATH="$TEXMACS_PATH/lib${DYLD_LIBRARY_PATH+":$DYLD_LIBRARY_PATH"}" ++DYLD_LIBRARY_PATH="$TEXMACS_PATH/lib"${DYLD_LIBRARY_PATH:+":$DYLD_LIBRARY_PATH"} + export TEXMACS_PATH PATH DYLD_LIBRARY_PATH + + #GS_LIB=".:$RESOURCES_DIR/ghostscript/8.61/lib:$RESOURCES_DIR/ghostscript/8.61/Resource:$RESOURCES_DIR/ghostscript/fonts:$RESOURCES_DIR/fonts/default/ghostscript:$RESOURCES_DIR/fonts/default/Type1:$RESOURCES_DIR/fonts/default/TrueType:/usr/lib/DPS/outline/base:/usr/openwin/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/TrueType:/usr/share/cups/fonts" +--- texmacs-1.0.7.7~/plugins/mupad/bin/tm_mupad_help 2010-10-22 21:38:00.000000000 +0200 ++++ texmacs-1.0.7.7/plugins/mupad/bin/tm_mupad_help 2010-12-04 20:35:31.000000000 +0100 +@@ -26,7 +26,7 @@ + + SYSINFO=`$MuPAD_ROOT_PATH/share/bin/sysinfo` + export SYSINFO +-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${MuPAD_ROOT_PATH}/${SYSINFO}/lib:/usr/local/X11R6/motif-2.0/lib:/usr/local/X11R6/lib:$MuPAD_ROOT_PATH/$SYSINFO/bin ++LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${MuPAD_ROOT_PATH}/${SYSINFO}/lib:/usr/local/X11R6/motif-2.0/lib:/usr/local/X11R6/lib:$MuPAD_ROOT_PATH/$SYSINFO/bin + export LD_LIBRARY_PATH + + XKEYSYMDB=$MuPAD_ROOT_PATH/share/unix/XKeysymDB diff -Nru texmacs-1.0.7.13/debian/patches/series texmacs-1.0.7.14/debian/patches/series --- texmacs-1.0.7.13/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/patches/series 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,9 @@ +01_american.patch +02_man.patch +03_mupad.patch +04_axiom.patch +05_fixRd.patch +07_fig2ps.patch +08_gzipbest.patch +10_tex-files.cpp.patch +11_desktop-file.patch diff -Nru texmacs-1.0.7.13/debian/README.source texmacs-1.0.7.14/debian/README.source --- texmacs-1.0.7.13/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/debian/README.source 2012-01-03 03:13:08.000000000 +0000 @@ -0,0 +1,4 @@ +The source package uses quilt for the modifications of the upstream source. +If you want to change something it is best to use the quilt approach +as documented in + /usr/share/doc/quilt/README.source diff -Nru texmacs-1.0.7.13/debian/rules texmacs-1.0.7.14/debian/rules --- texmacs-1.0.7.13/debian/rules 2012-01-03 03:13:05.000000000 +0000 +++ texmacs-1.0.7.14/debian/rules 2012-01-03 03:13:08.000000000 +0000 @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/gnome.mk DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/usr/ --libexecdir=/usr/lib/texmacs --datadir=/usr/share/texmacs --mandir=/usr/share/man @@ -31,9 +31,13 @@ cp debian/texmacs-common/usr/share/texmacs/TeXmacs/misc/images/TeXmacs.svg debian/texmacs-common/usr/share/pixmaps/ rm debian/texmacs-common/usr/share/texmacs/TeXmacs/LICENSE \ + debian/texmacs-common/usr/share/texmacs/TeXmacs/fonts/LICENSE \ + debian/texmacs-common/usr/share/texmacs/TeXmacs/fonts/LATEX_LICENSE \ debian/texmacs-common/usr/share/pixmaps/texmacs/LICENSE \ debian/texmacs-common/usr/share/texmacs/TeXmacs/plugins/octave/doc/COPYING - + rm debian/texmacs-common/usr/share/texmacs/TeXmacs/fonts/type1/.*DS* \ + debian/texmacs-common/usr/share/texmacs/TeXmacs/fonts/type1/math/.*DS* \ + debian/texmacs-common/usr/share/texmacs/TeXmacs/plugins/fricas/progs/._* install -m 644 debian/texmacs-common.lintian debian/texmacs-common/usr/share/lintian/overrides/texmacs-common ln -s ../../../pixmaps/texmacs debian/texmacs-common/usr/share/texmacs/TeXmacs/misc/pixmaps diff -Nru texmacs-1.0.7.13/misc/admin/admin.makefile texmacs-1.0.7.14/misc/admin/admin.makefile --- texmacs-1.0.7.13/misc/admin/admin.makefile 2011-09-16 13:33:42.000000000 +0000 +++ texmacs-1.0.7.14/misc/admin/admin.makefile 2011-10-17 18:45:12.000000000 +0000 @@ -17,8 +17,8 @@ datadir = ${datarootdir} mandir = ${datarootdir}/man tmdir = TeXmacs -tm_devel = TeXmacs-1.0.7.13 -tm_devel_release = TeXmacs-1.0.7.13-1 +tm_devel = TeXmacs-1.0.7.14 +tm_devel_release = TeXmacs-1.0.7.14-1 tmorig = /Users/vdhoeven/texmacs/src tmsrc = /Users/vdhoeven/texmacs/src/TeXmacs tmbin = ${exec_prefix}/libexec/TeXmacs diff -Nru texmacs-1.0.7.13/packages/centos/TeXmacs.spec texmacs-1.0.7.14/packages/centos/TeXmacs.spec --- texmacs-1.0.7.13/packages/centos/TeXmacs.spec 2011-09-16 13:33:42.000000000 +0000 +++ texmacs-1.0.7.14/packages/centos/TeXmacs.spec 2011-10-17 18:45:12.000000000 +0000 @@ -1,5 +1,5 @@ Name: TeXmacs -Version: 1.0.7.13 +Version: 1.0.7.14 Release: 1%{?dist} Summary: A structured wysiwyg scientific text editor diff -Nru texmacs-1.0.7.13/packages/debian/changelog texmacs-1.0.7.14/packages/debian/changelog --- texmacs-1.0.7.13/packages/debian/changelog 2011-09-16 13:33:42.000000000 +0000 +++ texmacs-1.0.7.14/packages/debian/changelog 2011-10-17 18:45:12.000000000 +0000 @@ -1,4 +1,4 @@ -texmacs (1.0.7.13-1) unstable; urgency=low +texmacs (1.0.7.14-1) unstable; urgency=low * TeXmacs Debian Package -- dndiatta Fri, 08 Apr 2011 15:21:31 +0200 diff -Nru texmacs-1.0.7.13/packages/debian/control texmacs-1.0.7.14/packages/debian/control --- texmacs-1.0.7.13/packages/debian/control 2011-09-16 13:33:42.000000000 +0000 +++ texmacs-1.0.7.14/packages/debian/control 2011-10-17 18:45:12.000000000 +0000 @@ -1,5 +1,5 @@ Source: texmacs -Version: 1.0.7.13 +Version: 1.0.7.14 Section: editors Priority: optional Maintainer: Daouda Niang DIATTA diff -Nru texmacs-1.0.7.13/packages/fedora/TeXmacs.spec texmacs-1.0.7.14/packages/fedora/TeXmacs.spec --- texmacs-1.0.7.13/packages/fedora/TeXmacs.spec 2011-09-16 13:33:42.000000000 +0000 +++ texmacs-1.0.7.14/packages/fedora/TeXmacs.spec 2011-10-17 18:45:12.000000000 +0000 @@ -1,5 +1,5 @@ Name: TeXmacs -Version: 1.0.7.13 +Version: 1.0.7.14 Release: 1%{?dist} Summary: A structured wysiwyg scientific text editor diff -Nru texmacs-1.0.7.13/packages/mandriva/TeXmacs.spec texmacs-1.0.7.14/packages/mandriva/TeXmacs.spec --- texmacs-1.0.7.13/packages/mandriva/TeXmacs.spec 2011-09-16 13:33:42.000000000 +0000 +++ texmacs-1.0.7.14/packages/mandriva/TeXmacs.spec 2011-10-17 18:45:12.000000000 +0000 @@ -1,5 +1,5 @@ Name: TeXmacs -Version: 1.0.7.13 +Version: 1.0.7.14 Release: 1%{?dist} Summary: A structured wysiwyg scientific text editor diff -Nru texmacs-1.0.7.13/packages/redhat/TeXmacs.spec texmacs-1.0.7.14/packages/redhat/TeXmacs.spec --- texmacs-1.0.7.13/packages/redhat/TeXmacs.spec 2011-09-16 13:33:42.000000000 +0000 +++ texmacs-1.0.7.14/packages/redhat/TeXmacs.spec 2011-10-17 18:45:12.000000000 +0000 @@ -1,16 +1,16 @@ Summary: A structured wysiwyg scientific text editor Name: TeXmacs -Version: 1.0.7.13 +Version: 1.0.7.14 Release: 1%{?dist} Url: http://www.texmacs.org -Source0: TeXmacs-1.0.7.13.tar.gz +Source0: TeXmacs-1.0.7.14.tar.gz License: GNU GPL 3.0 Packager: Joris van der Hoeven Distribution: GNU/Linux Vendor: Jo the ripper software Group: Applications/Editors Buildrequires: guile-devel -BuildRoot: %{_tmppath}/TeXmacs-1.0.7.13-root +BuildRoot: %{_tmppath}/TeXmacs-1.0.7.14-root %description @@ -35,7 +35,7 @@ Pdf files. Converters exist for TeX/LaTeX and Html/Mathml. %prep -%setup -q -n TeXmacs-1.0.7.13 +%setup -q -n TeXmacs-1.0.7.14 %build ./configure --disable-qt --prefix=/usr diff -Nru texmacs-1.0.7.13/packages/windows/TeXmacs.iss texmacs-1.0.7.14/packages/windows/TeXmacs.iss --- texmacs-1.0.7.13/packages/windows/TeXmacs.iss 2011-09-16 13:33:42.000000000 +0000 +++ texmacs-1.0.7.14/packages/windows/TeXmacs.iss 2011-10-17 18:45:12.000000000 +0000 @@ -4,12 +4,12 @@ [Setup] AppName=TeXmacs -AppVerName=1.0.7.13 +AppVerName=1.0.7.14 DefaultDirName={pf}\TeXmacs DefaultGroupName=TeXmacs UninstallDisplayIcon={app}\TeXmacs.ico OutputDir=..\..\..\distr -OutputBaseFilename=TeXmacs-1.0.7.13-installer +OutputBaseFilename=TeXmacs-1.0.7.14-installer ; SourceDir=../.. ChangesAssociations=yes diff -Nru texmacs-1.0.7.13/plugins/coq/packages/session/coq.ts texmacs-1.0.7.14/plugins/coq/packages/session/coq.ts --- texmacs-1.0.7.13/plugins/coq/packages/session/coq.ts 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/plugins/coq/packages/session/coq.ts 2011-10-11 07:25:09.000000000 +0000 @@ -0,0 +1,73 @@ + + + + +<\body> + <\active*> + <\src-title> + + + <\src-purpose> + The article style. + + + <\src-copyright|1998--2004> + Joris van der Hoeven + + + <\src-license> + This software falls under the . It comes WITHOUT ANY + WARRANTY WHATSOEVER. You should have received a copy of the license + which the software. If not, see . + + + + + + + > + + \; + + + >>> + + >|>>>>> + + >>>> + + \; + + | + >>> + + >>> + + + <\render-theorem| >> + \; + + <\indent> + |> + + + + <\proof> + \; + + <\indent> + + + + > + + \; + + +<\initial> + <\collection> + + + \ No newline at end of file diff -Nru texmacs-1.0.7.13/plugins/coq/progs/coq-edit.scm texmacs-1.0.7.14/plugins/coq/progs/coq-edit.scm --- texmacs-1.0.7.13/plugins/coq/progs/coq-edit.scm 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/plugins/coq/progs/coq-edit.scm 2011-10-11 07:23:44.000000000 +0000 @@ -0,0 +1,135 @@ + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; MODULE : coq-edit.scm +;; DESCRIPTION : editing routines for Coq +;; COPYRIGHT : (C) 2011 Joris van der Hoeven +;; +;; This software falls under the GNU general public license version 3 or later. +;; It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE +;; in the root directory or . +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(texmacs-module (coq-edit) + (:use (utils plugins plugin-eval) + (link locus-edit))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Adding unique identifiers +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define (coq-insert-ids-sub done t) + (when (tree-compound? t) + (when (tree-in? t '(coq-command coq-enunciation)) + (with s (tree->stree (tree-ref t 0)) + (if (or (== s "") (ahash-ref done s)) + (with new-s (create-unique-id) + (ahash-set! done new-s #t) + (tree-set t 0 new-s)) + (ahash-set! done s #t)))) + (for (c (tree-children t)) + (coq-insert-ids-sub done c)))) + +(tm-define (coq-insert-ids t) + (with done (make-ahash-table) + (coq-insert-ids-sub done t))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Inserting new commands +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (coq-command-context? t) + (and (tree-is? t 'coq-command) + (== (tree-down-index t) 2))) + +(tm-define (insert-coq-command) + (when (not (inside? 'coq-command)) + (with cmd `(coq-command ,(create-unique-id) "dark grey" "") + (insert-go-to cmd '(2 0))))) + +(tm-define (kbd-enter t shift?) + (:require (coq-command-context? t)) + (with cmd `(coq-command ,(create-unique-id) "dark grey" "") + (if shift? + (with-innermost doc 'document + (with i (+ (tree-down-index doc) 1) + (tree-insert! doc i (list cmd)) + (tree-go-to doc i 2 0))) + (begin + (if (tree-is? t :up 'concat) + (set! t (tree-up t)) + (tree-set! t `(concat ,t))) + (with i (+ (tree-down-index t) 1) + (tree-insert! t i (list cmd)) + (tree-go-to t i 2 0)))))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Inserting new theorems +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (insert-coq-enunciation type) + (insert-go-to `(coq-enunciation ,(create-unique-id) "dark grey" ,type + "" (document "") (document "")) + '(3 0))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Checking +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define coq-status-table (make-ahash-table)) +(define coq-updating 0) + +(tm-define (coq-set-status id status) + (with col (cond ((== status "error") "red") + ((== status "checked") "black") + ((== status "unchecked") "dark grey") + ((== status "busy") "#8080c0") + (else "dark blue")) + (ahash-set! coq-status-table id col))) + +(define (coq-update-status t tab) + (cond ((null? t) #f) + ((pair? t) + (coq-update-status (car t) tab) + (coq-update-status (cdr t) tab)) + ((tree-atomic? t) #f) + ((and (tree-in? t '(coq-command coq-enunciation)) + (tree-atomic? (tree-ref t 0)) + (ahash-ref tab (tree->string (tree-ref t 0)))) + (let* ((id (tree->string (tree-ref t 0))) + (col (ahash-ref tab id))) + (tree-assign! t `(,(tree-label t) ,id ,col + ,@(cddr (tree-children t)))) + (ahash-remove! tab id))) + (else (coq-update-status (tree-children t) tab)))) + +(tm-define (coq-update) + (when (and (!= (ahash-size coq-status-table) 0) (in-coq-style?)) + (coq-update-status (buffer-tree) coq-status-table))) + +(tm-define (coq-check) + (coq-insert-ids (buffer-tree)) + (let* ((cmd (object->string `(check ,(tree->stree (buffer-tree))))) + (ret (lambda (r) + (coq-update) + (delayed (:idle 1000) (coq-update)) + (delayed (:idle 3000) (coq-update)) + (delayed (:idle 10000) (coq-update)) + (set! coq-updating (- coq-updating 1))))) + (silent-feed "coq" "default" cmd ret '()) + (set! coq-updating (+ coq-updating 1)) + (delayed + (:while (!= coq-updating 0)) + (:every 1000) + (coq-update)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Comments +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (coq-remove-comments t) + (cond ((and (tree-is? t 'coq-comment) (tree-is? t :up 'document)) + (tree-remove (tree-up t) (tree-index t) 1)) + ((tree-compound? t) + (for-each coq-remove-comments (reverse (tree-children t)))))) diff -Nru texmacs-1.0.7.13/plugins/coq/progs/coq-kbd.scm texmacs-1.0.7.14/plugins/coq/progs/coq-kbd.scm --- texmacs-1.0.7.13/plugins/coq/progs/coq-kbd.scm 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/plugins/coq/progs/coq-kbd.scm 2011-10-11 07:23:44.000000000 +0000 @@ -0,0 +1,27 @@ + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; MODULE : coq-kbd.scm +;; DESCRIPTION : keyboard shortcuts for coq +;; COPYRIGHT : (C) 2011 Joris van der Hoeven +;; +;; This software falls under the GNU general public license version 3 or later. +;; It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE +;; in the root directory or . +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(texmacs-module (coq-kbd) + (:use (coq-edit))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Keyboard shortcuts +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(kbd-map + (:mode in-coq-style?) + ("$" (insert-coq-command)) + ("C-return" (coq-check)) + ("L e m m a" (insert-coq-enunciation "Lemma")) + ("T h e o r e m" (insert-coq-enunciation "Theorem")) + ("C-F12" (coq-remove-comments (buffer-tree)))) diff -Nru texmacs-1.0.7.13/plugins/coq/progs/init-coq.scm texmacs-1.0.7.14/plugins/coq/progs/init-coq.scm --- texmacs-1.0.7.13/plugins/coq/progs/init-coq.scm 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/plugins/coq/progs/init-coq.scm 2011-10-17 18:43:25.000000000 +0000 @@ -0,0 +1,29 @@ + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; MODULE : init-coq.scm +;; DESCRIPTION : Initialize Coq plugin +;; COPYRIGHT : (C) 2011 Joris van der Hoeven +;; +;; This software falls under the GNU general public license version 3 or later. +;; It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE +;; in the root directory or . +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(texmacs-modes + (in-coq-style% (style-has? "coq-style"))) + +(lazy-keyboard (coq-kbd) in-coq-style?) + +(when (url-exists-in-path? "coq_to_texmacs") + (define-format coq-vernacular + (:name "Coq vernacular") + (:suffix "v")) + + (converter coq-vernacular-file stm-file + (:shell "coq_to_texmacs" from to))) + +(plugin-configure coq + (:require (url-exists-in-path? "coq_texmacs")) + (:launch "coq_texmacs")) Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/plugins/fricas/progs/._init-fricas.scm and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/plugins/fricas/progs/._init-fricas.scm differ diff -Nru texmacs-1.0.7.13/src/Data/Convert/Tex/fromtex.cpp texmacs-1.0.7.14/src/Data/Convert/Tex/fromtex.cpp --- texmacs-1.0.7.13/src/Data/Convert/Tex/fromtex.cpp 2011-09-11 15:31:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Data/Convert/Tex/fromtex.cpp 2011-09-30 09:36:53.000000000 +0000 @@ -65,9 +65,14 @@ for (i=0; i", l2e (t[1])); + if (is_tuple (t, "\\xleftarrow", 1)) + return tree (LONG_ARROW, "", l2e (t[1])); + if (is_tuple (t, "\\xrightarrow", 1)) + return tree (LONG_ARROW, "", l2e (t[1])); + if (is_tuple (t, "\\xleftrightarrow", 1)) + return tree (LONG_ARROW, "", l2e (t[1])); + if (is_tuple (t, "\\xmapsto", 1)) + return tree (LONG_ARROW, "", l2e (t[1])); + if (is_tuple (t, "\\xmapsfrom", 1)) + return tree (LONG_ARROW, "", l2e (t[1])); + if (is_tuple (t, "\\xequal", 1)) + return tree (LONG_ARROW, "", l2e (t[1])); + if (is_tuple (t, "\\xLeftarrow", 1)) + return tree (LONG_ARROW, "", l2e (t[1])); + if (is_tuple (t, "\\xRightarrow", 1)) + return tree (LONG_ARROW, "", l2e (t[1])); + if (is_tuple (t, "\\xLeftrightarrow", 1)) + return tree (LONG_ARROW, "", l2e (t[1])); + if (is_tuple (t, "\\xminus*", 2)) + return tree (LONG_ARROW, "", l2e (t[1]), l2e (t[2])); + if (is_tuple (t, "\\xleftarrow*", 2)) + return tree (LONG_ARROW, "", l2e (t[1]), l2e (t[2])); + if (is_tuple (t, "\\xrightarrow*", 2)) + return tree (LONG_ARROW, "", l2e (t[1]), l2e (t[2])); + if (is_tuple (t, "\\xleftrightarrow*", 2)) + return tree (LONG_ARROW, "", + l2e (t[1]), l2e (t[2])); + if (is_tuple (t, "\\xmapsto*", 2)) + return tree (LONG_ARROW, "", l2e (t[1]), l2e (t[2])); + if (is_tuple (t, "\\xmapsfrom*", 2)) + return tree (LONG_ARROW, "", l2e (t[1]), l2e (t[2])); + if (is_tuple (t, "\\xequal*", 2)) + return tree (LONG_ARROW, "", l2e (t[1]), l2e (t[2])); + if (is_tuple (t, "\\xLeftarrow*", 2)) + return tree (LONG_ARROW, "", l2e (t[1]), l2e (t[2])); + if (is_tuple (t, "\\xRightarrow*", 2)) + return tree (LONG_ARROW, "", l2e (t[1]), l2e (t[2])); + if (is_tuple (t, "\\xLeftrightarrow*", 2)) + return tree (LONG_ARROW, "", + l2e (t[1]), l2e (t[2])); + // Start TeXmacs specific markup if (is_tuple (t, "\\tmmathbf", 1)) return tree (CONCAT, @@ -1675,18 +1723,25 @@ if (is_atomic (t)) return t; else if (is_compound (t, "verbatim", 1) && is_atomic (t[0]) && is_hyper_link (t[0]->label)) { - return compound ("href", t[0]); + return compound ("href", finalize_misc (t[0])); } else if (is_func (t, WITH, 3) && t[0] == FONT_FAMILY && t[1] == "tt" && is_atomic (t[2]) && is_hyper_link (t[2]->label)) { - return compound ("href", t[2]); + return compound ("href", finalize_misc (t[2])); } else if (is_compound (t, "flushleft", 1) || is_compound (t, "leftaligned", 1)) - return compound ("left-aligned", t[0]); + return compound ("left-aligned", finalize_misc (t[0])); else if (is_compound (t, "flushright", 1) || is_compound (t, "rightaligned", 1)) - return compound ("right-aligned", t[0]); + return compound ("right-aligned", finalize_misc (t[0])); + else if (is_compound (t, "acknowledgments", 1)) + return compound ("acknowledgments*", finalize_misc (t[0])); + else if (is_compound (t, "text", 1) && + is_func (t[0], WITH, 3) && + t[0][0] == "font-family" && + t[0][1] == "rm") + return compound ("math-up", finalize_misc (t[0][2])); else { int i, n= N(t); tree r (t, n); diff -Nru texmacs-1.0.7.13/src/Data/Convert/Tex/parsetex.cpp texmacs-1.0.7.14/src/Data/Convert/Tex/parsetex.cpp --- texmacs-1.0.7.13/src/Data/Convert/Tex/parsetex.cpp 2011-09-07 20:49:33.000000000 +0000 +++ texmacs-1.0.7.14/src/Data/Convert/Tex/parsetex.cpp 2011-09-24 17:39:51.000000000 +0000 @@ -100,8 +100,7 @@ (i+4>n || s(i,i+4) != "\\end")))) { switch (s[i]) { case '~': - if (command_type ["!mode"] == "math") t << tuple ("\\sim"); - else t << tuple ("\\nbsp"); + t << tuple ("\\nbsp"); i++; break; case ' ': diff -Nru texmacs-1.0.7.13/src/Data/Convert/Texmacs/upgradetm.cpp texmacs-1.0.7.14/src/Data/Convert/Texmacs/upgradetm.cpp --- texmacs-1.0.7.13/src/Data/Convert/Texmacs/upgradetm.cpp 2011-09-11 14:28:17.000000000 +0000 +++ texmacs-1.0.7.14/src/Data/Convert/Texmacs/upgradetm.cpp 2011-10-04 15:20:39.000000000 +0000 @@ -952,7 +952,8 @@ (s == "corollary") || (s == "proof") || (s == "axiom") || (s == "definition") || (s == "notation") || (s == "conjecture") || (s == "remark") || (s == "note") || (s == "example") || - (s == "exercise") || (s == "warning") || (s == "convention") || + (s == "exercise") || (s == "warning") || + (s == "convention") || (s == "acknowledgments") || (s == "code") || (s == "quote") || (s == "quotation") || (s == "verse") || (s == "center") || (s == "indent") || (s == "body") || (s == "description") || @@ -1383,41 +1384,41 @@ ******************************************************************************/ static tree -upgrade_title (tree t, tree& params) { +upgrade_title (tree t, tree& tit, tree& auth, tree& meta) { if (is_atomic (t)) return t; else if (is_func (t, APPLY, 2) || is_func (t, EXPAND, 2)) { - if (t[0] == "title") { params[0]= t[1]; return ""; } - if (t[0] == "author") { params[1]= t[1]; return ""; } - if (t[0] == "address") { params[2]= t[1]; return ""; } - if (t[0] == "urladdr") { params[3]= t[1]; return ""; } - if (t[0] == "title-email") { params[4]= t[1]; return ""; } - if (t[0] == "title-thanks") { params[5]= t[1]; return ""; } - if (t[0] == "keywords") { params[6]= t[1]; return ""; } - if (t[0] == "subjclass") { params[7]= t[1]; return ""; } - if (t[0] == "classification") { params[8]= t[1]; return ""; } + if (t[0] == "title") { + tit << tree (EXPAND, "title", t[1]); return ""; } + if (t[0] == "author") { + auth << tree (EXPAND, "author", t[1]); return ""; } + if (t[0] == "address") { + auth << tree (EXPAND, "address", t[1]); return ""; } + if (t[0] == "urladdr") { + auth << tree (EXPAND, "title-web", t[1]); return ""; } + if (t[0] == "title-email") { + auth << tree (EXPAND, "title-email", t[1]); return ""; } + if (t[0] == "title-thanks") { + meta << tree (EXPAND, "title-thanks", t[1]); return ""; } + if (t[0] == "keywords") { + meta << tree (EXPAND, "title-keywords", t[1]); return ""; } + if (t[0] == "subjclass") { + meta << tree (EXPAND, "title-ams-class", t[1]); return ""; } + if (t[0] == "classification") { + meta << tree (EXPAND, "title-ams-class", t[1]); return ""; } } else if (is_func (t, APPLY, 3) || is_func (t, EXPAND, 3)) { - if (t[0] == "subjclass*") { params[7]= t[2]; return ""; } + if (t[0] == "subjclass*") { + meta << tree (EXPAND, "title-ams-class", t[2]); return ""; } } else if ((t == tree (APPLY, "maketitle")) || (t == tree (EXPAND, "maketitle"))) { tree doc (DOCUMENT); - doc << tree (EXPAND, "title", copy (params[0])); - doc << tree (EXPAND, "author", copy (params[1])); - doc << tree (EXPAND, "address", copy (params[2])); - if (params[3] != "") - doc << tree (EXPAND, "title-web", copy (params[3])); - if (params[4] != "") - doc << tree (EXPAND, "title-email", copy (params[4])); - if (params[5] != "") - doc << tree (EXPAND, "title-thanks", copy (params[5])); - if (params[6] != "") - doc << tree (EXPAND, "title-keywords", copy (params[6])); - if (params[7] != "") - doc << tree (EXPAND, "title-ams-class", copy (params[7])); + doc << A (tit); + doc << A (auth); + doc << A (meta); doc << tree (EXPAND, "title-date", tree (_DATE, "")); return tree (EXPAND, "make-title", doc); } @@ -1425,16 +1426,14 @@ int i, n= N(t); tree r (t, n); for (i=0; i"; + if (t[2] == tree (LINE, + tuple ("-10ln", "6ln"), + tuple ("0ln", "0ln"), + tuple ("-10ln", "-6ln"))) + return ""; + } + return t; +} + +static void +replace_line_arrows (tree& t, string var, string begin, string end) { + if (find_attr (t, var)) { + tree val= get_attr (t, var, "default"); + t= set_attr (t, "arrow-length", "10ln"); + t= set_attr (t, "arrow-height", "6ln"); + if (is_func (val, TUPLE, 1)) + t= set_attr (t, end, encode_arrow (val[0])); + if (is_func (val, TUPLE, 2)) { + t= set_attr (t, begin, encode_arrow (val[0])); + t= set_attr (t, end, encode_arrow (val[1])); + } + t= remove_attr (t, var); + } +} + +static void +replace_magnification (tree& t, string var, string repl) { + tree body= t[N(t)-1]; + if (find_attr (t, var)) + if (is_func (body, GRAPHICS) || + is_func (body, GR_GROUP) || + is_func (body, TEXT_AT) || + is_func (body, _POINT) || + is_func (body, LINE) || + is_func (body, CLINE) || + is_func (body, SPLINE) || + is_func (body, CSPLINE) || + is_func (body, ARC) || + is_func (body, CARC) || + is_func (body, VAR_SPLINE)) + { + tree val= get_attr (t, var, "1"); + if (is_func (val, TIMES, 2) && + is_func (val[1], VALUE, 1) && + val[1][0] == var) + val= val[0]; + t= set_attr (t, repl, val); + t= remove_attr (t, var); + } +} + +static tree +upgrade_gr_attributes (tree t) { + int i; + if (is_atomic (t)) return t; + if (is_func (t, WITH)) { + replace_dash_style (t, "dash-style"); + replace_dash_style (t, "gr-dash-style"); + replace_line_arrows (t, "line-arrows", "arrow-begin", "arrow-end"); + replace_line_arrows (t, "gr-line-arrows", + "gr-arrow-begin", "gr-arrow-end"); + replace_magnification (t, "magnification", "magnify"); + } + int n= N(t); + tree r (t, n); + for (i=0; i name ("long arrow") -> + accessible (1) -> name (1, "superscript") -> + accessible (2) -> name (2, "subscript")); init (LPRIME, "lprime", fixed (1) -> name ("left prime")); init (RPRIME, "rprime", fixed (1) -> name ("right prime")); init (BELOW, "below", fixed (2) -> accessible (0)); @@ -547,6 +554,10 @@ init (TEXT_AT, "text-at", fixed (1, 1, BIFORM) -> returns_graphical () -> accessible (0) -> point_type (1)); + init (MATH_AT, "math-at", + fixed (1, 1, BIFORM) -> returns_graphical () -> + accessible (0) -> point_type (1) -> + locals (0, "mode", "math")); init (_POINT, "point", repeat (1, 1) -> returns_graphical () -> point_type (0)); init (LINE, "line", @@ -582,6 +593,18 @@ init (FRAME_INVERSE, "frame-inverse", fixed (1) -> point_type (0)); + init (IS_EQUAL, "is-equal", + fixed (2) -> returns_constraint () -> graphical_id (0)); + init (IS_INTERSECTION, "is-intersection", + fixed (3) -> returns_constraint () -> graphical_id (0)); + init (ON_CURVE, "on-curve", + options (2, 1, BIFORM) -> returns_constraint () -> + graphical_id (0) -> numeric (1)); + init (ON_TEXT_BORDER, "on-text-border", + fixed (2) -> returns_constraint () -> graphical_id (0)); + init (ON_GRID, "on-grid", + fixed (2) -> returns_constraint () -> graphical_id (0)); + init (CANVAS, "canvas", fixed (6, 1, BIFORM) -> accessible (1)); init (ORNAMENT, "ornament", fixed (1) -> accessible (0)); diff -Nru texmacs-1.0.7.13/src/Data/Drd/tag_info.hpp texmacs-1.0.7.14/src/Data/Drd/tag_info.hpp --- texmacs-1.0.7.13/src/Data/Drd/tag_info.hpp 2011-09-07 20:49:34.000000000 +0000 +++ texmacs-1.0.7.14/src/Data/Drd/tag_info.hpp 2011-09-29 12:59:56.000000000 +0000 @@ -30,11 +30,13 @@ #define TYPE_URL 13 #define TYPE_GRAPHICAL 14 #define TYPE_POINT 15 -#define TYPE_ANIMATION 16 -#define TYPE_DURATION 17 -#define TYPE_OBSOLETE 18 -#define TYPE_UNKNOWN 19 -#define TYPE_ERROR 20 +#define TYPE_CONSTRAINT 16 +#define TYPE_GRAPHICAL_ID 17 +#define TYPE_ANIMATION 18 +#define TYPE_DURATION 19 +#define TYPE_OBSOLETE 20 +#define TYPE_UNKNOWN 21 +#define TYPE_ERROR 22 int drd_encode (tree t); tree drd_decode (int i); diff -Nru texmacs-1.0.7.13/src/Data/Drd/vars.cpp texmacs-1.0.7.14/src/Data/Drd/vars.cpp --- texmacs-1.0.7.13/src/Data/Drd/vars.cpp 2011-09-07 20:49:34.000000000 +0000 +++ texmacs-1.0.7.14/src/Data/Drd/vars.cpp 2011-10-06 11:15:16.000000000 +0000 @@ -203,35 +203,54 @@ * Environment variables for graphics ******************************************************************************/ -string POINT_STYLE ("point-style"); - -string LINE_WIDTH ("line-width"); -string DASH_STYLE ("dash-style"); -string DASH_STYLE_UNIT ("dash-style-unit"); -string LINE_ARROWS ("line-arrows"); -string LINE_CAPS ("line-caps"); -string FILL_COLOR ("fill-color"); -string FILL_STYLE ("fill-style"); -string TEXTAT_HALIGN ("text-at-halign"); -string TEXTAT_VALIGN ("text-at-valign"); - string GR_GEOMETRY ("gr-geometry"); string GR_FRAME ("gr-frame"); string GR_MODE ("gr-mode"); +string GR_AUTO_CROP ("gr-auto-crop"); +string GR_CROP_PADDING ("gr-crop-padding"); +string GR_GRID ("gr-grid"); +string GR_GRID_ASPECT ("gr-grid-aspect"); +string GR_EDIT_GRID ("gr-edit-grid"); +string GR_EDIT_GRID_ASPECT ("gr-edit-grid-aspect"); + +string GR_MAGNIFY ("gr-magnify"); string GR_OPACITY ("gr-opacity"); string GR_COLOR ("gr-color"); string GR_POINT_STYLE ("gr-point-style"); string GR_LINE_WIDTH ("gr-line-width"); +string GR_LINE_JOIN ("gr-line-join"); +string GR_LINE_CAPS ("gr-line-caps"); +string GR_LINE_EFFECTS ("gr-line-effects"); string GR_DASH_STYLE ("gr-dash-style"); string GR_DASH_STYLE_UNIT ("gr-dash-style-unit"); -string GR_LINE_ARROWS ("gr-line-arrows"); +string GR_ARROW_BEGIN ("gr-arrow-begin"); +string GR_ARROW_END ("gr-arrow-end"); +string GR_ARROW_LENGTH ("gr-arrow-length"); +string GR_ARROW_HEIGHT ("gr-arrow-height"); string GR_FILL_COLOR ("gr-fill-color"); -string GR_TEXTAT_HALIGN ("gr-text-at-halign"); -string GR_TEXTAT_VALIGN ("gr-text-at-valign"); -string GR_GRID ("gr-grid"); -string GR_GRID_ASPECT ("gr-grid-aspect"); -string GR_EDIT_GRID ("gr-edit-grid"); -string GR_EDIT_GRID_ASPECT ("gr-edit-grid-aspect"); +string GR_FILL_STYLE ("gr-fill-style"); +string GR_TEXT_AT_HALIGN ("gr-text-at-halign"); +string GR_TEXT_AT_VALIGN ("gr-text-at-valign"); +string GR_TEXT_AT_MARGIN ("gr-text-at-margin"); + +string GID ("gid"); +string MAGNIFY ("magnify"); +string POINT_STYLE ("point-style"); +string LINE_WIDTH ("line-width"); +string LINE_JOIN ("line-join"); +string LINE_CAPS ("line-caps"); +string LINE_EFFECTS ("line-effects"); +string DASH_STYLE ("dash-style"); +string DASH_STYLE_UNIT ("dash-style-unit"); +string ARROW_BEGIN ("arrow-begin"); +string ARROW_END ("arrow-end"); +string ARROW_LENGTH ("arrow-length"); +string ARROW_HEIGHT ("arrow-height"); +string FILL_COLOR ("fill-color"); +string FILL_STYLE ("fill-style"); +string TEXT_AT_HALIGN ("text-at-halign"); +string TEXT_AT_VALIGN ("text-at-valign"); +string TEXT_AT_MARGIN ("text-at-margin"); /****************************************************************************** * Environment variables for preamble mode diff -Nru texmacs-1.0.7.13/src/Data/Drd/vars.hpp texmacs-1.0.7.14/src/Data/Drd/vars.hpp --- texmacs-1.0.7.13/src/Data/Drd/vars.hpp 2011-09-07 20:49:34.000000000 +0000 +++ texmacs-1.0.7.14/src/Data/Drd/vars.hpp 2011-10-06 11:14:49.000000000 +0000 @@ -181,34 +181,54 @@ extern string CELL_ROW_NR; extern string CELL_COL_NR; -extern string POINT_STYLE; -extern string LINE_WIDTH; -extern string DASH_STYLE; -extern string DASH_STYLE_UNIT; -extern string LINE_ARROWS; -extern string LINE_CAPS; -extern string FILL_COLOR; -extern string FILL_STYLE; -extern string TEXTAT_HALIGN; -extern string TEXTAT_VALIGN; - extern string GR_GEOMETRY; extern string GR_FRAME; extern string GR_MODE; +extern string GR_AUTO_CROP; +extern string GR_CROP_PADDING; +extern string GR_GRID; +extern string GR_GRID_ASPECT; +extern string GR_EDIT_GRID; +extern string GR_EDIT_GRID_ASPECT; + +extern string GR_MAGNIFY; extern string GR_OPACITY; extern string GR_COLOR; extern string GR_POINT_STYLE; extern string GR_LINE_WIDTH; +extern string GR_LINE_JOIN; +extern string GR_LINE_CAPS; +extern string GR_LINE_EFFECTS; extern string GR_DASH_STYLE; extern string GR_DASH_STYLE_UNIT; -extern string GR_LINE_ARROWS; +extern string GR_ARROW_BEGIN; +extern string GR_ARROW_END; +extern string GR_ARROW_LENGTH; +extern string GR_ARROW_HEIGHT; extern string GR_FILL_COLOR; -extern string GR_TEXTAT_HALIGN; -extern string GR_TEXTAT_VALIGN; -extern string GR_GRID; -extern string GR_GRID_ASPECT; -extern string GR_EDIT_GRID; -extern string GR_EDIT_GRID_ASPECT; +extern string GR_FILL_STYLE; +extern string GR_TEXT_AT_HALIGN; +extern string GR_TEXT_AT_VALIGN; +extern string GR_TEXT_AT_MARGIN; + +extern string GID; +extern string MAGNIFY; +extern string POINT_STYLE; +extern string LINE_WIDTH; +extern string LINE_JOIN; +extern string LINE_CAPS; +extern string LINE_EFFECTS; +extern string DASH_STYLE; +extern string DASH_STYLE_UNIT; +extern string ARROW_BEGIN; +extern string ARROW_END; +extern string ARROW_LENGTH; +extern string ARROW_HEIGHT; +extern string FILL_COLOR; +extern string FILL_STYLE; +extern string TEXT_AT_HALIGN; +extern string TEXT_AT_VALIGN; +extern string TEXT_AT_MARGIN; extern string SRC_STYLE; extern string SRC_SPECIAL; diff -Nru texmacs-1.0.7.13/src/Edit/editor.hpp texmacs-1.0.7.14/src/Edit/editor.hpp --- texmacs-1.0.7.13/src/Edit/editor.hpp 2011-09-07 20:49:33.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/editor.hpp 2011-10-02 06:15:39.000000000 +0000 @@ -96,6 +96,7 @@ virtual void back_around (tree t, path p, bool forward) = 0; virtual void back_prime (tree t, path p, bool forward) = 0; virtual void back_in_around (tree t, path p, bool forward) = 0; + virtual void back_in_long_arrow (tree t, path p, bool forward) = 0; virtual void back_in_wide (tree t, path p, bool forward) = 0; virtual void back_in_tree (tree t, path p, bool forward) = 0; virtual void pre_remove_around (path p) = 0; @@ -105,6 +106,7 @@ virtual void back_general (path p, bool forward) = 0; virtual void back_in_with (tree t, path p, bool forward) = 0; virtual void back_in_general (tree t, path p, bool forward) = 0; + virtual void back_in_text_at (tree t, path p, bool forward) = 0; /* other protected subroutines */ virtual tree kbd (string s) = 0; @@ -157,7 +159,7 @@ virtual void mouse_click (SI x, SI y) = 0; virtual bool mouse_extra_click (SI x, SI y) = 0; virtual void mouse_drag (SI x, SI y) = 0; - virtual void mouse_select (SI x, SI y, int mods) = 0; + virtual void mouse_select (SI x, SI y, int mods, bool drag) = 0; virtual void mouse_paste (SI x, SI y) = 0; virtual void mouse_adjust (SI x, SI y) = 0; virtual void mouse_scroll (SI x, SI y, bool up) = 0; diff -Nru texmacs-1.0.7.13/src/Edit/Interface/edit_cursor.cpp texmacs-1.0.7.14/src/Edit/Interface/edit_cursor.cpp --- texmacs-1.0.7.13/src/Edit/Interface/edit_cursor.cpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Interface/edit_cursor.cpp 2011-10-01 21:37:54.000000000 +0000 @@ -64,7 +64,8 @@ path edit_cursor_rep::tree_path (path sp, SI x, SI y, SI delta) { - path p= correct_cursor (et, find_scrolled_tree_path (eb, sp, x, y, delta)); + path stp= find_scrolled_tree_path (eb, sp, x, y, delta); + path p= correct_cursor (et, stp); return make_cursor_accessible (p, searching_forwards); } diff -Nru texmacs-1.0.7.13/src/Edit/Interface/edit_footer.cpp texmacs-1.0.7.14/src/Edit/Interface/edit_footer.cpp --- texmacs-1.0.7.13/src/Edit/Interface/edit_footer.cpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Interface/edit_footer.cpp 2011-09-30 07:39:52.000000000 +0000 @@ -188,6 +188,8 @@ r= concat ("big ", as_symbol (st[0])); break; case LPRIME: r= concat ("left prime ", as_string (st[0])); break; + case LONG_ARROW: + r= concat ("long arrow ", as_string (st[0])); break; case RPRIME: r= concat ("prime ", as_string (st[0])); break; case SQRT: @@ -276,6 +278,10 @@ if (N(st) >= 1 && is_atomic (st[0])) return concat (up, st[0]->label * " "); else return concat (up, "float "); + case LONG_ARROW: + if (l == 1) return concat (up, "above "); + else if (l == 2) return concat (up, "below "); + else return up; case BELOW: if (l==0) return concat (up, "body "); else return concat (up, "script below "); diff -Nru texmacs-1.0.7.13/src/Edit/Interface/edit_graphics.cpp texmacs-1.0.7.14/src/Edit/Interface/edit_graphics.cpp --- texmacs-1.0.7.13/src/Edit/Interface/edit_graphics.cpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Interface/edit_graphics.cpp 2011-10-06 09:11:28.000000000 +0000 @@ -15,6 +15,9 @@ #include "Graphics/curve.hpp" #include "Boxes/graphics.hpp" #include "Bridge/impl_typesetter.hpp" +#include "drd_std.hpp" + +extern tree the_et; /****************************************************************************** * Constructors and destructors @@ -28,9 +31,64 @@ edit_graphics_rep::~edit_graphics_rep () {} /****************************************************************************** +* Extra subroutines for graphical selections +******************************************************************************/ + +gr_selection +snap_to_guide (point p, gr_selections sels, double eps) { + if (N(sels) == 0) { + gr_selection snap; + snap->type= "free"; + snap->p= p; + snap->dist= 0; + return snap; + } + + sort (sels); + gr_selection best; + best->type= "none"; + for (int i=0; itype == "grid-point") + best= sels[i]; + else if (is_nil (sels[i]->c)) + return sels[i]; + + for (int i=0; ic) && + !is_nil (sels[j]->c) && + (sels[i]->type != "grid-curve-point" || + sels[j]->type != "grid-curve-point")) + { + array ins= intersection (sels[i]->c, sels[j]->c, p, eps); + for (int k=0; ktype == "none" || norm (ins[k] - p) < best->dist) { + gr_selection sel; + sel->type= sels[i]->type * "&" * sels[j]->type; + sel->p = ins[k]; + sel->dist= norm (ins[k] - p); + sel->cp = append (sels[i]->cp, sels[j]->cp); + sel->pts = append (sels[i]->pts, sels[j]->pts); + best= sel; + } + } + } + + if (best->type != "none") return best; + return sels[0]; +} + +/****************************************************************************** * Main edit_graphics routines ******************************************************************************/ +path +edit_graphics_rep::graphics_path () { + path gp= search_upwards (GRAPHICS); + if (is_nil (gp)) return tp; + return gp * 0; +} + bool edit_graphics_rep::inside_graphics (bool b) { path p = path_up (tp); @@ -38,7 +96,7 @@ tree st = et; while (!is_nil (p)) { if (is_func (st, GRAPHICS)) flag= true; - if (b && is_func (st, TEXT_AT)) flag= false; + if (b && is_graphical_text (st)) flag= false; if (is_atomic (st) || p->item < 0 || p->item >= N(st)) break; st= st[p->item]; p = p->next; @@ -61,7 +119,7 @@ // cout << type << " at " << p << " [" << lim1 << ", " << lim2 << "]\n"; if (N(lim1) == 2) if ((p[0]lim2[0]) || (p[1]lim2[1])) - return false; + return as_bool (call ("graphics-busy?")); return true; } return false; @@ -92,25 +150,28 @@ frame edit_graphics_rep::find_frame (bool last) { + path gp= graphics_path (); bool bp_found; - path bp= eb->find_box_path (tp, bp_found); + path bp= eb->find_box_path (gp, bp_found); if (bp_found) return eb->find_frame (path_up (bp), last); else return frame (); } grid edit_graphics_rep::find_grid () { + path gp= graphics_path (); bool bp_found; - path bp= eb->find_box_path (tp, bp_found); + path bp= eb->find_box_path (gp, bp_found); if (bp_found) return eb->find_grid (path_up (bp)); else return grid (); } void edit_graphics_rep::find_limits (point& lim1, point& lim2) { + path gp= graphics_path (); lim1= point (); lim2= point (); bool bp_found; - path bp= eb->find_box_path (tp, bp_found); + path bp= eb->find_box_path (gp, bp_found); if (bp_found) eb->find_limits (path_up (bp), lim1, lim2); } @@ -132,63 +193,47 @@ edit_graphics_rep::adjust (point p) { frame f= find_frame (); grid g= find_grid (); - if (!is_nil (g) && !is_nil (gr0) && g!=gr0) { + if (!is_nil (g) && !is_nil (gr0) && g != gr0) { graphical_select (p[0], p[1]); g= gr0; } - if (is_nil (g)) - return p; - else { - point res; - gr_selections sels= gs; - frame f2= find_frame (true); - if (!is_nil (f2)) { - point fp= f2 (p); - int i; - if ((tree)g == "empty_grid") { - if (N(pts)>0) - res= pts[0]; - for (i=0; i0 && norm (fp - sp) < 5*get_pixel_size ()) - res= pts[i]; - } - int n= N(sels); - for (i=0; ip; - if (N(res)==0 || (N(sp)>0 && norm (fp - sp) < 5*get_pixel_size () - && norm (fp - sp) < norm (fp - res))) - res= sels[i]->p; - } - } - else - if (!is_nil (f)) { - res= f2 (g->find_point_around (p, 10*get_pixel_size (), f)); - for (i=0; i0 && norm (fp - sp) < norm (fp - res)) - res= pts[i]; - } - for (i=0; i0 && norm (fp - sp) < norm (fp - res)) - res= ci[i]; - } - for (i=0; i0 && norm (fp - sp) < norm (fp - res)) - res= cgi[i]; - } - //TODO: Adjusting by means on freely moving on surface of closed curves - ; + if (is_nil (g)) return p; + point res; + gr_selections sels= copy (gs); + frame f2= find_frame (true); + if (is_nil (f2)) return p; + point fp= f2 (p); + if ((tree) g != "empty_grid") { + point q= g->find_point_around (p, 10*get_pixel_size (), f); + point fq= f2 (q); + if (norm (fq - fp) < 10*get_pixel_size ()) { + gr_selection sel; + sel->type= "grid-point"; + sel->p = fq; + sel->dist= norm (fq - fp); + sels << sel; + } + array gc= + g->get_curves_around (p, 10*get_pixel_size (), f); + for (int i=0; ic), fp); + if (norm (fc - fp) < 10*get_pixel_size ()) { + gr_selection sel; + sel->type= "grid-curve-point"; + sel->p = fc; + sel->dist= norm (fc - fp); + sel->c = f2 (gc[i]->c); + sels << sel; } - if (N(res)>0) - res= f2[res]; - else - res= p; } - return res; } + double eps= get_pixel_size () / 10.0; + gr_selection snap= snap_to_guide (fp, sels, eps); + //cout << "Snap " << fp << " to " << snap << ", " << snap->p << "\n"; + point snapped= f2[snap->p]; + if (N(snapped) == 2) return snapped; + return p; + // FIXME: why can snapped be an invalid point? } tree @@ -205,42 +250,10 @@ point p = f (p0); sels= eb->graphical_select ((SI)p[0], (SI)p[1], 10*get_pixel_size ()); gs= sels; - pts= array (0); - ci= array (0); - cgi= array (0); gr0= empty_grid (); grid g= find_grid (); frame f2= find_frame (true); - if (!is_nil (g) && !is_nil (f2)) { - gr0= g; - p = f2 (point (x, y)); - int i, j, n= N(sels); - for (i=0; i pts2= sels[i]->pts; - if (N(pts2)>0 && norm (pts2[0] - p) <= 10*get_pixel_size ()) - pts= pts << pts2[0]; - if (N(pts2)>1 && norm (pts2[1] - p) <= 10*get_pixel_size ()) - pts= pts << pts2[1]; - } - double eps= get_pixel_size () / 10.0; - for (i=0; ic; - curve c2= sels[j]->c; - if (!is_nil (c1) && !is_nil (c2)) - ci= ci << intersection (c1, c2, p, eps); - } - } - array gc= g->get_curves_around (p0, 10*get_pixel_size (), f); - //FIXME: Too slow - for (i=0; ic); - for (j=0; jc)) - cgi= cgi << intersection (c, sels[j]->c, p, eps); - } - } + if (!is_nil (g) && !is_nil (f2)) gr0= g; return as_tree (sels); } @@ -331,19 +344,41 @@ ren->set_clipping (ox1, oy1, ox2, oy2); } +void +edit_graphics_rep::back_in_text_at (tree t, path p, bool forward) { + int i= last_item (p); + if ((i == 0) && is_empty (t[0])) { + p= path_up (p); + if (is_func (subtree (et, path_up (p)), WITH)) p= path_up (p); + tree st= subtree (et, path_up (p)); + if (is_func (st, GRAPHICS)) { + if (N(st) == 1) assign (p, ""); + else { + remove (p, 1); + go_to_border (path_up (p) * 0, true); + } + } + } +} + bool edit_graphics_rep::mouse_graphics (string type, SI x, SI y, int m, time_t t) { + //cout << type << ", " << x << ", " << y << ", " << m << ", " << t << "\n"; + //cout << "et= " << et << "\n"; + //cout << "tp= " << tp << "\n"; + //cout << "gp= " << graphics_path () << "\n"; (void) t; // apply_changes (); // FIXME: remove after review of synchronization frame f= find_frame (); if (!is_nil (f)) { - if (!over_graphics (x, y)) return false; - if (type == "move" || type == "dragging") + if (!over_graphics (x, y)) + return false; + if (type == "move" || type == "dragging-left") if (check_event (MOTION_EVENT)) return true; point p = f [point (x, y)]; graphical_select (p[0], p[1]); // init the caching for adjust(). - p = adjust (p); + p= adjust (p); gr_x= p[0]; gr_y= p[1]; string sx= as_string (p[0]); @@ -351,28 +386,29 @@ invalidate_graphical_object (); call ("set-keyboard-modifiers", object (m)); if (type == "move") - call ("graphics-move-point", sx, sy); - else if (type == "release-left") - call ("graphics-insert-point", sx, sy); + call ("graphics-move", sx, sy); + else if (type == "release-left" || type == "double-left") + call ("graphics-release-left", sx, sy); else if (type == "release-middle") - call ("graphics-remove-point", sx, sy); - else if (type == "release-right") - call ("graphics-last-point", sx, sy); - else if (type == "start-drag") - call ("graphics-start-drag", sx, sy); - else if (type == "dragging") - call ("graphics-dragging", sx, sy); - else if (type == "end-drag") - call ("graphics-end-drag", sx, sy); - else if (type == "start-right-drag") - call ("graphics-start-right-drag", sx, sy); - else if (type == "right-dragging") - call ("graphics-right-dragging", sx, sy); - else if (type == "end-right-drag") - call ("graphics-end-right-drag", sx, sy); + call ("graphics-release-middle", sx, sy); + else if (type == "release-right" || type == "double-right") + call ("graphics-release-right", sx, sy); + else if (type == "start-drag-left") + call ("graphics-start-drag-left", sx, sy); + else if (type == "dragging-left") + call ("graphics-dragging-left", sx, sy); + else if (type == "end-drag-left") + call ("graphics-end-drag-left", sx, sy); + else if (type == "start-drag-right") + call ("graphics-start-drag-right", sx, sy); + else if (type == "dragging-right") + call ("graphics-dragging-right", sx, sy); + else if (type == "end-drag-right") + call ("graphics-end-drag-right", sx, sy); invalidate_graphical_object (); notify_change (THE_CURSOR); return true; } + //cout << "No frame " << tp << ", " << subtree (et, path_up (tp)) << "\n"; return false; } diff -Nru texmacs-1.0.7.13/src/Edit/Interface/edit_graphics.hpp texmacs-1.0.7.14/src/Edit/Interface/edit_graphics.hpp --- texmacs-1.0.7.13/src/Edit/Interface/edit_graphics.hpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Interface/edit_graphics.hpp 2011-10-05 19:31:07.000000000 +0000 @@ -19,8 +19,6 @@ box go_box; // The graphical object typesetted as a box double gr_x, gr_y; // Last (x, y) position of the mouse gr_selections gs; // Last graphical_select (x, y) - array pts; // Last control points - array ci, cgi; // Last Curves & Grid/curves intersections (x, y) grid gr0; // Last grid protected: @@ -31,6 +29,7 @@ edit_graphics_rep (); ~edit_graphics_rep (); + path graphics_path (); bool inside_graphics (bool b); bool inside_active_graphics (bool b); bool over_graphics (SI x, SI y); @@ -50,6 +49,7 @@ void invalidate_graphical_object (); void draw_graphical_object (renderer ren); bool mouse_graphics (string s, SI x, SI y, int mods, time_t t); + void back_in_text_at (tree t, path p, bool forward); }; #endif // defined EDIT_GRAPHICS_H diff -Nru texmacs-1.0.7.13/src/Edit/Interface/edit_interface.cpp texmacs-1.0.7.14/src/Edit/Interface/edit_interface.cpp --- texmacs-1.0.7.13/src/Edit/Interface/edit_interface.cpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Interface/edit_interface.cpp 2011-10-06 07:52:24.000000000 +0000 @@ -50,7 +50,7 @@ message_l (""), message_r (""), last_l (""), last_r (""), sfactor (sv->get_default_shrinking_factor ()), pixel (sfactor*PIXEL), copy_always (), - last_click (0), last_x (0), last_y (0), dragging (false), + last_x (0), last_y (0), made_selection (false), table_selection (false), oc (0, 0), temp_invalid_cursor (false), shadow (NULL), stored (NULL), @@ -321,7 +321,7 @@ is_func (st, ROW) || is_func (st, TFORMAT) || is_graphical (st) || (is_func (st, WITH) && is_graphical (st[N(st)-1])) || - (is_func (st, WITH) && is_func (st[N(st)-1], TEXT_AT)) || + (is_func (st, WITH) && is_graphical_text (st[N(st)-1])) || (is_compound (st, "math", 1) && is_compound (subtree (et, path_up (p)), "input"))) compute_env_rects (path_up (p), rs, recurse); diff -Nru texmacs-1.0.7.13/src/Edit/Interface/edit_interface.hpp texmacs-1.0.7.14/src/Edit/Interface/edit_interface.hpp --- texmacs-1.0.7.13/src/Edit/Interface/edit_interface.hpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Interface/edit_interface.hpp 2011-10-02 06:40:39.000000000 +0000 @@ -47,10 +47,7 @@ int input_mode; // INPUT_NORMAL, INPUT_SEARCH, INPUT_REPLACE protected: - time_t last_click; // last click on left mouse button SI last_x, last_y; - bool start_drag, start_right_drag; - bool dragging, right_dragging; SI start_x, start_y; SI end_x, end_y; bool made_selection; @@ -149,7 +146,7 @@ void mouse_click (SI x, SI y); bool mouse_extra_click (SI x, SI y); void mouse_drag (SI x, SI y); - void mouse_select (SI x, SI y, int mods); + void mouse_select (SI x, SI y, int mods, bool drag); void mouse_paste (SI x, SI y); void mouse_adjust (SI x, SI y); void mouse_scroll (SI x, SI y, bool up); diff -Nru texmacs-1.0.7.13/src/Edit/Interface/edit_keyboard.cpp texmacs-1.0.7.14/src/Edit/Interface/edit_keyboard.cpp --- texmacs-1.0.7.13/src/Edit/Interface/edit_keyboard.cpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Interface/edit_keyboard.cpp 2011-10-01 20:06:28.000000000 +0000 @@ -228,12 +228,19 @@ //if (t2 - t1 >= 10) cout << "handle_keypress took " << t2-t1 << "ms\n"; } +void drag_left_reset (); +void drag_right_reset (); + void edit_interface_rep::handle_keyboard_focus (bool has_focus, time_t t) { if (DEBUG_KEYBOARD) { if (has_focus) cout << "Keyboard] Got focus at " << t << "\n"; else cout << "Keyboard] Lost focus at " << t << "\n"; } + if (got_focus != has_focus) { + drag_left_reset (); + drag_right_reset (); + } got_focus= has_focus; (void) t; notify_change (THE_FOCUS); if (got_focus) { diff -Nru texmacs-1.0.7.13/src/Edit/Interface/edit_mouse.cpp texmacs-1.0.7.14/src/Edit/Interface/edit_mouse.cpp --- texmacs-1.0.7.13/src/Edit/Interface/edit_mouse.cpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Interface/edit_mouse.cpp 2011-10-02 07:29:54.000000000 +0000 @@ -19,96 +19,6 @@ #include "window.hpp" /****************************************************************************** -* dispatching -******************************************************************************/ - -void -edit_interface_rep::mouse_any (string type, SI x, SI y, int mods, time_t t) { - last_x= x; last_y= y; - if (type != "move" || (is_attached (this) && !check_event (MOTION_EVENT))) - update_active_loci (); - - if (type == "leave") - set_pointer ("XC_top_left_arrow"); - if ((type != "move") && (type != "enter") && (type != "leave")) - set_input_normal (); - if (!is_nil (popup_win) && (type != "leave")) { - set_visibility (popup_win, false); - destroy_window_widget (popup_win); - popup_win= widget (); - } - - if (inside_graphics (false)) { - string type2= type; - if (type == "enter") { - dragging= start_drag= false; - right_dragging= start_right_drag= false; - } - if (type == "press-left") - start_drag= true; - if (type == "press-right") - start_right_drag= true; - - if (start_drag && type == "move") { - type2= "start-drag"; - start_drag= false; - dragging= true; - } - else if (dragging && (type == "move")) - type2= "dragging"; - if (dragging && (type == "release-left")) - type2= "end-drag"; - - if (start_right_drag && type == "move") { - type2= "start-right-drag"; - start_right_drag= false; - right_dragging= true; - } - else if (right_dragging && (type == "move")) - type2= "right-dragging"; - if (right_dragging && (type == "release-right")) - type2= "end-right-drag"; - - if (type == "release-left") - dragging= start_drag= false; - if (type == "release-right") - right_dragging= start_right_drag= false; - if (mouse_graphics (type2, x, y, mods, t)) return; - if (!over_graphics (x, y)) - eval ("(graphics-reset-context 'text-cursor)"); - } - - if (type == "press-left") mouse_click (x, y); - if (dragging && (type == "move")) { - if (is_attached (this) && check_event (DRAG_EVENT)) return; - mouse_drag (x, y); - } - if (type == "release-left" || type == "release-right") { - dragging= right_dragging= false; - send_mouse_grab (this, false); - if ((t >= last_click) && ((t - last_click) <= 500)) { - last_click= t; - if (mouse_extra_click (x, y)) - last_click= t- 2000; - } - else { - last_click= t; - mouse_select (x, y, mods); - } - } - if (type == "press-middle") mouse_paste (x, y); - if (type == "press-right") mouse_adjust (x, y); - if (type == "press-up") mouse_scroll (x, y, true); - if (type == "press-down") mouse_scroll (x, y, false); - - if ((type == "press-left") || - (type == "release-left") || - (type == "press-middle") || - (type == "press-right")) - notify_change (THE_DECORATIONS); -} - -/****************************************************************************** * Routines for the mouse ******************************************************************************/ @@ -117,8 +27,6 @@ if (eb->action ("click", x, y, 0) != "") return; start_x = x; start_y = y; - start_drag= dragging= true; - start_right_drag= right_dragging= false; send_mouse_grab (this, true); } @@ -152,14 +60,12 @@ p1= p2; p2= temp; } - if ((p1 == p2) && start_drag) return; set_selection (p1, p2); - start_drag= start_right_drag= false; notify_change (THE_SELECTION); } void -edit_interface_rep::mouse_select (SI x, SI y, int mods) { +edit_interface_rep::mouse_select (SI x, SI y, int mods, bool drag) { if (eb->action ("select" , x, y, 0) != "") return; if (!is_nil (active_ids) && (mods & 256) == 0) { call ("link-follow-ids", object (active_ids)); @@ -170,10 +76,8 @@ bool b= inside_graphics (); if (b) g= get_graphics (); go_to (x, y); - if ((!b0 && inside_graphics (false)) || (b0 && !inside_graphics (false))) { - dragging= start_drag= false; - right_dragging= start_right_drag= false; - } + if ((!b0 && inside_graphics (false)) || (b0 && !inside_graphics (false))) + drag= false; if (!b && inside_graphics ()) eval ("(graphics-reset-context 'begin)"); tree g2= get_graphics (); @@ -181,7 +85,7 @@ invalidate_graphical_object (); eval ("(graphics-reset-context 'exit)"); } - if (start_drag) { + if (!drag) { path sp= find_innermost_scroll (eb, tp); path p0= tree_path (sp, x, y, 0); set_selection (p0, p0); @@ -331,9 +235,187 @@ } /****************************************************************************** +* drag and double click detection for left button +******************************************************************************/ + +static void* left_handle = NULL; +static bool left_started = false; +static bool left_dragging= false; +static SI left_x= 0; +static SI left_y= 0; +static time_t left_last= 0; + +void +drag_left_reset () { + left_started = false; + left_dragging= false; + left_x = 0; + left_y = 0; +} + +static string +detect_left_drag (void* handle, string type, SI x, SI y, time_t t, SI d) { + if (left_handle != handle) drag_left_reset (); + left_handle= handle; + if (type == "press-left") { + left_dragging= true; + left_started = true; + left_x = x; + left_y = y; + } + else if (type == "move") { + if (left_started) { + if (norm (point (x - left_x, y - left_y)) < d) return "wait-left"; + left_started= false; + return "start-drag-left"; + } + if (left_dragging) return "dragging-left"; + } + else if (type == "release-left") { + if (left_started) drag_left_reset (); + if (left_dragging) { + drag_left_reset (); + return "end-drag-left"; + } + if ((t >= left_last) && ((t - left_last) <= 500)) { + left_last= t; + return "double-left"; + } + left_last= t; + } + return type; +} + +/****************************************************************************** +* drag and double click detection for right button +******************************************************************************/ + +static void* right_handle = NULL; +static bool right_started = false; +static bool right_dragging= false; +static SI right_x= 0; +static SI right_y= 0; +static time_t right_last= 0; + +void +drag_right_reset () { + right_started = false; + right_dragging= false; + right_x = 0; + right_y = 0; + right_last = 0; +} + +static string +detect_right_drag (void* handle, string type, SI x, SI y, time_t t, SI d) { + if (right_handle != handle) drag_right_reset (); + right_handle= handle; + if (type == "press-right") { + right_dragging= true; + right_started = true; + right_x = x; + right_y = y; + } + else if (type == "move") { + if (right_started) { + if (norm (point (x - right_x, y - right_y)) < d) return "wait-right"; + right_started= false; + return "start-drag-right"; + } + if (right_dragging) return "dragging-right"; + } + else if (type == "release-right") { + if (right_started) drag_right_reset (); + if (right_dragging) { + drag_right_reset (); + return "end-drag-right"; + } + if ((t >= right_last) && ((t - right_last) <= 500)) { + right_last= t; + return "double-right"; + } + right_last= t; + } + return type; +} + +/****************************************************************************** +* dispatching +******************************************************************************/ + +void +edit_interface_rep::mouse_any (string type, SI x, SI y, int mods, time_t t) { + //cout << "Mouse any " << type << ", " << x << ", " << y << "; " << mods << ", " << t << "\n"; + last_x= x; last_y= y; + bool move_like= + (type == "move" || type == "dragging-left" || type == "dragging-right"); + if ((!move_like) || (is_attached (this) && !check_event (MOTION_EVENT))) + update_active_loci (); + + if (type == "leave") + set_pointer ("XC_top_left_arrow"); + if ((!move_like) && (type != "enter") && (type != "leave")) + set_input_normal (); + if (!is_nil (popup_win) && (type != "leave")) { + set_visibility (popup_win, false); + destroy_window_widget (popup_win); + popup_win= widget (); + } + + if (inside_graphics (false)) { + if (mouse_graphics (type, x, y, mods, t)) return; + if (!over_graphics (x, y)) + eval ("(graphics-reset-context 'text-cursor)"); + } + + if (type == "press-left" || type == "start-drag-left") mouse_click (x, y); + if (type == "dragging-left") { + if (is_attached (this) && check_event (DRAG_EVENT)) return; + mouse_drag (x, y); + } + if (type == "release-left" || type == "end-drag-left") { + send_mouse_grab (this, false); + mouse_select (x, y, mods, type == "end-drag-left"); + } + if (type == "double-left") { + send_mouse_grab (this, false); + if (mouse_extra_click (x, y)) + drag_left_reset (); + } + if (type == "press-middle") mouse_paste (x, y); + if (type == "press-right") mouse_adjust (x, y); + if (type == "press-up") mouse_scroll (x, y, true); + if (type == "press-down") mouse_scroll (x, y, false); + + if ((type == "press-left") || + (type == "release-left") || + (type == "end-drag-left") || + (type == "press-middle") || + (type == "press-right")) + notify_change (THE_DECORATIONS); +} + +/****************************************************************************** * Event handlers ******************************************************************************/ +static void +call_mouse_event (string kind, SI x, SI y, SI m, time_t t) { + array args; + args << object (kind) << object (x) << object (y) + << object (m) << object ((double) t); + call ("mouse-event", args); +} + +static void +delayed_call_mouse_event (string kind, SI x, SI y, SI m, time_t t) { + string cmd= + "(delayed (mouse-event " * scm_quote (kind) * " " * + as_string (x) * " " * as_string (y) * " " * + as_string (m) * " " * as_string (((double) t)) * "))"; + eval (cmd); +} + void edit_interface_rep::handle_mouse (string kind, SI x, SI y, int m, time_t t) { if (is_nil (eb)) apply_changes (); @@ -342,9 +424,21 @@ y *= sfactor; //cout << kind << " (" << x << ", " << y << "; " << m << ")" //<< " at " << t << "\n"; - array args; - args << object (kind) << object (x) << object (y) - << object (m) << object ((double) t); - call ("mouse-event", args); + + string rew= kind; + rew= detect_left_drag ((void*) this, rew, x, y, t, 5 * PIXEL * sfactor); + if (rew == "start-drag-left") { + call_mouse_event (rew, left_x, left_y, m, t); + delayed_call_mouse_event ("dragging-left", x, y, m, t); + } + else { + rew= detect_right_drag ((void*) this, rew, x, y, t, 5 * PIXEL * sfactor); + if (rew == "start-drag-right") { + call_mouse_event (rew, right_x, right_y, m, t); + delayed_call_mouse_event ("dragging-right", x, y, m, t); + } + else call_mouse_event (rew, x, y, m, t); + } + end_editing (); } diff -Nru texmacs-1.0.7.13/src/Edit/Modify/edit_delete.cpp texmacs-1.0.7.14/src/Edit/Modify/edit_delete.cpp --- texmacs-1.0.7.13/src/Edit/Modify/edit_delete.cpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Modify/edit_delete.cpp 2011-10-06 07:54:21.000000000 +0000 @@ -219,6 +219,9 @@ case BIG_AROUND: back_in_around (u, p, forward); return; + case LONG_ARROW: + back_in_long_arrow (u, p, forward); + return; case WIDE: case VAR_WIDE: back_in_wide (u, p, forward); @@ -240,7 +243,10 @@ back_in_with (u, p, forward); return; default: - back_in_general (u, p, forward); + if (is_graphical_text (u)) + back_in_text_at (u, p, forward); + else + back_in_general (u, p, forward); break; } } diff -Nru texmacs-1.0.7.13/src/Edit/Modify/edit_math.cpp texmacs-1.0.7.14/src/Edit/Modify/edit_math.cpp --- texmacs-1.0.7.13/src/Edit/Modify/edit_math.cpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Modify/edit_math.cpp 2011-09-30 08:52:26.000000000 +0000 @@ -240,6 +240,26 @@ } void +edit_math_rep::back_in_long_arrow (tree t, path p, bool forward) { + int i= last_item (p); + if (i == 2) { + if (is_empty (t[2])) remove (path_up (p) * 2, 1); + if (forward) go_to_border (path_up (p), !forward); + else go_to_border (path_up (p) * 1, forward); + } + else if (i == 1) { + if (N(t) == 2 && is_empty (t[1])) { + assign (path_up (p), ""); + correct (path_up (p, 2)); + } + else if (forward && N(t) >= 3) + go_to_border (path_up (p) * 2, forward); + else go_to_border (path_up (p), !forward); + } + else go_to_border (path_up (p), !forward); +} + +void edit_math_rep::back_prime (tree t, path p, bool forward) { if ((N(t) == 1) && is_atomic (t[0])) { string s= t[0]->label; diff -Nru texmacs-1.0.7.13/src/Edit/Modify/edit_math.hpp texmacs-1.0.7.14/src/Edit/Modify/edit_math.hpp --- texmacs-1.0.7.13/src/Edit/Modify/edit_math.hpp 2011-09-07 20:49:32.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Modify/edit_math.hpp 2011-09-30 08:41:44.000000000 +0000 @@ -34,6 +34,7 @@ void back_around (tree t, path p, bool forward); void back_prime (tree t, path p, bool forward); void back_in_around (tree t, path p, bool forward); + void back_in_long_arrow (tree t, path p, bool forward); void back_in_wide (tree t, path p, bool forward); void back_in_tree (tree t, path p, bool forward); void pre_remove_around (path p); diff -Nru texmacs-1.0.7.13/src/Edit/Process/edit_process.cpp texmacs-1.0.7.14/src/Edit/Process/edit_process.cpp --- texmacs-1.0.7.13/src/Edit/Process/edit_process.cpp 2011-09-11 13:49:13.000000000 +0000 +++ texmacs-1.0.7.14/src/Edit/Process/edit_process.cpp 2011-10-03 10:18:17.000000000 +0000 @@ -38,8 +38,8 @@ return bibf; if (exists (relative (base, bibf))) return relative (base, bibf); - if (exists (relative (base, url_ancestor () * bibf))) - return resolve (relative (base, url_ancestor () * bibf)); + if (exists (expand (relative (base, url_ancestor () * bibf)))) + return resolve (expand (relative (base, url_ancestor () * bibf))); return url_none (); } diff -Nru texmacs-1.0.7.13/src/Guile/Glue/build-glue-basic.scm texmacs-1.0.7.14/src/Guile/Glue/build-glue-basic.scm --- texmacs-1.0.7.13/src/Guile/Glue/build-glue-basic.scm 2011-09-07 20:49:33.000000000 +0000 +++ texmacs-1.0.7.14/src/Guile/Glue/build-glue-basic.scm 2011-10-06 10:07:26.000000000 +0000 @@ -189,8 +189,15 @@ (declare-visited declare_visited (void string)) (has-been-visited? has_been_visited (bool string)) + (graphics-set set_graphical_value (void content content)) + (graphics-has? has_graphical_value (bool content)) + (graphics-ref get_graphical_value (tree content)) + (graphics-needs-update? graphics_needs_update (bool)) + (graphics-notify-update graphics_notify_update (void content)) + ;; routines for strings (string-number? is_double (bool string)) + (string-occurs? occurs (bool string string)) (string-search-forwards search_forwards (int string int string)) (string-search-backwards search_backwards (int string int string)) (string-replace replace (string string string string)) @@ -267,6 +274,7 @@ (url-any url_wildcard (url)) (url-wildcard url_wildcard (url string)) (url-parent url_parent (url)) + (url-ancestor url_ancestor (url)) (url-append url_concat (url url url)) (url-or url_or (url url url)) (url->string as_string (string url)) @@ -275,6 +283,7 @@ (url-concat? is_concat (bool url)) (url-or? is_or (bool url)) (url-ref url_ref (url url int)) + (url-head head (url url)) (url-tail tail (url url)) (url-suffix suffix (string url)) (url-glue glue (url url string)) diff -Nru texmacs-1.0.7.13/src/Guile/Glue/glue_basic.cpp texmacs-1.0.7.14/src/Guile/Glue/glue_basic.cpp --- texmacs-1.0.7.13/src/Guile/Glue/glue_basic.cpp 2011-09-07 20:49:33.000000000 +0000 +++ texmacs-1.0.7.14/src/Guile/Glue/glue_basic.cpp 2011-10-06 10:07:38.000000000 +0000 @@ -2073,6 +2073,69 @@ } SCM +tmg_graphics_set (SCM arg1, SCM arg2) { + SCM_ASSERT_CONTENT (arg1, SCM_ARG1, "graphics-set"); + SCM_ASSERT_CONTENT (arg2, SCM_ARG2, "graphics-set"); + + content in1= scm_to_content (arg1); + content in2= scm_to_content (arg2); + + // SCM_DEFER_INTS; + set_graphical_value (in1, in2); + // SCM_ALLOW_INTS; + + return SCM_UNSPECIFIED; +} + +SCM +tmg_graphics_hasP (SCM arg1) { + SCM_ASSERT_CONTENT (arg1, SCM_ARG1, "graphics-has?"); + + content in1= scm_to_content (arg1); + + // SCM_DEFER_INTS; + bool out= has_graphical_value (in1); + // SCM_ALLOW_INTS; + + return bool_to_scm (out); +} + +SCM +tmg_graphics_ref (SCM arg1) { + SCM_ASSERT_CONTENT (arg1, SCM_ARG1, "graphics-ref"); + + content in1= scm_to_content (arg1); + + // SCM_DEFER_INTS; + tree out= get_graphical_value (in1); + // SCM_ALLOW_INTS; + + return tree_to_scm (out); +} + +SCM +tmg_graphics_needs_updateP () { + // SCM_DEFER_INTS; + bool out= graphics_needs_update (); + // SCM_ALLOW_INTS; + + return bool_to_scm (out); +} + +SCM +tmg_graphics_notify_update (SCM arg1) { + SCM_ASSERT_CONTENT (arg1, SCM_ARG1, "graphics-notify-update"); + + content in1= scm_to_content (arg1); + + // SCM_DEFER_INTS; + graphics_notify_update (in1); + // SCM_ALLOW_INTS; + + return SCM_UNSPECIFIED; +} + +SCM tmg_string_numberP (SCM arg1) { SCM_ASSERT_STRING (arg1, SCM_ARG1, "string-number?"); @@ -2086,6 +2149,21 @@ } SCM +tmg_string_occursP (SCM arg1, SCM arg2) { + SCM_ASSERT_STRING (arg1, SCM_ARG1, "string-occurs?"); + SCM_ASSERT_STRING (arg2, SCM_ARG2, "string-occurs?"); + + string in1= scm_to_string (arg1); + string in2= scm_to_string (arg2); + + // SCM_DEFER_INTS; + bool out= occurs (in1, in2); + // SCM_ALLOW_INTS; + + return bool_to_scm (out); +} + +SCM tmg_string_search_forwards (SCM arg1, SCM arg2, SCM arg3) { SCM_ASSERT_STRING (arg1, SCM_ARG1, "string-search-forwards"); SCM_ASSERT_INT (arg2, SCM_ARG2, "string-search-forwards"); @@ -3032,6 +3110,15 @@ } SCM +tmg_url_ancestor () { + // SCM_DEFER_INTS; + url out= url_ancestor (); + // SCM_ALLOW_INTS; + + return url_to_scm (out); +} + +SCM tmg_url_append (SCM arg1, SCM arg2) { SCM_ASSERT_URL (arg1, SCM_ARG1, "url-append"); SCM_ASSERT_URL (arg2, SCM_ARG2, "url-append"); @@ -3142,6 +3229,19 @@ } SCM +tmg_url_head (SCM arg1) { + SCM_ASSERT_URL (arg1, SCM_ARG1, "url-head"); + + url in1= scm_to_url (arg1); + + // SCM_DEFER_INTS; + url out= head (in1); + // SCM_ALLOW_INTS; + + return url_to_scm (out); +} + +SCM tmg_url_tail (SCM arg1) { SCM_ASSERT_URL (arg1, SCM_ARG1, "url-tail"); @@ -5126,7 +5226,13 @@ scm_new_procedure ("set-locus-rendering", (FN) tmg_set_locus_rendering, 2, 0, 0); scm_new_procedure ("declare-visited", (FN) tmg_declare_visited, 1, 0, 0); scm_new_procedure ("has-been-visited?", (FN) tmg_has_been_visitedP, 1, 0, 0); + scm_new_procedure ("graphics-set", (FN) tmg_graphics_set, 2, 0, 0); + scm_new_procedure ("graphics-has?", (FN) tmg_graphics_hasP, 1, 0, 0); + scm_new_procedure ("graphics-ref", (FN) tmg_graphics_ref, 1, 0, 0); + scm_new_procedure ("graphics-needs-update?", (FN) tmg_graphics_needs_updateP, 0, 0, 0); + scm_new_procedure ("graphics-notify-update", (FN) tmg_graphics_notify_update, 1, 0, 0); scm_new_procedure ("string-number?", (FN) tmg_string_numberP, 1, 0, 0); + scm_new_procedure ("string-occurs?", (FN) tmg_string_occursP, 2, 0, 0); scm_new_procedure ("string-search-forwards", (FN) tmg_string_search_forwards, 3, 0, 0); scm_new_procedure ("string-search-backwards", (FN) tmg_string_search_backwards, 3, 0, 0); scm_new_procedure ("string-replace", (FN) tmg_string_replace, 3, 0, 0); @@ -5195,6 +5301,7 @@ scm_new_procedure ("url-any", (FN) tmg_url_any, 0, 0, 0); scm_new_procedure ("url-wildcard", (FN) tmg_url_wildcard, 1, 0, 0); scm_new_procedure ("url-parent", (FN) tmg_url_parent, 0, 0, 0); + scm_new_procedure ("url-ancestor", (FN) tmg_url_ancestor, 0, 0, 0); scm_new_procedure ("url-append", (FN) tmg_url_append, 2, 0, 0); scm_new_procedure ("url-or", (FN) tmg_url_or, 2, 0, 0); scm_new_procedure ("url->string", (FN) tmg_url_2string, 1, 0, 0); @@ -5203,6 +5310,7 @@ scm_new_procedure ("url-concat?", (FN) tmg_url_concatP, 1, 0, 0); scm_new_procedure ("url-or?", (FN) tmg_url_orP, 1, 0, 0); scm_new_procedure ("url-ref", (FN) tmg_url_ref, 2, 0, 0); + scm_new_procedure ("url-head", (FN) tmg_url_head, 1, 0, 0); scm_new_procedure ("url-tail", (FN) tmg_url_tail, 1, 0, 0); scm_new_procedure ("url-suffix", (FN) tmg_url_suffix, 1, 0, 0); scm_new_procedure ("url-glue", (FN) tmg_url_glue, 2, 0, 0); diff -Nru texmacs-1.0.7.13/src/Kernel/Types/tree.cpp texmacs-1.0.7.14/src/Kernel/Types/tree.cpp --- texmacs-1.0.7.13/src/Kernel/Types/tree.cpp 2011-09-07 20:49:26.000000000 +0000 +++ texmacs-1.0.7.14/src/Kernel/Types/tree.cpp 2011-10-06 08:14:29.000000000 +0000 @@ -363,6 +363,11 @@ } bool +is_graphical_text (tree t) { + return is_func (t, TEXT_AT) || is_func (t, MATH_AT); +} + +bool is_empty (tree t) { if (is_atomic (t)) return (t == ""); if (is_document (t) || is_concat (t)) { diff -Nru texmacs-1.0.7.13/src/Kernel/Types/tree.hpp texmacs-1.0.7.14/src/Kernel/Types/tree.hpp --- texmacs-1.0.7.13/src/Kernel/Types/tree.hpp 2011-09-07 20:49:26.000000000 +0000 +++ texmacs-1.0.7.14/src/Kernel/Types/tree.hpp 2011-10-06 07:50:25.000000000 +0000 @@ -262,6 +262,7 @@ bool is_right_script_prime (tree t); bool is_mod_active (tree t); bool is_mod_active_once (tree t); +bool is_graphical_text (tree t); bool is_empty (tree t); inline bool diff -Nru texmacs-1.0.7.13/src/Kernel/Types/tree_label.hpp texmacs-1.0.7.14/src/Kernel/Types/tree_label.hpp --- texmacs-1.0.7.13/src/Kernel/Types/tree_label.hpp 2011-09-07 20:49:26.000000000 +0000 +++ texmacs-1.0.7.14/src/Kernel/Types/tree_label.hpp 2011-10-06 08:12:57.000000000 +0000 @@ -37,7 +37,7 @@ // mathematics AROUND, VAR_AROUND, BIG_AROUND, - LEFT, MID, RIGHT, BIG, + LEFT, MID, RIGHT, BIG, LONG_ARROW, LPRIME, RPRIME, BELOW, ABOVE, LSUB, LSUP, RSUB, RSUP, FRAC, SQRT, WIDE, VAR_WIDE, NEG, TREE, @@ -100,10 +100,12 @@ GRAPHICS, SUPERPOSE, GR_GROUP, GR_LINEAR_TRANSFORM, - TEXT_AT, _POINT, + TEXT_AT, MATH_AT, _POINT, LINE, CLINE, ARC, CARC, SPLINE, VAR_SPLINE, CSPLINE, FILL, IMAGE, BOX_INFO, FRAME_DIRECT, FRAME_INVERSE, + IS_EQUAL, IS_INTERSECTION, + ON_CURVE, ON_TEXT_BORDER, ON_GRID, // graphical interface markup CANVAS, ORNAMENT, diff -Nru texmacs-1.0.7.13/src/Plugins/Ghostscript/gs_utilities.cpp texmacs-1.0.7.14/src/Plugins/Ghostscript/gs_utilities.cpp --- texmacs-1.0.7.13/src/Plugins/Ghostscript/gs_utilities.cpp 2011-09-09 19:54:48.000000000 +0000 +++ texmacs-1.0.7.14/src/Plugins/Ghostscript/gs_utilities.cpp 2011-09-24 13:26:48.000000000 +0000 @@ -143,7 +143,7 @@ cmd << "-dQUIET -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite "; cmd << "-sOutputFile=" << sys_concretize (pdf) << " "; cmd << sys_concretize (doc); - cmd << " -c '[ /Title (" << as_string (tail(pdf)) << ") /DOCINFO pdfmark' "; + cmd << " -c \"[ /Title (" << as_string (tail(pdf)) << ") /DOCINFO pdfmark\" "; // NOTE: when converting from ps to pdf the title of the document is // incorrectly referring to the name of the temporary file diff -Nru texmacs-1.0.7.13/src/Plugins/Ghostscript/gs_utilities.cpp.2 texmacs-1.0.7.14/src/Plugins/Ghostscript/gs_utilities.cpp.2 --- texmacs-1.0.7.13/src/Plugins/Ghostscript/gs_utilities.cpp.2 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/src/Plugins/Ghostscript/gs_utilities.cpp.2 2011-09-18 20:34:32.000000000 +0000 @@ -0,0 +1,183 @@ + +/****************************************************************************** +* MODULE : gs_utilities.mm +* DESCRIPTION: Utilities for Ghostscript +* COPYRIGHT : (C) 2010 David MICHEL +******************************************************************************* +* This software falls under the GNU general public license version 3 or later. +* It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE +* in the root directory or . +******************************************************************************/ + +#include "tm_configure.hpp" +#ifdef USE_GS + +#include "gs_utilities.hpp" +#include "analyze.hpp" +#include "file.hpp" + +bool +gs_supports (url image) { + string s= suffix (image); + if (s == "ps" || s == "eps" || s == "pdf") return true; + return false; +} + +void +gs_image_size (url image, int& w_pt, int& h_pt) { + string cmd; + cmd= "grep -m 1 '^%%BoundingBox: ' "; + cmd << sys_concretize (image); + string buf= eval_system (cmd); + int pos= 0; + int ok= read (buf, pos, "%%BoundingBox: "); + if (!ok) { +#if defined (__MINGW__) || defined (__MINGW32__) + cmd= "\""; + cmd << get_env ("TEXMACS_PATH") << string ("\\bin\\gswin32c\" "); +#else + cmd= "gs "; +#endif + cmd << "-dQUIET -dNOPAUSE -dBATCH -dSAFER -dEPSCrop -sDEVICE=bbox "; + cmd << sys_concretize (image); + string buf= eval_system (cmd); + int pos= 0; + ok= read (buf, pos, "%%BoundingBox: "); + } + if (ok) { + int x1, y1, x2, y2; + skip_spaces (buf, pos); + ok= ok && read_int (buf, pos, x1); + skip_spaces (buf, pos); + ok= ok && read_int (buf, pos, y1); + skip_spaces (buf, pos); + ok= ok && read_int (buf, pos, x2); + skip_spaces (buf, pos); + ok= ok && read_int (buf, pos, y2); + if (ok) { + w_pt= x2-x1; + h_pt= y2-y1; + return; + } + } + cerr << "TeXmacs Cannot read image file '" << image << "'" + << " in gs_image_size" << LF; + w_pt= 35; h_pt= 35; +} + +void ps_bounding_box (url image, int& x1, int& y1, int& x2, int& y2); + +static bool +use_converts (url image, int& bx1, int& by1, int& bx2, int& by2) { + // NOTE: determine whether we should use image magick. + // Indeed, EPSCrop unfortunately does not correctly handle + // non trivial offsets of bounding boxes + static bool has_image_magick= exists_in_path ("convert"); + ps_bounding_box (image, bx1, by1, bx2, by2); + return has_image_magick && (bx1 != 0 || by1 != 0); +} + +void +gs_to_png (url image, url png, int w, int h) { + int bx1, by1, bx2, by2; + if (use_converts (image, bx1, by1, bx2, by2)) { + cout << image << ", " << w << ", " << h << "\n"; + cout << bx1 << ", " << by1 << "; " << bx2 << ", " << by2 << "\n"; + /* + int ww= bx2 - bx1, hh= by2 - by1; + int ox= (bx1 * w) / ww, oy= (by1 * h) / hh; + string cmd= "convert "; + cmd << "-resize '" << as_string ((100*w)/ww) + << "%x" << as_string ((100*h)/hh) << "%' "; + cmd << "-crop " << as_string (w) << "x" << as_string (h) + << "+" << as_string (ox) << "+" << as_string (oy) << " "; + */ + string cmd= "convert "; + cmd << "-crop " << as_string (bx2-bx1) << "x" << as_string (by2-by1) + << "+" << as_string (bx1) << "+" << as_string (by1) << " "; + cmd << "-geometry " << as_string (w) << "x" << as_string (h) << " "; + cmd << sys_concretize (image) << " "; + cmd << sys_concretize (png); + system (cmd); + } + else { +#if defined (__MINGW__) || defined (__MINGW32__) + string cmd= "\""; + cmd << get_env ("TEXMACS_PATH") << string ("\\bin\\gswin32c\" "); +#else + string cmd= "gs "; +#endif + cmd << "-dQUIET -dNOPAUSE -dBATCH -dSAFER "; + cmd << "-sDEVICE=png16m -dGraphicsAlphaBits=4 -dEPSCrop "; + cmd << "-g" << as_string (w) << "x" << as_string (h) << " "; + int bbw, bbh; + int rw, rh; + gs_image_size (image, bbw, bbh); + rw= (w*72-1)/bbw+1; + rh= (h*72-1)/bbh+1; + cmd << "-r" << as_string (rw) << "x" << as_string (rh) << " "; + cmd << "-sOutputFile=" << sys_concretize (png) << " "; + cmd << sys_concretize (image); + system (cmd); + } +} + +void +gs_to_eps (url image, url eps) { + int bx1, by1, bx2, by2; + if (use_converts (image, bx1, by1, bx2, by2)) { + string cmd= "convert "; + cmd << sys_concretize (image) << " "; + cmd << sys_concretize (eps); + system (cmd); + } + else { +#if defined (__MINGW__) || defined (__MINGW32__) + string cmd= "\""; + cmd << get_env ("TEXMACS_PATH") << string ("\\bin\\gswin32c\" "); +#else + string cmd= "gs "; +#endif + cmd << "-dQUIET -dNOPAUSE -dBATCH -dSAFER "; + cmd << "-sDEVICE=epswrite -dEPSCrop "; + cmd << "-sOutputFile=" << sys_concretize (eps) << " "; + cmd << sys_concretize (image); + system (cmd); + } +} + +void +gs_to_pdf (url doc, url pdf) { +#if defined (__MINGW__) || defined (__MINGW32__) + string cmd= "\""; + cmd << get_env ("TEXMACS_PATH") << string ("\\bin\\gswin32c\" "); +#else + string cmd= "gs "; +#endif + cmd << "-dQUIET -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite "; + cmd << "-sOutputFile=" << sys_concretize (pdf) << " "; + cmd << sys_concretize (doc); + cmd << " -c '[ /Title (" << as_string (tail(pdf)) << ") /DOCINFO pdfmark' "; + + // NOTE: when converting from ps to pdf the title of the document is + // incorrectly referring to the name of the temporary file + // so we add some PS code to override the PDF document title with + // the name of the PDF file. + + system (cmd); +} + +void +tm_gs (url image) { +#if defined (__MINGW__) || defined (__MINGW32__) + string cmd= "\""; + cmd << get_env ("TEXMACS_PATH") << string ("\\bin\\gswin32c\" "); +#else + string cmd= "gs "; +#endif + cmd << "-q -sDEVICE=x11alpha -dBATCH -dNOPAUSE -dSAFER -dNOEPS "; + cmd << sys_concretize (image); + system (cmd); +} + +#endif diff -Nru texmacs-1.0.7.13/src/Plugins/Qt/qt_chooser_widget.cpp texmacs-1.0.7.14/src/Plugins/Qt/qt_chooser_widget.cpp --- texmacs-1.0.7.13/src/Plugins/Qt/qt_chooser_widget.cpp 2011-09-07 20:49:28.000000000 +0000 +++ texmacs-1.0.7.14/src/Plugins/Qt/qt_chooser_widget.cpp 2011-09-24 13:26:48.000000000 +0000 @@ -185,7 +185,7 @@ QStringList _files; QString _filter, _suffix, _caption, _directory; _caption = to_qstring (win_title); - _directory = to_qstring (directory * "/" * file); + _directory = QString::fromLocal8Bit (as_charp (directory * "/" * file)); #if (QT_VERSION >= 0x040400) if (type == "directory") { diff -Nru texmacs-1.0.7.13/src/Plugins/Qt/qt_dialogues.cpp texmacs-1.0.7.14/src/Plugins/Qt/qt_dialogues.cpp --- texmacs-1.0.7.13/src/Plugins/Qt/qt_dialogues.cpp 2011-09-07 20:49:28.000000000 +0000 +++ texmacs-1.0.7.14/src/Plugins/Qt/qt_dialogues.cpp 2011-09-30 05:38:08.000000000 +0000 @@ -239,84 +239,122 @@ void qt_input_widget_rep::perform_dialog() { - QDialog d (0, Qt::Sheet); - QVBoxLayout* vl = new QVBoxLayout(&d); - - QVector cbs (N (fields)); - - for(int i=0; iprompt))),&d); - cbs[i] = new QComboBox(&d); - cbs[i] -> setSizeAdjustPolicy (QComboBox::AdjustToMinimumContentsLength); - cbs[i] -> setEditText (to_qstring(fields[i]->input)); - int minlen = 0; - for(int j=0; j < N(fields[i]->proposals); j++) { - QString str = to_qstring (fields[i]->proposals[j]); - cbs[i] -> addItem (str); - int c = str.count(); - if (c > minlen) minlen = c; + if ((N(fields)==1) && (fields[0]->type == "question")) { + // then use Qt messagebox for smoother, more standard UI + QWidget * mainwindow = QApplication::activeWindow (); + // main texmacs window. There are probably better ways... + // Presently not checking if the windows has the focus; + // In case it has not, it should be brought into focus + // before calling the dialog + QMessageBox * msgBox=new QMessageBox(mainwindow); + //sets parent widget, so that appears at proper location + msgBox->setText(to_qstring (qt_translate (fields[0]->prompt))); + msgBox->setStandardButtons(QMessageBox::Cancel); + int choices = N(fields[0]->proposals); + QVector buttonlist (choices); + //allowing for any number of choices + for(int i=0; iproposals[i]); + //capitalize the first character? + buttonlist[i] = msgBox->addButton (to_qstring (qt_translate (blabel)), QMessageBox::ActionRole); } - cbs[i] -> setMinimumContentsLength (minlen>50 ? 50 : (minlen < 2 ? 10 : minlen)); - cbs[i] -> setEditable (true); - // apparently the following flag prevents Qt from substituting an history item - // for an input when they differ only from the point of view of case (upper/lower) - // eg. if the history contains aAAAAa and you type AAAAAA then the combo box - // will retain the string aAAAAa - cbs[i]->setDuplicatesEnabled(true); - cbs[i]->completer()->setCaseSensitivity(Qt::CaseSensitive); - lab -> setBuddy (cbs[i]); - hl -> addWidget (lab); - hl -> addWidget (cbs[i]); - vl -> addLayout (hl); - - if (ends (fields[i]->type, "file") || fields[i]->type == "directory") { - // autocompletion - //QCompleter *completer = new QCompleter(cbs[i]); - QCompleter *completer = cbs[i]->completer(); - QDirModel *dirModel = new QDirModel(); - completer->setModel(dirModel); - //cbs[i]->setCompleter(completer); + msgBox->setDefaultButton (buttonlist[0]); //default is first choice + msgBox->setWindowTitle (to_qstring (qt_translate ("Question"))); + msgBox->setIcon (QMessageBox::Question); + + msgBox->exec(); + bool buttonclicked=false; + for(int i=0; iclickedButton() == buttonlist[i]) { + fields[0] -> input = scm_quote (fields[0]->proposals[i]); + buttonclicked=true; + break; + } } + if (!buttonclicked) {fields[0] -> input = "#f";} //cancelled } - { - QDialogButtonBox* buttonBox = - new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel, - Qt::Horizontal, &d); - QObject::connect (buttonBox, SIGNAL (accepted()), &d, SLOT (accept())); - QObject::connect (buttonBox, SIGNAL (rejected()), &d, SLOT (reject())); - vl -> addWidget (buttonBox); - } -// d.setLayout (vl); - d.setWindowTitle(to_qstring(win_title)); - QPoint pos = to_qpoint(position); - //cout << "Size :" << size.x1 << "," << size.x2 << LF; - //cout << "Position :" << pos.x() << "," << pos.y() << LF; - - d.updateGeometry(); - QSize sz = d.sizeHint(); - QRect r; r.setSize(sz); - r.moveCenter(pos); - d.setGeometry(r); - - int result = d.exec (); - if (result == QDialog::Accepted) { + else { //usual dialogue layout + QDialog d (0, Qt::Sheet); + QVBoxLayout* vl = new QVBoxLayout(&d); + + QVector cbs (N (fields)); + for(int i=0; icurrentText(); - fields[i] -> input = scm_quote (from_qstring (item)); + QHBoxLayout *hl = new QHBoxLayout(); + + QLabel *lab = new QLabel (to_qstring (tm_var_encode( (fields[i]->prompt))),&d); + cbs[i] = new QComboBox(&d); + cbs[i] -> setSizeAdjustPolicy (QComboBox::AdjustToMinimumContentsLength); + cbs[i] -> setEditText (to_qstring(fields[i]->input)); + int minlen = 0; + for(int j=0; j < N(fields[i]->proposals); j++) { + QString str = to_qstring (fields[i]->proposals[j]); + cbs[i] -> addItem (str); + int c = str.count(); + if (c > minlen) minlen = c; + } + cbs[i] -> setMinimumContentsLength (minlen>50 ? 50 : (minlen < 2 ? 10 : minlen)); + cbs[i] -> setEditable (true); + // apparently the following flag prevents Qt from substituting + // an history item for an input when they differ only from + // the point of view of case (upper/lower) + // eg. if the history contains aAAAAa and you type AAAAAA then + // the combo box will retain the string aAAAAa + cbs[i]->setDuplicatesEnabled(true); + cbs[i]->completer()->setCaseSensitivity(Qt::CaseSensitive); + lab -> setBuddy (cbs[i]); + hl -> addWidget (lab); + hl -> addWidget (cbs[i]); + vl -> addLayout (hl); + + if (ends (fields[i]->type, "file") || fields[i]->type == "directory") { + // autocompletion + //QCompleter *completer = new QCompleter(cbs[i]); + QCompleter *completer = cbs[i]->completer(); + QDirModel *dirModel = new QDirModel(); + completer->setModel(dirModel); + //cbs[i]->setCompleter(completer); + } } - } else { - for(int i=0; i input = "#f"; + + { + QDialogButtonBox* buttonBox = + new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel, + Qt::Horizontal, &d); + QObject::connect (buttonBox, SIGNAL (accepted()), &d, SLOT (accept())); + QObject::connect (buttonBox, SIGNAL (rejected()), &d, SLOT (reject())); + vl -> addWidget (buttonBox); + } + // d.setLayout (vl); + d.setWindowTitle(to_qstring(win_title)); + QPoint pos = to_qpoint(position); + //cout << "Size :" << size.x1 << "," << size.x2 << LF; + //cout << "Position :" << pos.x() << "," << pos.y() << LF; + + d.updateGeometry(); + QSize sz = d.sizeHint(); + QRect r; r.setSize(sz); + r.moveCenter(pos); + d.setGeometry(r); + + int result = d.exec (); + if (result == QDialog::Accepted) { + for(int i=0; icurrentText(); + fields[i] -> input = scm_quote (from_qstring (item)); + } + } else { + for(int i=0; i input = "#f"; + } } } + cmd (); } - /******************************************************************************* * Input text widget implementation *******************************************************************************/ diff -Nru texmacs-1.0.7.13/src/Plugins/Qt/QTMStyle.cpp texmacs-1.0.7.14/src/Plugins/Qt/QTMStyle.cpp --- texmacs-1.0.7.13/src/Plugins/Qt/QTMStyle.cpp 2011-09-07 20:49:28.000000000 +0000 +++ texmacs-1.0.7.14/src/Plugins/Qt/QTMStyle.cpp 2011-10-06 16:14:56.000000000 +0000 @@ -15,7 +15,7 @@ #include "tm_ostream.hpp" #include #include - +#include @@ -72,7 +72,7 @@ void drawPrimitive (PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const; int pixelMetric (PixelMetric metric, const QStyleOption *opt, const QWidget *widget) const; QSize sizeFromContents (ContentsType type, const QStyleOption* option, const QSize& contentsSize, const QWidget* widget = 0) const; - // void drawControl (ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget = 0) const; + void drawControl (ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget = 0) const; int styleHint (StyleHint hint, const QStyleOption* option = 0, const QWidget* widget = 0, QStyleHintReturn* returnData = 0) const; }; @@ -448,10 +448,10 @@ return baseStyle()->pixelMetric(metric,opt,widget); } -#if 0 void QTMStyle::drawControl (ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget) const { switch (element) { +#if 0 case CE_MenuItem: if (const QStyleOptionMenuItem *mi = qstyleoption_cast (option)) { @@ -460,11 +460,49 @@ baseStyle()->drawControl (element, &mi2, painter, widget); break; } +#endif + + case CE_ToolBar: { + if ((widget) && (widget->windowTitle() == "mode toolbar")) { + + // For unified tool bars, draw nothing. + if (QMainWindow * mainWindow = qobject_cast(widget->window())) { + if ((mainWindow->unifiedTitleAndToolBarOnMac()) && + (widget->parent()->objectName() != "central widget")) + break; + } + + //QColor mainWindowGradientBeginActive (150, 150, 150); + //QColor mainWindowGradientBegin (200, 200, 200); + //QColor mainWindowGradientEnd (232, 232, 232); + + QColor mainWindowGradientBeginActive (222, 222, 222); + QColor mainWindowGradientEndActive (202, 202, 202); + QColor mainWindowGradientBegin (236, 236, 236); + QColor mainWindowGradientEnd (226, 226, 226); + + if (widget->window()->isActiveWindow()) + mainWindowGradientBegin = mainWindowGradientBeginActive; + if (widget->window()->isActiveWindow()) + mainWindowGradientEnd = mainWindowGradientEndActive; + + // draw background gradient + QLinearGradient linearGrad; + if (option->state & State_Horizontal) + linearGrad = QLinearGradient(0, option->rect.top(), 0, option->rect.bottom()); + else + linearGrad = QLinearGradient(option->rect.left(), 0, option->rect.right(), 0); + + linearGrad.setColorAt(0, mainWindowGradientBegin); + linearGrad.setColorAt(1, mainWindowGradientEnd); + painter->fillRect(option->rect, linearGrad); + } + } break; + default: baseStyle()->drawControl (element, option, painter, widget); } } -#endif int QTMStyle::styleHint (StyleHint hint, const QStyleOption* option, const QWidget* widget, QStyleHintReturn* returnData) const { diff -Nru texmacs-1.0.7.13/src/Plugins/Qt/qt_sys_utils.cpp texmacs-1.0.7.14/src/Plugins/Qt/qt_sys_utils.cpp --- texmacs-1.0.7.13/src/Plugins/Qt/qt_sys_utils.cpp 2011-09-07 20:49:28.000000000 +0000 +++ texmacs-1.0.7.14/src/Plugins/Qt/qt_sys_utils.cpp 2011-09-24 13:26:48.000000000 +0000 @@ -29,7 +29,7 @@ proc.setProcessChannelMode (QProcess::MergedChannels); char* _cmd = as_charp (cmd); #if defined (__MINGW__) || defined (__MINGW32__) - QString qcmd = _cmd; + QString qcmd = QString::fromLocal8Bit (as_charp (_cmd)); #else QString qcmd = "sh -c \""; qcmd += _cmd; diff -Nru texmacs-1.0.7.13/src/Plugins/Qt/qt_tm_widget.cpp texmacs-1.0.7.14/src/Plugins/Qt/qt_tm_widget.cpp --- texmacs-1.0.7.13/src/Plugins/Qt/qt_tm_widget.cpp 2011-09-13 18:59:41.000000000 +0000 +++ texmacs-1.0.7.14/src/Plugins/Qt/qt_tm_widget.cpp 2011-10-06 19:39:04.000000000 +0000 @@ -103,8 +103,7 @@ sz.setHeight (sz.height () + 6); } else if (sz.height () >= 20) { - sz.setWidth (sz.width () + 2); - sz.setHeight (sz.height () + 4); + sz.setHeight (sz.height () + 2); } else if (sz.height () >= 16) { sz.setHeight (sz.height () + 2); @@ -127,12 +126,12 @@ QMainWindow* mw= tm_mainwindow (); mw->setStyle (qtmstyle ()); - mw->menuBar()->setStyle (qtmstyle ()); + mw->menuBar()->setStyle (qtmstyle ()); // there is a bug in the early implementation of toolbars in Qt 4.6 // which has been fixed in 4.6.2 (at least) // this is why we change dimension of icons - + #if (defined(Q_WS_MAC)&&(QT_VERSION>=QT_VERSION_CHECK(4,6,0))&&(QT_VERSIONsetIconSize (QSize (22, 30)); #else @@ -193,16 +192,16 @@ { // set proper sizes for icons - QPixmap *pxm = the_qt_renderer()->xpm_image("tm_new.xpm"); - QSize sz = (pxm ? pxm->size() : QSize(32,32)); + QPixmap *pxm = the_qt_renderer()->xpm_image ("tm_new.xpm"); + QSize sz = (pxm ? pxm->size() : QSize(24,24)); tweek_iconbar_size (sz); mainToolBar->setIconSize (sz); - pxm = the_qt_renderer()->xpm_image("tm_section.xpm"); - sz = (pxm ? pxm->size() : QSize(17,17)); + pxm = the_qt_renderer()->xpm_image ("tm_section.xpm"); + sz = (pxm ? pxm->size() : QSize(20,20)); tweek_iconbar_size (sz); modeToolBar->setIconSize(sz); - pxm = the_qt_renderer()->xpm_image("tm_plus.xpm"); - sz = (pxm ? pxm->size() : QSize(17,17)); + pxm = the_qt_renderer()->xpm_image ("tm_add.xpm"); + sz = (pxm ? pxm->size() : QSize(16,16)); tweek_iconbar_size (sz); focusToolBar->setIconSize(sz); } @@ -213,6 +212,7 @@ mw->setUnifiedTitleAndToolBarOnMac(true); QWidget *cw= new QWidget (); + cw->setObjectName("central widget"); // this is important for styling toolbars. QBoxLayout *bl = new QBoxLayout(QBoxLayout::TopToBottom, cw); bl->setContentsMargins(2,2,2,2); @@ -242,17 +242,22 @@ rulerWidget = new QWidget(cw); rulerWidget->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed); rulerWidget->setMinimumHeight(1); - rulerWidget->setBackgroundRole(QPalette::Dark); + rulerWidget->setBackgroundRole(QPalette::Mid); + // FIXME: how to use 112 (active) and 146 (passive) rulerWidget->setVisible(false); rulerWidget->setAutoFillBackground(true); -// rulerWidget = new QLabel("pippo", cw); - + // rulerWidget = new QLabel("pippo", cw); + bl->insertWidget(0, modeToolBar); bl->insertWidget(1, rulerWidget); bl->insertWidget(2, focusToolBar); bl->insertWidget(3, userToolBar); + tw->setContentsMargins (2, 0, 2, 0); + mw->setContentsMargins (-2, -2, -2, -2); + bar->setContentsMargins (0, 0, 0, 2); + #else mw->setCentralWidget(tw); @@ -279,7 +284,6 @@ #ifndef Q_WS_MAC tm_mainwindow()->menuBar()->setVisible (false); #endif - } qt_tm_widget_rep::~qt_tm_widget_rep () { diff -Nru texmacs-1.0.7.13/src/System/Boot/init_texmacs.cpp texmacs-1.0.7.14/src/System/Boot/init_texmacs.cpp --- texmacs-1.0.7.13/src/System/Boot/init_texmacs.cpp 2011-09-12 11:27:39.000000000 +0000 +++ texmacs-1.0.7.14/src/System/Boot/init_texmacs.cpp 2011-09-19 17:19:19.000000000 +0000 @@ -249,8 +249,9 @@ plugin_path ("misc/patterns")); (void) get_env_path ("TEXMACS_PIXMAP_PATH", "$TEXMACS_HOME_PATH/misc/pixmaps" | - url ("$TEXMACS_PATH/misc/pixmaps/modern/24x24") | - //url ("$TEXMACS_PATH/misc/pixmaps/alternate/24x24") | + url ("$TEXMACS_PATH/misc/pixmaps/modern/24x24/main") | + url ("$TEXMACS_PATH/misc/pixmaps/modern/20x20/mode") | + url ("$TEXMACS_PATH/misc/pixmaps/modern/16x16/focus") | url ("$TEXMACS_PATH/misc/pixmaps/traditional/--x17") | plugin_path ("misc/pixmaps")); (void) get_env_path ("TEXMACS_DIC_PATH", diff -Nru texmacs-1.0.7.13/src/System/Classes/url.cpp texmacs-1.0.7.14/src/System/Classes/url.cpp --- texmacs-1.0.7.13/src/System/Classes/url.cpp 2011-09-07 20:49:31.000000000 +0000 +++ texmacs-1.0.7.14/src/System/Classes/url.cpp 2011-10-03 10:50:38.000000000 +0000 @@ -309,18 +309,12 @@ if (u2 == url_parent ()) { if (is_root (u1)) return u1; if (is_atomic (u1) && (!is_parent (u1))) return url_here (); - if (is_semi_root (u1)) - return u1; + if (is_semi_root (u1)) return u1; } if (is_concat (u2) && (u2[1] == url_parent ())) { if (is_root (u1)) return u1 * u2[2]; if (is_atomic (u1) && (!is_parent (u1))) return u2[2]; - if (is_semi_root (u1)) - return u1 * u2[2]; - } - if (is_concat (u2) && (u2[1] == url_ancestor ())) { - if (is_root (u1) || is_semi_root (u1)) return u1 * u2[2]; - return (u1 * u2[2]) | ((u1 * url_parent ()) * u2); + if (is_semi_root (u1)) return u1 * u2[2]; } if (is_concat (u1)) return u1[1] * (u1[2] * u2); return as_url (tuple ("concat", u1->t, u2->t)); @@ -591,6 +585,12 @@ expand (url u1, url u2) { if (is_or (u1)) return expand (u1[1], u2) | expand (u1[2], u2); if (is_or (u2)) return expand (u1, u2[1]) | expand (u1, u2[2]); + if (is_ancestor (u2)) { + if (is_concat (u1)) return u1 | expand (u1[1], u2); + return u1 | u2; + } + if (is_concat (u2) && is_ancestor (u2[1])) + return expand (expand (u1, u2[1]), u2[2]); return u1 * u2; } diff -Nru texmacs-1.0.7.13/src/System/Files/file.cpp texmacs-1.0.7.14/src/System/Files/file.cpp --- texmacs-1.0.7.13/src/System/Files/file.cpp 2011-09-07 20:49:30.000000000 +0000 +++ texmacs-1.0.7.14/src/System/Files/file.cpp 2011-10-06 08:27:27.000000000 +0000 @@ -74,8 +74,9 @@ #endif if (fin == NULL) { err= true; - cerr << "TeXmacs] warning, load error for " << name << ", " - << sys_errlist[errno] << "\n"; + if (!occurs ("system", name)) + cerr << "TeXmacs] warning, load error for " << name << ", " + << sys_errlist[errno] << "\n"; } int size= 0; if (!err) { diff -Nru texmacs-1.0.7.13/src/System/Files/image_files.cpp texmacs-1.0.7.14/src/System/Files/image_files.cpp --- texmacs-1.0.7.13/src/System/Files/image_files.cpp 2011-09-09 19:55:17.000000000 +0000 +++ texmacs-1.0.7.14/src/System/Files/image_files.cpp 2011-09-18 20:33:40.000000000 +0000 @@ -228,36 +228,36 @@ image_size (url image, int& w, int& h) { #ifdef QTTEXMACS if (qt_supports (image)) { - //cout << "qt " << image << "\n"; qt_image_size (image, w, h); // default to 72 dpi + //cout << "qt " << image << ", " << w << ", " << h << "\n"; return; } #endif #ifdef MACOSX_EXTENSIONS if (mac_image_size (image, w, h) ) { - //cout << "mac " << image << "\n"; + //cout << "mac " << image << ", " << w << ", " << h << "\n"; return; } #endif #ifdef USE_IMLIB2 if (imlib2_supports (image)) { - //cout << "imlib2 " << image << "\n"; imlib2_image_size (image, w, h); + //cout << "imlib2 " << image << ", " << w << ", " << h << "\n"; return; } #endif #ifdef USE_GS if (gs_supports (image)) { - //cout << "gs " << image << "\n"; gs_image_size (image, w, h); + //cout << "gs " << image << ", " << w << ", " << h << "\n"; return; } #endif - //cout << "default " << image << "\n"; int x1, y1, x2, y2; ps_bounding_box (image, x1, y1, x2, y2); w= x2 - x1; h= y2 - y1; + //cout << "default " << image << ", " << w << ", " << h << "\n"; } /****************************************************************************** diff -Nru texmacs-1.0.7.13/src/System/Language/mathemagix_language.cpp texmacs-1.0.7.14/src/System/Language/mathemagix_language.cpp --- texmacs-1.0.7.13/src/System/Language/mathemagix_language.cpp 2011-09-07 20:49:30.000000000 +0000 +++ texmacs-1.0.7.14/src/System/Language/mathemagix_language.cpp 2011-09-16 15:05:18.000000000 +0000 @@ -73,6 +73,7 @@ t ("cpp_libs")= c; t ("cpp_preamble")= c; t ("cpp_macro")= c; + t ("cpp_include")= c; t ("true")= c; t ("false")= c; t ("mmout")= c; diff -Nru texmacs-1.0.7.13/src/System/Misc/fast_alloc.hpp texmacs-1.0.7.14/src/System/Misc/fast_alloc.hpp --- texmacs-1.0.7.13/src/System/Misc/fast_alloc.hpp 2011-09-07 20:49:31.000000000 +0000 +++ texmacs-1.0.7.14/src/System/Misc/fast_alloc.hpp 2011-09-30 12:26:56.000000000 +0000 @@ -163,6 +163,14 @@ } template inline C* +tm_new (A1& a1, A2& a2, A3& a3, A4& a4, A5& a5) { + void* ptr= fast_new (sizeof (C)); + (void) new (ptr) C (a1, a2, a3, a4, a5); + return (C*) ptr; +} + +template inline C* tm_new (const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5, const A6& a6) { @@ -434,6 +442,12 @@ } template inline C* +tm_new (A1& a1, A2& a2, A3& a3, A4& a4, A5& a5) { + return new C (a1, a2, a3, a4, a5); +} + +template inline C* tm_new (const A1& a1, const A2& a2, const A3& a3, const A4& a4, const A5& a5, const A6& a6) { diff -Nru texmacs-1.0.7.13/src/Typeset/Boxes/Basic/boxes.cpp texmacs-1.0.7.14/src/Typeset/Boxes/Basic/boxes.cpp --- texmacs-1.0.7.13/src/Typeset/Boxes/Basic/boxes.cpp 2011-09-07 20:49:34.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Boxes/Basic/boxes.cpp 2011-10-05 19:31:07.000000000 +0000 @@ -350,6 +350,7 @@ gr_selections res; if (graphical_distance (x, y) <= dist) { gr_selection gs; + gs->type= "box"; gs->dist= graphical_distance (x, y); gs->cp << find_tree_path (x, y, dist); // FIXME: check whether this is correct: I do not remember whether @@ -365,6 +366,7 @@ gr_selections res; if (in_rectangle (x1, y1, x2, y2)) { gr_selection gs; + gs->type= "box"; gs->dist= graphical_distance (x1, y1); SI dist= (SI)norm (point (x2-x1, y2-y1)); gs->cp << find_tree_path (x1, y1, dist); @@ -634,7 +636,8 @@ tm_ostream& operator << (tm_ostream& out, gr_selection sel) { - return out << "gr_selection (" << sel->dist << ", " << sel->cp << ")"; + return out << "gr_selection (" << sel->type << ", " + << sel->dist << ", " << sel->cp << ")"; } struct less_eq_gr_selection { @@ -642,8 +645,14 @@ return a->dist <= b->dist; } }; -tree as_tree (gr_selections sels) { +void +sort (gr_selections& sels) { merge_sort_leq (sels); +} + +tree +as_tree (gr_selections sels) { + sort (sels); int i, n= N(sels); array > res (n); for (i=0; i=0; i--) res << bs[i]->graphical_select (x- sx(i), y- sy(i), dist); } return res; @@ -354,7 +354,7 @@ gr_selections res; if (contains_rectangle (x1, y1, x2, y2)) { int i, n= subnr(); - for (i=0; i=0; i--) res << bs[i]->graphical_select (x1- sx(i), y1- sy(i), x2- sx(i), y2- sy(i)); } diff -Nru texmacs-1.0.7.13/src/Typeset/Boxes/Composite/concat_boxes.cpp texmacs-1.0.7.14/src/Typeset/Boxes/Composite/concat_boxes.cpp --- texmacs-1.0.7.13/src/Typeset/Boxes/Composite/concat_boxes.cpp 2011-09-07 20:49:34.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Boxes/Composite/concat_boxes.cpp 2011-10-05 20:45:35.000000000 +0000 @@ -55,6 +55,7 @@ SI get_leaf_offset (string search); box transform (frame fr); + gr_selections graphical_select (SI x, SI y, SI dist); gr_selections graphical_select (SI x1, SI y1, SI x2, SI y2); }; @@ -498,10 +499,19 @@ } gr_selections +concat_box_rep::graphical_select (SI x, SI y, SI dist) { + gr_selections res; + int i, n= subnr(); + for (i=n-1; i>=0; i--) + res << bs[i]->graphical_select (x- sx(i), y- sy(i), dist); + return res; +} + +gr_selections concat_box_rep::graphical_select (SI x1, SI y1, SI x2, SI y2) { gr_selections res; int i, n= subnr(); - for (i=0; i=0; i--) res << bs[i]->graphical_select (x1- sx(i), y1- sy(i), x2- sx(i), y2- sy(i)); return res; diff -Nru texmacs-1.0.7.13/src/Typeset/Boxes/Composite/stack_boxes.cpp texmacs-1.0.7.14/src/Typeset/Boxes/Composite/stack_boxes.cpp --- texmacs-1.0.7.13/src/Typeset/Boxes/Composite/stack_boxes.cpp 2011-09-07 20:49:34.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Boxes/Composite/stack_boxes.cpp 2011-09-29 18:56:17.000000000 +0000 @@ -349,7 +349,7 @@ stack_box_rep::graphical_select (SI x1, SI y1, SI x2, SI y2) { gr_selections res; int i, n= subnr(); - for (i=0; i=0; i--) res << bs[i]->graphical_select (x1- sx(i), y1- sy(i), x2- sx(i), y2- sy(i)); return res; diff -Nru texmacs-1.0.7.13/src/Typeset/Boxes/Graphics/graphics_boxes.cpp texmacs-1.0.7.14/src/Typeset/Boxes/Graphics/graphics_boxes.cpp --- texmacs-1.0.7.13/src/Typeset/Boxes/Graphics/graphics_boxes.cpp 2011-09-07 20:49:34.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Boxes/Graphics/graphics_boxes.cpp 2011-10-06 09:51:15.000000000 +0000 @@ -12,6 +12,7 @@ #include "env.hpp" #include "Boxes/graphics.hpp" #include "Boxes/composite.hpp" +#include "Boxes/construct.hpp" #include "Graphics/math_util.hpp" /****************************************************************************** @@ -33,6 +34,7 @@ void post_display (renderer &ren); int reindex (int i, int item, int n); virtual int find_child (SI x, SI y, SI delta, bool force); + gr_selections graphical_select (SI x, SI y, SI dist); gr_selections graphical_select (SI x1, SI y1, SI x2, SI y2); }; @@ -94,30 +96,39 @@ for (i=0; iaccessible () || force) - && is_tuple (ty) && ty[0]=="textat") + if ((bs[i]->accessible () || force) && is_tuple (ty) && ty[0]=="text-at") return i; } return m; } +/*NOTE: It seems that the dimensions of the boxes that inherit from + composite_box are not calculated correctly (namely : one can find + points inside the box that are outside the rectangle (x1, y1, x2, y2) + that defines the border of the box). As a consequence, we use a traversal + routine that doesn't tests contains_rectangle(). When this problem + will have been corrected, the method of composite_box should work, + and consequently, its more specific implementation below should be + removed (this is the same in concat_boxes and stack_boxes). */ + +gr_selections +graphics_box_rep::graphical_select (SI x, SI y, SI dist) { + gr_selections res; + int i, n= subnr(); + for (i=n-1; i>=0; i--) + res << bs[i]->graphical_select (x- sx(i), y- sy(i), dist); + return res; +} + gr_selections graphics_box_rep::graphical_select (SI x1, SI y1, SI x2, SI y2) { gr_selections res; int i, n= subnr(); - for (i=0; i=0; i--) res << bs[i]->graphical_select (x1- sx(i), y1- sy(i), x2- sx(i), y2- sy(i)); return res; } -/*NOTE: It seems that the dimensions of the boxes that inherit from - composite_box are not calculated correctly (namely : one can find - points inside the box that are outside the rectangle (x1, y1, x2, y2) - that defines the border of the box). As a consequence, we use a traversal - routine that doesn't tests contains_rectangle(). When this problem - will have been corrected, the method of composite_box should work, - and consequently, its more specific implementation above should be - removed (this is the same in concat_boxes and stack_boxes). */ /****************************************************************************** * Group boxes @@ -140,6 +151,7 @@ gr_selections res; if (graphical_distance (x, y) <= dist) { gr_selection gs; + gs->type= "group"; gs->dist= graphical_distance (x, y); //gs->p= point (x, y); // The cursor moves freely inside the box gs->cp << reverse (path (0, ip)); @@ -155,6 +167,7 @@ gr_selections res; if (in_rectangle (x1, y1, x2, y2)) { gr_selection gs; + gs->type= "group"; gs->dist= graphical_distance (x1, y1); gs->cp << reverse (path (0, ip)); gs->pts= array (0); @@ -207,6 +220,7 @@ gr_selections res; if (graphical_distance (x, y) <= dist) { gr_selection gs; + gs->type= "point"; gs->dist= graphical_distance (x, y); gs->p= p; gs->cp << reverse (path (0, ip)); @@ -377,6 +391,7 @@ SI n= (SI)norm (p - pts[i]); if (n <= dist) { gr_selection gs; + gs->type= "curve-handle"; gs->dist= n; gs->p= pts[i]; gs->cp << reverse (paths[i]); @@ -397,6 +412,7 @@ SI n= (SI)norm (p - p2); if (n <= dist) { gr_selection gs; + gs->type= "curve-point"; gs->dist= n; gs->p= p2; gs->cp << reverse (paths[i]); @@ -417,6 +433,7 @@ gr_selections res; if (in_rectangle (x1, y1, x2, y2)) { gr_selection gs; + gs->type= "curve"; gs->dist= graphical_distance (x1, y1); gs->cp << reverse (path (0, ip)); gs->pts= array (0); @@ -597,7 +614,9 @@ graphics_box ( path ip, array bs, frame f, grid g, point lim1, point lim2) { - return tm_new (ip, bs, f, g, lim1, lim2); + box r= tm_new (ip, bs, f, g, lim1, lim2); + if (r->x1 != 0) r= move_box (ip, r, -r->x1, 0); + return r; } box @@ -618,5 +637,5 @@ array arrows) { return tm_new (ip, c, width, col, - style, style_unit, fill, fill_col, arrows); + style, style_unit, fill, fill_col, arrows); } diff -Nru texmacs-1.0.7.13/src/Typeset/Boxes/graphics.hpp texmacs-1.0.7.14/src/Typeset/Boxes/graphics.hpp --- texmacs-1.0.7.13/src/Typeset/Boxes/graphics.hpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Boxes/graphics.hpp 2011-10-05 19:31:07.000000000 +0000 @@ -20,7 +20,7 @@ box graphics_box ( path ip, array bs, frame f, grid g, point lim1, point lim2); box graphics_group_box (path ip, array bs); -box textat_box (path ip, box b, SI x, SI y); +box text_at_box (path ip, box b, SI x, SI y, SI axis, SI pad); box point_box ( path ip, point p, SI r, color col, int fill, color fill_col, string style); box curve_box (path ip, curve c, SI width, color col, diff -Nru texmacs-1.0.7.13/src/Typeset/Boxes/Modifier/change_boxes.cpp texmacs-1.0.7.14/src/Typeset/Boxes/Modifier/change_boxes.cpp --- texmacs-1.0.7.13/src/Typeset/Boxes/Modifier/change_boxes.cpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Boxes/Modifier/change_boxes.cpp 2011-10-05 20:48:05.000000000 +0000 @@ -12,6 +12,7 @@ #include "Boxes/composite.hpp" #include "Boxes/construct.hpp" #include "scheme.hpp" +#include "gui.hpp" /****************************************************************************** * changing the behaviour of a box @@ -563,28 +564,94 @@ } /****************************************************************************** -* textat boxes +* text_at boxes ******************************************************************************/ -struct textat_box_rep: public move_box_rep { - textat_box_rep (path ip, box b, SI x, SI y): - move_box_rep (ip, b, x, y, false, false) {} +struct text_at_box_rep: public move_box_rep { + SI axis; + SI pad; + text_at_box_rep (path ip, box b, SI x, SI y, SI axis, SI pad); gr_selections graphical_select (SI x, SI y, SI dist); - operator tree () { return tree (TUPLE, "textat", (tree) bs[0]); } + operator tree () { return tree (TUPLE, "text-at", (tree) bs[0]); } + /* + void pre_display (renderer &ren) { + array xs, ys; + xs << x1 - pad << x2 + pad << x2 + pad << x1 - pad << x1 - pad; + ys << y1 - pad << y1 - pad << y2 + pad << y2 + pad << y1 - pad; + ren->set_color (rgb_color (255, 255, 224)); + ren->polygon (xs, ys); + } + */ }; +text_at_box_rep::text_at_box_rep (path ip, box b, SI x, SI y, SI a2, SI p2): + move_box_rep (ip, b, x, y, false, false), axis (a2), pad (p2) {} + gr_selections -textat_box_rep::graphical_select (SI x, SI y, SI dist) { +text_at_box_rep::graphical_select (SI x, SI y, SI dist) { + array special; + special << point (x1 - pad, y1 - pad) + << point (x1 - pad, y2 + pad) + << point (x2 + pad, y2 + pad) + << point (x2 + pad, y1 - pad) + << point ((x1 + x2) >> 1, y1 - pad) + << point ((x1 + x2) >> 1, y2 + pad) + << point (x1 - pad, y1 + axis) + << point (x2 + pad, y1 + axis); + array ps; + ps << point (x1 - pad, y1 - pad) << point (x2 + pad, y1 - pad) + << point (x2 + pad, y2 + pad) << point (x1 - pad, y2 + pad) + << point (x1 - pad, y1 - pad); + array cs; + for (int i=0; itype= "text-handle"; + gs->dist= norm (p - point (sx(0), sy(0))); + gs->p= point (sx(0), sy(0)); + gs->cp << reverse (path (0, path (1, ip))); + gs->pts << gs->p; + gs->c= curve (); + res << gs; + } + else if (graphical_distance (x, y) == 0) { gr_selection gs; + gs->type= "text"; gs->dist= graphical_distance (x, y); - gs->p= point (x, y); + gs->p= p; gs->cp << box_rep::find_tree_path (x, y, dist); gs->pts << gs->p; gs->c= curve (); res << gs; } + + for (int i=0; itype= "text-border-point"; + gs->p= special[i]; + gs->dist= norm (gs->p - p); + gs->cp << box_rep::find_tree_path (x, y, dist); + gs->pts << gs->p; + gs->c= curve (); + res << gs; + } + for (int i=0; itype= "text-border"; + gs->p= closest (cs[i], p); + gs->dist= norm (gs->p - p); + gs->cp << box_rep::find_tree_path (x, y, dist); + gs->pts << gs->p; + gs->c= cs[i]; + res << gs; + } + } return res; } @@ -675,6 +742,6 @@ } box -textat_box (path ip, box b, SI x, SI y) { - return tm_new (ip, b, x, y); +text_at_box (path ip, box b, SI x, SI y, SI axis, SI pad) { + return tm_new (ip, b, x, y, axis, pad); } diff -Nru texmacs-1.0.7.13/src/Typeset/boxes.hpp texmacs-1.0.7.14/src/Typeset/boxes.hpp --- texmacs-1.0.7.13/src/Typeset/boxes.hpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/boxes.hpp 2011-10-05 19:31:07.000000000 +0000 @@ -93,6 +93,7 @@ tm_ostream& operator << (tm_ostream& out, gr_selection sel); typedef array gr_selections; +void sort (gr_selections& sels); tree as_tree (gr_selections sels); /****************************************************************************** @@ -325,6 +326,7 @@ ******************************************************************************/ struct gr_selection_rep: concrete_struct { + string type; array cp; array pts; point p; diff -Nru texmacs-1.0.7.13/src/Typeset/Concat/concater.cpp texmacs-1.0.7.14/src/Typeset/Concat/concater.cpp --- texmacs-1.0.7.13/src/Typeset/Concat/concater.cpp 2011-09-10 19:48:25.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Concat/concater.cpp 2011-10-06 08:18:13.000000000 +0000 @@ -343,6 +343,9 @@ case BIG: typeset_bigop (t, ip); break; + case LONG_ARROW: + typeset_long_arrow (t, ip); + break; case LPRIME: typeset_lprime (t, ip); break; @@ -680,6 +683,9 @@ case TEXT_AT: typeset_text_at (t, ip); break; + case MATH_AT: + typeset_math_at (t, ip); + break; case _POINT: typeset_point (t, ip); break; diff -Nru texmacs-1.0.7.13/src/Typeset/Concat/concater.hpp texmacs-1.0.7.14/src/Typeset/Concat/concater.hpp --- texmacs-1.0.7.13/src/Typeset/Concat/concater.hpp 2011-09-10 19:47:28.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Concat/concater.hpp 2011-10-06 08:18:27.000000000 +0000 @@ -71,6 +71,7 @@ //void typeset_middle (tree t, path ip); //void typeset_right (tree t, path ip); void typeset_bigop (tree t, path ip); + void typeset_long_arrow (tree t, path ip); void typeset_lprime (tree t, path ip); void typeset_rprime (tree t, path ip); void typeset_below (tree t, path ip); @@ -132,12 +133,15 @@ void typeset_sound (tree t, path ip); // graphical markup + void typeset_graphical (array& bs, tree t, path ip); void typeset_graphics (tree t, path ip); void typeset_superpose (tree t, path ip); void typeset_gr_group (tree t, path ip); void typeset_gr_linear_transform (tree t, path ip); void typeset_text_at (tree t, path ip); + void typeset_math_at (tree t, path ip); void typeset_point (tree t, path ip); + array typeset_line_arrows (path ip); void typeset_line (tree t, path ip, bool close); void typeset_arc (tree t, path ip, bool close); void typeset_spline (tree t, path ip, bool close); diff -Nru texmacs-1.0.7.13/src/Typeset/Concat/concat_graphics.cpp texmacs-1.0.7.14/src/Typeset/Concat/concat_graphics.cpp --- texmacs-1.0.7.13/src/Typeset/Concat/concat_graphics.cpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Concat/concat_graphics.cpp 2011-10-06 11:17:10.000000000 +0000 @@ -11,6 +11,17 @@ #include "concater.hpp" #include "Boxes/graphics.hpp" +#include "drd_std.hpp" +#include "hashset.hpp" + +#define BEGIN_MAGNIFY \ + tree new_mag= as_string (env->magn * env->mgfy); \ + tree old_mfy= env->local_begin (MAGNIFY, "1"); \ + tree old_mag= env->local_begin (MAGNIFICATION, new_mag); + +#define END_MAGNIFY \ + env->local_end (MAGNIFICATION, old_mag); \ + env->local_end (MAGNIFY, old_mfy); /****************************************************************************** * Typesetting graphics @@ -23,21 +34,49 @@ /* TODO: Check that the active elements (f.e. the markup) also adhere to the same convention. */ + void concater_rep::typeset_graphics (tree t, path ip) { - int i, n= N(t); +BEGIN_MAGNIFY grid gr= as_grid (env->read (GR_GRID)); - array bs (n+1); + array bs; gr->set_aspect (env->read (GR_GRID_ASPECT)); - bs[0]= grid_box (ip, gr, env->fr, env->as_length ("2ln"), - env->clip_lim1, env->clip_lim2); - for (i=0; ifr, env->as_length ("2ln"), + env->clip_lim1, env->clip_lim2); + typeset_graphical (bs, t, ip); + + point lim1= env->clip_lim1; + point lim2= env->clip_lim2; + if (env->get_bool (GR_AUTO_CROP)) { + SI x1= MAX_SI, y1= MAX_SI, x2= -MAX_SI, y2= -MAX_SI; + for (int i=1; iget_type () << "\n"; + x1= min (x1, b->x1); y1= min (y1, b->y1); + x2= max (x2, b->x2); y2= max (y2, b->y2); + x1= min (x1, b->x3); y1= min (y1, b->y3); + x2= max (x2, b->x4); y2= max (y2, b->y4); + } + SI pad= env->get_length (GR_CROP_PADDING); + lim1= env->fr [point (x1 - pad, y1 - pad)]; + lim2= env->fr [point (x2 + pad, y2 + pad)]; + //cout << lim1 << " -- " << lim2 << "\n"; + } + gr= as_grid (env->read (GR_EDIT_GRID)); gr->set_aspect (env->read (GR_EDIT_GRID_ASPECT)); - box b= graphics_box (ip, bs, env->fr, gr, env->clip_lim1, env->clip_lim2); + box b= graphics_box (ip, bs, env->fr, gr, lim1, lim2); print (b); +END_MAGNIFY +} + +void +concater_rep::typeset_gr_group (tree t, path ip) { +BEGIN_MAGNIFY + array bs; + typeset_graphical (bs, t, ip); + print (graphics_group_box (ip, bs)); +END_MAGNIFY } void @@ -55,16 +94,6 @@ } void -concater_rep::typeset_gr_group (tree t, path ip) { - int i, n= N(t); - array bs (n); - for (i=0; i (t[1])); @@ -77,41 +106,106 @@ void concater_rep::typeset_text_at (tree t, path ip) { - if (N(t) != 2) { typeset_error (t, ip); return; } - box b = typeset_as_concat (env, t[0], descend (ip, 0)); - point p = env->fr (env->as_point (env->exec (t[1]))); - string halign= env->textat_halign; - string valign= env->textat_valign; - - if (N(p) == 0) - typeset_dynamic (tree (ERROR, "bad text-at"), ip); - else { - SI x= (SI) p[0], y= (SI) p[1]; - if (halign == "left") x -= b->x1; - else if (halign == "center") x -= ((b->x1 + b->x2) >> 1); - else if (halign == "right") x -= b->x2; - if (valign == "bottom") y -= b->y1; - else if (valign == "center") y -= ((b->y1 + b->y2) >> 1); - else if (valign == "top") y -= b->y2; - print (textat_box (ip, b, x, y)); +BEGIN_MAGNIFY + if (N(t) != 2) typeset_error (t, ip); + else { + box b = typeset_as_concat (env, t[0], descend (ip, 0)); + point p = env->fr (env->as_point (env->exec (t[1]))); + string halign= env->text_at_halign; + string valign= env->text_at_valign; + + if (N(p) == 0) + typeset_dynamic (tree (ERROR, "bad text-at"), ip); + else { + SI x= (SI) p[0], y= (SI) p[1], axis= (b->h() >> 1); + if (halign == "left") x -= b->x1; + else if (halign == "center") x -= ((b->x1 + b->x2) >> 1); + else if (halign == "right") x -= b->x2; + if (valign == "bottom") y -= b->y1; + else if (valign == "axis") { + axis= env->fn->yfrac - b->y1; + y -= env->fn->yfrac; + } + else if (valign == "center") y -= ((b->y1 + b->y2) >> 1); + else if (valign == "top") y -= b->y2; + print (text_at_box (ip, b, x, y, axis, env->fn->spc->def)); + } } +END_MAGNIFY +} + +void +concater_rep::typeset_math_at (tree t, path ip) { +BEGIN_MAGNIFY + if (N(t) != 2) typeset_error (t, ip); + else { + // FIXME: attaching ip to compound ("math", t[0]) is a bit hacky, + // but it seems to work fine for the time being + box b = typeset_as_concat (env, compound ("math", t[0]), ip); + point p = env->fr (env->as_point (env->exec (t[1]))); + string halign= env->text_at_halign; + string valign= env->text_at_valign; + + if (N(p) == 0) + typeset_dynamic (tree (ERROR, "bad text-at"), ip); + else { + SI x= (SI) p[0], y= (SI) p[1], axis= (b->h() >> 1); + if (halign == "left") x -= b->x1; + else if (halign == "center") x -= ((b->x1 + b->x2) >> 1); + else if (halign == "right") x -= b->x2; + if (valign == "bottom") y -= b->y1; + else if (valign == "axis") { + axis= (env->fn->yx >> 1) - b->y1; + y -= (env->fn->yx >> 1); + } + else if (valign == "center") y -= ((b->y1 + b->y2) >> 1); + else if (valign == "top") y -= b->y2; + print (text_at_box (ip, b, x, y, axis, env->fn->spc->def)); + } + } +END_MAGNIFY } void concater_rep::typeset_point (tree t, path ip) { - if (N(t) < 2) { typeset_error (t, ip); return; } - int i, n= N(t); - tree u (TUPLE, N(t)); - for (i=0; iexec (t[i]); - point p= env->fr (env->as_point (u)); - print (point_box (ip, p, 20*PIXEL, env->col, - env->fill_mode, env->fill_color, - env->point_style)); +BEGIN_MAGNIFY + if (N(t) < 2) typeset_error (t, ip); + else { + int i, n= N(t); + tree u (TUPLE, N(t)); + for (i=0; iexec (t[i]); + point p= env->fr (env->as_point (u)); + print (point_box (ip, p, 20*PIXEL, env->col, + env->fill_mode, env->fill_color, + env->point_style)); + } +END_MAGNIFY +} + +static tree +protect_arrow (edit_env env, tree t) { + return tree (WITH, "arrow-begin", "none", "arrow-end", "none", + "dash-style", "none", t); +} + +array +concater_rep::typeset_line_arrows (path ip) { + array bs (2); + if (env->line_arrows[0] != "") { + tree a= protect_arrow (env, env->line_arrows[0]); + bs[0]= typeset_as_concat (env, a, decorate (ip)); + } + if (env->line_arrows[1] != "") { + tree a= protect_arrow (env, env->line_arrows[1]); + bs[1]= typeset_as_concat (env, a, decorate (ip)); + } + return bs; } void concater_rep::typeset_line (tree t, path ip, bool close) { +BEGIN_MAGNIFY int i, n= N(t); array a(n); for (i=0; ifr (poly_segment (a, cip)); + print (curve_box (ip, c, env->lw, env->col, + env->dash_style, env->dash_style_unit, + env->fill_mode, env->fill_color, + typeset_line_arrows (ip))); } - curve c= env->fr (poly_segment (a, cip)); - print (curve_box (ip, c, env->lw, env->col, - env->dash_style, env->dash_style_unit, - env->fill_mode, env->fill_color, - env->line_arrows)); +END_MAGNIFY } void concater_rep::typeset_arc (tree t, path ip, bool close) { +BEGIN_MAGNIFY int i, n= N(t); array a(n); for (i=0; i cip(n); for (i=0; ifr (arc (a, cip, close)); - print (curve_box (ip, c, env->lw, env->col, - env->dash_style, env->dash_style_unit, - env->fill_mode, env->fill_color, - env->line_arrows)); + if (n != 3 || linearly_dependent (a[0], a[1], a[2]) || + (N (intersection (midperp (a[0], a[1], a[2]), + midperp (a[1], a[2], a[0]))) == 0)) + typeset_line (t, ip, close); + else { + curve c= env->fr (arc (a, cip, close)); + print (curve_box (ip, c, env->lw, env->col, + env->dash_style, env->dash_style_unit, + env->fill_mode, env->fill_color, + typeset_line_arrows (ip))); + } } +END_MAGNIFY } void concater_rep::typeset_spline (tree t, path ip, bool close) { +BEGIN_MAGNIFY int i, n= N(t); array a(n); for (i=0; i cip(n); for (i=0; ifr (N(a)>=3 ? spline (a, cip, close): poly_segment (a, cip)); + print (curve_box (ip, c, env->lw, env->col, + env->dash_style, env->dash_style_unit, + env->fill_mode, env->fill_color, + typeset_line_arrows (ip))); } - curve c= env->fr (N(a)>=3 ? spline (a, cip, close) : poly_segment (a, cip)); - print (curve_box (ip, c, env->lw, env->col, - env->dash_style, env->dash_style_unit, - env->fill_mode, env->fill_color, - env->line_arrows)); +END_MAGNIFY } void @@ -187,7 +292,7 @@ void concater_rep::typeset_cspline (tree t, path ip) { - typeset_spline(t,ip,true); + typeset_spline (t, ip, true); } void @@ -195,3 +300,99 @@ (void) t; (void) ip; print (test_box (ip)); } + +/****************************************************************************** +* Constrainted graphics +******************************************************************************/ + +hashmap graphical_values (UNINIT); +hashset graphical_modified; + +void +set_graphical_value (tree var, tree val) { + //cout << "Set " << var << " := " << val << "\n"; + if (is_atomic (var)) + graphical_values (var->label)= val; +} + +bool +has_graphical_value (tree var) { + //cout << "Has " << var << "?\n"; + return is_atomic (var) && graphical_values->contains (var->label); +} + +tree +get_graphical_value (tree var) { + ASSERT (has_graphical_value (var), "invalid graphical id"); + //cout << "Get " << var << " = " << graphical_values [var->label] << "\n"; + return graphical_values [var->label]; +} + +bool +graphics_needs_update () { + return N(graphical_modified) > 0; +} + +void +graphics_require_update (tree var) { + if (is_atomic (var)) + graphical_modified->insert (var->label); + //cout << "Set " << var << ", " << N(graphical_modified) << "\n"; +} + +void +graphics_notify_update (tree var) { + if (is_atomic (var)) + graphical_modified->remove (var->label); + //cout << "Reset " << var << ", " << N(graphical_modified) << "\n"; +} + +static void +set_graphical_values (tree t) { + if (is_atomic (t)); + else if (is_func (t, WITH)) { + for (int i=0; ilabel, t[N(t)-1]); + set_graphical_values (t[N(t)-1]); + } + else { + for (int i=0; i& bs, tree t, path ip) { + int i, n= N(t); + set_graphical_values (t); + + for (i=0; iget_type (t[i]) == TYPE_CONSTRAINT) { + tree u= t[i]; + switch (L(u)) { + case IS_EQUAL: + if (has_graphical_value (u[1])) + set_graphical_value (u[0], get_graphical_value (u[1])); + break; + case IS_INTERSECTION: + cout << "Not yet implemented 'is-intersection'\n"; + break; + case ON_CURVE: + cout << "Not yet implemented 'on-curve'\n"; + break; + case ON_TEXT_BORDER: + cout << "Not yet implemented 'on-text-border'\n"; + break; + case ON_GRID: + cout << "Not yet implemented 'on-grid'\n"; + break; + default: + break; + } + } + + for (i=0; iget_type (t[i]) != TYPE_CONSTRAINT && !is_atomic (t[i])) + bs << typeset_as_atomic (env, t[i], descend (ip, i)); +} diff -Nru texmacs-1.0.7.13/src/Typeset/Concat/concat_math.cpp texmacs-1.0.7.14/src/Typeset/Concat/concat_math.cpp --- texmacs-1.0.7.13/src/Typeset/Concat/concat_math.cpp 2011-09-10 20:21:25.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Concat/concat_math.cpp 2011-09-30 08:24:19.000000000 +0000 @@ -122,6 +122,41 @@ ******************************************************************************/ void +concater_rep::typeset_long_arrow (tree t, path ip) { + if (N(t) != 2 && N(t) != 3) { typeset_error (t, ip); return; } + tree old_ds= env->local_begin (MATH_DISPLAY, "false"); + tree old_mc= env->local_begin (MATH_CONDENSED, "true"); + tree old_il= env->local_begin_script (); + box sup_b, sub_b; + if (N(t) >= 2) { + tree old_vp= env->local_begin (MATH_VPOS, "-1"); + sup_b= typeset_as_concat (env, t[1], descend (ip, 1)); + env->local_end (MATH_VPOS, old_vp); + } + if (N(t) >= 3) { + tree old_vp= env->local_begin (MATH_VPOS, "1"); + sub_b= typeset_as_concat (env, t[2], descend (ip, 2)); + env->local_end (MATH_VPOS, old_vp); + } + env->local_end_script (old_il); + env->local_end (MATH_CONDENSED, old_mc); + env->local_end (MATH_DISPLAY, old_ds); + + string s= as_string (t[0]); + SI w= sup_b->w(); + if (N(t) == 3) w= max (w, sub_b->w()); + w += env->fn->wquad; + box arrow= wide_box (decorate (descend (ip, 0)), s, env->fn, env->col, w); + + space spc= env->fn->spc; + if (env->math_condensed) spc= space (spc->min>>3, spc->def>>3, spc->max>>2); + else spc= space (spc->min>>1, spc->def>>1, spc->max); + print (spc); + print (limit_box (ip, arrow, sub_b, sup_b, env->fn, false)); + print (spc); +} + +void concater_rep::typeset_below (tree t, path ip) { if (N(t) != 2) { typeset_error (t, ip); return; } box b1= typeset_as_concat (env, t[0], descend (ip, 0)); diff -Nru texmacs-1.0.7.13/src/Typeset/Concat/concat_text.cpp texmacs-1.0.7.14/src/Typeset/Concat/concat_text.cpp --- texmacs-1.0.7.13/src/Typeset/Concat/concat_text.cpp 2011-09-10 19:59:06.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Concat/concat_text.cpp 2011-09-16 15:09:02.000000000 +0000 @@ -36,6 +36,11 @@ (string s, path ip, int pos, string col) { color c= (col == ""? env->col: named_color (col)); + if (env->alpha != 255) { + int r, g, b, a; + get_rgb_color (c, r, g, b, a); + c= rgb_color (r, g, b, env->alpha); + } box b= text_box (ip, pos, s, env->fn, c); a << line_item (STRING_ITEM, OP_TEXT, b, HYPH_INVALID, env->lan); } diff -Nru texmacs-1.0.7.13/src/Typeset/Env/env_default.cpp texmacs-1.0.7.14/src/Typeset/Env/env_default.cpp --- texmacs-1.0.7.13/src/Typeset/Env/env_default.cpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Env/env_default.cpp 2011-10-06 11:16:01.000000000 +0000 @@ -194,35 +194,54 @@ env (CELL_ROW_NR) = "1"; // row coordinate of cell env (CELL_COL_NR) = "1"; // column coordinate of cell - env (POINT_STYLE) = "disk"; // point style (square, circle...) + env (GR_GEOMETRY) = gr_geometry; // geometry of graphics + env (GR_FRAME) = gr_frame; // coordinate frame for graphics + env (GR_MODE) = "line"; // graphical mode + env (GR_AUTO_CROP) = "false"; // auto crop graphics + env (GR_CROP_PADDING) = "1spc"; // padding when auto cropping + env (GR_GRID) = gr_grid; // grid for graphics + env (GR_GRID_ASPECT) = gr_grid_aspect; // grid aspect + env (GR_EDIT_GRID) = gr_edit_grid; // edit grid + env (GR_EDIT_GRID_ASPECT) = gr_grid_aspect; // edit grid (subdivisions) + + env (GR_MAGNIFY) = "default"; // magnify of new objects + env (GR_OPACITY) = "default"; // opacity of new objects + env (GR_COLOR) = "default"; // color of new objects + env (GR_POINT_STYLE) = "default"; // point style of new objects + env (GR_LINE_WIDTH) = "default"; // line width for new objects + env (GR_LINE_JOIN) = "default"; // line join for new objects + env (GR_LINE_CAPS) = "default"; // line caps for new objects + env (GR_LINE_EFFECTS) = "default"; // line effects for new objects + env (GR_DASH_STYLE) = "default"; // dash style for new objects + env (GR_DASH_STYLE_UNIT) = "default"; // dash style unit for new objects + env (GR_ARROW_BEGIN) = "default"; // arrow begin for new objects + env (GR_ARROW_END) = "default"; // arrow end for new objects + env (GR_ARROW_LENGTH) = "default"; // arrow length for new objects + env (GR_ARROW_HEIGHT) = "default"; // arrow height for new objects + env (GR_FILL_COLOR) = "default"; // fill color for new objects + env (GR_FILL_STYLE) = "default"; // fill style for new objects + env (GR_TEXT_AT_HALIGN) = "default"; // horiz. alignment for new text-ats + env (GR_TEXT_AT_VALIGN) = "default"; // vert. alignment for new text-ats + env (GR_TEXT_AT_MARGIN) = "default"; // margins for new text-ats + env (GID) = "default"; // graphical identifier + env (MAGNIFY) = "1"; // magnification for graphical objects + env (POINT_STYLE) = "disk"; // point style (square, circle...) env (LINE_WIDTH) = "1ln"; // line width in graphics + env (LINE_JOIN) = "normal"; // junctions in multilines + env (LINE_CAPS) = "normal"; // caps at ends + env (LINE_EFFECTS) = "none"; // effects to be applied on line env (DASH_STYLE) = "none"; // dash style env (DASH_STYLE_UNIT) = "5ln"; // dash style unit - env (LINE_ARROWS) = "none"; // arrows at end of lines - env (LINE_CAPS) = "normal"; // junctions in multilines + env (ARROW_BEGIN) = "none"; // arrow at beginning of line + env (ARROW_END) = "none"; // arrow at end of line + env (ARROW_LENGTH) = "5ln"; // longitudal length of arrow + env (ARROW_HEIGHT) = "5ln"; // transverse height of arrow env (FILL_COLOR) = "none"; // fill color env (FILL_STYLE) = "plain"; // fill style - env (TEXTAT_HALIGN) = "left"; // horizontal text-at alignment - env (TEXTAT_VALIGN) = "base"; // vertical text-at alignment - - env (GR_GEOMETRY) = gr_geometry; // geometry of graphics - env (GR_FRAME) = gr_frame; // coordinate frame for graphics - env (GR_MODE) = "line"; // graphical mode - env (GR_OPACITY) = "default"; // opacity of new objects - env (GR_COLOR) = "default"; // color of new objects - env (GR_POINT_STYLE) = "default"; // point style of new objects - env (GR_LINE_WIDTH) = "default"; // line width for new objects - env (GR_DASH_STYLE) = "default"; // dash style for new objects - env (GR_DASH_STYLE_UNIT) = "default"; // dash style unit for new objects - env (GR_LINE_ARROWS) = "default"; // line arrows for new objects - env (GR_FILL_COLOR) = "default"; // fill color for new objects - env (GR_TEXTAT_HALIGN) = "default"; // horiz. alignment for new text-ats - env (GR_TEXTAT_VALIGN) = "default"; // vert. alignment for new text-ats - env (GR_GRID) = gr_grid; // grid for graphics - env (GR_GRID_ASPECT) = gr_grid_aspect; // grid aspect - env (GR_EDIT_GRID) = gr_edit_grid; // edit grid - env (GR_EDIT_GRID_ASPECT) = gr_grid_aspect; // edit grid (subdivisions) + env (TEXT_AT_HALIGN) = "left"; // horizontal text-at alignment + env (TEXT_AT_VALIGN) = "base"; // vertical text-at alignment + env (TEXT_AT_MARGIN) = "base"; // margin for smart guides env (SRC_STYLE) = "angular"; // style for "source" tags env (SRC_SPECIAL) = "normal"; // special treatment of certain tags diff -Nru texmacs-1.0.7.13/src/Typeset/Env/env_exec.cpp texmacs-1.0.7.14/src/Typeset/Env/env_exec.cpp --- texmacs-1.0.7.13/src/Typeset/Env/env_exec.cpp 2011-09-13 21:29:07.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Env/env_exec.cpp 2011-10-03 10:21:28.000000000 +0000 @@ -917,7 +917,7 @@ //cout << "Package " << name << "\n"; if (is_rooted_web (base_file_name)) styp= styp | head (base_file_name); - else styp= head (base_file_name) | styp; + else styp= ::expand (head (base_file_name) * url_ancestor ()) | styp; string doc_s; if (!load_string (styp * name, doc_s, false)) { tree doc= texmacs_document_to_tree (doc_s); diff -Nru texmacs-1.0.7.13/src/Typeset/Env/env_inactive.cpp texmacs-1.0.7.14/src/Typeset/Env/env_inactive.cpp --- texmacs-1.0.7.13/src/Typeset/Env/env_inactive.cpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Env/env_inactive.cpp 2011-09-29 13:11:24.000000000 +0000 @@ -146,6 +146,10 @@ return compound ("src-regular", t); case TYPE_POINT: return compound ("src-regular", t); + case TYPE_CONSTRAINT: + return compound ("src-regular", t); + case TYPE_GRAPHICAL_ID: + return compound ("src-var", t); case TYPE_ANIMATION: return compound ("src-regular", t); case TYPE_DURATION: diff -Nru texmacs-1.0.7.13/src/Typeset/Env/env_length.cpp texmacs-1.0.7.14/src/Typeset/Env/env_length.cpp --- texmacs-1.0.7.13/src/Typeset/Env/env_length.cpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Env/env_length.cpp 2011-09-29 19:10:17.000000000 +0000 @@ -243,6 +243,25 @@ p[i]= as_length (t[i]); return fr[p]; } + if (is_func (t, WITH)) { + for (int i=0; i(0); + dash_style= array (0); if (is_string (t)) { string s= as_string (t); - if (s == "none") {} - } - else - if (is_tuple (t)) { - int i, n= N(t); - dash_style= array (n); - for (i=0; i 0 && (s[0] == '0' || s[0] == '1')) { + int i, n= N(s); + dash_style= array (n); + for (i=0; i. For example : - - - |...> - draws green objects with green line arrows; - - - while |color|green|...> - draws green objects with blue line arrows. - */ void -edit_env_rep::update_line_arrows () { - tree t= env [LINE_ARROWS]; - line_arrows= array(2); +decompose_length (string s, double& x, string& un) { + int i; + for (i=0; i='a') && (s[i]<='z')) break; + x = as_double (s (0, i)); + un= s (i, N(s)); +} + +tree +edit_env_rep::decode_arrow (tree t, string l, string h) { if (is_string (t)) { - string s= as_string (t); - if (s == "none") {} - } - else - if (is_tuple (t) && N(t)<=2 && N(t)>0) { - array b (2); - b[1]= t[0]=="" ? box () : typeset_as_box (this, t[0], path(0)); - if (N(t)>=2) { - b[0]= b[1]; - b[1]= t[1]=="" ? box () : typeset_as_box (this, t[1], path (0)); - } - line_arrows= b; + string s= t->label; + if (s == "" || s == "none") return ""; + double lx, hx; + string lun, hun; + decompose_length (l, lx, lun); + decompose_length (h, hx, hun); + if (s == "") + return tree (LINE, + tree (_POINT, l, h), + tree (_POINT, "0" * lun, "0" * hun), + tree (_POINT, l, as_string (-hx) * hun)); + if (s == "") + return tree (LINE, + tree (_POINT, as_string (-lx) * lun, h), + tree (_POINT, "0" * lun, "0" * hun), + tree (_POINT, as_string (-lx) * lun, + as_string (-hx) * hun)); + if (s == "|") + return tree (WITH, FILL_COLOR, tree (VALUE, COLOR), + LINE_WIDTH, "0ln", + tree (CLINE, + tree (_POINT, l, h), + tree (_POINT, "0" * lun, "0" * hun), + tree (_POINT, l, as_string (-hx) * hun))); + if (s == "|") + return tree (WITH, FILL_COLOR, tree (VALUE, COLOR), + LINE_WIDTH, "0ln", + tree (CLINE, + tree (_POINT, as_string (-lx) * lun, h), + tree (_POINT, "0" * lun, "0" * hun), + tree (_POINT, as_string (-lx) * lun, + as_string (-hx) * hun))); + if (s == "") + return tree (LINE, + tree (_POINT, as_string (-lx) * lun, h), + tree (_POINT, "0" * lun, "0" * hun), + tree (_POINT, as_string (-lx) * lun, + as_string (-hx) * hun)); + if (s == "") + return tree (GR_GROUP, + tree (LINE, + tree (_POINT, l, h), + tree (_POINT, "0" * lun, "0" * hun), + tree (_POINT, l, as_string (-hx) * hun)), + tree (LINE, + tree (_POINT, as_string (0 * lx) * lun, h), + tree (_POINT, as_string (-lx) * lun, "0" * hun), + tree (_POINT, as_string (0 * lx) * lun, + as_string (-hx) * hun))); + if (s == "") + return tree (GR_GROUP, + tree (LINE, + tree (_POINT, as_string (-lx) * lun, h), + tree (_POINT, "0" * lun, "0" * hun), + tree (_POINT, as_string (-lx) * lun, + as_string (-hx) * hun)), + tree (LINE, + tree (_POINT, as_string (0 * lx) * lun, h), + tree (_POINT, as_string (lx) * lun, "0" * hun), + tree (_POINT, as_string (0 * lx) * lun, + as_string (-hx) * hun))); + if (s == "|") + return tree (LINE, + tree (_POINT, "0" * lun, h), + tree (_POINT, "0" * lun, as_string (-hx) * hun)); + if (s == "o") + return tree (WITH, FILL_COLOR, tree (VALUE, COLOR), + LINE_WIDTH, "0ln", + tree (CARC, + tree (_POINT, "0" * lun, h), + tree (_POINT, l, "0" * hun), + tree (_POINT, "0" * lun, as_string (-hx) * hun))); + return ""; } + else return t; +} + +void +edit_env_rep::update_line_arrows () { + line_arrows= array (2); + string l= get_string (ARROW_LENGTH); + string h= get_string (ARROW_HEIGHT); + line_arrows[0]= decode_arrow (env [ARROW_BEGIN], l, h); + line_arrows[1]= decode_arrow (env [ARROW_END], l, h); } void @@ -489,8 +560,8 @@ update_dash_style (); dash_style_unit= get_length (DASH_STYLE_UNIT); update_line_arrows (); - textat_halign= get_string (TEXTAT_HALIGN); - textat_valign= get_string (TEXTAT_VALIGN); + text_at_halign= get_string (TEXT_AT_HALIGN); + text_at_valign= get_string (TEXT_AT_VALIGN); update_src_style (); update_src_special (); @@ -514,6 +585,9 @@ update_font (); lw= get_length (LINE_WIDTH); break; + case Env_Magnify: + mgfy= get_double (MAGNIFY); + break; case Env_Language: update_language (); break; @@ -578,11 +652,11 @@ case Env_Line_Arrows: update_line_arrows(); break; - case Env_Textat_Halign: - textat_halign= get_string (TEXTAT_HALIGN); + case Env_Text_At_Halign: + text_at_halign= get_string (TEXT_AT_HALIGN); break; - case Env_Textat_Valign: - textat_valign= get_string (TEXTAT_VALIGN); + case Env_Text_At_Valign: + text_at_valign= get_string (TEXT_AT_VALIGN); break; case Env_Src_Style: update_src_style (); diff -Nru texmacs-1.0.7.13/src/Typeset/env.hpp texmacs-1.0.7.14/src/Typeset/env.hpp --- texmacs-1.0.7.13/src/Typeset/env.hpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/env.hpp 2011-10-04 15:00:07.000000000 +0000 @@ -32,36 +32,37 @@ #define Env_User 0 #define Env_Fixed 1 #define Env_Magnification 2 -#define Env_Language 3 -#define Env_Mode 4 -#define Env_Info_Level 5 -#define Env_Font 6 -#define Env_Font_Size 7 -#define Env_Index_Level 8 -#define Env_Display_Style 9 -#define Env_Math_Condensed 10 -#define Env_Vertical_Pos 11 -#define Env_Color 12 -#define Env_Paragraph 13 -#define Env_Page 14 -#define Env_Page_Extents 15 -#define Env_Preamble 16 -#define Env_Geometry 17 -#define Env_Frame 18 -#define Env_Line_Width 19 -#define Env_Grid 20 -#define Env_Grid_Aspect 21 -#define Env_Src_Style 22 -#define Env_Src_Special 23 -#define Env_Src_Compact 24 -#define Env_Src_Close 25 -#define Env_Point_Style 26 -#define Env_Dash_Style 27 -#define Env_Dash_Style_Unit 28 -#define Env_Fill_Color 29 -#define Env_Line_Arrows 30 -#define Env_Textat_Halign 31 -#define Env_Textat_Valign 32 +#define Env_Magnify 3 +#define Env_Language 4 +#define Env_Mode 5 +#define Env_Info_Level 6 +#define Env_Font 7 +#define Env_Font_Size 8 +#define Env_Index_Level 9 +#define Env_Display_Style 10 +#define Env_Math_Condensed 11 +#define Env_Vertical_Pos 12 +#define Env_Color 13 +#define Env_Paragraph 14 +#define Env_Page 15 +#define Env_Page_Extents 16 +#define Env_Preamble 17 +#define Env_Geometry 18 +#define Env_Frame 19 +#define Env_Line_Width 20 +#define Env_Grid 21 +#define Env_Grid_Aspect 22 +#define Env_Src_Style 23 +#define Env_Src_Special 24 +#define Env_Src_Compact 25 +#define Env_Src_Close 26 +#define Env_Point_Style 27 +#define Env_Dash_Style 28 +#define Env_Dash_Style_Unit 29 +#define Env_Fill_Color 30 +#define Env_Line_Arrows 31 +#define Env_Text_At_Halign 32 +#define Env_Text_At_Valign 33 /****************************************************************************** * For style file editing @@ -142,6 +143,7 @@ int dpi; double inch; double magn; + double mgfy; double flexibility; int mode; int mode_op; @@ -173,9 +175,9 @@ SI dash_style_unit; int fill_mode; color fill_color; - array line_arrows; - string textat_halign; - string textat_valign; + array line_arrows; + string text_at_halign; + string text_at_valign; int inactive_mode; tree recover_env; @@ -382,6 +384,7 @@ void update_page_pars (); void get_page_pars (SI& w, SI& h, SI& ww, SI& hh, SI& odd, SI& even, SI& top, SI& bottom); + tree decode_arrow (tree t, string l, string h); void update_font (); void update_color (); void update_mode (); @@ -477,4 +480,11 @@ double get_magnification (string s); int decode_alpha (string s); +void set_graphical_value (tree var, tree val); +bool has_graphical_value (tree var); +tree get_graphical_value (tree var); +bool graphics_needs_update (); +void graphics_require_update (tree var); +void graphics_notify_update (tree var); + #endif // defined ENV_H diff -Nru texmacs-1.0.7.13/src/Typeset/Graphics/curve.cpp texmacs-1.0.7.14/src/Typeset/Graphics/curve.cpp --- texmacs-1.0.7.13/src/Typeset/Graphics/curve.cpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Graphics/curve.cpp 2011-10-05 19:31:07.000000000 +0000 @@ -108,9 +108,15 @@ if (stored && decreasing) n0= tm_infinity; double delta= (n - eps) / 2; - t+=c->bound (t, max (eps, delta)); + t += max (0.00001, c->bound (t, max (eps, delta))); nprec= n; } + if (!stored && decreasing) { + curvet ct; + ct.dist= norm (pclosest - p); + ct.t= closest; + res << ct; + } } return res; } @@ -141,6 +147,29 @@ } point +closest (curve f, point p) { + array abs; + array pts; + array rcip; + f->get_control_points (abs, pts, rcip); + if (N(abs) == 0) return f(0); + double t1= abs[0]; + double t2= abs[N(abs)-1]; + double best= 0; + double eps = norm (f(0) - p); + for (int i=0; i<10; i++) { + bool found= false; + double t= f->find_closest_point (t1, t2, p, eps, found); + if (found) best= t; + else break; + double eps2= norm (f(t) - p); + if (eps2 >= 0.9 * eps) break; + eps= eps2; + } + return f(best); +} + +point grad (curve f, double t) { bool error= false; return f->grad (t, error); diff -Nru texmacs-1.0.7.13/src/Typeset/Graphics/curve.hpp texmacs-1.0.7.14/src/Typeset/Graphics/curve.hpp --- texmacs-1.0.7.13/src/Typeset/Graphics/curve.hpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Graphics/curve.hpp 2011-10-05 19:31:07.000000000 +0000 @@ -82,5 +82,6 @@ curve invert (curve c); array intersection (curve f, curve g, point p0, double eps); +point closest (curve f, point p); #endif // defined CURVE_H diff -Nru texmacs-1.0.7.13/src/Typeset/Graphics/grid.cpp texmacs-1.0.7.14/src/Typeset/Graphics/grid.cpp --- texmacs-1.0.7.13/src/Typeset/Graphics/grid.cpp 2011-09-07 20:49:35.000000000 +0000 +++ texmacs-1.0.7.14/src/Typeset/Graphics/grid.cpp 2011-10-05 19:31:07.000000000 +0000 @@ -120,6 +120,7 @@ grid_rep (subd, col, o), step (st) {} operator tree () { return "cartesian"; } array get_curves (point lim1, point lim2, double u, bool b); + array get_curves_around (point p, double delta, frame f); point find_closest_point (point p, point pmin, point pmax); }; @@ -180,6 +181,43 @@ return res; } +array +cartesian_rep::get_curves_around (point p, double delta, frame f) { + double nsub= 0; + string c; + for (int i=0; i (0); + + point p2 = f (p); + point lim1= f[point (p2[0]-delta, p2[1]-delta)]; + point lim2= f[point (p2[0]+delta, p2[1]+delta)]; + + double x1= min (lim1[0], lim2[0]); + double y1= min (lim1[1], lim2[1]); + double x2= max (lim1[0], lim2[0]); + double y2= max (lim1[1], lim2[1]); + double xo= center[0]; + double yo= center[1]; + double s = step / nsub; + + double X1= xo + floor ((p[0] - xo) / s) * s; + double Y1= yo + floor ((p[1] - yo) / s) * s; + double X2= xo + ceil ((p[0] - xo) / s) * s; + double Y2= yo + ceil ((p[1] - yo) / s) * s; + x1= min (x1, X1 - s / 10); + y1= min (y1, Y1 - s / 10); + x2= max (x2, X2 + s / 10); + y2= max (y2, Y2 + s / 10); + + array res; + res << create_line (X1, y1, X1, y2, c); + res << create_line (x1, Y1, x2, Y1, c); + if (X2 > X1) res << create_line (X2, y1, X2, y2, c); + if (Y2 > Y1) res << create_line (x1, Y2, x2, Y2, c); + return res; +} + point cartesian_rep::find_closest_point (point p, point pmin, point pmax) { double x, y, oldx=0, oldy= 0, ssubd; diff -Nru texmacs-1.0.7.13/#svn-commit.tmp# texmacs-1.0.7.14/#svn-commit.tmp# --- texmacs-1.0.7.13/#svn-commit.tmp# 2011-09-10 20:00:21.000000000 +0000 +++ texmacs-1.0.7.14/#svn-commit.tmp# 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -Fix ---This line, and those below, will be ignored-- - -M src/Data/Convert/Texmacs/upgradetm.cpp -M src/Typeset/Concat/concater.cpp -M src/Typeset/Concat/concater.hpp -M src/Typeset/Concat/concat_text.cpp diff -Nru texmacs-1.0.7.13/TeXmacs/doc/about/changes/change-log.en.tm texmacs-1.0.7.14/TeXmacs/doc/about/changes/change-log.en.tm --- texmacs-1.0.7.13/TeXmacs/doc/about/changes/change-log.en.tm 2011-09-16 11:29:04.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/doc/about/changes/change-log.en.tm 2011-10-17 18:47:45.000000000 +0000 @@ -5,9 +5,15 @@ <\body> changelog> - + <\itemize> + New icons for Qt version of TeXmacs (1.0.7.14). + + Many bug fixes for graphics mode (1.0.7.14). + + Improved extensible arrows (1.0.7.14). + Experiment with new set of icons (1.0.7.13). Fix Qt image support (1.0.7.13). Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/fonts/type1/._.DS_Store and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/fonts/type1/._.DS_Store differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/fonts/type1/.DS_Store and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/fonts/type1/.DS_Store differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/fonts/type1/math/._.DS_Store and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/fonts/type1/math/._.DS_Store differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/fonts/type1/math/.DS_Store and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/fonts/type1/math/.DS_Store differ diff -Nru texmacs-1.0.7.13/TeXmacs/fonts/virtual/long.vfn texmacs-1.0.7.14/TeXmacs/fonts/virtual/long.vfn --- texmacs-1.0.7.13/TeXmacs/fonts/virtual/long.vfn 2011-09-07 20:50:09.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/fonts/virtual/long.vfn 2011-09-30 08:57:13.000000000 +0000 @@ -109,10 +109,13 @@ (rubber-varleftarrow-# (hor-extend shortleftarrow 0.9 # 0.1)) (rubber-varrightarrow-# (hor-extend shortrightarrow 0.1 # 0.1)) + (rubber-minus-# (hor-extend - 0.5 # 0.1)) (rubber-leftarrow-# (hor-extend leftarrow 0.5 # 0.1)) (rubber-rightarrow-# (hor-extend rightarrow 0.5 # 0.1)) (rubber-leftrightarrow-# (hor-extend leftrightarrow 0.5 # 0.1)) (rubber-mapsto-# (hor-extend mapsto 0.5 # 0.1)) + (rubber-mapsfrom-# (hor-extend mapsfrom 0.5 # 0.1)) + (rubber-equal-# (hor-extend = 0.5 # 0.1)) (rubber-Leftarrow-# (hor-extend Leftarrow 0.5 # 0.1)) (rubber-Rightarrow-# (hor-extend Rightarrow 0.5 # 0.1)) (rubber-Leftrightarrow-# (hor-extend Leftrightarrow 0.5 # 0.1)) diff -Nru texmacs-1.0.7.13/TeXmacs/langs/natural/dic/english-chinese.scm texmacs-1.0.7.14/TeXmacs/langs/natural/dic/english-chinese.scm --- texmacs-1.0.7.13/TeXmacs/langs/natural/dic/english-chinese.scm 2011-09-07 20:49:37.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/langs/natural/dic/english-chinese.scm 2011-09-24 13:24:13.000000000 +0000 @@ -20,6 +20,8 @@ ("activate hidden" "激活隐藏内容") ("activation" "") ("acute" "") +("add branch after" "在后面添加一个") +("add branch before" "在前面添加一个") ("add package" "增加宏包") ("add style package" "增加宏包") ("add switch after" "") @@ -66,6 +68,7 @@ ("always" "总是") ("american" "美语") ("animation" "动画") +("answer" "答案") ("and" "") ("angular" "") ("appendix" "附录") @@ -201,8 +204,8 @@ ("center" "居中") ("center text" "原文中间") ("centered" "居中") -("centered block" "居中有框表格") -("centered tabular" "居中无框表格") +("centered block" "有框表格(内容居中)") +("centered tabular" "无框表格(内容居中)") ("change border of cell" "改变单元格边界") ("change cell operation mode" "改变单元格操作模式") ("change log" "更新记录") @@ -220,6 +223,7 @@ ("class" "") ("clear" "清除") ("clear all fields" "清除全部区域") +("clear menu" "清除列表") ("clear selection" "") ("clear undo history" "清除撤销记录") ("clipped" "") @@ -283,7 +287,7 @@ ("create a new document" "新建文档") ("create preamble" "生成导言") ("create subsession" "创建子进程") -("create web site" "生成站点") +("create web site" "生成网站") ("cursors" "游标") ("curve" "曲线") ("custom tab" "") @@ -312,7 +316,7 @@ ("deactivate" "") ("deactivate table" "") ("debug" "调试") -("debugging tool" "调试工具") +("debugging tool" "调试菜单") ("december" "") ("decimal comma" "小数逗号") ("decimal dot" "小数点") @@ -374,6 +378,7 @@ ("draw over selection" "在选择区域内绘制") ("duplicate" "副本") ("dutch" "荷兰语") +("dynamic" "演示") ("dynamic libraries" "动态链接库") ("edit" "编辑") ("edit table" "编辑表格") @@ -407,6 +412,7 @@ ("enumerate alpha" "有序列表(小写字母)") ("enumerate roman" "有序列表(小写罗马数字)") ("enumerate numeric" "有序列表(阿拉伯数字)") +("enunciation" "说明") ("env" "") ("environment" "环境") ("epilogue" "") @@ -486,6 +492,7 @@ ("flat" "扁平") ("flexibility" "弹性") ("flexibility factor for vertical spacing" "") +("floating algorithm" "浮动算法") ("floating figure" "浮动图形") ("floating object" "浮动对象") ("floating table" "浮动表格") @@ -865,7 +872,7 @@ ("linear algebra" "线性代数") ("link" "链接") ("link image" "链接图片") -("linking tool" "链接工具") +("linking tool" "链接菜单") ("list" "") ("list of figures" "图形目录") ("list of tables" "表格目录") @@ -914,7 +921,7 @@ ("make negation" "") ("make page reference" "") ("make reference" "") -("make slides" "制作幻灯片") +("make slides" "展开幻灯片") ("make square root" "") ("make tilde" "") ("make title" "表题制作") @@ -951,8 +958,11 @@ ("meminfo" "") ("merge" "") ("messy" "") +("meta" "win") ("meta key" "") -("middle" "") +("metafont and available type" "优先使用 Metafont 字体") +("metafont bitmaps only" "仅只使用 Metafont 字体") +("middle" "居中") ("minimal" "最小") ("minimal number of columns" "行数最小值") ("minimal number of rows" "列数最小值") @@ -972,7 +982,6 @@ ("modify table padding" "") ("mongolian" "") ("more information about GNU TeXmacs can be found in the Help" "更多关于 GNU TeXmacs 的信息可查看帮助") -("more information about GNU TeXmacs can be found in the Help-" "更多关于 GNU TeXmacs 的信息可查看帮助-") ("mosaic" "") ("move" "移动") ("move down" "") @@ -1136,6 +1145,8 @@ ("perform operations on entire table" "对整个表格操作") ("perform operations on rows" "对整行操作") ("permanent" "") +("permanent footer" "每一页页脚") +("permanent header" "每一页页眉") ("person" "人物") ("personal dictionary has been modified" "") ("phantasy" "") @@ -1143,8 +1154,8 @@ ("phoenician" "") ("phonetic" "") ("pink" "粉红") -("plain block" "普通有框表格") -("plain tabular" "普通无框表格") +("plain block" "有框表格(普通)") +("plain tabular" "无框表格(普通)") ("planned changes" "") ("plans for the future" "未来计划") ("please" "") @@ -1152,6 +1163,7 @@ ("plot" "描画图形") ("plugin" "") ("plugins" "") +("plug-ins" "插件") ("plus" "") ("point" "点") ("point style" "点形状") @@ -1175,6 +1187,7 @@ ("presentation" "") ("presentation mode" "演讲模式") ("presentation tag" "展示标记") +("presentation tool" "演示菜单") ("preserve tags" "保留标记") ("pretty tree output" "美化树状输出") ("preview" "预览") @@ -1185,6 +1198,7 @@ ("previous similar" "相似的(前一个)") ("programming routines for editing documents" "文档编辑的编程常规") ("properties" "属性") +("property" "性质") ("primary" "") ("prime" "") ("print" "打印") @@ -1197,7 +1211,7 @@ ("printer" "打印机") ("printer dpi" "打印机DPI") ("printing command" "打印程序") -("problem" "问题") +("problem" "题目") ("professional" "专业") ("prog" "") ("prog font" "") @@ -1212,6 +1226,7 @@ ("project" "项目") ("projects" "项目计划") ("prologue" "") +("prominent" "突出") ("prompt on scripts" "") ("prompts and default input" "提示符和默认输入") ("proof" "证明") @@ -1221,13 +1236,15 @@ ("query replace" "替换文本") ("question" "问题") ("quit" "") +("question" "问题") ("quotation" "长引用") ("quote" "引用") ("range" "") -("really close it" "") +("really close it" "是否真要关闭它") ("really huge" "非常大") ("really quit" "是否真的退出") ("really tiny" "非常小") +("recent" "最近使用") ("recover autosave file" "复元自动保存文件") ("red" "红色") ("redo" "恢复") @@ -1273,6 +1290,7 @@ ("remove previous field" "删除前一个区域") ("remove rightwards" "删除此列") ("remove tag" "删除标签") +("remove this branch" "删除当前这个") ("remove this column" "删除此列") ("remove this row" "删除此行") ("remove this switch" "") @@ -1395,6 +1413,8 @@ ("set height of cell" "") ("set margins" "") ("set n" "") +("set number of columns" "设定列数") +("set number of rows" "设定行数") ("set or get environment variables" "") ("set paragraph margins" "段落边距") ("set paragraph mode" "段落对齐") @@ -1437,12 +1457,13 @@ ("small figure" "小图片标题") ("small skip" "小间距") ("small table" "小表格标题") +("solution" "解答") ("solving equations" "解方程") ("songti" "宋体") ("sound" "声音") ("source" "源码") ("source code" "程序源码") -("source macros tool" "源码工具") +("source macros tool" "源码菜单") ("source tags" "代码标记") ("space" "空白") ("space between lines" "") @@ -1512,11 +1533,11 @@ ("swedish" "瑞典语") ("swiss" "") ("switch" "") -("switch to first" "") +("switch to first" "跳到第前面") ("switch to formula style" "") -("switch to last" "") -("switch to next" "") -("switch to previous" "") +("switch to last" "跳到最后面") +("switch to next" "跳到下一个") +("switch to previous" "跳到前一个") ("switching and folding" "切换和折叠") ("symbol" "符号") ("system command" "") @@ -1534,9 +1555,10 @@ ("teXmacs extensions to scheme and utilities" "对 Scheme 的扩展和实用工具") ("teXmacs fonts" "TeXmacs 字体") ("teXmacs notice" "") -("teXmacs plugins" "TeXmacs 插件") +("teXmacs plug-ins" "TeXmacs 插件") ("teXmacs primitives" "TeXmacs 原语") ("teXmacs style files" "") +("textual operator" "文本运算符") ("ternary" "") ("test" "捡测") ("tex" "") @@ -1558,7 +1580,7 @@ ("the application does not reply" "") ("the application is already running" "") ("the boxes produced by the typesetter" "排版中使用的盒子") -("the buffer has not been saved" "暂存区信息尚未保存") +("the buffer has not been saved" "该文件尚未保存") ("the graphical user interface" "图形用户界面") ("the leaves of TeXmacs trees" "") ("the mycas example" "") @@ -1573,8 +1595,8 @@ ("this document has been produced using" "此文档由制作") ("this line" "") ("this page" "") -("this page footer" "") -("this page header" "") +("this page footer" "当前页页脚") +("this page header" "当前页页眉") ("this row" "此行") ("thumbnails" "缩略图") ("tilda" "") @@ -1603,6 +1625,8 @@ ("turkish" "土耳其文") ("tutorial" "入门教程") ("type" "类型") +("type 1 only" "仅只使用 Type1 字体") +("type 1 with metafont fallback" "优先使用 Type1 字体") ("type a latex command followed by" "") ("type body" "") ("type denominator" "") @@ -1627,6 +1651,7 @@ ("update" "更新") ("update from web" "") ("update image links" "") +("update web site" "更新网站") ("upgrade" "升级") ("upper border" "上端") ("upright" "正体") @@ -1693,7 +1718,7 @@ ("verbatim" "") ("verse" "诗文") ("version" "版本") -("versioning tool" "版本工具") +("versioning tool" "版本菜单") ("vertical" "竖直") ("vertical after" "") ("vertical before" "") @@ -1711,9 +1736,9 @@ ("visible" "可见") ("visual grid" "可视网格") ("warning" "警告") -("web" "网络") +("web" "网站") ("welcome" "欢迎") -("welcome to TeXmacs" "欢迎使用 TeXmacs") +("welcome to GNU TeXmacs" "欢迎使用 GNU TeXmacs") ("what is new" "最近更新") ("when finished" "") ("while" "") @@ -1741,6 +1766,7 @@ ("write typewriter text" "") ("write verbatim text" "逐字文本") ("writing data converters" "编写数据转换器") +("writing documentation" "编写插件文档") ("writing TeXmacs bibliography styles" "编写参考文献样式") ("writing your own style files" "编写自己的样式文件") ("written with TeXmacs" "使用 TeXmacs 制作") diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_back.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_back.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_back.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_back.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -/* XPM */ -static char *go_previous__[] = { -/* columns rows colors chars-per-pixel */ -"24 24 75 1 ", -" c #1F4985", -". c #204A86", -"X c #204A87", -"o c #214A87", -"O c #204B87", -"+ c #214C87", -"@ c #204A88", -"# c #214A88", -"$ c #204B88", -"% c #214B88", -"& c #214C88", -"* c #204C89", -"= c #214C89", -"- c #224D89", -"; c #244D89", -": c #244F8B", -"> c #28528C", -", c #2E5D9B", -"< c #355D96", -"1 c #305E9D", -"2 c #3C639B", -"3 c #3564A0", -"4 c #3465A4", -"5 c #3767A5", -"6 c #3A68A3", -"7 c #3868A6", -"8 c #3B6AA7", -"9 c #3B6BA7", -"0 c #3C6BA7", -"q c #3F6CA6", -"w c #3E6CA8", -"e c #3F70AB", -"r c #3F70AC", -"t c #41679D", -"y c #456DA2", -"u c #406EA9", -"i c #446FA8", -"p c #406FAC", -"a c #4971A6", -"s c #4471AB", -"d c #4571AB", -"f c #4572AB", -"g c #4070AC", -"h c #4071AC", -"j c #4171AC", -"k c #4070AD", -"l c #4071AD", -"z c #4171AD", -"x c #4672AC", -"c c #4972A9", -"v c #4B73A9", -"b c #4C74AB", -"n c #4A74AC", -"m c #4A75AD", -"M c #4E78AF", -"N c #4979B3", -"B c #4A7AB3", -"V c #4B7BB3", -"C c #4D79B1", -"Z c #4D7BB4", -"A c #547FB5", -"S c #5781B5", -"D c #5883B8", -"F c #5884B9", -"G c #5D87BA", -"H c #6089BA", -"J c #618ABB", -"K c #628BBC", -"L c #638BBC", -"P c #638CBC", -"I c #6990BE", -"U c #6E92BF", -"Y c #6991C0", -"T c #6D94C2", -"R c None", -/* pixels */ -"RRRRRRRRRRRRRRRRRRRRRRRR", -"RRRRRRRRRRRRRRRRRRRRRRRR", -"RRRRRRRRRRRRRRRRRRRRRRRR", -"RRRRRRRRRRRR*XRRRRRRRRRR", -"RRRRRRRRRRR%bw444444444444Z RR", -"RRRRRR:iq44444444444N:RR", -"RRRRRRR*q8449fxxxxxii%RR", -"RRRRRRRRX994u** % %##%RR", -"RRRRRRRRR*279 RRRRRRRRRR", -"RRRRRRRRRR 17 RRRRRRRRRR", -"RRRRRRRRRRRX1 RRRRRRRRRR", -"RRRRRRRRRRRR RRRRRRRRRR", -"RRRRRRRRRRRRRXRRRRRRRRRR", -"RRRRRRRRRRRRRRRRRRRRRRRR", -"RRRRRRRRRRRRRRRRRRRRRRRR", -"RRRRRRRRRRRRRRRRRRRRRRRR" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_cancel.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_cancel.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_cancel.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_cancel.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,167 +0,0 @@ -/* XPM */ -static char *dialog_no[] = { -/* columns rows colors chars-per-pixel */ -"24 24 137 2 ", -" c #9F0707", -". c #A00707", -"X c #A10707", -"o c #A20707", -"O c #A80A0A", -"+ c #AA0A0A", -"@ c #AB0A0A", -"# c #AB0D0D", -"$ c #AD0F0F", -"% c #AE0F0F", -"& c #AD1010", -"* c #AF1212", -"= c #B11414", -"- c #B11515", -"; c #B21616", -": c #B21818", -"> c #B31919", -", c #B41B1B", -"< c #B51B1B", -"1 c #B61D1D", -"2 c #B61F1F", -"3 c #B71F1F", -"4 c #B72121", -"5 c #B82020", -"6 c #BA2222", -"7 c #BA2323", -"8 c #B92424", -"9 c #BA2626", -"0 c #BB2727", -"q c #BC2727", -"w c #BD2727", -"e c #BE2828", -"r c #BD2A2A", -"t c #BE2A2A", -"y c #BF2A2A", -"u c #BE2C2C", -"i c #C02D2D", -"p c #C02E2E", -"a c #C12E2E", -"s c #C13030", -"d c #C23232", -"f c #C43131", -"g c #C43232", -"h c #C43636", -"j c #C43737", -"k c #C73838", -"l c #C63939", -"z c #C63A3A", -"x c #C83939", -"c c #C93C3C", -"v c #C83D3D", -"b c #C93D3D", -"n c #CA3D3D", -"m c #C93F3F", -"M c #CA3E3E", -"N c #CB3F3F", -"B c #CC3F3F", -"V c #CA4040", -"C c #CB4040", -"Z c #CA4242", -"A c #CA4343", -"S c #CD4040", -"D c #CD4141", -"F c #CE4242", -"G c #CB4545", -"H c #CB4646", -"J c #CC4545", -"K c #CD4545", -"L c #CF4444", -"P c #CC4646", -"I c #CC4747", -"U c #CE4646", -"Y c #CE4747", -"T c #CC4848", -"R c #CC4A4A", -"E c #D04444", -"W c #D04747", -"Q c #D14747", -"! c #D14848", -"~ c #D34949", -"^ c #D14D4D", -"/ c #D34D4D", -"( c #D14E4E", -") c #D24F4F", -"_ c #D44D4D", -"` c #D64E4E", -"' c #D65151", -"] c #D75151", -"[ c #D75252", -"{ c #D45454", -"} c #D45555", -"| c #D65656", -" . c #D95252", -".. c #D95555", -"X. c #DA5555", -"o. c #DC5757", -"O. c #D85B5B", -"+. c #DC5A5A", -"@. c #DD5B5B", -"#. c #DE5B5B", -"$. c #E15F5F", -"%. c #DF6060", -"&. c #DF6161", -"*. c #DC6464", -"=. c #DF6A6A", -"-. c #E16363", -";. c #E16464", -":. c #E26565", -">. c #E26666", -",. c #E26868", -"<. c #E26A6A", -"1. c #E26B6B", -"2. c #E36C6C", -"3. c #E36D6D", -"4. c #E16E6E", -"5. c #E36F6F", -"6. c #E37070", -"7. c #E47272", -"8. c #E47373", -"9. c #E37474", -"0. c #E47575", -"q. c #E57777", -"w. c #E57979", -"e. c #E57A7A", -"r. c #E57C7C", -"t. c #E67D7D", -"y. c #E57E7E", -"u. c #E78181", -"i. c #E68282", -"p. c #E78383", -"a. c #E78484", -"s. c #E78787", -"d. c #E78888", -"f. c #E88888", -"g. c #E88B8B", -"h. c #E98C8C", -"j. c None", -/* pixels */ -"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.", -"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.", -"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.", -"j.j.j.j.j.j.f f j.j.j.j.j.j.j.j.f f j.j.j.j.j.j.", -"j.j.j.j.j.p P P p j.j.j.j.j.j.s T T p j.j.j.j.j.", -"j.j.j.j.p P g.g.T p j.j.j.j.p T h.g.P p j.j.j.j.", -"j.j.j.e m u.6.7.g.A e j.j.e G d.6.7.u.A e j.j.j.", -"j.j.j.e m e.1.>.5.u.A e e G u.6.1.5.t.m e j.j.j.", -"j.j.j.j.9 v e.1.-.1.t.A A t.2.-.1.e.v 9 j.j.j.j.", -"j.j.j.j.j.6 l 6.>.$.>.e.0.>.$.>.9.l 6 j.j.j.j.j.", -"j.j.j.j.j.j.6 h 5.@.@.@.@.@.-.5.j 6 j.j.j.j.j.j.", -"j.j.j.j.j.j.j.4 h =.@.+.@.@.=.h 4 j.j.j.j.j.j.j.", -"j.j.j.j.j.j.j.< s *.X. . .X.*.s < j.j.j.j.j.j.j.", -"j.j.j.j.j.j.> u O.' ` ' ` ` .O.e > j.j.j.j.j.j.", -"j.j.j.j.j.; 9 | ) ~ ` | | ` ~ ` | 9 ; j.j.j.j.j.", -"j.j.j.j.* 6 ) Q F Q ) q q ) Q P P ) 9 ; j.j.j.j.", -"j.j.j.* < P F n F P 4 = = 4 P F F F Q < ; j.j.j.", -"j.j.j.* < A c m F < # j.j.# < F c m n > # j.j.j.", -"j.j.j.j.# ; k k > # j.j.j.j.# > k c ; # j.j.j.j.", -"j.j.j.j.j.@ = ; O j.j.j.j.j.j.O ; = @ j.j.j.j.j.", -"j.j.j.j.j.j.o o j.j.j.j.j.j.j.j. o j.j.j.j.j.j.", -"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.", -"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.", -"j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_copy.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_copy.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_copy.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_copy.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,133 +0,0 @@ -/* XPM */ -static char *edit_copy__[] = { -/* columns rows colors chars-per-pixel */ -"24 24 103 2 ", -" c #A5A5A5", -". c #A7A9AA", -"X c #B1B2B2", -"o c #B7B7B7", -"O c #B6B8B8", -"+ c #B8B9B8", -"@ c #B9B9B9", -"# c #BABABB", -"$ c #BABBBB", -"% c #BBBBBB", -"& c #BBBCBC", -"* c #BCBCBC", -"= c #BCBDBD", -"- c #BDBDBD", -"; c #BDBEBE", -": c #BEBEBE", -"> c #BEBFBF", -", c #BFBFBF", -"< c #C0C0C0", -"1 c #C1C1C1", -"2 c #C1C2C2", -"3 c #C2C2C2", -"4 c #C2C3C3", -"5 c #C3C3C3", -"6 c #C3C5C5", -"7 c #C4C4C4", -"8 c #C4C5C5", -"9 c #C5C5C5", -"0 c #C6C6C6", -"q c #C6C7C6", -"w c #C6C7C7", -"e c #C6C8C7", -"r c #C7C8C7", -"t c #C8C8C8", -"y c #C9C9C9", -"u c #CACACA", -"i c #CBCBCB", -"p c #CCCDCD", -"a c #CECFCF", -"s c #D0D1D0", -"d c #D0D1D1", -"f c #D1D1D1", -"g c #D2D3D2", -"h c #D2D3D3", -"j c #D4D4D4", -"k c #D4D5D4", -"l c #D4D5D5", -"z c #D5D5D5", -"x c #D5D6D6", -"c c #D6D6D6", -"v c #D9D9D9", -"b c #DBDBDB", -"n c #DBDCDC", -"m c #DDDDDD", -"M c #DEDEDE", -"N c #E1E1E1", -"B c #E3E3E3", -"V c #E4E4E4", -"C c #E5E5E5", -"Z c #E6E6E6", -"A c #E9E9E9", -"S c #EAEBEB", -"D c #EBEBEB", -"F c #EBECEC", -"G c #EBECED", -"H c #ECECEC", -"J c #ECEDED", -"K c #EDEDED", -"L c #EDEDEE", -"P c #EDEEEE", -"I c #EEEEEE", -"U c #EEEFEF", -"Y c #EFEFEF", -"T c #EEEFF0", -"R c #EFF0F0", -"E c #F0F0F0", -"W c #F0F1F1", -"Q c #F1F1F1", -"! c #F1F2F2", -"~ c #F2F2F2", -"^ c #F2F3F3", -"/ c #F3F3F3", -"( c #F3F4F4", -") c #F4F4F4", -"_ c #F4F4F5", -"` c #F4F5F5", -"' c #F5F5F5", -"] c #F5F6F6", -"[ c #F6F6F6", -"{ c #F6F7F7", -"} c #F7F7F7", -"| c #F7F8F8", -" . c #F8F8F8", -".. c #F8F9F9", -"X. c #F9F9F9", -"o. c #FAFAFA", -"O. c #FAFBFB", -"+. c #FBFBFB", -"@. c #FCFCFC", -"#. c #FDFDFD", -"$. c #FEFEFE", -"%. c #FFFFFF", -"&. c None", -/* pixels */ -"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.", -"&.&.* # $ & * * > * > * > * * < < &.&.&.&.&.&.&.", -"&.* W L Y Y W W ( ) ) ` ` ) ` } X.&.&.&.&.&.&.&.", -"&.$ L S L L E W R W W ( ( ) ) ) ` &.&.&.&.&.&.&.", -"&.* R L L Y W W W ) ` ` ) ` } ` ` o < * , &.&.", -"&.* W R E W W ) ) ` } } } } X.} X.i L ` ` X.5 &.", -"&.* ( W W ( ( ` } } } } X.X.+.X.X.r D ) ` X., &.", -"&.* ` W ( ) ` } } X.+.X.+.X.+.+.X.i L } ` X.< &.", -"&.* ` W ` } } X.+.+.+.+.+.+.+.+.+.i Y X.} +.< &.", -"&., } ` ` ` X.+.X.+.+.#.+.+.+.#.#.i W X.X.#.5 &.", -"&.< } ` } X.X.X.+.+.#.+.#.#.#.#.#.i W #.+.#.5 &.", -"&., X.` X.X.X.#.+.+.#.#.#.#.#.#.#.i ` X.+.#.5 &.", -"&.< X.} X.X.#.X.#.#.#.#.#.#.#.#.@.p ( #.#.#.9 &.", -"&.< X.X.X.X.+.#.#.#.#.#.#.W L S F i ` #.#.#.9 &.", -"&.< X.} +.#.+.#.#.#.#.} S b z z 9 M #.#.#.#.< &.", -"&.< X.X.X.X.#.#.#.#.X.S g X.E e z #.#.#.#.#.9 &.", -"&.< X.X.X.+.#.#.#.#.` M i ) e z #.+.) E D Y + &.", -"&.5 +.X.+.+.#.#.#.#.` b 9 9 g #.+.L M z z < &.&.", -"&.5 #.#.#.#.#.#.#.#.` d # z #.#.W d ) ) a &.&.&.", -"&.&.5 5 9 < # c z z h 9 b #.#.X.V e ) s &.&.&.&.", -"&.&.&.&.&.&.&.V V V V L #.#.#.X.N 9 e &.&.&.&.&.", -"&.&.&.&.&.&.&.#.#.#.#.#.#.#.#.X.M X &.&.&.&.&.&.", -"&.&.&.&.&.&.&.< < 9 < 9 9 9 9 < . &.&.&.&.&.&.&.", -"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_cut.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_cut.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_cut.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_cut.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -/* XPM */ -static char *edit_cut[] = { -/* columns rows colors chars-per-pixel */ -"24 24 108 2 ", -" c #4A4A4A", -". c #535353", -"X c #636363", -"o c #676767", -"O c #6A6A6A", -"+ c #707070", -"@ c #757575", -"# c #777777", -"$ c #7D7D7D", -"% c #8D8D8D", -"& c #8E8E8E", -"* c #8F8F8F", -"= c #959595", -"- c #979797", -"; c #999999", -": c #9B9B9B", -"> c #9C9C9C", -", c #9D9D9D", -"< c #9E9E9E", -"1 c #9F9F9F", -"2 c #A0A0A0", -"3 c #A2A2A2", -"4 c #A3A3A3", -"5 c #A4A4A4", -"6 c #A5A5A5", -"7 c #A6A6A6", -"8 c #A8A8A8", -"9 c #A9A9A9", -"0 c #AAAAAA", -"q c #ABABAB", -"w c #ACACAC", -"e c #ADADAD", -"r c #AEAEAE", -"t c #B0B0B0", -"y c #B1B1B1", -"u c #B2B2B2", -"i c #B3B3B3", -"p c #B4B4B4", -"a c #B5B5B5", -"s c #B7B7B7", -"d c #B8B8B8", -"f c #B9B9B9", -"g c #BABABA", -"h c #BCBCBC", -"j c #BDBDBD", -"k c #BEBEBE", -"l c #BFBFBF", -"z c #C0C0C0", -"x c #C1C1C1", -"c c #C3C3C3", -"v c #C4C4C4", -"b c #C5C5C5", -"n c #C7C7C7", -"m c #C8C8C8", -"M c #C9C9C9", -"N c #CACACA", -"B c #CBCBCB", -"V c #CCCCCC", -"C c #CDCDCD", -"Z c #CECECE", -"A c #CFCFCF", -"S c #D0D0D0", -"D c #D1D1D1", -"F c #D2D2D2", -"G c #D3D3D3", -"H c #D4D4D4", -"J c #D5D5D5", -"K c #D6D6D6", -"L c #D7D7D7", -"P c #D8D8D8", -"I c #D9D9D9", -"U c #DADADA", -"Y c #DBDBDB", -"T c #DCDCDC", -"R c #DDDDDD", -"E c #DEDEDE", -"W c #DFDFDF", -"Q c #E0E0E0", -"! c #E1E1E1", -"~ c #E2E2E2", -"^ c #E3E3E3", -"/ c #E4E4E4", -"( c #E5E5E5", -") c #E6E6E6", -"_ c #E7E7E7", -"` c #E8E8E8", -"' c #E9E9E9", -"] c #EAEAEA", -"[ c #EBEBEB", -"{ c #ECECEC", -"} c #EDEDED", -"| c #EEEEEE", -" . c #EFEFEF", -".. c #F0F0F0", -"X. c #F1F1F1", -"o. c #F2F2F2", -"O. c #F3F3F3", -"+. c #F4F4F4", -"@. c #F5F5F5", -"#. c #F6F6F6", -"$. c #F7F7F7", -"%. c #F8F8F8", -"&. c #F9F9F9", -"*. c #FAFAFA", -"=. c #FBFBFB", -"-. c #FCFCFC", -";. c #FDFDFD", -":. c None", -/* pixels */ -":.:.:.+.+.+.) ~ ..+...+.+.:.:.:.:.:.:.:.:.:.:.:.", -":.:.=.=.=.=.R j ' ;.=.;.=...~ :.:.:.:.:.:.:.:.:.", -":.~ +.;.=.;.) 3 g ..;.;.=...) P :.:.:.:.:.:.:.:.", -":.:.=.;.;.;.+.g = A +.;.+.| ' | K :.:.:.:.:.:.:.", -":.:.=.=.=.;.;.P : w ) ;.=.' ' =.| K :.:.:.:.:.:.", -":.:...=.;.=.;.| u < m +.=.| R ) ) R v :.:.:.:.:.", -":.:.A ' ..=.=.=.D 3 g R =.+.' ~ R P D z :.:.:.:.", -":.:.v m ~ ' ' +.) u a D ..=.+.| ' ) ~ D :.:.:.:.", -":.:.) z g D ) ~ R j u m ~ =.=.+.....| P :.:.:.:.", -":.:.+...A u j K R m w u m | ;.;.=.=.+.~ :.:.:.:.", -":.:.+.;.+.~ j w z A m A m ~ ..=.=.=.' D :.:.:.:.", -":.:...=.=.+.| K a w j P ~ ~ P R ) ~ v 3 < w :.:.", -":.:...=.=.=.+.=.| K a 3 g 8 7 a g v w + :.$ w :.", -":.:...+.+.+.+.+.+...' j w 8 7 3 : < w 3 :.:.u :.", -":.:...+.+...+.+...+...~ g j D R K v 8 7 w j 7 :.", -":.:.| ..............| ' A j A | | ' A % + # :.", -":.:.| ' | | ' | | ' | ' D v v ' | ' ) g :.:.:.:.", -":.:.' ' ' ' ' ' ' ' ' R z w g K ' ' ) m :.:.:.:.", -":.:.) ) ' ) ' ) ' ' ) A 7 = 3 j R ' ) v :.:.:.:.", -":.:.) ' ) ) ) ' ) ) ) A u j j a m ) ~ z :.:.:.:.", -":.:.) ) ) ) ) ~ ) ) ) m a m K z g R ~ j :.:.:.:.", -":.:.R R R R R R R P P A 8 u z 8 < A D w :.:.:.:.", -":.:.3 7 7 3 3 3 < < < = # X o . O % % :.:.:.:.:.", -":.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_find_next.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_find_next.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_find_next.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_find_next.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,260 +0,0 @@ -/* XPM */ -static char *edit_find__[] = { -/* columns rows colors chars-per-pixel */ -"24 24 230 2 ", -" c #373737", -". c #383838", -"X c #393939", -"o c #3A3A3A", -"O c #3B3B3B", -"+ c #3D3D3D", -"@ c #3F3F3F", -"# c #414141", -"$ c #434343", -"% c #444543", -"& c #444444", -"* c #454545", -"= c #676765", -"- c #717171", -"; c #747673", -": c #757873", -"> c #787878", -", c #7B7D7A", -"< c #7F7F7F", -"1 c #80827E", -"2 c #6A8FBB", -"3 c #7295BF", -"4 c #7496BD", -"5 c #7D9BBF", -"6 c #7497C0", -"7 c #7699C2", -"8 c #779BC5", -"9 c #789AC2", -"0 c #7D9EC5", -"q c #808080", -"w c #818181", -"e c #828381", -"r c #828282", -"t c #848583", -"y c #848484", -"u c #868686", -"i c #878787", -"p c #898989", -"a c #8A8A8A", -"s c #8B8B8B", -"d c #8C8C8C", -"f c #8D8D8D", -"g c #8F908E", -"h c #909090", -"j c #939393", -"k c #969793", -"l c #959594", -"z c #969696", -"x c #959893", -"c c #989997", -"v c #999999", -"b c #9B9C9A", -"n c #9D9D9D", -"m c #9FA09B", -"M c #A0A0A0", -"N c #A2A3A1", -"B c #A3A3A3", -"V c #A3A4A1", -"C c #A6A6A6", -"Z c #A7A7A7", -"A c #A8A9A6", -"S c #A9A9A9", -"D c #AAABA8", -"F c #ABABAB", -"G c #ABACAA", -"H c #ABACAB", -"J c #AEAEAE", -"K c #AFB0AB", -"L c #B0B2AD", -"P c #B1B2AE", -"I c #B0B1B0", -"U c #B1B1B1", -"Y c #B3B3B3", -"T c #B4B5B0", -"R c #B4B5B2", -"E c #B6B7B3", -"W c #B7B7B3", -"Q c #B4B4B4", -"! c #B6B7B4", -"~ c #B7B7B6", -"^ c #B7B8B4", -"/ c #B8B8B3", -"( c #B8B9B6", -") c #B9BAB7", -"_ c #BABBB8", -"` c #BCBEBB", -"' c #BEBFBB", -"] c #B9BFBE", -"[ c #B8BEBF", -"{ c #BCBCBC", -"} c #BDBDBD", -"| c #BDBEBC", -" . c #BFBFBD", -".. c #BFBFBE", -"X. c #BFC0BD", -"o. c #C0C1BE", -"O. c #809FC5", -"+. c #8AA6C7", -"@. c #86A4C9", -"#. c #88A5C9", -"$. c #8DABCD", -"%. c #8EABCD", -"&. c #92ACC9", -"*. c #97AFCA", -"=. c #91ACCC", -"-. c #93AECC", -";. c #92AECF", -":. c #94AECD", -">. c #9AB2CC", -",. c #9EB5D2", -"<. c #A2B3C3", -"1. c #A1B4C9", -"2. c #A6B7C9", -"3. c #A3B7CC", -"4. c #B5BDC1", -"5. c #A5B9D2", -"6. c #A6BBD4", -"7. c #A6BCD4", -"8. c #A7BED6", -"9. c #A3BCD8", -"0. c #A4BCD8", -"q. c #A4BDD8", -"w. c #C0BFC0", -"e. c #ADC0D6", -"r. c #B9C7D7", -"t. c #BAC8D6", -"y. c #BCC9D6", -"u. c #B1C5DA", -"i. c #B6C7D8", -"p. c #BAC8D8", -"a. c #BFCBD8", -"s. c #BECBD9", -"d. c #BCCCDB", -"f. c #AFC7E1", -"g. c #B4C9E1", -"h. c #BACDE1", -"j. c #C1C1C1", -"k. c #C3C3C3", -"l. c #C3C4C1", -"z. c #C3C4C2", -"x. c #C3C7C7", -"c. c #C4C4C4", -"v. c #C6C7C4", -"b. c #C7C7C5", -"n. c #C7C7C7", -"m. c #C8C9C7", -"M. c #C8CAC7", -"N. c #C9CAC7", -"B. c #C8C8C8", -"V. c #C9C9C8", -"C. c #C9C9C9", -"Z. c #C9CAC9", -"A. c #CACACA", -"S. c #CCCDC9", -"D. c #CCCCCC", -"F. c #CDCDCD", -"G. c #CECECE", -"H. c #CFCFCF", -"J. c #D0D0CF", -"K. c #C7CFD7", -"L. c #CCD0D0", -"P. c #CDD0D0", -"I. c #CED2D1", -"U. c #CDD1D2", -"Y. c #CAD1D5", -"T. c #C6D1DC", -"R. c #CFD5D9", -"E. c #D0D0D0", -"W. c #D1D1D1", -"Q. c #D2D2D2", -"!. c #D3D3D3", -"~. c #D4D4D4", -"^. c #D4D5D4", -"/. c #D5D5D5", -"(. c #D6D6D6", -"). c #D6D7D6", -"_. c #D7D7D7", -"`. c #D7D8D6", -"'. c #D8DBD5", -"]. c #D8D8D8", -"[. c #D9D9D9", -"{. c #DADBD9", -"}. c #DADADA", -"|. c #DADBDA", -" X c #DBDBDB", -".X c #DCDCDC", -"XX c #DDDDDC", -"oX c #DDDDDD", -"OX c #DEDEDE", -"+X c #DEDFDE", -"@X c #DFDFDF", -"#X c #C4D2E0", -"$X c #C7D5E5", -"%X c #CAD5E1", -"&X c #CDD8E5", -"*X c #CDDBEA", -"=X c #CEDBEA", -"-X c #D5E0EC", -";X c #D9E2EC", -":X c #DAE3ED", -">X c #D8E4F0", -",X c #E0E0E0", -"Xf.8 y.T yXr kXkXkX", -"kXkXkXz dX2X9Xo.[ 2 h.-X:X-X#X6.3 2.) 3X< kXkXkX", -"kXkXkXj dXE.8Xl.[ 4 q.$X&X%Xd.u.7 <.K 9X< kXkXkX", -"kXkXkXj yX9X9X[.` 1.6 7.i.K.s.>.5 4.m yX< kXkXkX", -"kXkXkXf yX3X9X9X) I.:.9 >.>.&.O.T.S.c G - kXkXkX", -"kXkXkXp gX9X9XgX~.L I.t.@.0 5.Y.l.{ F g = kXkXkX", -"kXkXkXu dX9X3XyX@XJ.l.B.B.v.v.o.V V U C z ; kXkX", -"kXkXkXu jXyXeXgXgXjXgX3X[.`..XyX3XA b L F D 1 kX", -"kXkXkX> B.B.B.B.B.n.n.j.j.w.{ { { Q r t ^ '.x kX", -"kXkXkXkX* * * * % # @ + O X X . X * , x : kX", -"kXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkXkX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_find.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_find.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_find.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_find.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,230 +0,0 @@ -/* XPM */ -static char *edit_find___[] = { -/* columns rows colors chars-per-pixel */ -"24 24 200 2 ", -" c #434649", -". c #42464A", -"X c #46494C", -"o c #494B4E", -"O c #515355", -"+ c #52565A", -"@ c #575A5C", -"# c #58595B", -"$ c #5D6064", -"% c #66696D", -"& c #6B6C6D", -"* c #747475", -"= c #77797D", -"- c #7B7C7C", -"; c #858585", -": c #838588", -"> c #8D8D8D", -", c #8F9194", -"< c #999898", -"1 c #9A9998", -"2 c #9A9999", -"3 c #9C9D9F", -"4 c #9F9F9F", -"5 c #A3A2A3", -"6 c #A3A3A4", -"7 c #A4A4A5", -"8 c #A6A6A7", -"9 c #A7A7A8", -"0 c #A9A8A8", -"q c #A8A8AA", -"w c #AAAAAA", -"e c #AAAAAB", -"r c #ACABAB", -"t c #ADACAB", -"y c #AAAAAC", -"u c #ACACAC", -"i c #ADADAC", -"p c #AEAEAD", -"a c #B0AFAE", -"s c #AFAFB0", -"d c #B1B1B1", -"f c #B2B3B4", -"g c #B3B3B4", -"h c #B5B4B4", -"j c #B4B4B5", -"k c #B6B6B6", -"l c #B7B7B7", -"z c #B8B7B6", -"x c #B8B8B8", -"c c #B8B8B9", -"v c #B9B9B9", -"b c #BAB9B8", -"n c #B9B9BA", -"m c #BBBABA", -"M c #BBBBBB", -"N c #BCBBBA", -"B c #BCBCBC", -"V c #BDBCBC", -"C c #BDBDBD", -"Z c #BEBDBD", -"A c #BEBEBE", -"S c #BEBEBF", -"D c #C0BFBF", -"F c #C1C0C0", -"G c #C1C1C1", -"H c #C2C1C1", -"J c #C3C3C3", -"K c #C4C3C3", -"L c #C4C4C4", -"P c #C5C5C5", -"I c #C6C5C5", -"U c #C5C5C6", -"Y c #C6C6C6", -"T c #C8C7C7", -"R c #C8C8C7", -"E c #CAC9C9", -"W c #CACACA", -"Q c #CBCACA", -"! c #CBCBCB", -"~ c #CCCCCB", -"^ c #CBCBCC", -"/ c #CCCCCC", -"( c #CDCCCC", -") c #CCCCCD", -"_ c #CECDCC", -"` c #CECDCD", -"' c #CECECD", -"] c #CFCECD", -"[ c #CCCCCE", -"{ c #CECECE", -"} c #CFCECE", -"| c #CFCFCE", -" . c #CFCFCF", -".. c #D0CFCE", -"X. c #D0CFCF", -"o. c #D1D0CF", -"O. c #CECFD2", -"+. c #CECED3", -"@. c #D0D0D0", -"#. c #D1D0D0", -"$. c #D0D0D1", -"%. c #D2D1D1", -"&. c #D2D2D1", -"*. c #D1D1D2", -"=. c #D2D2D2", -"-. c #D3D2D2", -";. c #D3D3D3", -":. c #D4D3D3", -">. c #D4D4D4", -",. c #D5D4D4", -"<. c #D6D5D5", -"1. c #D5D5D7", -"2. c #D6D6D6", -"3. c #D7D6D6", -"4. c #D7D7D7", -"5. c #D8D7D7", -"6. c #D9D8D8", -"7. c #D9D9D9", -"8. c #DAD9D9", -"9. c #DADAD9", -"0. c #D8D8DB", -"q. c #DADADA", -"w. c #DBDBDB", -"e. c #DCDBDB", -"r. c #D8D9DE", -"t. c #D9DADF", -"y. c #DCDCDC", -"u. c #DDDCDC", -"i. c #DDDDDD", -"p. c #DEDDDD", -"a. c #DCDCDE", -"s. c #DEDEDE", -"d. c #DFDEDE", -"f. c #DFDFDF", -"g. c #E0DFDF", -"h. c #DCDCE0", -"j. c #DDDDE2", -"k. c #DDDEE3", -"l. c #DEDEE2", -"z. c #DFDFE3", -"x. c #DFE0E0", -"c. c #E0E0E0", -"v. c #E1E1E1", -"b. c #E2E1E1", -"n. c #E2E2E2", -"m. c #E3E2E2", -"M. c #E4E3E3", -"N. c #E1E1E5", -"B. c #E3E4E4", -"V. c #E5E4E4", -"C. c #E5E5E5", -"Z. c #E6E5E5", -"A. c #E6E6E6", -"S. c #E7E6E6", -"D. c #E7E7E7", -"F. c #E8E7E7", -"G. c #E4E5E8", -"H. c #E5E5E9", -"J. c #E6E6E9", -"K. c #E6E6EA", -"L. c #E8E8E8", -"P. c #E9E8E8", -"I. c #EAE9E9", -"U. c #ECEBEB", -"Y. c #EAEAED", -"T. c #EBEBEE", -"R. c #EDECEC", -"E. c #EEEDED", -"W. c #EEEEEE", -"Q. c #EFEEEE", -"!. c #F0EFEF", -"~. c #EEEEF0", -"^. c #EEEEF1", -"/. c #EEEFF1", -"(. c #F0F0F0", -"). c #F1F1F1", -"_. c #F2F1F1", -"`. c #F0F0F2", -"'. c #F1F1F3", -"]. c #F1F2F2", -"[. c #F1F2F3", -"{. c #F2F2F2", -"}. c #F2F2F3", -"|. c #F3F3F3", -" X c #F3F3F4", -".X c #F3F3F5", -"XX c #F4F4F4", -"oX c #F4F4F5", -"OX c #F5F5F6", -"+X c #F6F6F7", -"@X c #F8F7F7", -"#X c #F8F8F8", -"$X c #F9F8F8", -"%X c #F8F8F9", -"&X c #F9F9FA", -"*X c #FAFAFA", -"=X c #FAFAFB", -"-X c #FBFBFB", -";X c #FCFCFC", -":X c None", -/* pixels */ -":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X", -":X:X:X2.+X+X+X+X+X+X+X+X+X(.m.^ :X:X:X:X:X:X:X:X", -":X:X:Xi.&X&X&X&X@X&X&X&X&X&X+Xm.2.:X:X:X:X:X:X:X", -":X:X:Xi.&X+Xm.U.m.U.U.D.D.U.m.x.+XO.:X:X:X:X:X:X", -":X:X:Xi.+XU.i.^ N N N ^ x.m.m.x.+XU.G :X:X:X:X:X", -":X:X:Xi.@Xm.p N 4.x.4.N z i.x.2.G.m.m.N :X:X:X:X", -":X:X:X2.+Xz 2.+X&X&X+X+X^ G U.m.^ j p N :X:X:X:X", -":X:X:X5.2.N +X+X+X%X+X+X+Xj ^ m.i.G m G N :X:X:X", -":X:X:X5.N r.`.`.+X/.+X`.+X^ j i.i.i.i.F.2.:X:X:X", -":X:X:X$.m h.T.T./././././.O.z F.F.U.U.!.2.:X:X:X", -":X:X:X2.J ^ P.G.G.G.G.G.G.N N g.m.F.F.U.^ :X:X:X", -":X:X:X$.0.9 h.b.k.k.k.k.0.6 ^ 2.5.i.m.U.^ :X:X:X", -":X:X:X^ P.J 9 O.0.r.k.$.9 p i.i.g.m.m.F.^ :X:X:X", -":X:X:X^ m.g.J 5 p j s 6 @ * D i.i.i.m.m.^ :X:X:X", -":X:X:XT b.5.$.X.G J T ^ 3 - N 2.o.i.m.T :X:X:X", -":X:X:XG g.5.X.^ $.O.X.$.$., ; T 5.i.m.G :X:X:X", -":X:X:XG g.2.X.X.X.X.X.o.o.X.; X > T i.i.D :X:X:X", -":X:X:XG i.5.X.2.5.o.2.o.2.5.o.- o < X.5.D :X:X:X", -":X:X:XG 5.X.T T T E E E T E E H % O 6 2.G :X:X:X", -":X:X:XD 2.X.X.X.X._ X.^ X.^ X.X.G $ @ 0 N :X:X:X", -":X:X:XN X.X.X.X.X.X.o.X.X.X.o.X.X.N + & p :X:X:X", -":X:X:XN X.X._ X.X.^ X.X.X.X.X.^ ^ 2.j 9 z :X:X:X", -":X:X:X1 p a t t p p p p t t p p p p p a 1 :X:X:X", -":X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X:X" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_forward.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_forward.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_forward.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_forward.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -/* XPM */ -static char *go_next__[] = { -/* columns rows colors chars-per-pixel */ -"24 24 83 1 ", -" c #1F4884", -". c #1F4B86", -"X c #1F4B87", -"o c #204A87", -"O c #214A87", -"+ c #204B87", -"@ c #214C87", -"# c #204A88", -"$ c #204B88", -"% c #214B88", -"& c #214B89", -"* c #224B88", -"= c #224A8A", -"- c #214C88", -"; c #204C89", -": c #214C89", -"> c #224C88", -", c #234D8A", -"< c #244E89", -"1 c #264F8B", -"2 c #254F8C", -"3 c #29528E", -"4 c #2B548E", -"5 c #2F5D9B", -"6 c #365F97", -"7 c #32619F", -"8 c #3765A2", -"9 c #3666A3", -"0 c #3465A4", -"q c #3767A5", -"w c #3B6AA5", -"e c #3868A6", -"r c #3A69A6", -"t c #3B6BA7", -"y c #3C6AA5", -"u c #3C6BA7", -"i c #3F6CA6", -"p c #3F6CA7", -"a c #3D6CA8", -"s c #3F70AB", -"d c #3F70AC", -"f c #41689E", -"g c #466EA4", -"h c #416EA8", -"j c #446FA8", -"k c #4B72A7", -"l c #4371AB", -"z c #4471AB", -"x c #4772AA", -"c c #4070AC", -"v c #4071AC", -"b c #4171AC", -"n c #4070AD", -"m c #4071AD", -"M c #4171AD", -"N c #4272AD", -"B c #4872AA", -"V c #4E76AA", -"C c #4C76AD", -"Z c #4E76AD", -"A c #5178AD", -"S c #5079AE", -"D c #4979B3", -"F c #4A7AB3", -"G c #4B7AB3", -"H c #4D79B1", -"J c #4C7BB4", -"K c #4E7CB5", -"L c #4E7DB5", -"P c #507BB0", -"I c #537FB5", -"U c #5B83B5", -"Y c #5982B6", -"T c #5883B7", -"R c #5B84B8", -"E c #5A86BA", -"W c #5E87B9", -"Q c #628BBB", -"! c #638CBC", -"~ c #678EBD", -"^ c #6B8FBE", -"/ c #6990BF", -"( c None", -/* pixels */ -"((((((((((((((((((((((((", -"((((((((((((((((((((((((", -"((((((((((((((((((((((((", -"(((((((((((+%(((((((((((", -"(((((((((((+6:((((((((((", -"(((((((((((+^f%(((((((((", -"(((((((((((+//g%((((((((", -"(((%+++++++:~L!k%(((((((", -"(((:TQQQQQQQEFFWV:((((((", -"(((:TKFFFFFFFFDDTA<(((((", -"(((:TKFDFFFFFFDDFIA1((((", -"(((%PMdjaMdddMMaMMHC+(((", -"(((:Be00000000000aC3=(((", -"(((Xj00000000000aB3%((((", -"(((:pjMjzzjza00ah2%(((((", -"(((XX%%%X%X%a0ea<(((((((", -"(((((((((((%rr0@((((((((", -"(((((((((((X00%(((((((((", -"(((((((((((X5+((((((((((", -"(((((((((((X+(((((((((((", -"(((((((((((X((((((((((((", -"((((((((((((((((((((((((", -"((((((((((((((((((((((((", -"((((((((((((((((((((((((" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_language.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_language.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_language.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_language.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,285 +0,0 @@ -/* XPM */ -static char *emblem_web[] = { -/* columns rows colors chars-per-pixel */ -"24 24 255 2 ", -" c #183866", -". c #183968", -"X c #1B3F73", -"o c #1D4278", -"O c #1D437A", -"+ c #1E447C", -"@ c #355B7F", -"# c #728E5B", -"$ c #7E9C59", -"% c #5F8472", -"& c #5C8174", -"* c #68866D", -"= c #6B8D6D", -"- c #709060", -"; c #71916B", -": c #6A8E74", -"> c #6E917C", -", c #749076", -"< c #70907A", -"1 c #79957B", -"2 c #9BAE2A", -"3 c #9CAF29", -"4 c #9CAF2D", -"5 c #9DB029", -"6 c #9EB12A", -"7 c #9FB22A", -"8 c #9DB02D", -"9 c #8FA639", -"0 c #98AE36", -"q c #9DB133", -"w c #A0B32B", -"e c #A1B42B", -"r c #A1B42C", -"t c #A2B52C", -"y c #A2B52D", -"u c #A3B62D", -"i c #A1B42F", -"p c #A4B72E", -"a c #A6B92F", -"s c #A2B634", -"d c #A7BA30", -"f c #A5B933", -"g c #A7BB34", -"h c #A8BB30", -"j c #A8BB31", -"k c #AABD32", -"l c #A9BD35", -"z c #ABBF39", -"x c #ADC034", -"c c #AEC135", -"v c #AFC235", -"b c #ADC037", -"n c #B0C336", -"m c #B2C537", -"M c #B2C538", -"N c #B4C739", -"B c #B5C839", -"V c #B5C83A", -"C c #B6C93A", -"Z c #B8CB3B", -"A c #B9CC3C", -"S c #BBCE3E", -"D c #BCCF3E", -"F c #BDD03F", -"G c #829D50", -"H c #849C57", -"J c #829C5D", -"K c #89A242", -"L c #8AA24C", -"P c #90A848", -"I c #97AD49", -"U c #97AE4B", -"Y c #91A84F", -"T c #9FB541", -"R c #9CB046", -"E c #9BB34F", -"W c #8EA852", -"Q c #8EA857", -"! c #83A05E", -"~ c #87A35E", -"^ c #89A45D", -"/ c #90A85E", -"( c #9CB350", -") c #A3B84B", -"_ c #A3BC59", -"` c #A5BA5E", -"' c #819A60", -"] c #849D71", -"[ c #829C7B", -"{ c #88A161", -"} c #8CA464", -"| c #8EA969", -" . c #94AF65", -".. c #94AE66", -"X. c #90AC68", -"o. c #9AB06C", -"O. c #88A773", -"+. c #8EA772", -"@. c #9EBA76", -"#. c #A3B860", -"$. c #A2BB6A", -"%. c #AEC247", -"&. c #ABC24E", -"*. c #B1C74F", -"=. c #BFD344", -"-. c #B5CB53", -";. c #BFD356", -":. c #AAC472", -">. c #AEC47C", -",. c #C0D341", -"<. c #204985", -"1. c #204A86", -"2. c #234C87", -"3. c #204B88", -"4. c #214B88", -"5. c #214B89", -"6. c #214C88", -"7. c #214C89", -"8. c #224C88", -"9. c #224C89", -"0. c #234D8A", -"q. c #254E89", -"w. c #254F8B", -"e. c #264F8A", -"r. c #295181", -"t. c #2F5786", -"y. c #2A538D", -"u. c #365C82", -"i. c #305788", -"p. c #2F5790", -"a. c #375E94", -"s. c #3A6096", -"d. c #3C6399", -"f. c #3465A4", -"g. c #3868A6", -"h. c #3969A7", -"j. c #406484", -"k. c #43688B", -"l. c #4E728F", -"z. c #537C87", -"x. c #50798A", -"c. c #446890", -"v. c #41679C", -"b. c #456A9E", -"n. c #467294", -"m. c #4F7896", -"M. c #507396", -"N. c #557F9F", -"B. c #406FAB", -"V. c #4472A4", -"C. c #4C71A3", -"Z. c #4C70A4", -"A. c #4F73A5", -"S. c #4F74A6", -"D. c #4170AC", -"F. c #4C77AF", -"G. c #4E78AF", -"H. c #5276A8", -"J. c #527EAC", -"K. c #4875B0", -"L. c #4976B1", -"P. c #4977B1", -"I. c #507CB5", -"U. c #517DB6", -"Y. c #527EB6", -"T. c #678B8E", -"R. c #6C8E8B", -"E. c #719484", -"W. c #779885", -"Q. c #7B9983", -"!. c #779588", -"~. c #77968D", -"^. c #698E90", -"/. c #769A9C", -"(. c #5C80AF", -"). c #5C85AF", -"_. c #5681B3", -"`. c #5782B3", -"'. c #5F82B1", -"]. c #5B82B5", -"[. c #5C83B6", -"{. c #5F86B7", -"}. c #5782BA", -"|. c #5984BB", -" X c #5B86BC", -".X c #5C87BD", -"XX c #5D87BD", -"oX c #5F89BE", -"OX c #6B91A2", -"+X c #6083B1", -"@X c #6284B3", -"#X c #6385B4", -"$X c #698AB7", -"%X c #6087B8", -"&X c #608ABF", -"*X c #618BBF", -"=X c #6B8FB9", -"-X c #698DBB", -";X c #6A8DBB", -":X c #6C8EBA", -">X c #7697BA", -",X c #7092BF", -".SX$Xb.0.IXIXIXIXIXIXIX", -"IXIXIXIXIXIXu.[ jXvXI g lXGXLXZXxXt.w.IXIXIXIXIX", -"IXIXIXIXIXj.o.MXdXyX| SXVXSXbX$.%.` l.1.IXIXIXIX", -"IXIXIXIXr.R ( ..B 1XsXKXDXfXnX@.C k ) t.IXIXIXIX", -"IXIXIX9.' t h z fX1XsXKXPXCX,.=.B n a X.9.IXIXIX", -"IXIXIXu.4 t f /.8XyXsXsXPX,.BXfX_ n a t c.IXIXIX", -"IXIXIX* 7 q W.2X6X9XyXuXaX:.-.gXzX| h t , IXIXIX", -"IXIX3.H ~.J.`.|.*X6X9XeXkXF F A m E s ^ ] 9.IXIX", -"IXIX9.{ J N.U.}.oX*X6X6X*.F A C m k ~ 8 mX1.IXIX", -"IXIX9.@XT.; > E.). XoX*X&.A C m x f P > qX9.IXIX", -"IXIXIXS.{.V.0 t Q _.}.|.OX .O.x k f t R.+X4.IXIX", -"IXIXIXd.-Xx.7 t f U ^.U.Y.Y.I.T h t G #XZ.IXIXIX", -"IXIXIXw.XM.1.IXIXIXIXIXIX", -"IXIXIXIXIXIXIXX w.a.Z.+X@XA.s.e.o IXIXIXIXIXIXIX", -"IXIXIXIXIXIXIXIXIXIX + + . IXIXIXIXIXIXIXIXIXIX", -"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX", -"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX", -"IXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIXIX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_new.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_new.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_new.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_new.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,254 +0,0 @@ -/* XPM */ -static char *document_new__[] = { -/* columns rows colors chars-per-pixel */ -"24 24 224 2 ", -" c #008800", -". c #009500", -"X c #009900", -"o c #029B02", -"O c #009C00", -"+ c #009D00", -"@ c #0F950F", -"# c #099C09", -"$ c #00A000", -"% c #00A200", -"& c #06A100", -"* c #09A400", -"= c #0AA700", -"- c #03AA00", -"; c #06AD00", -": c #0CA900", -"> c #0BAF00", -", c #0FAC00", -"< c #0DAE0A", -"1 c #0EA80F", -"2 c #1FAC00", -"3 c #00B100", -"4 c #01B100", -"5 c #03B100", -"6 c #00B300", -"7 c #02B201", -"8 c #02B102", -"9 c #06B200", -"0 c #00B501", -"q c #07B400", -"w c #09B109", -"e c #18B300", -"r c #18BA00", -"t c #10A710", -"y c #1BA71C", -"u c #1DA81D", -"i c #11B311", -"p c #14B514", -"a c #26B300", -"s c #2CB100", -"d c #29BF00", -"f c #32B400", -"g c #21A921", -"h c #21AB21", -"j c #2FAF2F", -"k c #26B620", -"l c #24B024", -"z c #24B025", -"x c #29B129", -"c c #2CB12C", -"v c #37BA20", -"b c #33AF33", -"n c #37AC37", -"m c #32B132", -"M c #37BB37", -"N c #39BC39", -"B c #45AC00", -"V c #41BA00", -"C c #4DBC00", -"Z c #5AB200", -"A c #4EAF22", -"S c #45BC28", -"D c #5AB322", -"F c #44C800", -"G c #54C100", -"H c #59C128", -"J c #47B647", -"K c #43B843", -"L c #44B944", -"P c #54A454", -"I c #59A859", -"U c #78A778", -"Y c #73BB73", -"T c #4ACE49", -"R c #51D049", -"E c #69CD4E", -"W c #73D04E", -"Q c #69DC5B", -"! c #77DF5B", -"~ c #7ED47E", -"^ c #7ED57E", -"/ c #7DDD7C", -"( c #84D97F", -") c #80DC7C", -"_ c #88DA7F", -"` c #A5B5A5", -"' c #A9B8A9", -"] c #ADB2B4", -"[ c #B2B6B8", -"{ c #B8BABB", -"} c #BBBDBD", -"| c #BFBFBF", -" . c #85C686", -".. c #8FCD8C", -"X. c #90CE8C", -"o. c #96CF8C", -"O. c #98D08C", -"+. c #9BD78C", -"@. c #9ED88C", -"#. c #9EC29E", -"$. c #99DD99", -"%. c #99DE99", -"&. c #ACC3AC", -"*. c #B8C4B8", -"=. c #B9C5B9", -"-. c #CAE6BF", -";. c #CDE4BF", -":. c #CFE7BF", -">. c #D2E6BF", -",. c #BFC1C0", -"<. c #BFC3C4", -"1. c #C1C1C2", -"2. c #C1C2C2", -"3. c #C2C2C3", -"4. c #C2C3C3", -"5. c #C3C3C3", -"6. c #C3C4C4", -"7. c #C3C5C4", -"8. c #C4C4C4", -"9. c #C4C5C5", -"0. c #C4C5C6", -"q. c #C8C6C8", -"w. c #C8C9C9", -"e. c #C9C9C9", -"r. c #C9CACB", -"t. c #CACACA", -"y. c #CACACB", -"u. c #CBCBCB", -"i. c #CFCFCF", -"p. c #C1D7C1", -"a. c #D4D4D5", -"s. c #D7D8D7", -"d. c #D7D7D8", -"f. c #DBDBDB", -"g. c #DBDBDC", -"h. c #DDDEDD", -"j. c #DDDDDE", -"k. c #DCDDDF", -"l. c #DDDEDF", -"z. c #DEDEDE", -"x. c #CAE6C3", -"c. c #CDE4C3", -"v. c #CFE7C3", -"b. c #C8EBC6", -"n. c #C9ECC6", -"m. c #D0E6C0", -"M. c #D0E5C3", -"N. c #D4E7C0", -"B. c #D0E6C6", -"V. c #D3E7C6", -"C. c #D3ECC3", -"Z. c #D7EDC3", -"A. c #D3E6D4", -"S. c #D8EED1", -"D. c #DAEFD1", -"F. c #D9E5DA", -"G. c #DAE5DA", -"H. c #DFE8DF", -"J. c #E4E4E4", -"K. c #E7E7E7", -"L. c #E0E9E1", -"P. c #E7E8E8", -"I. c #E8E8E8", -"U. c #E8E9EA", -"Y. c #E9E9EA", -"T. c #E9EAEA", -"R. c #EAEAEB", -"E. c #EAEBEB", -"W. c #EBEBEB", -"Q. c #EAEBEC", -"!. c #EBEBEC", -"~. c #EBECEC", -"^. c #ECECEC", -"/. c #ECECED", -"(. c #ECEDED", -"). c #EDEDED", -"_. c #ECEEED", -"`. c #EDEEED", -"'. c #EEECEE", -"]. c #EDEEEE", -"[. c #EDEEEF", -"{. c #EEEEEE", -"}. c #EEEFEF", -"|. c #F2F7EF", -" X c #F3F8EF", -".X c #F0EEF0", -"XX c #EFF0F0", -"oX c #F0F0F0", -"OX c #F1F1F0", -"+X c #F0F0F1", -"@X c #F0F1F1", -"#X c #F1F1F1", -"$X c #F1F2F2", -"%X c #F2F2F2", -"&X c #F2F2F3", -"*X c #F2F3F3", -"=X c #F2F7F0", -"-X c #F3F3F4", -";X c #F3F4F4", -":X c #F4F4F4", -">X c #F5F4F4", -",X c #F4F5F5", -"XG.u $ X.-.:.|.|.>.:.O.= $ ", -"sXsXsX^.XXXXXX*X,X,X,XL.c 3 , f B m.N.Z C a 9 + ", -"sXsXsX^.+X+X+X+X,X,XqX`.Y 3 q d V C.Z.G F r 3 ", -"sXsXsXXX+X+X,X>X,X,XqXwXp.c 0 , 2 +.@.s e 3 + sX", -"sXsXsX^.%X%X>X,X6XqXwXeX.X#.x 0 - = : > 3 + sXsX", -"sXsXsXXX%X,X,X6X6XeXeXeXuX^.&.I z i p z P sXsXsX", -"sXsXsX+X,X,X6X6XwXwXwXuXwXiX,Xh.*.` ' *.s.sXsXsX", -"sXsXsX+X,X,X6XwXwXwXuXwXiXiXiXuXiXwXwXeX,XsXsXsX", -"sXsXsX+X,X0XwXwXuXuXuXiXiXiXiXiXiXiXiXiX9XsXsXsX", -"sXsXsX%X,X,XwXwXiXwXiXiXiXiXiXiXeXwX6X,X^.sXsXsX", -"sXsXsX+X5XqXqXrXwXiXiXiXiXiXiXwX+XJ.f.h.<.sXsXsX", -"sXsXsX%X5XqXrXrXiXwXiXiXiXiXwX^.a.i.f.{ sXsXsXsX", -"sXsXsX%X5XrXrXrXiXiXiXiXiXiX+Xa.f.+X,.sXsXsXsXsX", -"sXsXsX%X5XrXrXrXiXiXiXiXiXwXI.u.h.0.sXsXsXsXsXsX", -"sXsXsX+XqXrXrXrXiXiXiXiXiX,Xh.u.} sXsXsXsXsXsXsX", -"sXsXsX,XrXrXuXuXiXiXiXiXiX9Xl.[ sXsXsXsXsXsXsXsX", -"sXsXsX6.w.t.u.u.t.u.u.u.u.q.] sXsXsXsXsXsXsXsXsX", -"sXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_open.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_open.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_open.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_open.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,275 +0,0 @@ -/* XPM */ -static char *document_open__[] = { -/* columns rows colors chars-per-pixel */ -"24 24 245 2 ", -" c #364B65", -". c #6D6F6C", -"X c #616973", -"o c #6E7176", -"O c #717171", -"+ c #717370", -"@ c #767875", -"# c #777876", -"$ c #74777A", -"% c #787878", -"& c #7C7E7B", -"* c #797B7D", -"= c #7F7F7F", -"- c #2F588C", -"; c #325C91", -": c #345F95", -"> c #345F96", -", c #37659F", -"< c #3E6FAB", -"1 c #3F6EAC", -"2 c #797E83", -"3 c #4070AB", -"4 c #4B74A8", -"5 c #5B7EA9", -"6 c #4B77B0", -"7 c #4F7CB3", -"8 c #7F8082", -"9 c #7B8A9C", -"0 c #79899E", -"q c #5380B6", -"w c #5A83B7", -"e c #5D84B6", -"r c #6883A5", -"t c #6080A8", -"y c #6383AA", -"u c #7187A3", -"i c #778AA2", -"p c #6286B3", -"a c #6086B5", -"s c #6489B6", -"d c #6489B7", -"f c #658AB7", -"g c #608CBD", -"h c #638EBF", -"j c #638FBF", -"k c #648FBF", -"l c #688DBB", -"z c #698FBF", -"x c #6B90BE", -"c c #6C91BE", -"v c #6D91BF", -"b c #7999BF", -"n c #648FC0", -"m c #6490C0", -"M c #6591C1", -"N c #6591C2", -"B c #6692C2", -"V c #6996C9", -"C c #6E98C8", -"Z c #6F9BCB", -"A c #6B9ACE", -"S c #6C9BCE", -"D c #6D9BCE", -"F c #6D9CCE", -"G c #6E9CCE", -"H c #6F9DCF", -"J c #7297C4", -"K c #7C9CC4", -"L c #7D9EC7", -"P c #759DCB", -"I c #709ECF", -"U c #719ECF", -"Y c #789CC8", -"T c #709DD0", -"R c #729FD0", -"E c #76A0CC", -"W c #7DA1CB", -"Q c #77A3D2", -"! c #7BA5D3", -"~ c #7DA5D1", -"^ c #7DA6D1", -"/ c #7EA6D1", -"( c #7CA5D3", -") c #7DA6D3", -"_ c #7FA7D2", -"` c #7BA5D4", -"' c #7CA5D4", -"] c #7CA6D4", -"[ c #858584", -"{ c #868785", -"} c #858687", -"| c #8A8A89", -" . c #8A8B89", -".. c #8C8D8A", -"X. c #8E8F8D", -"o. c #8F8F8E", -"O. c #808D9E", -"+. c #838F9E", -"@. c #959492", -"#. c #959694", -"$. c #979694", -"%. c #979896", -"&. c #90959B", -"*. c #93999D", -"=. c #95989C", -"-. c #989898", -";. c #9B9A99", -":. c #9A9B99", -">. c #9B9C9A", -",. c #9C9D9B", -"<. c #9D9D9D", -"1. c #9E9F9D", -"2. c #9E9E9E", -"3. c #9F9E9E", -"4. c #9F9F9E", -"5. c #9F9F9F", -"6. c #A0A19F", -"7. c #8A94A0", -"8. c #969CA0", -"9. c #979DA4", -"0. c #A1A1A1", -"q. c #A2A2A1", -"w. c #A2A2A2", -"e. c #A3A3A3", -"r. c #A3A4A2", -"t. c #A4A4A3", -"y. c #A5A5A5", -"u. c #A6A6A6", -"i. c #A7A7A7", -"p. c #A8A8A8", -"a. c #A9AAA8", -"s. c #AAABA9", -"d. c #ABABAB", -"f. c #ACACAC", -"g. c #AFAFAF", -"h. c #AAAFB5", -"j. c #AAB0B5", -"k. c #ABB0B5", -"l. c #B6B6B5", -"z. c #B6B6B6", -"x. c #B0B5BB", -"c. c #B9B9B8", -"v. c #B9BAB9", -"b. c #BCBCBB", -"n. c #BCBDBC", -"m. c #BFBFBF", -"M. c #82A2CA", -"N. c #84A7CE", -"B. c #89A8CD", -"V. c #8BAACF", -"C. c #80A8D3", -"Z. c #87A8D0", -"A. c #80A9D5", -"S. c #83AAD5", -"D. c #84ACD6", -"F. c #86ADD7", -"G. c #87ADD7", -"H. c #87AED8", -"J. c #88AED8", -"K. c #8CB0D7", -"L. c #8AB0D8", -"P. c #8BB0D9", -"I. c #8CB2D9", -"U. c #8EB2D9", -"Y. c #8EB3D9", -"T. c #8EB2DA", -"R. c #8EB3DA", -"E. c #90B3DA", -"W. c #91B4DA", -"Q. c #92B5DA", -"!. c #92B5DB", -"~. c #93B5DB", -"^. c #92B6DB", -"/. c #93B6DB", -"(. c #94B5DB", -"). c #94B6DB", -"_. c #95B7DC", -"`. c #96B7DC", -"'. c #97B8DB", -"]. c #97B8DC", -"[. c #97B8DD", -"{. c #97B9DD", -"}. c #99B8DC", -"|. c #98B8DD", -" X c #9ABADD", -".X c #9ABBDD", -"XX c #9ABADE", -"oX c #9BBBDE", -"OX c #9CBBDD", -"+X c #9CBBDE", -"@X c #A1BFE0", -"#X c #A1C0E0", -"$X c #A4C2E1", -"%X c #A5C2E1", -"&X c #A5C3E1", -"*X c #A6C2E1", -"=X c #A5C2E2", -"-X c #A7C4E2", -";X c #A8C4E2", -":X c #A8C4E3", -">X c #AAC5E2", -",X c #ABC6E3", -".CXVXVXVXVXNXxXwXi.@ AXAXAXAXAXAX", -"AXAXAXAXAXAXAX%.xXjXpX7X5Xm.m.7XgX3X# AXAXAXAXAX", -"AXAX-.9.3.3.[ ;.NXxXyXv.v.v.n.iXuXuXe.+ AXAXAXAX", -"AX= p.l.s.s.X.>.jXxXyXl.l.l.n.jXaX8Xm...AXAXAXAX", -"AX% p.p.i.i.| 3.5XgXsX8X9X7X9XyXyXeXfX#.AXAXAXAX", -"AXO e.i.q.q.{ 6.ZXCXfX3X3X5X5X3X3X9XNX>.AXAXAXAX", -"AXAX6.q.*.&.2 8.nXbXqXh.k.k.k.k.h.x.vX*.AXAXAXAX", -"AXAX3.9.y p p f v v l d d d d d d f x d e 7 AXAX", -"AXAX-.7.K >X:X&X&X&X&X&X&X&X&X&X&X&X$X$X>XN.AXAX", -"AXAX#.+.K @XY.U.U.U.U.U.Y.U.U.U.Y.Y.Y.Y.^.W AXAX", -"AXAX#.+.L &X(.~.~.~.~.~.^.^.^.^.~.~.~.P.^.Y AXAX", -"AXAXX.9 M.;X(. X{.{.{.{.{.{.{.{.{.(.P.D.'.J AXAX", -"AXAX| 0 V.&X X XoXoX+X+X X X X X XU.J.G.+Xz AXAX", -"AXAX} i V.@X{.{.{._.(.~.^.E.U.P.J.G.G.G.'.w AXAX", -"AXAX8 u Z.^.G.S._ _ ` ` ` ` ` ` ] ] ] ] K.6 AXAX", -"AXAX* r P Q I G H G H H H I H H I I G Q ~ < AXAX", -"AXAX$ t V G A A G G A G F G F G G G G G Z 1 AXAX", -"AXAXo 5 E ~ ~ ~ ~ ~ ~ ~ ~ _ ~ _ _ _ C.C.Z 3 AXAX", -"AXAXX 4 e d g g j k n m k k k g m m k k 7 , AXAX", -"AXAX ; , , ; , : : : : , ; , , , : : , - AXAXAX", -"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX", -"AXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAXAX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_paste.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_paste.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_paste.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_paste.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,183 +0,0 @@ -/* XPM */ -static char *edit_paste__[] = { -/* columns rows colors chars-per-pixel */ -"24 24 153 2 ", -" c #313131", -". c #393939", -"X c #3A3A3A", -"o c #3B3B3B", -"O c #444444", -"+ c #474747", -"@ c #4A4A4A", -"# c #4B4C4B", -"$ c #4C4C4C", -"% c #4D4D4D", -"& c #4E4E4E", -"* c #4F4F4F", -"= c #505050", -"- c #515151", -"; c #525252", -": c #535353", -"> c #545454", -", c #555555", -"< c #565656", -"1 c #575757", -"2 c #585858", -"3 c #595959", -"4 c #5A5A5A", -"5 c #5B5B5B", -"6 c #5C5C5C", -"7 c #5D5D5D", -"8 c #5E5E5E", -"9 c #5F5F5F", -"0 c #606060", -"q c #616161", -"w c #626262", -"e c #636363", -"r c #646464", -"t c #656565", -"y c #666665", -"u c #666666", -"i c #676767", -"p c #686868", -"a c #696969", -"s c #6A6A6A", -"d c #6B6B6B", -"f c #6C6C6C", -"g c #6D6D6D", -"h c #6E6E6E", -"j c #6F6F6F", -"k c #707070", -"l c #717070", -"z c #717171", -"x c #727272", -"c c #737373", -"v c #747474", -"b c #757575", -"n c #767676", -"m c #767776", -"M c #777777", -"N c #787878", -"B c #797979", -"V c #7A7A7A", -"C c #7B7B7B", -"Z c #7D7D7D", -"A c #7E7E7E", -"S c #7F7F7F", -"D c #818181", -"F c #828282", -"G c #868686", -"H c #878787", -"J c #898989", -"K c #8C8C8C", -"L c #8F8F8F", -"P c #969696", -"I c #989898", -"U c #999999", -"Y c #9A9A9A", -"T c #9B9B9B", -"R c #9C9C9C", -"E c #9E9E9E", -"W c #9F9F9F", -"Q c #A3A3A3", -"! c #A4A4A4", -"~ c #A5A5A5", -"^ c #A7A7A7", -"/ c #A8A8A8", -"( c #A9A9A9", -") c #AAAAAA", -"_ c #ABABAB", -"` c #ADADAD", -"' c #AEAEAE", -"] c #B0B0B0", -"[ c #B1B1B1", -"{ c #B2B2B2", -"} c #B4B4B4", -"| c #B6B6B6", -" . c #B7B7B7", -".. c #BDBDBD", -"X. c #C0C0C0", -"o. c #C2C2C2", -"O. c #C3C4C3", -"+. c #C4C4C4", -"@. c #C7C7C7", -"#. c #C8C8C8", -"$. c #C9C9C9", -"%. c #CBCBCB", -"&. c #CDCDCC", -"*. c #CDCECE", -"=. c #CECFCE", -"-. c #D2D2D3", -";. c #D3D4D4", -":. c #D4D4D4", -">. c #D4D5D5", -",. c #D5D6D6", -"<. c #D6D6D6", -"1. c #D7D8D7", -"2. c #D4D7D9", -"3. c #D8D8D8", -"4. c #D8D8D9", -"5. c #D9D9D9", -"6. c #D9DADA", -"7. c #DADADA", -"8. c #DCDCDC", -"9. c #DCDDDE", -"0. c #DFDFDF", -"q. c #E5E5E5", -"w. c #EBEEEF", -"e. c #EDEDED", -"r. c #EFEFEF", -"t. c #EFF0F0", -"y. c #F0F0F0", -"u. c #F1F1F1", -"i. c #F1F2F2", -"p. c #F1F2F3", -"a. c #F2F2F2", -"s. c #F3F2F2", -"d. c #F3F3F2", -"f. c #F2F3F3", -"g. c #F3F3F3", -"h. c #F3F4F4", -"j. c #F4F4F4", -"k. c #F4F5F5", -"l. c #F5F5F5", -"z. c #F6F6F6", -"x. c #F7F7F7", -"c. c #F7F8F8", -"v. c #F8F8F8", -"b. c #F8F9F9", -"n. c #F9F9F9", -"m. c #FAFAFA", -"M. c #FBFBFB", -"N. c #FBFCFC", -"B. c #FCFCFC", -"V. c #FDFDFD", -"C. c #FEFEFE", -"Z. c #FFFFFF", -"A. c None", -/* pixels */ -"A.A.A.A.A.A.A.A.8.7.<.<.<.A.A.A.A.A.A.A.A.A.A.A.", -"A.A.A.A.A.A.A.K Y Y Y Y P J A.A.A.A.A.A.A.A.A.A.", -"A.A.D G G G E %.%.@.@.o.....P N Z C N A.A.A.A.A.", -"A.A.P Q ~ ~ | u.r.r.r.r.u.u.| ~ ' ' W A.A.A.A.A.", -"A.A.D Z Z Z D E Y E Y Y Y Y z a p u p j A.A.A.A.", -"A.A.N Z Z N v z z z z g g g z z z j g g A.A.A.A.", -"A.A.N Z N v z { u.u.t.r.t.r.u.r.r.r.r.j.b.M.8.A.", -"A.A.v v v v g | b.u.h.u.z.z.z.z.v.v.v.v.b.M.0.A.", -"A.A.z v z z a { b.h.u.z.z.z.b.v.b.M.b.b.M.M.0.A.", -"A.A.g z g g u { b.h.z.z.z.b.b.b.b.b.M.M.M.B.0.A.", -"A.A.a g g a u { B.z.z.b.b.b.b.M.B.B.B.B.M.B.q.A.", -"A.A.a a a a 6 { B.z.z.b.M.M.M.M.B.B.B.B.B.B.8.A.", -"A.A.u a u u 5 ` B.v.b.b.M.M.M.M.B.B.B.B.B.B.0.A.", -"A.A.q u q q 4 ` B.b.M.M.M.M.M.M.B.B.B.B.B.B.0.A.", -"A.A.6 q 9 6 < _ B.B.b.B.B.B.M.B.B.B.B.B.B.B.0.A.", -"A.A.6 6 6 4 : ` B.M.B.B.B.B.B.B.B.B.B.B.B.B.8.A.", -"A.A.< 4 4 < ; ^ B.B.B.B.B.B.B.B.B.B.z.z.u.u.2.A.", -"A.A.< 4 < : & ~ B.B.B.B.B.B.B.B.B.z.q.7.7.-.A.A.", -"A.A.; < ; ; @ ~ B.B.B.B.B.B.B.B.z.1.=.7.=.A.A.A.", -"A.A.* ; ; & + Q B.B.B.B.B.B.B.b.q.@.u.<.A.A.A.A.", -"A.A.& ; & & O Q B.B.B.B.B.B.B.u.<.;.@.v A.A.A.A.", -"A.A.. . . . Y B.B.B.B.B.B.B.r.-.{ # A.A.A.A.A.", -"A.A.A.A.A.A.A.~ B.B.B.B.B.B.B.w.*.u A.A.A.A.A.A.", -"A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_print.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_print.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_print.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_print.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,169 +0,0 @@ -/* XPM */ -static char *document_print__[] = { -/* columns rows colors chars-per-pixel */ -"24 24 139 2 ", -" c #555753", -". c #585A56", -"X c #5E605C", -"o c #5F625E", -"O c #6E726C", -"+ c #71736D", -"@ c #71736E", -"# c #73746F", -"$ c #747671", -"% c #767874", -"& c #797B76", -"* c #7B7D77", -"= c #7A7E77", -"- c #7B7D78", -"; c #80817C", -": c #80827D", -"> c #2C558F", -", c #35629B", -"< c #3A649A", -"1 c #406AA3", -"2 c #4773A9", -"3 c #4975AC", -"4 c #5A7CAA", -"5 c #5E7EAC", -"6 c #4F7CB2", -"7 c #547FB3", -"8 c #5987BA", -"9 c #678AB7", -"0 c #6B8CB6", -"q c #6591C3", -"w c #6693C4", -"e c #6B95C8", -"r c #7DA0C9", -"t c #858783", -"y c #888A85", -"u c #8A8B87", -"i c #8B8E88", -"p c #8D8F89", -"a c #8D8F8A", -"s c #8F918A", -"d c #91938F", -"f c #939591", -"g c #959793", -"h c #989A95", -"j c #9A9B97", -"k c #9C9D99", -"l c #9C9F99", -"z c #9DA198", -"x c #9DA199", -"c c #9EA09B", -"v c #9FA29C", -"b c #A0A29D", -"n c #A0A29E", -"m c #A1A49F", -"M c #A2A49F", -"N c #A1A3A0", -"B c #A2A4A0", -"V c #A5A6A2", -"C c #A7A8A4", -"Z c #A9AAA6", -"A c #ABACA8", -"S c #ABAEA8", -"D c #ADAEAA", -"F c #ADB0AA", -"G c #B1B4AC", -"H c #B4B7B0", -"J c #B5B7B2", -"K c #B5B8B4", -"L c #B6B9B4", -"P c #B7B8B5", -"I c #B8BCB5", -"U c #B9BDB6", -"Y c #BABDB6", -"T c #BCBFB8", -"R c #BDC0B9", -"E c #D0C793", -"W c #EAE3A1", -"Q c #8BACD1", -"! c #9ABADD", -"~ c #A3BDDA", -"^ c #A2BEDF", -"/ c #A8C1DD", -"( c #BECFE4", -") c #BFD5E9", -"_ c #C2C3C1", -"` c #C3C3C2", -"' c #C3C6C0", -"] c #C7C8C3", -"[ c #C6C9C3", -"{ c #CCCECA", -"} c #CECFCC", -"| c #CFD1CA", -" . c #CFD1CB", -".. c #D3D7CF", -"X. c #D4D7D0", -"o. c #D7D8D5", -"O. c #DADAD8", -"+. c #DBDCD9", -"@. c #DBDCDA", -"#. c #DDDFDA", -"$. c #DFE0DD", -"%. c #C5D6E7", -"&. c #C5D8EB", -"*. c #C8DAED", -"=. c #CEDDED", -"-. c #CFDEEE", -";. c #CEDEEF", -":. c #D1DFEE", -">. c #CFE0EF", -",. c #E4E4E4", -"<. c #E6E6E6", -"1. c #E7E7E6", -"2. c #E6E8E4", -"3. c #E7E9E5", -"4. c #E8E9E6", -"5. c #E9EAE7", -"6. c #E9E9E8", -"7. c #EAEBE8", -"8. c #EBECE9", -"9. c #EEEFEC", -"0. c #F0F1EF", -"q. c #F0F2EF", -"w. c #F1F2EF", -"e. c #F1F2F0", -"r. c #F2F3F0", -"t. c #F3F3F2", -"y. c #F3F4F2", -"u. c #F4F4F3", -"i. c #F4F5F4", -"p. c #F6F6F5", -"a. c #F6F6F6", -"s. c #F8F8F8", -"d. c #F9F9F8", -"f. c #F9F9F9", -"g. c #FAFAF9", -"h. c #FBFBFB", -"j. c #FEFEFE", -"k. c #FFFFFF", -"l. c None", -/* pixels */ -"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.", -"l.l.l.l.l.l.l.l.l.l.l.e q l.l.l.l.l.l.l.l.l.l.l.", -"l.l.l.l.l.l.l.l.l.w Q -.-.r 7 l.l.l.l.l.l.l.l.l.", -"l.l.l.l.l.l.l.l.l.8 :.^ ! *.3 l.l.l.l.l.l.l.l.l.", -"l.l.l.l.l.l.l.l.l.6 -.~ / ) 1 l.l.l.l.l.l.l.l.l.", -"l.l.l.l.l.l.l.l.l.2 >.9 0 &., l.l.l.l.l.l.l.l.l.", -"l.l.l.l.l.l.l.l.l.< %.4 5 ( > l.l.l.l.l.l.l.l.l.", -"l.l.l.l.l.T U U L U I I U U L U U U T l.l.l.l.l.", -"l.l.l.l.l.S k.k.k.k.k.k.k.k.k.k.k.k.A l.l.l.l.l.", -"l.l.l.s y k k.8.7.7.5.8.7.7.7.7.8.k.k y p l.l.l.", -"l.l.l.B +.: <.{ { { { { { { { { } ,.: $.N l.l.l.", -"l.l.p h.[ U U U U U U Y Y U U U Y U U [ d.p l.l.", -"l.y O.d.T h.s.s.s.s.s.s.d.s.s.s.s.s.h.T d.@.y l.", -"l.t a.8.Y t.k.k.k.k.k.k.k.k.k.k.k.h.a.T 5.s.t l.", -"l.; d.$...Y Y U U U Y Y Y U U U Y Y Y ..W d.: l.", -"l.* a...X.X.X.X.X.X.X.X.X.X.X.X.......X.E a.- l.", -"l.& y...v d f f h j k v b n V C Z A D L ..y.& l.", -"l.% 0...L @ ` L F F F F F F F F L ` $ o...0.% l.", -"l.$ 9.5.G n d.3.2.2.2.2.2.2.2.2.5.s.b G 5.9.$ l.", -"l.@ @ * v t.k.k.h.k.k.k.k.k.k.h.k.k.y.z * @ @ l.", -"l.l.l.O U ' [ ] ] ] ] ] ] ] ] ] ] [ ' T O l.l.l.", -"l.l.l.o 5.t.0.0.0.t.0.y.0.0.t.0.0.0.0.1.X l.l.l.", -"l.l.l.o . . o l.l.l.", -"l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l.l." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_redo.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_redo.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_redo.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_redo.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,139 +0,0 @@ -/* XPM */ -static char *edit_redo[] = { -/* columns rows colors chars-per-pixel */ -"24 24 109 2 ", -" c #42770C", -". c #44770D", -"X c #44770E", -"o c #43780C", -"O c #43780D", -"+ c #44780D", -"@ c #44790D", -"# c #45790E", -"$ c #45790F", -"% c #46790F", -"& c #457A0E", -"* c #467A0E", -"= c #467A0F", -"- c #477A0F", -"; c #467B0F", -": c #477B0F", -"> c #477A10", -", c #477B10", -"< c #487C10", -"1 c #487C11", -"2 c #487C13", -"3 c #487B14", -"4 c #4C7E18", -"5 c #4D7E18", -"6 c #53841F", -"7 c #578723", -"8 c #578724", -"9 c #5D8A22", -"0 c #5D8B23", -"q c #5A8925", -"w c #618E2D", -"e c #638F2F", -"r c #669224", -"t c #67922B", -"y c #659231", -"u c #669232", -"i c #6D9734", -"p c #6C9738", -"a c #6E983B", -"s c #749B30", -"d c #749B32", -"f c #769E3A", -"g c #7EA238", -"h c #749D40", -"j c #749E42", -"k c #779F42", -"l c #779F44", -"z c #7CA140", -"x c #7EA340", -"c c #83A63D", -"v c #8AAF3F", -"b c #86A842", -"n c #89AA47", -"m c #8FAF4F", -"M c #8DB342", -"N c #8EB246", -"B c #8FB14E", -"V c #91B646", -"C c #92B747", -"Z c #92B748", -"A c #91B24E", -"S c #91B44D", -"D c #94B949", -"F c #95B84F", -"G c #97BB4F", -"H c #84A952", -"J c #88AB50", -"K c #8BAD51", -"L c #8BAD58", -"P c #94B650", -"I c #95B751", -"U c #94B652", -"Y c #97BA50", -"T c #98BA55", -"R c #9EBE5B", -"E c #92B461", -"W c #9EBD60", -"Q c #9DBC6B", -"! c #9DBB6C", -"~ c #A0BE64", -"^ c #A0BE65", -"/ c #A2BE73", -"( c #9DC157", -") c #A6C26D", -"_ c #A9C66C", -"` c #A6C170", -"' c #AEC977", -"] c #A9C379", -"[ c #ABC57A", -"{ c #ACC77C", -"} c #ADC77D", -"| c #AFCA79", -" . c #AEC87A", -".. c #AFC87D", -"X. c #AEC87E", -"o. c #B1C97F", -"O. c #B3CD7E", -"+. c #B0C981", -"@. c #B2CB81", -"#. c #B0C882", -"$. c #B2CA82", -"%. c #B2CC80", -"&. c #B7D087", -"*. c #B8D285", -"=. c #BAD28B", -"-. c #BBD48A", -";. c #BBD48B", -":. c #BED690", -">. c None", -/* pixels */ -">.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.>.>.O >.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.>.>.O 7 = >.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.>.>.O =.u , >.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.>.>.O :.-.h , >.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.1 1 3 -.( *.H , >.>.>.>.>.>.>.>.", -">.>.>.>.>.>.> h Q X.&._ D G O.E > >.>.>.>.>.>.>.", -">.>.>.>.= w .o.R G Z V V V Z ' ! = >.>.>.>.>.>.", -">.>.>.= t $.T N M M M N M M G %.l = >.>.>.>.>.>.", -">.>.>.2 [ U N R ) .$.W v I X.p > >.>.>.>.>.>.>.", -">.>.O z ^ B } L p 8 4 $.U } e = >.>.>.>.>.>.>.>.", -">.>.: J K ` i = >.>. $.] q = >.>.>.>.>.>.>.>.>.", -">.>.1 J P J = >.>.>. / 6 O >.>.>.>.>.>.>.>.>.>.", -">.>.= f K x > >.>.>.O 5 >.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.9 n g = >.>.>. >.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.= s b t = >.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.> s c 9 . >.>.>.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.= r g = >.>.>.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.O O . >.>.>.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.", -">.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_reload.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_reload.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_reload.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_reload.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,244 +0,0 @@ -/* XPM */ -static char *view_refresh[] = { -/* columns rows colors chars-per-pixel */ -"24 24 214 2 ", -" c #1A3B6A", -". c #1B3E70", -"X c #1C4073", -"o c #1C4074", -"O c #1D4377", -"+ c #1F477E", -"@ c #1F4781", -"# c #204883", -"$ c #214986", -"% c #204A86", -"& c #204A87", -"* c #214B87", -"= c #224C87", -"- c #214B88", -"; c #224B88", -": c #214C89", -"> c #224C88", -", c #234C88", -"< c #224C89", -"1 c #234C89", -"2 c #224D89", -"3 c #234D89", -"4 c #224C8A", -"5 c #224D8A", -"6 c #234D8A", -"7 c #244D89", -"8 c #254E88", -"9 c #254E89", -"0 c #244D8A", -"q c #244F8A", -"w c #244E8B", -"e c #254F8B", -"r c #264F8A", -"t c #264E8B", -"y c #264F8B", -"u c #244F8C", -"i c #264F8C", -"p c #24508B", -"a c #27508B", -"s c #25508D", -"d c #26518C", -"f c #27518C", -"g c #28528B", -"h c #29538C", -"j c #28528D", -"k c #29538E", -"l c #29538F", -"z c #2B5490", -"x c #2C5590", -"c c #2B5895", -"v c #2F5994", -"b c #335B95", -"n c #345C96", -"m c #345D97", -"M c #355E96", -"N c #335E9A", -"B c #305F9C", -"V c #356099", -"C c #31609C", -"Z c #32609C", -"A c #34609C", -"S c #37649C", -"D c #3B639A", -"F c #38639C", -"G c #3C659C", -"H c #3D669C", -"J c #3663A0", -"K c #3564A0", -"L c #3564A2", -"P c #3465A4", -"I c #3566A4", -"U c #3666A5", -"Y c #3B66A0", -"T c #3967A4", -"R c #3768A6", -"E c #3F6BA3", -"W c #3968A5", -"Q c #3868A6", -"! c #3969A7", -"~ c #3E6AA4", -"^ c #3A6BA8", -"/ c #3D6CA8", -"( c #3D6DA9", -") c #3F6DA9", -"_ c #3E6EAB", -"` c #3F70AC", -"' c #426CA3", -"] c #426DA4", -"[ c #436EA5", -"{ c #436EA7", -"} c #436FA7", -"| c #4170AB", -" . c #4270AA", -".. c #4370AB", -"X. c #4371AB", -"o. c #4670A9", -"O. c #4471AB", -"+. c #4170AC", -"@. c #4472AD", -"#. c #4773AD", -"$. c #4674AC", -"%. c #4474AF", -"&. c #4574AF", -"*. c #4B73A9", -"=. c #4873AB", -"-. c #4A75AB", -";. c #4E76AA", -":. c #4974AC", -">. c #557CAD", -",. c #4B77B0", -"<. c #4878B2", -"1. c #4979B3", -"2. c #4A79B3", -"3. c #4D7BB2", -"4. c #4E7CB3", -"5. c #4C7CB4", -"6. c #4D7CB5", -"7. c #4D7DB5", -"8. c #4E7DB5", -"9. c #4F7EB6", -"0. c #547DB1", -"q. c #5480B7", -"w. c #5980B1", -"e. c #5B81B3", -"r. c #5A82B5", -"t. c #5E83B4", -"y. c #5E86B6", -"u. c #5180B8", -"i. c #5280B8", -"p. c #5481B8", -"a. c #5483BA", -"s. c #5684BA", -"d. c #5985BA", -"f. c #5885BB", -"g. c #5986BA", -"h. c #5986BC", -"j. c #5987BC", -"k. c #5887BD", -"l. c #5987BD", -"z. c #5B89BE", -"x. c #5F89BD", -"c. c #5E8ABD", -"v. c #5C89BE", -"b. c #5C8ABF", -"n. c #6087B8", -"m. c #6188B9", -"M. c #6389B8", -"N. c #648BBC", -"B. c #658BBC", -"V. c #658DBD", -"C. c #668EBE", -"Z. c #678FBF", -"A. c #6890BF", -"S. c #6C91BF", -"D. c #5E8BC0", -"F. c #5F8CC1", -"G. c #5F8DC2", -"H. c #608EC2", -"J. c #618FC3", -"K. c #6590C2", -"L. c #6391C4", -"P. c #6492C5", -"I. c #6593C5", -"U. c #6792C4", -"Y. c #6593C6", -"T. c #6694C6", -"R. c #6794C7", -"E. c #6795C7", -"W. c #6990C0", -"Q. c #6A91C0", -"!. c #6992C1", -"~. c #6A92C1", -"^. c #6891C2", -"/. c #6E92C0", -"(. c #6E93C0", -"). c #6F95C3", -"_. c #6A95C6", -"`. c #6D95C4", -"'. c #6D96C5", -"]. c #6D96C7", -"[. c #6C98C9", -"{. c #7195C0", -"}. c #7396C2", -"|. c #7297C3", -" X c #7499C6", -".X c #749AC6", -"XX c #709AC9", -"oX c #739BC9", -"OX c #709BCA", -"+X c #709ACB", -"@X c #759CC8", -"#X c #779ECB", -"$X c #749DCC", -"%X c #769FCD", -"&X c #799DC8", -"*X c #799EC9", -"=X c #799FCB", -"-X c #7CA0CA", -";X c #78A2CF", -":X c #7BA3CF", -">X c #7EA2CC", -",X c #7CA2CE", -"X8XQ.g 3 g }., qXqX", -"qXqXqXqXqXn 3X7X[.E.E.P.P.J.G.G.oX*X' Q.3Xw qXqX", -"qXqXqXqXw >X;X_.P.+X>X4X4X=X].z.h.K.-X].&X$ qXqX", -"qXqXqXw t.X(.G k w G y.@Xc.a.d.u..X$ qXqX", -"qXqXqXb 4XP.L.@X>.3 qXqXqXqX4 *.oXa.0.6.].@ qXqX", -"qXqXqX;.[.G._.B.3 qXqXqXqXqXw M.D.0.6.1._.@ qXqX", -"qXqXp y.U.c.].G qXqXqXqXqX4 e.U.R.U.Z.Z.H.- qXqX", -"qXqX3 ^.D.z.].k qXqXqXqX4 @ - - @ @ @ - - - qXqX", -"qXqX3 Z.h.a.^.d qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqX4 0.h.u.c.m qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqX3 ] d.8.a.:.3 qXqXqXqXqXqXqX~ qXqXqXqXqXqXqX", -"qXqXqXv d.1.1.0.S 3 qXqXqXqX- S ] Z qXqXqXqXqXqX", -"qXqXqX3 o.8.&.&.3.{ z w w k .*.J B S m qXqXqXqX", -"qXqXqXqX3 ,.&.` _ _ @.&.o. .( I I T ' w qXqXqXqX", -"qXqXqXqXO d X.X.^ ^ R P I I I T +.:.k qXqXqXqX", -"qXqXqXqXqXX 3 N ( ^ I P I I / @.Y w . qXqXqXqXqX", -"qXqXqXqXqXqXqX$ p c N I W J m w @ qXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqX. + @ $ # o qXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX", -"qXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqXqX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_replace.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_replace.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_replace.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_replace.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -/* XPM */ -static char *edit_find_replace[] = { -/* columns rows colors chars-per-pixel */ -"24 24 100 2 ", -" c #32363A", -". c #363A3D", -"X c #494B4E", -"o c #4B4E51", -"O c #4F5357", -"+ c #56585C", -"@ c #5C5D5E", -"# c #5F6266", -"$ c #626364", -"% c #666768", -"& c #6C6F73", -"* c #967E56", -"= c #927F7C", -"- c #FB775A", -"; c #DE9E1B", -": c #E3A316", -"> c #E7A815", -", c #ECB11C", -"< c #DA9B27", -"1 c #DD9E28", -"2 c #C48D33", -"3 c #D69C37", -"4 c #DA9F37", -"5 c #DAA424", -"6 c #EDB721", -"7 c #EEB923", -"8 c #EFBE2C", -"9 c #EFC030", -"0 c #EFC63C", -"q c #D3A049", -"w c #D9A54D", -"e c #CEA25A", -"r c #E1AF4D", -"t c #DB8474", -"y c #CEA970", -"u c #F0CF52", -"i c #EBD061", -"p c #E7D373", -"a c #EAD77B", -"s c #7C7E81", -"d c #8D8D8E", -"f c #939494", -"g c #9B9998", -"h c #B2AE95", -"j c #B8AB96", -"k c #A5A5A4", -"l c #A8A7A7", -"z c #ACACAB", -"x c #B6B3AF", -"c c #AEAEB1", -"v c #B5B5B5", -"b c #BBBBBB", -"n c #CBAE82", -"m c #CAB698", -"M c #D0BB9B", -"N c #CDBEAA", -"B c #C6BFB6", -"V c #C0BFBF", -"C c #DFC790", -"Z c #E2D384", -"A c #ECDE93", -"S c #E1D798", -"D c #DED7A6", -"F c #DDD7AA", -"G c #C0C0B5", -"H c #DBCBB6", -"J c #D0C7BB", -"K c #D7D2B2", -"L c #EAE1A5", -"P c #C4C4C4", -"I c #C8C7C7", -"U c #CEC8C0", -"Y c #C7C7C8", -"T c #CDCDCC", -"R c #D0CFCE", -"E c #D3D2C5", -"W c #DBD9C4", -"Q c #D0D0CF", -"! c #CFCFD0", -"~ c #D0CFD0", -"^ c #CFD0D4", -"/ c #D4D3D3", -"( c #D8D7D7", -") c #DBDBD5", -"_ c #D7D7DA", -"` c #D8D7D8", -"' c #DCDBDB", -"] c #E0D6C9", -"[ c #E0DFDF", -"{ c #DCDDE1", -"} c #E4E4E4", -"| c #E8E7E7", -" . c #E5E6E9", -".. c #EBEBEC", -"X. c #EEEEF0", -"o. c #EFF0F0", -"O. c #F3F3F3", -"+. c #F7F7F8", -"@. c #FAFAFA", -"#. c None", -/* pixels */ -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.", -"#.#.#.( O.O.O.O.O.O.O.O.O.O.} T #.#.#.#.#.#.#.#.", -"#.#.#.' @.@.@.@.@.@.@.@.@.@.O.| / #.#.#.#.#.#.#.", -"#.#.#.' @.o.| | | | } [ } | } [ O.! #.#.#.#.#.#.", -"#.#.#.' +...' } Q v b v v b [ [ O...I #.#.#.#.#.", -"#.#.#.` +...} I v { o.O...Q z Y } | } v #.#.#.#.", -"#.#.#.( O.O.[ v ..@.+.+.@.@.( k T v z v g t - #.", -"#.#.#.( O...x / +.O.+.o.+.+.o.v I Y b G h = #.#.", -"#.#.#./ O. .l } o.o.o.o.o.X.X.Y v ' ) a 5 * #.#.", -"#.#.#./ o. .z ' ..o....... ...Y I ..A 6 2 #.#.#.", -"#.#.#.Q ..| v V . .{ . . . .c / L 6 w B #.#.#.", -"#.#.#.T ..' I l _ { { { { { b l F 8 4 ] ~ #.#.#.", -"#.#.#.T | [ Q d d P ^ ^ ^ c c J 0 1 H .T #.#.#.", -"#.#.#.I } / g X s b z l z b W u ; M } } I #.#.#.", -"#.#.#.I ' k o & T ^ Q ! ^ E i : n / ' } I #.#.#.", -"#.#.#.P z + # P Q Q ! ! T p > y / ( ' [ I #.#.#.", -"#.#.#.f $ + b / R R T T Z , e T R ~ ( ' P #.#.#.", -"#.#.#.@ O b ' ' ( ( ( S 6 q E ` ` ` ( ( P #.#.#.", -"#.#.$ O c ( / ( / ( D 8 3 J ( / ( / / ( V #.#.#.", -"#.% f ( / R / / K 0 < N / / / / / / / b #.#.#.", -"#.. #.b R R R Q T C r m Q R Q Q R R R / b #.#.#.", -"#.#.#.b R T T R x j J T T R R Q T R R Q b #.#.#.", -"#.#.#.g z z z z k l z z z z z z z z z z g #.#.#.", -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_save.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_save.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_save.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_save.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,233 +0,0 @@ -/* XPM */ -static char *document_save__[] = { -/* columns rows colors chars-per-pixel */ -"24 24 203 2 ", -" c #1F2324", -". c #272D2F", -"X c #282E30", -"o c #2E3436", -"O c #2F3537", -"+ c #353A3B", -"@ c #3B403F", -"# c #3D4241", -"$ c #3F4342", -"% c #3F4343", -"& c #424545", -"* c #424644", -"= c #434645", -"- c #454747", -"; c #454847", -": c #464A48", -"> c #494C4A", -", c #4B4D4B", -"< c #4C4F4C", -"1 c #4F514E", -"2 c #60615F", -"3 c #6C6F6C", -"4 c #6D6F6C", -"5 c #6A706C", -"6 c #6E706C", -"7 c #6E716D", -"8 c #6F726E", -"9 c #70726E", -"0 c #717470", -"q c #747672", -"w c #747673", -"e c #757874", -"r c #787A76", -"t c #4E9A06", -"y c #4F9C08", -"u c #529D0B", -"i c #539E0B", -"p c #549F0D", -"a c #559F11", -"s c #569F11", -"d c #59A113", -"f c #59A114", -"g c #59A016", -"h c #5EA519", -"j c #65A626", -"k c #66A727", -"l c #68AF26", -"z c #6CB12C", -"x c #7BBB3E", -"c c #79AE46", -"v c #7EB34B", -"b c #8AE234", -"n c #828B75", -"m c #91B869", -"M c #87C14F", -"N c #8CC852", -"B c #93E444", -"V c #99E64E", -"C c #9DC476", -"Z c #A0D66C", -"A c #A1D272", -"S c #A2D274", -"D c #ACEB70", -"F c #B5ED7F", -"G c #868883", -"H c #858884", -"J c #888A85", -"K c #888B85", -"L c #888A86", -"P c #898A86", -"I c #898B86", -"U c #8A8C87", -"Y c #8B8E88", -"T c #8E8F8C", -"R c #8E908A", -"E c #8E918B", -"W c #8F918B", -"Q c #8F928B", -"! c #8F908C", -"~ c #90918D", -"^ c #93948F", -"/ c #939590", -"( c #969792", -") c #969894", -"_ c #9D9F9A", -"` c #A9ABA7", -"' c #B1B2AF", -"] c #B1B3AF", -"[ c #B8B8B5", -"{ c #BBBEB7", -"} c #BCBEB8", -"| c #BCBFB8", -" . c #B4D197", -".. c #B7D49A", -"X. c #BAEE88", -"o. c #B5C5A4", -"O. c #B8C9A8", -"+. c #BDC0B9", -"@. c #BEC1BA", -"#. c #BFC2BB", -"$. c #BFC1BD", -"%. c #C1E49F", -"&. c #C4F098", -"*. c #C6F19C", -"=. c #C1CAB4", -"-. c #C0C2BC", -";. c #C1C3BD", -":. c #C1C4BE", -">. c #C2C5BF", -",. c #C3C5BF", -"<. c #C6CEBA", -"1. c #C9F1A2", -"2. c #C9F0A3", -"3. c #CCF2A7", -"4. c #CDF3A9", -"5. c #CFF3AB", -"6. c #CEF0AC", -"7. c #D0F3AD", -"8. c #D0F3AE", -"9. c #D3F4B2", -"0. c #D3F4B3", -"q. c #D4F2B6", -"w. c #D8F4BD", -"e. c #C4C6C0", -"r. c #C5C7C1", -"t. c #C6C9C3", -"y. c #C7C9C3", -"u. c #CACCC7", -"i. c #CBCDC7", -"p. c #C9CAC8", -"a. c #CBCDC8", -"s. c #CDCEC9", -"d. c #CED0CB", -"f. c #CFD0CB", -"g. c #D0D2CD", -"h. c #D1D4CC", -"j. c #D2D4CF", -"k. c #D3D4D1", -"l. c #D4D5D1", -"z. c #D4D4D3", -"x. c #D5D7D2", -"c. c #D5D6D3", -"v. c #D5D7D3", -"b. c #D6D7D3", -"n. c #D7DAD2", -"m. c #D7D9D4", -"M. c #D8D9D5", -"N. c #D8DAD6", -"B. c #D9DAD6", -"V. c #DADCD9", -"C. c #DBDCD9", -"Z. c #DBDDD9", -"A. c #DCDDD9", -"S. c #DCDCDA", -"D. c #DDDDDA", -"F. c #DDDEDA", -"G. c #DDDEDB", -"H. c #DEDFDB", -"J. c #DEDEDC", -"K. c #DEDFDC", -"L. c #DEF7C6", -"P. c #E0F7CA", -"I. c #E1F7CA", -"U. c #E1F7CC", -"Y. c #E3F7CF", -"T. c #E3F8CF", -"R. c #E2E9D7", -"E. c #E1E1DE", -"W. c #E0E0DF", -"Q. c #E2E2DF", -"!. c #E7F9D5", -"~. c #ECFADE", -"^. c #E1E2E0", -"/. c #E3E3E0", -"(. c #E3E4E1", -"). c #E3E4E2", -"_. c #E4E5E2", -"`. c #E5E6E3", -"'. c #E6E6E4", -"]. c #E6E7E4", -"[. c #E6E7E5", -"{. c #EAEAE8", -"}. c #EAEBE9", -"|. c #EBECE9", -" X c #ECECEB", -".X c #EDEDEB", -"XX c #EEEEEC", -"oX c #EFEFED", -"OX c #EFF0EE", -"+X c #F1F1EF", -"@X c #F1F1F0", -"#X c #F1F2F0", -"$X c #F2F2F1", -"%X c #F3F3F2", -"&X c #F4F5F4", -"*X c #F5F5F4", -"=X c #F5F6F5", -"-X c #F6F6F5", -";X c #F6F6F6", -":X c #F8F8F7", -">X c #FDFDFD", -",X c #FFFFFF", -"X*Xy L.4.F b 3.a R./.%X%X] X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X>X*XJ w 1 e - e = = w $ < 0 0 9 8 8 8 3 3 $ o c #E42B05", -", c #E5310B", -"< c #E73813", -"1 c #E33A16", -"2 c #FC3A11", -"3 c #FB3D15", -"4 c #C43921", -"5 c #C53C24", -"6 c #FF431B", -"7 c #FE451D", -"8 c #FD461F", -"9 c #FF461E", -"0 c #FF471F", -"q c #C7412C", -"w c #CA4128", -"e c #C9422B", -"r c #D14B33", -"t c #CA503A", -"y c #D8563E", -"u c #E04021", -"i c #E04A2E", -"p c #FC4620", -"a c #FF4921", -"s c #FD4822", -"d c #FC4923", -"f c #FF4A23", -"g c #FE4B25", -"h c #FD4E28", -"j c #FF512C", -"k c #FE532E", -"l c #E25233", -"z c #E85131", -"x c #F65231", -"c c #F95432", -"v c #F85E3E", -"b c #FC603F", -"n c #FF613F", -"m c #C34E41", -"M c #CF5944", -"N c #D95941", -"B c #DD5940", -"V c #F15F43", -"C c #DD614A", -"Z c #DF624B", -"A c #C86459", -"S c #D76855", -"D c #D36B5B", -"F c #E26047", -"G c #E1634A", -"H c #E56048", -"J c #E8664D", -"K c #E3694F", -"L c #E8694E", -"P c #FF6140", -"I c #FD6342", -"U c #FF6443", -"Y c #F76749", -"T c #FB6748", -"R c #E86E55", -"E c #ED6F59", -"W c #F36C51", -"Q c #F86E52", -"! c #E2735E", -"~ c #EF7259", -"^ c #FB7356", -"/ c #F27359", -"( c #FA7A5F", -") c #FB7A5F", -"_ c #FD795D", -"` c #FD7B5F", -"' c #D06F63", -"] c #CA7E6D", -"[ c #DB7B6A", -"{ c #EE7860", -"} c #EE7A63", -"| c #E27F69", -" . c #E77F69", -".. c #F37A61", -"X. c #F57860", -"o. c #F07C67", -"O. c #FF7C60", -"+. c #DA8070", -"@. c #DE8377", -"#. c #EF806A", -"$. c #EA826E", -"%. c #F3826B", -"&. c #F6856E", -"*. c #E28371", -"=. c #EA8370", -"-. c #E88A77", -";. c #EE8A76", -":. c #E98A78", -">. c #ED8E7B", -",. c #F78973", -"<. c #FC8970", -"1. c #FA8F77", -"2. c #FC8E77", -"3. c #F28D78", -"4. c #F38F7B", -"5. c #F78E78", -"6. c #F28F7D", -"7. c #ED917F", -"8. c #F8907B", -"9. c #EF9380", -"0. c #EE9D8E", -"q. c #F19583", -"w. c #F59986", -"e. c #F99884", -"r. c #F89985", -"t. c #F09889", -"y. c #F59A89", -"u. c #F49B89", -"i. c #F59B8A", -"p. c #F19D8C", -"a. c #F59E8C", -"s. c #F89D8A", -"d. c #F99D8A", -"f. c #ED9D92", -"g. c #E9A097", -"h. c #F6A291", -"j. c #F2A395", -"k. c #F2A597", -"l. c #F3A99A", -"z. c #F4A99A", -"x. c #E8AEA4", -"c. c #F0ACA1", -"v. c #F0AEA2", -"b. c #ECB3AA", -"n. c #EFB3AA", -"m. c #EFB5AB", -"M. c #EDB6AB", -"N. c #F2B1A4", -"B. c #F2B3A7", -"V. c #F0B4A9", -"C. c #F0BBB1", -"Z. c #EFC1B9", -"A. c None", -/* pixels */ -"A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.", -"A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.", -"A.A.A.A.A.A.A.= A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.", -"A.A.A.A.A.A.A.= A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.", -"A.A.= = = A.A.= = = = A.A.= = = A.A.A.A.A.A.A.A.", -"A.A.A.$ = A.A.$ A.A.= $ A.= A.A.A.A.A.A.A.A.A.A.", -"A.X @ # O A.A.O A.A.A.O O O A.A.A.A.A.A.A.A.A.A.", -"A.. A.A.. A.. . A.A.. . A.. A.A.A.A.A.; 5 A.A.A.", -"A.. . . . A.A.. . . . A.A.. . . A.A.A.e M 5 A.A.", -"A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.- r [ x.+.q A.", -"A.A.A.A.A.A.A.A.t A.A.A.A.A.A.A.w y *.M.Z.b.@.m ", -"A.A.A.A.A.A.A.Z ! B A.A.A.A.A.A.G -.V.C.M.V.f.A ", -"A.A.A.A.A.A.Z :.0.=.F A.A.A.A.R 7.N.B.c.c.f.' A.", -"A.A.A.A.A.H $.>.q.p.;.J A.A.{ q.z.l.k.j.t.D A.A.", -"A.A.A.A.A.E o.{ o.3.i.4.~ %.w.h.s.i.i.6.S A.A.A.", -"A.A.A.A.A.i Y W / ..&.w.d.d.e.8.4.,.X.N A.A.A.A.", -"A.A.A.A.A.A.u x v Y Q ) 2.<.) ^ T x : A.A.A.A.A.", -"A.A.A.A.A.A.A., 3 p g h j j g 8 2 > A.A.A.A.A.A.", -"A.A.A.A.A.A.A.A.< 7 7 6 a a a a 1 A.A.A.A.A.A.A.", -"A.A.A.A.A.A.A.A.A.z v n P U U l A.A.A.A.A.A.A.A.", -"A.A.A.A.A.A.A.A.A.A.L ` O.` K A.A.A.A.A.A.A.A.A.", -"A.A.A.A.A.A.A.A.A.A.A. .1.| A.A.A.A.A.A.A.A.A.A.", -"A.A.A.A.A.A.A.A.A.A.A.A.] A.A.A.A.A.A.A.A.A.A.A.", -"A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A.A." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_undo.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_undo.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/24x24/tm_undo.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/24x24/tm_undo.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,146 +0,0 @@ -/* XPM */ -static char *edit_undo[] = { -/* columns rows colors chars-per-pixel */ -"24 24 116 2 ", -" c #BF9D01", -". c #C29F00", -"X c #C4A000", -"o c #C4A100", -"O c #C5A200", -"+ c #C5A201", -"@ c #C6A200", -"# c #C6A201", -"$ c #C6A301", -"% c #C7A301", -"& c #C4A102", -"* c #C5A202", -"= c #C6A202", -"- c #C6A302", -"; c #C7A302", -": c #C7A402", -"> c #C7A403", -", c #C5A205", -"< c #C6A306", -"1 c #C7A404", -"2 c #C6A405", -"3 c #C7A406", -"4 c #C9A601", -"5 c #C8A504", -"6 c #C8A505", -"7 c #CFAF03", -"8 c #C7A508", -"9 c #C7A50B", -"0 c #C8A608", -"q c #CAA90F", -"w c #D5B508", -"e c #D6B808", -"r c #CAAA16", -"t c #CAAB19", -"y c #CDAD19", -"u c #CEAF1A", -"i c #CDAE1D", -"p c #D6B819", -"a c #D3B629", -"s c #D3B62F", -"d c #D7BB2A", -"f c #D5B92C", -"g c #D8BC2E", -"h c #D8BE38", -"j c #E0C405", -"k c #E7CD0C", -"l c #E9CF09", -"z c #ECD207", -"x c #EED60B", -"c c #F0D80F", -"v c #E3C816", -"b c #E1C61A", -"n c #E5CA18", -"m c #F0D917", -"M c #E0C52D", -"N c #E3C929", -"B c #EED72C", -"V c #F2DC25", -"C c #F3DD2B", -"Z c #F4DF2A", -"A c #F4DE2F", -"S c #EAD334", -"D c #F5E02E", -"F c #F4E032", -"G c #F6E132", -"H c #F6E134", -"J c #F5E036", -"K c #F5E136", -"L c #F7E236", -"P c #F6E238", -"I c #DAC144", -"U c #DDC647", -"Y c #E5CE43", -"T c #E0C84B", -"R c #E2CC5A", -"E c #F6E342", -"W c #F7E342", -"Q c #F6E243", -"! c #F8E443", -"~ c #F5E24D", -"^ c #F6E44C", -"/ c #F6E44E", -"( c #F6E550", -") c #F6E552", -"_ c #F7E653", -"` c #F9E652", -"' c #F7E75F", -"] c #EAD870", -"[ c #F1E061", -"{ c #F4E360", -"} c #F7E763", -"| c #F7E866", -" . c #F9EA70", -".. c #F8EA77", -"X. c #F4E67A", -"o. c #F8EB7F", -"O. c #F9EC7D", -"+. c #F8EC7E", -"@. c #EFDF80", -"#. c #F1E386", -"$. c #F9ED86", -"%. c #F7EA88", -"&. c #F8ED90", -"*. c #F8EC92", -"=. c #FAEF92", -"-. c #F7EC9E", -";. c #FBF19C", -":. c #F9F0A3", -">. c #FAF1A4", -",. c #FBF2A7", -"<. c #FBF2AB", -"1. c #FCF3AA", -"2. c #FAF1AC", -"3. c #FBF2AC", -"4. c #FDF4B4", -"5. c None", -/* pixels */ -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.X 5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.i , 5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.> s 2.9 5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.2 I <.4.9 5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.> R ,.` 1.t 6 6 5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.2 ] ;.! L .<.-.#.T 6 X 5.5.5.5.5.5.", -"5.5.5.5.5.X X.=.L G G G G W _ O.%.s X 5.5.5.5.5.", -"5.5.5.5.5., U >.^ D D D D D D D W ..d > 5.5.5.5.", -"5.5.5.5.5.5.> h :.( Z } %.$.| ( A J ' 9 5.5.5.5.", -"5.5.5.5.5.5.5.> a *.^ $.t y g Y } J W M > 5.5.5.", -"5.5.5.5.5.5.5.5.X y X.$.2 5.5.> p ^ A S 4 5.5.5.", -"5.5.5.5.5.5.5.5.5.5.q [ , 5.5.5.X N Z B > 5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.0 X 5.5.5.> b V n > 5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.X 5.5.5.> v m e X 5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.X w m k X 5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.. 7 x z 4 5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.X z j X 5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.. X X 5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_back.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_back.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_back.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_back.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,155 +0,0 @@ -/* XPM */ -static char *go_previous__[] = { -/* columns rows colors chars-per-pixel */ -"32 32 117 2 ", -" c #1F4B87", -". c #204A87", -"X c #214A87", -"o c #214B87", -"O c #214C87", -"+ c #204988", -"@ c #204B88", -"# c #214B88", -"$ c #204B89", -"% c #214B89", -"& c #224A88", -"* c #224B89", -"= c #214C88", -"- c #214C89", -"; c #234C88", -": c #204C8A", -"> c #244E89", -", c #244F8B", -"< c #25508B", -"1 c #27508C", -"2 c #27518C", -"3 c #27528D", -"4 c #27548F", -"5 c #28538D", -"6 c #29538E", -"7 c #2B548E", -"8 c #2D5690", -"9 c #2E5790", -"0 c #305992", -"q c #305993", -"w c #335B95", -"e c #345D95", -"r c #375E97", -"t c #365F98", -"y c #3B629A", -"u c #3F669C", -"i c #3664A0", -"p c #3465A4", -"a c #3566A4", -"s c #3B68A3", -"d c #3B6AA7", -"f c #3E6BA5", -"g c #3C6BA7", -"h c #3C6BA8", -"j c #3D6CA8", -"k c #3E6CA8", -"l c #3E6DA8", -"z c #3E6DA9", -"x c #3F6DA9", -"c c #43699F", -"v c #486EA2", -"b c #406EA9", -"n c #416FA9", -"m c #436FA8", -"M c #426FAA", -"N c #4C72A6", -"B c #4C73A7", -"V c #4270AA", -"C c #4370AB", -"Z c #4471AB", -"A c #4571AB", -"S c #4671AA", -"D c #4572AB", -"F c #4672AC", -"G c #4673AC", -"H c #4773AC", -"J c #4773AD", -"K c #4874AD", -"L c #4975AD", -"P c #4B75AC", -"I c #4F78AE", -"U c #4776B1", -"Y c #4A79B3", -"T c #4B79B3", -"R c #4B7AB4", -"E c #4F7DB5", -"W c #537BB0", -"Q c #567EB2", -"! c #507EB6", -"~ c #527FB6", -"^ c #5480B7", -"/ c #5981B4", -"( c #5D84B6", -") c #5682B8", -"_ c #5984B9", -"` c #5C86BA", -"' c #6089BC", -"] c #618ABD", -"[ c #638BBD", -"{ c #668DBF", -"} c #688FC0", -"| c #6A91C0", -" . c #6B91C1", -".. c #6B92C1", -"X. c #6C92C1", -"o. c #6D93C2", -"O. c #6E94C2", -"+. c #7194C0", -"@. c #7095C3", -"#. c #7196C3", -"$. c #7296C4", -"%. c #7297C4", -"&. c #7397C4", -"*. c #7497C4", -"=. c #7698C2", -"-. c #7599C4", -";. c #7498C5", -":. c #7599C5", -">. c #7698C4", -",. c #7699C4", -"<. c #779AC4", -"1. c #769AC5", -"2. c #789BC6", -"3. c #7A9DC7", -"4. c #7C9EC8", -"5. c #7FA0C9", -"6. c None", -/* pixels */ -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6. 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.< # 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6 +. 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.9 >.4.X 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.q ,.] 4.# 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.r ,.` Y 3.X 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.# r ,._ Y Y 2.4 4 2 4 2 2 4 2 6 2 < X 6.6.6.", -"6.6.6.6.6.6.6.6.6. y ,.) Y Y Y ,.%.%.$.@.@.O.O.o. . . .X 6.6.6.", -"6.6.6.6.6.6.6.6.# u ,.^ Y Y Y Y T T T T T T Y Y T T T } X 6.6.6.", -"6.6.6.6.6.6.6.- v $.~ Y Y Y Y Y T Y Y Y Y Y Y Y Y T T { X 6.6.6.", -"6.6.6.6.6.6.# v $.E Y Y Y Y Y Y T T Y Y Y Y Y Y Y T T [ X 6.6.6.", -"6.6.6.6.6.- B @.E Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y Y T ] X 6.6.6.", -"6.6.6.6.# B .T U U U U U U U U U U U U U U U U U U U ` X 6.6.6.", -"6.6.6.6.# t ( k p p p p p p p p p p p p p p p p p p p L X 6.6.6.", -"6.6.6.6.6. w / k p p p p p p p p p p p p p p p p p p G X 6.6.6.", -"6.6.6.6.6.6.# q Q k p p p p p p p p p p p p p p p p p C X 6.6.6.", -"6.6.6.6.6.6.6.# 9 W l p p p p p p p p p p p p p p p p M X 6.6.6.", -"6.6.6.6.6.6.6.6.# 7 I l p p p p p p p p p p p p p p p l X 6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6 L g p p p G G F F D C C M M l l g X 6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.< D g p p G - O O O X X X X X X 6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.> D f p G 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.> g g M 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.- s l X 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.# i # 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.# 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6. 6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.", -"6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6.6." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_cancel.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_cancel.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_cancel.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_cancel.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,256 +0,0 @@ -/* XPM */ -static char *dialog_no[] = { -/* columns rows colors chars-per-pixel */ -"32 32 218 2 ", -" c #A30202", -". c #A40202", -"X c #A80404", -"o c #A80505", -"O c #A80606", -"+ c #AA0707", -"@ c #AA0808", -"# c #AC0B0B", -"$ c #AF0D0D", -"% c #AE0E0E", -"& c #AF0E0E", -"* c #B11010", -"= c #B21010", -"- c #B31212", -"; c #B21313", -": c #B31313", -"> c #B21414", -", c #B51414", -"< c #B51515", -"1 c #B31919", -"2 c #B71818", -"3 c #B41A1A", -"4 c #B81818", -"5 c #BA1A1A", -"6 c #BD1D1D", -"7 c #BF2020", -"8 c #BB2626", -"9 c #BB2828", -"0 c #BB2929", -"q c #BD2828", -"w c #BD2929", -"e c #BD2A2A", -"r c #BD2B2B", -"t c #BF2A2A", -"y c #C02323", -"u c #C12323", -"i c #C42525", -"p c #C62727", -"a c #C62A2A", -"s c #C02F2F", -"d c #C92C2C", -"f c #CA2E2E", -"g c #CC2F2F", -"h c #CD2F2F", -"j c #C03030", -"k c #C33030", -"l c #C33131", -"z c #C23434", -"x c #C23535", -"c c #C33535", -"v c #C53434", -"b c #C53535", -"n c #C53636", -"m c #C43737", -"M c #C63636", -"N c #C73737", -"B c #CC3131", -"V c #CD3232", -"C c #CF3333", -"Z c #C53838", -"A c #C53939", -"S c #C63838", -"D c #C73838", -"F c #C63939", -"G c #C73939", -"H c #C53A3A", -"J c #C63A3A", -"K c #C73B3B", -"L c #C73C3C", -"P c #C83838", -"I c #C83939", -"U c #C93939", -"Y c #C83A3A", -"T c #C93B3B", -"R c #CA3B3B", -"E c #CA3C3C", -"W c #CB3C3C", -"Q c #C93F3F", -"! c #CB3E3E", -"~ c #CB3F3F", -"^ c #CC3D3D", -"/ c #CC3F3F", -"( c #D03535", -") c #D13737", -"_ c #D13838", -"` c #D13939", -"' c #D33A3A", -"] c #D53C3C", -"[ c #D43D3D", -"{ c #D63D3D", -"} c #D73E3E", -"| c #D73F3F", -" . c #D83F3F", -".. c #D93F3F", -"X. c #CC4040", -"o. c #CD4040", -"O. c #CC4141", -"+. c #CE4242", -"@. c #CE4343", -"#. c #CF4343", -"$. c #CA4444", -"%. c #CB4444", -"&. c #CE4444", -"*. c #CF4444", -"=. c #CF4545", -"-. c #CC4646", -";. c #CD4747", -":. c #CF4C4C", -">. c #CF4D4D", -",. c #CF4E4E", -"<. c #D04545", -"1. c #D14747", -"2. c #D24747", -"3. c #D84040", -"4. c #D04848", -"5. c #D24848", -"6. c #D24A4A", -"7. c #D24B4B", -"8. c #D44B4B", -"9. c #D34C4C", -"0. c #D04E4E", -"q. c #D54F4F", -"w. c #D64F4F", -"e. c #D74F4F", -"r. c #D25151", -"t. c #D25252", -"y. c #D55050", -"u. c #D75353", -"i. c #D35555", -"p. c #D75454", -"a. c #D65555", -"s. c #D65757", -"d. c #D95252", -"f. c #D95353", -"g. c #D95757", -"h. c #DB5656", -"j. c #DA5757", -"k. c #D45858", -"l. c #D55959", -"z. c #D65B5B", -"x. c #D95858", -"c. c #DA5959", -"v. c #DB5A5A", -"b. c #DD5959", -"n. c #DD5A5A", -"m. c #DC5B5B", -"M. c #DE5B5B", -"N. c #DB5C5C", -"B. c #DA5F5F", -"V. c #DD5D5D", -"C. c #DF5C5C", -"Z. c #DE5D5D", -"A. c #DF5D5D", -"S. c #DE5E5E", -"D. c #DF5E5E", -"F. c #DF5F5F", -"G. c #E05D5D", -"H. c #E05E5E", -"J. c #E15F5F", -"K. c #D96161", -"L. c #DC6161", -"P. c #DC6262", -"I. c #DC6767", -"U. c #DE6767", -"Y. c #DC6868", -"T. c #DE6969", -"R. c #DE6C6C", -"E. c #DF6C6C", -"W. c #E06060", -"Q. c #E16060", -"!. c #E06161", -"~. c #E16161", -"^. c #E16262", -"/. c #E16363", -"(. c #E16464", -"). c #E26464", -"_. c #E26565", -"`. c #E16666", -"'. c #E26666", -"]. c #E26767", -"[. c #E16969", -"{. c #E26868", -"}. c #E26969", -"|. c #E16A6A", -" X c #E26A6A", -".X c #E36B6B", -"XX c #E36C6C", -"oX c #E06F6F", -"OX c #E27474", -"+X c #E27575", -"@X c #E27676", -"#X c #E37676", -"$X c #E47676", -"%X c #E47878", -"&X c #E57878", -"*X c #E57979", -"=X c #E57A7A", -"-X c #E67A7A", -";X c #E67B7B", -":X c #E57C7C", -">X c #E57D7D", -",X c #E67C7C", -"X[ tXtXtXtXtXtXtXtX] 1XrX4X] tXtXtXtXtXtXtX", -"tXtXtXtXtXtX' =X4X{.8X#X' tXtXtXtXtXtX' %XwXXX4X1X' tXtXtXtXtXtX", -"tXtXtXtXtX) $X=X).{.{.wXE.) tXtXtXtX) E.wXXX{.{.=X=X' tXtXtXtXtX", -"tXtXtXtXV c.4XQ.Q.Q.).{.9XL.C tXtXV P.8X{.{.).).Q.2Xc.V tXtXtXtX", -"tXtXtXtXtXg U.=XQ.Q.Q.).).9Xc.g g g.9X{.).).Q.Q.=XT.V tXtXtXtXtX", -"tXtXtXtXtXtXd B.=XL.J.Q.Q.).2Xy.y.2X).Q.Q.Q.L.%XL.f tXtXtXtXtXtX", -"tXtXtXtXtXtXtXa p.#XS.S.M.S.J.=X1XJ.J.M.M.S.$Xp.a tXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXp 6.#XS.h.M.M.S.J.M.M.M.S.#X9.p tXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXtXp +.E.M.g.g.h.g.M.d.M.XX-.p tXtXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXtXtX7 ! E.g.d.d.d.y.c.T.^ u tXtXtXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXtXtX6 G U.p.e.d.e.e.y.T.R 6 tXtXtXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXtX6 R P.y.8.6.6.8.8.6.e.B.R 6 tXtXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtX4 R c.6.2.2.2.6.6.2.6.2.6.l.L 5 tXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtX3 G i.-.<.+.-.6.l.l.2.<.-.2.-.i.L 4 tXtXtXtXtXtXtX", -"tXtXtXtXtXtX< G >.X.X.X.+.+.r.q a t.+.+.+.! ^ 9.G < tXtXtXtXtXtX", -"tXtXtXtXtX; n ;.R R R ! X.>.q ; ; 0 >.X.R ! R ! ;.G > tXtXtXtXtX", -"tXtXtXtX; q $.n P n G G -.q ; tXtX; q -.G G R n G $.r ; tXtXtXtX", -"tXtXtXtXtX$ x G n n x ! q $ tXtXtXtX$ q ! n l n L x $ tXtXtXtXtX", -"tXtXtXtXtXtX# s A l G 0 @ tXtXtXtXtXtX# 0 G l G r $ tXtXtXtXtXtX", -"tXtXtXtXtXtXtX@ q l 8 O tXtXtXtXtXtXtXtX@ 8 x q @ tXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXO 1 O tXtXtXtXtXtXtXtXtXtXo 3 O tXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXtX. tXtXtXtXtXtXtXtXtXtXtXtX tXtXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX", -"tXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtXtX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_copy.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_copy.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_copy.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_copy.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ -/* XPM */ -static char *edit_copy__[] = { -/* columns rows colors chars-per-pixel */ -"32 32 91 1 ", -" c #000000", -". c #4D514F", -"X c #5A5E5C", -"o c #5F6262", -"O c #636665", -"+ c #676C6A", -"@ c #6A6E6B", -"# c #8D908D", -"$ c #8E9090", -"% c #929694", -"& c #999B9B", -"* c #999C9A", -"= c #A0A1A1", -"- c #A5A6A6", -"; c #A9A9A9", -": c #AAABAB", -"> c #ABABAB", -", c #ADADAD", -"< c #AEAEAE", -"1 c #AFAFAF", -"2 c #B0B0B0", -"3 c #B2B2B2", -"4 c #B6B6B6", -"5 c #B9B9B9", -"6 c #BBBBBB", -"7 c #B8BCBD", -"8 c #BABEBF", -"9 c #C1C1C1", -"0 c #C2C2C2", -"q c #C2C3C3", -"w c #C3C4C3", -"e c #C8C8C8", -"r c #CBCBCB", -"t c #CDCDCD", -"y c #CECECE", -"u c #CFD0D0", -"i c #D6D6D6", -"p c #D8D8D8", -"a c #DBDBDB", -"s c #DCDCDB", -"d c #DBDDDE", -"f c #E1E1E1", -"g c #E2E2E2", -"h c #E3E3E3", -"j c #E4E4E4", -"k c #E5E5E5", -"l c #E7E8E8", -"z c #E8E9E9", -"x c #E9E9E9", -"c c #E9EAEA", -"v c #E9EAEB", -"b c #EAEBEB", -"n c #EBEBEB", -"m c #EBECEC", -"M c #ECECEC", -"N c #ECEDED", -"B c #EDEDED", -"V c #EDEEEE", -"C c #EEEEEE", -"Z c #EEEFEF", -"A c #EFEFEF", -"S c #EFF0F0", -"D c #EEF0F1", -"F c #F0F0F0", -"G c #F0F1F1", -"H c #F1F1F1", -"J c #F1F1F2", -"K c #F1F2F2", -"L c #F2F2F2", -"P c #F2F3F3", -"I c #F3F3F3", -"U c #F3F4F4", -"Y c #F4F4F4", -"T c #F4F5F5", -"R c #F5F5F5", -"E c #F5F6F6", -"W c #F6F6F6", -"Q c #F6F7F7", -"! c #F7F7F7", -"~ c #F7F8F8", -"^ c #F8F8F8", -"/ c #F9F9F8", -"( c #F9F9F9", -") c #FAFAF9", -"_ c #FAFAFA", -"` c #FAFBFB", -"' c #FBFBFB", -"] c #FCFCFC", -"[ c #FDFDFD", -"{ c #FEFEFE", -"} c None", -/* pixels */ -"}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}", -"}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}", -"}}!GGGG!G!!!!!!!~^!!^^]}}}}}}}}}", -"}}GlnnmnVVVAVGVGGGGGGG~}}}}}}}}}", -"}}GnvmVVAAGGGGGUUYGG!G^}}}}}}}}}", -"}}GnmmVZGGGG!G!GG!!!Y!^ }}}}}}}}", -"}}YnVVZGGG!GG!!!!!!!!!^ c #868686", -", c #888888", -"< c #898989", -"1 c #8A8A8A", -"2 c #8B8B8B", -"3 c #8C8C8C", -"4 c #909090", -"5 c #919191", -"6 c #929292", -"7 c #939393", -"8 c #949494", -"9 c #969696", -"0 c #999999", -"q c #9A9A9A", -"w c #9B9B9B", -"e c #9C9C9C", -"r c #9E9E9E", -"t c #9F9F9F", -"y c #A0A0A0", -"u c #A1A1A1", -"i c #A2A2A2", -"p c #A3A3A3", -"a c #A4A4A4", -"s c #A5A5A5", -"d c #A6A6A6", -"f c #A7A7A7", -"g c #A8A8A8", -"h c #A9A9A9", -"j c #AAAAAA", -"k c #ABABAB", -"l c #ACACAC", -"z c #ADADAD", -"x c #AEAEAE", -"c c #AFAFAF", -"v c #B0B0B0", -"b c #B1B1B1", -"n c #B2B2B2", -"m c #B3B3B3", -"M c #B4B4B4", -"N c #B5B5B5", -"B c #B6B6B6", -"V c #B7B7B7", -"C c #B8B8B8", -"Z c #B9B9B9", -"A c #BABABA", -"S c #BBBBBB", -"D c #BCBCBC", -"F c #BDBDBD", -"G c #BEBEBE", -"H c #BFBFBF", -"J c #C0C0C0", -"K c #C1C1C1", -"L c #C2C2C2", -"P c #C3C3C3", -"I c #C4C4C4", -"U c #C5C5C5", -"Y c #C6C6C6", -"T c #C7C7C7", -"R c #C8C8C8", -"E c #C9C9C9", -"W c #CACACA", -"Q c #CBCBCB", -"! c #CCCCCC", -"~ c #CDCDCD", -"^ c #CECECE", -"/ c #CFCFCF", -"( c #D0D0D0", -") c #D1D1D1", -"_ c #D2D2D2", -"` c #D3D3D3", -"' c #D4D4D4", -"] c #D5D5D5", -"[ c #D6D6D6", -"{ c #D7D7D7", -"} c #D8D8D8", -"| c #D9D9D9", -" . c #DADADA", -".. c #DBDBDB", -"X. c #DCDCDC", -"o. c #DDDDDD", -"O. c #DEDEDE", -"+. c #DFDFDF", -"@. c #E0E0E0", -"#. c #E1E1E1", -"$. c #E2E2E2", -"%. c #E3E3E3", -"&. c #E4E4E4", -"*. c #E5E5E5", -"=. c #E6E6E6", -"-. c #E7E7E7", -";. c #E8E8E8", -":. c #E9E9E9", -">. c #EAEAEA", -",. c #EBEBEB", -"<. c #ECECEC", -"1. c #EDEDED", -"2. c #EEEEEE", -"3. c #EFEFEF", -"4. c #F0F0F0", -"5. c #F1F1F1", -"6. c #F2F2F2", -"7. c #F3F3F3", -"8. c #F4F4F4", -"9. c #F5F5F5", -"0. c #F6F6F6", -"q. c #F7F7F7", -"w. c #F8F8F8", -"e. c #F9F9F9", -"r. c #FAFAFA", -"t. c #FBFBFB", -"y. c #FCFCFC", -"u. c #FDFDFD", -"i. c None", -/* pixels */ -"i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.", -"i.i.2.t.t.t.t.t.,.K -.t.t.t.0.t.t.0.2.} i.i.i.i.i.i.i.i.i.i.i.i.", -"i.i.2.u.u.t.t.u.2.d k ,.t.u.t.u.t.t.2.o.^ i.i.i.i.i.i.i.i.i.i.i.", -"i.i.2.t.t.u.t.t.0.S : S 4.t.u.t.t.4.,.,.} i.i.i.i.i.i.i.i.i.i.i.", -"i.i.2.t.u.t.u.t.t.} 6 6 ^ 0.u.u.0.4.-.2.4.} i.i.i.i.i.i.i.i.i.i.", -"i.i.,.u.t.u.t.u.u.4.z 2 k %.u.u.t.0.%.,.u.4.[ i.i.i.i.i.i.i.i.i.", -"i.i.,.u.t.u.u.t.t.t.^ 6 r K 4.u.t.4.%.-.u.t.2.[ i.i.i.i.i.i.i.i.", -"i.i.o.0.t.u.t.u.u.u.-.d q z } t.t.0.-.[ o.%.%.} T i.i.i.i.i.i.i.", -"i.i.D [ ,.4.t.t.t.t.0.K q z K 2.t.t.4.-.o.} [ [ ( K i.i.i.i.i.i.", -"i.i.K S } ,.-.,.0.t.u.o.d k D } 0.t.t.4.2.-.%.%.%.} i.i.i.i.i.i.", -"i.i.o.T k ^ ,.-.o.-.4.2.S k K E ,.t.t.0.4.2.,.,.,.o.i.i.i.i.i.i.", -"i.i.-.4.E i b o.,.%.o.o.K k B ^ } 0.t.t.0.t.0.4.2.-.i.i.i.i.i.i.", -"i.i.-.t.4.o.z r D %.%.[ E b d B E -.t.t.t.t.t.t.0.2.i.i.i.i.i.i.", -"i.i.-.t.t.t.,.T i i T o.} T S b B ^ 4.t.t.t.t.t.t.,.i.i.i.i.i.i.", -"i.i.-.t.t.t.t.0.o.S q k T ( o.%.} o.%.,.0.t.t.0.-.( S i.i.i.i.i.", -"i.i.%.0.0.0.0.0.t.2.[ b q d E o.,.2.%.( } o.o.[ T i 6 i B b i.i.", -"i.i.%.0.0.0.0.0.t.0.0.2.[ b 6 r D b d b D E ^ } B & O o $ z b i.", -"i.i.%.0.0.0.0.0.4.0.0.0.0.2.^ r d z ; 2 2 2 3 d B r i.i.i.9 D i.", -"i.i.%.0.0.0.0.0.0.0.0.4.0.0.4.T k K b E D k i q k B q i.i.S S i.", -"i.i.%.4.0.4.4.0.0.4.0.4.0.4.4.%.b K S %.,.-.-.( d q k S T E * i.", -"i.i.o.4.2.4.4.4.4.4.4.4.2.4.4.2.T T B [ 2.2.2.,.( r + * 2 + i.i.", -"i.i.%.4.2.2.2.2.2.2.2.4.2.,.2.2.^ E b E 2.2.2.,.2.( i.i.i.i.i.i.", -"i.i.o.2.,.,.,.,.,.,.2.,.,.,.,.,.^ [ K T ,.,.,.,.,.} i.i.i.i.i.i.", -"i.i.o.,.-.,.-.,.-.,.-.,.,.-.,.} K k i D ^ -.,.,.,.[ i.i.i.i.i.i.", -"i.i.} 2.,.-.,.-.-.-.,.-.,.-.-.^ k * : i D ( -.,.,.( i.i.i.i.i.i.", -"i.i.} ,.-.-.-.-.-.-.-.-.-.-.%.T k i T d b K o.,.,.( i.i.i.i.i.i.", -"i.i.} ,.-.-.-.-.-.-.-.-.-.-.%.K B B %.T B S ( -.,.^ i.i.i.i.i.i.", -"i.i.} ,.%.%.%.%.-.%.%.%.%.-.%.K B B ( ( T b D -.%.^ i.i.i.i.i.i.", -"i.i.} ,.%.-.%.%.%.%.%.-.%.-.-.( k S T ( E 6 S o.%.T i.i.i.i.i.i.", -"i.i.z E T T T T T T K K D D D S 6 * 9 q % # r B b q i.i.i.i.i.i.", -"i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.X . i.i.i.i.i.i.i.i.i.i.i.", -"i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i.i." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_find_next.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_find_next.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_find_next.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_find_next.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,142 +0,0 @@ -/* XPM */ -static char *edit_find__[] = { -/* columns rows colors chars-per-pixel */ -"32 32 104 2 ", -" c #4D4D4C", -". c #52544F", -"X c #535453", -"o c #5B5B5B", -"O c #5E605D", -"+ c #646464", -"@ c #6B6B6B", -"# c #70716D", -"$ c #737473", -"% c #777974", -"& c #7C7C7C", -"* c #7F817D", -"= c #81837F", -"- c #3567A5", -"; c #3B6BA6", -": c #426FA8", -"> c #4371AB", -", c #4A76AC", -"< c #4C78AF", -"1 c #4E7AB0", -"2 c #557DB1", -"3 c #5A82B4", -"4 c #6188B6", -"5 c #6F92BD", -"6 c #7897BA", -"7 c #799CC6", -"8 c #848484", -"9 c #878985", -"0 c #8A8C87", -"q c #8C8D8B", -"w c #8E908B", -"e c #90918F", -"r c #939492", -"t c #979994", -"y c #999A97", -"u c #9C9C9C", -"i c #9EA09B", -"p c #A3A4A2", -"a c #A6A9A4", -"s c #A9AAA7", -"d c #AAACA8", -"f c #B0B1AF", -"g c #B4B4B3", -"h c #B8B9B7", -"j c #BDBDBD", -"k c #BEC1BC", -"l c #C0C1BF", -"z c #87A2C2", -"x c #83A4CB", -"c c #8CABCF", -"v c #91A8C1", -"b c #95AEC9", -"n c #9EB0C4", -"m c #9AB1CB", -"M c #87AAD0", -"N c #97B6D5", -"B c #A3B5C7", -"V c #ACB9C6", -"C c #A6B9CE", -"Z c #AABACC", -"A c #A4BBD5", -"S c #AABCD0", -"D c #A3BFDD", -"F c #AEC0D3", -"G c #A8C2DC", -"H c #B4C4D5", -"J c #AEC7E0", -"K c #B4CAE2", -"L c #BCD0E4", -"P c #C1C1C1", -"I c #CBCDCA", -"U c #D0D1CF", -"Y c #C1CDDA", -"T c #C7D0D7", -"R c #CBD2D5", -"E c #CCD4DA", -"W c #D2D2D1", -"Q c #D7D9D5", -"! c #D8DAD7", -"~ c #DDDDDC", -"^ c #DEE0DB", -"/ c #E0E2DD", -"( c #C2D3E6", -") c #CBD7E3", -"_ c #C4D6E8", -"` c #CDDBEA", -"' c #D3DCE6", -"] c #D2DDE9", -"[ c #D5E1ED", -"{ c #DAE4EE", -"} c #D7E3F0", -"| c #DBE5F1", -" . c #DEE8F3", -".. c #E4E4E4", -"X. c #E0E6EA", -"o. c #E7EBED", -"O. c #EBEBEB", -"+. c #EFF1EE", -"@. c #E3EBF3", -"#. c #ECF1F4", -"$. c #F3F4F3", -"%. c #F8F8F7", -"&. c #FBFBFB", -"*. c None", -/* pixels */ -"*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.", -"*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.", -"*.*.*.*.*.u u u u u u y y r q q 8 8 = & % $ # @ @ + + *.*.*.*.*.", -"*.*.*.*.u &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.%.&.&.&.+ *.*.*.*.", -"*.*.*.*.r &...~ ~ ........~ ........................&.O *.*.*.*.", -"*.*.*.*.r &./ ' ~ ....~ ~ ..........................%.O *.*.*.*.", -"*.*.*.*.r &./ / ~ ....j j j j j j V l j j j j l ....%.O *.*.*.*.", -"*.*.*.*.e &.../ ~ ..................O...O.....O...O.&.O *.*.*.*.", -"*.*.*.*.q &...' ~ O...j j j j j j j j j j j j P O...%.o *.*.*.*.", -"*.*.*.*.q &...../ O...........O.O...O.O.O.O.O.O.O.O.%.o *.*.*.*.", -"*.*.*.*.8 &.....~ O...P j j j j j j j l j j P P O.O.%.o *.*.*.*.", -"*.*.*.*.8 &...f / O...O.O...O.O.O.O.O.O.O.O.O.O.O.O.%.o *.*.*.*.", -"*.*.*.*.8 &...O...O.O.P j j g u q 0 q y s j l P O.O.%.o *.*.*.*.", -"*.*.*.*.= &.......O...O.~ p d / &.&.&.O.l r U O.O.O.%.o *.*.*.*.", -"*.*.*.*.& &.....~ O.O.h q ! &.S 2 - < b #.O.r f #.+.&.X *.*.*.*.", -"*.*.*.*.& &.......O.O.u ! O.< x ` ] ( c : ) +.q ..+.&.X *.*.*.*.", -"*.*.*.*.$ &.O.....O.U s $., A @.@.@.} ] A > { I f +.%.X *.*.*.*.", -"*.*.*.*.$ &.......O.s ! C 7 } @.#.#. .} L M 5 $.e O.%.. *.*.*.*.", -"*.*.*.*.# &...O...+.r ..2 G } @.@.@.@.} G G > O.i ! %. *.*.*.*.", -"*.*.*.*.@ &...O...+.e ~ ; A ) ] ] ] ' H m b , E a U %. *.*.*.*.", -"*.*.*.*.@ &...g ..O.r ! 1 N ` [ . .] _ L K > R r ! %. *.*.*.*.", -"*.*.*.*.+ %...O...+.s W v 4 m S Z V V V B z 2 / 8 +.%. *.*.*.*.", -"*.*.*.*.+ &...O...+.W p O.< c K ( ) ] ` K 1 Y l $ ! %. *.*.*.*.", -"*.*.*.*.o &.O.O...+.O.u Q O., 4 v B n 6 : Y +.I s $ j *.*.*.*.", -"*.*.*.*.o &.O.O...+.+...y ! %.S 3 - 1 m #.O.I h i p # X *.*.*.*.", -"*.*.*.*.o %...O...+.O.P h y s ..%.&.&.O.h % i j g p p 8 X *.*.*.", -"*.*.*.*.X %.O.....#.O.+.+.$.! g u e e p I #.0 r h g p p r X *.*.", -"*.*.*.*.X &...O...+.O.O.O.#.+.$.$.$.+.$.$.$.O.w 8 g g p h a X *.", -"*.*.*.*.X %.$.%.$.%.$.%.$.$.O.O.O...............i # g k Q ^ X *.", -"*.*.*.*.*.o X o o o o X X X X X . . O g ^ d X *.", -"*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.. X . *.*.", -"*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_find.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_find.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_find.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_find.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/* XPM */ -static char *edit_find___[] = { -/* columns rows colors chars-per-pixel */ -"32 32 56 1 ", -" c #2F3438", -". c #31363A", -"X c #363A3D", -"o c #3B3F43", -"O c #3F4348", -"+ c #444649", -"@ c #4B4E52", -"# c #555758", -"$ c #565A5E", -"% c #5D5E5F", -"& c #656667", -"* c #646769", -"= c #6D6E6E", -"- c #777776", -"; c #7B7B7B", -": c #838485", -"> c #858688", -", c #8D8D8E", -"< c #929292", -"1 c #9B9B9C", -"2 c #9E9FA1", -"3 c #A4A4A4", -"4 c #A7A7A8", -"5 c #ABABAB", -"6 c #B0B0AF", -"7 c #B4B3B3", -"8 c #B8B8B7", -"9 c #BCBCBC", -"0 c #C0C0BF", -"q c #BFBFC0", -"w c #C4C3C3", -"e c #C8C7C7", -"r c #CCCBCB", -"t c #D0CFCF", -"y c #CECED1", -"u c #CFD0D4", -"i c #D4D3D3", -"p c #D8D7D7", -"a c #D3D4D8", -"s c #D7D8DE", -"d c #DCDBDC", -"f c #E0DFDF", -"g c #DCDDE1", -"h c #DFE0E3", -"j c #E3E2E3", -"k c #E8E7E7", -"l c #E6E6EA", -"z c #E7E8EA", -"x c #EBEAEB", -"c c #F0EFEF", -"v c #EFEFF1", -"b c #F3F3F4", -"n c #F8F7F7", -"m c #F7F7F8", -"M c #FBFBFB", -"N c None", -/* pixels */ -"NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN", -"NNNNNjjjjjjjjjjjjjpeNNNNNNNNNNNN", -"NNNNiMMMMMMMMMMMMMMnf9NNNNNNNNNN", -"NNNNrMMMMMMmMMMMMMMvkc8NNNNNNNNN", -"NNNNrMMckkxkzzzlxkkkpbx7NNNNNNNN", -"NNNNrMMzfjfpppphfhjzpcbk6NNNNNNN", -"NNNNrnnkpe435549pfjkpxcvfNNNNNNN", -"NNNNennf36pznzh83tjfekkkcpNNNNNN", -"NNNNenc4enmmmmmmi4jnfr05488NNNNN", -"NNNNrne6vnmmmmmmn06kkjt85591NNNN", -"NNNNez4pvnnnmbbmvj1tfppretf0NNNN", -"NNNNej4zxvvvvbvvnv40fppfhzcwNNNN", -"NNNNep5zlxvvvvvvvv40kfkcccz0NNNN", -"NNNNef3zxllxxvxvxx2ukkzczzceNNNN", -"NNNNek3yxlhhglhhji,uppffkkzeNNNN", -"NNNN9ze1gghhggggh45pppppkkjeNNNN", -"NNNN0kk52sggssgp01eppfjkkjk0NNNN", -"NNNN0jjj6<6eyy93*-7jjjjjjjj0NNNN", -"NNNN9ffpie311348*X;6iiipfjj9NNNN", -"NNNN0ffptyiiyrtie$o:7iiipjf0NNNN", -"NNNN8fpsytttttttr9@+>0pppff8NNNN", -"NNNN9ffirttrttrtrt6O@,9tpfp9NNNN", -"NNNN8pppiiiiiiiiiii5o$,eppp9NNNN", -"NNNN8pppipiiiipiippp2.%1ipp8NNNN", -"NNNN7pitrrerererererr, &2tp8NNNN", -"NNNN7pitrrrererrrerrer: =3t8NNNN", -"NNNN7itttttttttttttttit-.-56NNNN", -"NNNN6tttttttttttttttirte*X,5NNNN", -"NNNN6trtrrtrtrtrrrrtrtrt0>86NNNN", -"NNNN4rerrrrererrrrerrrrerrr4NNNN", -"NNNNN----------------------NNNNN", -"NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_forward.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_forward.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_forward.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_forward.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ -/* XPM */ -static char *go_next__[] = { -/* columns rows colors chars-per-pixel */ -"32 32 116 2 ", -" c #1F4B87", -". c #204A87", -"X c #214B87", -"o c #224B87", -"O c #214C87", -"+ c #224C87", -"@ c #204988", -"# c #204A88", -"$ c #214A88", -"% c #204B88", -"& c #214B88", -"* c #214B89", -"= c #234B88", -"- c #204C89", -"; c #214C89", -": c #224C88", -"> c #224D89", -", c #234E8B", -"< c #244D8A", -"1 c #264F8C", -"2 c #27508B", -"3 c #26528D", -"4 c #27528D", -"5 c #27548F", -"6 c #28528D", -"7 c #28538F", -"8 c #2B558F", -"9 c #295490", -"0 c #2A5591", -"q c #2E5792", -"w c #2F5B94", -"e c #325A95", -"r c #345D96", -"t c #375F97", -"y c #39619A", -"u c #3B649C", -"i c #3A649D", -"p c #3D669F", -"a c #3663A0", -"s c #3665A1", -"d c #3465A4", -"f c #3967A2", -"g c #3B68A4", -"h c #3868A6", -"j c #3969A6", -"k c #3A69A6", -"l c #3C69A5", -"z c #3D6AA6", -"x c #3E6CA7", -"c c #3E6DA9", -"v c #416CA8", -"b c #416FA9", -"n c #436FA9", -"m c #416FAA", -"M c #4370AB", -"N c #4471AB", -"B c #4673AC", -"V c #4874AD", -"C c #4975AE", -"Z c #4B77AE", -"A c #4C77AF", -"S c #4D78AF", -"D c #4776B1", -"F c #4978B2", -"G c #4A79B3", -"H c #4F7AB0", -"J c #4D7BB4", -"K c #4E7CB5", -"L c #517BB1", -"P c #537DB2", -"I c #557EB3", -"U c #567FB3", -"Y c #507DB5", -"T c #527FB6", -"R c #5480B7", -"E c #5880B4", -"W c #5981B4", -"Q c #5C83B5", -"! c #5E85B6", -"~ c #5682B8", -"^ c #5782B8", -"/ c #5A85BA", -"( c #5D87BB", -") c #5E88BB", -"_ c #5F89BD", -"` c #6187B8", -"' c #6388B9", -"] c #638BBD", -"[ c #668EBE", -"{ c #698FBF", -"} c #6D93BF", -"| c #6F93BF", -" . c #6B92C0", -".. c #6F93C0", -"X. c #7094C0", -"o. c #7297C4", -"O. c #7497C4", -"+. c #7498C5", -"@. c #7599C5", -"#. c #769AC5", -"$. c #779AC5", -"%. c #779BC6", -"&. c #799BC6", -"*. c #789CC6", -"=. c #799CC7", -"-. c #7A9CC7", -";. c #7A9DC7", -":. c #7B9DC7", -">. c #7B9DC8", -",. c #7C9EC8", -"<. c #7C9FC8", -"1. c #7D9FC8", -"2. c #7FA0C9", -"3. c #7FA1C9", -"4. c #83A4CA", -"5. c None", -/* pixels */ -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5. 5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.= 2 5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5. | 6 5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.. <.o.8 5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5. >.( | q 5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.= %.G / | w 5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.. 6 6 6 6 6 6 6 6 4 4 4 %.G G ~ .e = 5.5.5.5.5.5.5.5.5.5.", -"5.5.5.= 4.<.,.,.>.&.;.%.%.o.%.o.G G G ~ .e 5.5.5.5.5.5.5.5.5.", -"5.5.5.= 4.G G G G G G G G G F G G G G G T [ t 5.5.5.5.5.5.5.5.", -"5.5.5.= <.G G G G G G G G G G G G G G G G K ] y : 5.5.5.5.5.5.5.", -"5.5.5.= ;.G G G G G G G G G G G G G G G G G K ] i = 5.5.5.5.5.5.", -"5.5.5.= ;.G G G G G G G G G G G G G G G G G G J ( p = 5.5.5.5.5.", -"5.5.5.= o.D D D D D D D D D D D D D D D D D D F G R i = 5.5.5.5.", -"5.5.5.= ' d d d d d d d d d d d d d d d d d d d h B 9 : 5.5.5.5.", -"5.5.5.= ` d d d d d d d d d d d d d d d d d d h M 9 : 5.5.5.5.5.", -"5.5.5.= ! d d d d d d d d d d d d d d d d d h v 5 : 5.5.5.5.5.5.", -"5.5.5.= Q d d d d d d d d d d d d d d d d h v 4 . 5.5.5.5.5.5.5.", -"5.5.5.= E s d d d d d d d d d d d d d d h v 4 . 5.5.5.5.5.5.5.5.", -"5.5.5.= E E U P L L S J Z Z Z B d d s h z : 5.5.5.5.5.5.5.5.5.5.", -"5.5.5.= + . . + = . . . = . : B d d h z 1 5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5. M d h h : 5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.. v h f : 5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5. c s : 5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.. a : 5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.= 5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.: 5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.", -"5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_language.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_language.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_language.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_language.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,246 +0,0 @@ -/* XPM */ -static char *emblem_web[] = { -/* columns rows colors chars-per-pixel */ -"32 32 208 2 ", -" c #1D4277", -". c #1F467F", -"X c #557D7D", -"o c #7F9A4F", -"O c #7B9753", -"+ c #7E9B54", -"@ c #71925C", -"# c #7E9B5E", -"$ c #5E8273", -"% c #63866E", -"& c #6D8E6C", -"* c #739265", -"= c #7C9A63", -"- c #71926B", -"; c #648870", -": c #688B76", -"> c #6D8F7A", -", c #769671", -"< c #9CAF2B", -"1 c #9DB029", -"2 c #8BA33E", -"3 c #94AA35", -"4 c #99AD32", -"5 c #95AB3C", -"6 c #9DB134", -"7 c #9CB23E", -"8 c #A2B52C", -"9 c #A6B92F", -"0 c #A1B637", -"q c #A7BA30", -"w c #AABD32", -"e c #A2B73B", -"r c #A4B93C", -"t c #A9BD39", -"y c #AFC135", -"u c #ACC03B", -"i c #B0C336", -"p c #B4C739", -"a c #B6C93A", -"s c #B9CC3D", -"d c #BDD03F", -"f c #829D4B", -"g c #809C53", -"h c #87A047", -"j c #8CA541", -"k c #98AE45", -"l c #92AA4C", -"z c #99AF48", -"x c #9CB243", -"c c #9AB148", -"v c #8CA652", -"b c #8FA85E", -"n c #94AC57", -"m c #92AD5C", -"M c #97B056", -"N c #9BB556", -"B c #95B05F", -"V c #A4BA4A", -"C c #A8BE4E", -"Z c #A3BA54", -"A c #A9BF51", -"S c #A1BA5E", -"D c #819E65", -"F c #819F6B", -"G c #89A462", -"H c #8FA963", -"J c #8BA86B", -"K c #98B263", -"L c #9FB86C", -"P c #85A178", -"I c #8EA97C", -"U c #93AC7A", -"Y c #9EB771", -"T c #ADC345", -"R c #B2C540", -"E c #B4C843", -"W c #B1C64C", -"Q c #B3C84C", -"! c #B8CD49", -"~ c #BFD240", -"^ c #BCD04D", -"/ c #B8CD50", -"( c #BDD254", -") c #ABC263", -"_ c #A8C271", -"` c #1E4680", -"' c #1F4881", -"] c #204680", -"[ c #214A86", -"{ c #234D8A", -"} c #25508B", -"| c #375F96", -" . c #396097", -".. c #3F6D97", -"X. c #3C649A", -"o. c #3A699C", -"O. c #3565A4", -"+. c #3768A6", -"@. c #3A69A6", -"#. c #3D6DA9", -"$. c #527C8E", -"%. c #446B9F", -"&. c #457192", -"*. c #48749B", -"=. c #547E9C", -"-. c #466DA2", -";. c #4A6EA2", -":. c #416FAC", -">. c #4C73A4", -",. c #4371AC", -"<. c #4B75AB", -"1. c #4B78AA", -"2. c #527CA5", -"3. c #5479AB", -"4. c #4775B0", -"5. c #4976B0", -"6. c #4D7AB3", -"7. c #527DB4", -"8. c #5A7FB0", -"9. c #5D838B", -"0. c #638781", -"q. c #648987", -"w. c #688C81", -"e. c #6F9287", -"r. c #6E938F", -"t. c #608792", -"y. c #6A8D92", -"u. c #6B919E", -"i. c #75999F", -"p. c #7B9E9E", -"a. c #5580A7", -"s. c #5D87A6", -"d. c #5781A9", -"f. c #5C82B4", -"g. c #5F89B5", -"h. c #5681B9", -"j. c #5A85BB", -"k. c #5E88BE", -"l. c #6D92AE", -"z. c #7C9EA2", -"x. c #6285B4", -"c. c #688AB7", -"v. c #638ABB", -"b. c #6A8DBB", -"n. c #6D93BC", -"m. c #759BB7", -"M. c #7094BC", -"N. c #7399B9", -"B. c #7CA0BE", -"V. c #648CC1", -"C. c #6790C3", -"Z. c #6A92C5", -"A. c #6F96C8", -"S. c #7294C0", -"D. c #7897C0", -"F. c #759BC3", -"G. c #7A9BC2", -"H. c #7097C9", -"J. c #749ACB", -"K. c #799ECE", -"L. c #7DA1CD", -"P. c #7EA2D1", -"I. c #94AE86", -"U. c #91AF8E", -"Y. c #95B281", -"T. c #9BB882", -"R. c #98B68F", -"E. c #85A390", -"W. c #8CA791", -"Q. c #8DAC97", -"!. c #88A79A", -"~. c #90AC93", -"^. c #93B296", -"/. c #9CB893", -"(. c #96B39A", -"). c #A1B891", -"_. c #90AFA8", -"`. c #94B1A1", -"'. c #9AB4AD", -"]. c #81A4B4", -"[. c #87A8B1", -"{. c #8BABB7", -"}. c #8EA9BC", -"|. c #92B0B5", -" X c #A4BAAF", -".X c #A6BCB4", -"XX c #A1B8BB", -"oX c #819FC6", -"OX c #85A1C5", -"+X c #86A8C6", -"@X c #85A2C8", -"#X c #90AEC5", -"$X c #92AECD", -"%X c #95B0CC", -"&X c #9DB6CD", -"*X c #82A6D4", -"=X c #86AAD6", -"-X c #8CADD6", -";X c #89ADD8", -":X c #94AED0", -">X c #8EB0DB", -",X c #9AB6D9", -"X,X4X3Xc.{ { 5X5X5X5X5X5X5X5X", -"5X5X5X5X5X5X{ ;.1X).n m H 1 y ~ Q K.K.H.P.1X1X>.{ 5X5X5X5X5X5X5X", -"5X5X5X5X5X{ x.2X~.P z.E.B.k y ( Y *XP.G.L Z I.2Xx.{ 5X5X5X5X5X5X", -"5X5X5X5X{ x..XV p.m.H.K.L.1 (.=X=X[.@X) L Z Z r .X8.{ 5X5X5X5X5X", -"5X5X5X{ ;.XX0 l.n.u ^.K.P.{.;X>X{.~.!.^.Q.A y q 0 XX;.{ 5X5X5X5X", -"5X5X5X{ &Xc q t Z p W ].P.*X=X>X=X+X_.! E p y w q k $X} 5X5X5X5X", -"5X5X{ c.U 8 q y y S F.G.K.P.*X*X*X+X^ d s p y w 9 8 I f.{ 5X5X5X", -"5X5X{ &X6 8 q t K N.A.J.K.P.P.P.L.( _ L.Y.Z t q 9 8 4 $X{ 5X5X5X", -"5X5X;.I.1 8 q n V.C.Z.H.J.K.K.L.L.R.T.Y.N.n.z.m 9 8 1 W.;.5X5X5X", -"5X{ M.l < 5 c g.k.V.Z.Z.H.H.J.J.B./ d s C V B r 8 0 1 G c.{ 5X5X", -"5X{ OX4 > 7.s.j.k.V.V.C.Z.Z.A.A.) s d a p i w H 6 j > = D.[ 5X5X", -"5X[ }.< =.t.7.7.j.k.k.V.C.C.C.N.d a a a i i w 0 D 8 < 2.oX{ 5X5X", -"5X[ :X: 3 g 6.7.h.h.j.k.v.V.V.p.a a a a i y w 8 , 3 0.,.@X[ 5X5X", -"5X[ @X,.,.- q.v G r.h.j.j.k.k.v.T a p y y y 9 9 3 j >.,.G.[ 5X5X", -"5X{ D.<.#.,.9.8 0 x y.h.h.h.j.j.u.N J m q w 9 1 1 j #.,.n.[ 5X5X", -"5X{ x.7.@.#.* 1 8 9 0 e.7.7.h.7.6.h.6.d.9 9 8 8 1 $.@.6.f.{ 5X5X", -"5X5X%.n.+.@.h 1 1 9 9 w c a.6.6.6.6.6.6.k 8 8 1 f #.O.v.X.5X5X5X", -"5X5X} D.+.+.; 1 1 8 9 9 7 <.<.5.6.,.4.,.= 8 1 1 O O.@.n.} 5X5X5X", -"5X5X{ 3.f.O.+.o 1 1 1 1 = :.,.,.,.,.,.#.+ 1 1 1 O O.7.<.{ 5X5X5X", -"5X5X5X} M.#.O.o.3 1 1 8 & @.#.@.#.#.#.+.+ 1 1 f o.#.c.{ 5X5X5X5X", -"5X5X5X` X.Z.+.O.2 1 1 % +.+.+.+.+.+.O.O.$ 1 1 @ +.c.X.. 5X5X5X5X", -"5X5X5X5X[ >.c.#.O < < &.O.O.O.O.O.O.O.O...< 3 &.v.-.[ 5X5X5X5X5X", -"5X5X5X5X5X[ >.b.f < X O.O.O.O.O.O.O.O.O.O.$ *.v.-.[ 5X5X5X5X5X5X", -"5X5X5X5X5X5X' X.b.y.+.O.O.O.O.O.O.O.O.O.+.7.c.X.` 5X5X5X5X5X5X5X", -"5X5X5X5X5X5X5X { <.c.f.,.:.+.O.+.#.,.f.x.-.{ 5X5X5X5X5X5X5X5X", -"5X5X5X5X5X5X5X5X5X` { X.<.8.v.c.f.f.<.| { ` 5X5X5X5X5X5X5X5X5X5X", -"5X5X5X5X5X5X5X5X5X5X5X5X] [ ' [ [ [ . 5X5X5X5X5X5X5X5X5X5X5X5X5X", -"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X", -"5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X5X" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_new.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_new.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_new.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_new.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,277 +0,0 @@ -/* XPM */ -static char *document_new__[] = { -/* columns rows colors chars-per-pixel */ -"32 32 239 2 ", -" c #5D6262", -". c #5F6462", -"X c #616768", -"o c #636768", -"O c #656B6A", -"+ c #666C6B", -"@ c #6C7271", -"# c #008600", -"$ c #008700", -"% c #008900", -"& c #008A00", -"* c #008B00", -"= c #008D00", -"- c #008E00", -"; c #008F00", -": c #0D8C00", -"> c #108D00", -", c #009100", -"< c #009200", -"1 c #009500", -"2 c #019501", -"3 c #009700", -"4 c #009A00", -"5 c #009B00", -"6 c #009D00", -"7 c #009E00", -"8 c #0A9B0A", -"9 c #0E9A0E", -"0 c #129700", -"q c #129707", -"w c #179917", -"e c #388C00", -"r c #368B0D", -"t c #3E8E0D", -"y c #279D00", -"u c #259D07", -"i c #2C9F11", -"p c #00A000", -"a c #00A100", -"s c #01A101", -"d c #00A200", -"f c #01A301", -"g c #02A300", -"h c #06A600", -"j c #07A207", -"k c #07A507", -"l c #0DA400", -"z c #00A800", -"x c #00AB00", -"c c #01AB00", -"v c #00AC00", -"b c #00AD00", -"n c #00AE00", -"m c #00AF00", -"M c #04AF00", -"N c #08AA00", -"B c #16A700", -"V c #18A400", -"C c #1AA400", -"Z c #00B100", -"A c #01B001", -"S c #00B200", -"D c #00B300", -"F c #00B400", -"G c #06B600", -"H c #04B204", -"J c #0EB501", -"K c #00B900", -"L c #00BA00", -"P c #00BB00", -"I c #00BE00", -"U c #04BB04", -"Y c #08BB08", -"T c #0DBE0D", -"R c #0FBD0F", -"E c #13B500", -"W c #17B700", -"Q c #18B300", -"! c #13BB00", -"~ c #15A315", -"^ c #13BA13", -"/ c #1BB31B", -"( c #1BBA1B", -") c #2AAA00", -"_ c #3CA400", -"` c #35AF00", -"' c #3FAD00", -"] c #20B400", -"[ c #20BA00", -"{ c #32BA00", -"} c #3EA411", -"| c #3FA412", -" . c #22AE22", -".. c #27BF26", -"X. c #33A533", -"o. c #36A636", -"O. c #31AA31", -"+. c #34A834", -"@. c #3EAA3E", -"#. c #3CAD3C", -"$. c #3EB83E", -"%. c #469000", -"&. c #4DAF00", -"*. c #53AA00", -"=. c #4BB300", -"-. c #5DB300", -";. c #4FA912", -":. c #56B32B", -">. c #5EB62B", -",. c #32C600", -"<. c #3BC300", -"1. c #26C526", -"2. c #52CA00", -"3. c #52CF00", -"4. c #6FD900", -"5. c #42CF3E", -"6. c #56D53E", -"7. c #6BDB3E", -"8. c #7CDF3E", -"9. c #52B352", -"0. c #57B257", -"q. c #61BD48", -"w. c #67BF48", -"e. c #799179", -"r. c #5ACA5A", -"t. c #5ACB5A", -"y. c #5ED65E", -"u. c #63D55E", -"i. c #65D85E", -"p. c #72DC5E", -"a. c #7EDF5E", -"s. c #73CA6B", -"d. c #77CC6B", -"f. c #76D176", -"g. c #76D676", -"h. c #7EDE7E", -"j. c #80DC7E", -"k. c #81DF7E", -"l. c #88E17E", -"z. c #839983", -"x. c #979797", -"c. c #9D9D9D", -"v. c #A2A2A2", -"b. c #A6A6A6", -"n. c #A7BAA7", -"m. c #B1B2B1", -"M. c #B8BBB8", -"N. c #BCBCBD", -"B. c #BEBEBE", -"V. c #BFBFBF", -"C. c #83D583", -"Z. c #92D992", -"A. c #92DA92", -"S. c #9BE29B", -"D. c #9EE19E", -"F. c #9EE49E", -"G. c #A6E2A6", -"H. c #A6E3A6", -"J. c #BDBFC0", -"K. c #BFBFC0", -"L. c #C2C2C2", -"P. c #C2C2C4", -"I. c #C6C6C7", -"U. c #CBCBCC", -"Y. c #CBCCCD", -"T. c #CDCDCE", -"R. c #D6D6D6", -"E. c #D6D6D7", -"W. c #D2D6D9", -"Q. c #D1D8DC", -"!. c #D9D9DA", -"~. c #D8DBDE", -"^. c #DCDDDD", -"/. c #DEDFDF", -"(. c #C7E0C8", -"). c #DFDFE0", -"_. c #DEE3E5", -"`. c #E0E0E0", -"'. c #E1E1E1", -"]. c #E3E3E3", -"[. c #E4E4E4", -"{. c #E5E5E5", -"}. c #E4E5E6", -"|. c #E6E7E7", -" X c #E7E8E8", -".X c #E7E8E9", -"XX c #E8E9E9", -"oX c #E9E9E9", -"OX c #E8E9EA", -"+X c #E9EAEA", -"@X c #E9EAEB", -"#X c #EAEBEB", -"$X c #EBEBEB", -"%X c #EBECEC", -"&X c #ECECEC", -"*X c #ECEDED", -"=X c #EDEDED", -"-X c #EDEEEE", -";X c #EEEEEE", -":X c #EEEFEF", -">X c #EFEFEF", -",X c #EFF0F0", -"X*X9.g r.h.k.s.mXmXd.l.k.r.g < MX", -"MXMXMXMX4X|..XXX@X$X*X*X*X>X>XX>X>X.8.7.6...g < ", -"MXMXMXMX0X$X$X&X*X*X*X>X>X,XX>X>X4X,X0XeXXX8 M % mXmXmXmXmXmXmXmXmXmX: M = ", -"MXMXMXMXrX*X*X*X>X>X4X4XX4X4X4X8XeXpXiX&X@.M F ! ,.3.&.mXmX-.4.3.,.G S $ ", -"MXMXMXMXpX*X4XX&XXXXX_.MXMXMXMX", -"MXMXMXMXsXiXsXsXsXzXzXzXzXmXzXmXmXmXmXzXsXXR.V.I.^.`.O MXMXMXMXMX", -"MXMXMXMXhXrXsXhXzXhXzXhXzXmXmXmXmXmXhX4X`.B.mXhX'.+ MXMXMXMXMXMX", -"MXMXMXMXgXsXsXgXgXzXzXmXzXzXzXmXmXgXpX&XT.L.sX'.@ MXMXMXMXMXMXMX", -"MXMXMXMXhXpXsXhXgXgXhXmXmXzXmXmXmXhX4X'.B.!.'.@ MXMXMXMXMXMXMXMX", -"MXMXMXMXgXpXpXgXgXzXgXzXgXmXzXmXmXgX4X!.J.).O MXMXMXMXMXMXMXMXMX", -"MXMXMXMXgXsXsXhXhXzXzXgXgXmXmXmXmXhX4XR.W.o MXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXmXhXzXgXhXmXmXmXmXgXmXmXmXhX4XQ.. MXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMX", -"MXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMXMX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_open.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_open.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_open.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_open.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -/* XPM */ -static char *document_open__[] = { -/* columns rows colors chars-per-pixel */ -"32 32 92 1 ", -" c #3F3F3F", -". c #3C5678", -"X c #464646", -"o c #4B4B4B", -"O c #555653", -"+ c #575955", -"@ c #585A56", -"# c #5C5D5A", -"$ c #646464", -"% c #696B66", -"& c #6C6C6C", -"* c #767676", -"= c #707478", -"- c #7C7C7C", -"; c #325F99", -": c #33639E", -"> c #3666A4", -", c #3868A6", -"< c #3968A8", -"1 c #5F7899", -"2 c #6F7F94", -"3 c #446FA5", -"4 c #4D73A4", -"5 c #4673AD", -"6 c #5476A1", -"7 c #5D7CA3", -"8 c #547EB3", -"9 c #5986B8", -"0 c #5D8BBC", -"q c #7186A0", -"w c #738AA6", -"e c #6188B7", -"r c #648BBC", -"t c #6A8FBD", -"y c #5F8CC0", -"u c #668FC2", -"i c #6B94C5", -"p c #6797CC", -"a c #6798CD", -"s c #6C9ACE", -"d c #7196C3", -"f c #719DCE", -"g c #7C9FCA", -"h c #76A1CF", -"j c #77A2D1", -"k c #79A4D2", -"l c #7FA8D5", -"z c #848483", -"x c #8C8D8C", -"c c #8F918E", -"v c #808892", -"b c #838F9F", -"n c #939393", -"m c #989997", -"M c #9C9D9C", -"N c #A0A19F", -"B c #979BA0", -"V c #A3A4A3", -"C c #A8A8A7", -"Z c #ABABAB", -"A c #B0B0AF", -"S c #B3B3B3", -"D c #BDBDBD", -"F c #85A7CF", -"G c #80A7D4", -"H c #83AAD3", -"J c #8BAFD5", -"K c #88AED8", -"L c #8BB0D7", -"P c #8FB3DA", -"I c #96B6D7", -"U c #93B6DB", -"Y c #95B8DC", -"T c #9ABADD", -"R c #A0BDDC", -"E c #A7C1DE", -"W c #A6C2E1", -"Q c #ACC6E3", -"! c #B4CCE6", -"~ c #BCD2E9", -"^ c #C3C3C3", -"/ c #CCCCCC", -"( c #D0D0CF", -") c #D5D5D5", -"_ c #DBDBDB", -"` c #C0D4EA", -"' c #C6D8EC", -"] c #E4E4E4", -"[ c #E9E9E9", -"{ c #F2F2F2", -"} c #FDFDFD", -"| c None", -/* pixels */ -"||||||||||||||||||||||||||||||||", -"|||||||||OOOOOO+OOOOO#||||||||||", -"|||||||||O{}}}}}}}}}[x#|||||||||", -"|||||||||O_)_))))(//DDV#||||||||", -"|||||||||O____)_))(/^D{V#|||||||", -"||-******@____MmMmmM)^{{N#||||||", -"||2/^^^^D@__________)(CCDc||||||", -"||zSVMMMm@]__]NNMMMV__)/^S%|||||", -"||-^AAZZZ#]x(]______]___)(@|||||", -"||*SMmMnn@[][]NMNNNNMNNV__+|||||", -"||&^ZZZCV@[[[[][[][]]]]]]]+|||||", -"||%Ammnnx#[[[[VVVNVNVVNC][+|||||", -"||$DZw>><><,,,,,,,,,,,,,>>>>>>||", -"||$Zm6T~`~~~~~~~~~~~~~~~~~~~R<||", -"||$SV6ETKPPPPPPPPPPPPPPPPPUTI<||", -"||#Cn3!TUPPPPPPPPPPPPPPPPPPYL<||", -"||#ZV<~TUUYYUUUYPUUUUUUUUPKTH<||", -"||#Nx<'YYYYYYYYYYYYYYYYYUKlTk|||", -"||@VB5'TYTTTTYTTTTTTTYTYKlKWd|||", -"||Omv8`TTTTTTTTTTTTTTTYKKKKQr|||", -"||OBbe!YTTYTTTTTYYYPPKKKKKKQ8|||", -"||on2rQUYUPLHllllllllllllllW5|||", -"||OcqpTHlkkjjjjjjjkkkkkkkkkT<|||", -"||oz2ukfsafasfsffsfsfsfffffL>|||", -"||oz7yspaaaaaaaapppsapaaaaph<|||", -"||X-6ikjjjhjjjhhkkkkkkkkkklf<|||", -"||Xz4gHHFFFHFHFHFFHHHHHJKHHp<|||", -"|| =>9990900000000000r00yyr5:|||", -"|||.>>>>>>>><>>>>>>>>>>>>>>:||||", -"||||||||||||||||||||||||||||||||", -"||||||||||||||||||||||||||||||||", -"||||||||||||||||||||||||||||||||" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_paste.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_paste.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_paste.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_paste.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,189 +0,0 @@ -/* XPM */ -static char *edit_paste__[] = { -/* columns rows colors chars-per-pixel */ -"32 32 151 2 ", -" c #0C0C0C", -". c #101010", -"X c #111111", -"o c #121212", -"O c #181818", -"+ c #2A2A2A", -"@ c #414141", -"# c #434343", -"$ c #444444", -"% c #454545", -"& c #474746", -"* c #474747", -"= c #484848", -"- c #494949", -"; c #4A4A4A", -": c #4B4B4B", -"> c #4C4C4C", -", c #4D4D4D", -"< c #4E4E4E", -"1 c #4F4F4F", -"2 c #505050", -"3 c #515151", -"4 c #525252", -"5 c #535353", -"6 c #545454", -"7 c #555555", -"8 c #565656", -"9 c #575757", -"0 c #585858", -"q c #595959", -"w c #5A5A5A", -"e c #5B5B5B", -"r c #5C5C5C", -"t c #5D5D5D", -"y c #5D5E5C", -"u c #5E5E5E", -"i c #5F5F5F", -"p c #606060", -"a c #616161", -"s c #606260", -"d c #626262", -"f c #636363", -"g c #646464", -"h c #656565", -"j c #666666", -"k c #676767", -"l c #686868", -"z c #696969", -"x c #6A6A6A", -"c c #6B6B6B", -"v c #6C6C6C", -"b c #6D6D6D", -"n c #6E6E6E", -"m c #6F6F6F", -"M c #707070", -"N c #717171", -"B c #727272", -"V c #737373", -"C c #747474", -"Z c #757575", -"A c #767774", -"S c #767676", -"D c #777777", -"F c #777875", -"G c #787878", -"H c #797979", -"J c #7A7A7A", -"K c #7B7B7B", -"L c #7C7C7A", -"P c #7C7C7C", -"I c #7D7D7D", -"U c #7E7E7E", -"Y c #7F7F7F", -"T c #808080", -"R c #868686", -"E c #AEAEAE", -"W c #B4B5B5", -"Q c #B6B7B6", -"! c #B7B7B7", -"~ c #B9B9B9", -"^ c #BBBBBB", -"/ c #BDBDBD", -"( c #BFC0C0", -") c #C1C1C2", -"_ c #C2C2C2", -"` c #C2C3C4", -"' c #C9C9C9", -"] c #CCCDCD", -"[ c #CDCDCE", -"{ c #CECECE", -"} c #D0D1D1", -"| c #D3D3D3", -" . c #D5D5D5", -".. c #D5D5D6", -"X. c #D6D6D6", -"o. c #D7D7D7", -"O. c #D8D8D7", -"+. c #D8D8D8", -"@. c #D9D9D9", -"#. c #D9D9DA", -"$. c #DADADA", -"%. c #DCDDDC", -"&. c #DCDCDD", -"*. c #DDDDDD", -"=. c #DEDEDE", -"-. c #DFDFDE", -";. c #DFDFDF", -":. c #DDE1DF", -">. c #E0E0E0", -",. c #E1E1E1", -"<. c #E2E2E2", -"1. c #E4E4E4", -"2. c #E6E6E6", -"3. c #E7E7E7", -"4. c #E3E9EA", -"5. c #E8E8E8", -"6. c #E9E9E9", -"7. c #ECECEC", -"8. c #EDEDED", -"9. c #EEEEEE", -"0. c #EFF0F0", -"q. c #EEF3F6", -"w. c #F0F0F0", -"e. c #F0F1F1", -"r. c #F1F1F1", -"t. c #F1F2F2", -"y. c #F2F2F2", -"u. c #F2F3F3", -"i. c #F3F3F3", -"p. c #F3F4F4", -"a. c #F4F4F4", -"s. c #F4F5F5", -"d. c #F5F5F5", -"f. c #F5F6F6", -"g. c #F6F6F6", -"h. c #F6F7F7", -"j. c #F7F7F7", -"k. c #F7F8F8", -"l. c #F6F9FB", -"z. c #F8F8F8", -"x. c #F9F9F9", -"c. c #FAFAF9", -"v. c #FAFAFA", -"b. c #FBFBFB", -"n. c #FAFCFD", -"m. c #FCFCFC", -"M. c #FDFDFD", -"N. c #FDFEFE", -"B. c #FEFEFE", -"V. c #FFFFFF", -"C. c None", -/* pixels */ -"C.C.C.C.C.C.C.C.C.C.1.6.1.1.,.,.;.;.C.C.C.C.C.C.C.C.C.C.C.C.C.C.", -"C.C.C.C.C.C.C.C.C.C.~ Q Q ~ ! Q ! ! C.C.C.C.C.C.C.C.C.C.C.C.C.C.", -"C.C.C.C.C.C.C.C.C.Y P Y Y J J P J J J C.C.C.C.C.C.C.C.C.C.C.C.C.", -"C.C.C.J Y Y Y Y Y 6.1.1.,.;.;.+.+.X.| x M M v x x C.C.C.C.C.C.C.", -"C.C.Y E Q ~ ~ / ~ d.d.d.d.d.e.d.d.d.d.` { | X.X.' R C.C.C.C.C.C.", -"C.C.Y Y Y Y Y Y D +.+.+.+.+.+.+.+.+.+.p v c x k k T C.C.C.C.C.C.", -"C.C.C Y Y Y P J J p u u u u e e e e 8 x x x k k p k C.C.C.C.C.C.", -"C.C.M Y Y J J J D D M M v v x x x k k p f p p p p 8 C.C.C.C.C.C.", -"C.C.M Y J J D D D M V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.V.C.C.", -"C.C.v D J J M D M v V.0.e.e.e.p.p.d.d.d.d.d.d.d.x.d.x.x.k.V.C.C.", -"C.C.x D D M M D M x V.e.e.p.d.d.d.d.d.k.x.d.x.x.x.x.x.x.x.V.C.C.", -"C.C.k D D M M M v x V.e.e.p.d.d.d.d.d.x.x.x.x.x.x.x.x.x.x.V.C.C.", -"C.C.k M M M v v v k V.e.p.d.d.d.k.k.x.x.x.x.x.x.x.x.x.x.x.V.C.C.", -"C.C.k M M v x x x k V.p.d.d.d.d.x.x.x.x.x.x.V.x.V.x.V.x.V.V.C.C.", -"C.C.p v v x x k k p V.d.d.d.k.x.x.x.x.x.x.V.x.x.x.x.x.V.x.V.C.C.", -"C.C.u x x x x k k u V.d.k.k.k.x.x.x.x.V.x.x.V.V.x.V.V.x.V.V.C.C.", -"C.C.e x k k k k p u V.d.x.x.x.x.x.x.V.x.x.V.x.V.x.V.x.V.V.V.C.C.", -"C.C.e k k k p p p u V.d.x.x.x.x.V.x.x.V.V.x.V.x.x.V.V.x.x.V.C.C.", -"C.C.8 k p p u u u e V.x.x.x.V.x.x.V.x.V.b.V.V.x.V.x.V.V.V.V.C.C.", -"C.C.8 p p u u e e 8 V.x.x.x.x.x.x.x.V.x.V.x.V.V.V.V.V.V.V.V.C.C.", -"C.C.3 p u u e e e 8 V.x.x.x.V.x.V.x.x.V.x.V.V.V.V.V.V.V.V.V.C.C.", -"C.C.> u e e e 8 8 3 V.x.x.x.x.V.x.V.V.V.V.V.V.V.x.x.x.x.d.k.C.C.", -"C.C.> u e e 8 8 8 3 V.x.x.V.x.V.V.V.V.x.V.V.x.x.d.e.7.7.7.4.C.C.", -"C.C.= e 8 8 8 8 3 > V.x.x.x.V.x.V.x.V.V.V.x.x.e.6.+.] [ ;.C.C.C.", -"C.C.= 9 8 8 3 3 3 > V.x.V.x.x.V.V.b.V.V.V.b.e.o.Q _ :.-.P C.C.C.", -"C.C.& 8 5 3 3 1 1 = V.x.V.x.V.x.b.V.m.V.x.e.1.W V.x.,.F C.C.C.C.", -"C.C.& 3 3 3 > > = = V.x.x.V.x.V.V.V.V.m.x.7.} ( x.,.F C.C.C.C.C.", -"C.C.# 1 > > > : = & V.x.x.V.V.x.m.m.V.m.d.1._ &.,.p C.C.C.C.C.C.", -"C.C.# 1 > > = = = # V.V.V.x.x.V.V.V.V.x.i.;.) ;.u + C.C.C.C.C.C.", -"C.C.O o o o o . . . V.x.x.V.x.V.b.V.V.x.e.+. .& . C.C.C.C.C.C.", -"C.C.C.C.C.C.C.C.C.C.d.V.V.V.V.V.V.V.V.n.q.:.C.C.C.C.C.C.C.C.C.C.", -"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_print.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_print.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_print.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_print.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,267 +0,0 @@ -/* XPM */ -static char *document_print__[] = { -/* columns rows colors chars-per-pixel */ -"32 32 229 2 ", -" c #555753", -". c #5C5E5A", -"X c #5D5F5A", -"o c #5E605B", -"O c #5F615D", -"+ c #71736E", -"@ c #72746F", -"# c #737570", -"$ c #747672", -"% c #767874", -"& c #787A75", -"* c #7A7C77", -"= c #7B7D78", -"- c #7D7F7A", -"; c #7E7E7B", -": c #80827D", -"> c #83847F", -", c #DDC84E", -"< c #29538E", -"1 c #2F5B95", -"2 c #37619B", -"3 c #3A669E", -"4 c #406CA3", -"5 c #426EA6", -"6 c #4973AB", -"7 c #4875AC", -"8 c #527DB3", -"9 c #5883B6", -"0 c #5A88B9", -"q c #6592C3", -"w c #6794C3", -"e c #6A95C6", -"r c #7797C3", -"t c #779AC5", -"y c #7A9AC1", -"u c #789AC3", -"i c #868984", -"p c #888A85", -"a c #888B86", -"s c #8B8D8A", -"d c #8E8F89", -"f c #90928E", -"g c #92948F", -"h c #939591", -"j c #939690", -"k c #949692", -"l c #959692", -"z c #969893", -"x c #979995", -"c c #999B96", -"v c #9A9C97", -"b c #9C9D99", -"n c #9D9F99", -"m c #9D9F9A", -"M c #9EA09B", -"N c #A0A19D", -"B c #A1A39E", -"V c #A3A4A0", -"C c #A3A5A1", -"Z c #A4A5A1", -"A c #A5A7A3", -"S c #A6A8A2", -"D c #A6A9A3", -"F c #A7A8A4", -"G c #A8AAA5", -"H c #A9ABA7", -"J c #ABACA8", -"K c #ACADAA", -"L c #AEAFAB", -"P c #ADB0AA", -"I c #AFB2AD", -"U c #B0B3AD", -"Y c #B0B3AE", -"T c #B6B8B1", -"R c #B7B8B5", -"E c #B8BAB5", -"W c #B8BAB7", -"Q c #B9BBB7", -"! c #B8BCB5", -"~ c #B9BDB5", -"^ c #BABDB6", -"/ c #BABDB7", -"( c #BBBEB7", -") c #BDBFB9", -"_ c #BDC0B5", -"` c #C0C2BC", -"' c #C1C3BF", -"] c #C1C4BD", -"[ c #C3C5BF", -"{ c #83A2C8", -"} c #81A5CB", -"| c #88A6CA", -" . c #86ABD2", -".. c #9DB8D8", -"X. c #9FBEDE", -"o. c #A1C1DF", -"O. c #A5C0DE", -"+. c #A7C2E0", -"@. c #A7C2E1", -"#. c #B1C9E3", -"$. c #B1CAE2", -"%. c #B0CAE5", -"&. c #B5CEE6", -"*. c #B9CFE6", -"=. c #BDD0E8", -"-. c #BCD2E8", -";. c #C3C3C2", -":. c #C2C4C0", -">. c #C3C4C0", -",. c #C4C4C3", -"<. c #C5C7C2", -"1. c #CBCDC2", -"2. c #CACBC4", -"3. c #C9C9C6", -"4. c #CDCFC7", -"5. c #CBCBC9", -"6. c #CCCEC9", -"7. c #CCCCCA", -"8. c #CFD1C5", -"9. c #D0D2CD", -"0. c #D1D3CE", -"q. c #D2D3CF", -"w. c #D2D4CF", -"e. c #D3D7CF", -"r. c #D7D8CD", -"t. c #D9DACF", -"y. c #D2D4D0", -"u. c #D3D5D0", -"i. c #D3D5D1", -"p. c #D4D7D0", -"a. c #D4D6D2", -"s. c #D5D6D3", -"d. c #D6D7D3", -"f. c #D6D7D5", -"g. c #D7D7D5", -"h. c #D7D8D4", -"j. c #D7D8D5", -"k. c #D8D9D5", -"l. c #D9D9D6", -"z. c #D9D9D7", -"x. c #D9DCD7", -"c. c #DADDD6", -"v. c #DCDCD5", -"b. c #D8D9D8", -"n. c #D9DAD8", -"m. c #DADBD9", -"M. c #DBDBD9", -"N. c #DCDDD8", -"B. c #DCDCDA", -"V. c #DCDDDB", -"C. c #DDDEDC", -"Z. c #DEDFDC", -"A. c #DFE2DC", -"S. c #E0E2DD", -"D. c #E1E2DE", -"F. c #E1E3DE", -"G. c #E1E3DF", -"H. c #E2E4DF", -"J. c #C0D1E6", -"K. c #C6D7EA", -"L. c #C7D9EB", -"P. c #CADAEC", -"I. c #CEDDEE", -"U. c #CEDCEF", -"Y. c #D1E0EE", -"T. c #D6E2F0", -"R. c #D6E4F1", -"E. c #D7E5F1", -"W. c #E0E1E0", -"Q. c #E2E3E1", -"!. c #E3E5E0", -"~. c #E3E5E1", -"^. c #E4E5E1", -"/. c #E4E6E1", -"(. c #E5E6E2", -"). c #E6E7E3", -"_. c #E6E7E4", -"`. c #E7E8E4", -"'. c #E7E8E5", -"]. c #E7E8E6", -"[. c #E8E8E5", -"{. c #E8E9E5", -"}. c #E8E9E6", -"|. c #E9E9E6", -" X c #E9EAE7", -".X c #E9EBE7", -"XX c #EAEBE8", -"oX c #EBEBE9", -"OX c #EAEAEA", -"+X c #EAEBEA", -"@X c #EBEBEB", -"#X c #EAECE8", -"$X c #EBECE9", -"%X c #ECECEA", -"&X c #ECEDEA", -"*X c #EDEDEB", -"=X c #EDEEEC", -"-X c #EEEFEC", -";X c #EEEFEE", -":X c #EFEFEE", -">X c #EFF1EE", -",X c #F0F0EE", -"XdXn jX", -"p Z.0X#X^ dX5X5X ", -"; iXc.c.c.c.c.c.c.c.c.c.x.c.c.c.c.c.c.c.c.c.x.c.c.c.c.2., 4.iX= ", -"= 0Xp.e.p.y.p.p.p.p.p.p.p.y.p.p.p.p.p.p.p.p.p.p.p.p.p.r.v.t.0X* ", -"* 5Xe.e.K h h h j x c v v n n M N N Z Z D D H H J K P ) e.e.qX* ", -"& 5Xe.e.C # ;.Q Y U U U Y Y U U U U Y Y I Y U Y ^ ;.+ [ e.e.5X& ", -"% ,Xe.e.R - Q.y.<.^ R R ^ R ^ R R ^ R ^ R R ^ <.y.W.; g.e.e.,X% ", -"% >Xp.r.3.k dX#X.X+X.X.X.X.X#X#X.X.X.X#X#X.X.X#X#XdXh .Xe.e.>X$ ", -"+ >X$X,XR :.aX5XZ.n.n.n.j.n.n.n.x.X,X;X+ ", -"+ + + + D >XdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX;XD + + + + ", -"jXjXjXjX^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ) ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ jXjXjXjX", -"jXjXjXo 6. c #477B0F", -", c #477B10", -"< c #477C10", -"1 c #487B10", -"2 c #487B11", -"3 c #487C10", -"4 c #487C11", -"5 c #487C12", -"6 c #487D12", -"7 c #4A7E12", -"8 c #4C7E12", -"9 c #497D14", -"0 c #4B7D15", -"q c #4D7F15", -"w c #4D8018", -"e c #4E8019", -"r c #4F811B", -"t c #538317", -"y c #56861A", -"u c #50811D", -"i c #50821C", -"p c #56861D", -"a c #54841F", -"s c #618E1F", -"d c #568621", -"f c #5B8A27", -"g c #5D8B2B", -"h c #5E8C2A", -"j c #659023", -"k c #699425", -"l c #63902F", -"z c #66932F", -"x c #699528", -"c c #69952E", -"v c #6E982A", -"b c #739B2B", -"n c #689534", -"m c #6C9635", -"M c #6D9833", -"N c #6C973A", -"B c #6F9A39", -"V c #719A30", -"C c #79A02F", -"Z c #7DA332", -"A c #7EA333", -"S c #7FA434", -"D c #7FA435", -"F c #78A03A", -"G c #7CA139", -"H c #749E41", -"J c #7BA240", -"K c #78A043", -"L c #7CA342", -"P c #78A045", -"I c #79A244", -"U c #79A146", -"Y c #7EA445", -"T c #80A435", -"R c #80A535", -"E c #82A837", -"W c #82A738", -"Q c #83A73A", -"! c #82A838", -"~ c #83A83B", -"^ c #84AA39", -"/ c #86AC3B", -"( c #88AE3D", -") c #8AAF3F", -"_ c #87AB44", -"` c #88AC40", -"' c #89AD43", -"] c #8AAE43", -"[ c #8BAF43", -"{ c #81A84D", -"} c #83A84F", -"| c #87AB4F", -" . c #89AC4D", -".. c #8BB040", -"X. c #8CB141", -"o. c #8DB242", -"O. c #8CB044", -"+. c #8DB244", -"@. c #8FB444", -"#. c #8EB148", -"$. c #8FB249", -"%. c #90B545", -"&. c #90B645", -"*. c #90B646", -"=. c #91B746", -"-. c #92B847", -";. c #93B64E", -":. c #93B948", -">. c #94BA49", -",. c #95BB4A", -"<. c #96BB4B", -"1. c #96BB4C", -"2. c #96BB4E", -"3. c #97BC4C", -"4. c #98BD4D", -"5. c #99BE4E", -"6. c #9ABF4F", -"7. c #82A950", -"8. c #8DB05A", -"9. c #8EB15B", -"0. c #8EB25B", -"q. c #98BD50", -"w. c #9ABE53", -"e. c #9BBF53", -"r. c #90B25B", -"t. c #99B85D", -"y. c #9CBC5C", -"u. c #9DBD5D", -"i. c #93B660", -"p. c #96B660", -"a. c #97B866", -"s. c #9BBC66", -"d. c #9ABC68", -"f. c #9CBD6B", -"g. c #9EBE6D", -"h. c #9BC050", -"j. c #9CC151", -"k. c #9DC252", -"l. c #9EC353", -"z. c #9DC154", -"x. c #9FC454", -"c. c #9FC25A", -"v. c #A0C555", -"b. c #A0C655", -"n. c #A0C456", -"m. c #A1C756", -"M. c #A2C757", -"N. c #A0C459", -"B. c #A1C758", -"V. c #A1C25E", -"C. c #A3C858", -"Z. c #A4C859", -"A. c #A4C959", -"S. c #A4C95B", -"D. c #A5CA5A", -"F. c #A6CB5B", -"G. c #A7CC5C", -"H. c #A8CC5E", -"J. c #A0C060", -"K. c #A1C160", -"L. c #A9CD60", -"P. c #AACE62", -"I. c #A8CB64", -"U. c #ACCF66", -"Y. c #A7C46C", -"T. c #A9C869", -"R. c #ADCD6D", -"E. c #AED069", -"W. c #B0D16D", -"Q. c #A5C473", -"!. c #A5C374", -"~. c #A9C570", -"^. c #ABC771", -"/. c #ADCA73", -"(. c #ADCA74", -"). c #AAC87A", -"_. c #AFCB78", -"`. c #ADC97E", -"'. c #B1CE77", -"]. c #B2CD7B", -"[. c #B1CB7F", -"{. c #B1CC7C", -"}. c #B3CE7F", -"|. c #B4CE7D", -" X c #B3D372", -".X c #B5D376", -"XX c #B7D37E", -"oX c #B7D181", -"OX c #B7D183", -"+X c #B7D085", -"@X c #B8D185", -"#X c #B9D286", -"$X c #BAD486", -"%X c #BCD786", -"&X c #BDD886", -"*X c #BAD388", -"=X c #BAD28A", -"-X c #BCD688", -";X c #BCD48D", -":X c #BCD58D", -">X c #BED68F", -",X c #BDD690", -" >Xd wXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwX, 9X1Xh 7 wXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwX@ qX X1Xn , wXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwX, qXG.E.9XH 7 wXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXwXwXwXwXwX7 7 2 u 9XG.G.E.7X{ , wXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXwXwX, 0 7.f.`.,X5X.XG.G.G.U.7X0., wXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwX, w 9.>XXXR.I.S.b.C.C.C.G.G.P.2Xd.< wXwXwXwXwXwXwX", -"wXwXwXwXwXwX, N :X'.c.k.k.b.b.b.M.M.M.S.S.G.P. wXwXwXwXwX", -"wXwXwXwX> U +Xw.>.5.5.5.5.5.k.k.l.b.b.b.C.B.C.&X).0 wXwXwXwXwXwX", -"wXwXwXwXq [.2.>.>.>.5.>.5.5.5.k.j.k.l.k.x.C.%X!.< wXwXwXwXwXwXwX", -"wXwXwX> r.J.*.*.-.:.2.V./.|.oX#XT.k.j.k.x.-Xg.7 wXwXwXwXwXwXwXwX", -"wXwXwXa ~.@.@.*.*.V.{.s.U l f g #X5.5.k.#Xa., wXwXwXwXwXwXwXwXwX", -"wXwXwXm y.o.o.%.^.i.u , wXwXwX@ #X2.e.oX0.> wXwXwXwXwXwXwXwXwXwX", -"wXwX> Y ;.) [ u.} > wXwXwXwXwX@ |.q.].} > wXwXwXwXwXwXwXwXwXwXwX", -"wXwX2 .[ ) O.t.> wXwXwXwXwXwX@ {.(.K > wXwXwXwXwXwXwXwXwXwXwXwX", -"wXwX2 F o.~ %.L > wXwXwXwXwXwX@ ^.B > wXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXc ] ~ %.M o wXwXwXwXwXwX@ l > wXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXa ] E _ F > wXwXwXwXwXwXo > wXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwX> G R E _ 7 wXwXwXwXwXwXo wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXq Q R ~ M > wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwX> j A A Q k > wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwX> p A A S v o wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwX> y C A A y wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXo 2 k b 8 wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXwXwXO @ . wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", -"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_reload.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_reload.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_reload.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_reload.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,121 +0,0 @@ -/* XPM */ -static char *view_refresh[] = { -/* columns rows colors chars-per-pixel */ -"32 32 83 1 ", -" c #19355F", -". c #1A3764", -"X c #1A3D6D", -"o c #1B3D70", -"O c #1D4276", -"+ c #1E447C", -"@ c #1F4781", -"# c #1F4882", -"$ c #204A87", -"% c #234D89", -"& c #26518B", -"* c #2B548E", -"= c #2D5690", -"- c #2F5E9A", -"; c #315A94", -": c #315E99", -"> c #32619F", -", c #3C639A", -"< c #3565A4", -"1 c #3B67A1", -"2 c #3768A6", -"3 c #3A69A5", -"4 c #3C6CAA", -"5 c #41679C", -"6 c #41699E", -"7 c #436CA3", -"8 c #486FA2", -"9 c #416FAA", -"0 c #4B72A5", -"q c #4372AD", -"w c #4B75AB", -"e c #4675B1", -"r c #4877B1", -"t c #4C7BB4", -"y c #4C7CBA", -"u c #517EB5", -"i c #507FBB", -"p c #5581B6", -"a c #5A81B2", -"s c #5483BA", -"d c #5A86BC", -"f c #5B89BE", -"g c #6187B4", -"h c #6289B6", -"j c #658CBC", -"k c #6A8EBB", -"l c #6F91BD", -"z c #7397BF", -"x c #5684C0", -"c c #5986C1", -"v c #5E8CC1", -"b c #628FC2", -"n c #6592C5", -"m c #6B94C4", -"M c #6997C8", -"N c #6C99CB", -"B c #7195C3", -"V c #7599C5", -"C c #7A9DC6", -"Z c #739DCB", -"A c #7B9FC9", -"S c #7CA1CC", -"D c #7BA4D1", -"F c #82A4CC", -"G c #88A9CF", -"H c #83A9D3", -"J c #8CADD2", -"K c #90AFD2", -"L c #8CB0D7", -"P c #92B1D3", -"I c #93B4DA", -"U c #99B7D8", -"Y c #9CBADC", -"T c #A1BEDD", -"R c #ACC5E2", -"E c #AEC9E3", -"W c #B3CCE5", -"Q c #BAD2E6", -"! c #BFD2E9", -"~ c #C2D6E9", -"^ c #C7D9EC", -"/ c #CCDDEE", -"( c None", -/* pixels */ -"((((((((((((((((((((((((((((((((", -"((((((((((((((((((((((((((((((((", -"((((((((((((%*%%$*%(((((((((((((", -"((((((((((&6lJUTTPFa*%((((((%(((", -"((((((((%,IYJDZNmZSJUV*((((%$(((", -"(((((((%BYHNNNNMMnnnnSJ0%(%C$(((", -"((((((=JIDNNNnnnnnnvvvnJk%VJ$(((", -"(((((%JHNNNnNnnnnvvvvvddFGAJ$(((", -"(((($lLNMMnnnSHLJAmffdddsmsG$(((", -"((((:INMMnnNJk8*=0zFbssssptF$(((", -"(((%SSnnnbZF,%(((($,CmiitstS$(((", -"(((;LnnnnmF*((((((($*SbutttC$(((", -"((%wFnnvfF,((((((((%jmutttrV$(((", -"((&jZnvvmh%((((((($jZZVVBBBB$(((", -"((%BMvvvZ7(((((((%$$%##%##$$%(((", -"((%SbdddC*((((((((((((((((((((((", -"((#SvvssZ&((((((((((((((((((((((", -"((%mfsssb,((((((((((((((((((((((", -"((&afsspjw%((((((((((((/((((((((", -"(($qfptstj=((((((((((VW!~~^(((((", -"(((=jtptttp%((((((((0KEEWWQ~P(((", -"(((%pptrtruu=#((((%=lILIYTRRj(((", -"((((;drreeqwu7;%%;9NZNNZDHIg8(((", -"(((($qtqqqq94ewrttiiyxvvnZm%((((", -"(((((%qr4q444422<<244eyycn&(((((", -"((((((%9w442222<<<<<2<2ri=O(((((", -"((((((($:q422<<<<<<<22q,&o((((((", -"((((((((+$<3<2<<<<<343&+((((((((", -"(((((((((.@$&-<<>>-=*@((((((((((", -"((((((((((((o@#%##o.((((((((((((", -"((((((((((((((((((((((((((((((((", -"((((((((((((((((((((((((((((((((" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_replace.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_replace.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_replace.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_replace.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,174 +0,0 @@ -/* XPM */ -static char *edit_find_replace[] = { -/* columns rows colors chars-per-pixel */ -"32 32 136 2 ", -" c #151B22", -". c #32363A", -"X c #35393C", -"o c #3B3E42", -"O c #3F4144", -"+ c #424649", -"@ c #4B4D4F", -"# c #4B4F54", -"$ c #555658", -"% c #5C5D5F", -"& c #5E6266", -"* c #68696A", -"= c #767675", -"- c #74777A", -"; c #797979", -": c #A27B41", -"> c #CD6B59", -", c #FC7254", -"< c #B98029", -"1 c #DC970F", -"2 c #DD9512", -"3 c #D8921B", -"4 c #E0970D", -"5 c #E49C0B", -"6 c #E7A10C", -"7 c #EAA509", -"8 c #EEAC0C", -"9 c #F0B411", -"0 c #F2BA17", -"q c #F3BC19", -"w c #D59426", -"e c #CE9233", -"r c #D39635", -"t c #F4C222", -"y c #F4C72B", -"u c #F4C92F", -"i c #F5CB33", -"p c #F3CE3D", -"a c #82807C", -"s c #9E827E", -"d c #AC9B7D", -"f c #B9A76B", -"g c #CE9946", -"h c #D39E4A", -"j c #C99B57", -"k c #CA9E5B", -"l c #CCA15E", -"z c #FE8266", -"x c #E18777", -"c c #FD9179", -"v c #C7A26B", -"b c #C9A570", -"n c #F4CD40", -"m c #F4D042", -"M c #F2D34C", -"N c #EFD65D", -"B c #F3D552", -"V c #F0C36A", -"C c #EBD86D", -"Z c #F1D964", -"A c #EBD973", -"S c #E9DA7F", -"D c #868484", -"F c #85878B", -"G c #8C8C8C", -"H c #939394", -"J c #9B9B9C", -"K c #9F9FA0", -"L c #A5A4A4", -"P c #ABA8A3", -"I c #A7A7A8", -"U c #A7A8A9", -"Y c #ABABAC", -"T c #B7AFA5", -"R c #B1B0AF", -"E c #B4B4B3", -"W c #B8B8B7", -"Q c #BCBCBC", -"! c #CBAE85", -"~ c #D0B388", -"^ c #CDB89A", -"/ c #D5BF9F", -"( c #CCBDA9", -") c #C8BEB2", -"_ c #C0BFBF", -"` c #DDC599", -"' c #DBD296", -"] c #DFD89C", -"[ c #E8DA84", -"{ c #E4DA8F", -"} c #E8DE97", -"| c #D1CAAD", -" . c #D9D5AA", -".. c #CEC3B2", -"X. c #C0C0BF", -"o. c #CBC6BF", -"O. c #D9C9B3", -"+. c #D0CFBA", -"@. c #D5D2B3", -"#. c #E0D9A1", -"$. c #E4DFAB", -"%. c #E6E3BC", -"&. c #C3C3C3", -"*. c #C8C7C7", -"=. c #CCC9C7", -"-. c #C6C6C8", -";. c #CCCBCB", -":. c #D3CEC7", -">. c #D0CFCF", -",. c #D2D1C5", -"<. c #DFD4C7", -"1. c #D3D3CE", -"2. c #DEDDCA", -"3. c #CFCFD0", -"4. c #D4D3D3", -"5. c #D8D7D7", -"6. c #D7D7DA", -"7. c #D7D8DD", -"8. c #DBDADB", -"9. c #E0DFDF", -"0. c #E5E3C6", -"q. c #DCDDE1", -"w. c #DFE0E4", -"e. c #E3E3E3", -"r. c #E8E7E7", -"t. c #E6E6EA", -"y. c #E7E8E8", -"u. c #EBEAEB", -"i. c #F0EFEF", -"p. c #EEEEF0", -"a. c #EFF0F1", -"s. c #F3F3F4", -"d. c #F8F7F7", -"f. c #F7F7F8", -"g. c #FBFBFB", -"h. c None", -/* pixels */ -"h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.h.h.h.e.e.e.e.e.e.e.e.e.e.e.e.e.8.X.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.h.h.4.g.g.g.g.g.g.g.g.g.g.g.g.g.g.s.9.X.h.h.h.h.h.h.h.h.h.h.", -"h.h.h.h.;.g.g.g.g.g.g.g.g.g.g.g.g.g.g.s.e.p.W h.h.h.h.h.h.h.h.h.", -"h.h.h.h.;.g.g.u.r.u.r.y.t.u.u.u.u.u.y.r.5.s.y.E h.h.h.h.h.h.h.h.", -"h.h.h.h.;.g.f.u.9.9.9.9.4.Q E R Q >.9.u.8.a.s.y.R h.h.h.h.h.h.h.", -"h.h.h.h.*.d.d.r.8.e.6.E I _ 3.3.&.I I 9.4.i.i.i.9.h.h.h.h.h.h.h.", -"h.h.h.h.*.d.d.u.e.5.L Q u.s.s.f.f.a.-.H Q e.r.y.u.5.h.h.h.c h.h.", -"h.h.h.h.*.d.s.s.s.E &.s.s.f.f.g.f.f.f.3.H -.Q Y U Q E h.x z , h.", -"h.h.h.h.=.s.s.u.1.L u.d.f.f.f.f.f.f.f.a.R X.4.W Y Y E I s > h.h.", -"h.h.h.h.=.i.i.r.Y Q s.s.s.s.s.s.s.s.a.a.;.K 5.;.*.;.' f a D h.h.", -"h.h.h.h.=.i.i.e.K ;.a.p.a.p.p.p.a.a.u.t.7.K 8.9.9.$.i 1 : h.h.h.", -"h.h.h.h.-.u.i.u.I &.a.p.p.p.p.p.p.t.t.u.8.L y.u.%.m 6 < h.h.h.h.", -"h.h.h.h.-.u.u.u.Q Y t.t.t.t.t.t.t.t.u.p.*.Y y.0.B 7 h T h.h.h.h.", -"h.h.h.h.&.u.u.9.*.H 6.q.q.w.w.q.w.t.w.w.J X.2.Z 8 r <.&.h.h.h.h.", -"h.h.h.h.X.r.r.8.5.I E 7.q.7.q.q.q.q.q.Y K ,.A 9 w O.u.&.h.h.h.h.", -"h.h.h.h.X.r.r.9.6.Y F K ;.q.q.q.q.3.K K :.[ q 3 ` t.r.X.h.h.h.h.", -"h.h.h.h._ e.e.e._ D o - L L Y Y K H W 7.} t 2 ~ y.w.e.X.h.h.h.h.", -"h.h.h.h._ e.e.X.F + # W 3.&.W E &.;.3. .u 5 v 4.8.e.e.Q h.h.h.h.", -"h.h.h.h.Q e.;.G @ + E 4.>.3.4.4.4.1. .p 5 j =.5.7.e.8.Q h.h.h.h.", -"h.h.h.h.Q >.H $ o U 4.;.1.>.>.>.;.@.M 7 g :.6.6.8.9.8.Q h.h.h.h.", -"h.h.h.h.Y J % X J >.>.;.;.>.;.;.+.N 8 e ) ;.;.1.5.8.9.Q h.h.h.h.", -"h.h.h.h.; * . H 4.5.4.4.4.4.1.:.C 8 w ..5.4.4.5.5.5.8.W h.h.h.h.", -"h.h.h.h.* . F 5.5.6.6.6.5.5.1.S 0 3 ^ 6.5.5.5.6.5.5.5.W h.h.h.h.", -"h.h.h.= . - 4.5.5.5.5.5.5.1.{ t 2 ! 5.5.5.5.4.5.5.5.5.E h.h.h.h.", -"h.h.= X % ;.4.4.4.4.4.4.>.] y 4 b 4.4.4.4.4.4.4.1.5.4.E h.h.h.h.", -"h.= o I 4.4.>.4.>.4.4.| p 5 k ;.4.4.>.1.4.4.4.1.>.4.E h.h.h.h.", -"h.O h.E >.>.>.>.1.;.=.` V l o.>.>.>.>.>.;.>.4.>.>.>.E h.h.h.h.", -"h.h.h.h.R >.;.>.;.;.1.I d ..;.;.;.;.>.;.;.;.1.;.;.;.>.R h.h.h.h.", -"h.h.h.h.I *.=.*.=.=.*.R E *.=.=.*.;.=.=.*.=.*.*.*.=.=.I h.h.h.h.", -"h.h.h.h.h.= = = = ; = ; ; ; ; = = = = = ; = = = ; ; = h.h.h.h.h.", -"h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_save.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_save.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_save.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_save.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,161 +0,0 @@ -/* XPM */ -static char *document_save__[] = { -/* columns rows colors chars-per-pixel */ -"32 32 123 2 ", -" c #262A2A", -". c #292C2E", -"X c #2D3334", -"o c #333533", -"O c #363836", -"+ c #323739", -"@ c #353A3C", -"# c #393D3D", -"$ c #3B403F", -"% c #3A3F41", -"& c #3E4243", -"* c #404545", -"= c #434847", -"- c #464A4A", -"; c #4B4D4B", -": c #5B5E5D", -"> c #646765", -", c #6D706C", -"< c #6E7170", -"1 c #717472", -"2 c #767A76", -"3 c #777A78", -"4 c #7A7C7A", -"5 c #4E9A06", -"6 c #549D0E", -"7 c #599F18", -"8 c #59A115", -"9 c #62A225", -"0 c #65A825", -"q c #6DA736", -"w c #74B536", -"e c #729352", -"r c #79AA4B", -"t c #7FBE44", -"y c #7F817E", -"u c #82DD29", -"i c #87E030", -"p c #8AE234", -"a c #8EE33A", -"s c #90E33E", -"d c #93BC6B", -"f c #8EC956", -"g c #90CA59", -"h c #94E446", -"j c #99E54F", -"k c #9CE456", -"l c #9FE659", -"z c #A1E75C", -"x c #A3E85F", -"c c #9AD066", -"v c #A4D576", -"b c #A4D970", -"n c #A7D57B", -"m c #A3E860", -"M c #ABEA6E", -"N c #ADE972", -"B c #B4EA7E", -"V c #7F8281", -"C c #818482", -"Z c #898B86", -"A c #8C8E89", -"S c #8F918C", -"D c #91938D", -"F c #939590", -"G c #999A97", -"H c #9C9E99", -"J c #A1AE96", -"K c #A1A29E", -"L c #A6AF9D", -"P c #A9BA98", -"I c #A2A4A1", -"U c #A7A9A4", -"Y c #ACB8A1", -"T c #AEB0AC", -"R c #B2B5AE", -"E c #B3B5B1", -"W c #B6B8B4", -"Q c #BABCB6", -"! c #BCBEB9", -"~ c #B7ED82", -"^ c #B8ED84", -"/ c #BDED8E", -"( c #B9E291", -") c #BFEE90", -"_ c #B3C3A2", -"` c #BEC0BC", -"' c #C0EF93", -"] c #C6EE9F", -"[ c #C2F095", -"{ c #C6F19B", -"} c #C1C2BE", -"| c #C7EDA2", -" . c #C9EEA5", -".. c #CAEEA8", -"X. c #CAF0A3", -"o. c #CDF1AA", -"O. c #D3F3B3", -"+. c #DAF6BE", -"@. c #C4C6C2", -"#. c #C6C8C3", -"$. c #CACBC6", -"%. c #CCCECA", -"&. c #CED0CC", -"*. c #D1D3CE", -"=. c #D4D5D2", -"-. c #D7D8D4", -";. c #D9DAD6", -":. c #DCDCD9", -">. c #DDF4C7", -",. c #DFE0DD", -"<. c #E2F6CE", -"1. c #E1E1DF", -"2. c #E6F9D5", -"3. c #E5E5E3", -"4. c #E8E8E7", -"5. c #ECECEB", -"6. c #EFF0EE", -"7. c #F0F0EF", -"8. c #F3F3F2", -"9. c #F7F8F7", -"0. c #F8F8F7", -"q. c #FBFBFA", -"w. c None", -/* pixels */ -"w.w.w.w.w.w.w.w.w.w.w.w.5 5 5 5 5 5 5 5 5 w.w.w.w.w.w.w.w.w.w.w.", -"w.w.w.w.w.w.w.w.w.w.w.w.5 .O.>.<.| | | 5 w.w.w.w.w.w.w.w.w.w.w.", -"w.w.w.w.w.w.w.w.w.w.w.w.5 .k B / u u | 5 w.w.w.w.w.w.w.w.w.w.w.", -"w.w.w.w.w.w.w.w.w.w.w.w.5 .k B / u u | 5 w.w.w.w.w.w.w.w.w.w.w.", -"w.w.w.w.w.w.w.w.w.w.w.w.5 | k B / u u | 5 w.w.w.w.w.w.w.w.w.w.w.", -"w.w.w.w.w.w.w.w.w.w.w.w.5 X.k B / u u | 5 w.w.w.w.w.w.w.w.w.w.w.", -"w.w.w.w.w.w.w.w.w.w.w.w.5 X.z B / u u | 5 w.w.w.w.w.w.w.w.w.w.w.", -"w.w.w.w.w.w.w.w.w.w.w.w.5 o.z B / u u .5 w.w.w.w.w.w.w.w.w.w.w.", -"w.w.w.w.w.w.w.w.5 5 5 5 6 o.z B ' u i X.6 5 5 5 5 w.w.w.w.w.w.w.", -"w.w.w.w.w.w.w.w.w.8 ..o.o.N x ~ [ i i M o.o...8 w.w.w.w.w.w.w.w.", -"w.w.w.w.w.w.Z A S e 0 | z s x ~ [ p p p l ] 0 e A Z A w.w.w.w.w.", -"w.w.w.w.w.Z =.3.1.3.d w { z m ~ [ p p j X.w d 1.3.:.D w.w.w.w.w.", -"w.w.w.w.w.K :.! *.Q Q r t X.M ~ [ p h X.t r -.$.I =.Q Z w.w.w.w.", -"w.w.w.w.A @.:.#.$.U ` Q q f O./ [ h { f q Q &.-.} -.-.S w.w.w.w.", -"w.w.w.w.Z :.-.%.R U Q Q R 9 v +.{ ) c 9 R Q @.;.:.:.4.S w.w.w.w.", -"w.w.w.w.F 5.$.U R } ! W R L 8 ( 2.b 8 L E W ! @.=.:.4.W w.w.w.w.", -"w.w.w.w.! 4.W @.$.#.! Q W R Y 7 n 8 J R W Q ! #.$.&.4.-.A w.w.w.", -"w.w.w.A :.,.%.&.%.%.$.#.} -.=.P 5 _ 1.! @.@.$.%.&.&.;.4.Z w.w.w.", -"w.w.w.A 8.3.-.*.=.*.=.*.*.=.;.%.&.-.:.*.*.*.*.=.=.*.W 4.H w.w.w.", -"w.w.w.E 6.,.3.-.-.;.-.-.-.-.-.*.=.=.-.-.-.-.-.-.-.#.R 1.#.Z w.w.", -"w.w.A ;.3.=.8.3.:.:.:.;.:.:.;.:.:.:.:.:.:.:.:.:.*.G &.:.1.A w.w.", -"w.w.A 8.-.;.:.8.7.,.,.,.,.,.,.,.:.1.1.:.:.:.:.@.T *.;.=.5.D w.w.", -"w.w.I 8.$.-.:.:.3.9.9.4.3.1.3.3.3.3.1.3.3.:.&.=.;.-.-.$.1.R w.w.", -"w.Z =.7.-.$.:.;.%.%.&.,.4.8.8.0.9.9.8.7.4.:.-.=.*.;.! Q -.=.A w.", -"w.A 4.3.:.%.` 6.5.5.6.5.8.6.7.8.7.7.6.6.6.6.4.4.5.=.W I W 4.Z w.", -"w.2 ` 8.q.q.4.3.3.3.3.4.4.3.3.4.4.4.3.4.4.4.4.3.3.3.q.4.5.$.C w.", -"w.@ 2 A D D F F F F F D A A A Z Z Z Z Z Z Z Z Z Z Z Z Z V d * w.", -"w.X + + @ @ @ @ # # % & & & * & > 2 3 3 3 3 3 4 4 4 < ; - ; X w.", -"w.X + @ @ @ @ # # & & - = * & * 1 X V + C o V o @ o 3 - - % . w.", -"w.w.+ X X @ O @ @ % & = & # % % : < 1 < 1 < < 1 1 < > % % % w.w.", -"w.w.w. @ @ @ @ @ % & & @ @ @ @ % % * % % @ % & @ @ % % X w.w.w.", -"w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_spell.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_spell.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_spell.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_spell.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,294 +0,0 @@ -/* XPM */ -static char *tools_check_spelling[] = { -/* columns rows colors chars-per-pixel */ -"32 32 256 2 ", -" c #000000", -". c #010101", -"X c #020202", -"o c #050000", -"O c #1B1B1B", -"+ c #232323", -"@ c #242424", -"# c #282828", -"$ c #2A2A2A", -"% c #313131", -"& c #454545", -"* c #464646", -"= c #474747", -"- c #BF2201", -"; c #BC250B", -": c #BC260C", -"> c #BB280B", -", c #BC2811", -"< c #C12808", -"1 c #D32604", -"2 c #D92701", -"3 c #C13119", -"4 c #C2351C", -"5 c #C6371E", -"6 c #C1381B", -"7 c #D73310", -"8 c #D13417", -"9 c #F32E04", -"0 c #FC3005", -"q c #F9350C", -"w c #FF370D", -"e c #EE3B17", -"r c #F43B14", -"t c #FE3C12", -"y c #FF3D14", -"u c #FF3E14", -"i c #FE3E15", -"p c #FD3F16", -"a c #FC3F17", -"s c #C63B22", -"d c #C63C24", -"f c #C73F27", -"g c #C73F28", -"h c #BA473B", -"j c #FD4119", -"k c #FF421A", -"l c #FC431C", -"z c #FF441C", -"x c #FF441D", -"c c #FC441E", -"v c #FE461E", -"b c #FF471F", -"n c #CD4128", -"m c #C1482F", -"M c #D64425", -"N c #D3482F", -"B c #CB4434", -"V c #CC4830", -"C c #CB4B35", -"Z c #D94E35", -"A c #DF4F35", -"S c #CB503B", -"D c #C8503E", -"F c #D05039", -"G c #D45439", -"H c #DB5238", -"J c #DD583F", -"K c #EA4728", -"L c #E84C2F", -"P c #FF4720", -"I c #FB4923", -"U c #FE4821", -"Y c #FF4821", -"T c #F44F2C", -"R c #F55131", -"E c #FB5331", -"W c #FF5430", -"Q c #FC5733", -"! c #FF5632", -"~ c #FC5734", -"^ c #FF5834", -"/ c #FF5935", -"( c #FF5936", -") c #F75D3F", -"_ c #FF5B38", -"` c #FF5C39", -"' c #F95C3C", -"] c #BD5044", -"[ c #C15740", -"{ c #C25447", -"} c #C65444", -"| c #D75B44", -" . c #D95840", -".. c #E05A40", -"X. c #E25E45", -"o. c #D2624E", -"O. c #D6654C", -"+. c #DB614A", -"@. c #DE654E", -"#. c #C16652", -"$. c #D4745F", -"%. c #E66147", -"&. c #E66349", -"*. c #EA664C", -"=. c #F36247", -"-. c #F46244", -";. c #FC6443", -":. c #F96344", -">. c #F76649", -",. c #F56B4F", -"<. c #FB694A", -"1. c #FC6A4B", -"2. c #FC6C4D", -"3. c #FF6C4C", -"4. c #FF6C4D", -"5. c #FF6D4D", -"6. c #FC6D4F", -"7. c #FF6E4F", -"8. c #EB6A51", -"9. c #EF6D53", -"0. c #E36F58", -"q. c #EA6F59", -"w. c #F46B51", -"e. c #F96D51", -"r. c #FF6F50", -"t. c #E1725D", -"y. c #E5745E", -"u. c #EF735A", -"i. c #EE745D", -"p. c #F17056", -"a. c #F57055", -"s. c #FD7153", -"d. c #F2725A", -"f. c #F4755A", -"g. c #F6755A", -"h. c #F1755C", -"j. c #F8795F", -"k. c #FC795D", -"l. c #C27363", -"z. c #E37460", -"x. c #E47864", -"c. c #E97861", -"v. c #EE7A63", -"b. c #F27A61", -"n. c #F07863", -"m. c #F37A62", -"M. c #F27A65", -"N. c #FC7C60", -"B. c #FD7C60", -"V. c #FF7E62", -"C. c #F97E64", -"Z. c #FF7F64", -"A. c #D58370", -"S. c #DB8373", -"D. c #DD8274", -"F. c #EF8069", -"G. c #ED806B", -"H. c #EA826F", -"J. c #ED846F", -"K. c #FF8064", -"L. c #F48068", -"P. c #F4866F", -"I. c #F9846C", -"U. c #F9866D", -"Y. c #FA866E", -"T. c #EC8773", -"R. c #ED8975", -"E. c #EF8A76", -"W. c #E0877D", -"Q. c #EE8978", -"!. c #EB8D7F", -"~. c #EE8E7C", -"^. c #F08370", -"/. c #F18670", -"(. c #F78973", -"). c #F28974", -"_. c #F98870", -"`. c #FC8E76", -"'. c #F18F7B", -"]. c #F78E79", -"[. c #F68F7A", -"{. c #F78F7B", -"}. c #EF937F", -"|. c #F7907B", -" X c #F7917B", -".X c #F5917C", -"XX c #F4937F", -"oX c #FB917B", -"OX c #FF9078", -"+X c #E08E80", -"@X c #E49283", -"#X c #E99185", -"$X c #EC9585", -"%X c #EE9685", -"&X c #E6958C", -"*X c #E89889", -"=X c #EF9C8B", -"-X c #EC9C8C", -";X c #F49380", -":X c #F59786", -">X c #F19886", -",X c #F49986", -"XiX'.*.UXUXh.).eXxXiXrX0XrX5XQ.D UXUXUX", -"UXUXUXUXUXUXUXM.M.i.v.L.T.;XaX;X9.b..XrXyX4X1X,X4X:X^.S UXUXUXUX", -"UXUXUXUXUXUXUXL =.,.w.h.b.L.[.yX6X2XsX2X.X{.[.[.(.d.V UXUXUXUXUX", -"UXUXUXUXUXUXUXUXK -.>.w.w.f.N._.gXgXoXY.Y.Y.C.e.R 8 UXUXUXUXUXUX", -"UXUXUXUXUXUXUXUX> e I E ' :.<.7.k.B.s.2.;.Q l q 1 UXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUX- 9 w a a k b U b b t t w 0 2 UXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUX< r b k t u k k b b U l 7 UXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUX6 T ( Q W Q ( ( ` ~ M UXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXm -.7.7.3.7.r.1.G UXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUX[ f.B.B.K.B.O.UXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUX#.(.OX`.$.UXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXl.;XA.UXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_undo.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_undo.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/32x32/tm_undo.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/32x32/tm_undo.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,251 +0,0 @@ -/* XPM */ -static char *edit_undo[] = { -/* columns rows colors chars-per-pixel */ -"32 32 213 2 ", -" c #AF8F00", -". c #B99700", -"X c #BE9C00", -"o c #C2A000", -"O c #C4A000", -"+ c #C4A100", -"@ c #C5A100", -"# c #C4A001", -"$ c #C5A101", -"% c #C5A201", -"& c #C6A200", -"* c #C6A201", -"= c #C4A102", -"- c #C5A202", -"; c #C6A302", -": c #C7A302", -"> c #C7A303", -", c #C7A401", -"< c #C7A402", -"1 c #C7A502", -"2 c #C7A403", -"3 c #C5A104", -"4 c #C5A205", -"5 c #C6A304", -"6 c #C7A304", -"7 c #C7A404", -"8 c #C6A405", -"9 c #C7A505", -"0 c #C7A406", -"q c #C7A507", -"w c #C8A600", -"e c #C8A506", -"r c #C8A606", -"t c #CAA801", -"y c #CCAA05", -"u c #C7A508", -"i c #C8A60A", -"p c #C8A70C", -"a c #D0AF01", -"s c #D2B305", -"d c #DBBD02", -"f c #C9A811", -"g c #CAA913", -"h c #CBAA14", -"j c #CCAC16", -"k c #CBAA1B", -"l c #CEAE1A", -"z c #CEAE1D", -"x c #D1B111", -"c c #D2B428", -"v c #D2B529", -"b c #D2B630", -"n c #D7BB35", -"m c #D7BB37", -"M c #D9BE31", -"N c #D9BF3C", -"B c #DEC106", -"V c #DFC414", -"C c #E2C601", -"Z c #E8CF02", -"A c #EBD303", -"S c #EED502", -"D c #EDD504", -"F c #EDD505", -"G c #EED504", -"H c #EED505", -"J c #EED506", -"K c #EED608", -"L c #EED609", -"P c #EED60A", -"I c #EED60B", -"U c #EFD70C", -"Y c #EFD60D", -"T c #EFD70D", -"R c #EFD70E", -"E c #F0D70F", -"W c #E4C811", -"Q c #E4CA1C", -"! c #EED712", -"~ c #EFD714", -"^ c #EFD811", -"/ c #EFD812", -"( c #EED814", -") c #EFD817", -"_ c #EAD11E", -"` c #EFD91A", -"' c #EFD91B", -"] c #F0D810", -"[ c #F0D811", -"{ c #F0D812", -"} c #F0D912", -"| c #F0D913", -" . c #F0D914", -".. c #F0D915", -"X. c #F1D916", -"o. c #F1DA17", -"O. c #F0DA18", -"+. c #F1DA18", -"@. c #F1DA19", -"#. c #F1DA1A", -"$. c #F2DB1A", -"%. c #F2DB1B", -"&. c #F2DB1C", -"*. c #F2DB1D", -"=. c #F0D91E", -"-. c #F2DB1E", -";. c #F2DC1E", -":. c #F2DC1F", -">. c #DCC120", -",. c #DEC32B", -"<. c #DBC135", -"1. c #E6CD2E", -"2. c #F0D920", -"3. c #F1DB22", -"4. c #F3DC21", -"5. c #F2DC22", -"6. c #F3DC22", -"7. c #F2DC23", -"8. c #F0DB27", -"9. c #F1DC24", -"0. c #F1DC27", -"q. c #F3DD26", -"w. c #F0DC28", -"e. c #F2DD28", -"r. c #F3DE28", -"t. c #F3DE29", -"y. c #F0DB2F", -"u. c #F2DD2E", -"i. c #F3DF2E", -"p. c #E5CE3D", -"a. c #E6D035", -"s. c #F3DD30", -"d. c #F4E035", -"f. c #F5E13E", -"g. c #F5E23E", -"h. c #DEC640", -"j. c #DCC444", -"k. c #DEC74C", -"l. c #E0CA4E", -"z. c #E2CB4E", -"x. c #E7D042", -"c. c #ECD846", -"v. c #E3CB51", -"b. c #E2CC56", -"n. c #E4CE5B", -"m. c #EAD755", -"M. c #F4E143", -"N. c #F5E347", -"B. c #F3E14A", -"V. c #F4E24E", -"C. c #F5E34E", -"Z. c #F4E34F", -"A. c #F5E44F", -"S. c #F6E452", -"D. c #F6E654", -"F. c #E7D363", -"G. c #E8D566", -"H. c #E9D567", -"J. c #ECDA65", -"K. c #EAD76C", -"L. c #E9D86C", -"P. c #EFDE6D", -"I. c #EDDB76", -"U. c #EDDC74", -"Y. c #EFDF7C", -"T. c #EEDF7D", -"R. c #F2E260", -"E. c #F8E863", -"W. c #F6E76C", -"Q. c #F8E96E", -"!. c #F7E970", -"~. c #F6E975", -"^. c #F0E27B", -"/. c #F8EB79", -"(. c #F1E283", -"). c #F2E385", -"_. c #F8EC87", -"`. c #F9EC87", -"'. c #FAED87", -"]. c #F3E68E", -"[. c #FBEE8C", -"{. c #FAEF8F", -"}. c #F4E893", -"|. c #FAEE91", -" X c #FAEF91", -".X c #F9EF92", -"XX c #FAEF92", -"oX c #FAEE94", -"OX c #FAEF94", -"+X c #F9ED96", -"@X c #F9EE96", -"#X c #FAEE96", -"$X c #FAEF9E", -"%X c #FCF195", -"&X c #FBF19D", -"*X c #FCF29E", -"=X c #F9EFA4", -"-X c #FAF0A3", -";X c #FCF2A3", -":X c #FBF2A6", -">X c #FCF3A6", -",X c #FAF0A9", -"Xd.:.:.:.E.5X,X}.Y.n.p - 0X0X0X0X0X0X0X0X0X", -"0X0X0X0X0X0X0X5 I.*Xi.:.:.:.:.-.-.q.g.S./.>XG.g - 0X0X0X0X0X0X0X", -"0X0X0X0X0X0Xq (.%Xr.:.:.-.-.%.%.-.%.%.%.%.e.Q.-X<.6 0X0X0X0X0X0X", -"0X0X0X0X0X- K.3Xr.:.:.-.-.-.%.%.%.%.o.o.%.o.o.s.=Xk.6 0X0X0X0X0X", -"0X0X0X0X0X0Xi ].'.4.-.%.-.%.%.%.o.o.%.o.o.o.o.{ 8.#Xl.- 0X0X0X0X", -"0X0X0X0X0X0X0Xu ).[.4.%.%.%.%.o.o.o.~ o.( / { { { 4.#Xg 0X0X0X0X", -"0X0X0X0X0X0X0X0X5 Y.{.4.o.o.%.A.|.|.'.!.M.%.{ { { ] S.J.w 0X0X0X", -"0X0X0X0X0X0X0X0X0Xq U.|.4.o.( ;Xb c n l.^.#XA.{ ] E ! ~.l 0X0X0X", -"0X0X0X0X0X0X0X0X0X0Xe L.|.4.( 1X5 0X0X0X2 j P.!.! E Y B.<.0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X- F.%Xq.&X5 0X0X0X0X0X- m.C.L L y.x.- 0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X2 v.[.#X5 0X0X0X0X0X0Xe D.' I ' c.2 0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X2 <.[.5 0X0X0X0X0X0X- x.8.I ' a.2 0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0Xw M # 0X0X0X0X0X0X- ,.8.L ' V 0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X6 - 0X0X0X0X0X0Xw 1.' J 4.x 0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X# 0X0X0X0X0X0Xe y.L ! _ 5 0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X- Q ! J ( y 0X0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X- V ~ J L B - 0X0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X- W L D A d - 0X0X0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X s D S A a - 0X0X0X0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0Xw Z C w X 0X0X0X0X0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X. - # 0X0X0X0X0X0X0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X", -"0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X0X" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_back.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_back.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_back.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_back.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,271 +0,0 @@ -/* XPM */ -static char *go_previous__[] = { -/* columns rows colors chars-per-pixel */ -"48 48 217 2 ", -" c #1D4278", -". c #1F467D", -"X c #1F4680", -"o c #214A85", -"O c #224A84", -"+ c #204A87", -"@ c #214B88", -"# c #214C89", -"$ c #224C89", -"% c #234C89", -"& c #244D89", -"* c #254D89", -"= c #254E89", -"- c #244E8A", -"; c #254E8A", -": c #264F8A", -"> c #264F8B", -", c #26508B", -"< c #25508D", -"1 c #27508C", -"2 c #27518C", -"3 c #27518D", -"4 c #26518E", -"5 c #27518E", -"6 c #27528E", -"7 c #27538F", -"8 c #28518C", -"9 c #29528D", -"0 c #28528E", -"q c #29538F", -"w c #2B548E", -"e c #2A548F", -"r c #2C558F", -"t c #285390", -"y c #295390", -"u c #295490", -"i c #295491", -"p c #2A5490", -"a c #2B5590", -"s c #2A5491", -"d c #2C5590", -"f c #2C5691", -"g c #2E5791", -"h c #2D5692", -"j c #2D5792", -"k c #2D5793", -"l c #2F5891", -"z c #2E5892", -"x c #2F5892", -"c c #2F5893", -"v c #2E5995", -"b c #305892", -"n c #305992", -"m c #305893", -"M c #305993", -"N c #315993", -"B c #315C97", -"V c #335C96", -"C c #345C94", -"Z c #345C95", -"A c #355D95", -"S c #36609A", -"D c #34609C", -"F c #36639F", -"G c #386098", -"H c #396098", -"J c #396199", -"K c #3A6198", -"L c #39619A", -"P c #3D639A", -"I c #3B649E", -"U c #3E659C", -"Y c #3F669D", -"T c #3E669E", -"R c #3465A4", -"E c #3566A4", -"W c #3566A5", -"Q c #3667A5", -"! c #3767A6", -"~ c #3A67A4", -"^ c #3768A5", -"/ c #3768A6", -"( c #3F69A2", -") c #3A68A4", -"_ c #3B68A4", -"` c #3B69A4", -"' c #3868A6", -"] c #3969A6", -"[ c #3969A7", -"{ c #3A69A6", -"} c #3A69A7", -"| c #3A6AA7", -" . c #3B6BA7", -".. c #3C69A4", -"X. c #3D6AA4", -"o. c #3D6AA5", -"O. c #3E6AA5", -"+. c #3E6BA5", -"@. c #3F6BA6", -"#. c #3F6CA6", -"$. c #3C6CA9", -"%. c #3E6DA9", -"&. c #3F6DA9", -"*. c #436BA2", -"=. c #446AA0", -"-. c #456BA0", -";. c #436DA5", -":. c #406CA6", -">. c #406DA7", -",. c #416DA7", -"<. c #416EA8", -"1. c #406EA9", -"2. c #436FA8", -"3. c #416FAA", -"4. c #4A70A4", -"5. c #4971A6", -"6. c #4370A9", -"7. c #4370AB", -"8. c #4371AB", -"9. c #4470A9", -"0. c #4470AA", -"q. c #4672AC", -"w. c #4871A8", -"e. c #4B75AB", -"r. c #4F76AA", -"t. c #4B76AE", -"y. c #4D76AD", -"u. c #4D77AF", -"i. c #4E78AE", -"p. c #4E78AF", -"a. c #5075A8", -"s. c #5076A8", -"d. c #537AAD", -"f. c #537BAF", -"g. c #567BAC", -"h. c #4575B0", -"j. c #4877B1", -"k. c #4978B3", -"l. c #4979B3", -"z. c #4A79B2", -"x. c #4A79B3", -"c. c #4B7AB3", -"v. c #4D78B0", -"b. c #4F79B0", -"n. c #4C7AB4", -"m. c #4C7BB4", -"M. c #4D7BB4", -"N. c #4E7CB5", -"B. c #4F7DB5", -"V. c #537DB3", -"C. c #547EB3", -"Z. c #557FB3", -"A. c #507DB5", -"S. c #507DB6", -"D. c #507EB6", -"F. c #517EB6", -"G. c #517FB6", -"H. c #527FB6", -"J. c #537FB6", -"K. c #527FB7", -"L. c #567FB4", -"P. c #5280B7", -"I. c #5380B7", -"U. c #5780B4", -"Y. c #5B80B1", -"T. c #5C80B1", -"R. c #5C81B1", -"E. c #5D83B3", -"W. c #5982B5", -"Q. c #5A82B5", -"!. c #5A83B5", -"~. c #5B83B6", -"^. c #5C84B6", -"/. c #5D85B7", -"(. c #5E85B7", -"). c #5F86B7", -"_. c #5480B8", -"`. c #5681B8", -"'. c #5582B8", -"]. c #5682B8", -"[. c #5682B9", -"{. c #5782B9", -"}. c #5B84B9", -"|. c #5984BA", -" X c #5F86B8", -".X c #5C87BB", -"XX c #6185B4", -"oX c #6085B5", -"OX c #6087B8", -"+X c #6187B9", -"@X c #6288B8", -"#X c #6389B9", -"$X c #6489B8", -"%X c #6589B8", -"&X c #6489B9", -"*X c #6589B9", -"=X c #658BBA", -"-X c #648ABB", -";X c #668BBA", -":X c #608ABD", -">X c #628BBD", -",X c #648CBE", -" rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX> -.R.x rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX1 4.qXqXM rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXr r.0XwX3XM rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXM g.0X{.{.&XM rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXC R.5XI.k.{.#Xx rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXK XX5XF.k.k.].$Xl rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXT &X =.3X:XN.k.k.k.k.F.0X-X#X X X(.(.(.(.(.^.~.!.!.!.d.p rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrX9 5.5X Xc.c.k.k.k.k.N.I.I.I.I.I.I.F.I.F.F.I.F.I.F.{.!.f rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXr a.5X|.c.k.c.k.c.k.c.k.k.c.k.c.k.k.k.c.k.c.k.c.k.j.F.L.M rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXM g.wX{.k.c.c.k.c.k.c.k.c.k.k.c.k.c.k.k.k.c.k.c.k.c.k.F.L.f rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXA L.3XK.n.l.l.k.c.k.c.k.c.k.c.c.k.c.k.c.k.c.k.c.k.c.k.c.F.L.b rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXK XX T #X>XN.l.l.l.l.l.c.k.c.k.c.k.c.k.c.k.k.c.k.c.k.c.l.l.l.l.l.F.C.f rXrXrXrXrXrXrXrX", -"rXrXrXrXrX# U &X Xh.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.k.c.f rXrXrXrXrXrXrXrX", -"rXrXrXrXrX+ P R.k._ / ! _ / / / / / / / / / / / / / / / / / / / / / / / _ $.1.i rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrX> K d.t._ R R R R R R R R R R R R R E R R R R R R R R R R R R / ;.4 rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXA r.i._ R R R R R R R R R R R R R R R R R R R R R R R R R ~ +.i rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXx 5.c. .R R R R R R R R R R R R R R R R R R R R R R R R ! +.4 rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXq *.i.%.E R R R R R R R R R R R R R R R R R R R R R R / _ 4 rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrX2 T i.%.E R R R R R R R R R R R R R R R R R R R R R ! _ 2 rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrX> K t.1.R R R R R R ! / | / | / ! _ / ! / / / / ! / _ 2 rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrX# V w.7./ R R R R _ q.7.;.;.1.%.@.+.+.+._ _ _ _ _ R > rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXx ;.8./ R R R | 1.v p p p p p i i i p 4 p i 4 2 # rXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXp ( 7._ R R | #.2 rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX9 I 7._ ! _ +.4 rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX> A %.| / +.2 rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX+ B #.%.+.> rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX. k +.+.> rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX p D > rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX> + rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX. rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX", -"rXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrXrX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_cancel.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_cancel.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_cancel.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_cancel.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -/* XPM */ -static char *dialog_no[] = { -/* columns rows colors chars-per-pixel */ -"48 48 39 1 ", -" c #930303", -". c #9B0303", -"X c #A20606", -"o c #A40808", -"O c #AB0B0B", -"+ c #AE1313", -"@ c #B11515", -"# c #B41C1C", -"$ c #B62121", -"% c #BA2424", -"& c #BD2B2B", -"* c #BE3131", -"= c #C12E2E", -"- c #C43434", -"; c #C53B3B", -": c #CA3B3B", -"> c #C64141", -", c #CC4343", -"< c #CC4B4B", -"1 c #D14646", -"2 c #D34B4B", -"3 c #CF5252", -"4 c #D25454", -"5 c #DA5454", -"6 c #D35A5A", -"7 c #DD5A5A", -"8 c #E05E5E", -"9 c #D66161", -"0 c #D96464", -"q c #DC6A6A", -"w c #DE7272", -"e c #E16363", -"r c #E26B6B", -"t c #E47474", -"y c #E57C7C", -"u c #E58383", -"i c #E68B8B", -"p c #E79090", -"a c None", -/* pixels */ -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaa==aaaaaaaaaaaaaaaaaaa=&aaaaaaaaaaaa", -"aaaaaaaaaaaa-44-aaaaaaaaaaaaaaaaa-44-aaaaaaaaaaa", -"aaaaaaaaaaa=6pp6=aaaaaaaaaaaaaaa=6pp4-aaaaaaaaaa", -"aaaaaaaaaa=6iuui6-aaaaaaaaaaaaa=6iuui6-aaaaaaaaa", -"aaaaaaaaa&4iyrrui6=aaaaaaaaaaa=6purryu4=aaaaaaaa", -"aaaaaaaa&3uyrrrruu4&aaaaaaaaa&4iurrrryu4&aaaaaaa", -"aaaaaaa&3uyeerrrryi3&aaaaaaa&3iyrrrrertu4&aaaaaa", -"aaaaaa%wt88e888888ry0tt88788887etq>%aaaaaaaa", -"aaaaaaaaaaa;qt777888878ryre87887777wq;%aaaaaaaaa", -"aaaaaaaaaaaa;0w777777788e777777777tq;aaaaaaaaaaa", -"aaaaaaaaaaaaa;9r75777575777777757t0-aaaaaaaaaaaa", -"aaaaaaaaaaaaaa*9q755757555555557q9*aaaaaaaaaaaaa", -"aaaaaaaaaaaaaaa&6q7525575255555q6&aaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaa&6052552255525q6&aaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaa%4055252525252e6%aaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaa%2052222222222250<$aaaaaaaaaaaaaa", -"aaaaaaaaaaaaaa$<94212222222222220<%aaaaaaaaaaaaa", -"aaaaaaaaaaaaa$>6211211112211111226>#aaaaaaaaaaaa", -"aaaaaaaaaaaa#;421111111111111111126>#aaaaaaaaaaa", -"aaaaaaaaaaa@;421,,:,,1,1,1111,:,,114;@aaaaaaaaaa", -"aaaaaaaaaa@-4,:11:1::,,242,:1:1:1:,,4-@aaaaaaaaa", -"aaaaaaaaa@*3,:::::1:,:<<><2::1::::::<<*@aaaaaaaa", -"aaaaaaaa@&<>:::::::::,<&+&<,:::::::::,<*+aaaaaaa", -"aaaaaaaO%<,:-::-:::-,<&Oa+&<:-::-::--::,&Oaaaaaa", -"aaaaaaO$>>---:--:-->>%+aaa+*<;-;-:--:--><$Oaaaaa", -"aaaaaaO#>;--------:>%Oaaaaa+-,---------;;@Oaaaaa", -"aaaaaaaO$;--=----;;$Oaaaaaaa+*>--=--=-;-@Oaaaaaa", -"aaaaaaaaO#--====;;#oaaaaaaaaa+*;-===-:*@aaaaaaaa", -"aaaaaaaaaO#--===-#oaaaaaaaaaaa+*-===-&Oaaaaaaaaa", -"aaaaaaaaaaX#====#.aaaaaaaaaaaaa+====$Oaaaaaaaaaa", -"aaaaaaaaaaa.@&&@.aaaaaaaaaaaaaa +&-#oaaaaaaaaaaa", -"aaaaaaaaaaaa.++.aaaaaaaaaaaaaaaa ++.aaaaaaaaaaaa", -"aaaaaaaaaaaaa. aaaaaaaaaaaaaaaaaa .aaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", -"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_copy.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_copy.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_copy.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_copy.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,190 +0,0 @@ -/* XPM */ -static char *edit_copy__[] = { -/* columns rows colors chars-per-pixel */ -"48 48 136 2 ", -" c #808587", -". c #939695", -"X c #A0A1A0", -"o c #A5A6A5", -"O c #A4A4A6", -"+ c #A7A9A7", -"@ c #A9AAA7", -"# c #A5A9A8", -"$ c #A7ACAD", -"% c #A9ABA8", -"& c #ABACA9", -"* c #ABACAA", -"= c #AAABAC", -"- c #ADADAE", -"; c #AEAEAE", -": c #AEAFAF", -"> c #AFAFAF", -", c #AFB0B0", -"< c #B0B0B0", -"1 c #B0B1B1", -"2 c #B1B1B1", -"3 c #B0B0B2", -"4 c #B2B2B2", -"5 c #B3B3B3", -"6 c #B2B3B4", -"7 c #B0B6B7", -"8 c #B4B4B4", -"9 c #B5B5B5", -"0 c #B5B6B6", -"q c #B6B6B6", -"w c #B6B6B7", -"e c #B7B7B7", -"r c #B8B8B8", -"t c #B9B9B9", -"y c #B8B8BA", -"u c #B8B9BA", -"i c #B8BABB", -"p c #BABABA", -"a c #BABBBB", -"s c #BCBEBE", -"d c #BEBFBF", -"f c #BFC0C0", -"g c #C0C2C3", -"h c #C2C3C3", -"j c #C3C3C4", -"k c #C4C4C6", -"l c #C5C5C6", -"z c #C2C8CB", -"x c #C8C8C8", -"c c #C9C9CA", -"v c #CCCCCD", -"b c #CFCFD0", -"n c #CFD0D0", -"m c #CED7DB", -"M c #CFD9DF", -"N c #D2D2D4", -"B c #D1D4D5", -"V c #D4D4D4", -"C c #D4D5D5", -"Z c #D4D5D6", -"A c #D6D6D6", -"S c #D5D7D8", -"D c #D8D8D8", -"F c #D8D9D9", -"G c #D9D9D9", -"H c #D9DADA", -"J c #DADADA", -"K c #DCDCDC", -"L c #DDDDDD", -"P c #DDDEDE", -"I c #DEDEDE", -"U c #DFDFDF", -"Y c #DFE0DF", -"T c #E0E0E0", -"R c #E1E1E1", -"E c #E2E2E3", -"W c #E1E3E4", -"Q c #E4E4E4", -"! c #E5E6E6", -"~ c #E6E6E6", -"^ c #E6E7E7", -"/ c #E7E7E7", -"( c #E7E8E8", -") c #E8E8E8", -"_ c #E8E9E9", -"` c #E9E9E9", -"' c #E9EAEA", -"] c #EAEAEA", -"[ c #EAEAEB", -"{ c #EAEBEB", -"} c #EBEBEB", -"| c #EAECEC", -" . c #EBECEC", -".. c #ECECEC", -"X. c #ECEDED", -"o. c #EDEDED", -"O. c #EDEEEE", -"+. c #EEEEEE", -"@. c #EEEFEF", -"#. c #EFEFEF", -"$. c #E6EDF0", -"%. c #EFF0F0", -"&. c #EEF3F5", -"*. c #EFF4F6", -"=. c #F0F0F0", -"-. c #F1F1F0", -";. c #F0F1F1", -":. c #F1F1F1", -">. c #F1F2F2", -",. c #F2F2F2", -"<. c #F2F3F3", -"1. c #F3F3F3", -"2. c #F3F4F4", -"3. c #F4F4F4", -"4. c #F4F5F5", -"5. c #F5F5F5", -"6. c #F6F6F5", -"7. c #F5F6F6", -"8. c #F6F6F6", -"9. c #F6F7F7", -"0. c #F7F7F7", -"q. c #F7F8F8", -"w. c #F6F8F9", -"e. c #F6F9FB", -"r. c #F8F8F8", -"t. c #F8F9F9", -"y. c #F9F9F9", -"u. c #FAFAFA", -"i. c #FAFBFB", -"p. c #FBFBFB", -"a. c #FBFCFE", -"s. c #FCFCFC", -"d. c #FDFDFD", -"f. c #FEFEFE", -"g. c #FFFFFF", -"h. c None", -/* pixels */ -"h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.g. .{ { . .X.X.X.X.X.%.X.=.%.=.=.=.=.=.=.=.=.=.=.3.=.3.=.=.3.=.g.h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.g.{ . .X.X.%.X.X.%.@.%.=.=.=.=.=.=.3.=.=.=.2.=.2.=.2.=.=.3.=.2.g.h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.g. . .X.X.X.X.X.=.X.^ ! ! ! ! ( ! ( { { { ! { ( { ! { { { { ( { 3.h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.g.X.X.X.X.X.%.%.X.{ p ; ; ; , ; , , ; 4 ; 4 , 4 4 4 4 ; 4 4 4 ; p h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.g.X.X.X.%.=.=.=.=.! ; g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.g.h.h.", -"h.h.g.X.%.%.X.%.=.%.=.( < g.{ { { X.X.X.X.@.@.X.X.%.=.%.=.%.=.=.=.2.=.=.=.2.=.2.=.=.2.=.=.g.h.h.", -"h.h.g.X.%.%.%.=.=.2.=.{ < g.{ .{ X.X.@.X.X.@.@.%.=.=.=.=.2.2.2.2.=.2.2.2.2.2.2.3.2.3.2.3.g.h.h.", -"h.h.g.X.=.%.=.=.=.=.2.( 4 g.X.X.X.X.@.X.%.@.%.=.=.=.=.=.=.=.=.2.2.2.2.2.2.3.3.3.3.3.3.3.3.g.h.h.", -"h.h.g.=.=.=.=.2.2.2.2. .4 g.X.X.X.X.X.@.%.=.%.%.=.=.2.2.2.2.2.2.3.3.3.2.3.3.3.3.3.3.3.3.3.g.h.h.", -"h.h.g.=.=.=.=.2.2.2.3.{ 4 g.X.X.X.@.@.=.=.2.=.2.2.=.2.2.2.3.3.3.3.0.3.3.3.r.3.0.r.r.3.r.3.g.h.h.", -"h.h.g.=.=.2.2.=.2.2.3.{ 4 g.%.X.=.=.%.=.=.=.2.=.2.2.2.3.3.3.w.3.3.0.0.0.w.3.r.3.w.3.r.3.3.g.h.h.", -"h.h.g.=.=.2.2.2.3.3.w.X.4 g.X.X.%.%.=.=.2.=.=.2.2.3.3.3.3.3.3.w.3.0.r.3.r.r.r.r.r.r.r.r.r.g.h.h.", -"h.h.g.=.2.2.2.3.3.3.0.X.8 g.%.=.%.=.=.2.=.2.3.2.3.3.3.0.r.0.3.r.0.r.r.r.r.r.r.r.r.r.r.r.r.g.h.h.", -"h.h.g.2.2.3.3.3.3.3.r.X.8 g.%.%.=.=.2.=.2.2.3.2.3.0.0.0.0.0.0.w.r.r.r.w.r.r.r.r.s.r.s.r.r.g.h.h.", -"h.h.g.=.2.3.0.3.r.0.r.#.8 g.=.2.=.2.2.2.3.3.3.0.3.0.0.0.0.0.r.r.r.r.r.g.s.r.s.r.r.s.r.p.r.g.h.h.", -"h.h.g.2.3.3.0.0.r.r.r.=.8 g.=.=.=.2.2.2.3.3.3.3.0.0.0.r.r.w.p.r.r.g.r.r.r.s.r.s.s.r.s.r.r.g.h.h.", -"h.h.g.3.3.0.3.r.w.r.r.X.8 g.=.=.3.=.2.2.3.0.0.0.0.0.w.r.p.r.p.p.r.r.g.r.s.r.s.r.r.s.r.s.r.g.h.h.", -"h.h.g.3.3.0.w.3.r.r.r.=.8 g.=.2.3.2.3.0.0.3.0.0.r.r.r.r.p.p.r.p.g.r.r.g.r.g.r.g.g.r.p.p.p.g.h.h.", -"h.h.g.3.0.3.r.r.r.r.p.=.8 g.3.3.2.3.3.3.0.w.r.r.p.r.p.p.r.p.r.p.r.r.g.r.r.r.g.r.r.g.p.p.r.g.h.h.", -"h.h.g.3.0.r.r.r.r.r.r.=.e g.3.3.3.3.0.0.0.w.r.p.r.p.p.r.p.p.p.p.r.g.r.g.g.g.r.g.g.p.s.s.g.g.h.h.", -"h.h.g.3.3.r.r.r.g.s.r.=.8 g.2.3.3.0.3.w.0.r.r.r.r.p.p.r.p.p.p.p.g.r.g.r.g.r.g.r.r.g.s.s.s.g.h.h.", -"h.h.g.3.r.r.r.r.r.s.r.=.8 g.3.0.0.0.0.r.r.r.r.p.p.p.p.p.p.p.p.p.g.r.g.g.r.g.r.g.r.g.g.r.g.g.h.h.", -"h.h.g.3.r.r.r.s.s.r.g.=.8 g.3.3.0.0.0.r.r.r.p.p.p.r.p.p.p.p.s.p.r.g.g.r.r.g.g.g.g.r.g.g.r.g.h.h.", -"h.h.g.0.r.p.r.g.g.r.r.=.8 g.3.3.3.0.r.r.p.p.p.r.p.p.p.p.s.s.s.s.g.r.g.r.g.g.g.r.g.g.r.g.g.g.h.h.", -"h.h.g.w.r.r.r.r.r.r.g.=.p g.3.w.0.0.r.r.p.r.p.r.p.p.p.p.s.s.s.s.g.r.g.g.g.r.g.g.g.g.g.g.g.g.h.h.", -"h.h.g.r.r.r.s.r.r.g.r.@.8 g.0.0.w.0.r.p.r.p.p.p.p.p.s.s.s.p.s.g.g.g.r.g.g.g.g.g.r.g.g.g.g.g.h.h.", -"h.h.g.r.r.s.r.s.p.p.g.=.e g.0.0.r.p.r.p.p.p.p.p.p.s.s.s.s.g.s.s.r.g.g.g.g.g.r.g.g.g.r.g.g.g.h.h.", -"h.h.g.r.r.s.s.r.p.p.g.2.e g.0.0.0.0.p.p.r.p.p.p.s.s.p.s.s.g.g.s.g.g.r.g.g.g.g.g.g.g.g.g.g.g.h.h.", -"h.h.g.r.r.r.r.g.r.g.r.=.8 g.0.0.p.p.p.r.p.p.p.p.s.s.p.g.s.s.s.g.g.g.g.g.g.r.g.r.r.g.r.r.s.s.h.h.", -"h.h.g.r.r.r.g.r.r.g.g.=.8 g.w.r.r.r.g.g.r.g.r.g.r.r.g.g.g.r.g.g.g.g.g.r.s.r.r.3.0.3.3.3.r.e.h.h.", -"h.h.g.r.r.g.r.g.r.g.g.=.p g.r.r.r.g.r.r.r.r.g.r.g.g.g.r.g.g.g.g.g.r.g.r.3.3.=.#.X.....X.=.2.h.h.", -"h.h.g.r.r.r.r.g.r.g.g.=.p g.r.r.r.r.r.g.g.r.g.g.r.g.g.g.g.r.g.g.g.g.r.=.@.{ ! L G G G K W z h.h.", -"h.h.g.r.g.r.r.r.g.r.r.=.8 g.r.r.r.g.r.r.r.g.g.r.g.g.r.g.g.g.g.g.r.r.=.X.R D n c l j c A 7 h.h.h.", -"h.h.g.r.r.g.r.g.r.g.g.=.p g.3.r.r.r.g.r.g.r.g.g.r.g.r.g.g.g.g.r.r.=.{ L b j p 4 8 n G $ h.h.h.h.", -"h.h.g.g.r.r.r.g.g.r.g.=.p g.r.g.g.r.r.g.r.g.r.r.g.g.g.g.g.g.g.r.3.X.L c ; 4 f G =.R # h.h.h.h.h.", -"h.h.g.r.r.r.g.r.r.g.g.=.p g.r.r.g.r.g.r.g.r.r.g.r.r.g.g.g.g.r.3.X.R b 8 V s.s.3.R # h.h.h.h.h.h.", -"h.h.g.r.g.r.r.g.g.r.g.=.8 g.r.g.r.r.r.g.r.g.g.g.g.g.g.g.r.g.r.=.{ A j = L g.3.Y % h.h.h.h.h.h.h.", -"h.h.g.r.r.r.g.r.r.g.g.=.8 g.r.r.r.g.r.r.g.g.g.r.p.g.p.g.g.p.3.#.R v u O 2.0.R % h.h.h.h.h.h.h.h.", -"h.h.g.g.g.g.g.g.g.g.g.3.p g.r.g.r.g.g.r.g.r.r.g.p.g.g.g.g.p.3.} G l , a 3.R % h.h.h.h.h.h.h.h.h.", -"h.h.h.h.h.h.h.h.h.h.h.h.h.g.r.g.r.r.g.r.r.r.g.g.g.g.p.g.p.r.3.{ Z f ; K Y % h.h.h.h.h.h.h.h.h.h.", -"h.h.h.h.h.h.h.h.h.h.h.h.h.g.r.r.g.r.r.g.g.g.r.g.p.g.g.g.g.p.=.{ N s p L + h.h.h.h.h.h.h.h.h.h.h.", -"h.h.h.h.h.h.h.h.h.h.h.h.h.g.r.r.r.g.r.r.p.g.r.g.p.g.p.g.s.r.=.! N f B X h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.h.h.h.h.h.h.h.h.h.h.h.g.r.g.r.g.r.g.g.r.g.g.g.g.g.g.g.s.3.{ S m . h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.h.h.h.h.h.h.h.h.h.h.h.g.g.r.g.r.r.g.r.g.g.r.p.g.r.p.r.w.&.$.M h.h.h.h.h.h.h.h.h.h.h.h.h.h.", -"h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_cut.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_cut.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_cut.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_cut.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,218 +0,0 @@ -/* XPM */ -static char *edit_cut[] = { -/* columns rows colors chars-per-pixel */ -"48 48 164 2 ", -" c #090909", -". c #0A0A0A", -"X c #0B0B0B", -"o c #0C0C0C", -"O c #0D0D0D", -"+ c #101010", -"@ c #111111", -"# c #121212", -"$ c #141414", -"% c #161616", -"& c #1F1F1F", -"* c #222222", -"= c #232323", -"- c #2F2F2F", -"; c #474747", -": c #494949", -"> c #4A4A4A", -", c #4B4B4B", -"< c #4F4F4F", -"1 c #575757", -"2 c #5A5A5A", -"3 c #5D5D5D", -"4 c #616161", -"5 c #626262", -"6 c #646464", -"7 c #6B6B6B", -"8 c #6D6D6D", -"9 c #6E6E6E", -"0 c #6F6F6F", -"q c #707070", -"w c #717171", -"e c #737373", -"r c #747474", -"t c #777777", -"y c #787878", -"u c #797979", -"i c #7B7B7B", -"p c #7C7C7C", -"a c #7D7D7D", -"s c #7E7E7E", -"d c #7F7F7F", -"f c #818181", -"g c #828282", -"h c #838383", -"j c #848484", -"k c #858585", -"l c #878787", -"z c #888888", -"x c #898989", -"c c #8A8A8A", -"v c #8B8B8B", -"b c #8C8C8C", -"n c #8E8E8E", -"m c #8F8F8F", -"M c #909090", -"N c #919191", -"B c #929292", -"V c #939393", -"C c #949494", -"Z c #959595", -"A c #969696", -"S c #979797", -"D c #989898", -"F c #999999", -"G c #9A9A9A", -"H c #9B9B9B", -"J c #9C9C9C", -"K c #9D9D9D", -"L c #9E9E9E", -"P c #9F9F9F", -"I c #A0A0A0", -"U c #A1A1A1", -"Y c #A2A2A2", -"T c #A3A3A3", -"R c #A4A4A4", -"E c #A5A5A5", -"W c #A6A6A6", -"Q c #A7A7A7", -"! c #A9A9A9", -"~ c #AAAAAA", -"^ c #ABABAB", -"/ c #ACACAC", -"( c #ADADAD", -") c #AEAEAE", -"_ c #AFAFAF", -"` c #B0B0B0", -"' c #B1B1B1", -"] c #B2B2B2", -"[ c #B3B3B3", -"{ c #B4B4B4", -"} c #B5B5B5", -"| c #B6B6B6", -" . c #B7B7B7", -".. c #B8B8B8", -"X. c #B9B9B9", -"o. c #BABABA", -"O. c #BBBBBB", -"+. c #BCBCBC", -"@. c #BDBDBD", -"#. c #BEBEBE", -"$. c #BFBFBF", -"%. c #C0C0C0", -"&. c #C1C1C1", -"*. c #C2C2C2", -"=. c #C3C3C3", -"-. c #C4C4C4", -";. c #C5C5C5", -":. c #C6C6C6", -">. c #C7C7C7", -",. c #C8C8C8", -"<. c #C9C9C9", -"1. c #CACACA", -"2. c #CBCBCB", -"3. c #CCCCCC", -"4. c #CDCDCD", -"5. c #CECECE", -"6. c #CFCFCF", -"7. c #D0D0D0", -"8. c #D1D1D1", -"9. c #D2D2D2", -"0. c #D3D3D3", -"q. c #D4D4D4", -"w. c #D5D5D5", -"e. c #D6D6D6", -"r. c #D7D7D7", -"t. c #D8D8D8", -"y. c #D9D9D9", -"u. c #DADADA", -"i. c #DBDBDB", -"p. c #DCDCDC", -"a. c #DDDDDD", -"s. c #DEDEDE", -"d. c #DFDFDF", -"f. c #E0E0E0", -"g. c #E1E1E1", -"h. c #E2E2E2", -"j. c #E3E3E3", -"k. c #E4E4E4", -"l. c #E5E5E5", -"z. c #E6E6E6", -"x. c #E7E7E7", -"c. c #E8E8E8", -"v. c #E9E9E9", -"b. c #EAEAEA", -"n. c #EBEBEB", -"m. c #ECECEC", -"M. c #EDEDED", -"N. c #EEEEEE", -"B. c #EFEFEF", -"V. c #F0F0F0", -"C. c #F1F1F1", -"Z. c #F2F2F2", -"A. c #F3F3F3", -"S. c #F4F4F4", -"D. c #F5F5F5", -"F. c #F6F6F6", -"G. c #F7F7F7", -"H. c #F8F8F8", -"J. c #F9F9F9", -"K. c #FAFAFA", -"L. c #FBFBFB", -"P. c #FCFCFC", -"I. c #FDFDFD", -"U. c None", -/* pixels */ -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.Z.Z.Z.S.Z.Z.S.S.Z.a.z.Z.Z.Z.Z.S.Z.Z.S.Z.Z.S.Z.c.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.c.L.I.I.I.I.L.I.L.L.1._ z.L.I.I.I.I.L.I.L.I.L.L.Z.z.7.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.z.I.L.I.L.L.I.L.I.L.5.h T j.L.L.I.L.I.L.I.I.L.S.Z.c.w.1.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.z.I.L.I.L.I.L.I.L.I.a.B a ^ c.L.L.I.L.I.L.L.L.Z.B.z.j.5.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.z.L.I.L.I.L.I.L.I.I.B._ i z O.Z.I.L.I.L.I.L.S.Z.B.j.B.a.5.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.z.I.L.I.L.I.L.I.L.I.S.7.z h G 5.S.I.L.I.L.L.S.Z.B.a.S.S.j.1.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.z.L.I.L.I.L.I.L.I.I.I.z.T h m ^ u.L.L.L.I.L.S.S.c.a.Z.I.S.j.1.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.j.L.I.L.I.L.I.L.I.I.L.S.*.z z J O.B.I.L.I.L.S.S.c.u.Z.I.I.S.j.1.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.j.I.L.I.L.I.L.I.L.L.I.L.a.J z G ^ 5.S.I.L.I.S.Z.c.w.Z.I.I.L.Z.j.1.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.j.I.I.L.I.L.I.L.I.I.L.L.B.{ B Z Q { z.L.I.L.S.S.c.7.B.L.L.L.L.Z.j.:.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.5.B.L.I.I.I.L.I.L.L.I.L.L.5.Z Z T ] :.S.L.I.L.S.Z.w.1.7.7.w.w.w.7.1.O.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.] :.a.c.S.L.I.I.L.I.L.I.L.c.^ Z T { O.u.L.I.L.S.Z.B.j.a.u.w.w.7.7.7.5.] U.U.U.U.U.U.U.U.U.", -"U.U.U.+.O.w.j.a.j.B.L.I.L.I.L.L.S.:.G T _ +.:.B.L.I.I.Z.Z.c.c.z.z.a.j.a.a.u.5.U.U.U.U.U.U.U.U.U.", -"U.U.U.5.O.Q a.S.z.u.u.c.S.L.I.L.L.a.T T ^ +.*.w.L.L.I.L.S.Z.B.c.z.z.j.j.z.j.u.U.U.U.U.U.U.U.U.U.", -"U.U.U.u.a.^ Z :.Z.L.c.u.u.j.B.L.I.Z.{ T _ O.5.*.B.I.L.L.L.S.Z.B.B.c.c.c.z.j.u.U.U.U.U.U.U.U.U.U.", -"U.U.U.a.S.a._ m Q a.S.Z.c.u.w.u.z.S.7.Q ] { 5.1.w.S.L.L.L.L.S.S.Z.Z.B.B.B.c.a.U.U.U.U.U.U.U.U.U.", -"U.U.U.a.L.S.j.+.m m +.c.Z.c.j.u.w.7.5.Q Q { :.u.*.B.L.L.L.L.L.L.S.S.S.S.S.Z.z.U.U.U.U.U.U.U.U.U.", -"U.U.U.a.L.L.L.c.5.Q j G 5.B.c.j.u.u.7.{ J J ^ 7.5.w.L.L.L.L.L.L.L.L.L.L.L.S.B.U.U.U.U.U.U.U.U.U.", -"U.U.U.a.S.L.L.S.Z.a.+.B j ^ a.c.j.w.w.7.:.] G J +.O.c.I.L.L.L.L.L.L.L.L.L.S.B.U.U.U.U.U.U.U.U.U.", -"U.U.U.a.L.L.L.L.L.S.B.7.^ j z { a.c.w.1.*.O.O.] _ Q 5.S.L.L.L.L.L.L.L.L.L.L.c.U.U.U.U.U.U.U.U.U.", -"U.U.U.u.L.S.L.L.L.L.L.Z.z.:.T h m +.j.j.:.:.B.c.u.a.w.w.c.L.L.L.L.L.S.L.Z.z.7.T U.U.U.U.U.U.U.U.", -"U.U.U.u.L.L.L.L.S.L.L.S.S.B.a.+.G j B O.a.Z.L.u.a.B.L.j.5.w.c.L.I.L.S.B.5.:.1.1.5.:.{ U.U.U.U.U.", -"U.U.U.u.S.L.S.S.L.L.S.L.L.L.S.B.u.+.Z h m ] w.j.c.S.B.z.j.5.:.1.7.7.1.*.5.{ z e h Q +.:.^ U.U.U.", -"U.U.U.u.S.S.L.S.S.L.S.L.S.L.L.S.Z.B.u.+.J a i Q 1.7.{ ] :.7.w.7.7.7.u.z.7.a 5 - . = 3 Q :.Q U.U.", -"U.U.U.u.L.S.L.S.L.S.S.S.S.S.S.L.S.S.Z.B.u.+.B m G T m 7 e h G ] +.*.1.j.:.a Z 3 U.U.U.: { 1.U.U.", -"U.U.U.u.L.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.Z.z.*.Z Q 1.{ i m j i 0 0 0 7 B :.J ] U.U.U.U.U.J w.h U.", -"U.U.U.w.S.S.S.S.L.S.S.S.S.L.S.S.S.S.S.S.S.Z.j._ B :.5.T :.1.O.Q Z B m h ] :.^ U.U.U.U.U.{ a.r U.", -"U.U.U.u.S.S.S.S.S.S.S.S.S.S.S.Z.S.S.S.S.S.S.Z.w.G ] 5.^ 7.c.z.a.w.7.7.O.B _ *._ J U.U.^ a.:.; U.", -"U.U.U.w.S.Z.Z.S.Z.Z.Z.S.Z.S.Z.Z.S.S.S.S.Z.Z.Z.c.{ ^ 7._ 1.B.B.B.B.c.c.a._ j m ] :.1.5.j.7.0 U.U.", -"U.U.U.w.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.Z.B.B.B.7._ w.] { z.c.B.c.B.B.B.u._ a < e J _ G 1 @ U.U.", -"U.U.U.w.Z.B.B.B.B.Z.B.B.Z.Z.Z.B.B.Z.B.Z.B.B.B.B.u.] u.] ^ j.B.B.B.B.B.B.c.a.{ : U.$ = @ U.U.U.U.", -"U.U.U.w.Z.B.c.B.B.c.B.B.B.c.B.B.B.c.B.c.B.B.c.B.a.{ a._ T a.B.B.B.c.B.B.c.c.7.U.U.U.U.U.U.U.U.U.", -"U.U.U.7.Z.B.B.c.c.B.c.B.c.B.B.c.B.B.c.B.B.c.B.B.7.O.B.+.T w.c.B.c.B.B.c.B.B.w.U.U.U.U.U.U.U.U.U.", -"U.U.U.w.Z.c.c.B.B.c.c.c.c.c.c.c.c.c.c.c.c.B.c.z.*.5.j.w.*.*.j.c.c.B.c.c.c.c.7.U.U.U.U.U.U.U.U.U.", -"U.U.U.w.Z.c.c.c.c.c.c.B.c.B.c.c.B.c.c.B.c.c.c.5.*.O.h h _ 1.+.a.c.c.c.c.B.c.7.U.U.U.U.U.U.U.U.U.", -"U.U.U.w.Z.z.c.c.c.c.c.c.c.B.c.c.c.c.c.c.c.c.j.*.*.i 6 e r ] O.+.z.c.c.c.c.c.5.U.U.U.U.U.U.U.U.U.", -"U.U.U.7.Z.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.u.+.+.i Z ] G B +.] 5.c.c.c.c.c.5.U.U.U.U.U.U.U.U.U.", -"U.U.U.7.B.z.z.z.c.c.c.z.c.z.c.z.c.z.c.z.z.c.w.O.:.m O.u.1.G ] { O.j.z.c.c.z.5.U.U.U.U.U.U.U.U.U.", -"U.U.U.7.B.z.z.c.c.c.z.c.z.c.z.c.z.c.z.c.c.c.u.] 5.J +.j.a.O.Q 1.^ 7.z.z.c.c.1.U.U.U.U.U.U.U.U.U.", -"U.U.U.7.B.z.j.z.z.z.z.z.z.j.z.z.z.z.j.z.z.j.a._ *.] ] a.z.5._ 7.Q +.j.z.z.z.:.U.U.U.U.U.U.U.U.U.", -"U.U.U.5.c.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.a.O.^ +._ 5.j.7.+.u.Z ] a.j.j.j.:.U.U.U.U.U.U.U.U.U.", -"U.U.U.7.c.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.1.G { :.O.*.:.j.*.a ] a.j.j.j.*.U.U.U.U.U.U.U.U.U.", -"U.U.U.1.Z.c.c.c.z.c.z.z.z.z.z.j.j.j.z.z.j.j.j.u._ B { w.u.j.5.a r O.w.a.a.w.{ U.U.U.U.U.U.U.U.U.", -"U.U.U.j +.:.*.*.*.*.*.*.+.+.+.O.O.O.{ { { { ] ] J r 5 i z j 2 : 0 Z Q Q Q T h U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.= @ O O O . @ & U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_find_next.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_find_next.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_find_next.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_find_next.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,161 +0,0 @@ -/* XPM */ -static char *edit_find__[] = { -/* columns rows colors chars-per-pixel */ -"48 48 107 2 ", -" c #1C1C1C1C1C1C", -". c #222222222222", -"X c #358B358B358B", -"o c #3B3B3B3B3B3B", -"O c #44EF44EF44EF", -"+ c #4CDA4CDA4CDA", -"@ c #545454545454", -"# c #5B805B805B80", -"$ c #639263926392", -"% c #6B1E6B1E6B1E", -"& c #735C735C735C", -"* c #7B927B927B92", -"= c #31316464A3A3", -"- c #3B916B6BA7A7", -"; c #3E3E6DA0A8DB", -": c #44C47272AB55", -"> c #4ACA7676AD2D", -", c #52527BAEAEAE", -"< c #4DCE7A7AB130", -"1 c #54D47E7EB231", -"2 c #5A5A82C2B494", -"3 c #5B5B8585B8B8", -"4 c #62628787B3B3", -"5 c #64648888B5B5", -"6 c #61618A09BB3A", -"7 c #6D6D8E8EB8B8", -"8 c #6B6B9191BEBE", -"9 c #7474933DBA64", -"0 c #79799797BCBC", -"q c #67679090C0C0", -"w c #73739797C342", -"e c #77779B9BC444", -"r c #7F7F9D9DC0C0", -"t c #7E28A0A0C9C9", -"y c #848484848484", -"u c #8D548D548D54", -"i c #948894889488", -"p c #9BF59BF59BF5", -"a c #80809C9CBEBE", -"s c #A54FA54FA54F", -"d c #AAEAAAEAAAEA", -"f c #B520B520B520", -"g c #BE3FBE3FBE3F", -"h c #83D9A2F8C771", -"j c #8F8FA6A6C3C3", -"k c #8585A7A7CFCF", -"l c #94EAAB2AC69B", -"z c #9514AF6FCB4A", -"x c #9797B0B0CACA", -"c c #9C69B24BC996", -"v c #8F8FAEAED0D0", -"b c #9595B4B4D6D6", -"n c #9898B4B4D5D5", -"m c #9E9EB8B8D7D7", -"M c #9A9AB7B7D92E", -"N c #9BF1BA64DADA", -"B c #A6A6B6B6C7C7", -"V c #A9A9B7B7C7C7", -"C c #AE03BA0FC7C7", -"Z c #A3A3B585CA09", -"A c #AD2CBB7BCC4B", -"S c #AFAFBFBFD2D2", -"D c #A322BEFEDD1C", -"F c #ACACC0C0D6D6", -"G c #A6A6C1C1DDDD", -"H c #A8A8C2C2DEDE", -"J c #B2B2C0C0D0D0", -"K c #BCBCC7C7D5D5", -"L c #BFBFC9C9D4D4", -"P c #B4B4C8C8DDDD", -"I c #ACACC5C5E0E0", -"U c #B34CCA30E248", -"Y c #BB7BCF4FE464", -"T c #BE57D19EE64C", -"R c #C23BC23BC23B", -"E c #CDA5CDA5CDA5", -"W c #C2C2CBCBD6D6", -"Q c #C3C3CF4FDCDC", -"! c #C646D251DF5F", -"~ c #CBCBD43ADE44", -"^ c #D429D429D429", -"/ c #DD50DD50DD50", -"( c #C5C5D615E726", -") c #CACAD7D7E5E5", -"_ c #CF4FDA59E564", -"` c #C2C2D555E8E8", -"' c #C8C8D7D7E8E8", -"] c #CC21DB13EB40", -"[ c #D312DC5CE625", -"{ c #D9D9DFDFE7E7", -"} c #D16ADEABECEC", -"| c #D575E1C1EEAE", -" . c #DB5BE4E4EF6F", -".. c #D757E3E3F0F0", -"X. c #DC0AE65AF208", -"o. c #DF34E93EF31D", -"O. c #E53FE53FE53F", -"+. c #E6E6E7E7E9E9", -"@. c #E5E5E8E8ECEC", -"#. c #EBB9EBBAEBBE", -"$. c #E322EBB8F4C1", -"%. c #EEEEEFEFF2F2", -"&. c #EAEAF0F0F7F7", -"*. c #EBEBF1F1F8F8", -"=. c #F543F545F54E", -"-. c #FA81FA81FA81", -";. c None", -/* pixels */ -";.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.", -";.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.", -";.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.", -";.;.;.;.;.;.;.y u i i i i i i u u u u y y y y * * * * & & & % & % % % $ $ $ $ # # ;.;.;.;.;.;.;.", -";.;.;.;.;.;.y =.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.=.-.-.-.=.=.=.# ;.;.;.;.;.;.", -";.;.;.;.;.;.i =.O.O.O./ O.O.O./ O.O./ O.O.O.O.O.O.O.O.O.+.O.O.O.O.O.O.O.O.O.O.#.-.# ;.;.;.;.;.;.", -";.;.;.;.;.;.u =.O./ / / O.O./ O.O.O./ O.O.O.O./ O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.=.# ;.;.;.;.;.;.", -";.;.;.;.;.;.i =.O./ / / O.O.O./ / O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.-.# ;.;.;.;.;.;.", -";.;.;.;.;.;.i =.O./ / / O.O./ O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.#.=.# ;.;.;.;.;.;.", -";.;.;.;.;.;.u -.O.O.O./ O.O.O.O.f g f g f g g g g g g g g g g g g g g g O.#.O.O.-.# ;.;.;.;.;.;.", -";.;.;.;.;.;.y -.O./ O./ O.O.O.O.O.O.O.O.O.O.O.O.O.O.O.#.O.#.#.O.O.#.O.O.#.O.O.O.-.# ;.;.;.;.;.;.", -";.;.;.;.;.;.y -.O./ O./ O.O.O.O.g g g g g g g g g g g g g g g g g g R g O.#.#.#.=.# ;.;.;.;.;.;.", -";.;.;.;.;.;.y -.O.O.O./ +.O.O.O.O.O.O.O.O.#.O.#.#.O.#.O.#.#.O.#.#.O.#.#.#.O.#.+.-.# ;.;.;.;.;.;.", -";.;.;.;.;.;.y =.O.O.O./ #.O.O.O.g g g g g g g g g g g g g g g g g g g g #.#.#.#.-.# ;.;.;.;.;.;.", -";.;.;.;.;.;.y =.O.O.O./ #.O.O.O.O.O.O.#.#.O.O.#.#.O.#.#.#.+.+.#.#.#.#.#.#.O.+.#.-.@ ;.;.;.;.;.;.", -";.;.;.;.;.;.y =.+.O.O./ #.O.O.O.g g g g g g g g g R R g R g R g g g g g #.#.#.+.-.# ;.;.;.;.;.;.", -";.;.;.;.;.;.y =.O.O.O./ #.O.O.O.O.#.O.#.+.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.-.# ;.;.;.;.;.;.", -";.;.;.;.;.;.* =.#.^ / O.#.#.O.#.g g g g g g g g g g R g g g g R g g R g #.#.#.#.=.@ ;.;.;.;.;.;.", -";.;.;.;.;.;.* -.#.R O./ #.O.#.O.O.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.%.#.#.-.@ ;.;.;.;.;.;.", -";.;.;.;.;.;.* =.#.O.#.O.#.O.O.O.g g g g R g g g f s i p p u p d g R R R #.#.#.=.-.# ;.;.;.;.;.;.", -";.;.;.;.;.;.* -.O.O.O.O.#.#.#.#.#.#.#.#.#.#.^ s R #.-.-.-.-.-./ s f O.#.%.#.#.#.-.@ ;.;.;.;.;.;.", -";.;.;.;.;.;.* =.#.O.O.O.#.O.O.#.g g g R R s f -.-.~ l 0 9 a S +.-./ u f #.#.=.%.=.@ ;.;.;.;.;.;.", -";.;.;.;.;.;.& =.#.O.O.O.#.#.#.#.#.#.#.#.f E -.Q 2 : 6 e e 8 1 ; l %.=.i ^ =.%.%.=.@ ;.;.;.;.;.;.", -";.;.;.;.;.;.& =.#.O.O.O.#.#.O.#.g g g d f -.V - w Y X.X.X.] P h , 5 #.=.u / #.=.-.@ ;.;.;.;.;.;.", -";.;.;.;.;.;.& -.#.O.O.O.#.#.O.#.#.#.+.i -.K ; M $.%.&.$.o.X...] I 2 8 =.^ s %.#.=.@ ;.;.;.;.;.;.", -";.;.;.;.;.;.& =.#.O.#.O.#.O.#.#.R g s ^ +.> h | $.&.&.&.$.o...} T b < S -.p / %.=.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.% =.#.O.#.O.#.#.#.#.+.#.p #.Z 2 T o.$.$.%.$.o.o...| Y N k 1 =.^ f %.-.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.% =.#.O.#.O.%.#.#.#.#.O.s #.3 t | X.X.$.$.$.$.X...| U D N ; ~ +.i =.=.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.% -.#.O.#.O.%.#.#.#.#.^ f O.- M } ..X.X.$.$.o.X.X.] I H D 2 Z #.i #.-.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.$ =.#.R ^ O.%.#.#.#.g d f / = z ( ) [ [ [ [ } ] ) Z c x z 2 l +.i O.=.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.$ -.#.^ #.O.#.#.#.#.#.E f O.- b ] ..| X. .$.$.X.' ` Y I I 3 Z O.p O.=.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.$ =.#.#.#.#.#.#.#.#.R f d #.1 e G L ! ~ ~ ~ W C V Z Z c z : W O.y =.-.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.$ =.+.O.#.O.%.#.#.#.#.#.u =.l 5 G P T ( ] } .| _ ( T U M : #.^ p =.-.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.$ =.#.#.+.#.#.#.#.#.R R p / O.: h x c B B C C C C Z Z c 2 Z #.p g =.=.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.# =.#.#.#.O.%.#.%.#.#.#.^ s -.A > D P T ` ( ] ] ] ` Y w 2 %./ & #.=.-.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.# =.#.O.O.O.#.#.#.%.g R R i E -.l ; a c c B B Z Z l 2 , +.=.i $ ^ -.=.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.@ =.#.#.#.O.%.#.#.=.#.#.=.O.u O.-.J : 2 t n m z 8 ; 9 &.-.#.R d # f -.+ ;.;.;.;.;.;.", -";.;.;.;.;.;.# =.#.O.#.O.#.#.#.#.R R R R f u ^ -.=.F 9 2 < 4 l { -.#.^ R p p d % s + ;.;.;.;.;.;.", -";.;.;.;.;.;.# =.#.O.#.O.#.#.#.#.#.=.%.%.%.O.p s / =.-.-.-.-.-.#.g * d g d p p d & + ;.;.;.;.;.;.", -";.;.;.;.;.;.@ =.#.#.#.#.#.#.=.#.#.%.#.=.#.%.#.E p p d R R f d y p E $ d f d s i d y X ;.;.;.;.;.", -";.;.;.;.;.;.+ =.#.O.#.O.#.#.#.#.#.=.#.=.#.=.=.=.=.#.E g f g E =.-.-.^ # d f s d i d u o ;.;.;.;.", -";.;.;.;.;.;.@ =.#.#.#.O.=.#.#.#.#.#.=.#.#.=.%.%.#.#.+.#.#.#.#.#.#.#.+./ $ p f d d i s p O ;.;.;.", -";.;.;.;.;.;.+ =.#.#.#.O.#.#.#.#.#.=.#.#.+.#.#.O.O.O.O.O.O.O.O./ O.O.O.O./ & u f d f p f f O ;.;.", -";.;.;.;.;.;.+ =.=.=.=.=.-.-.-.-.-.=.=.=.%.#.#.O.O.O./ / / / / ^ / ^ / / / / * * f d f / +.u ;.;.", -";.;.;.;.;.;.. + @ + + @ + @ + @ + + + + + + + + + + O O O O O O O O O O O + O + % f ^ / O.p ;.;.", -";.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;. # g +.E @ ;.;.", -";.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.X + X ;.;.;.", -";.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;.;." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_find.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_find.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_find.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_find.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,126 +0,0 @@ -/* XPM */ -static char *edit_find___[] = { -/* columns rows colors chars-per-pixel */ -"48 48 72 1 ", -" c #1D2329", -". c #21262B", -"X c #272B2F", -"o c #282B2F", -"O c #242A31", -"+ c #2A2F33", -"@ c #2F353C", -"# c #32363A", -"$ c #393B3D", -"% c #383E44", -"& c #414244", -"* c #43494F", -"= c #494B4C", -"- c #454B50", -"; c #515253", -": c #51555B", -"> c #5A5B5D", -", c #5B5F64", -"< c #5E6063", -"1 c #646465", -"2 c #6C6C6C", -"3 c #6C7074", -"4 c #757575", -"5 c #7E7E7D", -"6 c #858585", -"7 c #888887", -"8 c #8B8B8B", -"9 c #949394", -"0 c #989797", -"q c #989897", -"w c #96979A", -"e c #969899", -"r c #9C9C9B", -"t c #A0A09F", -"y c #A4A4A3", -"u c #A8A7A7", -"i c #A8A8A7", -"p c #A6A6A8", -"a c #ABABAB", -"s c #AFAFB0", -"d c #B3B2B3", -"f c #B8B7B7", -"g c #BCBCBC", -"h c #C4C4C4", -"j c #C8C7C7", -"k c #C7C8C8", -"l c #CCCBCB", -"z c #D0CFCF", -"x c #CECED0", -"c c #D3D2D2", -"v c #D8D7D7", -"b c #D9D8D7", -"n c #D6D6DB", -"m c #D7D8DD", -"M c #DBDBDB", -"N c #E0DFDF", -"B c #DDDDE2", -"V c #DFE0E4", -"C c #E3E2E3", -"Z c #E8E7E7", -"A c #E8E8E7", -"S c #E6E6E9", -"D c #E7E8EA", -"F c #EBEBEC", -"G c #F0EFEF", -"H c #EEEEF1", -"J c #F3F3F4", -"K c #F8F7F7", -"L c #F7F7F8", -"P c #F7F8F9", -"I c #FBFBFB", -"U c None", -/* pixels */ -"UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU", -"UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU", -"UUUUUUqFJJJJJJJJJJJJJJJJJJJJChsUUUUUUUUUUUUUUUUU", -"UUUUUUaIIIIIIIIIIIIIIIIIIIIIIFCkUUUUUUUUUUUUUUUU", -"UUUUUUaIIIIIIIIIIIIIIIIIIIIIIJNPlUUUUUUUUUUUUUUU", -"UUUUUUaIIIKIIIIIIIIIIIIIIIIIIKcJPhUUUUUUUUUUUUUU", -"UUUUUUaIKKPGFAFFFFFFFFFFFFFFFAkJPJhUUUUUUUUUUUUU", -"UUUUUUaIKPPCNVNNCCNNNNNNNNNNNFkFJJPhUUUUUUUUUUUU", -"UUUUUUaKKIJCBCNCNbvvNVCVNNNNAJcAJGJGfUUUUUUUUUUU", -"UUUUUUaJKKJCCCcd98888tgbVNNNAPxNJJGGFaUUUUUUUUUU", -"UUUUUUiJKJJCbp6qgvNNcf98gNNNNNhNJFFJJVtUUUUUUUUU", -"UUUUUUaJJKJb98cJPPPJJPJh8tNNNNhcAAAFFJN8UUUUUUUU", -"UUUUUUiJJKF9tFJIPPPPPPJJV9dGJJNhgdappgckUUUUUUUU", -"UUUUUUuJJJa9FJPIPPIKPPJJPN8hPJJFAcgpq0qguUUUUUUU", -"UUUUUUaJJb6bJLPLPPPPPPPJGGg8MNNNbchgdddgg5UUUUUU", -"UUUUUUuGJiuFFJJLJJPPJJJPJGA8dNMNbnckhhkcVuUUUUUU", -"UUUUUUuGF7xHHJJJJJJJPHPPHHHp9BnbbbbccbNZFuUUUUUU", -"UUUUUUuGB6BSSSJJGGJJHHHHPHPg6nbbbvCCCFFGGuUUUUUU", -"UUUUUUuZN6VHSSHJHHGGHHHHHHHk5bVVNNGGJGFFFuUUUUUU", -"UUUUUUuGN6VJHSSSHHHHHHHHFHHg8FGFGGAGFFFGFuUUUUUU", -"UUUUUUuFB6xHHSSSVAFFFFFDDSSu9ZCCZZAAFGFFFuUUUUUU", -"UUUUUUuZFruFSSSSVVVVVVSBBBB5abbbvNZZZAZZCuUUUUUU", -"UUUUUUyFFj5nVSVVSVVVVVVBVSg4kbvvvvvvvZZZCtUUUUUU", -"UUUUUUyCZS99BVVBBBBBBBBBBn5abcvccvvNZZZZZuUUUUUU", -"UUUUUUuCZZN50bBbnBnnBnBBcg9jcvcbCZCZCZZZCtUUUUUU", -"UUUUUUuCCCCz67xBBnBBnBBh996hCCCCCZZZCZZZCuUUUUUU", -"UUUUUUtCCZCCbr40fknnxfq9,&69cCCZCCCCNCCNCuUUUUUU", -"UUUUUUtNNCNvccg0666778yf< =78jcccccvNZNZNtUUUUUU", -"UUUUUUubNVNvzznzxhhhkcbzg: ;89kczcccvNCNNtUUUUUU", -"UUUUUUtCNNNzzzzzxxzxzzzzcf*.>8qzczzcbNNNNtUUUUUU", -"UUUUUUtbVNbnzzzzzzzzzzzzzcs%.17yvbvNNNNNNtUUUUUU", -"UUUUUUtNbNVzzzzxzxzxzzkzzzzp#o27avvvvbVbbtUUUUUU", -"UUUUUUtVbNbcxxxkzzzjzzzzzzjzw++47axzcbBbNrUUUUUU", -"UUUUUUqbbbbczzzzzzzzzzzzzzzzz8O#56sbbNNbNrUUUUUU", -"UUUUUUqbbbbbbbbNvvvvvvbbbbbbbb7O%58gbbbbbrUUUUUU", -"UUUUUUtvbbbbbcccvcvvzvvznbzbznx4 &79hbbvnrUUUUUU", -"UUUUUUtvbbbzjkzjjjkjjljljjzjjjjg, =79jbnvtUUUUUU", -"UUUUUUqbzbzjjkzjljzjjjljjjjjjzjzf: ;79zbvqUUUUUU", -"UUUUUUqcnzzzjjjjjjzkjllljjjjjjjjzg-O>70jcqUUUUUU", -"UUUUUUqcczzvzvzzvzzzzzzzccccczbzzbs%.19ycqUUUUUU", -"UUUUUUqzzzzzzzzzzzzzzzzzzzzzczzzzzzu#o26ftUUUUUU", -"UUUUUUqzzzzzzzzzzzzzzzzzzzzzzzzzzzzzq+o4g0UUUUUU", -"UUUUUU0zzzzzzzzzzzkzzzzlzzzzzzzkzkzzk9>uz0UUUUUU", -"UUUUUU0zzjzjjzjzllzzlllllllllllzzzzkzkjlz0UUUUUU", -"UUUUUU7kzzzzzzzjzzkzzzzzllllzzkzkzzzzzzzk8UUUUUU", -"UUUUUUU4555555555555555555555555555555554UUUUUUU", -"UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU", -"UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_forward.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_forward.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_forward.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_forward.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,271 +0,0 @@ -/* XPM */ -static char *go_next__[] = { -/* columns rows colors chars-per-pixel */ -"48 48 217 2 ", -" c #1D4076", -". c #1E4379", -"X c #1F467E", -"o c #1E4781", -"O c #214983", -"+ c #214A86", -"@ c #204A87", -"# c #214B88", -"$ c #214C89", -"% c #234D88", -"& c #234D89", -"* c #234D8A", -"= c #244D89", -"- c #244D8A", -"; c #244E8A", -": c #244F8B", -"> c #254F8B", -", c #264F8B", -"< c #25508B", -"1 c #26508C", -"2 c #27508C", -"3 c #27518C", -"4 c #27518D", -"5 c #27518E", -"6 c #27528E", -"7 c #28518D", -"8 c #29538E", -"9 c #28538F", -"0 c #2B548F", -"q c #295490", -"w c #2B5490", -"e c #2B5590", -"r c #2A5591", -"t c #2B5591", -"y c #2B5692", -"u c #2D5590", -"i c #2E5791", -"p c #2C5692", -"a c #2C5792", -"s c #2C5793", -"d c #2D5793", -"f c #2E5792", -"g c #2F5792", -"h c #2D5892", -"j c #2D5893", -"k c #2E5892", -"l c #2F5892", -"z c #2F5A95", -"x c #2E5996", -"c c #2F5A96", -"v c #305892", -"b c #305992", -"n c #305993", -"m c #315993", -"M c #325993", -"N c #325994", -"B c #305A94", -"V c #325A94", -"C c #335C95", -"Z c #315C96", -"A c #335D97", -"S c #345C96", -"D c #345D96", -"F c #355D96", -"G c #365D96", -"H c #365E96", -"J c #365E97", -"K c #305C98", -"L c #325D98", -"P c #315E9B", -"I c #335F9B", -"U c #35609C", -"Y c #36629E", -"T c #37639E", -"R c #386098", -"E c #386199", -"W c #3C649C", -"Q c #3465A4", -"! c #3565A4", -"~ c #3566A4", -"^ c #3566A5", -"/ c #3666A5", -"( c #3667A5", -") c #3767A5", -"_ c #3767A6", -"` c #3865A0", -"' c #3966A1", -"] c #3967A3", -"[ c #3A67A2", -"{ c #3A67A3", -"} c #3967A4", -"| c #3768A6", -" . c #3769A6", -".. c #3A68A3", -"X. c #3C68A3", -"o. c #3A68A5", -"O. c #3B69A5", -"+. c #3868A6", -"@. c #3869A6", -"#. c #3969A6", -"$. c #3868A7", -"%. c #3869A7", -"&. c #3969A7", -"*. c #3A69A7", -"=. c #3A6AA6", -"-. c #3B6AA6", -";. c #3A6AA7", -":. c #3C69A4", -">. c #3D69A4", -",. c #3D6AA5", -"<. c #3C6AA7", -"1. c #3D6BA7", -"2. c #3B6AA8", -"3. c #3B6BA8", -"4. c #3C6BA8", -"5. c #3D6BA8", -"6. c #3F6EAA", -"7. c #40689F", -"8. c #42699E", -"9. c #436BA3", -"0. c #466DA2", -"q. c #406DA7", -"w. c #426EA7", -"e. c #426EA8", -"r. c #426FA8", -"t. c #436FA8", -"y. c #406FAA", -"u. c #416FAB", -"i. c #446FA9", -"p. c #4770A6", -"a. c #4770A7", -"s. c #4B72A6", -"d. c #4370AA", -"f. c #4570A9", -"g. c #4671A9", -"h. c #4671AA", -"j. c #4772AA", -"k. c #4A73A9", -"l. c #4873AA", -"z. c #4974AA", -"x. c #4C75AB", -"c. c #4C76AB", -"v. c #4C75AC", -"b. c #4D76AC", -"n. c #4C77AD", -"m. c #4F77AC", -"M. c #4F79AF", -"N. c #5076A9", -"B. c #5078AD", -"V. c #5178AD", -"C. c #547AAD", -"Z. c #587DAE", -"A. c #4575B0", -"S. c #4675B0", -"D. c #4675B1", -"F. c #4776B1", -"G. c #4978B3", -"H. c #4979B3", -"J. c #4A79B3", -"K. c #4B7AB3", -"L. c #4B7AB4", -"P. c #4C7AB4", -"I. c #4C7BB4", -"U. c #4E7CB4", -"Y. c #4F7CB4", -"T. c #4E7CB5", -"R. c #4F7DB5", -"E. c #557CB0", -"W. c #577EB0", -"Q. c #507EB6", -"!. c #517FB7", -"~. c #527FB6", -"^. c #5380B7", -"/. c #5480B7", -"(. c #5581B7", -"). c #5981B3", -"_. c #5B82B5", -"`. c #5C84B6", -"'. c #5F86B6", -"]. c #5380B8", -"[. c #5481B8", -"{. c #5581B8", -"}. c #5682B8", -"|. c #5782B8", -" X c #5783B8", -".X c #5883B8", -"XX c #5A84B8", -"oX c #5B84B8", -"OX c #5A85BA", -"+X c #5E88BB", -"@X c #5F89BC", -"#X c #6185B4", -"$X c #6086B7", -"%X c #6187B7", -"&X c #6187B8", -"*X c #6288B8", -"=X c #6388B9", -"-X c #6389B9", -";X c #6389BA", -":X c #6489B9", -">X c #658ABA", -",X c #668BBA", -" c #759462", -", c #7C9B64", -"< c #74946B", -"1 c #799760", -"2 c #618673", -"3 c #688D7F", -"4 c #65897B", -"5 c #6F9172", -"6 c #729372", -"7 c #7C9C74", -"8 c #7B9B7D", -"9 c #9BAE2C", -"0 c #9EB129", -"q c #9EB127", -"w c #8DA53D", -"e c #95AA34", -"r c #98AD33", -"t c #90A73A", -"y c #93A93A", -"u c #98AF3E", -"i c #9EB339", -"p c #9EB233", -"a c #A2B52C", -"s c #A6B92E", -"d c #A9BC2F", -"f c #A0B225", -"g c #A2B633", -"h c #A5B934", -"j c #AABD32", -"k c #A0B63D", -"l c #A6B93B", -"z c #AEC134", -"x c #ADC13B", -"c c #B1C436", -"v c #B3C63A", -"b c #B6C93A", -"n c #BACD3C", -"m c #BED13E", -"M c #819D4C", -"N c #819D55", -"B c #829E59", -"V c #87A044", -"C c #8CA444", -"Z c #87A04D", -"A c #8AA34B", -"S c #96AD42", -"D c #95AD4B", -"F c #98AF45", -"G c #9EB441", -"H c #8AA454", -"J c #87A25C", -"K c #8BA55B", -"L c #85A055", -"P c #93AB53", -"I c #92AC5A", -"U c #98AF52", -"Y c #9CB454", -"T c #9CB55A", -"R c #A8BE40", -"E c #A1B749", -"W c #A4BA4D", -"Q c #A5BA46", -"! c #A5BD57", -"~ c #A7BF5C", -"^ c #819E68", -"/ c #8DA764", -"( c #8AA66C", -") c #84A061", -"_ c #90AA64", -"` c #90AC6E", -"' c #9AB463", -"] c #88A575", -"[ c #89A67C", -"{ c #88A575", -"} c #97B274", -"| c #99B472", -" . c #93B07C", -".. c #A4BD68", -"X. c #A1BC79", -"o. c #ADC242", -"O. c #B0C544", -"+. c #BACE44", -"@. c #B1C648", -"#. c #B7CC4A", -"$. c #BACE4C", -"%. c #B4C846", -"&. c #BED141", -"*. c #ADC451", -"=. c #ACC35A", -"-. c #B8CE56", -";. c #BCD154", -":. c #AAC264", -">. c #ACC46B", -",. c #A7C061", -"<. c #A8C172", -"1. c #244B84", -"2. c #244D89", -"3. c #284F88", -"4. c #27518C", -"5. c #29528C", -"6. c #2E5690", -"7. c #2F5892", -"8. c #335B94", -"9. c #385F97", -"0. c #3F6D97", -"q. c #3C639A", -"w. c #3B6A9C", -"e. c #37679F", -"r. c #3465A4", -"t. c #3768A6", -"y. c #3A6AA6", -"u. c #3D6CA9", -"i. c #4D7687", -"p. c #49748D", -"a. c #4F7984", -"s. c #547D8C", -"d. c #41679C", -"f. c #44699E", -"g. c #447291", -"h. c #4F799C", -"j. c #49759C", -"k. c #456CA2", -"l. c #496EA1", -"z. c #406FAB", -"x. c #4472A5", -"c. c #4B72A5", -"v. c #4472AD", -"b. c #4B75AD", -"n. c #4E79AD", -"m. c #4F7BA6", -"M. c #5175A7", -"N. c #537DA4", -"B. c #5376A9", -"V. c #527AAC", -"C. c #5B7EAE", -"Z. c #4775B0", -"A. c #4977B1", -"S. c #4D7AB3", -"D. c #537DB3", -"F. c #5A7FB0", -"G. c #537FB8", -"H. c #5C8283", -"J. c #5D859B", -"K. c #61878A", -"L. c #6D918C", -"P. c #73968C", -"I. c #7D9D8C", -"U. c #618992", -"Y. c #6E9293", -"T. c #779A9A", -"R. c #799C9E", -"E. c #769996", -"W. c #5781AC", -"Q. c #5C85AB", -"!. c #5882A3", -"~. c #5681B4", -"^. c #5B82B4", -"/. c #5681B9", -"(. c #5A85BB", -"). c #5E88BE", -"_. c #688FAF", -"`. c #6B91A2", -"'. c #789CA4", -"]. c #7498AA", -"[. c #6385B4", -"{. c #668AB3", -"}. c #638ABC", -"|. c #6B8CB9", -" X c #6487B7", -".X c #6C91B4", -"XX c #6B92BB", -"oX c #7499B5", -"OX c #7290BC", -"+X c #7398BB", -"@X c #7A9EBC", -"#X c #779AB7", -"$X c #7EA1AD", -"%X c #7EA1B0", -"&X c #7FA3B9", -"*X c #648DC2", -"=X c #6B92C5", -"-X c #6E96C8", -";X c #7797C0", -":X c #7897C0", -">X c #7D9BC4", -",X c #7197C9", -".+.O.v c z j d a S T.VXV.2.UXUXUXUXUXUX", -"UXUXUXUXUX5.|.vXK a s j z z o.| kX$X4X4X5XGXKXJXGX5XBX>.m m n b c c j d s a J #X:X8.UXUXUXUXUXUX", -"UXUXUXUXUXf.CX6Xr a s j z z T yX2X-XXM.UXUXUXUXUXUX", -"UXUXUXUX2.[.vXH q s d d R ` ].=X-X,X.#.+.@. .I.I.T.( h a 0 0 0 6 :Xc.UXUXUXUXUX", -"UXUXUXUXM.gXA 9 S , % Y.(.).).*X*X=X-X-X-X-X-X,X&XX.&.m m n O.v x R G h a i C r % OXF.2.UXUXUXUX", -"UXUXUX2.^.$Xt N J.W.W.W./.(.).).}.*X=X=X=X-X-X-XtX#.m m b n c c z d P / a y < < < {. X5.UXUXUXUX", -"UXUXUX5. XI.e < W.!././././.).).}.*X*X*X=X*X*X+X,.n m b n v c c z j i 7 S 0 e % h.^. X6.UXUXUXUX", -"UXUXUX5.{.].C # % K.u.~././.(.(.).).*X*X*X*X*X].*.n n b b v c c z j s K , p r < x.D.{.8.UXUXUXUX", -"UXUXUX5.Q.(.H.% w & !./.W.~./.(.(.).).).).*X*XR.O.n b n v c c z z j s i < A : c.u.D. X8.UXUXUXUX", -"UXUXUX5.^.(.u.x.J.= 4 U.) 7 Y.W././.(./.(.).)._.T b v c c z z z j s s g C A H.v.u.S.[.6.UXUXUXUX", -"UXUXUX2.C.[.u.u.u.!.4 # g h i 8 ~././.~.(.(.(./.E.W x o.o.x z z j s a f 0 e H.u.u.S.^.4.UXUXUXUX", -"UXUXUX2.M. Xy.y.u.u.!.# 0 z s i 7 W./././././././.P.8 P.L.( g d s s a a 0 M j.u.y.D.C.2.UXUXUXUX", -"UXUXUXUXf.|.u.y.u.u.* y s 0 0 z k 7 !.~./././././.~./.~./.L.i d s g 0 f w H.u.u.y.^.l.2.UXUXUXUX", -"UXUXUXUX8. XA.t.t.t.; 0 0 0 0 d d h D 8 W./.~.Z./././.u.Z.J.F d a f 0 0 $ y.y.r.u.[.q.UXUXUXUXUX", -"UXUXUXUX4.W.F.t.r.t.; p q 0 s p d g d G U./.u./.u.u.~.~.u.W.H 0 g f 0 r 4 t.t.r.b.^.6.UXUXUXUXUX", -"UXUXUXUXUXk.}.u.r.r.H.# q q q s a s s % !.u./.u.u./.~.u.u.W., 0 f 0 q 9 * t.t.t.D.c.2.UXUXUXUXUX", -"UXUXUXUXUX5.^.D.r.r.r.* t 0 q q a a g < u.u.u./.u.u.Z.u.u.u.1 s 9 9 q 9 2 r.t.v.^.8.UXUXUXUXUXUX", -"UXUXUXUXUX1.k. Xu.r.r.r.* e q 9 9 f 0 4 z.u.z.z.z.u.u.u.u.k.N q 0 0 9 # p.r.t.F.c.2.UXUXUXUXUXUX", -"UXUXUXUXUXUX5.C.D.t.r.r.0.M q q q 9 M s.u.u.t.u.u.u.u.u.u.w.$ q 0 q w i.r.t.b.D.7.UXUXUXUXUXUXUX", -"UXUXUXUXUXUXUX9.[.A.t.r.0.& q 9 9 # g.r.t.t.t.t.t.t.t.t.r.r.@ e q q # g.r.z.^.q.1.UXUXUXUXUXUXUX", -"UXUXUXUXUXUXUX+ d. Xv.r.e.$ 9 q 9 = e.r.r.r.r.r.r.r.r.r.r.r.p.w q e ; r.u.^.c.1.UXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUX+ k. Xv.e.$ q q M @ r.r.r.r.r.r.r.r.r.r.r.r.0.& w $ 0.u.D.c.2.UXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUX1.k.^.B.- e V a.r.r.r.r.r.r.r.r.r.r.r.r.r.e.i.p.w.v.F.l.3.UXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUX+ d.F.!.4 @ r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.r.t.b.D.f.1.UXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXX 8.b.^.b.y.r.r.r.r.r.r.r.r.r.r.r.r.r.r.v.D.b.8.+ UXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUX. 1.q.B.^.D.v.u.y.t.t.t.t.t.t.u.z.S.D.B.q.3. UXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUX 1.8.k.V.D.V.D.S.S.A.n.D.V.V.k.9.5.o UXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXO 1.8.9.q.k.k.k.q.q.8.3.+ UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXX o o o X UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX", -"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_new.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_new.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_new.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_new.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,239 +0,0 @@ -/* XPM */ -static char *document_new__[] = { -/* columns rows colors chars-per-pixel */ -"48 48 185 2 ", -" c #000000", -". c #001200", -"X c #2B2E2C", -"o c #373737", -"O c #373937", -"+ c #005F00", -"@ c #006200", -"# c #007300", -"$ c #434744", -"% c #4F534F", -"& c #4F5250", -"* c #5D5F5D", -"= c #008700", -"- c #008D00", -"; c #148F00", -": c #009400", -"> c #0A9602", -", c #009C00", -"< c #0B940B", -"1 c #179902", -"2 c #1D930E", -"3 c #149B14", -"4 c #1A9C1A", -"5 c #2F8400", -"6 c #378600", -"7 c #33850D", -"8 c #209200", -"9 c #2C9600", -"0 c #26950E", -"q c #389800", -"w c #2B9513", -"e c #349813", -"r c #3E9A13", -"t c #00A400", -"y c #0CA300", -"u c #00AC00", -"i c #0AAA00", -"p c #09AC09", -"a c #10A200", -"s c #1BA400", -"d c #14A900", -"f c #1CAF00", -"g c #00B400", -"h c #0BB600", -"j c #01BA00", -"k c #0AB50A", -"l c #0EBD0E", -"z c #16B300", -"x c #19B400", -"c c #14B800", -"v c #1EBE00", -"b c #13A213", -"n c #13A813", -"m c #12BC12", -"M c #18BD18", -"N c #21A700", -"B c #28A500", -"V c #2FA800", -"C c #34A700", -"Z c #3EA500", -"A c #3CAA00", -"S c #27B600", -"D c #27BF00", -"F c #2ABC00", -"G c #32BB00", -"H c #23AC23", -"J c #2EA52E", -"K c #2AAA2A", -"L c #24B424", -"P c #37AD37", -"I c #38A338", -"U c #3FA83F", -"Y c #3DBE3D", -"T c #449C00", -"R c #469D13", -"E c #43A000", -"W c #4CA400", -"Q c #46A800", -"! c #4DA522", -"~ c #53A722", -"^ c #55AF34", -"/ c #5BB134", -"( c #01C201", -") c #00CB00", -"_ c #0AC10A", -"` c #08C908", -"' c #15C315", -"] c #18C018", -"[ c #31C400", -"{ c #3AC300", -"} c #39CB38", -"| c #46C600", -" . c #46CB00", -".. c #4CCA00", -"X. c #59CE00", -"o. c #5BD000", -"O. c #6CD400", -"+. c #47CF38", -"@. c #48CF38", -"#. c #56D338", -"$. c #64D838", -"%. c #70D837", -"&. c #7CDC37", -"*. c #72DB38", -"=. c #479947", -"-. c #5F9E5F", -";. c #47B947", -":. c #4DB44D", -">. c #49BD49", -",. c #5FB848", -"<. c #52A152", -"1. c #5CAF5C", -"2. c #62BA48", -"3. c #65A165", -"4. c #72A770", -"5. c #73A870", -"6. c #47C047", -"7. c #49C149", -"8. c #4ECF4E", -"9. c #52D24E", -"0. c #5FD74E", -"q. c #54D154", -"w. c #6BDA4E", -"e. c #76DD4E", -"r. c #7EDE4D", -"t. c #6EC460", -"y. c #63D763", -"u. c #69D863", -"i. c #72DC63", -"p. c #7BDE63", -"a. c #76D276", -"s. c #7ADC79", -"d. c #81DF62", -"f. c #81C870", -"g. c #82D17D", -"h. c #83DF78", -"j. c #88E178", -"k. c #8C938C", -"l. c #959595", -"z. c #9B9B9B", -"x. c #81AC80", -"c. c #84BE84", -"v. c #A4A4A4", -"b. c #ACACAC", -"n. c #A8B4A8", -"m. c #B4B5B5", -"M. c #B6BAB6", -"N. c #B3BCBF", -"B. c #BBBCBC", -"V. c #90CF80", -"C. c #8EE18E", -"Z. c #91E28D", -"A. c #9CE19C", -"S. c #A5CFA6", -"D. c #A4D9A4", -"F. c #B1DDAE", -"G. c #A1E5A1", -"H. c #B4E7B4", -"J. c #BBE1B7", -"K. c #B4E8B4", -"L. c #B8E9B8", -"P. c #BDC2C4", -"I. c #C3C3C3", -"U. c #C3C7C9", -"Y. c #C6CACC", -"T. c #CCCDCD", -"R. c #D2D2D2", -"E. c #D1D5D8", -"W. c #D5D8DA", -"Q. c #DCDDDD", -"!. c #D7E6D7", -"~. c #DDDFE0", -"^. c #E4E4E4", -"/. c #E3EFE0", -"(. c #E6E7E8", -"). c #E7E8E9", -"_. c #ECEDED", -"`. c #E7F2E0", -"'. c #E8F2E2", -"]. c #ECF6E9", -"[. c #EFF0F0", -"{. c #F4F4F4", -"}. c #F7F8F8", -"|. c #FCFCFC", -" X c None", -/* pixels */ -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X, : , , t , X X X X X X X X X", -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X- : : > H 6.;.H t : : , X X X X X X", -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X+ : : n a.H.L.L.L.L.H.a.n : - X X X X X", -" X X X X X X|.}.}.|.}.|.|.}.}.|.}.|.}.|.|.}.|.|.}.|.}.D.> , >.A.G.G.A.G.A.A.G.G.A.7.: : X X X X", -" X X X X X X}.(.^.).^.(.(.).(._._._._._._._.[._.[.[.S.< : Y C.C.C.a.F.J.J.F.g.Z.C.C.Y : : X X X", -" X X X X X X}.(.).(.(.)._.(._._.)._._._._._._._.[.!.< t L s.s.s.h.t.].|.|.'.t.j.j.s.s.L , : X X", -" X X X X X X}.(.(.(.(.(._.(._._._._.[._._._.[.[._.:.: t q.y.u.i.p.2.].|.|.].2.d.p.i.u.q.t : - X", -" X X X X X X}.).(.(._._._._._._._._._.{.[.[.{._.^.< : m 9.9.0.w.e.^ ].|.|.'./ d.e.w.0.q.m t : X", -" X X X X X X|.)._.)._._._._._.[._.[.[.[.[.[.[.[.c.- u M } @.#.$.%.! '.|.|.].~ &.*.$.#.@.] t : : ", -" X X X X X X}.).)._._._._._._._.[.[.[.[.{.[.[._.I , u j > 2 w e r 7 '.|.|.'.7 R r e 0 1 h u t : ", -" X X X X X X}._._._.(._.[._.[._.[.[.[.[.[.{.[.).3 , j t 4.`././.`.`.|.|.|.|.'.'./././.5.i g : - ", -" X X X X X X}.)._._._._._.[._._.[.[.{.[.[.{.{.~.3 t g t x.|.|.|.|.|.|.|.|.|.|.|.|.|.|.x.i g t - ", -" X X X X X X|._._._.[._.[.[._.{.[.[.{.{.{.{.{.~.4 t g t x.|.|.|.|.|.|.|.|.|.|.|.|.|.|.x.y j t : ", -" X X X X X X}._._._._._.[.[.{._.{.{.[.{.{.{.{.!.4 t j t 4././.`././.|.|.|.|.'./.`.`.`.5.i g t , ", -" X X X X X X|._._._._.[.[.[.{.{.[.{.{.{.{.{.{.^.K u g g > ; 8 9 q 6 '.|.|.'.6 T q 9 8 1 h g u : ", -" X X X X X X|._._._.{._.{.[.[.{.{.{.{.{.{.}.{.^.1.u g g h v [ .o.E '.|.|.'.W O.o. .[ v g g u # ", -" X X X X X X|._.[.[.[.[.[.{.{.{.{.{.{.{.}.{.}.(.M.d g g g c [ [ ..Z '.|.|.'.Q o...{ F h u g t X", -" X X X X X X|.{.[.[.[.[.{.{.{.{.{.{.}.{.{.}.}.{.R.=.g g u i x F { C `.|.|.'.A ..{ F x g g g : X", -" X X X X X X|._.[.[.[.{.[.{.{.{.{.}.{.}.}.}.}.}.^.n.k j g t i z S B `.|.|.'.V G S z t g j g X X", -" X X X X X X|._.[.{.[.{.{.{.{.{.{.{.}.}.}.}.}.|.[.R.3.j j g t i d s f.V.V.f.N x i t g g j @ X X", -" X X X X X X|._.[.{.[.{.{.{.{.}.}.}.}.}.}.}.|.}.}.(.m.-.j j j t t t y a a y i t t u j j @ X X X", -" X X X X X X|.{.[.{.{.{.{.{.}.{.{.}.}.}.}.|.}.|.|.{.~.m.3._ ( ( u t , t t t t g j ( g @ X X X X", -" X X X X X X}.[.[.{.[.{.{.}.}.{.}.}.|.}.|.|.}.}.|.}.{.!.M.k.J _ ) j j u j ( j ) ` P . X X X X X", -" X X X X X X|.[.{.{.{.{.{.{.}.}.}.}.}.|.|.}.|.|.|.|.|.{.^.I.v.k.<.L l l ' ' L =.k.b. X X X X X", -" X X X X X X|.{.{.{.{.{.}.}.}.}.}.}.}.|.}.|.|.|.|.}.|.|.}.[.Q.I.b.z.l.l.l.l.z.v.I.^. X X X X X X", -" X X X X X X}.{.{.{.{.}.}.{.}.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.}.{.(.Q.R.T.R.R.Q.(._.|. X X X X X X", -" X X X X X X|.{.{.{.{.{.}.}.}.|.}.|.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.}.{.{.}.|.|.|.|. X X X X X X", -" X X X X X X|.{.{.{.}.{.{.}.}.}.}.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|. X X X X X X", -" X X X X X X|.{.{.}.{.}.}.}.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|. X X X X X X", -" X X X X X X|.{.{.{.}.}.}.}.}.|.}.|.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|. X X X X X X", -" X X X X X X|.{.{.}.}.}.}.|.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.}.}.}.}.}.|.|. X X X X X X", -" X X X X X X|.{.{.}.}.}.}.}.}.}.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.}.}.{.[.{.{._.[.[.{. X X X X X X", -" X X X X X X|.{.}.}.}.}.}.|.}.|.|.|.}.|.|.|.|.|.|.|.|.|.|.|.|.}.{._._.(.^.Q.Q.Q.(.I. X X X X X X", -" X X X X X X|.}.}.}.}.}.}.|.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.}.{._.).Q.R.T.T.T.W.Y. X X X X X X X", -" X X X X X X|.{.{.}.}.}.|.}.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.}.{._.~.T.I.B.m.I.Q.T.X X X X X X X X", -" X X X X X X|.{.}.}.}.}.|.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.}.[._.Q.I.m.I.R._.[.T.o X X X X X X X X", -" X X X X X X|.}.}.}.}.}.}.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.{.{.~.T.m.|.|.}.[.T.$ X X X X X X X X X", -" X X X X X X|.}.}.}.}.}.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.}.[.(.R.B.I.|.|.[.T.% X X X X X X X X X X", -" X X X X X X|.}.}.}.}.|.}.|.|.}.|.|.|.|.|.|.|.|.|.|.|.{._.Q.T.m.T.|.[.T.* X X X X X X X X X X X", -" X X X X X X|.{.{.}.}.|.|.}.|.|.|.|.|.|.|.|.|.|.|.|.|.{._.R.I.b.^._.T.* X X X X X X X X X X X X", -" X X X X X X|.}.}.}.|.}.|.|.|.}.|.|.|.|.|.|.|.|.|.|.|._.(.R.B.B._.T.& X X X X X X X X X X X X X", -" X X X X X X|.}.}.}.}.}.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.{.^.T.B.Q.T.$ X X X X X X X X X X X X X X", -" X X X X X X|.}.}.}.}.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.}._.^.Y.Y.Y.O X X X X X X X X X X X X X X X", -" X X X X X X|.}.{.}.}.|.}.}.|.}.|.|.|.|.|.|.|.|.|.|.|._.^.E.U. X X X X X X X X X X X X X X X X X", -" X X X X X X|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.{._.N. X X X X X X X X X X X X X X X X X X", -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X", -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X", -" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_open.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_open.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_open.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_open.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -/* XPM */ -static char *document_open__[] = { -/* columns rows colors chars-per-pixel */ -"48 48 90 1 ", -" c #2E2E2E2E2E2E", -". c #35B635B635B6", -"X c #3C3C3C3C3C3C", -"o c #1D1D37375959", -"O c #1E1E39395B5B", -"+ c #20203D3D6262", -"@ c #29EA4E4E7D7D", -"# c #3E3E57577575", -"$ c #449A449A449A", -"% c #4D144D144D14", -"& c #53BC53BC53BC", -"* c #5ACE5ACE5ADA", -"= c #4ECF5C5C6D6D", -"- c #635363536353", -"; c #6C026C116C11", -": c #73F473F473F4", -"> c #7B507B507B50", -", c #2F2F57578B8B", -"< c #3A3A5D5D8888", -"1 c #30305ADB9110", -"2 c #3D3D64649696", -"3 c #350A63639F9F", -"4 c #34716546A417", -"5 c #38386767A3A3", -"6 c #3B4A699EA600", -"7 c #4C4C68688B8B", -"8 c #4B4B6B6B9393", -"9 c #41416F6FA8A8", -"0 c #46467171A7A7", -"q c #47477272AAAA", -"w c #49CA7575AC6C", -"e c #4C4C7878AEAE", -"r c #50507979ADAD", -"t c #5BDC7EFFAAAA", -"y c #45457676B1B1", -"u c #51517C7CB1B1", -"i c #54548404BDBD", -"p c #5E5E8989BDBD", -"a c #71718C8CAEAE", -"s c #63238CCCBD7D", -"d c #74749191B6B6", -"f c #5D5D8F8FC7C7", -"g c #5F5F9393CACA", -"h c #66669494C6C6", -"j c #6BC19595C4C4", -"k c #62A79545CBEC", -"l c #67679898CCCC", -"z c #6C0C9B4FCDF1", -"x c #72589F6ECF93", -"c c #73739F9FD0D0", -"v c #7373A0A0CFCF", -"b c #7D7DA3A3CFCF", -"n c #7583A1E8D0FB", -"m c #7D12A6C7D36D", -"M c #7F7FA8A8D450", -"N c #846484648464", -"B c #8A5F8A5F8A5F", -"V c #95CA95CA95CA", -"C c #9C0B9C0B9C0B", -"Z c #85859797AFAF", -"A c #9696A1A1B0B0", -"S c #9292A4A4BBBB", -"D c #A4FBA4FBA4FB", -"F c #AB02AB02AB02", -"G c #AC2BAEAEB231", -"H c #B4BFB4BFB4BF", -"J c #BC00BC00BC00", -"K c #8080A6A6CFCF", -"L c #8274AA86D52E", -"P c #8A23AEE1D6D6", -"I c #8E6EB2EAD8F0", -"U c #92C5B54EDA73", -"Y c #9797B9B9DCDC", -"T c #9B9BBBBBDD9D", -"R c #AEAEB6B6C1C1", -"E c #A4A4BFBFDDDD", -"W c #A525C1C1E160", -"Q c #AAD9C5E4E1F8", -"! c #B1B1CACAE4E4", -"~ c #B9B9CFCFE7E7", -"^ c #BC3CD150E8E8", -"/ c #C376C37BC380", -"( c #CC87CC87CC87", -") c #D36FD36FD36F", -"_ c #DB33DB33DB33", -"` c #E4A4E4A4E4A4", -"' c #EB28EB28EB28", -"] c #F572F572F572", -"[ c #FADEFADEFADE", -"{ c None", -/* pixels */ -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{", -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{", -"{{{{{{{{{{{%%%%&%%%&&%&&*****--;-;;;;:::::>>{{{{", -"{{{{{{{{{{{%[]]]]]]']]]]]]]]]]]]]]]][[[[[[':{{{{", -"{{{{{{{{{{{%[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[':{{{{", -"{{&&&&&&&&&*]]][]]]][[[[[[[[[[[[[[[[[[[[[[`:{{{{", -"{&J/(((/(((:]]'/FDDFDDFDDDDDDDDDDFDDFDD][]_-{{{{", -"{&JHCCCCCCC*[`'`````````'`'`''`'`''''''']'/*{{{{", -"{%(JFDDDFDD-]``HDDDDDDDDDDDDDDFDDFD``'''''H${{{{", -"{$HHVVCVVVNC'______________________`_`_```V{{{{{", -"{.H(DFFDDD>_`__FDDDDDDDDDDDDDDDDDDDDDDD/__:{{{{{", -"{{CJVVVVVV*](((((((((((((()(()()))()))))_(;{{{{{", -"{{V_DDDFDCN'((HDDDDDDDDDDDDDDDDDDDDDDF/((H*{{{{{", -"{{>/CVCVV;()J//JJ/JJ//J//////////////////N{{{{{{", -"{{:_DDDDD*'JJHDCDDDDDDDDDCDDDDDDDDDDD///J-{{{{{{", -"{{*(CVVV>D_HHHHHHHHHHHHHHHHHHJHHHJHJHJJJC%{{{{{{", -"{{*_FFFD-`HFFDCDCDCDDCDDCDDCDDDGHHGHHHHH;{{{{{{{", -"{{&/DVBN;`FFDFFFFFFDFFFFFFFFFFFFFFFFFFFC&{{{{{{{", -"{{&/HDD:J/Ft56666666666656666666666666654343334{", -"{{$FDBB&'GG6EQQQQQQQQQQQQQQQQQQQQQQQ!QQQQQQQQ~so", -"{{XFHCNN_GF6^UUUIIIIIIIIIIIIIIIIIIIIIIIIIIIIP~q{", -"{{ VFN;J/HAu!LPLLPPLLPLPPLLLLLLLLMMLLMmMLKLmLQ4{", -"{{{BJV*_JHZsQLLPLLLPLLPLLLLLLLLLLLMLmLMMmLmnIP,{", -"{{{:F>-`JJaxTLLLPLLLLLMLLLLLMLMMLmLMMmMMmmncYjO{", -"{{{;/:C)JJtLULLLLLLLLLLLLMMMMLMMMMMMMmMMmnxxW0{{", -"{{{-G-/(//qUPLLmLLLLMLmLMMMMMMMMmMMmmmmmxnxmT4{{", -"{{{*/-(///6TLLLLMMLMmLmmMMMMmMMMmmmmMmnxznxPK1{{", -"{{{*F*(//ReYLLLLLMMmLmmMMMMmmmmmmmmmmxxvznxUs+{{", -"{{{*F*(((SsUMMMMmMmMMMmMmmmMmMmmmmnnxxnznxnU6{{{", -"{{{%V*(((djLMmMmmMMmmmmmmmmMmnmnnnnxcvvcvxmP3{{{", -"{{{$C*J((rmLMmmmmmmMmmmnvnnnnvxxxcnzxvxxxxMh@{{{", -"{{{.N-CHG6PMmmmMnnncxxxxxxxxvxxxvxvnnzxvxxPw{{{{", -"{{{{N;%&=eLMbmvvnccnncnccnnxczcncccxczcnznM4{{{{", -"{{{{:N-;7pbxzzxzzczzzzzlzzzzzczzzzzzzczzznh1{{{{", -"{{{{;C:;6xzzzzzzzzzzzzzzzzzzzzllzzzzlzllzcy{{{{{", -"{{{{*>*=9zllzlllllllzllzlllllllllllllllllz4{{{{{", -"{{{{&N*2fklklkklkklkkkkkkkkkkkklkkkkkkkkki@{{{{{", -"{{{{%;#6fkkkkkkkkkkgkkkgkkgkkkgkgkkgkkkgk4{{{{{{", -"{{{{%85fkggkkgkkkkggkkgkkgkgkkgkkgkkgkkgy@{{{{{{", -"{{{{{<4444444444444445455444544444444444@{{{{{{{", -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{", -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{", -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{", -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{", -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{", -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{", -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{", -"{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_paste.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_paste.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_paste.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_paste.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,277 +0,0 @@ -/* XPM */ -static char *edit_paste__[] = { -/* columns rows colors chars-per-pixel */ -"48 48 223 2 ", -" c #141414", -". c #151515", -"X c #181818", -"o c #1A1A1A", -"O c #1B1B1B", -"+ c #1C1C1C", -"@ c #1E1E1E", -"# c #1F1F1F", -"$ c #202020", -"% c #212121", -"& c #222222", -"* c #232323", -"= c #242424", -"- c #262626", -"; c #272727", -": c #282828", -"> c #292929", -", c #2A2A2A", -"< c #2B2B2B", -"1 c #2C2C2C", -"2 c #2D2D2D", -"3 c #2E2E2E", -"4 c #2F2F2F", -"5 c #303030", -"6 c #313131", -"7 c #323232", -"8 c #333333", -"9 c #343434", -"0 c #353535", -"q c #363636", -"w c #373737", -"e c #383838", -"r c #393939", -"t c #3A3A3A", -"y c #3B3B3B", -"u c #3C3C3C", -"i c #3D3D3D", -"p c #3E3E3E", -"a c #3F3F3F", -"s c #404040", -"d c #414141", -"f c #424242", -"g c #434343", -"h c #444444", -"j c #454545", -"k c #464646", -"l c #474747", -"z c #484848", -"x c #494949", -"c c #4A4A4A", -"v c #4B4B4B", -"b c #4C4C4C", -"n c #4D4D4D", -"m c #4E4E4E", -"M c #4F4F4F", -"N c #505050", -"B c #515151", -"V c #525252", -"C c #535353", -"Z c #545454", -"A c #555555", -"S c #565656", -"D c #575757", -"F c #5D5D5D", -"G c #626262", -"H c #676767", -"J c #686868", -"K c #696969", -"L c #6A6A6A", -"P c #6C6C6C", -"I c #6E6E6E", -"U c #717171", -"Y c #727272", -"T c #737373", -"R c #757575", -"E c #767676", -"W c #7B7B7B", -"Q c #7C7C7C", -"! c #818181", -"~ c #838383", -"^ c #848484", -"/ c #858585", -"( c #8A8A8A", -") c #8E8F8D", -"_ c #909090", -"` c #959595", -"' c #969694", -"] c #989898", -"[ c #9A9A9A", -"{ c #9B9C9A", -"} c #9C9C9C", -"| c #9D9D9D", -" . c #9E9E9E", -".. c #9F9F9F", -"X. c #A0A0A0", -"o. c #A2A2A0", -"O. c #A4A4A4", -"+. c #A6A7A4", -"@. c #A9A9A8", -"#. c #A9A9A9", -"$. c #A9ABA8", -"%. c #AAAAA9", -"&. c #AAAAAA", -"*. c #ABABAB", -"=. c #ABACA9", -"-. c #AAACAB", -";. c #ACAEAB", -":. c #ADADAC", -">. c #AEAEAE", -",. c #AEAFB0", -"<. c #B0B0B0", -"1. c #B1B1B1", -"2. c #B2B3B1", -"3. c #B0B2B2", -"4. c #B2B3B2", -"5. c #B3B3B3", -"6. c #B2B5B4", -"7. c #B5B5B5", -"8. c #B7B7B7", -"9. c #B8B8B8", -"0. c #BABABA", -"q. c #BBBBBC", -"w. c #BBBDBF", -"e. c #BCBCBC", -"r. c #BCBDBC", -"t. c #BCBCBD", -"y. c #BDBDBD", -"u. c #BFBFBF", -"i. c #BEBFC0", -"p. c #C0C0C0", -"a. c #C0C1C1", -"s. c #C1C2C2", -"d. c #C2C2C2", -"f. c #C0C3C5", -"g. c #C4C4C4", -"h. c #C4C4C5", -"j. c #C5C5C5", -"k. c #C6C6C6", -"l. c #C7C7C9", -"z. c #C8C8C9", -"x. c #CACACB", -"c. c #CACBCB", -"v. c #CBCBCB", -"b. c #CCCCCC", -"n. c #CCCCCD", -"m. c #CDCDCD", -"M. c #CFCFD0", -"N. c #D1D1D1", -"B. c #D2D2D1", -"V. c #D1D2D2", -"C. c #D2D2D2", -"Z. c #D2D3D3", -"A. c #D3D3D3", -"S. c #D3D3D4", -"D. c #D4D4D4", -"F. c #D5D5D5", -"G. c #D4D6D6", -"H. c #D5D6D6", -"J. c #D6D6D6", -"K. c #D7D7D7", -"L. c #D7D8D7", -"P. c #D8D8D8", -"I. c #D8D8D9", -"U. c #D9D9D9", -"Y. c #D9D9DA", -"T. c #DBDBDB", -"R. c #DBDBDC", -"E. c #DCDCDC", -"W. c #DCDCDD", -"Q. c #DDDDDD", -"!. c #DDDDDE", -"~. c #DEDEDE", -"^. c #DEDFDF", -"/. c #DFDFDF", -"(. c #DFDFE0", -"). c #E0E0E0", -"_. c #E1E1E1", -"`. c #E2E2E2", -"'. c #E3E3E3", -"]. c #E4E4E4", -"[. c #E5E5E5", -"{. c #E6E6E6", -"}. c #E7E7E7", -"|. c #E9E9E9", -" X c #EAEAEA", -".X c #EBEEEF", -"XX c #ECECEC", -"oX c #EDEDED", -"OX c #EEEEEE", -"+X c #EFEFEF", -"@X c #EFF0F0", -"#X c #F0F0F0", -"$X c #F0F1F1", -"%X c #F1F1F1", -"&X c #F1F2F2", -"*X c #F2F2F2", -"=X c #F3F3F2", -"-X c #F2F3F3", -";X c #F3F3F3", -":X c #F3F4F4", -">X c #F4F4F4", -",X c #F4F5F5", -".#.O.| } ' _ ( / ! Q E Y P L aXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaX", -"aXaXaXaXaX9 p h g g g g h | g.g.d.a.i.y.e.0.9.8.7.5.1.<.! h h z z z z g 3 aXaXaXaXaXaXaXaXaXaXaX", -"aXaXaXaXN L L H L L H L L X.P.J.K.P.K.K.K.K.K.K.K.K.K.J.X.L I Y T T Y E Q G aXaXaXaXaXaXaXaXaXaX", -"aXaXaXh F S S S S S S S N X.+X+X+X+X+X+X+X+X+X+X+X+X+X+X] g h z M z z z z S N aXaXaXaXaXaXaXaXaX", -"aXaXaXz S S S S S S N N S | |.|.|.|.|.|.|.|.|.|.|.|.|.|.' g h z z z z l z h h aXaXaXaXaXaXaXaXaX", -"aXaXaXh S S S N S N S N N ( J.C.D.J.D.J.D.J.D.J.D.D.J.D.~ g g l l l l l h h y aXaXaXaXaXaXaXaXaX", -"aXaXaXh S S N S S N S N N g y y 9 w 9 9 8 8 8 8 6 6 6 6 9 g g l l l l h l h y aXaXaXaXaXaXaXaXaX", -"aXaXaXg S N N N N N M N M M M M v z z z l l l h h h l h h h h h h h h h h h w aXaXaXaXaXaXaXaXaX", -"aXaXaXg N S N N N N M M M M z z z z z z l l h h h h h h h h h h g g h g g a 8 aXaXaXaXaXaXaXaXaX", -"aXaXaXp N N M M N N M z M M z wX5X5X5X5X5X5X5X5X3X8X3X8XwX5XwX8X3XwXwX3XwXwXwXwXwXwXwX3XyXaXaXaX", -"aXaXaXp N N M M M M M M M z h :X#X+X+X+X;X@X#X;X>X>X>X>X:X5X>X5X5X5X5X5X3X3X3X3X5X5XwX3XwXaXaXaX", -"aXaXaXy N M M M M M M M z M h 5X+X@X;X;X;X;X;X>X>X>X>X>X5X5X5X5X3XwX5XwXwX5XwX3XwX3X3XwXyXaXaXaX", -"aXaXaXp M M z M z z z z z z h 5X@X+X;X#X;X;X>X;X>X5X5X3X>X5X3X5X3XwX3X3X5XwX3XwXwXwX3XwXwXaXaXaX", -"aXaXaXy v M v v M v v z z z g 5X;X@X;X-X>X>X5X>X>X5X5X3X3X8X8X8X5XwXwX3XwXwXwXwXwXwXwXwXyXaXaXaX", -"aXaXaXw v v v v z z z z z h s 5X;X;X-X-X;X>X>X5X5X5X8X3X8X8X8XwXwXwXwXwXwXwXwXwXwXwXwXwXyXaXaXaX", -"aXaXaXy v v v z z z l l z l g 5X-X-X:X:X>X5X3X3X3X8X8X8XwX8XwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXaXaXaX", -"aXaXaXw z z z z l l l l h h s 6X>X>X-X5X5X3X3X8X3X8XwX8X8XwXwXwXwXwXwXwXwXwXwXwXwXwXyXwXyXaXaXaX", -"aXaXaX9 l z l z l l h h g g p 6X-X>X>X5X5X3X3X8X3XwXwXwXwXwXwXwXwXwXyXyXyXwXwXwXyXwXwXwXyXaXaXaX", -"aXaXaX9 l l l h h h h h g g u 6X;X5X5X3X3X3X8X8XwXwXwXwXwXwXwXwXwXyXwXwXwXwXyXwXyXwXyXwXyXaXaXaX", -"aXaXaX6 l l h h h h h h g g u 3X5X5X>X8X8X3XwX8XwXwXwXwXwXwXtXwXwXwXwXwXyXyXyXyXyXyXwXwXyXaXaXaX", -"aXaXaX6 h h h g g g g h s g u wX>X5X3X3X8XwXwXwXwXwXwXwXtXtXwXtXwXyXyXyXyXwXwXyXwXyXyXyXyXaXaXaX", -"aXaXaX6 h g g g g a s s s a y 8X5X6X8X8X8XwXwXwXwXwXwXtXwXwXtXtXyXyXwXyXwXyXyXyXyXyXyXyXyXaXaXaX", -"aXaXaX3 g g g a g s s a a p y wX5X3X8X3XwXwXwXwXwXwXtXwXtXtXtXtXyXyXyXyXyXyXyXyXyXyXyXyXyXaXaXaX", -"aXaXaX3 g a g p s a p p p p w wX3X8X8XwXwXwXwXwXtXwXtXtXtXtXtXtXyXyXyXyXyXyXyXyXyXyXyXyXyXaXaXaX", -"aXaXaX3 g g a p a p p p p y w wX3X8X8XwXwXwXwXtXwXtXwXtXtXtXtXyXyXyXyXyXyXyXyXyXyXyXyXyXyXaXaXaX", -"aXaXaX> p p p p u p y u y y w wX8XwX8XwXwXwXtXwXwXtXtXtXtXtXyXyXyXyXyXyXyXyXyXyXyXyXyXyXyXaXaXaX", -"aXaXaX> p p y p y y y y y y 9 tX8XwXwXwXwXwXwXtXtXtXtXtXtXyXyXyXyXyXyXyXyXyXyXyXyXyXyXyXyXaXaXaX", -"aXaXaX> p p y p y y y y w y 8 tXwXwXwXwXwXtXtXwXtXtXtXtXyXyXyXyXyXyXyXyXyXyXyXyXyXyXyXyXyXaXaXaX", -"aXaXaX- y y y y y y w y w w 8 wX8XwXwXwXwXtXwXtXtXtXyXyXyXyXyXyXyXyXyXyXyXyXwXyXwXwXwXyXeXaXaXaX", -"aXaXaX- y y y y y y 9 y 9 y 6 yXwXwXwXwXwXwXwXyXwXyXyXyXyXyXyXyXyXyXyXyXwXwX5X>X>X>X;X5X5XaXaXaX", -"aXaXaX- y 9 y 9 9 9 y 9 9 9 6 wXwXwXwXyXwXyXyXyXyXyXyXyXyXyXyXyXyXyXyXwX>X;X#X+XXXXX+X+X XaXaXaX", -"aXaXaX- y y y 9 y 9 y 9 9 9 6 wXwXwXwXwXwXyXwXwXyXyXyXyXyXyXyXyXwXwX5X;X+X|.'.Q.P.J.J.Q.;.aXaXaX", -"aXaXaX& 9 y 9 y 9 9 9 9 9 9 3 yXwXwXwXyXyXwXyXyXyXyXyXyXyXyXyXyXwX5X+X+X).J.b.f.a.m.Q.:.aXaXaXaX", -"aXaXaX& 9 9 9 9 9 9 9 6 9 6 3 yXwXwXwXwXyXwXwXyXyXyXyXyXyXyXyXwX3X;X|.S.y.1.>.g.'.'.#.aXaXaXaXaX", -"aXaXaX& y 9 9 9 9 9 6 6 6 6 3 yXwXwXyXwXwXyXyXyXyXyXyXyXyXyXwX5X;X|.P.>.L.|.wX5X'.;.aXaXaXaXaXaX", -"aXaXaX& 9 9 6 9 6 6 6 6 6 6 3 wXwXwXwXyXyXyXyXyXyXyXyXyXyXyXwX;X+XQ.l.1.yXyX4X'.@.aXaXaXaXaXaXaX", -"aXaXaX& 6 9 6 9 6 6 6 6 3 3 > yXwXyXwXwXyXwXwXyXyXyXyXyXyXyXwX;X{.C.0.g.yX4X'.;.aXaXaXaXaXaXaXaX", -"aXaXaX& 6 6 6 6 6 6 3 3 3 3 > yXwXwXwXwXyXyXyXyXyXyXyXyXyXwX:X+XQ.c.1.T.5X'.O.aXaXaXaXaXaXaXaXaX", -"aXaXaX& 6 6 6 6 3 6 3 3 3 3 > wXwXyXyXwXyXwXyXyXyXyXyXyXyXwX;X|.L.s.6.>X).o.+ aXaXaXaXaXaXaXaXaX", -"aXaXaX+ 6 3 3 3 3 3 > 3 3 3 > yXwXwXwXyXyXyXyXyXyXyXyXyXyXwX;X{.C.y.C.).{ * . aXaXaXaXaXaXaXaXaX", -"aXaXaX+ 3 3 3 3 3 3 3 > > > - wXwXwXyXwXwXyXyXyXyXyXyXyXwXwX;X].M.y.Q.' & & . aXaXaXaXaXaXaXaXaX", -"aXaXaX+ + + + o o + o o o o o wXwXyXwXyXyXyXyXyXyXyXyXyXtXwX;X'.M.J.) . . . o aXaXaXaXaXaXaXaXaX", -"aXaXaXaXaXaXaXaXaXaXaXaXaXaXaXwXwXwXwXyXyXyXyXyXyXyXyXyXyXwX+X{.J.#.aXaXaXaXaXaXaXaXaXaXaXaXaXaX", -"aXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXv.v.v.m.m.m.m.m.m.m.m.m.c.l.f.i.aXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaX", -"aXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaXaX" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_print.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_print.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_print.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_print.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,166 +0,0 @@ -/* XPM */ -static char *document_print__[] = { -/* columns rows colors chars-per-pixel */ -"48 48 112 2 ", -" c #595D54", -". c #5C5E58", -"X c #61655C", -"o c #646662", -"O c #676A62", -"+ c #6E7269", -"@ c #71736D", -"# c #737571", -"$ c #757970", -"% c #7A7C76", -"& c #7C7F7A", -"* c #7D8079", -"= c #81857C", -"- c #DACA67", -"; c #3D649B", -": c #3E69A1", -"> c #58759B", -", c #446BA0", -"< c #4A70A5", -"1 c #4E75A8", -"2 c #537AAC", -"3 c #5C82B3", -"4 c #6682A5", -"5 c #6488B5", -"6 c #638AB9", -"7 c #7597C1", -"8 c #7398C3", -"9 c #729ECE", -"0 c #7CA2CC", -"q c #76A1D1", -"w c #7BA5D2", -"e c #868883", -"r c #898B86", -"t c #8C8E89", -"y c #91938E", -"u c #949591", -"i c #969993", -"p c #999B96", -"a c #9B9C98", -"s c #A2A49E", -"d c #A4A6A1", -"f c #A6A9A3", -"g c #A8ABA6", -"h c #ACAEA9", -"j c #AEB1AB", -"k c #B1B2AE", -"l c #B4B5B2", -"z c #B7B9B4", -"x c #B9BBB6", -"c c #B7BEBF", -"v c #BDBFBA", -"b c #BFC0BC", -"n c #D2CC9C", -"m c #CAC9AC", -"M c #C2C4BF", -"N c #CACBBB", -"B c #D9D6B8", -"V c #87A6C4", -"C c #89A7C5", -"Z c #8BA9C6", -"A c #8EABCE", -"S c #90ABC5", -"D c #9EB3C7", -"F c #9CB2C8", -"G c #82AAD5", -"H c #8DAED4", -"J c #8AB0D7", -"K c #8DB2D8", -"L c #95B3D4", -"P c #9AB6D6", -"I c #9FB9D7", -"U c #92B5DA", -"Y c #98B7D9", -"T c #97B8DC", -"R c #9DBADA", -"E c #A2B6CA", -"W c #A0B9D7", -"Q c #A2BDDB", -"! c #BDC3C4", -"~ c #ADC4DE", -"^ c #ADC7E3", -"/ c #AFC8E4", -"( c #B3CAE2", -") c #B9CEE5", -"_ c #BBD0E7", -"` c #BDD2E8", -"' c #C3C5C2", -"] c #C6C8C5", -"[ c #C9CCC6", -"{ c #CBCDC9", -"} c #CED0CB", -"| c #D7D7C7", -" . c #D1D4CE", -".. c #D8D8C8", -"X. c #D3D5D1", -"o. c #D6D9D2", -"O. c #D9DCD6", -"+. c #DCDDDA", -"@. c #DEE0DC", -"#. c #E1E2DE", -"$. c #C1D5EA", -"%. c #E4E5E2", -"&. c #E7E8E6", -"*. c #E8E9E7", -"=. c #ECEDEB", -"-. c #EFF0EE", -";. c #F0F0EF", -":. c #F3F4F2", -">. c #F7F8F7", -",. c #F8F8F7", -"<. c #F9F9F8", -"1. c None", -/* pixels */ -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.0 L R R A 9 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.0 Q _ $._ _ $.) Y 8 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.0 ) $.1.1.1.1.1.R ( ^ 7 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.P $.1.1.1.1.1.1.1.1./ H 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.Q ^ 1.1.1.1.1.1.1.9 R L 2 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.6 ~ Q 1.1.1.1.q 9 9 9 K R 2 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.6 ^ Y 1.q K T T K w 9 H R 2 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3 ^ U 9 K A 7 7 L U 9 G P 1 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3 ~ U w U 6 , 1.5 Q w G L < 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2 Q K w Y 2 1.1.2 I G G L , 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1 W J w L 1 1.1.< W G G H ; 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.4 D S C D 4 1.1.4 E Z V S > 1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.1.b { ] { { ] E [ ] ' ' E ] ] b ] ! ! ! c ] { { { { b 1.1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.b #.;.;.;.;.:.;.;.;.:.:.:.;.;.;.;.;.:.;.;.-.=.=.=.=.@.v 1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.b ;.:.:.;.;.;.;.;.;.=.=.=.=.=.=.=.*.*.&.*.&.&.&.%.=.=.b 1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.x =.;.=.=.=.=.*.*.*.&.&.&.&.%.%.%.%.%.#.%.#.#.#.#.%.=.x 1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.1.1.1.1.l =.;.*.=.*.*.*.*.*.*.&.%.%.%.%.%.%.%.#.#.@.#.@.@.%.*.l 1.1.1.1.1.1.1.1.1.1.", -"1.1.1.1.1.1.t p a u f &.*.%.%.%.%.#.#.#.@.@.@.@.+.+.+.+.O.O.O.O.o.O.X.@.%.g u p a t 1.1.1.1.1.1.", -"1.1.1.1.1.1.h .x h d { X.{ } { { { { { { [ [ ] ' [ ' ' ' ' ' ' M ' ' ] } s h M +.j 1.1.1.1.1.1.", -"1.1.1.1.1.d %.%.M M v ' ' ' ' ' M M M M M M ' M ' ' M ' ' ' ' ' M M M M M v b ] *.%.d 1.1.1.1.1.", -"1.1.1.1.a o.:.X.X.%.%.%.%.%.%.%.%.%.#.%.%.%.%.%.%.%.%.%.%.%.%.#.%.%.%.%.%.%.#.} +.>.O.a 1.1.1.1.", -"1.1.1.t ] >.*. .#.;.=.;.=.=.=.=.;.=.=.=.=.=.=.=.=.=.=.=.=.=.=.;.;.=.=.=.;.=.;.O.X.;.:.] u 1.1.1.", -"1.1.1.l =.:.%.{ =.:.;.;.;.:.;.:.;.:.:.:.:.:.;.:.:.:.:.:.;.:.:.;.;.:.;.;.;.:.,.%. .*.:.=.j 1.1.1.", -"1.1.i +.:.=.@. .:.<.<.<.<.<.<.<.,.,.<.<.,.,.<.<.,.,.,.,.<.<.<.<.<.<.<.,.<.<.<.;. .%.=.:.+.i 1.1.", -"1.1.k ;.;.=.+.X.<.<.,.,.,.,.,.<.,.<.<.,.,.,.,.,.,.,.,.,.<.,.,.,.,.,.:.,.:.,.<.:.X.%.=.;.;.h 1.1.", -"1.r ] :.*.=.O.} :.:.=.*.*.=.*.=.*.*.=.*.=.=.*.=.*.=.*.=.=.=.*.*.=.=.=.=.=.=.:.=.} #.*.*.:.[ r 1.", -"1.y o.=.&.%.@.{ X.=.=.=.=.=.;.=.=.=.=.=.=.=.=.=.=.=.=.=.;.=.=.=.=.=.=.=.=.=.&.X. .%.%.&.=.O.u 1.", -"1.p +.*.#.%.#.O.{ { } } } { } } } } } } } } } } } } } } } } } } } } } .{ .[ .+.@.+.@.&.+.i 1.", -"1.p #.%.@.@.@.@.@...o.o.o.o.o.o.o.o.O.X.o.o.o.o.o.o.o.o.o.o.o...o.o.o.o.o.o.o.@.o.N b N @.@.p 1.", -"1.a @.#.o.@.o.o.o.@.O.@.@.o.@.o.O.O.O.O.O.O.O.@.O.O.O.O.o.@.@.o.@.o.@.o.o.@.@.o.} n - n O.@.s 1.", -"1.i +.+.o.o.o...o.o.o.o...O...o.o.o.o.o.o.o.o...o.o.o.o.o.o.o.o.o. . . .o.o.o.o...| B | @.@.i 1.", -"1.i +.O. .o. .} N [ ! [ [ [ [ ! [ ] [ [ [ [ [ [ [ [ [ [ [ } [ [ } } } } [ } } } .o.o.o.@.@.p 1.", -"1.i +.O. . .b a y y s a s s s s d d d d f f f f g g g g g g g j h h h h k k g d k ! ...o.@.y 1.", -"1.i +.O. .} s $ X * h b g f s f d d d d f d f f s f f f g g f f f f f f b k * O * b . .@. .i 1.", -"1.y O.O.o.} s X * b b b b g g g g g g g g g g g g g g g g g f g g h b b b * + b .o.@.O.u 1.", -"1.i o.O. . .j + X 4 . .b ! b b ' M ' M M ' ! ! ' [ [ [ [ [ [ [ [ [ [ } . .t X $ b o. .o.O.u 1.", -"1.y o.o. . .z = * p #.#.@.} [ [ { { { { { ] { { ] O.@.#.@.%.#.@.#.#.@.%.%.%.d # * } @.} @.o.y 1.", -"1.y o.@.o...N p i m :.-.*.#.&.&.%.&.%.%.%.&.%.&.&.=.=.=.=.=.=.*.=.=.=.*.;.:.v i p .@...@...u 1.", -"1.t } +.O.o.x s k | >.:.:.:.-.:.:.;.:.;.:.:.-.:.;.:.:.;.:.:.:.:.:.:.:.:.:.>.X.k f b @.o.@.[ t 1.", -"1.% t y u y y s b #.,.,.>.>.>.>.>.>.>.>.>.>.>.>.>.>.,.>.>.>.,.>.>.>.,.,.,.<.&.x s r y y y t * 1.", -"1.1.1.1.1.. r E ] *.:.:.:.:.:.-.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.:.*.] b e . 1.1.1.1.1.", -"1.1.1.1.1.o z #.{ } . . . . . . . .} .} . . .} X.X.} . . . .} .X.} . . .{ @.z o 1.1.1.1.1.", -"1.1.1.1.1.o h } { { { [ [ [ [ [ [ { { [ [ [ ] { { ] [ { [ [ [ { [ [ ] { [ [ [ [ { h o 1.1.1.1.1.", -"1.1.1.1.1.1.o @ # # # # # # @ $ # # # # # # # # # # # # # # # # # # # # # # # # + o 1.1.1.1.1.1." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_redo.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_redo.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_redo.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_redo.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -/* XPM */ -static char *edit_redo[] = { -/* columns rows colors chars-per-pixel */ -"48 48 82 1 ", -" c #3E6E0C", -". c #42750D", -"X c #44780E", -"o c #467A11", -"O c #4A7C14", -"+ c #4E7E18", -"@ c #4E8019", -"# c #52831D", -"$ c #568621", -"% c #598722", -"& c #5A8925", -"* c #5E8C29", -"= c #618F2C", -"- c #63902E", -"; c #799F2E", -": c #669231", -"> c #6B9535", -", c #6C9738", -"< c #6F9A3C", -"1 c #709836", -"2 c #729B3D", -"3 c #799F3D", -"4 c #7DA333", -"5 c #759E41", -"6 c #7AA145", -"7 c #7DA44A", -"8 c #81A736", -"9 c #81A836", -"0 c #82A53B", -"q c #85AB3B", -"w c #89AF3E", -"e c #8AB03F", -"r c #80A443", -"t c #86A843", -"y c #8AAC45", -"u c #82A74C", -"i c #8AAB4C", -"p c #8DB343", -"a c #8FB348", -"s c #91B646", -"d c #92B847", -"f c #92B64B", -"g c #95BA4A", -"h c #99BE4E", -"j c #85AA52", -"k c #8BAD54", -"l c #8DAF59", -"z c #8EB15B", -"x c #93B453", -"c c #9ABD54", -"v c #91B45E", -"b c #9DBD5D", -"n c #95B661", -"m c #98B764", -"M c #97B964", -"N c #9CBB64", -"B c #9EBD6A", -"V c #A1BF65", -"C c #A0BE6B", -"Z c #9AC04F", -"A c #9DC252", -"S c #9DC059", -"D c #A0C556", -"F c #A2C55D", -"G c #A5C85D", -"H c #A3C363", -"J c #A7CB61", -"K c #A9CB63", -"L c #A4C26C", -"P c #ACCB6C", -"I c #AFD06C", -"U c #A7C571", -"Y c #A9C672", -"T c #ACCA74", -"R c #ADCB79", -"E c #B0CE73", -"W c #B1CE7B", -"Q c #B2D077", -"! c #B3D07A", -"~ c #B8D67C", -"^ c #B5D184", -"/ c None", -/* pixels */ -"////////////////////////////////////////////////", -"////////////////////////////////////////////////", -"////////////////////////////////////////////////", -"////////////////////////////////////////////////", -"//////////////////////////X/////////////////////", -"//////////////////////////O#////////////////////", -"//////////////////////////*n>///////////////////", -"//////////////////////////:^YnRIGSZAAAAAAAAAAAAcPU5O////////", -"//////////////$uYPSZZhZhZhhZZZZZZZhhAKY7+///////", -"/////////////&lEGAhhhZhhhhhhhhhhhhhhhhFYj#//////", -"////////////&vEcghhhghhhhhhhhhhhhhhhhhgKR2X/////", -"///////////@zYcgghgghgggggghggggggghggAYz&//////", -"//////////o6YcgggggggggggggggggddggggcYj$///////", -"//////////-LFdgsdgdgpgddsgpgdggdgdddSUj#////////", -"/////////@jLsssssdddgsghhhggdgpgdssSU7#/////////", -"/////////=LcsssspssgbHLLLBUbgpspssbL6O//////////", -"/////////5LssssssgNLmj5>**5CgpppsbC2o///////////", -"////////+lHpeyesgLv2$o////*LxpppbB c #2F5C9A", -", c #335C95", -"< c #325E9A", -"1 c #386097", -"2 c #33619E", -"3 c #3A639B", -"4 c #3465A4", -"5 c #3967A1", -"6 c #3768A6", -"7 c #3A69A6", -"8 c #3C6CA9", -"9 c #3F70AC", -"0 c #40679D", -"q c #42699F", -"w c #426CA4", -"e c #486EA2", -"r c #416FA9", -"t c #4A71A5", -"y c #4372AC", -"u c #4A74AB", -"i c #4F78AD", -"p c #5177A9", -"a c #547AAD", -"s c #597EAE", -"d c #4676B1", -"f c #4977B1", -"g c #4C7CB5", -"h c #507EB5", -"j c #507FB8", -"k c #5380B7", -"l c #5C83B4", -"z c #5483BA", -"x c #5986BB", -"c c #5B89BE", -"v c #6086B6", -"b c #6589B7", -"n c #6087B8", -"m c #638ABB", -"M c #6A8EBC", -"N c #6C91BE", -"B c #5E8CC1", -"V c #618EC2", -"C c #6492C5", -"Z c #6B95C5", -"A c #6795C8", -"S c #6996C8", -"D c #6C99CA", -"F c #7196C2", -"G c #769AC4", -"H c #799CC5", -"J c #729CCA", -"K c #7B9EC8", -"L c #7FA0C7", -"P c #76A0CF", -"I c #7DA2CD", -"U c #7BA4D1", -"Y c #7FA8D3", -"T c #83A5CC", -"R c #88A8CE", -"E c #81A7D1", -"W c #82A9D3", -"Q c #8AADD4", -"! c #8EB1D6", -"~ c #8DB1D8", -"^ c #91B1D6", -"/ c #92B3D8", -"( c None", -/* pixels */ -"((((((((((((((((((((((((((((((((((((((((((((((((", -"((((((((((((((((((((((((((((((((((((((((((((((((", -"((((((((((((((((((((((((((((((((((((((((((((((((", -"((((((((((((((((((((=,,331,:=(((((((((((((((((((", -"(((((((((((((((((:qsNTTRRTTGbp3-((((((((((((((((", -"(((((((((((((((,pHQ//QWWWEEQ/^RMe-((((((((&(((((", -"(((((((((((((;pT^~YPJDDDSDSSSJIQRNq*((((*,=(((((", -"((((((((((((3N/~IJDDSSDSSSACACCZJWTp-((*eM,(((((", -"(((((((((((wL!YDDDDSSSSSAACCCVVVBCURl;-pTT,(((((", -"((((((((((eT~PSDDSSSSSCCCCCCCCVVBBBJTbvTTT,(((((", -"(((((((((qTQJSSSSSAAACCCCCCCVBBBBBzBSRTZZG,(((((", -"((((((((,HWJSSSAAACCCCCVVBcBBBBBzBBBcCVxZN,(((((", -"(((((((-bQJAAAAACCCCCCSDDZZCBcccBxxBzzzzMG,(((((", -"(((((((tRPSAACCCCCVCHIIHHHHIJScxxxzzzzzzVN,(((((", -"((((((,NESACCCCCVCJIGlq311qubLJmzzzzzzzjmN,(((((", -"((((((eTDCCCCVBBVJHs,*((((((-3bPVzzzjjjhcM,(((((", -"(((((=bIABCBVVBBDHt=(((((((((%4444444466663:&O((((((((((((((", -"((((((((((((((((.#&-:>><2<<>;*#o((((((((((((((((", -"((((((((((((((((((( +@%&&%#@X(((((((((((((((((((", -"((((((((((((((((((((((((((((((((((((((((((((((((", -"((((((((((((((((((((((((((((((((((((((((((((((((", -"((((((((((((((((((((((((((((((((((((((((((((((((", -"((((((((((((((((((((((((((((((((((((((((((((((((" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_replace.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_replace.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_replace.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_replace.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,247 +0,0 @@ -/* XPM */ -static char *edit_find_replace[] = { -/* columns rows colors chars-per-pixel */ -"48 48 193 2 ", -" c #0D141B", -". c #111920", -"X c #1B2126", -"o c #1E242A", -"O c #21252A", -"+ c #23282E", -"@ c #272D34", -"# c #2A2D31", -"$ c #2F3235", -"% c #2D333A", -"& c #35373A", -"* c #353B41", -"= c #3C3E40", -"- c #3F454B", -"; c #434546", -": c #454748", -"> c #4C4D4F", -", c #494E54", -"< c #4C5155", -"1 c #545555", -"2 c #565758", -"3 c #5E5E5F", -"4 c #585C61", -"5 c #676767", -"6 c #676A6F", -"7 c #6C6C6C", -"8 c #686B70", -"9 c #747474", -"0 c #7F7A72", -"q c #747678", -"w c #777A7D", -"e c #7D7D7D", -"r c #AC721B", -"t c #B0751F", -"y c #936B67", -"u c #827F79", -"i c #CB6858", -"p c #E86D56", -"a c #FD7254", -"s c #E27F6E", -"d c #FF7F62", -"f c #D6890D", -"g c #DB8C0A", -"h c #DF900B", -"j c #CE8616", -"k c #CF8718", -"l c #D28713", -"z c #D48810", -"x c #E2940A", -"c c #E69A0B", -"v c #E89F0C", -"b c #EBA30C", -"n c #EEAB0B", -"m c #F1B40A", -"M c #F4BC0D", -"N c #CB8720", -"B c #CD8822", -"V c #C98B2E", -"C c #C8972D", -"Z c #C98C32", -"A c #C9913F", -"S c #F6BB28", -"D c #F6C313", -"F c #F7C71B", -"G c #F8CA1E", -"H c #F9CE24", -"J c #F8D12C", -"K c #F8D232", -"L c #F8D63A", -"P c #928065", -"I c #81807F", -"U c #938B7F", -"Y c #A9936D", -"T c #C59043", -"R c #C89241", -"E c #C29654", -"W c #C79955", -"Q c #C69B5B", -"! c #C09C66", -"~ c #FE9179", -"^ c #C3A06C", -"/ c #C9A36C", -"( c #F8D740", -") c #F8D947", -"_ c #F7DA4C", -"` c #F7DD54", -"' c #F7DE5B", -"] c #F3CF6B", -"[ c #F5DE61", -"{ c #EAC079", -"} c #F5E067", -"| c #F3E06C", -" . c #F3E174", -".. c #F0E17B", -"X. c #848484", -"o. c #888887", -"O. c #8B8B8B", -"+. c #908F8F", -"@. c #9B9788", -"#. c #8F9091", -"$. c #949494", -"%. c #989797", -"&. c #989897", -"*. c #969698", -"=. c #979899", -"-. c #9C9C9B", -";. c #B88680", -":. c #A0A09F", -">. c #9EA0A1", -",. c #A3A3A3", -"<. c #A9A6A1", -"1. c #A8A8A7", -"2. c #A6A6A8", -"3. c #ABABAB", -"4. c #B0AFAF", -"5. c #AEAFB0", -"6. c #B3B3B4", -"7. c #BCBBBC", -"8. c #FF9D87", -"9. c #FB9C88", -"0. c #C6AA81", -"q. c #CBAD82", -"w. c #C0AB8D", -"e. c #C6B295", -"r. c #C2B39E", -"t. c #CFB898", -"y. c #D4BE98", -"u. c #C4BBAC", -"i. c #CABCA8", -"p. c #C7BFB4", -"a. c #C0BFBD", -"s. c #D6CD8D", -"d. c #D9C096", -"f. c #E3D88C", -"g. c #E6DE94", -"h. c #E1DC9D", -"j. c #FED998", -"k. c #EEE185", -"l. c #EBE18B", -"z. c #F0E380", -"x. c #EDE492", -"c. c #E8E19C", -"v. c #D4C4AE", -"b. c #DCDAAB", -"n. c #CDCDB2", -"m. c #C3C0BC", -"M. c #CBC4BC", -"N. c #CCCCBB", -"B. c #D8CEBF", -"V. c #D4D3B5", -"C. c #D8D7B0", -"Z. c #D0D0B9", -"A. c #DFDEBA", -"S. c #E4DFA4", -"D. c #E6E2AA", -"F. c #E2E0B2", -"G. c #C5C4C5", -"H. c #C9C6C3", -"J. c #C9C8C4", -"K. c #C7C7C8", -"L. c #C7C8C8", -"P. c #CDCDCC", -"I. c #D0CFC1", -"U. c #D0CFCF", -"Y. c #D5D5C2", -"T. c #D3D2CE", -"R. c #D8D2CB", -"E. c #DADACF", -"W. c #D0CFD0", -"Q. c #D4D3D3", -"!. c #D8D7D7", -"~. c #DDDBD4", -"^. c #D5D6DA", -"/. c #D8D7D8", -"(. c #D7D8DD", -"). c #DBDBDB", -"_. c #E0DFDF", -"`. c #E3E2DB", -"'. c #DDDEE2", -"]. c #DFE0E4", -"[. c #E3E2E3", -"{. c #E8E7E7", -"}. c #E8E8E7", -"|. c #E5E5E9", -" X c #E7E8EA", -".X c #EBEBEC", -"XX c #F0EFEF", -"oX c #EEEFF1", -"OX c #F3F3F4", -"+X c #F8F7F7", -"@X c #F7F7F8", -"#X c #FBFBFB", -"$X c None", -/* pixels */ -"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X=..XOXOXOXOXOX+XOXOXOX+XOXOX+XOXOXOXOX+XOXOX[.G.4.$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X4.#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X.X[.L.$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X3.#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#XOX_.+XL.$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X3.#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X+XQ.OX+XL.$X$X$X$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X3.+X#X#X+X.X.X.X}..X.X.X.X.X.X.X}..X.X.X.X}..X}.P.oXOXOXL.$X$X$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X3.+X+X+X+X[.].`.]._.`.[._.[.[._._._.`.[.]._._.}.P. XOXOXOXL.$X$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X3.+X+X+XOX[.'.[.)._.[.].'.L.3.-.#.*.,.a.!.[.|.OXQ.}.OXOXXXOX7.$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X3.+X+X+X+X[.`.[.[.[.].6.o.$.5.a.L.G.6.=.X.1.[.OXP.[.XXoXXXXX.X3.$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X1.+XOX+XOX[._.)._.^.$.#.L..XOX#X@X@X@XoXQ.=.o.L.G._.OXoXoXoXXX}.-.$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X1.OX+X+XOX[._._.^.O.,.}.OXOXoXOXOXOXOXOXOXoX5.e 3.!.[.}. X.X.XXX_.#.$X$X$X9.~ $X$X$X", -"$X$X$X$X$X$X1.OXOXOX+XOXOXOX2.:.oXOXOX@X@X@X#X#X@X#X@X@XOX6.w 7.a.6.3.2.2.7.Q.P.$X$Xs 8.~ a $X$X", -"$X$X$X$X$X$X1.XXOXOXOX+XOXP.O.[.oXOX@X@X#X#X#X@X#X#X#X@XOX.X$.3.[.W.7.2.=.$.-.6.2.%.;.p a a $X$X", -"$X$X$X$X$X$X1.OXOXOXXX[.`.+.6.XXOX@X@XOXOX@X@X@XOX@X@X@XOXoXP.e Q.Q.G.7.6.5.6.7.3.3.O.y i $X$X$X", -"$X$X$X$X$X$X1.OXXXXXXX`.P.w /.XXOXOXOXOXOXOXOXOXOXOXOXOXoX.X Xo.6.).T.L.G.G.L.n.s.@.w O.$X$X$X$X", -"$X$X$X$X$X$X<.OXXXXXXX[.7.X.{.oXOXOXOXoXoXOXoXOXOXOXoXOXoX XoX>.-.).!.^.Q.).Y.z.F C y I $X$X$X$X", -"$X$X$X$X$X$X2..XXXXXXX_.3.X.oXXXoXoXoXoXoXoXoXoXoXoXoX X|. X X3.$._._._.`.~.x.H n f t $X$X$X$X$X", -"$X$X$X$X$X$X<..XXX.X.X[.7.I {.oX.XoXoX.XoXoXoXoXoXoX X|. X XoX5.%.[.XXXX`.D.J m h t $X$X$X$X$X$X", -"$X$X$X$X$X$X,..XXX.XXXXXW.w '. XoX.XoX.X.X.X.XoX X|.|. XoXoXoX=.6.XX.X`.D.L m x A U $X$X$X$X$X$X", -"$X$X$X$X$X$X<..X{.XX{.{.).q G.|.].].]. X|.].|.].|. X X X X X'.X.K..X[.F.` m c V Z.3.$X$X$X$X$X$X", -"$X$X$X$X$X$X2.{.{..X{.!.!.*.+.[.].].].'.].].].'.].].|.].|. X6.e Q._.A.[ M c B v. X<.$X$X$X$X$X$X", -"$X$X$X$X$X$X<.{.{.{.{.!./.K.q a.].'.'.'.].'.'.'.].'.'.'.].^.w 5.!.V. .D b l t.{..X<.$X$X$X$X$X$X", -"$X$X$X$X$X$X,.{.{.{.{.!.Q.Q.2.%.^.'.'.^.'.'.'.^.'.'.'.'.^.X.#.Q.Z...F b f q.{.{.[.,.$X$X$X$X$X$X", -"$X$X$X$X$X$X,.[.{.{.[.!.!.!.:.%.:.7.(.'.^.^.^.^.^.'.'.G.q o.P.I.l.H n g / _.{.{.[.,.$X$X$X$X$X$X", -"$X$X$X$X$X$X<.[.[.{.[.[.[.a.o.8 1 X.:.G.^.(.'.'.^.G.*.q 2.'._.h.J n g W ).[.[.[.[.,.$X$X$X$X$X$X", -"$X$X$X$X$X$X,.[.[.[.[.{.H.#.u & + #.3.#.O.*.%.#.I X.=.W.[./.h.L m h A R.{.[.[.[.[.,.$X$X$X$X$X$X", -"$X$X$X$X$X$X>.[.[.[.[.a.O.I = O q G.Q.P.a.4.1.4.7.K.^.Q.U.S.) m x V u.^.`.[.[.[.[.:.$X$X$X$X$X$X", -"$X$X$X$X$X$X,.)._.[.Q.+.X.; O 8 P.W.W.Q.Q.Q.Q.Q.Q.Q.W.P.C.' M c B r.Q.Q.Q._._.`.`.:.$X$X$X$X$X$X", -"$X$X$X$X$X$X:.[._./.%.O.> o 4 G.W.W.W.W.W.W.W.W.W.W.P.V.] D b l w.W.W.^._._._._._.:.$X$X$X$X$X$X", -"$X$X$X$X$X$X-._./.-.O.2 o , 7.W.U.U.W.W.W.W.W.W.U.U.Z...D b z 0././.).)._._._.).).:.$X$X$X$X$X$X", -"$X$X$X$X$X$X:.).,.o.4 O : 6.W.U.U.U.U.W.P.U.U.P.P.N.z.G n h Y Q.!.!.!.Q./.)._._.).>.$X$X$X$X$X$X", -"$X$X$X$X$X$X:.3.O.5 + * 3.W.P.P.P.P.P.U.P.P.P.P.M.c.J n g E H.P.P.P.P.Q.Q.).).).).:.$X$X$X$X$X$X", -"$X$X$X$X$X$X7 O.7 # % >.Q.P.W.W.U.U.W.W.U.U.W.M.h.L m h T M.P.U.W.W.P.^.).).~.).).-.$X$X$X$X$X$X", -"$X$X$X$X$X$X9 q $ @ =.).).!.).).)./.).~.)./.R.b.) m x V M.~.~.!.!.).).!.!./.).~.!.-.$X$X$X$X$X$X", -"$X$X$X$X$X7 e & + O././.!.!.!.!.!.!.!.!.!.Q.C.' M c N i.!.^.).!.!.!.!.!.!.!.!.!.!.-.$X$X$X$X$X$X", -"$X$X$X$X7 X.- X w Q.!.!.^.!.!.Q.Q.!.!.!.Q.V.[ D v j e.^.Q.!.!.!.!.^.Q.!.!.!.!.!.!.-.$X$X$X$X$X$X", -"$X$X$X3 X.: O 8 P.!.Q.Q.Q.Q.Q.!.Q.^.Q.Q.Z...D b l 0.Q.^.Q.!.Q.^.Q.Q.^.Q.Q.Q.!.Q.Q.-.$X$X$X$X$X$X", -"$X$X2 X.> X < L.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Q.Z.k.G b f ^ P.^.Q.Q.Q.Q.Q.Q.Q.Q.^.Q.Q.Q.Q.Q.-.$X$X$X$X$X$X", -"$X$Xo.2 O O.Q.R.Q.Q.Q.Q.Q.R.Q.Q.Q.H.f.H n g E P.T.T.Q.T.Q.T.Q.T.Q.Q.R.Q.Q.T.Q.R.-.$X$X$X$X$X$X", -"$X9 3 + . $X=.T.W.Q.U.Q.U.Q.U.U.W.Q.u.] S g T H.Q.U.W.T.Q.U.Q.W.Q.W.W.T.W.U.U.Q.Q.%.$X$X$X$X$X$X", -"$X$XO . $X$X&.U.U.P.U.U.P.U.U.U.U.J.y.j.{ Q p.T.U.U.U.U.P.U.P.Q.U.U.U.U.U.U.U.W.P.%.$X$X$X$X$X$X", -"$X$X$X$X$X$X&.U.P.P.P.P.P.P.P.P.U.<.Y d.u.J.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.=.$X$X$X$X$X$X", -"$X$X$X$X$X$X%.U.P.P.P.P.P.P.P.P.J.u u m.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.P.=.$X$X$X$X$X$X", -"$X$X$X$X$X$Xo.L.P.P.P.P.P.U.P.P.P.a.P.P.P.P.U.P.P.P.P.U.P.P.P.P.P.P.P.P.P.P.P.P.P.O.$X$X$X$X$X$X", -"$X$X$X$X$X$X$X9 X.e e u e e e e e e e e u e e e e e e e e u e e e e u e e u e I 9 $X$X$X$X$X$X$X", -"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X", -"$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X" -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_save.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_save.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_save.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_save.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,218 +0,0 @@ -/* XPM */ -static char *document_save__[] = { -/* columns rows colors chars-per-pixel */ -"48 48 164 2 ", -" c #2A2F31", -". c #2E3335", -"X c #303536", -"o c #303638", -"O c #353A3B", -"+ c #393E3E", -"@ c #3B3F40", -"# c #3D4242", -"$ c #414545", -"% c #444847", -"& c #454949", -"* c #494D4B", -"= c #4D504E", -"- c #4E5250", -"; c #525553", -": c #555856", -"> c #575958", -", c #5B5E5C", -"< c #5D605E", -"1 c #5E6160", -"2 c #646764", -"3 c #666967", -"4 c #6A6D6B", -"5 c #6E706E", -"6 c #727573", -"7 c #757876", -"8 c #777A79", -"9 c #7A7C7A", -"0 c #4E9A05", -"q c #539E0D", -"w c #57A010", -"e c #5FA61A", -"r c #62A81F", -"t c #5D9627", -"y c #66AB25", -"u c #68AC27", -"i c #6AAD2B", -"p c #74AE3D", -"a c #75B23C", -"s c #79D61D", -"d c #7BD720", -"f c #7DD924", -"g c #76AE41", -"h c #78AE44", -"j c #7BAD4B", -"k c #7BB644", -"l c #7EBA45", -"z c #7FB848", -"x c #79A154", -"c c #7D807D", -"v c #83DD2B", -"b c #86DB34", -"n c #88DD36", -"m c #8BDE3B", -"M c #8AE233", -"N c #8EE23C", -"B c #83BC4D", -"V c #84AE5B", -"C c #82B153", -"Z c #86BF50", -"A c #87AB64", -"S c #8CAC6E", -"D c #8BB761", -"F c #90B86B", -"G c #95B07C", -"H c #90DD45", -"J c #8BC455", -"K c #8DC459", -"L c #92C95D", -"P c #8FE040", -"I c #93E444", -"U c #96E44A", -"Y c #98E74D", -"T c #9CE754", -"R c #A1E85C", -"E c #97CC64", -"W c #99CE66", -"Q c #9ED36C", -"! c #A0D46E", -"~ c #A4DB6F", -"^ c #A1D173", -"/ c #A7DC73", -"( c #A9DE76", -") c #A7D57C", -"_ c #ABDD7A", -"` c #A6E864", -"' c #A7E46C", -"] c #A9E56F", -"[ c #ABEA6D", -"{ c #ACE672", -"} c #AEE974", -"| c #ADE27B", -" . c #B0EB77", -".. c #B1E67D", -"X. c #B3EB7C", -"o. c #838581", -"O. c #8B8D87", -"+. c #8D8E8A", -"@. c #8F908C", -"#. c #91938E", -"$. c #969D8E", -"%. c #939592", -"&. c #979894", -"*. c #999B96", -"=. c #9D9E9A", -"-. c #9FA09C", -";. c #A0B789", -":. c #A0A19E", -">. c #ADBF9A", -",. c #A5A6A2", -"<. c #A7A8A4", -"1. c #A9AAA5", -"2. c #ABADA9", -"3. c #AFB1AD", -"4. c #B4BEA7", -"5. c #B2B4AE", -"6. c #B4B8AE", -"7. c #B3B5B1", -"8. c #B6B8B3", -"9. c #B9BBB6", -"0. c #BCBEBA", -"q. c #ABD781", -"w. c #B5DD8E", -"e. c #B2E481", -"r. c #B5EA82", -"t. c #B9ED86", -"y. c #B5E28B", -"u. c #B9E58E", -"i. c #BCED8B", -"p. c #BBE393", -"a. c #BFEB94", -"s. c #BEE39B", -"d. c #B3C1A5", -"f. c #BDC6B3", -"g. c #BFC1BC", -"h. c #C3ED9A", -"j. c #C0F092", -"k. c #C0CBB4", -"l. c #C1C3BE", -"z. c #C5CCBE", -"x. c #C5E7A4", -"c. c #C7EFA0", -"v. c #CCF2A5", -"b. c #D0F3AD", -"n. c #C4C6C1", -"m. c #C7C9C4", -"M. c #C9CBC6", -"N. c #CDCECA", -"B. c #CFD0CC", -"V. c #D1D2CE", -"C. c #D4D5D2", -"Z. c #D7D8D4", -"A. c #D9DAD6", -"S. c #DCDDDA", -"D. c #DFE0DD", -"F. c #E1E2DE", -"G. c #E4E4E2", -"H. c #E7E8E5", -"J. c #E8E9E6", -"K. c #ECEDEB", -"L. c #EFF0EE", -"P. c #F0F0EF", -"I. c #F3F3F1", -"U. c None", -/* pixels */ -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.q y i i i i i y y y y q U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.y ) p.p.s.s./ / / ) Q r U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i y.r...i.u.H b b U ( i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i y.{ ' e.} v s d b ~ i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i y.} { r. .b d d m / i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i y.{ { r...b f d m / i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i y.} { r...b f f P / i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i y...{ r...n f f P { i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i y. .} t.X.n v v P { i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i y...} t.t.N v v I ( i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i p.X.} t.X.m v v I { i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.i y.r. .t.t.P v M U ( i U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.0 w y i i i B p.X.X.i.t.N M M U e.l u i i u w 0 U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.e E y.e.e.u.i. .X.i.t.I M M N ] e.| | y.W r U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.t a y. .R ` ` [ X.i.t.I M M M N U Y .e.a t U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.%.*.=.$.x l e.[ T ` [ X.i.t.I M M M M M R e.B x $.=.=.%.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.:.l.N.V.N.z.D Z p.} ` [ X.i.i.N M M M M T r.J D z.V.N.N.m.:.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.+.9.A.N.V.C.V.4.j K a.} } X.j.t.I M M M Y X.J C k.C.V.N.N.S.0.@.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.&.N.N.5.l.V.g.0.4.j E h.X.X.i.t.I M M Y ..L k d.V.V.M.2.1.V.V.*.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.,.Z.N.l.N.N.6.0.M.>.k ^ v.t.i.t.I M I .W g >.m.N.V.V.l.g.V.S.1.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.O.8.A.N.N.N.l.1.l.m.l.;.p q.v.a.t.I N } ! p ;.l.n.m.V.Z.C.C.C.D.0.+.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.&.M.C.M.M.l.1.:.m.n.l.0.G g w.b.i.Y [ / p G 0.g.n.m.N.V.Z.Z.Z.S.V.*.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.:.C.V.M.9.,.,.0.M.l.g.0.8.S k s.v. .( a S 6.0.g.l.m.M.N.V.Z.Z.S.S.,.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.5.A.N.0.5.l.N.N.M.m.l.g.0.6.A Z x.p.k A 5.0.0.l.n.M.M.N.V.V.V.A.G.8.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.#.m.S.M.g.N.Z.Z.V.N.N.M.n.n.M.z.F B k F m.m.n.n.m.N.V.V.V.V.V.N.C.G.M.#.U.U.U.U.U.U.", -"U.U.U.U.U.U.*.C.Z.B.C.Z.A.Z.A.Z.C.V.B.B.A.Z.f.V V f.S.D.N.N.N.C.V.Z.Z.C.C.B.M.D.A.:.U.U.U.U.U.U.", -"U.U.U.U.U.U.2.D.Z.D.S.S.S.S.A.A.A.A.A.A.S.C.N.z.z.B.A.G.A.A.Z.A.A.A.A.Z.A.V.9.N.D.2.U.U.U.U.U.U.", -"U.U.U.U.U.+.0.D.C.P.G.S.S.S.D.S.S.S.S.S.S.A.Z.Z.Z.A.S.S.S.A.S.A.A.A.S.S.S.N.2.z.S.0.+.U.U.U.U.U.", -"U.U.U.U.U.&.V.A.V.K.K.F.D.D.D.D.D.D.D.D.F.D.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.9.2.m.Z.B.%.U.U.U.U.U.", -"U.U.U.U.U.,.F.V.B.F.P.K.F.F.F.F.F.F.F.F.F.F.F.F.F.F.F.F.F.S.F.F.S.F.F.S.l.,.0.N.Z.D.,.U.U.U.U.U.", -"U.U.U.U.U.9.G.N.C.Z.H.I.P.J.G.G.G.G.G.F.F.F.G.G.F.F.F.F.F.F.F.F.F.F.A.n.2.0.V.V.C.G.9.U.U.U.U.U.", -"U.U.U.U.#.N.S.N.Z.Z.S.G.P.I.P.J.H.G.H.G.H.G.G.G.G.G.G.G.G.G.G.G.S.C.n.9.M.C.C.C.V.D.N.#.U.U.U.U.", -"U.U.U.U.-.S.C.M.C.A.A.S.S.G.L.I.I.L.K.J.J.J.J.J.J.J.J.J.J.J.H.D.C.N.N.V.C.C.C.N.m.B.A.-.U.U.U.U.", -"U.U.U.U.7.J.A.B.M.B.S.A.C.V.V.C.D.J.L.P.I.I.I.I.I.I.I.I.I.K.G.S.C.C.V.B.B.B.M.0.9.g.S.3.U.U.U.U.", -"U.U.U.#.m.J.A.C.B.l.B.S.C.V.V.V.C.C.S.D.G.J.J.K.K.K.J.J.G.F.D.A.A.C.C.B.C.B.9.7.7.0.A.l.+.U.U.U.", -"U.U.U.*.A.S.N.9.M.n.0.A.D.S.F.F.F.F.F.G.G.G.G.G.G.G.G.G.F.D.D.S.S.S.A.A.Z.g.7.2.-.2.B.C.*.U.U.U.", -"U.U.U.*.S.G.C.B.C.B.n.M.N.N.N.B.B.B.B.B.C.C.N.C.B.N.N.M.n.n.n.n.l.l.l.l.g.0.n.l.8.g.S.A.*.U.U.U.", -"U.U.U.4 2.Z.D.G.F.D.D.D.S.S.D.S.D.D.D.D.S.S.S.S.S.S.A.S.A.S.A.A.A.A.S.A.A.S.S.D.S.S.Z.2.4 U.U.U.", -"U.U.U.+ , c @.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.&.=.=.=.=.=.=.=.=.=.=.=.=.=.&.&.%.o.2 # U.U.U.", -"U.U.U.. O + # # # # * # # * # * = - - * * * * * - 2 6 9 9 8 8 6 8 6 8 9 6 6 8 5 : ; ; & O U.U.U.", -"U.U.U.. O o O o @ @ @ @ @ @ @ % & # # # # # # * 2 , 8 8 2 4 , 4 < 8 9 : : 7 7 ; * = & O U.U.U.", -"U.U.U.. O O O o @ @ @ @ @ @ # # % % % # # # # $ * 1 4 6 6 4 5 4 5 4 7 7 3 3 6 3 ; * = & X U.U.U.", -"U.U.U.. o @ @ @ @ @ @ @ # # # # * % $ $ % # % $ % = : > : ; ; - ; > : : : : : = * * * + U.U.U.", -"U.U.U.U. . o o @ @ # # # # # @ + @ @ @ @ @ # # % $ $ $ # $ $ % % $ $ % % $ + o X U.U.U.U.", -"U.U.U.U.U.U.U. . . . o @ . . . . . . . X . o o o X X . X . X X X X X X X X U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.", -"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_spell.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_spell.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_spell.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_spell.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -/* XPM */ -static char *tools_check_spelling[] = { -/* columns rows colors chars-per-pixel */ -"48 48 182 2 ", -" c #010101", -". c #282828", -"X c #323232", -"o c #3A3A3A", -"O c #474747", -"+ c #484848", -"@ c #B11F03", -"# c #AD240B", -"$ c #B52002", -"% c #BA2101", -"& c #BB2209", -"* c #B82808", -"= c #AB2A14", -"- c #A52C1E", -"; c #AA2C19", -": c #B12F13", -"> c #BF2A11", -", c #B0391F", -"< c #A12D20", -"1 c #BD3225", -"2 c #C12A0F", -"3 c #C12C12", -"4 c #C5331B", -"5 c #ED2B02", -"6 c #F42C03", -"7 c #FE2D01", -"8 c #EF330D", -"9 c #FD3106", -"0 c #FE350A", -"q c #FF390E", -"w c #E23717", -"e c #E83410", -"r c #E53816", -"t c #E43C1E", -"y c #F63A12", -"u c #FF3D13", -"i c #C63C24", -"p c #CB3D24", -"a c #C83F28", -"s c #D43F24", -"d c #DD3D22", -"f c #AF422A", -"g c #AF4B35", -"h c #EF421D", -"j c #FE431B", -"k c #CC432B", -"l c #D54226", -"z c #D5442A", -"x c #D94429", -"c c #D7482D", -"v c #DB492D", -"b c #CB4C36", -"n c #CA483B", -"m c #D14C34", -"M c #DC4E33", -"N c #D14A3B", -"B c #D6533A", -"V c #DB573E", -"C c #E34424", -"Z c #EB4425", -"A c #E2462D", -"S c #E1482B", -"D c #F64622", -"F c #FF4720", -"G c #FE4B25", -"H c #F04F2D", -"J c #FE4E29", -"K c #FE512D", -"L c #E05237", -"P c #E2573D", -"I c #EC5A3E", -"U c #F55333", -"Y c #FE5531", -"T c #FE5936", -"R c #F0563A", -"E c #FE5D3B", -"W c #FE603F", -"Q c #905E54", -"! c #AF5C4B", -"~ c #B05440", -"^ c #AF6555", -"/ c #B06E5F", -"( c #CD5440", -") c #DC5A42", -"_ c #E75C42", -"` c #F85F41", -"' c #DF634C", -"] c #D26450", -"[ c #DF6757", -"{ c #D56855", -"} c #DC6758", -"| c #D96D5A", -" . c #D6705E", -".. c #EA6045", -"X. c #E4634C", -"o. c #EC654C", -"O. c #EF684B", -"+. c #F56244", -"@. c #FC6344", -"#. c #F4654A", -"$. c #F46A4E", -"%. c #FD6A4B", -"&. c #E26654", -"*. c #E66A52", -"=. c #EA6D54", -"-. c #E36F59", -";. c #EB6E58", -":. c #F46D52", -">. c #FA6F52", -",. c #ED7057", -"<. c #EC745C", -"1. c #F27056", -"2. c #FD7456", -"3. c #F2735A", -"4. c #FD765A", -"5. c #F4785E", -"6. c #FC795D", -"7. c #DB6F62", -"8. c #DF7461", -"9. c #E47561", -"0. c #EC7B64", -"q. c #E17B68", -"w. c #ED7E68", -"e. c #F57D64", -"r. c #FA7E64", -"t. c #F27F69", -"y. c #DC8275", -"u. c #DF887B", -"i. c #E5806D", -"p. c #ED826D", -"a. c #FD8166", -"s. c #F3836D", -"d. c #FA846B", -"f. c #EB8672", -"g. c #E78977", -"h. c #EE8A75", -"j. c #ED8E7B", -"k. c #F28670", -"l. c #F58A74", -"z. c #FB8B74", -"x. c #F48E7B", -"c. c #EE907D", -"v. c #F5917D", -"b. c #F9927D", -"n. c #E48C83", -"m. c #EE9685", -"M. c #EF978A", -"N. c #ED9B8D", -"B. c #F39583", -"V. c #FC9680", -"C. c #F49986", -"Z. c #FC9984", -"A. c #F49D8C", -"S. c #F99E8A", -"D. c #ED9E91", -"F. c #F39F91", -"G. c #F6A08F", -"H. c #F9A28F", -"J. c #EEA599", -"K. c #F3A394", -"L. c #FAA593", -"P. c #FBA896", -"I. c #F1A699", -"U. c #F3AA9C", -"Y. c #F8AD9D", -"T. c #EFACA3", -"R. c #F1ADA1", -"E. c #EFB0A6", -"W. c #EDB5AB", -"Q. c #EEB8AE", -"!. c #F4B2A5", -"~. c #FAB2A3", -"^. c #F2B5A9", -"/. c #F2B9AE", -"(. c #EFB7B1", -"). c #EEBCB4", -"_. c #F1BDB3", -"`. c #F0BEB8", -"'. c #EEC2BA", -"]. c #F1C3BB", -"[. c #F1CBC4", -"{. c None", -/* pixels */ -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.O O {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.+ O {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.O O {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.O O {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.O O {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.O O O O {.{.{.{.{.O O {.{.O O O {.{.{.{.{.{.{.{.{.O O + + {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.O O + + O O O {.{.{.{.O O O O O O O + + {.{.{.{.{.O O O O O + {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.O O O {.{.{.+ O O O {.{.O + + + {.{.{.O O O {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.O O {.{.{.O + O {.{.{.{.O O + {.{.O O O {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.+ + + O {.{.{.+ + {.{.{.{.{.{.+ + {.{.+ + O {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.. X o o o X X {.{.{.o X {.{.{.{.{.{.o . {.{.o X {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{. {.{.{. {.{.{. {.{.{.{.{.{. {.{. {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{. {.{.{.{. {.{.{. {.{.{.{.{.{. {.{. {.{.{.{.{.{.{.{.{.{.{.{.4 a 3 {.{.{.{.{.{.", -"{. {.{.{.{. {.{.{. {.{.{.{.{. {.{. {.{.{.{.{.{.{.{.{.{.@ 4 ( i & {.{.{.{.{.", -"{.{. {.{.{. {.{.{. {.{. {.{.{. {.{.{.{.{.{.{.{.{.4 4 b i > * {.{.{.{.", -"{.{. {.{.{. {.{.{.{.{. {.{.{.{.4 i k ] .a 3 & {.{.{.", -"{.{.{. {.{. {.{.{.{.{.{.{. {.{.{.{.{.{.{.{. {.{.{.p k k { W.[.y.i 2 @ {.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.2 p m m | W.[.[.'.y.a i {.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.k {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.z B B 8.W.[.[.).'.).u.n 1 {.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.x .) {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.c ) ) q./.[.'.).).Q.(.`.n.( {.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.l ) -.X.c {.{.{.{.{.{.{.{.{.{.{.{.{.M ' X.i.Q.].]./.Q.W.W.W./.(.q.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.l V -.g.9.X.c {.{.{.{.{.{.{.{.{.{.{.L *.' f./.]._.Q.W.W.E.E.T.T.J.7.< ", -"{.{.{.{.{.{.{.{.{.{.{.{.x ) | N.^.J.q.*.v {.{.{.{.{.{.{.{.{.P =.-.j./._./.^.E.E.T.T.R.T.D.[ < {.", -"{.{.{.{.{.{.{.{.{.{.{.x ) -.N.J.D.U.I.p.=.v {.{.{.{.{.{.{._ <.<.x././.!.R.R.U.U.R.I.I.M.[ - {.{.", -"{.{.{.{.{.{.{.{.{.{.d P -.m.K.c.c.m.U.U.h.=.S {.{.{.{.{._ 0.0.m.^.!.U.R.U.I.I.I.I.I.M.&.; {.{.{.", -"{.{.{.{.{.{.{.{.{.{.A ;.B.m.i.p.h.j.B.U.U.x.,.S {.{.{.o.s.s.C.!.~.I.K.K.K.K.K.A.F.B.&.; {.{.{.{.", -"{.{.{.{.{.{.{.{.{.{._ B.v.0.0.p.p.p.k.v.I.Y.v.,.C {.O.s.k.A.~.U.S.F.A.A.C.F.A.C.x.X.; {.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.o.k.<.3.,.<.e.p.p.k.x.P.~.C.3.1.l.b.G.Y.H.C.B.B.C.B.B.C.B.x._ ; {.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.t R #.:.1.1.3.5.e.s.s.l.L.~.A.b.b.L.Y.C.b.b.b.b.B.V.V.x.t.I = {.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.w R +.$.$.:.1.1.5.e.e.d.H.~.H.P.P.b.l.z.l.l.l.l.z.t.` Z # {.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.r U ` @.#.$.:.1.1.6.6.d.H.~.P.z.a.d.d.d.d.d.3.W D 8 @ {.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.e h K T E +.%.$.2.2.1.6.z.a.4.a.6.2.:.W J j 9 6 $ {.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.5 9 q j G J K T E W W W W E Y G j j 0 7 6 6 % {.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.6 9 9 q q 9 0 0 q u u q q 0 9 q q q 9 6 % {.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.8 j j j j q 0 j j u j j j j j j j y * {.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.h G J J G j G G J J K K K K J h : {.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.H T T W T Y Y T T W W W T U , {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.W @.%.%.%.%.%.%.%.%.%.W f {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.$.2.4.4.4.6.4.4.2.:.g {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.3.a.a.a.a.a.a.5.~ {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.p.z.z.z.z.s.! {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.l.b.Z.b.^ {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.C.G./ {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.Q {.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.", -"{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{.{." -}; diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_undo.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_undo.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/alternate/48x48/tm_undo.xpm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/alternate/48x48/tm_undo.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,156 +0,0 @@ -/* XPM */ -static char *edit_undo[] = { -/* columns rows colors chars-per-pixel */ -"48 48 102 2 ", -" c #B49302", -". c #BA9904", -"X c #C19E05", -"o c #C5A204", -"O c #C6A40A", -"+ c #C8A60D", -"@ c #C8A80F", -"# c #CAAA15", -"$ c #CDAE1C", -"% c #CFB01B", -"& c #CEAF22", -"* c #CFB023", -"= c #D1B325", -"- c #D6B925", -"; c #D2B52C", -": c #D6BB2B", -"> c #D8BD2C", -", c #D5BA35", -"< c #D7BC3D", -"1 c #D8BE3D", -"2 c #EDD402", -"3 c #EFD70B", -"4 c #EFD80E", -"5 c #EFD711", -"6 c #EFD814", -"7 c #EFD91A", -"8 c #F1D914", -"9 c #F2DB1B", -"0 c #DBC231", -"q c #DCC43E", -"w c #EFDA21", -"e c #F3DC23", -"r c #F4DF2A", -"t c #E0C730", -"y c #E3CC36", -"u c #EAD43A", -"i c #EFDA3C", -"p c #F1DE32", -"a c #F2DE3C", -"s c #F6E02F", -"d c #F6E133", -"f c #F6E23B", -"g c #F9E43E", -"h c #D8BF43", -"j c #DBC244", -"k c #DCC44C", -"l c #DFC854", -"z c #E0C841", -"x c #E2CC4C", -"c c #EAD541", -"v c #EEDB44", -"b c #EAD64D", -"n c #ECD94C", -"m c #F1DF45", -"M c #F1DF49", -"N c #E1CB54", -"B c #E2CD5B", -"V c #E5D053", -"C c #EDDA54", -"Z c #E4D15E", -"A c #EAD85E", -"S c #F4E143", -"D c #F9E544", -"F c #F4E24C", -"G c #F9E74E", -"H c #F3E254", -"J c #F8E753", -"K c #FAE856", -"L c #F5E458", -"P c #FAE95A", -"I c #E3CF64", -"U c #E6D263", -"Y c #E8D562", -"T c #EEDD65", -"R c #E7D46B", -"E c #E9D66C", -"W c #EDDC6C", -"Q c #E7D571", -"! c #EDDC75", -"~ c #EEDF7C", -"^ c #F4E564", -"/ c #FAE962", -"( c #F4E56B", -") c #F9EA6B", -"_ c #EFE073", -"` c #F2E374", -"' c #F6E874", -"] c #F9EA73", -"[ c #F5E779", -"{ c #F7E97E", -"} c #FAEC7F", -"| c #F3E582", -" . c #F6E882", -".. c #F9EB86", -"X. c #F5E78B", -"o. c #F6E98C", -"O. c #F8EB8B", -"+. c #FDF187", -"@. c #F3E693", -"#. c #F6EA90", -"$. c #F5E99A", -"%. c None", -/* pixels */ -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.X %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.$ + %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.O < Q ; %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.O h @.$.; %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.@ k o.+.@.; %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.# B #.) P X.; %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.$ U O./ D P X.; %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.& E ..K g D P | ; %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.; ! .G g g g G o.h & $ # O %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.o , ~ ] D f g g g g ] | ~ ! Q B j ; # %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.O h | ) g d g d g f d g J J P / ] { | E 1 # %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.+ k | / a d d d d d d d d d d d d d f G ) .E , + %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.# l .G s s s s s s s s s s s s s s s s s s g / { l # %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.$ B { F s s s s s s e s s s s r s s s s e s s s d G { U $ %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.o j #.G e s e s 9 s s s s s s e s s 9 s s s s s 9 r e g ' U $ %.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.& R ' f e e s e 9 9 e e 9 e e e s e 9 e 9 9 9 s e e e f ' Z # %.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.$ U ' d e 9 e e e e e 9 9 e e e 9 e e e e 9 e e e e 9 d [ j O %.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.# B ' g 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 e 9 9 F ` ; %.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.# l ` S 9 9 9 9 9 9 9 9 r s r e 9 9 9 9 9 9 9 9 9 8 e ^ B + %.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.# k ` g 8 8 8 8 9 9 J ` ` ` ` ( L g e 8 8 8 8 8 8 8 a ` = %.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.+ j ` S 6 4 6 6 r ` h ; ; , j B E ( F 9 6 6 8 8 8 8 ( j %.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.+ < ! S 6 3 3 e W * %.%.%.%.+ % j E ^ e 4 3 4 6 4 F Z + %.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.O < ! F 6 3 w ( ; %.%.%.%.%.%.%.$ B ( 9 3 3 3 2 p E % %.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.o : E G 6 7 W = %.%.%.%.%.%.%.%.# B L 3 2 2 3 w W = %.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.; E H r W * %.%.%.%.%.%.%.%.%.= W r 2 2 2 7 T = %.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.= Y ( _ = %.%.%.%.%.%.%.%.%.+ B v 2 2 2 7 T = %.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.% U _ = %.%.%.%.%.%.%.%.%.%.j F 2 2 2 e A $ %.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.$ j * %.%.%.%.%.%.%.%.%.%.j F 2 2 2 p V + %.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.+ o %.%.%.%.%.%.%.%.%.+ x a 2 2 2 v q %.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.o %.%.%.%.%.%.%.%.%.% C w 2 2 9 C = %.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.+ q v 2 2 3 m j @ %.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.X > C 7 2 2 e b % %.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.. : n r 2 2 7 n > . %.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.O > n r 2 2 7 v 0 o %.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.o 0 v 7 2 2 7 v 0 + %.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.= v 9 2 3 p c ; . %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.- i 7 w i y % . %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.+ t u y - + %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.o @ O %.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.", -"%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%.%." -}; Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_add_2.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_add_2.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_add.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_add.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_alternate_both.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_alternate_both.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_alternate_first.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_alternate_first.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_alternate_second.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_alternate_second.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_background.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_background.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_border.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_border.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_pos.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_pos.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_size.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_size.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_special.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_special.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_wrap.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_cell_wrap.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_delete_down.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_delete_down.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_delete_left.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_delete_left.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_delete_right.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_delete_right.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_delete_up.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_delete_up.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_emphasize.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_emphasize.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_exit_left.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_exit_left.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_exit_right.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_exit_right.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_focus_delete.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_focus_delete.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_focus_help.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_focus_help.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_insert_down.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_insert_down.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_insert_left.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_insert_left.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_insert_right.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_insert_right.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_insert_up.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_insert_up.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_large_around_2.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_large_around_2.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_large_around.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_large_around.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_math.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_math.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_name.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_name.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_numbered.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_numbered.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_root_index.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_root_index.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_sample.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_sample.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_sansserif.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_sansserif.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_set_properties.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_set_properties.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_show_hidden.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_show_hidden.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_similar_first.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_similar_first.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_similar_last.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_similar_last.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_similar_next.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_similar_next.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_similar_previous.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_similar_previous.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_strong.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_strong.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_table_parwidth.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_table_parwidth.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_verbatim.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_verbatim.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_wide_under.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/16x16/focus/tm_wide_under.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_activate.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_activate.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_alignment.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_alignment.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_animate.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_animate.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_arc_mode.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_arc_mode.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_arrow.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_arrow.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_assign.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_assign.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_bbb.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_bbb.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_bigaround.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_bigaround.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_bigop.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_bigop.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_binop.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_binop.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_binrel.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_binrel.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_bold.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_bold.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_cal.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_cal.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_carc_mode.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_carc_mode.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_chapter.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_chapter.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_cline_mode.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_cline_mode.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_color.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_color.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_compact.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_compact.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_cspline_mode.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_cspline_mode.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_ctrl_flow.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_ctrl_flow.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_edit_props.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_edit_props.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_emphasize.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_emphasize.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_equal.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_equal.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_floatpos.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_floatpos.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_fraction.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_fraction.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_frak.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_frak.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_graphics_geometry.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_graphics_geometry.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_graphics_grid.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_graphics_grid.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_greek.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_greek.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_group_group.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_group_group.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_group_move.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_group_move.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_group_rotate.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_group_rotate.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_group_zoom.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_group_zoom.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_image.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_image.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_index.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_index.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_italic.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_italic.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_lambda.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_lambda.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_line_mode.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_line_mode.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_link.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_link.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_list.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_list.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_mathbold.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_mathbold.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_math.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_math.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_math_preferences.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_math_preferences.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_math_style.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_math_style.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_math_syntax.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_math_syntax.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_miscsymb.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_miscsymb.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_name.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_name.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_op.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_op.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_pageins.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_pageins.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_parindent.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_parindent.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_parstyle.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_parstyle.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_point_mode.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_point_mode.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_prime.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_prime.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_program.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_program.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_prominent.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_prominent.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_quote.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_quote.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_root.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_root.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_sample.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_sample.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_sansserif.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_sansserif.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_section.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_section.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_shell.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_shell.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_smallcaps.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_smallcaps.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_spline_mode.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_spline_mode.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_stretch.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_stretch.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_strong.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_strong.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_subsup.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_subsup.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_switch.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_switch.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_table.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_table.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_textat_mode.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_textat_mode.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_textual.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_textual.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_theorem.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_theorem.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_three.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_three.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_tuple.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_tuple.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_typewriter.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_typewriter.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_unequal.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_unequal.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_verbatim.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_verbatim.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_wide.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/20x20/mode/tm_wide.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_back.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_back.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_cancel_2.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_cancel_2.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_cancel.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_cancel.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_copy.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_copy.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_cut.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_cut.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_find_next.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_find_next.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_find.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_find.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_forward.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_forward.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_language.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_language.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_larrow_bar.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_larrow_bar.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_larrow_double.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_larrow_double.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_larrow.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_larrow.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_new.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_new.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_open_bis.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_open_bis.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_open.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_open.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_paste.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_paste.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_print.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_print.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_rarrow_bar.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_rarrow_bar.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_rarrow_double.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_rarrow_double.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_rarrow.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_rarrow.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_redo.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_redo.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_reload.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_reload.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_replace.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_replace.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_save.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_save.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_spell.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_spell.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/main/tm_undo.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/main/tm_undo.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_back.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_back.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_cancel_2.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_cancel_2.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_cancel.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_cancel.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_copy.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_copy.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_cut.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_cut.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_find_next.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_find_next.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_find.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_find.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_forward.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_forward.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_language.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_language.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_larrow_bar.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_larrow_bar.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_larrow_double.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_larrow_double.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_larrow.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_larrow.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_new.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_new.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_open_bis.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_open_bis.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_open.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_open.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_paste.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_paste.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_print.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_print.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_rarrow_bar.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_rarrow_bar.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_rarrow_double.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_rarrow_double.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_rarrow.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_rarrow.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_redo.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_redo.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_reload.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_reload.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_replace.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_replace.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_save.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_save.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_spell.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_spell.png differ Binary files /tmp/wwRY4lT8FK/texmacs-1.0.7.13/TeXmacs/misc/pixmaps/modern/24x24/tm_undo.png and /tmp/ZJrp19B2FH/texmacs-1.0.7.14/TeXmacs/misc/pixmaps/modern/24x24/tm_undo.png differ diff -Nru texmacs-1.0.7.13/TeXmacs/misc/pixmaps/traditional/--x17/tm_add.xpm texmacs-1.0.7.14/TeXmacs/misc/pixmaps/traditional/--x17/tm_add.xpm --- texmacs-1.0.7.13/TeXmacs/misc/pixmaps/traditional/--x17/tm_add.xpm 2011-09-07 20:50:12.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/misc/pixmaps/traditional/--x17/tm_add.xpm 2011-09-18 17:04:09.000000000 +0000 @@ -1,21 +1,22 @@ /* XPM */ static char * tm_add_xpm[] = { -"13 13 5 1", +"14 14 5 1", " c None", "= c #00000000FFFF", ". c #0000FFFFFFFF", "O c #444444444444", "o c #EEEEEEEEEEEE", -" ", -" ", -" OOO ", -" OoO ", -" OoO ", -" OOOOoOOOO ", -" OoooooooO ", -" OOOOoOOOO ", -" OoO ", -" OoO ", -" OOO ", -" ", -" "}; +" ", +" ", +" ", +" OOO ", +" OoO ", +" OoO ", +" OOOOoOOOO ", +" OoooooooO ", +" OOOOoOOOO ", +" OoO ", +" OoO ", +" OOO ", +" ", +" "}; diff -Nru texmacs-1.0.7.13/TeXmacs/packages/beamer/slides.ts texmacs-1.0.7.14/TeXmacs/packages/beamer/slides.ts --- texmacs-1.0.7.13/TeXmacs/packages/beamer/slides.ts 2011-09-07 20:50:14.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/packages/beamer/slides.ts 2011-10-10 19:59:39.000000000 +0000 @@ -1,4 +1,4 @@ - + @@ -32,6 +32,45 @@ <\active*> <\src-comment> + Ornaments with no images + + + + + + + + + + + + + + + + \; + + >>>> + + >>>> + + >>>> + + > + + >>>> + + >>>> + + \; + + >>>|0fn|0.333fn>>>>> + + <\active*> + <\src-comment> Further customizations diff -Nru texmacs-1.0.7.13/TeXmacs/packages/environment/env-theorem.ts texmacs-1.0.7.14/TeXmacs/packages/environment/env-theorem.ts --- texmacs-1.0.7.13/TeXmacs/packages/environment/env-theorem.ts 2011-09-07 20:50:13.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/packages/environment/env-theorem.ts 2011-09-24 16:58:31.000000000 +0000 @@ -1,4 +1,4 @@ - + @@ -98,6 +98,8 @@ + + \; diff -Nru texmacs-1.0.7.13/TeXmacs/packages/gui/gui-form.ts texmacs-1.0.7.14/TeXmacs/packages/gui/gui-form.ts --- texmacs-1.0.7.13/TeXmacs/packages/gui/gui-form.ts 2011-09-07 20:50:13.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/packages/gui/gui-form.ts 2011-10-03 09:12:42.000000000 +0000 @@ -87,11 +87,11 @@ - |>|>>> + |>|>>> |||||||||||>>>>>>> - ||\>>|0.02em|-0.055em>>>>|>>>|>>>>> + ||\>>|0.02em|-0.055em>>>>|>>>|>>>>> |||||||||||||||>|>>>>>>> @@ -103,9 +103,9 @@ - |true>|>|0.02em|-0.055em>>|>>>> + |true>|>|0.02em|-0.055em>>|>>>> - |true>|>|0.2em|0.2em>>|>>>> + |true>|>|0.2em|0.2em>>|>>>> |-marker>|>>> diff -Nru texmacs-1.0.7.13/TeXmacs/packages/header/title-base.ts texmacs-1.0.7.14/TeXmacs/packages/header/title-base.ts --- texmacs-1.0.7.13/TeXmacs/packages/header/title-base.ts 2011-09-16 08:04:40.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/packages/header/title-base.ts 2011-09-25 08:19:34.000000000 +0000 @@ -1,4 +1,4 @@ - + > diff -Nru texmacs-1.0.7.13/TeXmacs/packages/standard/std-markup.ts texmacs-1.0.7.14/TeXmacs/packages/standard/std-markup.ts --- texmacs-1.0.7.13/TeXmacs/packages/standard/std-markup.ts 2011-09-11 14:47:14.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/packages/standard/std-markup.ts 2011-09-18 07:46:26.000000000 +0000 @@ -1,4 +1,4 @@ - + > @@ -239,6 +239,22 @@ > + + <\surround||> + <\with|par-left||1.5fn>|par-first|-1.5fn> + + + + > + + + <\surround||> + <\with|par-par-sep|0fn> + + + + > + >>> diff -Nru texmacs-1.0.7.13/TeXmacs/progs/convert/latex/latex-drd.scm texmacs-1.0.7.14/TeXmacs/progs/convert/latex/latex-drd.scm --- texmacs-1.0.7.13/TeXmacs/progs/convert/latex/latex-drd.scm 2011-09-11 15:31:43.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/convert/latex/latex-drd.scm 2011-09-30 09:36:30.000000000 +0000 @@ -103,7 +103,10 @@ (drd-group latex-command-1*% documentclass documentstyle sqrt bibitem cite includegraphics includegraphics* - subjclass) + subjclass + xleftarrow xrightarrow xleftrightarrow xminus + xLeftarrow xRightarrow xLeftrightarrow xequal + xmapsto xmapsfrom) (drd-group latex-command-2*% def newcommand renewcommand newtheorem newtheorem* frac parbox) @@ -343,6 +346,17 @@ (gggeq "amsmath") (qed "amsmath") + (xminus "amsmath") + (xleftarrow "amsmath") + (xrightarrow "amsmath") + (xleftrightarrow "amsmath") + (xmapsto "amsmath") + (xmapsfrom "amsmath") + (xequal "amsmath") + (xLeftarrow "amsmath") + (xRightarrow "amsmath") + (xLeftrightarrow "amsmath") + (btimes "graphicx") (Backepsilon "graphicx") (Mho "graphicx") diff -Nru texmacs-1.0.7.13/TeXmacs/progs/convert/latex/latex-texmacs-drd.scm texmacs-1.0.7.14/TeXmacs/progs/convert/latex/latex-texmacs-drd.scm --- texmacs-1.0.7.13/TeXmacs/progs/convert/latex/latex-texmacs-drd.scm 2011-09-11 14:49:52.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/convert/latex/latex-texmacs-drd.scm 2011-09-30 10:22:14.000000000 +0000 @@ -381,6 +381,38 @@ " \\end{center}\n" " \\end{minipage}}\n"))) +;;(define-macro (latex-texmacs-long prim x l m r) +;; `(drd-table latex-texmacs-preamble% +;; (,(string->symbol (substring prim 1 (string-length prim))) +;; (!append +;; "\\def" ,prim "fill@{\\arrowfill@" ,l ,m ,r "}\n" +;; "\\providecommand{" ,prim "}[2][]{" +;; "\\ext@arrow 0099" ,prim "fill@{#1}{#2}}\n")))) + +(define-macro (latex-texmacs-long prim x l m r) + `(drd-table latex-texmacs-preamble% + (,(string->symbol (substring prim 1 (string-length prim))) + (!append + "\\providecommand{" ,prim "}[2][]{" + "\\mathop{" ,x "}\\limits_{#1}^{#2}}\n")))) + +(latex-texmacs-long "\\xminus" "-" + "\\DOTSB\\relbar" "\\relbar" "\\DOTSB\\relbar") +(latex-texmacs-long "\\xleftrightarrow" "\\longleftrightarrow" + "\\leftarrow" "\\relbar" "\\rightarrow") +(latex-texmacs-long "\\xmapsto" "\\longmapsto" + "\\vdash" "\\relbar" "\\rightarrow") +(latex-texmacs-long "\\xmapsfrom" "\\leftarrow\\!\\!\\dashv" + "\\leftarrow" "\\relbar" "\\dashv") +(latex-texmacs-long "\\xequal" "=" + "\\DOTSB\\Relbar" "\\Relbar" "\\DOTSB\\Relbar") +(latex-texmacs-long "\\xLeftarrow" "\\Longleftarrow" + "\\Leftarrow" "\\Relbar" "\\Relbar") +(latex-texmacs-long "\\xRightarrow" "\\Longrightarrow" + "\\Relbar" "\\Relbar" "\\Rightarrow") +(latex-texmacs-long "\\xLeftrightarrow" "\\Longleftrightarrow" + "\\Leftarrow" "\\Relbar" "\\Rightarrow") + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Plain style theorems ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -420,6 +452,7 @@ (latex-texmacs-remark "example" "Example") (latex-texmacs-remark "convention" "Convention") (latex-texmacs-remark "warning" "Warning") +(latex-texmacs-remark "acknowledgments" "Acknowledgments") (latex-texmacs-exercise "exercise" "Exercise") (latex-texmacs-exercise "problem" "Problem") @@ -455,6 +488,7 @@ (ams-texmacs-remark "note" "Note") (ams-texmacs-remark "example" "Example") (ams-texmacs-remark "convention" "Convention") +(ams-texmacs-remark "acknowledgments" "Acknowledgments") (ams-texmacs-remark "warning" "Warning") (ams-texmacs-remark "exercise" "Exercise") (ams-texmacs-remark "problem" "Problem") diff -Nru texmacs-1.0.7.13/TeXmacs/progs/convert/latex/tmtex.scm texmacs-1.0.7.14/TeXmacs/progs/convert/latex/tmtex.scm --- texmacs-1.0.7.13/TeXmacs/progs/convert/latex/tmtex.scm 2011-09-07 20:50:09.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/convert/latex/tmtex.scm 2011-09-30 10:18:03.000000000 +0000 @@ -647,6 +647,22 @@ (define (tmtex-big l) (list (string->symbol (tmtex-big-decode (car l))))) +(define (tmtex-decode-long-arrow s) + (cond ((nstring? s) 'xrightarrow) + ((and (string-starts? s "")) + (tmtex-decode-long-arrow (substring s 8 (- (string-length s) 1)))) + ((in? s '("minus" "leftarrow" "rightarrow" "leftrightarrow" + "equal" "Leftarrow" "Rightarrow" "Leftrightarrow" + "mapsto" "mapsfrom")) + (string->symbol (string-append "x" s))) + (else 'xrightarrow))) + +(define (tmtex-long-arrow l) + (with cmd (tmtex-decode-long-arrow (car l)) + (if (== (length l) 2) + (list cmd (tmtex (cadr l))) + (list cmd (list '!option (tmtex (caddr l))) (tmtex (cadr l)))))) + (define (tmtex-prime-list l) (if (null? l) l (cond ((== (car l) #\<) @@ -1566,6 +1582,7 @@ (mid tmtex-mid) (right tmtex-right) (big tmtex-big) + (long-arrow tmtex-long-arrow) (lprime tmtex-lprime) (rprime tmtex-rprime) (below tmtex-below) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/convert/tools/tmpre.scm texmacs-1.0.7.14/TeXmacs/progs/convert/tools/tmpre.scm --- texmacs-1.0.7.13/TeXmacs/progs/convert/tools/tmpre.scm 2011-09-07 20:50:09.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/convert/tools/tmpre.scm 2011-09-24 17:00:08.000000000 +0000 @@ -32,9 +32,10 @@ (drd-group tmpre-theorem-env% theorem proposition lemma corollary axiom definition notation conjecture - remark note example exercise warning convention + remark note example exercise warning convention acknowledgments theorem* proposition* lemma* corollary* axiom* definition* notation* - conjecture* remark* note* example* exercise* warning* convention*) + conjecture* remark* note* example* exercise* warning* + convention* acknowledgments*) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Preprocessing diff -Nru texmacs-1.0.7.13/TeXmacs/progs/dynamic/fold-edit.scm texmacs-1.0.7.14/TeXmacs/progs/dynamic/fold-edit.scm --- texmacs-1.0.7.13/TeXmacs/progs/dynamic/fold-edit.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/dynamic/fold-edit.scm 2011-10-10 19:23:07.000000000 +0000 @@ -434,10 +434,11 @@ "page-odd" "page-even" "page-right" "par-width" "page-odd-shift" "page-even-shift" "page-top" "page-bot" "page-height-margin") - (with t (buffer-tree) - (when (and (tm-func? t 'document 1) (switch-context? (tree-ref t 0))) - (tree-assign-node (tree-ref t 0) 'document) - (tree-set! t (tree-ref t 0)) + (let* ((t (buffer-tree)) + (c (tree-children t))) + (when (and (tm-func? t 'document) (switch-context? (cAr c))) + (tree-assign-node (cAr c) 'document) + (tree-set! t `(document ,@(cDr c) ,@(tree-children (cAr c)))) (for-each dynamic-make-slide (tree-children t))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff -Nru texmacs-1.0.7.13/TeXmacs/progs/generic/document-menu.scm texmacs-1.0.7.14/TeXmacs/progs/generic/document-menu.scm --- texmacs-1.0.7.13/TeXmacs/progs/generic/document-menu.scm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/generic/document-menu.scm 2011-09-20 21:15:24.000000000 +0000 @@ -625,7 +625,10 @@ (=> (eval pack) ("Remove package" (init-remove-package pack))))) (=> (balloon (icon "tm_add.xpm") "Add style package") - (link add-package-menu)))) + (link add-package-menu)) + (assuming (tree-is-buffer? t) + ((balloon (icon "tm_focus_help.xpm") "Describe tag") + (focus-help))))) (tm-menu (focus-document-icons t) (minibar @@ -641,9 +644,5 @@ (dynamic (focus-style-icons t)) (glue #f #f 5 0) (dynamic (focus-document-icons t)) - (glue #f #f 5 0) - (minibar - ((balloon (icon "tm_focus_help.xpm") "Describe tag") - (focus-help))) (glue #f #f 5 0) (dynamic (focus-document-extra-icons t))) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/generic/generic-doc.scm texmacs-1.0.7.14/TeXmacs/progs/generic/generic-doc.scm --- texmacs-1.0.7.13/TeXmacs/progs/generic/generic-doc.scm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/generic/generic-doc.scm 2011-09-19 19:24:07.000000000 +0000 @@ -181,20 +181,6 @@ ($menu "Focus" "Last similar") ", " ($tmdoc-icon "tm_similar_last.xpm")) "Jump to the last " (focus-doc-similar t) ".")) - ($when (cursor-inside? t) - ($para - "In addition, it is possible to quickly exit the tag as follows:") - ($description-long - ($describe-item - ($inline ($shortcut (structured-exit-left)) ", " - ($menu "Focus" "Exit left") ", " - ($tmdoc-icon "tm_exit_left.xpm")) - "Jump out of the " ($markup lab) " tag on the left.") - ($describe-item - ($inline ($shortcut (structured-exit-right)) ", " - ($menu "Focus" "Exit right") ", " - ($tmdoc-icon "tm_exit_right.xpm")) - "Jump out of the " ($markup lab) " tag on the right."))) ($para "For more information and further useful shortcuts, " "we refer to the section on " diff -Nru texmacs-1.0.7.13/TeXmacs/progs/generic/generic-edit.scm texmacs-1.0.7.14/TeXmacs/progs/generic/generic-edit.scm --- texmacs-1.0.7.13/TeXmacs/progs/generic/generic-edit.scm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/generic/generic-edit.scm 2011-10-06 15:03:18.000000000 +0000 @@ -16,6 +16,8 @@ (utils library cursor) (utils edit variants))) +(tm-define (generic-context? t) #t) ;; overridden in, e.g., graphics mode + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Basic cursor movements via the keyboard ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -38,19 +40,23 @@ (tm-define (kbd-horizontal t forwards?) (:require (tree-is-buffer? t)) - (if forwards? (go-right) (go-left))) + (with move (lambda () (if forwards? (go-right) (go-left))) + (go-to-next-such-that move generic-context?))) (tm-define (kbd-vertical t downwards?) (:require (tree-is-buffer? t)) - (if downwards? (go-down) (go-up))) + (with move (lambda () (if downwards? (go-down) (go-up))) + (go-to-next-such-that move generic-context?))) (tm-define (kbd-extremal t forwards?) (:require (tree-is-buffer? t)) - (if forwards? (go-end-line) (go-start-line))) + (with move (lambda () (if forwards? (go-end-line) (go-start-line))) + (go-to-next-such-that move generic-context?))) (tm-define (kbd-incremental t downwards?) (:require (tree-is-buffer? t)) - (if downwards? (go-page-down) (go-page-up))) + (with move (lambda () (if downwards? (go-page-down) (go-page-up))) + (go-to-next-such-that move generic-context?))) (tm-define (kbd-left) (kbd-horizontal (focus-tree) #f)) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/generic/generic-menu.scm texmacs-1.0.7.14/TeXmacs/progs/generic/generic-menu.scm --- texmacs-1.0.7.13/TeXmacs/progs/generic/generic-menu.scm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/generic/generic-menu.scm 2011-09-19 19:22:30.000000000 +0000 @@ -287,10 +287,15 @@ "Structured variant") (dynamic (focus-variant-menu t)))))) (dynamic (focus-tag-extra-icons t)) + (assuming (cursor-inside? t) + ((balloon (icon "tm_exit_left.xpm") "Exit tag on the left") + (structured-exit-left)) + ((balloon (icon "tm_exit_right.xpm") "Exit tag on the right") + (structured-exit-right)) + ((balloon (icon "tm_focus_delete.xpm") "Remove tag") + (remove-structure-upwards))) ((balloon (icon "tm_focus_help.xpm") "Describe tag") - (focus-help)) - ((balloon (icon "tm_focus_delete.xpm") "Remove tag") - (remove-structure-upwards))) + (focus-help))) (tm-menu (focus-move-icons t) ((balloon (icon "tm_similar_first.xpm") "Go to first similar tag") @@ -300,12 +305,7 @@ ((balloon (icon "tm_similar_next.xpm") "Go to next similar tag") (traverse-next)) ((balloon (icon "tm_similar_last.xpm") "Go to last similar tag") - (traverse-last)) - (assuming (cursor-inside? t) - ((balloon (icon "tm_exit_left.xpm") "Exit tag on the left") - (structured-exit-left)) - ((balloon (icon "tm_exit_right.xpm") "Exit tag on the right") - (structured-exit-right)))) + (traverse-last))) (tm-menu (focus-insert-icons t) (assuming (and (structured-horizontal? t) (not (structured-vertical? t))) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-drd.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-drd.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-drd.scm 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-drd.scm 2011-10-06 08:35:33.000000000 +0000 @@ -0,0 +1,162 @@ + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; MODULE : graphics-drd.scm +;; DESCRIPTION : properties of the graphical tags +;; COPYRIGHT : (C) 2011 Joris van der Hoeven +;; +;; This software falls under the GNU general public license version 3 or later. +;; It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE +;; in the root directory or . +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(texmacs-module (graphics graphics-drd) + (:use (utils library cursor) + (utils library tree) + (utils edit variants))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Properties of the graphical tags +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define-group graphical-atomic-tag + point) + +(define-group graphical-curve-tag + line cline spline cspline arc carc) + +(define-group graphical-text-tag + text-at math-at) + +(define-group graphical-non-group-tag + (graphical-curve-tag) (graphical-atomic-tag) (graphical-text-tag)) + +(define-group graphical-group-tag + gr-group) + +(define-group graphical-tag + (graphical-non-group-tag) (graphical-group-tag)) + +(tm-define (graphical-text-context? t) + (tm-in? t (graphical-text-tag-list))) + +(tm-define (inside-graphical-text?) + (tree-innermost graphical-text-context?)) + +(tm-define gr-tags-all (graphical-tag-list)) +(tm-define gr-tags-curves (graphical-curve-tag-list)) +(tm-define gr-tags-noncurves (append (graphical-atomic-tag-list) + (graphical-text-tag-list) + (graphical-group-tag-list))) +(tm-define gr-tags-oneshot '(point arc carc text-at gr-group)) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; List of graphical attributes and their properties +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (gr-prefixed? attr) + (string-starts? attr "gr-")) + +(tm-define (gr-prefix attr) + (string-append "gr-" attr)) + +(tm-define (gr-unprefix attr) + (substring attr 3 (string-length attr))) + +(define-table attribute-default-table + ("gid" . "default") + ("magnify" . "1") + ("color" . "black") + ("opacity" . "100%") + ("point-style" . "disk") + ("line-width" . "1ln") + ("line-join" . "normal") + ("line-caps" . "normal") + ("line-effects" . "normal") + ("dash-style" . "none") + ("dash-style-unit" . "5ln") + ("arrow-begin" . "none") + ("arrow-end" . "none") + ("arrow-length" . "5ln") + ("arrow-height" . "5ln") + ("fill-color" . "none") + ("fill-style" . "plain") + ("text-at-halign" . "left") + ("text-at-valign" . "base")) + +(tm-define (graphics-attribute-default attr) + (if (gr-prefixed? attr) + (graphics-attribute-default (gr-unprefix attr)) + (ahash-ref attribute-default-table attr))) + +(tm-define (decode-dash x) + (cond ((== x "default") "---") + ((== x "10") ". . . . .") + ((== x "11100") "- - - - -") + ((== x "1111010") "- . - . -") + (else "other"))) + +(tm-define (decode-arrow x) + (cond ((== x "default") "") + ((== x "none") "") + ((== x "") "") + ((== x "") ">") + ((== x "|") "|>") + ((== x "") ">>") + ((== x "") "<") + ((== x "|") "<|") + ((== x "") "<<") + ((string? x) x) + (else "other"))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Attributes of the graphical tags +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (graphics-common-attributes) + '("gid" "magnify" "color" "opacity")) + +(tm-define (graphics-all-attributes) + (map car (ahash-table->list attribute-default-table))) + +(tm-define (graphics-attributes tag) + (graphics-common-attributes)) + +(tm-define (graphics-attributes tag) + (:require (== tag 'point)) + (append (graphics-common-attributes) + '("fill-color" + "point-style"))) + +(tm-define (graphics-attributes tag) + (:require (graphical-curve-tag? tag)) + (append (graphics-common-attributes) + '("fill-color" + "line-width" "line-join" "line-caps" "line-effects" + "dash-style" "dash-style-unit" + "arrow-begin" "arrow-end" "arrow-length" "arrow-height"))) + +(tm-define (graphics-attributes tag) + (:require (graphical-text-tag? tag)) + (append (graphics-common-attributes) + '("text-at-halign" "text-at-valign"))) + +(tm-define (graphics-attributes tag) + (:require (graphical-group-tag? tag)) + (graphics-all-attributes)) + +(tm-define (graphics-attribute? tag attr) + (in? attr (graphics-attributes tag))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Attributes for editing modes +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (graphics-mode-attributes mode) + (cond ((func? mode 'edit 1) (graphics-attributes (cadr mode))) + ((== mode '(group-edit props)) (graphics-all-attributes)) + (else '()))) + +(tm-define (graphics-mode-attribute? mode attr) + (in? attr (graphics-mode-attributes mode))) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-edit.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-edit.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-edit.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-edit.scm 2011-10-06 07:44:37.000000000 +0000 @@ -5,6 +5,7 @@ ;; DESCRIPTION : editing routines for graphics mode ;; COPYRIGHT : (C) 2001 Joris van der Hoeven ;; (C) 2004, 2005, 2006 Joris van der Hoeven and Henri Lesourd +;; (C) 2011 Joris van der Hoeven ;; ;; This software falls under the GNU general public license version 3 or later. ;; It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE @@ -13,11 +14,10 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (texmacs-module (graphics graphics-edit) - (:use (utils library cursor) (utils library tree) - (kernel texmacs tm-states) - (graphics graphics-utils) (graphics graphics-main) - (graphics graphics-object) (graphics graphics-env) - (graphics graphics-kbd) (graphics graphics-group))) + (:use (graphics graphics-env) + (graphics graphics-single) + (graphics graphics-group))) + ;; TODO: ;; @@ -46,7 +46,7 @@ ;; ;; -> rajouter systematiquement des "synopsis" pour les tm-define. ;; -;; -> des macros comme foreach et foreach-number, etc., devraient +;; -> des macros comme foreach-number, etc., devraient ;; etre dans kernel/boot/abbrevs ou kernel/library (et chercher ;; des noms plus elegants). ;; @@ -56,696 +56,52 @@ ;; ;; -> On en discutera davantage apres un premier passage en revue. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Edit mode -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; Basic operations -;; -;; NOTE: Imperative functions, which inconditionnaly perform a given -;; operation on the sketch. -;; -;; These functions depend on, and can change the current edit state (i.e., -;; being in modifying or in selecting mode), and they maintain the value -;; of the state variables current-point-no and current-edge-sel?, which -;; are basic pointers inside the edited object. -;; -;; In other words, these functions are methods which operate on the sketch, -;; according to what you need to do when editing in point mode. - -;; Basic operations (setting the object) -(define (object-set! o . opt) - ;(display* "o=" o "\n") - (set! layer-of-last-removed-object #f) - (set! current-obj o) ;; FIXME: Hmmm, I still have a doubt for this one. - ;; Should completely clarify its role & centralize - ;; where it's managed (and for similar gvs as well). - (if sticky-point - (sketch-set! `(,o)) - (if (in? 'checkout opt) - (begin - (sketch-set! `(,o)) - (sketch-checkout)) - (if (in? 'new opt) - (graphics-group-enrich-insert o) - (graphics-assign current-path o))))) - -;; Basic operations (create) -(define (sketch-get1) - (if (not (and (pair? (sketch-get)) (eq? 1 (length (sketch-get))))) - (graphics-error "(sketch-get1)")) - (sketch-get)) - -(tm-define (object_create tag x y) - (:require (eq? tag 'point)) - (object-set! `(point ,x ,y) 'new)) - -(tm-define (object_create tag x y) - (:require (in? tag gr-tags-curves)) - (with o (graphics-enrich `(,tag (point ,x ,y) (point ,x ,y))) - (graphics-store-state 'start-create) - (set! current-point-no 1) - (object-set! o 'checkout) - (graphics-store-state #f))) - -(tm-define (object_create tag x y) - (:require (eq? tag 'text-at)) - (object-set! `(text-at "" (point ,x ,y)) 'new)) - -;; Basic operations (set & add point) -(define (object_set-point no xcur ycur) - (define obj (stree-radical (car (sketch-get1)))) - ;(display* "obj[" no ";" xcur "," ycur "]=" obj "\n") - (if (== (car obj) 'point) - (begin - (set-car! (cdr obj) xcur) - (set-car! (cddr obj) ycur)) - (with l (list-tail (cdr obj) no) - (set-car! l `(point ,xcur ,ycur)))) - (object-set! (car (sketch-get)))) - -(define (object_add-point no xcur ycur x y dirn) - (define obj (stree-radical (car (sketch-get1)))) - ;(display* "obj=" obj "\n") - (if (not (and (in? (car obj) '(arc carc)) (> (length obj) 3))) - (with l (list-tail (cdr obj) no) - (graphics-store-state #f) - (if dirn - (begin - (set-cdr! l (cons `(point ,x ,y) (cdr l))) - (if (and xcur ycur) - (set-car! l `(point ,xcur ,ycur))) - (set! current-point-no (+ no 1))) - (begin - (set-cdr! l (cons (car l) (cdr l))) - (set-car! l `(point ,x ,y)) - (if (and xcur ycur) - (set-car! (cdr l) `(point ,xcur ,ycur))) - (set! current-point-no no)) - ) - (object-set! (car (sketch-get))) - (set! current-edge-sel? #t)))) - -;; Basic operations (remove) -(define (object_remove-point no) -;; FIXME: should read the radical & memoize it - (with l (if (<= no 0) - current-obj - (list-tail (cdr current-obj) (- no 1))) - (set-cdr! l (cddr l)) - (set! current-point-no #f) - (object-set! current-obj))) - ;; FIXME: Should assign the memoized radical, here - -(define (object_remove) - (graphics-remove current-path)) - -;; Basic operations (checkout & commit) -(define (object_checkout) - (sketch-set! `(,(path->tree current-path))) - (sketch-checkout) - (sketch-set! (map tree->stree (sketch-get)))) - -(define (object_commit) - (define obj (stree-radical (car (sketch-get1)))) - (if (not (and (in? (car obj) '(arc carc)) (<= (length obj) 3))) - (begin - (graphical-fetch-props (car (sketch-get))) - (set! obj (graphics-enrich-bis - obj - graphical-opacity - graphical-color - graphical-pstyle - graphical-lwidth - (local-magnification graphical-magnification) - graphical-lstyle - graphical-lstyle-unit - graphical-larrows - graphical-fcolor - graphical-textat-halign - graphical-textat-valign)) - (set! current-edge-sel? #f) - (sketch-set! `(,obj)) - (sketch-commit) - (set! leftclick-waiting #f) - (set! current-obj (stree-radical obj)) - (set! current-point-no #f) - (graphics-forget-states)))) - -;; Edition operations -;; -;; NOTE: Intelligent functions, which take into account the state, -;; the previous mouse clicks, etc. They also perform printing the -;; help messages. These functions maintain the value of the state -;; variables, and they manage state stacking. -;; -;; In other words, these functions implement the different states -;; of the editing automaton. - -(define moveclick-tolerance "5px") -(define previous-leftclick #f) - -(define (move-over) - ;(display* "obj[move<" sticky-point ">]=")(write current-obj)(display "\n") - (set-message "Left click: add or edit object; Middle click: remove object" "") - (graphics-decorations-update) - (if current-path - (with p2 (tm-upwards-path current-path '(text-at) '(graphics)) - (if (not p2) (go-to (rcons current-path 0)))))) - -(define (edit-insert x y) - (if just-started-dragging - (set! disable-drag #t)) - (object_create (cadr (graphics-mode)) x y)) - -(define (start-move) - (define edge current-edge-sel?) - (set-message "Left click: add point; Middle click: undo" "") - (graphics-store-state 'start-move) - (object_checkout) - (graphics-group-start) - (set! current-edge-sel? #t) - (set! leftclick-waiting #f) - (set! previous-leftclick `(point ,current-x ,current-y)) - (if (and edge - (not (and (in? (car current-obj) '(arc carc)) - (> (length current-obj) 3)))) - (begin - (object_add-point current-point-no #f #f current-x current-y #t) - (graphics-decorations-update))) - (graphics-store-state #f)) - -(define (move-point) - ;(display* "obj[move<" sticky-point ">]=")(write current-obj)(display "\n") - (if (and leftclick-waiting - (not (points-dist< - previous-leftclick - `(point ,current-x ,current-y) - moveclick-tolerance))) - (begin - ;(display* "prev-leftc(2)=" previous-leftclick "\n") - ;(display* "x(2)=" current-x "\n") - ;(display* "y(2)=" current-y "\n\n") - (set! leftclick-waiting #f) - (object_add-point - current-point-no - (cadr previous-leftclick) (caddr previous-leftclick) - current-x current-y - (== (logand (get-keyboard-modifiers) ShiftMask) 0))) - (begin - (if leftclick-waiting - (set-message "Left click: finish" "") - (set-message "Left click: add point; Middle click: undo" "")) - (object_set-point current-point-no current-x current-y)) - ) - (graphics-decorations-update)) - -(define (last-point) - (if (and leftclick-waiting - (points-dist< - previous-leftclick - `(point ,current-x ,current-y) - moveclick-tolerance)) - (begin - (object_set-point - current-point-no - (cadr previous-leftclick) - (caddr previous-leftclick)) - (object_commit)) - (begin - (if (and (not leftclick-waiting) - previous-leftclick - (points-dist< - previous-leftclick - `(point ,current-x ,current-y) - moveclick-tolerance)) - (begin - (undo 0) - (set! choosing #f) - (set! leftclick-waiting #f) - (set! just-started-dragging #f)) - (begin - (set-message "Left click: finish" "") - (set! leftclick-waiting #t))))) - ;(display* "prev-leftc=" previous-leftclick "\n") - ;(display* "x=" current-x "\n") - ;(display* "y=" current-y "\n\n") - (set! previous-leftclick `(point ,current-x ,current-y))) - -(define (back) - ;(display* "obj[" p "]=" obj "\n") - (graphics-back-state #f) - (graphics-move-point current-x current-y)) - -(define (remove-point) - ;(display* "obj[" p "]=" obj "\n") - (if (or (in? (car current-obj) gr-tags-oneshot) (null? (cdddr current-obj)) - (not (in? (car current-obj) gr-tags-all)) - (!= (logand (get-keyboard-modifiers) ShiftMask) 0)) - (begin - (object_remove) - (graphics-decorations-reset) - (graphics-group-start)) - (begin - (object_remove-point current-point-no) - (graphics-decorations-update)))) - -;; Left button -(tm-define (left-button) - (:require (in? (car current-obj) gr-tags-point-curves)) - (if sticky-point - (last-point) - (start-move))) - -(tm-define (left-button) - (:require (eq? (car current-obj) 'text-at)) - (if sticky-point - (object_commit) - (if (on-graphical-embedding-box? current-x current-y current-obj "1mm") - (begin - (set-texmacs-pointer 'graphics-cross) - (set! current-point-no 1) - (start-move)) - (begin - (set-texmacs-pointer 'text-arrow) - (go-to (car (select-first (s2f current-x) (s2f current-y)))))))) - -(tm-define (left-button) - (:require (not (in? (car current-obj) gr-tags-all))) - (if sticky-point - (last-point) - (start-move))) - -;; Move -(tm-define (move) - (:require (in? (car current-obj) gr-tags-point-curves)) - (if sticky-point - (move-point) - (move-over))) - -(tm-define (move) - (:require (eq? (car current-obj) 'text-at)) - (if (and (not sticky-point) - (on-graphical-embedding-box? current-x current-y current-obj "1mm")) - (set-texmacs-pointer 'graphics-cross-arrows) - (set-texmacs-pointer 'graphics-cross) - ) - (set! current-point-no 1) - (if sticky-point - (move-point) - (move-over))) - -(tm-define (move) - (:require (eq? (car current-obj) 'gr-group)) - (if sticky-point - (display* "Sticky move(gr-group) !yet implemented\n") - (begin - (set! current-point-no #f) - (graphics-decorations-update)))) - -(tm-define (move) - (:require (not (in? (car current-obj) gr-tags-all))) - (if sticky-point - (move-point) - (move-over))) - -;; Middle button -(tm-define (middle-button) - (if sticky-point - (back) - (remove-point))) - -;; Dispatch -(tm-define (edit_left-button mode x y) - (:require (eq? mode 'edit)) - (:state graphics-state) - (set-texmacs-pointer 'graphics-cross) - ;(display "obj[left-button]=")(write current-obj)(display "\n") - (if sticky-point - (begin - (if just-started-dragging - (set! disable-drag #t)) - (left-button)) - (if current-obj - (begin - (if (not just-started-dragging) - (begin - (edit_tab-key 'edit - (if (graphics-states-void?) - #f - choosing) - 1))) - (if (or (not just-started-dragging) (not choosing)) - (begin - (if (not (graphics-states-void?)) - (graphics-pop-state)) - (graphics-store-state #f))) - (set! choosing #t)) - (edit-insert x y)))) - -(tm-define (edit_move mode x y) - (:require (eq? mode 'edit)) - (:state graphics-state) - ;(display "obj[move]=")(write current-obj)(display "\n") - (set-texmacs-pointer 'graphics-cross #t) - (if choosing - ;; Start moving point/object or inserting a new point - (with first #f - (graphics-state-set (graphics-pop-state)) - ;; Restores the state when choosing has been set - (set! first (not choosing)) - (set! choosing #f) - (graphics-forget-states) - (if (and first - (not just-started-dragging) - (not (eq? (car current-obj) 'text-at))) - (edit-insert current-x current-y) - (left-button))) - ;; Moving - (begin - (if current-obj - (move) - (graphics-decorations-reset))))) - -(tm-define (edit_middle-button mode x y) - (:require (eq? mode 'edit)) - (:state graphics-state) - (set-texmacs-pointer 'graphics-cross) - ;(display* "Graphics] Edit(Middle-button)[" current-path "]=" current-obj "\n") - (if current-obj - (begin - (if choosing - (graphics-state-set (graphics-pop-state))) - (middle-button)))) - -(tm-define (edit_right-button mode x y) - (:require (eq? mode 'edit)) - (display* "Right button(edit) currently unused\n")) - -(tm-define (edit_tab-key mode next inc) - (:require (eq? mode 'edit)) - (:state graphics-state) - ;(display* "\nGraphics] Edit(Tab)[" next "," current-path "]=" current-obj "\n") - (if (and current-x current-y) - (begin - (if current-obj - (graphics-decorations-update)) - (if next - (select-next inc)) - ) - (invalidate-graphical-object))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Edit properties (implemented as a group mode, see below) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;; Functions with check marks for all the properties ("Enable change" menu) -(define (enabled-var? var) - (not (graphics-frozen-property? var))) - -(tm-define (graphics-opacity-enabled?) - (enabled-var? "gr-opacity")) - -(tm-define (graphics-color-enabled?) - (enabled-var? "gr-color")) - -(tm-define (graphics-toggle-opacity-enabled) - (:check-mark "v" graphics-opacity-enabled?) - (graphics-frozen-property! "gr-opacity" - (graphics-opacity-enabled?))) - -(tm-define (graphics-toggle-color-enabled) - (:check-mark "v" graphics-color-enabled?) - (graphics-frozen-property! "gr-color" - (graphics-color-enabled?))) - -(tm-define (graphics-point-style-enabled?) - (enabled-var? "gr-point-style")) - -(tm-define (graphics-toggle-point-style-enabled) - (:check-mark "v" graphics-point-style-enabled?) - (graphics-frozen-property! "gr-point-style" - (graphics-point-style-enabled?))) - -(tm-define (graphics-line-width-enabled?) - (enabled-var? "gr-line-width")) - -(tm-define (graphics-toggle-line-width-enabled) - (:check-mark "v" graphics-line-width-enabled?) - (graphics-frozen-property! "gr-line-width" - (graphics-line-width-enabled?))) - -(tm-define (graphics-dash-style-enabled?) - (enabled-var? "gr-dash-style")) - -(tm-define (graphics-toggle-dash-style-enabled) - (:check-mark "v" graphics-dash-style-enabled?) - (graphics-frozen-property! "gr-dash-style" - (graphics-dash-style-enabled?))) - -(tm-define (graphics-dash-style-unit-enabled?) - (enabled-var? "gr-dash-style-unit")) - -(tm-define (graphics-toggle-dash-style-unit-enabled) - (:check-mark "v" graphics-dash-style-unit-enabled?) - (graphics-frozen-property! "gr-dash-style-unit" - (graphics-dash-style-unit-enabled?))) - -(tm-define (graphics-line-arrows-enabled?) - (enabled-var? "gr-line-arrows")) - -(tm-define (graphics-toggle-line-arrows-enabled) - (:check-mark "v" graphics-line-arrows-enabled?) - (graphics-frozen-property! "gr-line-arrows" - (graphics-line-arrows-enabled?))) - -(tm-define (graphics-fill-color-enabled?) - (enabled-var? "gr-fill-color")) - -(tm-define (graphics-toggle-fill-color-enabled) - (:check-mark "v" graphics-fill-color-enabled?) - (graphics-frozen-property! "gr-fill-color" - (graphics-fill-color-enabled?))) - -(tm-define (graphics-textat-halign-enabled?) - (enabled-var? "gr-text-at-halign")) - -(tm-define (graphics-toggle-textat-halign-enabled) - (:check-mark "v" graphics-textat-halign-enabled?) - (graphics-frozen-property! "gr-text-at-halign" - (graphics-textat-halign-enabled?))) - -(tm-define (graphics-textat-valign-enabled?) - (enabled-var? "gr-text-at-valign")) - -(tm-define (graphics-toggle-textat-valign-enabled) - (:check-mark "v" graphics-textat-valign-enabled?) - (graphics-frozen-property! "gr-text-at-valign" - (graphics-textat-valign-enabled?))) - -;; Functions for managing properties -(tm-define (graphics-assign-props p obj) - (let* ((op (graphics-path-property p "opacity")) - (color (graphics-path-property p "color")) - (ps (graphics-path-property p "point-style")) - (lw (graphics-path-property p "line-width")) - (mag (graphics-path-property-1 p "magnification")) - (st (graphics-path-property p "dash-style")) - (stu (graphics-path-property p "dash-style-unit")) - (lp (graphics-path-property p "line-arrows")) - (fc (graphics-path-property p "fill-color")) - (ha (graphics-path-property p "text-at-halign")) - (va (graphics-path-property p "text-at-valign")) - ) - (graphics-remove p 'memoize-layer) - (with res - (graphics-group-enrich-insert-bis (stree-radical obj) - (if (graphics-opacity-enabled?) - (graphics-get-property "gr-opacity") op) - (if (graphics-color-enabled?) - (graphics-get-property "gr-color") color) - (if (graphics-point-style-enabled?) - (graphics-get-property "gr-point-style") ps) - (if (graphics-line-width-enabled?) - (graphics-get-property "gr-line-width") lw) - mag - (if (graphics-dash-style-enabled?) - (graphics-get-property "gr-dash-style") st) - (if (graphics-dash-style-unit-enabled?) - (graphics-get-property "gr-dash-style-unit") stu) - (if (graphics-line-arrows-enabled?) - (graphics-get-property "gr-line-arrows") lp) - (if (graphics-fill-color-enabled?) - (graphics-get-property "gr-fill-color") fc) - (if (graphics-textat-halign-enabled?) - (graphics-get-property "gr-text-at-halign") ha) - (if (graphics-textat-valign-enabled?) - (graphics-get-property "gr-text-at-valign") va) #f) - res))) - -(tm-define (graphics-copy-props p) - (let* ((op (graphics-path-property p "opacity")) - (color (graphics-path-property p "color")) - (ps (graphics-path-property p "point-style")) - (lw (graphics-path-property p "line-width")) - (st (graphics-path-property p "dash-style")) - (stu (graphics-path-property p "dash-style-unit")) - (lp (graphics-path-property p "line-arrows")) - (fc (graphics-path-property p "fill-color")) - (ha (graphics-path-property p "text-at-halign")) - (va (graphics-path-property p "text-at-valign")) - ) - (if (!= op "default") - (graphics-change-property "gr-opacity" op) - (graphics-remove-property "gr-opacity")) - (if (!= color "default") - (graphics-change-property "gr-color" color) - (graphics-remove-property "gr-color")) - (if (!= ps "default") - (graphics-change-property "gr-point-style" ps) - (graphics-remove-property "gr-point-style")) - (if (!= lw "default") - (graphics-change-property "gr-line-width" lw) - (graphics-remove-property "gr-line-width")) - (if (!= st "default") - (graphics-change-property "gr-dash-style" st) - (graphics-remove-property "gr-dash-style")) - (if (!= stu "default") - (graphics-change-property "gr-dash-style-unit" stu) - (graphics-remove-property "gr-dash-style-unit")) - (if (!= lp "default") - (graphics-change-property "gr-line-arrows" lp) - (graphics-remove-property "gr-line-arrows")) - (if (!= fc "default") - (graphics-change-property "gr-fill-color" fc) - (graphics-remove-property "gr-fill-color")) - (if (!= ha "default") - (graphics-change-property "gr-text-at-halign" ha) - (graphics-remove-property "gr-text-at-halign")) - (if (!= va "default") - (graphics-change-property "gr-text-at-valign" va) - (graphics-remove-property "gr-text-at-valign")))) - -(tm-define (current-is-textat?) - (and current-path - (== (tree-label (path->tree current-path)) 'text-at))) - -(tm-define (text-at-change-halign p dirn) - (:state graphics-state) - (let* ((obj (stree-at p)) - (mag (get-graphical-prop p "magnification")) - (halign (get-graphical-prop p "text-at-halign")) - (valign (get-graphical-prop p "text-at-valign")) - (halign2 (if dirn - (cond ((== halign "left") "right") - ((== halign "center") "left") - ((== halign "right") "center") - (else "left")) - (cond ((== halign "left") "center") - ((== halign "center") "right") - ((== halign "right") "left") - (else "left")))) - ) - (graphics-remove p 'memoize-layer) - (set! current-path - (graphics-group-enrich-insert-bis - obj #f #f #f mag #f #f #f #f halign2 valign #f)) - (sketch-reset) - (graphics-decorations-update) - (graphics-group-start))) - -(tm-define (text-at-change-valign p dirn) - (:state graphics-state) - (let* ((obj (stree-at p)) - (mag (get-graphical-prop p "magnification")) - (halign (get-graphical-prop p "text-at-halign")) - (valign (get-graphical-prop p "text-at-valign")) - (valign2 (if dirn - (cond ((== valign "bottom") "top") - ((== valign "base") "bottom") - ((== valign "center") "base") - ((== valign "top") "center") - (else "base")) - (cond ((== valign "bottom") "base") - ((== valign "base") "center") - ((== valign "center") "top") - ((== valign "top") "bottom") - (else "base")))) - ) - (graphics-remove p 'memoize-layer) - (set! current-path - (graphics-group-enrich-insert-bis - obj #f #f #f mag #f #f #f #f halign valign2 #f)) - (sketch-reset) - (graphics-decorations-update) - (graphics-group-start))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Events when the cursor is inside a text-at -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(tm-define (when-inside-text-at func x y) - (:state graphics-state) - (let* ((res #t) - (uncaptured (lambda () - (if (!= func 'move) - (begin - (graphics-group-start) - (graphics-move-point x y)))))) - ;;(display* "Inside text-at=" func "; x=" x "; y=" y "\n") - (if (and (not sticky-point) - (tm-upwards-path (cDr (cursor-path)) '(text-at) '(graphics))) - (if (and (pair? current-obj) (eq? (car current-obj) 'text-at)) - (cond - ((== func 'left-button) - (left-button))) - (uncaptured)) - (set! res #f)) - ;;(display* "res=" res "\n") - res)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Dealing with superpositions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(tm-define (graphics-graphical? t) + (and (tree? t) + (or (tree-in? t gr-tags-all) + (and (tree-is? t 'with) + (graphics-graphical? (tree-ref t :last)))))) + +(tm-define (graphics-graphical-index t) + (or (and (tree? t) (tree-compound? t) + (list-find-index (tree-children t) graphics-graphical?)) 0)) + (tm-define (graphics-zprevious p) (let* ((p0 (cDr p)) (ofs (cAr p)) - (res #f) - ) - (foreach-number (i (- ofs 1) >= 0) + (i0 (graphics-graphical-index (path->tree p0))) + (res #f)) + (foreach-number (i (- ofs 1) >= i0) (with t (path->tree (rcons p0 i)) (if (and (not res) (box-intersects t (path->tree p))) - (set! res i))) - ) + (set! res i)))) res)) (tm-define (graphics-znext p) (let* ((p0 (cDr p)) (t0 (path->tree p0)) (ofs (cAr p)) - (res #f) - ) + (res #f)) (foreach-number (i (+ 1 ofs) < (tree-arity t0)) (with t (path->tree (rcons p0 i)) (if (and (not res) (box-intersects t (path->tree p))) - (set! res i))) - ) + (set! res i)))) res)) (tm-define (graphics-zmove dirn) - ;(display* "dirn(graphics-zmove)=" dirn "\n") - ;(display* "current-path" current-path "\n") (if current-path (let* ((p (graphics-object-root-path current-path)) (t (if p (path->tree p) #f)) (t0 (if t (path->tree (cDr p)) #f)) - ) - ;(display* "t0=" (get-tag? t0) "\n") - ;(display* "t=" t "\n") + (i0 (graphics-graphical-index t0))) (cond ((eq? dirn 'background) - (if (> (cAr p) 0) - (let* ((p-1 (rcons (cDr p) 0)) + (if (> (cAr p) i0) + (let* ((p-1 (rcons (cDr p) i0)) (t-1 (path->tree p-1)) ) (tree-remove t0 (cAr p) 1) @@ -764,7 +120,7 @@ )) ) ((eq? dirn 'farther) - (if (> (cAr p) 0) + (if (> (cAr p) i0) (let* ((no (graphics-zprevious p)) (p-1 (if no (rcons (cDr p) no) #f)) (t-1 (if p-1 (path->tree p-1) #f)) @@ -795,6 +151,38 @@ (graphics-group-start)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Major extern interface routines +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (graphics-enter-mode old-mode new-mode) + (:state graphics-state) + (if (and (graphics-group-mode? old-mode) + (not (graphics-group-mode? new-mode))) + (graphics-reset-state)) + (if (and (not (graphics-group-mode? old-mode)) + (graphics-group-mode? new-mode)) + (begin + (if sticky-point (undo 0)) + (sketch-reset) + (graphics-decorations-reset)))) + +(tm-define (graphics-finish) + ;;(display* "Graphics] Finish\n") + (with mode (graphics-mode) + (cond ((== (car mode) 'edit) + (with submode (cadr mode) + (cond ((== submode 'point) (noop)) + ((in? submode gr-tags-curves) (noop)) + ((graphical-text-tag? submode) (noop)) + (else (display* "Uncaptured finish (edit)\n"))))) + ((== (car mode) 'group-edit) (noop)) + (else (display* "Uncaptured finish\n"))))) + +(tm-define (graphics-busy?) + (:state graphics-state) + sticky-point) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Event hooks ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -806,101 +194,72 @@ (tm-define (get-keyboard-modifiers) the-keyboard-modifiers) -(tm-define (graphics-insert-point x y) - ;(display* "Graphics] Insert " x ", " y "\n") - (if (not (when-inside-text-at 'left-button x y)) +;;(display* " sticky-point " sticky-point "\n") +;;(display* " leftclick-waiting " leftclick-waiting "\n") +;;(display* " current-graphical-object " current-graphical-object "\n") +;;(display* " graphics-action " graphics-action "\n") +;;(display* " current-point-no " current-point-no "\n") + +(tm-define (graphics-move x y) + ;;(display* "Graphics] Move " x ", " y "\n") + (when (not (inside-graphical-text?)) + (edit_move (car (graphics-mode)) x y))) + +(tm-define (graphics-release-left x y) + ;;(display* "Graphics] Release-left " x ", " y "\n") + (if (inside-graphical-text?) + (with-innermost t graphical-text-context? + (let* ((ps (select-first (s2f x) (s2f y))) + (p (and ps (car ps)))) + (if (and p (list-starts? p (tree->path t))) + (go-to p) + (tree-go-to t :start)))) (edit_left-button (car (graphics-mode)) x y))) -(tm-define (graphics-move-point x y) - ;(display* "Graphics] Move " x ", " y "\n") - (if (not (when-inside-text-at 'move x y)) - (edit_move (car (graphics-mode)) x y))) - -(tm-define (graphics-remove-point x y) - ;(display* "Graphics] Remove " x ", " y "\n") - (if (not (when-inside-text-at 'middle-button x y)) - (edit_middle-button (car (graphics-mode)) x y))) - -(tm-define (graphics-last-point x y) - ;(display* "Graphics] Last " x ", " y "\n") - (if (not (when-inside-text-at 'right-button x y)) - (edit_right-button (car (graphics-mode)) x y))) - -(define just-started-dragging #f) -(define disable-drag #f) -;; FIXME : put these 2 variables inside the state. - -(tm-define (graphics-start-drag x y) - ;(display* "Graphics] Start-drag " x ", " y "\n") - (if (when-inside-text-at 'start-drag x y) - (set! disable-drag #t) - (begin - (set! just-started-dragging #t) - (graphics-insert-point x y)))) - -(tm-define (graphics-dragging x y) - ;(display* "Graphics] dragging " x ", " y "\n") - (graphics-move-point x y)) - -(tm-define (graphics-end-drag x y) - ;(display* "Graphics] End-drag " x ", " y "\n") - (if (not (when-inside-text-at 'end-drag x y)) - (begin - (set! just-started-dragging #f) - (if disable-drag - (set! disable-drag #f) - (begin - (graphics-insert-point x y) - (if (eq? (car (graphics-mode)) 'edit) - (graphics-insert-point x y))))))) - -(tm-define (graphics-start-right-drag x y) - ;(display* "Graphics] Start-right-drag " x ", " y "\n") - (graphics-last-point x y)) - -(tm-define (graphics-right-dragging x y) - ;(display* "Graphics] right-dragging " x ", " y "\n") - (graphics-move-point x y)) +(tm-define (graphics-release-middle x y) + ;;(display* "Graphics] Release-middle " x ", " y "\n") + (when (not (inside-graphical-text?)) + (edit_middle-button (car (graphics-mode)) x y))) + +(tm-define (graphics-release-right x y) + ;;(display* "Graphics] Release-right " x ", " y "\n") + (when (not (inside-graphical-text?)) + (edit_right-button (car (graphics-mode)) x y))) + +(tm-define (graphics-start-drag-left x y) + ;;(display* "Graphics] Start-drag-left " x ", " y "\n") + (when (not (inside-graphical-text?)) + (edit_start-drag (car (graphics-mode)) x y))) + +(tm-define (graphics-dragging-left x y) + ;;(display* "Graphics] Dragging-left " x ", " y "\n") + (when (not (inside-graphical-text?)) + (edit_drag (car (graphics-mode)) x y))) + +(tm-define (graphics-end-drag-left x y) + ;;(display* "Graphics] End-drag-left " x ", " y "\n") + (when (not (inside-graphical-text?)) + (edit_end-drag (car (graphics-mode)) x y))) + +(tm-define (graphics-start-drag-right x y) + ;;(display* "Graphics] Start-right-drag " x ", " y "\n") + (when (not (inside-graphical-text?)) + (graphics-release-right x y))) + +(tm-define (graphics-dragging-right x y) + ;;(display* "Graphics] Right-dragging " x ", " y "\n") + (when (not (inside-graphical-text?)) + (graphics-move x y))) -(tm-define (graphics-end-right-drag x y) +(tm-define (graphics-end-drag-right x y) (:state graphics-state) - ;(display* "Graphics] End-right-drag " x ", " y "\n") - (if (not sticky-point) -; FIXME : test due to timing problems in detecting the drag - (graphics-last-point x y))) + ;;(display* "Graphics] End-right-drag " x ", " y "\n") + (when (not (inside-graphical-text?)) + (if (not sticky-point) + ;; FIXME : test due to timing problems in detecting the drag + (graphics-release-right x y)))) (tm-define (graphics-choose-point inc) (:state graphics-state) ;(display* "Graphics] Choose\n") - (if (not (graphics-states-void?)) - (graphics-pop-state)) - (set! choosing #t) - (graphics-store-state #f) - (edit_tab-key (car (graphics-mode)) #t inc)) - -(tm-define (graphics-enter-mode old-mode new-mode) - (:state graphics-state) - (if (and (graphics-group-mode? old-mode) - (not (graphics-group-mode? new-mode)) - ) - (graphics-reset-state) - ) - (if (and (not (graphics-group-mode? old-mode)) - (graphics-group-mode? new-mode) - ) - (begin - (if sticky-point (undo 0)) - (sketch-reset) - (graphics-decorations-reset)))) - -(tm-define (graphics-finish) - ;;(display* "Graphics] Finish\n") - (with mode (graphics-mode) - (cond ((== (car mode) 'edit) - (with submode (cadr mode) - (cond ((== submode 'point) (noop)) - ((in? submode gr-tags-curves) (noop)) - ((== submode 'text-at) (noop)) - (else (display* "Uncaptured finish (edit)\n"))))) - ((== (car mode) 'group-edit) (noop)) - (else (display* "Uncaptured finish\n"))))) + (edit_tab-key (car (graphics-mode)) inc)) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-env.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-env.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-env.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-env.scm 2011-10-04 14:35:22.000000000 +0000 @@ -13,9 +13,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (texmacs-module (graphics graphics-env) - (:use (utils library cursor) (utils library tree) - (kernel texmacs tm-states) - (graphics graphics-utils))) + (:use (graphics graphics-utils))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; State variables & history for the current graphics context @@ -28,6 +26,7 @@ (current-graphical-object #f) (choosing #f) (sticky-point #f) + (dragging-create? #f) (leftclick-waiting #f) (current-point-no #f) (current-edge-sel? #f) @@ -91,6 +90,7 @@ (state-set! st 'current-graphical-object (get-graphical-object)) (state-set! st 'choosing choosing) (state-set! st 'sticky-point sticky-point) + (state-set! st 'dragging-create? dragging-create?) (state-set! st 'leftclick-waiting leftclick-waiting) (state-set! st 'current-obj current-obj) (state-set! st 'current-point-no current-point-no) @@ -116,6 +116,7 @@ (graphics-decorations-reset))) (set! choosing (state-ref st 'choosing)) (set! sticky-point (state-ref st 'sticky-point)) + (set! dragging-create? (state-ref st 'dragging-create?)) (set! leftclick-waiting (state-ref st 'leftclick-waiting)) (set! current-obj (state-ref st 'current-obj)) (set! current-point-no (state-ref st 'current-point-no)) @@ -184,6 +185,7 @@ (graphics-decorations-reset) (set! choosing #f) (set! sticky-point #f) + (set! dragging-create? #f) (set! leftclick-waiting #f) (set! current-obj #f) (set! current-point-no #f) @@ -292,7 +294,7 @@ (with res (tree->stree (graphical-select-area x1 y1 x2 y2)) ;(display* "res=" res "\n") (set! res (filter-graphical-select res #f #f)) - (foreach (e res) + (for (e res) (set! l (cons (graphics-path (car e)) l)) ) (reverse (list-remove-duplicates l)))) @@ -375,18 +377,6 @@ (hash-set! define-option-table :state-slots define-option-state-slots) -;(define-public-macro (tmdefine head . body) -; (with st #f -; (foreach-cons (c body) -; (with i (car c) -; (if (and (pair? i) (eq? (car i) ':state)) -; (set! st c))) -; ) -; (if st -; (begin -; (set-car! st `(with-state-by-name ,(cadar st) . ,(cdr st))) -; (set-cdr! st '())))) -; `(tm-define ,head . ,body)) ;; Graphics context [reset] (define current-cursor #f) @@ -462,6 +452,7 @@ (graphics-decorations-reset)) (set! choosing #f) (set! sticky-point #f) + (set! dragging-create? #f) (set! current-point-no #f) (set! graphics-undo-enabled #t) (set! remove-undo-mark? #f) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-group.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-group.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-group.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-group.scm 2011-10-06 08:46:47.000000000 +0000 @@ -5,6 +5,7 @@ ;; DESCRIPTION : editing routines for graphics group mode ;; COPYRIGHT : (C) 2001 Joris van der Hoeven ;; (C) 2004-2007 Joris van der Hoeven and Henri Lesourd +;; (C) 2011 Joris van der Hoeven ;; ;; This software falls under the GNU general public license version 3 or later. ;; It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE @@ -13,11 +14,8 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (texmacs-module (graphics graphics-group) - (:use (utils library cursor) (utils library tree) - (kernel texmacs tm-states) - (graphics graphics-utils) (graphics graphics-main) - (graphics graphics-object) (graphics graphics-env) - (graphics graphics-kbd) (graphics graphics-edit))) + (:use (graphics graphics-env) + (graphics graphics-single))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Group edit mode @@ -37,36 +35,35 @@ (define (store-points) (lambda (o) (if (match? o '(point :%2)) - (set! so-points (cons o so-points)) - ) - o) - ) + (set! so-points (cons o so-points))) + o)) (set! group-bary-x #f) (set! group-bary-y #f) (if (nnull? (sketch-get)) - (with so (map tree->stree (sketch-get)) - (traverse-transform so (store-points)) - (if (nnull? so-points) - (with n 0 - (set! group-bary-x 0) - (set! group-bary-y 0) - (foreach (p so-points) - (set! group-bary-x (+ group-bary-x (s2f (cadr p)))) - (set! group-bary-y (+ group-bary-y (s2f (caddr p)))) - (set! n (+ n 1)) - ) - (set! group-bary-x (/ group-bary-x n)) - (set! group-bary-y (/ group-bary-y n)))) - )) + (with so (map tree->stree (sketch-get)) + (traverse-transform so (store-points)) + (if (nnull? so-points) + (with n 0 + (set! group-bary-x 0) + (set! group-bary-y 0) + (for (p so-points) + (set! group-bary-x (+ group-bary-x (s2f (cadr p)))) + (set! group-bary-y (+ group-bary-y (s2f (caddr p)))) + (set! n (+ n 1))) + (set! group-bary-x (/ group-bary-x n)) + (set! group-bary-y (/ group-bary-y n)))))) (set! group-first-x (s2f current-x)) (set! group-first-y (s2f current-y)) (> (point-norm (sub-point `(,group-first-x ,group-first-y) `(,group-bary-x ,group-bary-y))) 1e-3)) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Transformations +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (define (sub-point p1 p2) - `(,(- (car p1) (car p2)) - ,(- (cadr p1) (cadr p2)))) + `(,(- (car p1) (car p2)) + ,(- (cadr p1) (cadr p2)))) (define (point-norm p) (sqrt (+ (* (car p) (car p)) @@ -74,262 +71,280 @@ (define (traverse-transform o opn) (define (traverse o) - (opn (if (pair? o) (map traverse o) o)) - ) + (opn (if (pair? o) (map traverse o) o))) (traverse o)) (define (translate-point x y) (lambda (o) - (if (match? o '(point :%2)) + (if (match? o '(point :%2)) `(point ,(f2s (+ x (s2f (cadr o)))) ,(f2s (+ y (s2f (caddr o))))) - o))) + o))) (define (group-translate x y) (lambda (o) - (traverse-transform o (translate-point x y)))) + (traverse-transform o (translate-point x y)))) (define (zoom-point x0 y0 h) (lambda (o) - (if (match? o '(point :%2)) - (let* ((x (s2f (cadr o))) - (y (s2f (caddr o))) - ) - `(point ,(f2s (+ x0 (* (- x group-bary-x) h))) - ,(f2s (+ y0 (* (- y group-bary-y) h)))) - ) - o))) + (if (match? o '(point :%2)) + (let* ((x (s2f (cadr o))) + (y (s2f (caddr o)))) + `(point ,(f2s (+ x0 (* (- x group-bary-x) h))) + ,(f2s (+ y0 (* (- y group-bary-y) h))))) + o))) (define (group-zoom x y) (with h (/ (point-norm (sub-point `(,x ,y) `(,group-bary-x ,group-bary-y))) (point-norm (sub-point `(,group-first-x ,group-first-y) `(,group-bary-x ,group-bary-y)))) - (lambda (o) - (let* ((res (traverse-transform o (zoom-point group-bary-x group-bary-y h))) - (curmag #f) - (gmag (s2f (graphics-eval-magnification))) - ) + (lambda (o) + (let* ((res (traverse-transform + o (zoom-point group-bary-x group-bary-y h))) + (curmag #f)) (if (eq? (car res) 'with) - (with curmag (s2f (find-prop res "magnification" "1.0")) - (list-find&set-prop - res "magnification" (f2s (* curmag gmag h)))) - `(with "magnification" ,(f2s (* gmag h)) ,res)))))) + (with curmag (s2f (find-prop res "magnify" "1.0")) + (list-find&set-prop + res "magnify" (f2s (* curmag h)))) + `(with "magnify" ,(f2s h) ,res)))))) (define (rotate-point x0 y0 alpha) (lambda (o) - (if (match? o '(point :%2)) - (let* ((x (- (s2f (cadr o)) group-bary-x)) - (y (- (s2f (caddr o)) group-bary-y)) - ) - `(point ,(f2s (+ x0 (* x (cos alpha)) (* (- y) (sin alpha)))) - ,(f2s (+ y0 (* x (sin alpha)) (* y (cos alpha))))) - ) - o))) + (if (match? o '(point :%2)) + (let* ((x (- (s2f (cadr o)) group-bary-x)) + (y (- (s2f (caddr o)) group-bary-y))) + `(point ,(f2s (+ x0 (* x (cos alpha)) (* (- y) (sin alpha)))) + ,(f2s (+ y0 (* x (sin alpha)) (* y (cos alpha)))))) + o))) (define (group-rotate x y) (let* ((b (make-rectangular group-bary-x group-bary-y)) (f (make-rectangular group-first-x group-first-y)) (p (make-rectangular x y)) - (alpha (- (angle (- p b)) (angle (- f b)))) - ) - (lambda (o) - (traverse-transform o (rotate-point group-bary-x group-bary-y alpha))))) + (alpha (- (angle (- p b)) (angle (- f b))))) + (lambda (o) + (traverse-transform o (rotate-point group-bary-x group-bary-y alpha))))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Group / ungroup +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Grouping/Ungrouping (tm-define (group-selected-objects) (if (and (not sticky-point) (nnull? (sketch-get))) - (begin - (graphics-store-state 'group-selected-objects) - (sketch-checkout) - (with o (cons 'gr-group (sketch-get)) - (sketch-reset) - (sketch-toggle o) - ) - (sketch-commit) - (graphics-group-start) - (set! graphics-undo-enabled #t) - (graphics-forget-states)))) + (begin + (graphics-store-state 'group-selected-objects) + (sketch-checkout) + (with o (cons 'gr-group (sketch-get)) + (sketch-reset) + (sketch-toggle o)) + (sketch-commit) + (graphics-group-start) + (set! graphics-undo-enabled #t) + (graphics-forget-states)))) (tm-define (ungroup-current-object) (if (and (not sticky-point) (== (length (sketch-get)) 1) (== (tree-label (car (sketch-get))) 'gr-group)) - ;; TODO: Add support for ungrouping > - (with obj (car (sketch-get)) - (graphics-store-state 'ungroup-selected-objects) - (sketch-checkout) - (sketch-reset) - (foreach-number (i 0 < (tree-arity obj)) - (sketch-toggle (tree-ref obj i)) - ) - (sketch-commit) - (graphics-group-start) - (set! graphics-undo-enabled #t) - (graphics-forget-states)))) + ;; TODO: Add support for ungrouping > + (with obj (car (sketch-get)) + (graphics-store-state 'ungroup-selected-objects) + (sketch-checkout) + (sketch-reset) + (foreach-number (i 0 < (tree-arity obj)) + (sketch-toggle (tree-ref obj i))) + (sketch-commit) + (graphics-group-start) + (set! graphics-undo-enabled #t) + (graphics-forget-states)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Copy and paste attribute style +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (graphics-assign-props p obj) + (let* ((l1 (graphics-all-attributes)) + (l2 (map gr-prefix l1)) + (l3 (map graphics-get-property l2)) + (l4 (map cons l1 l3)) + (tab (list->ahash-table l4))) + (graphics-remove p 'memoize-layer) + (graphics-group-enrich-insert-table (stree-radical obj) tab #f))) + +(tm-define (graphics-copy-props p) + (let* ((t (path->tree p)) + (attrs (graphical-relevant-attributes t)) + (vars (list-difference attrs '("gid"))) + (get-prop (lambda (var) (graphics-path-property p var))) + (gr-vars (map gr-prefix vars)) + (vals (map get-prop vars))) + (for-each graphics-set-property gr-vars vals))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Remove +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Removing (tm-define (remove-selected-objects) (sketch-checkout) (sketch-reset) (sketch-commit) (graphics-group-start)) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; State transitions +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (tm-define (start-operation opn p obj) - (:require (in? (car obj) (append '(point text-at) gr-tags-curves))) + (:require (graphical-non-group-tag? (car obj))) (set! current-path #f) (if sticky-point ;;Perform operation (begin - (sketch-commit) - (graphics-decorations-update) - (if (== (state-ref graphics-first-state 'graphics-action) - 'start-operation) - (remove-undo-mark)) - (set! graphics-undo-enabled #t) - (graphics-forget-states)) + (sketch-commit) + (graphics-decorations-update) + (if (== (state-ref graphics-first-state 'graphics-action) + 'start-operation) + (remove-undo-mark)) + (set! graphics-undo-enabled #t) + (graphics-forget-states)) ;;Start operation (cond - ((and (not multiselecting) (eq? (cadr (graphics-mode)) 'group-ungroup)) - (if (and p (not sticky-point) (null? (sketch-get)) - (== (tree-label (path->tree p)) 'gr-group)) - (sketch-set! `(,(path->tree p)))) - (if (and (not sticky-point) - (== (length (sketch-get)) 1) - (== (tree-label (car (sketch-get))) 'gr-group)) - (ungroup-current-object) - (group-selected-objects)) - ) - ((and (not multiselecting) (== (cadr (graphics-mode)) 'props)) - (if (null? (sketch-get)) - (if p - (begin - (set! obj (stree-at p)) - (set! current-path (graphics-assign-props p obj)) - (set! current-obj obj) - (graphics-decorations-update))) - (with l '() - (foreach (o (sketch-get)) - (with p (graphics-assign-props - (tree->path o) - (tree->stree o)) - (set! l (cons (path->tree p) l))) - ) - (sketch-set! (reverse l)) - (graphics-decorations-update)) - ) - (graphics-group-start) - ) - ((and (not multiselecting) (or p (nnull? (sketch-get)))) - (if (null? (sketch-get)) - (any_toggle-select #f #f p obj)) - (if (store-important-points) - (begin - (graphics-store-state 'start-operation) - (sketch-checkout) - (sketch-transform tree->stree) - (set! group-first-go (copy-tree (sketch-get))) - (set! graphics-undo-enabled #f) - (graphics-store-state #f) - (set! group-old-x (s2f current-x)) - (set! group-old-y (s2f current-y)))))))) + ((and (not multiselecting) (eq? (cadr (graphics-mode)) 'group-ungroup)) + (if (and p (not sticky-point) (null? (sketch-get)) + (== (tree-label (path->tree p)) 'gr-group)) + (sketch-set! `(,(path->tree p)))) + (if (and (not sticky-point) + (== (length (sketch-get)) 1) + (== (tree-label (car (sketch-get))) 'gr-group)) + (ungroup-current-object) + (group-selected-objects))) + ((and (not multiselecting) (== (cadr (graphics-mode)) 'props)) + (if (null? (sketch-get)) + (if p + (begin + (set! obj (stree-at p)) + (set! current-path (graphics-assign-props p obj)) + (set! current-obj obj) + (graphics-decorations-update))) + (with l '() + (for (o (sketch-get)) + (with p (graphics-assign-props + (tree->path o) + (tree->stree o)) + (set! l (cons (path->tree p) l)))) + (sketch-set! (reverse l)) + (graphics-decorations-update))) + (graphics-group-start)) + ((and (not multiselecting) (or p (nnull? (sketch-get)))) + (if (null? (sketch-get)) + (any_toggle-select #f #f p obj)) + (if (store-important-points) + (begin + (graphics-store-state 'start-operation) + (sketch-checkout) + (sketch-transform tree->stree) + (set! group-first-go (copy-tree (sketch-get))) + (set! graphics-undo-enabled #f) + (graphics-store-state #f) + (set! group-old-x (s2f current-x)) + (set! group-old-y (s2f current-y)))))))) (define (any_toggle-select x y p obj) (if (not sticky-point) - (if multiselecting - (let* ((x1 (s2f selecting-x0)) - (y1 (s2f selecting-y0)) - (x2 (s2f x)) - (y2 (s2f y)) - (tmp 0) - (sel #f) - ) - (if (> x1 x2) - (begin - (set! tmp x1) - (set! x1 x2) - (set! x2 tmp)) - ) - (if (> y1 y2) - (begin - (set! tmp y1) - (set! y1 y2) - (set! y2 tmp)) - ) - (set! sel (graphics-select-area x1 y1 x2 y2)) - (sketch-reset) - (foreach (p sel) - (sketch-toggle (path->tree p)) - ) - (graphics-decorations-update) - (set! multiselecting #f) - (set! selecting-x0 #f) - (set! selecting-y0 #f) - ) - (if p - (with t (path->tree p) - (sketch-toggle t) - (graphics-decorations-update)) - (begin - (set! selecting-x0 x) - (set! selecting-y0 y) - (set! multiselecting #t)))))) + (if multiselecting + (let* ((x1 (s2f selecting-x0)) + (y1 (s2f selecting-y0)) + (x2 (s2f x)) + (y2 (s2f y)) + (tmp 0) + (sel #f)) + (if (> x1 x2) + (begin + (set! tmp x1) + (set! x1 x2) + (set! x2 tmp))) + (if (> y1 y2) + (begin + (set! tmp y1) + (set! y1 y2) + (set! y2 tmp))) + (set! sel (graphics-select-area x1 y1 x2 y2)) + (sketch-reset) + (for (p sel) + (sketch-toggle (path->tree p))) + (graphics-decorations-update) + (set! multiselecting #f) + (set! selecting-x0 #f) + (set! selecting-y0 #f)) + (if p + (with t (path->tree p) + (sketch-toggle t) + (graphics-decorations-update)) + (begin + (set! selecting-x0 x) + (set! selecting-y0 y) + (set! multiselecting #t)))))) (tm-define (toggle-select x y p obj) - (:require (in? (car obj) (append '(point text-at) gr-tags-curves))) + (:require (graphical-non-group-tag? (car obj))) (any_toggle-select x y p obj)) (define (any_unselect-all p obj) - (if (nnull? (sketch-get)) - (begin - (sketch-reset) - (graphics-decorations-update)) - (if (and p (not multiselecting) - (== (cadr (graphics-mode)) "props")) - (graphics-copy-props p)))) + (cond ((nnull? (sketch-get)) + (sketch-reset) + (graphics-decorations-update)) + ((and p (not multiselecting) (== (cadr (graphics-mode)) 'props)) + (graphics-copy-props p)))) (tm-define (unselect-all p obj) - (:require (in? (car obj) (append '(point text-at) gr-tags-curves))) + (:require (graphical-non-group-tag? (car obj))) (any_unselect-all p obj)) -;; Dispatch +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Global dispatching +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (tm-define (edit_move mode x y) (:require (eq? mode 'group-edit)) (:state graphics-state) (if sticky-point (begin - (set! x (s2f x)) - (set! y (s2f y)) - (with mode (graphics-mode) - (cond ((== (cadr mode) 'move) - (sketch-transform - (group-translate (- x group-old-x) - (- y group-old-y)))) - ((== (cadr mode) 'zoom) - (sketch-set! group-first-go) - (sketch-transform - (group-zoom x y)) - ) - ((== (cadr mode) 'rotate) - (sketch-set! group-first-go) - (sketch-transform - (group-rotate x y)) - )) - ) - (set! group-old-x x) - (set! group-old-y y)) + (set! x (s2f x)) + (set! y (s2f y)) + (with mode (graphics-mode) + (cond ((== (cadr mode) 'move) + (sketch-transform + (group-translate (- x group-old-x) + (- y group-old-y)))) + ((== (cadr mode) 'zoom) + (sketch-set! group-first-go) + (sketch-transform (group-zoom x y))) + ((== (cadr mode) 'rotate) + (sketch-set! group-first-go) + (sketch-transform (group-rotate x y))))) + (set! group-old-x x) + (set! group-old-y y)) (if multiselecting (begin - (graphical-object! - (append - (create-graphical-props 'default #f) - `((with color red - (cline (point ,selecting-x0 ,selecting-y0) - (point ,x ,selecting-y0) - (point ,x ,y) - (point ,selecting-x0 ,y))))))) + (graphical-object! + (append + (create-graphical-props 'default #f) + `((with color red + (cline (point ,selecting-x0 ,selecting-y0) + (point ,x ,selecting-y0) + (point ,x ,y) + (point ,selecting-x0 ,y))))))) (graphics-decorations-update)))) +(tm-define (edit_move mode x y) + (:require (and (== mode 'edit) (current-in? '(gr-group)))) + (:state graphics-state) + (if sticky-point + (display* "Uncaptured graphical move " mode ", " x ", " y "\n") + (begin + (set! current-point-no #f) + (graphics-decorations-update)))) + (tm-define (edit_left-button mode x y) (:require (eq? mode 'group-edit)) (:state graphics-state) @@ -349,10 +364,10 @@ (remove-selected-objects)) (unselect-all current-path current-obj))) -(tm-define (edit_tab-key mode next inc) +(tm-define (edit_tab-key mode inc) (:require (eq? mode 'group-edit)) - ;(display* "Graphics] Group-edit(Tab)\n") - (edit_tab-key 'edit next inc)) + ;;(display* "Graphics] Group-edit(Tab)\n") + (edit_tab-key 'edit inc)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Cut & paste actions @@ -365,41 +380,37 @@ (tm-define (graphics-copy) (:state graphics-state) (if (== (car (graphics-mode)) 'group-edit) - (with copied-objects (list-copy (sketch-get)) - (any_unselect-all #f #f) - (update-buffer) - (if (null? copied-objects) - (stree->tree "") - (stree->tree (cons 'graphics copied-objects))) - ) - (stree->tree ""))) + (with copied-objects (list-copy (sketch-get)) + (any_unselect-all #f #f) + (update-buffer) + (if (null? copied-objects) + (stree->tree "") + (stree->tree (cons 'graphics copied-objects)))) + (stree->tree ""))) (tm-define (graphics-cut) (:state graphics-state) (if (== (car (graphics-mode)) 'group-edit) - (let* ((l (list-copy (sketch-get))) - (res (graphics-copy)) - ) - (sketch-set! l) - (sketch-checkout) - (sketch-reset) - (sketch-commit) - res - ) - (stree->tree ""))) + (let* ((l (list-copy (sketch-get))) + (res (graphics-copy))) + (sketch-set! l) + (sketch-checkout) + (sketch-reset) + (sketch-commit) + res) + (stree->tree ""))) (tm-define (graphics-paste sel) (:state graphics-state) - ;(display* "sel=" sel "\n") + ;;(display* "sel=" sel "\n") (if (and (== (car (graphics-mode)) 'group-edit) (tree-compound? sel) (== (tree-label sel) 'graphics) (> (tree-arity sel) 0)) - (begin - (sketch-reset) - (sketch-checkout) - (foreach-number (i 0 < (tree-arity sel)) - (sketch-toggle (tree-ref sel i)) - ) - (sketch-commit) - (graphics-group-start)))) + (begin + (sketch-reset) + (sketch-checkout) + (foreach-number (i 0 < (tree-arity sel)) + (sketch-toggle (tree-ref sel i))) + (sketch-commit) + (graphics-group-start)))) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-kbd.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-kbd.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-kbd.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-kbd.scm 2011-10-06 19:22:09.000000000 +0000 @@ -12,62 +12,50 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (texmacs-module (graphics graphics-kbd) - (:use (utils library cursor) - (utils library tree) - (generic generic-kbd) - (graphics graphics-utils) + (:use (generic generic-kbd) + (graphics graphics-env) (graphics graphics-main) - (graphics graphics-env) (graphics graphics-edit))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Keyboard handling +;; Various contexts ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(tm-define ShiftMask 256) -(tm-define LockMask 512) -(tm-define ControlMask 1024) -(tm-define Mod1Mask 2048) -(tm-define Mod2Mask 4096) -(tm-define Mod3Mask 8192) -(tm-define Mod4Mask 16384) -(tm-define Mod5Mask 32768) - -(tm-define (kbd-variant t forwards?) - (:require (in-active-graphics?)) - (graphics-choose-point (if forwards? 1 -1))) +(define (in-active-graphics?) + (and (in-graphics?) (== (get-env "preamble") "false"))) -(tm-define (kbd-horizontal t forwards?) - (:require (tree-is? t 'text-at)) - (with move (if forwards? go-right go-left) - (go-to-remain-inside move 'text-at))) +(define (graphics-context? t) + (tree-is? t 'graphics)) -(tm-define (kbd-vertical t downwards?) - (:require (tree-is? t 'text-at)) - (with move (if downwards? go-down go-up) - (go-to-remain-inside move 'text-at))) +(define (inside-graphics-context? t) + (tree-search-upwards t graphics-context?)) -(tm-define (kbd-extremal t forwards?) - (:require (tree-is? t 'text-at)) - (with move (if forwards? go-right go-left) - (with action (lambda () (go-to-remain-inside move 'text-at)) - (go-to-repeat action)))) +(define (inside-graphical-text-context? t) + (and-with p (tree-ref t :up) + (and-with u (tree-search-upwards p graphical-text-context?) + (inside-graphics-context? u)))) + +(tm-define (generic-context? t) + (:require (inside-graphics-context? t)) + #f) -(define (in-active-graphics?) - (and (in-graphics?) (== (get-env "preamble") "false"))) - -(define (graphics-kbd-remove forward?) - (if (and (with-active-selection?) - (with-cursor (rcons (selection-path) 0) - (not (in-graphics?)))) - (begin - (go-to (rcons (selection-path) 0)) - (clipboard-cut "primary")))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Keyboard handling +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (kbd-map (:mode in-active-graphics?) - ("+" (graphics-zoom (/ 1.0 0.75))) - ("-" (graphics-zoom 0.75)) + ("+" (graphics-zoom 1.189207115)) + ("-" (graphics-zoom 0.840896415)) + ("1" (graphics-set-zoom 1.0)) + ("2" (graphics-set-zoom 2.0)) + ("3" (graphics-set-zoom 3.0)) + ("4" (graphics-set-zoom 4.0)) + ("5" (graphics-set-zoom 5.0)) + ("6" (graphics-set-zoom 6.0)) + ("7" (graphics-set-zoom 7.0)) + ("8" (graphics-set-zoom 8.0)) + ("9" (graphics-set-zoom 9.0)) ("left" (graphics-move-origin "+0.01gw" "0gh")) ("right" (graphics-move-origin "-0.01gw" "0gh")) ("down" (graphics-move-origin "0gw" "+0.01gh")) @@ -88,21 +76,106 @@ ("A-S-right" (graphics-change-extents "+1cm" "0cm")) ("A-S-down" (graphics-change-extents "0cm" "+1cm")) ("A-S-up" (graphics-change-extents "0cm" "-1cm")) - ("M-left" (if (current-is-textat?) - (text-at-change-halign current-path #f))) - ("M-right" (if (current-is-textat?) - (text-at-change-halign current-path #t))) - ("M-down" (if (current-is-textat?) - (text-at-change-valign current-path #f) - (graphics-change-geo-valign #f))) - ("M-up" (if (current-is-textat?) - (text-at-change-valign current-path #t) - (graphics-change-geo-valign #t))) - ("backspace" (graphics-kbd-backspace)) - ("delete" (graphics-kbd-delete)) + ("backspace" (graphics-kbd-remove #f)) + ("delete" (graphics-kbd-remove #t)) ("C-g" (graphics-toggle-grid #f)) ("C-G" (graphics-toggle-grid #t))) +(define graphics-keys + '("+" "-" "1" "2" "3" "4" "5" "6" "7" "8" "9" + "left" "right" "down" "up" "home" "end" "pageup" "pagedown" + "backspace" "delete")) + +(tm-define (keyboard-press key time) + (:mode in-active-graphics?) + (cond ((string-occurs? "-" key) (key-press key)) + ((in? key graphics-keys) (key-press key)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Overriding standard structured editing commands +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (kbd-variant t forwards?) + (:require (in-active-graphics?)) + (graphics-choose-point (if forwards? 1 -1))) + +(tm-define (graphics-kbd-remove forward?) + (cond ((and (with-active-selection?) + (with-cursor (rcons (selection-path) 0) + (not (in-graphics?)))) + (go-to (rcons (selection-path) 0)) + (clipboard-cut "primary")) + ((inside-graphical-text?) + (if forward? (kbd-delete) (kbd-backspace))) + (else + (edit_delete)))) + +(tm-define (geometry-vertical t down?) + (:require (in-active-graphics?)) + (graphics-change-geo-valign down?)) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Text at +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (kbd-horizontal t forwards?) + (:require (graphical-text-context? t)) + (with-define (move) ((if forwards? go-right go-left)) + (with-define (next) (go-to-next-inside move inside-graphics-context?) + (go-to-next-such-that next inside-graphical-text-context?)))) + +(tm-define (kbd-vertical t downwards?) + (:require (graphical-text-context? t)) + (with-define (move) ((if downwards? go-down go-up)) + (with-define (next) (go-to-next-inside move inside-graphics-context?) + (go-to-next-such-that next inside-graphical-text-context?)))) + +(tm-define (kbd-extremal t forwards?) + (:require (graphical-text-context? t)) + (with-define (move) ((if forwards? go-right go-left)) + (with-define (next) (go-to-next-inside move inside-graphics-context?) + (with-define (action) + (go-to-next-such-that next inside-graphical-text-context?) + (go-to-repeat action))))) + +(tm-define (geometry-horizontal t forwards?) + (:require (graphical-text-context? t)) + (let* ((old (graphical-get-attribute t "text-at-halign")) + (new (if forwards? + (cond ((== old "right") "center") + (else "left")) + (cond ((== old "left") "center") + (else "right"))))) + (graphical-set-attribute t "text-at-halign" new))) + +(tm-define (geometry-vertical t down?) + (:require (graphical-text-context? t)) + (let* ((old (graphical-get-attribute t "text-at-valign")) + (new (if down? + (cond ((== old "bottom") "base") + ((== old "base") "axis") + ((== old "axis") "center") + (else "top")) + (cond ((== old "top") "center") + ((== old "center") "axis") + ((== old "axis") "base") + (else "bottom"))))) + (graphical-set-attribute t "text-at-valign" new))) + +(tm-define (geometry-extremal t forwards?) + (:require (graphical-text-context? t)) + (graphical-set-attribute t "text-at-halign" + (if forwards? "left" "right"))) + +(tm-define (geometry-incremental t down?) + (:require (graphical-text-context? t)) + (graphical-set-attribute t "text-at-valign" + (if down? "top" "bottom"))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Draw over / draw under +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + (tm-define (inside-draw-over/under?) (or (inside? 'draw-over) (inside? 'draw-under))) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-main.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-main.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-main.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-main.scm 2011-10-06 19:19:31.000000000 +0000 @@ -14,8 +14,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (texmacs-module (graphics graphics-main) - (:use (utils library cursor) (utils library tree) - (graphics graphics-utils))) + (:use (graphics graphics-utils))) ;; TODO: Have a look at if there is still some part of the previous ;; mess due to unsafe synchro (fetching grids, egrid-as-vgrid?, etc.) @@ -24,6 +23,186 @@ ;; below, this code is clean. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Global properties of graphics +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (graphics-geometry) + (with geo (tree->stree (get-env-tree "gr-geometry")) + (if (match? geo '(tuple "geometry" :%2)) + (append geo '("center")) + (if (match? geo '(tuple "geometry" :%3)) + geo + '(tuple "geometry" "1par" "0.6par" "center"))))) + +(tm-define (graphics-set-width w) + (:argument w "Width of the graphics") + (let* ((geo (graphics-geometry)) + (align (if (>= (length geo) 5) (cAr geo) "center")) + (new-geo `(tuple "geometry" ,w ,(cadddr geo) ,align))) + (graphics-set-property "gr-geometry" new-geo))) + +(tm-define (graphics-set-height h) + (:argument h "Height of the graphics") + (let* ((geo (graphics-geometry)) + (align (if (>= (length geo) 5) (cAr geo) "center")) + (new-geo `(tuple "geometry" ,(caddr geo) ,h ,align))) + (graphics-set-property "gr-geometry" new-geo))) + +(define (geo-valign-has-value? val) + (let* ((geo (graphics-geometry)) + (align (car (cddddr geo)))) + (== val align))) + +(tm-define (graphics-set-geo-valign a) + (:argument a "Alignment of the graphics") + (:check-mark "*" geo-valign-has-value?) + (let* ((geo (graphics-geometry)) + (new-geo `(tuple "geometry" ,(caddr geo) ,(cadddr geo) ,a))) + (graphics-set-property "gr-geometry" new-geo))) + +(tm-define (graphics-set-extents w h) + (:argument w "Width of the graphics") + (:argument h "Height of the graphics") + (let* ((geo (graphics-geometry)) + (align (if (>= (length geo) 5) (cAr geo) "center")) + (new-geo `(tuple "geometry" ,w ,h ,align))) + (graphics-set-property "gr-geometry" new-geo))) + +(tm-define (graphics-cartesian-frame) + (with frame (tree->stree (get-env-tree "gr-frame")) + (if (match? frame '(tuple "scale" :%2)) + frame + '(tuple "scale" "1cm" (tuple "0.5par" "0cm"))))) + +(define (graphics-unit-has-value? val) + (let* ((fr (graphics-cartesian-frame)) + (unit (caddr fr))) + (== val unit))) + +(tm-define (graphics-set-unit u) + (:argument u "Graphical unit") + (:check-mark "*" graphics-unit-has-value?) + (with frame (graphics-cartesian-frame) + (with new-frame `(tuple "scale" ,u ,(cAr frame)) + (graphics-set-property "gr-frame" new-frame)))) + +(define (graphics-origin-has-value? x y) + (let* ((fr (graphics-cartesian-frame)) + (orig (cAr fr))) + (if (pair? x) + (set! x (length-add (cadr x) (caddr x)))) + (if (pair? y) + (set! y (length-add (cadr y) (caddr y)))) + ;; FIXME: The 2 (if)s above lack perfection... + (== `(tuple ,x ,y) orig))) + +(tm-define (graphics-set-origin x y) + (:argument x "Origin's x-coordinate") + (:argument y "Origin's y-coordinate") + (:check-mark "*" graphics-origin-has-value?) + (with frame (graphics-cartesian-frame) + (with new-frame (append (cDr frame) `((tuple ,x ,y))) + (graphics-set-property "gr-frame" new-frame)))) + +(tm-define (length-extract-unit len) + (define l (reverse (string->list len))) + (define (traverse l) + (if (pair? l) + (if (char-alphabetic? (car l)) + (traverse (cdr l)) + (set-cdr! l '())))) + (traverse l) + (set! l (reverse l)) + (if (and (pair? l) (not (char-alphabetic? (car l)))) + (set! l (cdr l))) + (list->string l)) ;; TODO: Move this in the utils (?) + +(tm-define (graphics-auto-crop?) + (== (graphics-get-property "gr-auto-crop") "true")) + +(tm-define (graphics-toggle-auto-crop) + (:check-mark "v" graphics-auto-crop?) + (with new (if (graphics-auto-crop?) "false" "true") + (graphics-set-property "gr-auto-crop" new))) + +(define (graphics-has-crop-padding? val) + (== (graphics-get-property "gr-crop-padding") val)) + +(tm-define (graphics-set-crop-padding val) + (:argument val "Padding around cropped graphics") + (:check-mark "*" graphics-has-crop-padding?) + (graphics-set-property "gr-crop-padding" val)) + +(tm-define (graphics-zoom e) + (let* ((fr (graphics-cartesian-frame)) + (u (caddr fr)) + (newu (length-mult e u)) + (newud (length-decode newu)) + (x1 (cadr (cadddr fr))) + (y1 (caddr (cadddr fr))) + (x2 (length-add x1 "-0.5gw")) + (y2 (length-add y1 "-0.5gh")) + (x3 (length-mult e x2)) + (y3 (length-mult e y2)) + (x4 (length-add x3 "0.5gw")) + (y4 (length-add y3 "0.5gh")) + (x5 (if (and (string? x4) (string-ends? x4 "gw")) x4 x1)) + (y5 (if (and (string? y4) (string-ends? y4 "gh")) y4 y1)) + (newfr `(tuple "scale" ,newu (tuple ,x4 ,y4)))) + (if (and (> newud 100) (< newud 10000000)) + (with magn (multiply-magnify (graphics-get-property "magnify") e) + (graphics-decorations-reset) + (graphics-set-property "gr-frame" newfr) + (graphics-set-property "magnify" magn))))) + +(tm-define (graphics-set-zoom z) + (with magn (graphics-get-property "magnify") + (if (or (not magn) (== magn "default")) (set! magn "1")) + (graphics-zoom (/ z (string->number magn))))) + +(tm-define (graphics-move-origin dx dy) + (define (add l1 l2) + (if (pair? l1) + `(tmlen ,(f2s (+ (s2f (cadr l1)) (length-decode l2)))) + (length-add l1 l2))) + (when (not (graphics-auto-crop?)) + (let* ((fr (graphics-cartesian-frame)) + (x (cadr (cadddr fr))) + (y (caddr (cadddr fr))) + (newfr `(tuple "scale" ,(caddr fr) + (tuple ,(add x dx) ,(add y dy))))) + (graphics-decorations-reset) + (graphics-set-property "gr-frame" newfr)))) + +(tm-define (graphics-change-extents dw dh) + (when (not (graphics-auto-crop?)) + (let* ((geo (graphics-geometry)) + (w (caddr geo)) + (h (cadddr geo)) + (w2 (length-add w dw)) + (h2 (length-add h dh))) + (if (> (length-decode w2) 0) + (set! w w2)) + (if (> (length-decode h2) 0) + (set! h h2)) + (graphics-decorations-reset) + (graphics-set-extents w h)))) + +(tm-define (graphics-change-geo-valign down?) + (let* ((geo (graphics-geometry)) + (a (car (cddddr geo)))) + (graphics-set-geo-valign + (if down? + (cond ((== a "top") "center") + ((== a "center") "bottom") + ((== a "bottom") "top") + (else "default")) + (cond ((== a "top") "bottom") + ((== a "center") "top") + ((== a "bottom") "center") + (else "default")))))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Grids ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -51,56 +230,44 @@ (set! graphics-current-base "10") (with grid (tree->stree (get-env-tree (if visual? "gr-grid" "gr-edit-grid"))) (cond ((match? grid '(tuple "empty")) - (set! graphics-current-type "empty") - ) + (set! graphics-current-type "empty")) ((match? grid '(tuple "cartesian")) - (set! graphics-current-type "cartesian") - ) + (set! graphics-current-type "cartesian")) ((match? grid '(tuple "cartesian" :%1)) (set! graphics-current-type "cartesian") - (set! graphics-current-step (list-ref grid 2)) - ) + (set! graphics-current-step (list-ref grid 2))) ((match? grid '(tuple "cartesian" :%2)) (set! graphics-current-type "cartesian") (set! graphics-current-center (list-ref grid 2)) - (set! graphics-current-step (list-ref grid 3)) - ) + (set! graphics-current-step (list-ref grid 3))) ((match? grid '(tuple "polar")) - (set! graphics-current-type "polar") - ) + (set! graphics-current-type "polar")) ((match? grid '(tuple "polar" :%1)) (set! graphics-current-type "polar") - (set! graphics-current-step (list-ref grid 2)) - ) + (set! graphics-current-step (list-ref grid 2))) ((match? grid '(tuple "polar" :%2)) (set! graphics-current-type "polar") (set! graphics-current-step (list-ref grid 2)) - (set! graphics-current-astep (list-ref grid 3)) - ) + (set! graphics-current-astep (list-ref grid 3))) ((match? grid '(tuple "polar" :%3)) (set! graphics-current-type "polar") (set! graphics-current-center (list-ref grid 2)) (set! graphics-current-step (list-ref grid 3)) - (set! graphics-current-astep (list-ref grid 4)) - ) + (set! graphics-current-astep (list-ref grid 4))) ((match? grid '(tuple "logarithmic")) - (set! graphics-current-type "logarithmic") - ) + (set! graphics-current-type "logarithmic")) ((match? grid '(tuple "logarithmic" :%1)) (set! graphics-current-type "logarithmic") - (set! graphics-current-step (list-ref grid 2)) - ) + (set! graphics-current-step (list-ref grid 2))) ((match? grid '(tuple "logarithmic" :%2)) (set! graphics-current-type "logarithmic") (set! graphics-current-step (list-ref grid 2)) - (set! graphics-current-base (list-ref grid 3)) - ) + (set! graphics-current-base (list-ref grid 3))) ((match? grid '(tuple "logarithmic" :%3)) (set! graphics-current-type "logarithmic") (set! graphics-current-center (list-ref grid 2)) (set! graphics-current-step (list-ref grid 3)) - (set! graphics-current-base (list-ref grid 4)) - )))) + (set! graphics-current-base (list-ref grid 4)))))) (tm-define (graphics-get-grid-type visual?) (graphics-fetch-grid-vars #f visual?) @@ -108,9 +275,7 @@ (define (get-actual-grid-type visual?) (with grid (tree->stree (get-env-tree (if visual? "gr-grid" "gr-edit-grid"))) - (if (and (pair? grid) (> (length grid) 1)) - (cadr grid) - #f))) + (and (pair? grid) (> (length grid) 1) (cadr grid)))) (define (graphics-set-grid visual?) (let* ((type (string->symbol graphics-current-type)) @@ -120,58 +285,48 @@ (base graphics-current-base) (prop (if visual? "gr-grid" "gr-edit-grid")) (prop-old (if visual? "gr-grid-old" "gr-edit-grid-old")) - (the-grid #f) - ) + (the-grid #f)) (cond ((== type 'empty) - (set! the-grid - `(tuple "empty")) - ) + (set! the-grid `(tuple "empty"))) ((== type 'cartesian) - (set! the-grid - `(tuple "cartesian" ,center ,step)) - ) + (set! the-grid `(tuple "cartesian" ,center ,step))) ((== type 'polar) - (set! the-grid - `(tuple "polar" ,center ,step ,astep)) - ) + (set! the-grid `(tuple "polar" ,center ,step ,astep))) ((== type 'logarithmic) - (set! the-grid - `(tuple "logarithmic" ,center ,step ,base))) - ) + (set! the-grid `(tuple "logarithmic" ,center ,step ,base)))) (if the-grid - (begin - (with grid-old (tree->stree (get-env-tree prop-old)) - (if (and (== (get-actual-grid-type visual?) "empty") - (> (length grid-old) 1) - (== (cadr the-grid) (cadr grid-old))) - (graphics-set-property prop grid-old) - (begin - (graphics-set-property prop the-grid) - (if (!= type 'empty) - (graphics-set-property prop-old the-grid))))))) + (with grid-old (tree->stree (get-env-tree prop-old)) + (if (and (== (get-actual-grid-type visual?) "empty") + (> (length grid-old) 1) + (== (cadr the-grid) (cadr grid-old))) + (graphics-set-property prop grid-old) + (begin + (graphics-set-property prop the-grid) + (if (!= type 'empty) + (graphics-set-property prop-old the-grid)))))) (if visual? (update-edit-grid 'grid-change)))) (define (grids-defaulted?) (with p (cDr (cursor-path)) - (and (== (get-upwards-property p "gr-grid") nothing) - (== (get-upwards-property p "gr-grid-old") nothing) - (== (get-upwards-property p "gr-edit-grid") nothing) - (== (get-upwards-property p "gr-edit-grid-old") nothing) - (== (get-upwards-property p "gr-edit-grid-aspect") nothing) - (== (get-upwards-property p "gr-grid-aspect") nothing) - (== (get-upwards-property p "gr-grid-aspect-props") nothing)))) + (and (== (get-upwards-property p "gr-grid") nothing) + (== (get-upwards-property p "gr-grid-old") nothing) + (== (get-upwards-property p "gr-edit-grid") nothing) + (== (get-upwards-property p "gr-edit-grid-old") nothing) + (== (get-upwards-property p "gr-edit-grid-aspect") nothing) + (== (get-upwards-property p "gr-grid-aspect") nothing) + (== (get-upwards-property p "gr-grid-aspect-props") nothing)))) (tm-define (graphics-reset-grids) (:check-mark "*" grids-defaulted?) (graphics-remove-property "gr-grid") (graphics-remove-property "gr-grid-old") (if (grid-as-visual-grid?) - (begin - (graphics-remove-property "gr-edit-grid") - (graphics-remove-property "gr-edit-grid-old") - (graphics-remove-property "gr-edit-grid-aspect") - (graphics-remove-property "gr-grid-aspect") - (graphics-remove-property "gr-grid-aspect-props")))) + (begin + (graphics-remove-property "gr-edit-grid") + (graphics-remove-property "gr-edit-grid-old") + (graphics-remove-property "gr-edit-grid-aspect") + (graphics-remove-property "gr-grid-aspect") + (graphics-remove-property "gr-grid-aspect-props")))) (define (visual-type-has-value? type) (graphics-fetch-grid-vars #f #t) @@ -182,54 +337,47 @@ (:check-mark "*" visual-type-has-value?) (graphics-fetch-grid-vars type #t) (with new-polar? #f - (if (and (== type 'polar) - (!= type (string->symbol graphics-current-type)) - ) - (let* ((aspect (graphics-grid-aspect #t)) - (nsubds (aspect-ref aspect 3)) - ) - (if nsubds - (set! nsubds (cadr nsubds))) - (set! new-polar? #t) - (graphics-set-grid-aspect 'detailed nsubds #t) - (set! graphics-current-astep (f2s default-polar-astep)))) - (set! graphics-current-type (symbol->string type)) - (graphics-set-grid #t) - (graphics-fetch-grid-vars type #t) - (if new-polar? (begin - (set! graphics-current-type (symbol->string type)) - (set! graphics-current-astep (f2s default-polar-astep)) - (update-edit-grid 'grid-change))))) + (if (and (== type 'polar) + (!= type (string->symbol graphics-current-type))) + (let* ((aspect (graphics-grid-aspect #t)) + (nsubds (aspect-ref aspect 3))) + (if nsubds (set! nsubds (cadr nsubds))) + (set! new-polar? #t) + (graphics-set-grid-aspect 'detailed nsubds #t) + (set! graphics-current-astep (f2s default-polar-astep)))) + (set! graphics-current-type (symbol->string type)) + (graphics-set-grid #t) + (graphics-fetch-grid-vars type #t) + (if new-polar? + (begin + (set! graphics-current-type (symbol->string type)) + (set! graphics-current-astep (f2s default-polar-astep)) + (update-edit-grid 'grid-change))))) (define (edit-type-has-value? type) (graphics-fetch-grid-vars #f #f) (set! type (cadr type)) - (if (== type 'default) - (set! type 'empty)) + (if (== type 'default) (set! type 'empty)) (== type (string->symbol graphics-current-type))) (tm-define (graphics-set-edit-grid type) (:check-mark "*" edit-type-has-value?) (cond ((or (== type 'default) - (== type 'grid-change) - ) + (== type 'grid-change)) (let* ((aspect (graphics-grid-aspect-props)) (nsubds0 (cadr (list-ref aspect (- (length aspect) 1)))) (nsubds (if (number? nsubds0) nsubds0 (if (string? nsubds0) (string->number nsubds0) - #f))) - ) - (if (or (== nsubds #f) (not (grid-aspect-show-subunits?))) - (set! nsubds 1)) - (if (== type 'default) - (graphics-fetch-grid-vars 'cartesian #t)) - (if (!= graphics-current-type "logarithmic") - (begin - (graphics-set-grid-aspect 'update nsubds #f))) - (graphics-set-grid #f)) - ) + #f)))) + (if (or (== nsubds #f) (not (grid-aspect-show-subunits?))) + (set! nsubds 1)) + (if (== type 'default) + (graphics-fetch-grid-vars 'cartesian #t)) + (if (!= graphics-current-type "logarithmic") + (graphics-set-grid-aspect 'update nsubds #f)) + (graphics-set-grid #f))) (else (grid-as-visual-grid! #f) (graphics-fetch-grid-vars type #f) @@ -242,8 +390,7 @@ ;; Setting grid properties (tm-define (graphics-set-grid-center x y visual?) - (if (not visual?) - (grid-as-visual-grid! #f)) + (if (not visual?) (grid-as-visual-grid! #f)) (graphics-fetch-grid-vars #f visual?) (set! graphics-current-center `(point ,x ,y)) (graphics-set-grid visual?)) @@ -254,8 +401,7 @@ (tm-define (graphics-set-grid-step val visual?) (:check-mark "*" grid-step-has-value?) - (if (not visual?) - (grid-as-visual-grid! #f)) + (if (not visual?) (grid-as-visual-grid! #f)) (graphics-fetch-grid-vars #f visual?) (set! graphics-current-step val) (graphics-set-grid visual?)) @@ -266,8 +412,7 @@ (tm-define (graphics-set-grid-astep val visual?) (:check-mark "*" grid-astep-has-value?) - (if (not visual?) - (grid-as-visual-grid! #f)) + (if (not visual?) (grid-as-visual-grid! #f)) (graphics-fetch-grid-vars #f visual?) (set! graphics-current-astep val) (graphics-set-grid visual?)) @@ -278,8 +423,7 @@ (tm-define (graphics-set-grid-base val visual?) (:check-mark "*" grid-base-has-value?) - (if (not visual?) - (grid-as-visual-grid! #f)) + (if (not visual?) (grid-as-visual-grid! #f)) (graphics-fetch-grid-vars #f visual?) (set! graphics-current-base val) (graphics-set-grid visual?)) @@ -308,10 +452,10 @@ ;; Setting visual grid aspect properties (tm-define (graphics-set-grid-aspect-properties c0 c1 s2 c2) - (:argument c0 "Color(axes)") - (:argument c1 "Color(unit)") + (:argument c0 "Color axes") + (:argument c1 "Color units") (:argument s2 "Subdivisions per unit") - (:argument c2 "Color(subds)") + (:argument c2 "Color subdivisions") (with aspect `(tuple (tuple "axes" ,c0) (tuple "1" ,c1) (tuple ,s2 ,c2)) (graphics-set-property "gr-grid-aspect" aspect) (graphics-set-property "gr-grid-aspect-props" aspect)) @@ -319,60 +463,55 @@ (define (cmp-aspect-items x y) (if (== (cadr x) "axes") #t - (if (== (cadr y) "axes") #f - (let* ((xval (s2f (cadr x))) - (yval (s2f (cadr y)))) - (< xval yval))))) + (if (== (cadr y) "axes") #f + (let* ((xval (s2f (cadr x))) + (yval (s2f (cadr y)))) + (< xval yval))))) (define (graphics-grid-aspect-props) (define res #f) (with aspect ;;(tree->stree (get-env-tree "gr-grid-aspect-props")) - (get-upwards-property - (cDr (cursor-path)) "gr-grid-aspect-props") - ;;FIXME: The synchro still doesn't work with (get-env-tree), - ;; so we proceed differently. Take this into account everywhere - ;; else (depends on if (get-env-tree) is gonna be fixed or not. - ;; If not, then we should avoid using it, and rely on the way - ;; above (if it doesn't raises other problems...)). + (get-upwards-property + (cDr (cursor-path)) "gr-grid-aspect-props") + ;;FIXME: The synchro still doesn't work with (get-env-tree), + ;; so we proceed differently. Take this into account everywhere + ;; else (depends on if (get-env-tree) is gonna be fixed or not. + ;; If not, then we should avoid using it, and rely on the way + ;; above (if it doesn't raises other problems...)). (if (match? aspect '(tuple (tuple :%2) (tuple :%2) :*)) (set! res aspect) (begin (set! aspect (graphics-path-property - (graphics-graphics-path) "gr-grid-aspect")) + (graphics-graphics-path) "gr-grid-aspect")) (if (match? aspect '(tuple (tuple :%2) (tuple :%2) :*)) (set! res aspect) - (set! res (get-default-val "gr-grid-aspect"))))) - ) + (set! res (get-default-val "gr-grid-aspect")))))) (cons 'tuple (sort (cdr res) cmp-aspect-items))) (define (graphics-grid-aspect visual?) (with gr (if visual? "gr-grid-aspect" "gr-edit-grid-aspect") - (with aspect (tree->stree (get-env-tree gr)) - (if (not (match? aspect '(tuple (tuple :%2) (tuple :%2) :*))) - (set! res (get-default-val gr))) - (cons 'tuple (sort (cdr aspect) cmp-aspect-items))))) + (with aspect (tree->stree (get-env-tree gr)) + (if (not (match? aspect '(tuple (tuple :%2) (tuple :%2) :*))) + (set! res (get-default-val gr))) + (cons 'tuple (sort (cdr aspect) cmp-aspect-items))))) (define (aspect-ref a i) - (if (and (pair? a) (integer? i) (> (length a) i)) - (list-ref a i) - #f)) + (and (pair? a) (integer? i) (> (length a) i) (list-ref a i))) (define (nsubd-has-value? type nsubd visual?) (with aspect (graphics-grid-aspect visual?) - (with ref (aspect-ref aspect 3) - (if ref - (if (number? nsubd) - (== (number->string nsubd) (cadr ref)) - (let* ((aspect (get-default-val - (if visual? - "gr-grid-aspect" - "gr-edit-grid-aspect"))) - (val (cadr (list-ref aspect 3))) - ) - (== (cadr ref) val)) - ) - #f)))) + (with ref (aspect-ref aspect 3) + (if ref + (if (number? nsubd) + (== (number->string nsubd) (cadr ref)) + (let* ((aspect (get-default-val + (if visual? + "gr-grid-aspect" + "gr-edit-grid-aspect"))) + (val (cadr (list-ref aspect 3)))) + (== (cadr ref) val))) + #f)))) (tm-define (graphics-set-grid-aspect type nsubd visual?) (:check-mark "*" nsubd-has-value?) @@ -381,30 +520,26 @@ (cond ((== type 'units-only) (graphics-set-property "gr-grid-aspect-props" aspect) (set-cdr! (cddr aspect) '()) - (graphics-set-property "gr-grid-aspect" aspect) - ) + (graphics-set-property "gr-grid-aspect" aspect)) ((== type 'detailed) (if nsubd (set-car! (cdr (list-ref aspect 3)) (number->string nsubd)) (set-car! (cdr (list-ref aspect 3)) (cadr (list-ref - (get-default-val "gr-grid-aspect") - 3))) - ) + (get-default-val "gr-grid-aspect") + 3)))) (graphics-set-property "gr-grid-aspect" aspect) - (graphics-set-property "gr-grid-aspect-props" aspect)) - ) - (update-edit-grid 'default) - ) + (graphics-set-property "gr-grid-aspect-props" aspect))) + (update-edit-grid 'default)) (with aspect - `(tuple (tuple "axes" "none") (tuple "1" "none") - (tuple ,(number->string nsubd) "none")) + `(tuple (tuple "axes" "none") (tuple "1" "none") + (tuple ,(number->string nsubd) "none")) (if (not nsubd) (set-car! (cdr (list-ref aspect 3)) (cadr (list-ref - (get-default-val "gr-edit-grid-aspect") - 3)))) + (get-default-val "gr-edit-grid-aspect") + 3)))) (graphics-set-property "gr-edit-grid-aspect" aspect) (if (!= type 'update) (grid-as-visual-grid! #f))))) @@ -412,31 +547,28 @@ (tm-define (graphics-interactive-set-grid-nsubds visual?) (:interactive #t) (interactive - (lambda (x) (graphics-set-grid-aspect 'detailed (string->number x) visual?)) + (lambda (x) + (graphics-set-grid-aspect 'detailed (string->number x) visual?)) "Number of subunit steps")) ;; Setting visual grid aspect properties (colors) (define (grid-aspect-ofs where) (cond ((== where 'axes) 1) - ((== where 'units) 2) - ((== where 'subunits) 3) - (else #f))) + ((== where 'units) 2) + ((== where 'subunits) 3) + (else #f))) (define (grid-color-has-value? where color) (let* ((i (grid-aspect-ofs (cadr where))) (aspect (graphics-grid-aspect #t)) (aspect-props (graphics-grid-aspect-props)) (ref (aspect-ref aspect i)) - (ref-props (aspect-ref aspect-props i)) - ) + (ref-props (aspect-ref aspect-props i))) (if (== color "default") (let* ((aspect (get-default-val "gr-grid-aspect")) - (ref2 (aspect-ref aspect i)) - ) - (if (and ref2 (or ref ref-props)) - (== (caddr ref2) (if ref (caddr ref) (caddr ref-props))) - #f) - ) + (ref2 (aspect-ref aspect i))) + (and ref2 (or ref ref-props) + (== (caddr ref2) (if ref (caddr ref) (caddr ref-props))))) (if ref (== color (caddr ref)) (== color (caddr ref-props)))))) @@ -446,22 +578,19 @@ (define i 0) (let* ((i (grid-aspect-ofs where)) (aspect (graphics-grid-aspect #t)) - (aspect-props (graphics-grid-aspect-props)) - ) + (aspect-props (graphics-grid-aspect-props))) (if i - (begin - (if (== color "default") - (let* ((aspect (get-default-val "gr-grid-aspect")) - (ref2 (aspect-ref aspect i)) - ) - (set! color (caddr ref2))) - ) - (set-car! (cddr (list-ref aspect-props i)) color) - (graphics-set-property "gr-grid-aspect-props" aspect-props) - (if (and (pair? aspect) (> (length aspect) 3)) - (begin - (set-car! (cddr (list-ref aspect i)) color) - (graphics-set-property "gr-grid-aspect" aspect))))))) + (begin + (if (== color "default") + (let* ((aspect (get-default-val "gr-grid-aspect")) + (ref2 (aspect-ref aspect i))) + (set! color (caddr ref2)))) + (set-car! (cddr (list-ref aspect-props i)) color) + (graphics-set-property "gr-grid-aspect-props" aspect-props) + (if (and (pair? aspect) (> (length aspect) 3)) + (begin + (set-car! (cddr (list-ref aspect i)) color) + (graphics-set-property "gr-grid-aspect" aspect))))))) ;; Grid interface elements (tm-define (grid-as-visual-grid?) @@ -481,9 +610,8 @@ (and (pair? aspect) (> (length aspect) 3)))) (tm-define (grid-show-subunits?) - (let* ((grid (tree->stree (get-env-tree "gr-grid"))) - (aspect (tree->stree (get-env-tree "gr-grid-aspect"))) - ) + (let* ((grid (tree->stree (get-env-tree "gr-grid"))) + (aspect (tree->stree (get-env-tree "gr-grid-aspect")))) (and (pair? grid) (pair? aspect) (> (length aspect) 3)))) (tm-define (grid-toggle-show-subunits) @@ -498,361 +626,103 @@ (prop-old (if visual? "gr-grid-old" "gr-edit-grid-old")) (p (cDr (cursor-path))) (gr (get-upwards-property p prop)) - (gr-old (get-upwards-property p prop-old)) - ) - (if (!= gr-old nothing) - (if (or (== gr nothing) - (== (cadr gr) "empty")) - (graphics-set-property prop gr-old) - (graphics-set-property prop '(tuple "empty"))) - (if (!= gr nothing) - (begin - (graphics-set-property prop '(tuple "empty")) - (graphics-set-property prop-old gr)))))) + (gr-old (get-upwards-property p prop-old))) + (if (!= gr-old nothing) + (if (or (== gr nothing) + (== (cadr gr) "empty")) + (graphics-set-property prop gr-old) + (graphics-set-property prop '(tuple "empty"))) + (if (!= gr nothing) + (begin + (graphics-set-property prop '(tuple "empty")) + (graphics-set-property prop-old gr)))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Graphics edit properties +;; Graphics edit mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Graphics edit mode (tm-define (graphics-mode) (with m (tree->stree (get-env-tree "gr-mode")) - (cond ((string? m) + (cond ((string? m) `(edit ,(string->symbol m))) - ((pair? m) - (map string->symbol (cdr m)))))) + ((pair? m) + (map string->symbol (cdr m)))))) (define (graphics-mode-has-value? mode) - (if (string? mode) - (set! mode `(edit ,(string->symbol mode)))) (if (and (pair? mode) (eq? (car mode) 'quote)) (set! mode (cadr mode))) -; FIXME: The parameters of a call inside -; a menu are non evaluated, thus when -; we write (foo '(a b)) in a menu, we -; receive (quote (a b)) as a parameter. -; This is why we had to add the crap (if) -; above... (== mode (graphics-mode))) (tm-define (graphics-set-mode val) (:check-mark "v" graphics-mode-has-value?) (graphics-group-start) - (with old-mode (graphics-mode) - (graphics-enter-mode old-mode val) - (graphics-set-property "gr-mode" - (cond ((string? val) - (list 'tuple "edit" val)) - ((symbol? val) - (list 'tuple "edit" (sy2s val))) - ((pair? val) - (set! val (map symbol->string val)) - (cons 'tuple val)))))) + (graphics-enter-mode (graphics-mode) val) + (graphics-set-property "gr-mode" `(tuple ,@(map symbol->string val)))) (tm-define (graphics-group-mode? mode) - (and (pair? mode) (eq? (car mode) 'group-edit))) + (func? mode 'group-edit 1)) -;; Graphics current edit properties -(define (opacity-has-value? opacity) - (== opacity (graphics-get-property "gr-opacity"))) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Attributes for graphical objects +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define (graphics-test-property? var) + (lambda (val) + (or (== val (graphics-get-property var)) + (and (== (graphics-get-property var) "default") + (== val (graphics-attribute-default var)))))) (tm-define (graphics-set-opacity val) (:argument val "Opacity") - (:check-mark "*" opacity-has-value?) - (graphics-change-property "gr-opacity" val)) - -(define (color-has-value? color) - (== color (graphics-get-property "gr-color"))) + (:check-mark "*" (graphics-test-property? "gr-opacity")) + (graphics-set-property "gr-opacity" val)) (tm-define (graphics-set-color val) (:argument val "Color") - (:check-mark "*" color-has-value?) - (graphics-change-property "gr-color" val)) - -(define (point-style-has-value? val) - (== val (graphics-get-property "gr-point-style"))) + (:check-mark "*" (graphics-test-property? "gr-color")) + (graphics-set-property "gr-color" val)) (tm-define (graphics-set-point-style val) (:argument val "Point style") - (:check-mark "*" point-style-has-value?) - (graphics-change-property "gr-point-style" val)) - -(define (line-width-has-value? val) - (== val (graphics-get-property "gr-line-width"))) + (:check-mark "*" (graphics-test-property? "gr-point-style")) + (graphics-set-property "gr-point-style" val)) (tm-define (graphics-set-line-width val) (:argument val "Line width") - (:check-mark "*" line-width-has-value?) - (graphics-change-property "gr-line-width" val)) - -(define (convert-dash-style val) - (define (convert-1 ch) - (if (or (eq? ch #\0) (eq? ch #\space)) "0" "1")) - (if (and (string? val) (not (equal? val ""))) - (cons 'tuple (map convert-1 (string->list val))) - 'none)) - -(define (dash-style-has-value? val) - (with sty (graphics-get-property "gr-dash-style") - (if (string? sty) - (== val sty) - (== (convert-dash-style val) sty)))) + (:check-mark "*" (graphics-test-property? "gr-line-width")) + (graphics-set-property "gr-line-width" val)) (tm-define (graphics-set-dash-style val) (:argument val "Dash style") - (:check-mark "*" dash-style-has-value?) - (graphics-change-property - "gr-dash-style" - (if (== val "default") - "default" - (convert-dash-style val)))) - -(tm-define (decode-dash x) - (cond ((== x "default") "---") - ((== x '(tuple "1" "0")) ". . . . .") - ((== x '(tuple "1" "1" "1" "0" "0")) "- - - - -") - ((== x '(tuple "1" "1" "1" "1" "0" "1" "0")) "- . - . -") - (else "other"))) - -(define (dash-style-unit-has-value? val) - (== val (graphics-get-property "gr-dash-style-unit"))) + (:check-mark "*" (graphics-test-property? "gr-dash-style")) + (graphics-set-property "gr-dash-style" val)) (tm-define (graphics-set-dash-style-unit val) (:argument val "Dash style unit") - (:check-mark "*" dash-style-unit-has-value?) - (graphics-change-property "gr-dash-style-unit" val)) - -(define (fill-color-has-value? color) - (== color (graphics-get-property "gr-fill-color"))) + (:check-mark "*" (graphics-test-property? "gr-dash-style-unit")) + (graphics-set-property "gr-dash-style-unit" val)) (tm-define (graphics-set-fill-color val) (:argument val "Fill color") - (:check-mark "*" fill-color-has-value?) - (graphics-change-property "gr-fill-color" val)) - -(define default-line-arrows - ;; REMARK: the points of the arrow are specified - ;; in absolute coordinates using tuples. Alternatively, - ;; one might include the arrows in a (with "gr-frame" ...) tag, - ;; but this does not yet work due to incorrect frame retrieval - ;; in edit_graphics.cpp. - #("none" - (tuple - (with "dash-style" "none" - (line (tuple "-10ln" "6ln") (tuple "0ln" "0ln") - (tuple "-10ln" "-6ln")))) - (tuple - (with "dash-style" "none" - (line (tuple "10ln" "6ln") (tuple "0ln" "0ln") - (tuple "10ln" "-6ln"))) - (with "dash-style" "none" - (line (tuple "-10ln" "6ln") (tuple "0ln" "0ln") - (tuple "-10ln" "-6ln")))))) - -(define (line-arrows-has-value? arrows) - (with gr-arrows (graphics-get-property "gr-line-arrows") - (if (pair? gr-arrows) - ; FIXME: Shitty workaround around the bug... - (set-car! (cddadr gr-arrows) "none")) - (if (number? arrows) - (== (vector-ref default-line-arrows arrows) gr-arrows) - (== arrows gr-arrows)))) - -(tm-define (graphics-set-line-arrows arrows) - (:argument val "Arrows") - (:check-mark "*" line-arrows-has-value?) - (cond ((string? arrows) - (graphics-change-property "gr-line-arrows" arrows)) - ((integer? arrows) - (graphics-change-property - "gr-line-arrows" - (vector-ref default-line-arrows arrows))) - ((pair? arrows) - (graphics-change-property "gr-line-arrows" arrows)))) - -(tm-define (decode-arrows val) - (cond ((== val "default") "---") - ((== val (vector-ref default-line-arrows 0)) "---") - ((== val (vector-ref default-line-arrows 1)) "--->") - ((== val (vector-ref default-line-arrows 2)) "<--->") - (else "other"))) + (:check-mark "*" (graphics-test-property? "gr-fill-color")) + (graphics-set-property "gr-fill-color" val)) -(define (text-at-halign-has-value? val) - (== val (graphics-get-property "gr-text-at-halign"))) +(tm-define (graphics-set-arrow-begin val) + (:argument val "Left arrow") + (:check-mark "*" (graphics-test-property? "gr-arrow-begin")) + (graphics-set-property "gr-arrow-begin" val)) + +(tm-define (graphics-set-arrow-end val) + (:argument val "Right arrow") + (:check-mark "*" (graphics-test-property? "gr-arrow-end")) + (graphics-set-property "gr-arrow-end" val)) -(tm-define (graphics-set-textat-halign val) +(tm-define (graphics-set-text-at-halign val) (:argument val "Text-at horizontal alignment") - (:check-mark "*" text-at-halign-has-value?) - (graphics-change-property "gr-text-at-halign" val)) + (:check-mark "*" (graphics-test-property? "gr-text-at-halign")) + (graphics-set-property "gr-text-at-halign" val)) -(define (text-at-valign-has-value? val) - (== val (graphics-get-property "gr-text-at-valign"))) - -(tm-define (graphics-set-textat-valign val) +(tm-define (graphics-set-text-at-valign val) (:argument val "Text-at vertical alignment") - (:check-mark "*" text-at-valign-has-value?) - (graphics-change-property "gr-text-at-valign" val)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Global properties of graphics -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(tm-define (graphics-geometry) - (with geo (tree->stree (get-env-tree "gr-geometry")) - (if (match? geo '(tuple "geometry" :%2)) - (append geo '("center")) - (if (match? geo '(tuple "geometry" :%3)) - geo - '(tuple "geometry" "1par" "0.6par" "center"))))) - -(tm-define (graphics-set-width w) - (:argument w "Width of the graphics") - (let* ((geo (graphics-geometry)) - (align (if (>= (length geo) 5) (cAr geo) "center")) - (new-geo `(tuple "geometry" ,w ,(cadddr geo) ,align)) - ) - (graphics-set-property "gr-geometry" new-geo))) - -(tm-define (graphics-set-height h) - (:argument h "Height of the graphics") - (let* ((geo (graphics-geometry)) - (align (if (>= (length geo) 5) (cAr geo) "center")) - (new-geo `(tuple "geometry" ,(caddr geo) ,h ,align)) - ) - (graphics-set-property "gr-geometry" new-geo))) - -(define (geo-valign-has-value? val) - (let* ((geo (graphics-geometry)) - (align (car (cddddr geo))) - ) - (== val align))) - -(tm-define (graphics-set-geo-valign a) - (:argument a "Alignment of the graphics") - (:check-mark "*" geo-valign-has-value?) - (let* ((geo (graphics-geometry)) - (new-geo `(tuple "geometry" ,(caddr geo) ,(cadddr geo) ,a)) - ) - (graphics-set-property "gr-geometry" new-geo))) - -(tm-define (graphics-set-extents w h) - (:argument w "Width of the graphics") - (:argument h "Height of the graphics") - (let* ((geo (graphics-geometry)) - (align (if (>= (length geo) 5) (cAr geo) "center")) - (new-geo `(tuple "geometry" ,w ,h ,align)) - ) - (graphics-set-property "gr-geometry" new-geo))) - -(tm-define (graphics-cartesian-frame) - (with frame (tree->stree (get-env-tree "gr-frame")) - (if (match? frame '(tuple "scale" :%2)) - frame - '(tuple "scale" "1cm" (tuple "0.5par" "0cm"))))) - -(define (graphics-unit-has-value? val) - (let* ((fr (graphics-cartesian-frame)) - (unit (caddr fr)) - ) - (== val unit))) - -(tm-define (graphics-set-unit u) - (:argument u "Graphical unit") - (:check-mark "*" graphics-unit-has-value?) - (with frame (graphics-cartesian-frame) - (with new-frame `(tuple "scale" ,u ,(cAr frame)) - (graphics-set-property "gr-frame" new-frame)))) - -(define (graphics-origin-has-value? x y) - (let* ((fr (graphics-cartesian-frame)) - (orig (cAr fr)) - ) - (if (pair? x) - (set! x (length-add (cadr x) (caddr x)))) - (if (pair? y) - (set! y (length-add (cadr y) (caddr y)))) - ; FIXME: The 2 (if)s above lack perfection... - (== `(tuple ,x ,y) orig))) - -(tm-define (graphics-set-origin x y) - (:argument x "Origin's x-coordinate") - (:argument y "Origin's y-coordinate") - (:check-mark "*" graphics-origin-has-value?) - (with frame (graphics-cartesian-frame) - (with new-frame (append (cDr frame) `((tuple ,x ,y))) - (graphics-set-property "gr-frame" new-frame)))) - -(tm-define (length-extract-unit len) - (define l (reverse (string->list len))) - (define (traverse l) - (if (pair? l) - (if (char-alphabetic? (car l)) - (traverse (cdr l)) - (set-cdr! l '()))) - ) - (traverse l) - (set! l (reverse l)) - (if (and (pair? l) (not (char-alphabetic? (car l)))) - (set! l (cdr l)) - ) - (list->string l)) ;; TODO: Move this in the utils (?) - -(tm-define (graphics-zoom e) - (let* ((fr (graphics-cartesian-frame)) - (u (caddr fr)) - (newu (length-mult e u)) - (newud (length-decode newu)) - (newfr `(tuple "scale" ,newu ,(cAr fr))) - ) - (if (and (> newud 100) (< newud 10000000)) - (with magn (multiply-magnification - (graphics-get-property "magnification") e) - (graphics-decorations-reset) - (graphics-set-property "gr-frame" newfr) - (if magn - (graphics-set-property "magnification" magn)))))) - -(tm-define (graphics-move-origin dx dy) - (define (add l1 l2) - (if (pair? l1) - `(tmlen ,(f2s (+ (s2f (cadr l1)) (length-decode l2)))) - (length-add l1 l2)) - ) - (let* ((fr (graphics-cartesian-frame)) - (x (cadr (cadddr fr))) - (y (caddr (cadddr fr))) - (newfr `(tuple "scale" ,(caddr fr) - (tuple ,(add x dx) - ,(add y dy)))) - ) - (graphics-decorations-reset) - (graphics-set-property "gr-frame" newfr))) - -(tm-define (graphics-change-extents dw dh) - (let* ((geo (graphics-geometry)) - (w (caddr geo)) - (h (cadddr geo)) - (w2 (length-add w dw)) - (h2 (length-add h dh)) - ) - (if (> (length-decode w2) 0) - (set! w w2)) - (if (> (length-decode h2) 0) - (set! h h2)) - (graphics-decorations-reset) - (graphics-set-extents w h))) - -(tm-define (graphics-change-geo-valign dirn) - (let* ((geo (graphics-geometry)) - (a (car (cddddr geo))) - ) - (graphics-set-geo-valign - (if dirn - (cond ((== a "top") "bottom") - ((== a "center") "top") - ((== a "bottom") "center") - (else "default")) - (cond ((== a "top") "center") - ((== a "center") "bottom") - ((== a "bottom") "top") - (else "default")))))) + (:check-mark "*" (graphics-test-property? "gr-text-at-valign")) + (graphics-set-property "gr-text-at-valign" val)) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-menu.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-menu.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-menu.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-menu.scm 2011-10-06 19:36:35.000000000 +0000 @@ -12,7 +12,9 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (texmacs-module (graphics graphics-menu) - (:use (graphics graphics-edit))) + (:use (graphics graphics-env) + (graphics graphics-main) + (graphics graphics-edit))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Submenus @@ -20,31 +22,96 @@ ;; FIXME: provide automatic checkmarks for these actions -(menu-bind graphics-geometry-menu - (-> "Extents" - ("Default" (graphics-remove-property "gr-geometry")) - --- - ("Width" (interactive graphics-set-width)) - ("Height" (interactive graphics-set-height)) - (-> "Alignment" - ("Top" (graphics-set-geo-valign "top")) - ("Center" (graphics-set-geo-valign "center")) - ("Bottom" (graphics-set-geo-valign "bottom")))) - (-> "Frame" - ("Default" (graphics-remove-property "gr-frame")) - --- - (group "Cartesian") - (-> "Unit" - ("1 cm" (graphics-set-unit "1cm")) - ("1 inch" (graphics-set-unit "1in")) - --- - ("Other" (interactive graphics-set-unit))) - (-> "Origin" - ("Centered" (graphics-set-origin "0.5gw" "0.5gh")) - ("Baseline" (graphics-set-origin "0cm" "0.5gh")) - ("Axis" (graphics-set-origin "0cm" (length-add "0.5gh" "1yfrac"))) - --- - ("Other" (interactive graphics-set-origin))))) +(menu-bind graphics-extents-menu + ("Width" (interactive graphics-set-width)) + ("Height" (interactive graphics-set-height))) + +(menu-bind graphics-auto-crop-menu + ("Crop" (graphics-toggle-auto-crop)) + --- + (when (graphics-auto-crop?) + (group "Padding") + ("none" (graphics-set-crop-padding "0spc")) + ("1 spc" (graphics-set-crop-padding "1spc")) + ("1 em" (graphics-set-crop-padding "1em")) + --- + ("Other" (interactive graphics-set-crop-padding)))) + +(menu-bind graphics-alignment-menu + ("Top" (graphics-set-geo-valign "top")) + ("Axis" (graphics-set-geo-valign "axis")) + ("Center" (graphics-set-geo-valign "center")) + ("Bottom" (graphics-set-geo-valign "bottom"))) + +(menu-bind graphics-resize-menu + (group "Width") + ("Fast decrease" (graphics-change-extents "-1cm" "0cm")) + ("Slow decrease" (graphics-change-extents "-0.1cm" "0cm")) + ("Slow increase" (graphics-change-extents "+0.1cm" "0cm")) + ("Fast increase" (graphics-change-extents "+1cm" "0cm")) + --- + (group "Height") + ("Fast decrease" (graphics-change-extents "0cm" "-1cm")) + ("Slow decrease" (graphics-change-extents "0cm" "-0.1cm")) + ("Slow increase" (graphics-change-extents "0cm" "+0.1cm")) + ("Fast increase" (graphics-change-extents "0cm" "+1cm"))) + +(menu-bind graphics-frame-unit-menu + ("1 cm" (graphics-set-unit "1cm")) + ("1 inch" (graphics-set-unit "1in")) + ;;("5 em" (graphics-set-unit "5em")) + --- + ("Other" (interactive graphics-set-unit))) + +(menu-bind graphics-frame-origin-menu + ("Center" (graphics-set-origin "0.5gw" "0.5gh")) + ("Left top" (graphics-set-origin "0gw" "1gh")) + ("Left axis" (graphics-set-origin "0gw" (length-add "0.5gh" "1yfrac"))) + ("Left center" (graphics-set-origin "0gw" "0.5gh")) + ("Left bottom" (graphics-set-origin "0gw" "0gh")) + --- + ("Other" (interactive graphics-set-origin))) + +(menu-bind graphics-move-menu + (group "Slow") + ("Left" (graphics-move-origin "+0.01gw" "0gh")) + ("Right" (graphics-move-origin "-0.01gw" "0gh")) + ("Down" (graphics-move-origin "0gw" "+0.01gh")) + ("Up" (graphics-move-origin "0gw" "-0.01gh")) + --- + (group "Fast") + ("Left" (graphics-move-origin "+0.1gw" "0gh")) + ("Right" (graphics-move-origin "-0.1gw" "0gh")) + ("Down" (graphics-move-origin "0gw" "+0.1gh")) + ("Up" (graphics-move-origin "0gw" "-0.1gh"))) + +(menu-bind graphics-zoom-menu + ("Zoom in" (graphics-zoom 1.189207115)) + ("Zoom out" (graphics-zoom 0.840896415)) + --- + ("10%" (graphics-set-zoom 0.1)) + ("25%" (graphics-set-zoom 0.25)) + ("50%" (graphics-set-zoom 0.5)) + ("75%" (graphics-set-zoom 0.75)) + ("100%" (graphics-set-zoom 1.0)) + ("150%" (graphics-set-zoom 1.5)) + ("200%" (graphics-set-zoom 2.0)) + ("300%" (graphics-set-zoom 3.0)) + ("400%" (graphics-set-zoom 4.0)) + ("500%" (graphics-set-zoom 5.0)) + ("1000%" (graphics-set-zoom 10.0))) + +(menu-bind graphics-global-menu + (group "Graphics") + (-> "Size" (link graphics-extents-menu)) + (-> "Resize" (link graphics-resize-menu)) + (-> "Crop" (link graphics-auto-crop-menu)) + (-> "Alignment" (link graphics-alignment-menu)) + --- + (-> "Unit" (link graphics-frame-unit-menu)) + (-> "Origin" (link graphics-frame-origin-menu)) + (-> "Move" (link graphics-move-menu)) + (-> "Zoom" (link graphics-zoom-menu))) (menu-bind graphics-visual-grid-menu (-> "Type" @@ -191,14 +258,15 @@ (link graphics-visual-grid-menu)) (menu-bind graphics-mode-menu - ("Point" (graphics-set-mode "point")) - ("Line" (graphics-set-mode "line")) - ("Polygon" (graphics-set-mode "cline")) - ("Spline" (graphics-set-mode "spline")) - ("Closed spline" (graphics-set-mode "cspline")) - ("Arc" (graphics-set-mode "arc")) - ("Circle" (graphics-set-mode "carc")) - ("Text box" (graphics-set-mode "text-at")) + ("Point" (graphics-set-mode '(edit point))) + ("Line" (graphics-set-mode '(edit line))) + ("Polygon" (graphics-set-mode '(edit cline))) + ("Spline" (graphics-set-mode '(edit spline))) + ("Closed spline" (graphics-set-mode '(edit cspline))) + ("Arc" (graphics-set-mode '(edit arc))) + ("Circle" (graphics-set-mode '(edit carc))) + ("Text" (graphics-set-mode '(edit text-at))) + ("Mathematics" (graphics-set-mode '(edit math-at))) --- ("Set properties" (graphics-set-mode '(group-edit props))) ("Move objects" (graphics-set-mode '(group-edit move))) @@ -207,8 +275,7 @@ ("Group/ungroup" (graphics-set-mode '(group-edit group-ungroup)))) (menu-bind graphics-opacity-menu - ("Default" (graphics-set-opacity "default")) - --- + ("0%" (graphics-set-opacity "0%")) ("10%" (graphics-set-opacity "10%")) ("20%" (graphics-set-opacity "20%")) ("30%" (graphics-set-opacity "30%")) @@ -218,6 +285,7 @@ ("70%" (graphics-set-opacity "70%")) ("80%" (graphics-set-opacity "80%")) ("90%" (graphics-set-opacity "90%")) + ("100%" (graphics-set-opacity "100%")) --- ("Other" (interactive graphics-set-opacity))) @@ -286,8 +354,8 @@ (group "Style") ;;("Default" (graphics-set-dash-style "default")) ;;-- - ("---" (graphics-set-dash-style "default")) - (". . . . ." (graphics-set-dash-style "10")) + ("-----" (graphics-set-dash-style "default")) + (". . . . ." (graphics-set-dash-style "10")) ("- - - - -" (graphics-set-dash-style "11100")) ("- . - . -" (graphics-set-dash-style "1111010")) ;;--- @@ -303,12 +371,27 @@ ("Other" (interactive graphics-set-dash-style-unit))) (menu-bind graphics-line-arrows-menu - ;;("Default" (graphics-set-line-arrows "default")) - ;;--- - ;;("---" (graphics-set-line-arrows 0)) - ("---" (graphics-set-line-arrows "default")) - ("--->" (graphics-set-line-arrows 1)) - ("<--->" (graphics-set-line-arrows 2))) + (group "Right arrow") + ("None" (graphics-set-arrow-end "default")) + ("--->" (graphics-set-arrow-end "")) + ("---|>" (graphics-set-arrow-end "|")) + ("--->>" (graphics-set-arrow-end "")) + ("---<" (graphics-set-arrow-end "")) + ("---<|" (graphics-set-arrow-end "|")) + ("---<<" (graphics-set-arrow-end "")) + ("---|" (graphics-set-arrow-end "|")) + ("---o" (graphics-set-arrow-end "o")) + --- + (group "Left arrow") + ("None" (graphics-set-arrow-begin "default")) + ("<---" (graphics-set-arrow-begin "")) + ("<|---" (graphics-set-arrow-begin "|")) + ("<<---" (graphics-set-arrow-begin "")) + (">---" (graphics-set-arrow-begin "")) + ("|>---" (graphics-set-arrow-begin "|")) + (">>---" (graphics-set-arrow-begin "")) + ("|---" (graphics-set-arrow-begin "|")) + ("o---" (graphics-set-arrow-begin "o"))) (menu-bind graphics-fill-color-menu ;;("Default" (graphics-set-fill-color "default")) @@ -322,58 +405,44 @@ ("Other" (interactive graphics-set-fill-color))) (menu-bind graphics-text-halign-menu - ;;("Default" (graphics-set-textat-halign "default")) + ;;("Default" (graphics-set-text-at-halign "default")) ;;--- - ;;("Left" (graphics-set-textat-halign "left")) - ("Left" (graphics-set-textat-halign "default")) - ("Center" (graphics-set-textat-halign "center")) - ("Right" (graphics-set-textat-halign "right"))) + ;;("Left" (graphics-set-text-at-halign "left")) + ("Left" (graphics-set-text-at-halign "default")) + ("Center" (graphics-set-text-at-halign "center")) + ("Right" (graphics-set-text-at-halign "right"))) (menu-bind graphics-text-valign-menu - ;;("Default" (graphics-set-textat-valign "default")) + ;;("Default" (graphics-set-text-at-valign "default")) ;;--- - ("Bottom" (graphics-set-textat-valign "bottom")) - ;;("Base" (graphics-set-textat-valign "base")) - ("Base" (graphics-set-textat-valign "default")) - ("Center" (graphics-set-textat-valign "center")) - ("Top" (graphics-set-textat-valign "top"))) - -(menu-bind graphics-enable-change-properties-menu - ("Color" (graphics-toggle-color-enabled)) - ("Fill color" (graphics-toggle-fill-color-enabled)) - (assuming (== (get-preference "experimental alpha") "on") - ("Opacity" (graphics-toggle-opacity-enabled))) - ("Point style" (graphics-toggle-point-style-enabled)) - ("Line width" (graphics-toggle-line-width-enabled)) - ("Dash style" (graphics-toggle-dash-style-enabled)) - ("Dash unit" (graphics-toggle-dash-style-unit-enabled)) - ("Line arrows" (graphics-toggle-line-arrows-enabled)) - ("Text box horizontal alignment" (graphics-toggle-textat-halign-enabled)) - ("Text box vertical alignment" (graphics-toggle-textat-valign-enabled))) + ("Bottom" (graphics-set-text-at-valign "bottom")) + ;;("Base" (graphics-set-text-at-valign "base")) + ("Base" (graphics-set-text-at-valign "default")) + ("Axis" (graphics-set-text-at-valign "axis")) + ("Center" (graphics-set-text-at-valign "center")) + ("Top" (graphics-set-text-at-valign "top"))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Menus for graphics mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (menu-bind graphics-insert-menu - (-> "Geometry" (link graphics-geometry-menu)) + (-> "Geometry" (link graphics-global-menu)) (-> "Grids" (link graphics-grids-menu)) --- - (link graphics-mode-menu) - ;;(-> "Enable change" (link graphics-enable-change-properties-menu)) - ) + (link graphics-mode-menu)) (menu-bind graphics-focus-menu (-> (eval (upcase-first (gr-mode->string (graphics-mode)))) (link graphics-mode-menu)) - (assuming (func? (graphics-mode) 'edit) + (assuming (nnull? (graphics-mode-attributes (graphics-mode))) --- (assuming (graphics-mode-attribute? (graphics-mode) "color") (-> "Color" (link graphics-color-menu))) (assuming (graphics-mode-attribute? (graphics-mode) "fill-color") (-> "Fill color" (link graphics-fill-color-menu))) - (assuming (== (get-preference "experimental alpha") "on") - (assuming (graphics-mode-attribute? (graphics-mode) "opacity") + (assuming (graphics-mode-attribute? (graphics-mode) "opacity") + (assuming (== (get-preference "experimental alpha") "on") (-> "Opacity" (link graphics-opacity-menu)))) (assuming (graphics-mode-attribute? (graphics-mode) "point-style") (-> "Point style" (link graphics-point-style-menu))) @@ -381,7 +450,9 @@ (-> "Line width" (link graphics-line-width-menu))) (assuming (graphics-mode-attribute? (graphics-mode) "dash-style") (-> "Line dashes" (link graphics-dash-menu))) - (assuming (graphics-mode-attribute? (graphics-mode) "line-arrows") + (assuming + (or (graphics-mode-attribute? (graphics-mode) "arrow-begin") + (graphics-mode-attribute? (graphics-mode) "arrow-end")) (-> "Line arrows" (link graphics-line-arrows-menu))) (assuming (graphics-mode-attribute? (graphics-mode) "text-at-halign") (-> "Horizontal alignment" (link graphics-text-halign-menu))) @@ -394,7 +465,7 @@ (tm-menu (graphics-global-icons) (=> (balloon (icon "tm_graphics_geometry.xpm") "Graphics geometry") - (link graphics-geometry-menu)) + (link graphics-global-menu)) (=> (balloon (icon "tm_graphics_grid.xpm") "Graphics grids") (link graphics-grids-menu))) @@ -403,32 +474,33 @@ ;; (link graphics-mode-menu)) ((check (balloon (icon "tm_point_mode.xpm") "Insert points") "v" (== (graphics-mode) '(edit point))) - (graphics-set-mode "point")) + (graphics-set-mode '(edit point))) ((check (balloon (icon "tm_line_mode.xpm") "Insert lines") "v" (== (graphics-mode) '(edit line))) - (graphics-set-mode "line")) + (graphics-set-mode '(edit line))) ((check (balloon (icon "tm_cline_mode.xpm") "Insert polygons") "v" (== (graphics-mode) '(edit cline))) - (graphics-set-mode "cline")) + (graphics-set-mode '(edit cline))) ((check (balloon (icon "tm_spline_mode.xpm") "Insert splines") "v" (== (graphics-mode) '(edit spline))) - (graphics-set-mode "spline")) + (graphics-set-mode '(edit spline))) ((check (balloon (icon "tm_cspline_mode.xpm") "Insert closed splines") "v" (== (graphics-mode) '(edit cspline))) - (graphics-set-mode "cspline")) + (graphics-set-mode '(edit cspline))) ((check (balloon (icon "tm_arc_mode.xpm") "Insert arcs") "v" (== (graphics-mode) '(edit arc))) - (graphics-set-mode "arc")) + (graphics-set-mode '(edit arc))) ((check (balloon (icon "tm_carc_mode.xpm") "Insert circles") "v" (== (graphics-mode) '(edit carc))) - (graphics-set-mode "carc")) - ((check (balloon (icon "tm_textat_mode.xpm") "Insert text boxes") + (graphics-set-mode '(edit carc))) + ((check (balloon (icon "tm_textat_mode.xpm") "Insert text") "v" (== (graphics-mode) '(edit text-at))) - (graphics-set-mode "text-at"))) + (graphics-set-mode '(edit text-at))) + ((check (balloon (icon "tm_math.xpm") "Insert mathematics") + "v" (== (graphics-mode) '(edit math-at))) + (graphics-set-mode '(edit math-at)))) (tm-menu (graphics-group-property-icons) - ;;(=> (balloon (icon "tm_toggle_change_props.xpm") "Enable change property") - ;; (link graphics-enable-change-properties-menu)) ((check (balloon (icon "tm_edit_props.xpm") "Change objects properties") "v" (== (graphics-mode) '(group-edit props))) (graphics-set-mode '(group-edit props)))) @@ -493,42 +565,42 @@ (s (if (== ps "default") "disk" ps))) (=> (eval s) (link graphics-point-style-menu))))) - (assuming (graphics-mode-attribute? (graphics-mode) "line-width") + (assuming + (or (graphics-mode-attribute? (graphics-mode) "line-width") + (graphics-mode-attribute? (graphics-mode) "dash-style")) / (mini #t - (group "Line width:") + (group "Line style:") (let* ((lw (graphics-get-property "gr-line-width")) (s (if (== lw "default") "1ln" lw))) (=> (eval s) - (link graphics-line-width-menu))))) - (assuming (graphics-mode-attribute? (graphics-mode) "dash-style") - / - (mini #t - (group "Dash:") + (link graphics-line-width-menu))) (let* ((dash (graphics-get-property "gr-dash-style")) (s (decode-dash dash))) (=> (eval s) (link graphics-dash-menu))))) - (assuming (graphics-mode-attribute? (graphics-mode) "line-arrows") + (assuming + (or (graphics-mode-attribute? (graphics-mode) "arrow-begin") + (graphics-mode-attribute? (graphics-mode) "arrow-end")) / (mini #t (group "Arrows:") - (let* ((arrows (graphics-get-property "gr-line-arrows")) - (s (decode-arrows arrows))) + (let* ((arrow-begin (graphics-get-property "gr-arrow-begin")) + (arrow-end (graphics-get-property "gr-arrow-end")) + (s (string-append (decode-arrow arrow-begin) + "---" + (decode-arrow arrow-end)))) (=> (eval s) (link graphics-line-arrows-menu))))) - (assuming (graphics-mode-attribute? (graphics-mode) "text-at-halign") + (assuming (or (graphics-mode-attribute? (graphics-mode) "text-at-halign") + (graphics-mode-attribute? (graphics-mode) "text-at-valign")) / (mini #t - (group "Horizontal alignment:") + (group "Alignment:") (let* ((al (graphics-get-property "gr-text-at-halign")) (s (if (== al "default") "left" al))) (=> (eval s) - (link graphics-text-halign-menu))))) - (assuming (graphics-mode-attribute? (graphics-mode) "text-at-halign") - / - (mini #t - (group "Vertical alignment:") + (link graphics-text-halign-menu))) (let* ((al (graphics-get-property "gr-text-at-valign")) (s (if (== al "default") "base" al))) (=> (eval s) @@ -543,6 +615,7 @@ ((== s '(edit arc)) "arc") ((== s '(edit carc)) "circle") ((== s '(edit text-at)) "text") + ((== s '(edit math-at)) "mathematics") ((== s '(group-edit props)) "properties") ((== s '(group-edit move)) "move") ((== s '(group-edit zoom)) "resize") @@ -563,4 +636,5 @@ (=> (balloon (eval (upcase-first (gr-mode->string (graphics-mode)))) "Current graphical mode") (link graphics-mode-menu))) - (link graphics-property-icons)) + (assuming (nnull? (graphics-mode-attributes (graphics-mode))) + (link graphics-property-icons))) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-object.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-object.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-object.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-object.scm 2011-10-06 09:15:23.000000000 +0000 @@ -13,8 +13,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (texmacs-module (graphics graphics-object) - (:use (utils library cursor) (utils library tree) - (graphics graphics-utils))) + (:use (graphics graphics-utils))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Subroutines for calculating with the graphical object @@ -25,7 +24,7 @@ (define (graphics-norm p1 p2) (let ((x (- (s2f (cadr p2)) (s2f (cadr p1)))) (y (- (s2f (caddr p2)) (s2f (caddr p1))))) - (sqrt (+ (* x x) (* y y))))) + (sqrt (+ (* x x) (* y y))))) (define infinity (/ 1.0 0.0)) (define (is-point? p) @@ -34,29 +33,29 @@ (define (graphics-closest-point-pos-bis p l) (if (null? l) '() - (let ((n1 (if (is-point? (car l)) - (graphics-norm p (car l)) - infinity))) - (if (null? (cdr l)) - l - (let* ((p2 (graphics-closest-point-pos-bis p (cdr l))) - (n2 (if (is-point? (car p2)) - (graphics-norm p (car p2)) - infinity))) - (if (<= n1 n2) l p2)))))) + (let ((n1 (if (is-point? (car l)) + (graphics-norm p (car l)) + infinity))) + (if (null? (cdr l)) + l + (let* ((p2 (graphics-closest-point-pos-bis p (cdr l))) + (n2 (if (is-point? (car p2)) + (graphics-norm p (car p2)) + infinity))) + (if (<= n1 n2) l p2)))))) (define (graphics-closest-point-pos p l) (- (length l) (length (graphics-closest-point-pos-bis p l)))) -(define (object-closest-point-pos obj x y) - ;(display* "obj(" x ", " y ")=" obj "\n") +(tm-define (object-closest-point-pos obj x y) + ;;(display* "obj(" x ", " y ")=" obj "\n") (if (pair? obj) (with type (car obj) - (if (== type 'point) - 0 - (if (not (in? (car obj) gr-tags-noncurves)) - (graphics-closest-point-pos (list 'point x y) (cdr obj)) - 0))) + (if (== type 'point) + 0 + (if (not (in? (car obj) gr-tags-noncurves)) + (graphics-closest-point-pos (list 'point x y) (cdr obj)) + 0))) 0)) (tm-define (points-dist< p1 p2 eps) @@ -66,47 +65,28 @@ (let* ((x1 (s2f (cadr p1))) (y1 (s2f (caddr p1))) (x2 (s2f (cadr p2))) - (y2 (s2f (caddr p2))) - ) - (< (+ (* (- x2 x1) (- x2 x1)) (* (- y2 y1) (- y2 y1))) (* eps eps)))) + (y2 (s2f (caddr p2)))) + (< (+ (* (- x2 x1) (- x2 x1)) (* (- y2 y1) (- y2 y1))) (* eps eps)))) ;; Graphical object (tm-define default-color-go-points "#4040ff") (tm-define default-color-selected-points "#ff6060") -(tm-define graphical-opacity "default") -(tm-define graphical-color "default") -(tm-define graphical-pstyle "default") -(tm-define graphical-lwidth "default") -(tm-define graphical-magnification "default") -(tm-define graphical-lstyle "default") -(tm-define graphical-lstyle-unit "default") -(tm-define graphical-larrows "default") -(tm-define graphical-fcolor "default") -(tm-define graphical-textat-halign "default") -(tm-define graphical-textat-valign "default") + +(tm-define graphical-attrs + (with t (make-ahash-table) + (for (var (graphics-all-attributes)) + (ahash-set! t var "default")) + t)) (tm-define (graphical-fetch-props o) - (set! graphical-opacity (find-prop o "opacity" "default")) - (set! graphical-color (find-prop o "color" "default")) - (set! graphical-pstyle (find-prop o "point-style" "default")) - (set! graphical-lwidth (find-prop o "line-width" "default")) - (set! graphical-magnification (find-prop o "magnification" "default")) - (set! graphical-lstyle (find-prop o "dash-style" "default")) - (set! graphical-lstyle-unit - (find-prop o "dash-style-unit" "default")) - (set! graphical-larrows (find-prop o "line-arrows" "default")) - (set! graphical-fcolor (find-prop o "fill-color" "default")) - (set! graphical-textat-halign - (find-prop o "text-at-halign" "default")) - (set! graphical-textat-valign - (find-prop o "text-at-valign" "default"))) + (for (var (graphics-all-attributes)) + (ahash-set! graphical-attrs var (find-prop o var "default")))) (tm-define (graphical-object fetch) ; FIXME: Remove this (tree->stree) should give more speed, but I'm not sure ; about what is the best way now. Then, directly plug the tree and test ; the new version of (find-prop) that works directly on trees. (with o (tree->stree (get-graphical-object)) - ;(display* "o=" o "\n") (if (and fetch (pair? o)) (graphical-fetch-props o)) (if (pair? o) @@ -114,7 +94,7 @@ '(concat)))) (tm-define (graphical-object! obj) - ;(display "graphical object!=")(write obj)(display "\n") + ;;(display* "obj= " obj "\n") (set-graphical-object (stree->tree obj))) ;; Graphical props @@ -137,196 +117,94 @@ ;; the one located at cursor) ; ;; -> 'basic <=> if sticky-point => 'active ;; otherwise => current-path. + (define (dv var val) (if (== val "default") (get-default-val var) - val) -) + val)) + (tm-define (get-graphical-prop mode prop) (with res - (cond + (cond ((== mode 'basic) (if sticky-point (get-graphical-prop 'active prop) - (get-graphical-prop current-path prop)) - ) + (get-graphical-prop current-path prop))) ((== mode 'active) - (cond - ((== prop "opacity") - graphical-opacity) - ((== prop "color") - graphical-color) - ((== prop "point-style") - graphical-pstyle) - ((== prop "line-width") - graphical-lwidth) - ((== prop "magnification") - graphical-magnification) - ((== prop "dash-style") - graphical-lstyle) - ((== prop "dash-style-unit") - graphical-lstyle-unit) - ((== prop "line-arrows") - graphical-larrows) - ((== prop "fill-color") - graphical-fcolor) - ((== prop "text-at-halign") - graphical-textat-halign) - ((== prop "text-at-valign") - graphical-textat-valign))) + (ahash-ref graphical-attrs prop)) ((list? mode) - (if (== prop "magnification") - (graphics-eval-magnification-at (rcons mode 0)) + (if (== prop "magnify") + (graphics-eval-magnify-at (rcons mode 0)) (graphics-path-property mode prop))) ((== mode 'new) (graphics-get-property (string-append "gr-" prop))) - (else ;(== mode 'default) - (get-default-val (string-append "gr-" prop))) - ) - (dv prop res))) + (else ;;(== mode 'default) + (get-default-val (string-append "gr-" prop)))) + (dv prop res))) (tm-define (create-graphical-props mode ps0) - (let ((op #f) - (color #f) - (ps #f) - (lw #f) - (mag #f) - (st #f) - (stu #f) - (lp #f) - (fc #f) - (ha #f) - (va #f) - ) - (cond - ((== mode 'active) - (set! op graphical-opacity) - (set! color graphical-color) - (set! ps graphical-pstyle) - (set! lw graphical-lwidth) - (set! mag graphical-magnification) - (set! st graphical-lstyle) - (set! stu graphical-lstyle-unit) - (set! lp graphical-larrows) - (set! fc graphical-fcolor) - (set! ha graphical-textat-halign) - (set! va graphical-textat-valign)) - ((list? mode) - (set! op (graphics-path-property mode "opacity")) - (set! color (graphics-path-property mode "color")) - (set! ps (graphics-path-property mode "point-style")) - (set! lw (graphics-path-property mode "line-width")) - (set! mag (graphics-eval-magnification-at (rcons mode 0))) - (set! st (graphics-path-property mode "dash-style")) - (set! stu (graphics-path-property mode "dash-style-unit")) - (set! lp (graphics-path-property mode "line-arrows")) - (set! fc (graphics-path-property mode "fill-color")) - (set! ha (graphics-path-property mode "text-at-halign")) - (set! va (graphics-path-property mode "text-at-valign"))) - ((== mode 'new) - (set! op (graphics-get-property "gr-opacity")) - (set! color (graphics-get-property "gr-color")) - (set! ps (graphics-get-property "gr-point-style")) - (set! lw (graphics-get-property "gr-line-width")) - (set! st (graphics-get-property "gr-dash-style")) - (set! stu (graphics-get-property "gr-dash-style-unit")) - (set! lp (graphics-get-property "gr-line-arrows")) - (set! fc (graphics-get-property "gr-fill-color")) - (set! ha (graphics-get-property "gr-text-at-halign")) - (set! va (graphics-get-property "gr-text-at-valign"))) - ((== mode 'default) - (set! op (get-default-val "gr-opacity")) - (set! color (get-default-val "gr-color")) - (set! ps (get-default-val "gr-point-style")) - (set! lw (get-default-val "gr-line-width")) - (set! st (get-default-val "gr-dash-style")) - (set! stu (get-default-val "gr-dash-style-unit")) - (set! lp (get-default-val "gr-line-arrows")) - (set! fc (get-default-val "gr-fill-color")) - (set! ha (get-default-val "gr-text-at-halign")) - (set! va (get-default-val "gr-text-at-valign"))) - ) - (list 'with "point-style" - (if ps0 ps0 (if ps (dv "point-style" ps) "square")) - "opacity" (dv "opacity" op) - "color" (dv "color" color) - "line-width" (dv "line-width" lw) - (if mag "magnification" "magnification-none") - (dv "magnification" (if mag mag "default")) - "dash-style" (dv "dash-style" st) - "dash-style-unit" (dv "dash-style-unit" stu) - "line-arrows" (dv "line-arrows" lp) - "fill-color" (dv "fill-color" fc) - "text-at-halign" (dv "text-at-halign" ha) - "text-at-valign" (dv "text-at-valign" va)))) + (let ((tab (make-ahash-table)) + (l (graphics-all-attributes))) + (set! l (list-difference l '("gid"))) + (cond + ((== mode 'active) + (for (var l) + (ahash-set! tab var (ahash-ref graphical-attrs var)))) + ((list? mode) + (for (var l) + (ahash-set! tab var (graphics-path-property mode var))) + (ahash-set! tab "magnify" + (graphics-eval-magnify-at (rcons mode 0)))) + ((== mode 'new) + (for (var l) + (ahash-set! tab var (graphics-get-property (gr-prefix var))))) + ((== mode 'default) + (for (var l) + (ahash-set! tab var (graphics-attribute-default var))))) + (with ps (ahash-ref tab "point-style") + (ahash-set! tab "point-style" + (if ps0 ps0 (if ps (dv "point-style" ps) "square")))) + (let* ((l1 (ahash-table->list tab)) + (l2 (map (lambda (x) (list (car x) (dv (car x) (cdr x)))) l1)) + (l3 (apply append l2))) + (cons 'with l3)))) ;; Graphical contours ;;NOTE: This subsection is OK. -(define (create-graphical-embedding-box o ha0 va0 halign valign mag len) - (define (create-haligns l b r t) - (with x (cond ((== halign "left") l) - ((== halign "center") (f2s (/ (+ (s2f l) (s2f r)) 2))) - ((== halign "right") r) - (else l)) - `((line (point ,x ,b) (point ,x ,(f2s (- (s2f b) len)))) - (line (point ,x ,t) (point ,x ,(f2s (+ (s2f t) len)))))) - ) - (define (create-valigns l b r t) - (with y (cond ((== valign "bottom") b) - ((== valign "center") (f2s (/ (+ (s2f b) (s2f t)) 2))) - ((== valign "top") t) - (else b)) - `((line (point ,l ,y) (point ,(f2s (- (s2f l) len)) ,y)) - (line (point ,r ,y) (point ,(f2s (+ (s2f r) len)) ,y)))) - ) - (define (get-textat-vbase b0) - (if (and (eq? (car o) 'text-at) - (equal? va0 "base")) - (begin - (set! o `(with "text-at-halign" ,ha0 - "text-at-valign" "bottom" ,o)) - (let* ((info0 (cdr (box-info o "lbLB"))) - (b (f2s (min (s2f (cadr info0)) (s2f (cadddr info0))))) - ) - (set! o (list-ref o 5)) - b) - ) - b0) - ) - (let* ((o1 (with res (if (in? (car o) '(text-at gr-group)) - `(with "text-at-halign" ,ha0 - "text-at-valign" ,va0 ,o) +(define (create-graphical-embedding-box o ha0 va0 halign valign mag) + (define (create-text-at-handle o) + (cond ((func? o 'with) + (create-text-at-handle (cAr o))) + ((graphical-text-context? o) + `((with "point-style" "disk" + ,(cAr o)))) + (else '()))) + (let* ((o1 (with res (if (or (graphical-text-context? o) + (== (car o) 'gr-group)) + `(with "text-at-halign" ,ha0 + "text-at-valign" ,va0 ,o) o) - (if (!= mag "default") - (set! res `(with "magnification" ,mag ,res))) - res)) + `(with "magnify" ,(if (== mag "default") "1" mag) ,res))) (info0 (cdr (box-info o1 "lbLB"))) (info1 (cdr (box-info o1 "rtRT"))) (l (f2s (min (s2f (car info0)) (s2f (caddr info0))))) - (b0 (f2s (min (s2f (cadr info0)) (s2f (cadddr info0))))) + (b (f2s (min (s2f (cadr info0)) (s2f (cadddr info0))))) (r (f2s (max (s2f (car info1)) (s2f (caddr info1))))) (t (f2s (max (s2f (cadr info1)) (s2f (cadddr info1))))) - (b (get-textat-vbase b0)) - (p00 (frame-inverse `(tuple ,l ,b0))) - (p10 (frame-inverse `(tuple ,r ,b0))) (p0 (frame-inverse `(tuple ,l ,b))) (p1 (frame-inverse `(tuple ,r ,b))) (p2 (frame-inverse `(tuple ,r ,t))) - (p3 (frame-inverse `(tuple ,l ,t))) - ) - (set-car! p0 'point) - (set-car! p1 'point) - (set-car! p2 'point) - (set-car! p3 'point) - (with res `((cline ,p00 ,p10 ,p2 ,p3) - ) - (if halign (set! res (append res - (create-haligns (cadr p00) (caddr p00) - (cadr p10) (caddr p2))))) - (if valign (set! res (append res - (create-valigns (cadr p0) (caddr p0) - (cadr p1) (caddr p2))))) - res))) + (p3 (frame-inverse `(tuple ,l ,t)))) + ;;(display* "o= " o1 "\n") + ;;(display* "p= " (cursor-path) ", " (cursor-tree) "\n") + ;;(display* "b= " l ", " b "; " r ", " t "\n") + (set-car! p0 'point) + (set-car! p1 'point) + (set-car! p2 'point) + (set-car! p3 'point) + (with res `((cline ,p0 ,p1 ,p2 ,p3)) + (set! res (append res (create-text-at-handle o))) + res))) (define (in-interval? x i1 i2 supop infop) (and (supop x i1) (infop x i2))) @@ -335,9 +213,9 @@ (set! eps (length-decode eps)) (let* ((ha (get-graphical-prop 'basic "text-at-halign")) (va (get-graphical-prop 'basic "text-at-valign")) - (o1 (if (and (pair? o) (eq? (car o) 'text-at)) - `(with "text-at-halign" ,ha - "text-at-valign" ,va ,o) + (o1 (if (graphical-text-context? o) + `(with "text-at-halign" ,ha + "text-at-valign" ,va ,o) o)) (info0 (cdr (box-info o1 "lbLB"))) (info1 (cdr (box-info o1 "rtRT"))) @@ -345,82 +223,73 @@ (b (min (s2f (cadr info0)) (s2f (cadddr info0)))) (r (max (s2f (car info1)) (s2f (caddr info1)))) (t (max (s2f (cadr info1)) (s2f (cadddr info1)))) - (p (frame-direct `(tuple ,x ,y))) - ) - (set! x (s2f (cadr p))) - (set! y (s2f (caddr p))) - (or (and (in-interval? x (- l eps) l >= <) - (in-interval? y (- b eps) (+ t eps) >= <=)) - (and (in-interval? x r (+ r eps) > <=) - (in-interval? y (- b eps) (+ t eps) >= <=)) - (and (in-interval? x (- l eps) (+ r eps) >= <=) - (in-interval? y (- b eps) b >= <)) - (and (in-interval? x (- l eps) (+ r eps) >= <=) - (in-interval? y t (+ t eps) > <=))))) + (p (frame-direct `(tuple ,x ,y)))) + (set! x (s2f (cadr p))) + (set! y (s2f (caddr p))) + (or (and (in-interval? x (- l eps) l >= <) + (in-interval? y (- b eps) (+ t eps) >= <=)) + (and (in-interval? x r (+ r eps) > <=) + (in-interval? y (- b eps) (+ t eps) >= <=)) + (and (in-interval? x (- l eps) (+ r eps) >= <=) + (in-interval? y (- b eps) b >= <)) + (and (in-interval? x (- l eps) (+ r eps) >= <=) + (in-interval? y t (+ t eps) > <=))))) (define draw-nonsticky-curp #t) (define (create-graphical-contour o edge no) ;; Point mode (define (curp lp) - (if draw-nonsticky-curp lp '()) - ) + (if draw-nonsticky-curp lp '())) (cond ((== (car o) 'point) - (cons o '()) - ) - ((== (car o) 'text-at) + (cons o '())) + ((graphical-text-context? o) (let* ((ha (get-graphical-prop 'basic "text-at-halign")) (va (get-graphical-prop 'basic "text-at-valign")) - (mag (get-graphical-prop 'basic "magnification")) - ) - (create-graphical-embedding-box o ha va ha va mag 0.1)) - ) + (mag (get-graphical-prop 'basic "magnify"))) + (create-graphical-embedding-box o ha va ha va mag))) ((== (car o) 'gr-group) (let* ((ha (get-graphical-prop 'basic "text-at-halign")) (va (get-graphical-prop 'basic "text-at-valign")) - (mag (get-graphical-prop 'basic "magnification")) - ) - (create-graphical-embedding-box - o ha va "center" "center" mag 0.1)) - ) + (mag (get-graphical-prop 'basic "magnify"))) + (create-graphical-embedding-box + o ha va "center" "center" mag))) (else (if (integer? no) (let* ((l (list-tail (cdr o) no)) (ll (length l))) - (append - (with h (list-head (cdr o) no) - (if (and edge - (in? (car o) - '(cline cspline carc)) - (== (+ no 1) (length (cdr o)))) - (cons `(with "point-style" - ,(if sticky-point - "square" "disk") - ,(car h)) (cdr h)) - h)) - (cons - (list 'with "point-style" "disk" - (cons 'concat - (if (< ll 2) - (if sticky-point - '() - (if edge - (list-head l 1) - (curp (list-head l 1)))) - (if edge - (with l2 (list-head l 2) - (if sticky-point - `(,(cons* 'with + (append + (with h (list-head (cdr o) no) + (if (and edge + (in? (car o) + '(cline cspline carc)) + (== (+ no 1) (length (cdr o)))) + (cons `(with "point-style" + ,(if sticky-point + "square" "disk") + ,(car h)) (cdr h)) + h)) + (cons + (list 'with "point-style" "disk" + (cons 'concat + (if (< ll 2) + (if sticky-point + '() + (if edge + (list-head l 1) + (curp (list-head l 1)))) + (if edge + (with l2 (list-head l 2) + (if sticky-point + `(,(cons* 'with "point-style" "square" `((concat . - ,(cdr l2))))) - l2)) - (cons - `(with "point-style" - "square" - ,(list-ref l 1)) - (curp (list-head l 1)) - )))) - ) '()) - (if (> ll 2) (list-tail l 2) '()))) + ,(cdr l2))))) + l2)) + (cons + `(with "point-style" + "square" + ,(list-ref l 1)) + (curp (list-head l 1))))))) '()) + (if (> ll 2) (list-tail l 2) '()))) (cdr o))))) ;; Graphical contours (group mode) @@ -428,213 +297,212 @@ (define (add-selections-colors op color fill-color) (if (not color) (set! color "none")) (if (not fill-color) (set! fill-color "none")) - `((with "color" ,color - "point-style" "square" - "fill-color" ,fill-color - (concat . ,op)))) + `((with "color" ,color + "point-style" "square" + "fill-color" ,fill-color + (concat . ,op)))) (define (create-graphical-contours l ptr pts) ;; Group mode -;; This routine draws the contours of each one -;; of the trees contained in the list l. If the -;; path ptr is the path of one of the trees in -;; the list, the corresponding object is drawn -;; using special points. Finally, the drawing -;; is made according to the mode in pts (i.e., -;; object, points, etc.). + ;; This routine draws the contours of each one + ;; of the trees contained in the list l. If the + ;; path ptr is the path of one of the trees in + ;; the list, the corresponding object is drawn + ;; using special points. Finally, the drawing + ;; is made according to the mode in pts (i.e., + ;; object, points, etc.). (define on-aobj #f) (define aobj-selected #f) (define (asc col fcol op) - (if (and on-aobj (not aobj-selected)) - (set! fcol #f)) - (add-selections-colors op col fcol) - ) + (if (and on-aobj (not aobj-selected)) + (set! fcol #f)) + (add-selections-colors op col fcol)) (define res '()) (define curscol #f) - (foreach (o l) - (if (tree? o) - (with path (reverse (tree-ip o)) - (if (equal? path ptr) - (set! aobj-selected #t))))) + (for (o l) + (if (tree? o) + (with path (reverse (tree-ip o)) + (if (== path ptr) + (set! aobj-selected #t))))) (if (and (== pts 'points) ptr) - (begin - (set! l (cons (path->tree ptr) l)))) - (foreach (o l) - (if (not (and (tree? o) (< (cAr (tree-ip o)) 0))) - (let* ((props #f) - (t #f) - (path0 #f) - ) - (set! curscol #f) - (set! on-aobj #f) - (if (tree? o) - (with path (reverse (tree-ip o)) - (set! props (create-graphical-props (if (== pts 'points) - 'default path) - (if (== pts 'object) - #f "square"))) - (if (equal? path ptr) - (begin - (set! on-aobj #t) - (set! curscol default-color-go-points))) - (set! path0 path) - (set! o (tree->stree o))) ;; FIXME: Remove this (tree->stree) - ) - (if (and (== (car o) 'gr-group) (!= pts 'object)) - (set! props (create-graphical-props 'default #f))) - (cond ((== (car o) 'point) - (if (not curscol) - (set! curscol default-color-selected-points)) - (set! t (if (== pts 'object) - `(,o) - (asc curscol #f `(,o)))) - ) - ((== (car o) 'text-at) - (if (not curscol) - (set! curscol default-color-selected-points)) - (set! t (let* ((ha (get-graphical-prop path0 "text-at-halign")) - (va (get-graphical-prop path0 "text-at-valign")) - (mag (get-graphical-prop path0 "magnification")) + (begin + (set! l (cons (path->tree ptr) l)))) + (for (o l) + (if (not (and (tree? o) (< (cAr (tree-ip o)) 0))) + (let* ((props #f) + (t #f) + (path0 #f)) + (set! curscol #f) + (set! on-aobj #f) + (if (tree? o) + (with path (reverse (tree-ip o)) + (set! props (create-graphical-props (if (== pts 'points) + 'default path) + (if (== pts 'object) + #f "square"))) + (if (== path ptr) + (begin + (set! on-aobj #t) + (set! curscol default-color-go-points))) + (set! path0 path) + (set! o (tree->stree o))) ;; FIXME: Remove this (tree->stree) + ) + (if (and (== (car o) 'gr-group) (!= pts 'object)) + (set! props (create-graphical-props 'default #f))) + (cond ((== (car o) 'point) + (if (not curscol) + (set! curscol default-color-selected-points)) + (set! t (if (== pts 'object) + `(,o) + (asc curscol #f `(,o))))) + ((graphical-text-context? o) + (if (not curscol) + (set! curscol default-color-selected-points)) + (set! t + (let* ((ha (get-graphical-prop path0 "text-at-halign")) + (va (get-graphical-prop path0 "text-at-valign")) + (mag (get-graphical-prop path0 "magnify")) (gc (asc curscol #f - (create-graphical-embedding-box - o ha va ha va mag 0.1))) - ) - (if (== pts 'object-and-points) - (cons o gc) - (if (== pts 'object) - `(,o) - gc)))) - ) - ((== (car o) 'gr-group) - (if (not curscol) - (set! curscol default-color-selected-points)) - (set! t (with gc (asc curscol #f - (let* ((ha (get-graphical-prop - path0 "text-at-halign")) - (va (get-graphical-prop - path0 "text-at-valign")) - (mag (get-graphical-prop - path0 "magnification")) - ) - (create-graphical-embedding-box - o ha va "center" "center" mag 0.1))) - (if (== pts 'object-and-points) - (cons o gc) - (if (== pts 'object) + (create-graphical-embedding-box + o ha va ha va mag)))) + (if (== pts 'object-and-points) + (cons o gc) + (if (== pts 'object) `(,o) - gc)))) - ) - (else - (set! t (if (== pts 'object-and-points) - (cons o (asc curscol default-color-selected-points - (cdr o))) - (if (== pts 'object) - `(,o) - (asc curscol default-color-selected-points - (cdr o)))))) - ) - (set! res (append res - (if props - `(,(append props `(,(cons* 'concat t)))) - t))))) - ) + gc))))) + ((== (car o) 'gr-group) + (if (not curscol) + (set! curscol default-color-selected-points)) + (set! t (with gc (asc curscol #f + (let* ((ha (get-graphical-prop + path0 "text-at-halign")) + (va (get-graphical-prop + path0 "text-at-valign")) + (mag (get-graphical-prop + path0 "magnify"))) + (create-graphical-embedding-box + o ha va "center" "center" mag))) + (if (== pts 'object-and-points) + (cons o gc) + (if (== pts 'object) + `(,o) + gc))))) + (else + (set! t (if (== pts 'object-and-points) + (cons o + (asc curscol default-color-selected-points + (cdr o))) + (if (== pts 'object) + `(,o) + (asc curscol default-color-selected-points + (cdr o))))))) + (set! res (append res + (if props + `(,(append props `(,(cons* 'concat t)))) + t)))))) res) ;; Create graphical object ;;NOTE: This subsection is OK +(define (get-local-magnify) + (let* ((m1 (graphics-get-property "magnify")) + (m2 (and graphical-attrs (ahash-ref graphical-attrs "magnify")))) + (number->string (* (magnify->number m1) (magnify->number m2))))) + (tm-define (create-graphical-object o mode pts no) -;; o == the objet one wants to draw -;; mode == 'active, 'new, , etc. (cf. "Graphical props" above). -;; pts == points, object, object-and-points. -;; no == description of the edge <=> no | (edge no) -;; == flag used in group modes <=> 'group | 'no-group + ;; o == the objet one wants to draw + ;; mode == 'active, 'new, , etc. (cf. "Graphical props" above). + ;; pts == points, object, object-and-points. + ;; no == description of the edge <=> no | (edge no) + ;; == flag used in group modes <=> 'group | 'no-group (define edge #t) - ;(display* "o[create-graphical-object](" mode "," pts "," no ")=")(write o)(newline) + ;;(display* "o[create-graphical-object](" mode "," pts "," no ")=")(write o)(newline) (if (pair? no) (begin - (set! edge (car no)) - (set! no (cadr no)))) + (set! edge (car no)) + (set! no (cadr no)))) (if (and o (not (null? o))) (let* ((op (add-selections-colors - (create-graphical-contour o edge no) - default-color-go-points #f)) + (create-graphical-contour o edge no) + default-color-go-points #f)) (props (if (and pts (!= pts 'points)) - (create-graphical-props mode #f) - (create-graphical-props 'default #f))) - ) - (graphical-object! - (if (or (eq? no 'group) - (and (not (eq? no 'no-group)) - (graphics-group-mode? (graphics-mode))) - ) - `(concat . - ,(create-graphical-contours - (map (lambda (x) - (if (tree? x) - (enhanced-tree->radical x) - x) - ) - the-sketch) - current-path pts) - ) - (append - props - `((concat . ,(cond ((== pts 'points) op) - ((== pts 'object) `(,o)) - ((== pts 'object-and-points) - (cons o op))))))))) + (create-graphical-props mode #f) + (create-graphical-props 'default #f))) + (mag-o `(with "magnify" ,(get-local-magnify) ,o))) + ;;(display* "-------\n") + ;;(display* "o= " o ", mode= " mode ", pts= " pts ", op= " op "\n") + ;;(display* "no= " no ", props= " props "\n") + (graphical-object! + (if (or (== no 'group) + (and (!= no 'no-group) + (graphics-group-mode? (graphics-mode)))) + `(with "magnify" ,(number->string + (magnify->number + (graphics-get-property "magnify"))) + (concat ,@(create-graphical-contours + (map (lambda (x) + (if (tree? x) + (enhanced-tree->radical x) + x)) + the-sketch) + current-path pts))) + (append + props + `((concat . ,(cond ((== pts 'points) op) + ((== pts 'object) `(,mag-o)) + ((== pts 'object-and-points) + (cons mag-o op))))))))) (graphical-object! '(concat)))) (tm-define (graphics-decorations-update . parms) -;; Creating the graphical object exclusively from the context + ;; Creating the graphical object exclusively from the context (invalidate-graphical-object) (if (== (length parms) 4) (create-graphical-object - (car parms) (cadr parms) (caddr parms) (cadddr parms)) + (car parms) (cadr parms) (caddr parms) (cadddr parms)) (if (graphics-group-mode? (graphics-mode)) (with pts #f - (if (null? parms) - (set! pts (if sticky-point 'object 'points)) - (set! pts (car parms))) - (if (and (null? (sketch-get)) - (pair? current-obj) - (> (length current-obj) 1)) - (create-graphical-object current-obj '() 'points 'no-group) - (create-graphical-object current-obj current-path pts #f))) + (if (null? parms) + (set! pts (if sticky-point 'object 'points)) + (set! pts (car parms))) + (if (and (null? (sketch-get)) + (pair? current-obj) + (> (length current-obj) 1)) + (create-graphical-object current-obj '() 'points 'no-group) + (create-graphical-object current-obj current-path pts #f))) (let* ((mode (if (null? parms) (if sticky-point - 'active + 'active current-path) (car parms))) - (tag (if current-obj (car current-obj) #f)) - ) - (if (and sticky-point - (== 1 (length (sketch-get)))) - (set! current-obj (car (sketch-get)))) - (if (tree? current-obj) - (set! current-obj (tree->stree current-obj))) - (if (and (eq? mode 'active) - (pair? current-obj)) - (begin - (graphical-fetch-props - (if (eq? (car current-obj) 'with) - current-obj `(with ,current-obj))) - (set! current-obj (stree-radical current-obj)))) - (create-graphical-object - current-obj - mode - (if sticky-point 'object-and-points 'points) - (if (== tag 'text-at) - 1 - (cond ((or (not tag) - (== tag 'gr-group)) - #f) - (else - (if current-point-no - (if current-edge-sel? - current-point-no - `(,current-edge-sel? ,current-point-no)) - #f)))))))) + (tag (if current-obj (car current-obj) #f))) + (if (and sticky-point + (== 1 (length (sketch-get)))) + (set! current-obj (car (sketch-get)))) + (if (tree? current-obj) + (set! current-obj (tree->stree current-obj))) + (if (and (== mode 'active) + (pair? current-obj)) + (begin + (graphical-fetch-props + (if (== (car current-obj) 'with) + current-obj `(with ,current-obj))) + (set! current-obj (stree-radical current-obj)))) + (create-graphical-object + current-obj + mode + (if sticky-point 'object-and-points 'points) + (if (graphical-text-tag? tag) + 1 + (cond ((or (not tag) + (== tag 'gr-group)) + #f) + (else + (if current-point-no + (if current-edge-sel? + current-point-no + `(,current-edge-sel? ,current-point-no)) + #f)))))))) (invalidate-graphical-object)) (tm-define (graphics-decorations-reset) @@ -643,10 +511,10 @@ ;; Operating on the graphical object (tm-define (transform-graphical-object opn) (with o (tree->stree (get-graphical-object)) - (if (pair? o) - (begin - (set! o (opn o)) - (graphical-object! o))))) + (if (pair? o) + (begin + (set! o (opn o)) + (graphical-object! o))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Managing the sketch @@ -692,17 +560,16 @@ (set! layer-of-last-removed-object (if (== (length (sketch-get)) 1) #f - '())) + '())) (set! remove-undo-mark? #f) (foreach-cons (c (sketch-get)) - (with o (car c) - (if (tree? o) - (begin - (set! remove-undo-mark? #t) - (graphics-remove (tree->path o) 'memoize-layer) - (if (or (tree->path o) (tree->path (enhanced-tree->radical o))) - (set-car! c (tree-copy o)))))) - ) + (with o (car c) + (if (tree? o) + (begin + (set! remove-undo-mark? #t) + (graphics-remove (tree->path o) 'memoize-layer) + (if (or (tree->path o) (tree->path (enhanced-tree->radical o))) + (set-car! c (tree-copy o))))))) (set! sticky-point #t) (set! graphics-undo-enabled #f) (graphics-decorations-update)) @@ -712,26 +579,24 @@ (if (not sticky-point) (graphics-error "(sketch-commit)")) (with sketch0 (list-copy (sketch-get)) - (sketch-reset) - (foreach (o sketch0) - (with layer layer-of-last-removed-object - (sketch-toggle (path->tree (graphics-group-insert-bis o group-mode?))) - (if (not (list? layer)) - (set! layer-of-last-removed-object layer))) - ) - (set! layer-of-last-removed-object #f) - (set! current-obj - (if group-mode? + (sketch-reset) + (for (o sketch0) + (with layer layer-of-last-removed-object + (sketch-toggle (path->tree (graphics-group-insert-bis o group-mode?))) + (if (not (list? layer)) + (set! layer-of-last-removed-object layer)))) + (set! layer-of-last-removed-object #f) + (set! current-obj + (if group-mode? '(nothing) - (if (== 1 (length (sketch-get))) - (stree-radical (tm->stree (car (sketch-get)))) - #f))) - (set! current-path - (if (and (== 1 (length (sketch-get))) - (tree? (car (sketch-get)))) - (tree->path (car (sketch-get))) - #f)) - ) + (if (== 1 (length (sketch-get))) + (stree-radical (tm->stree (car (sketch-get)))) + #f))) + (set! current-path + (if (and (== 1 (length (sketch-get))) + (tree? (car (sketch-get)))) + (tree->path (car (sketch-get))) + #f))) (set! sticky-point #f) (set! graphics-undo-enabled #t) (if remove-undo-mark? diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-single.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-single.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-single.scm 1970-01-01 00:00:00.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-single.scm 2011-10-06 14:20:20.000000000 +0000 @@ -0,0 +1,411 @@ + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; +;; MODULE : graphics-single.scm +;; DESCRIPTION : editing routines for single graphical objects +;; COPYRIGHT : (C) 2001 Joris van der Hoeven +;; (C) 2004, 2005, 2006 Joris van der Hoeven and Henri Lesourd +;; (C) 2011 Joris van der Hoeven +;; +;; This software falls under the GNU general public license version 3 or later. +;; It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE +;; in the root directory or . +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(texmacs-module (graphics graphics-single) + (:use (graphics graphics-object) + (graphics graphics-env) + (graphics graphics-main))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Basic operations +;; +;; NOTE: Imperative functions, which inconditionnaly perform a given +;; operation on the sketch. +;; +;; These functions depend on, and can change the current edit state (i.e., +;; being in modifying or in selecting mode), and they maintain the value +;; of the state variables current-point-no and current-edge-sel?, which +;; are basic pointers inside the edited object. +;; +;; In other words, these functions are methods which operate on the sketch, +;; according to what you need to do when editing in point mode. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;; Basic operations (setting the object) +(define (object-set! o . opt) + (set! layer-of-last-removed-object #f) + (set! current-obj o) ;; FIXME: Hmmm, I still have a doubt for this one. + ;; Should completely clarify its role & centralize + ;; where it's managed (and for similar gvs as well). + (if sticky-point + (sketch-set! `(,o)) + (if (in? 'checkout opt) + (begin + (sketch-set! `(,o)) + (sketch-checkout)) + (if (in? 'new opt) + (graphics-group-enrich-insert o) + (graphics-assign current-path o))))) + +;; Basic operations (create) +(define (sketch-get1) + (if (not (and (pair? (sketch-get)) (eq? 1 (length (sketch-get))))) + (graphics-error "(sketch-get1)")) + (sketch-get)) + +(tm-define (object_create tag x y) + (:require (== tag 'point)) + (object-set! `(point ,x ,y) 'new)) + +(tm-define (object_create tag x y) + (:require (in? tag gr-tags-curves)) + (with o (graphics-enrich `(,tag (point ,x ,y) (point ,x ,y))) + (graphics-store-state 'start-create) + (set! current-point-no 1) + (object-set! o 'checkout) + (graphics-store-state #f))) + +(tm-define (object_create tag x y) + (:require (graphical-text-tag? tag)) + (object-set! `(,tag "" (point ,x ,y)) 'new)) + +(define (set-point-sub obj no x y) + ;;(display* "set-point-sub " obj ", " no ", " x ", " y "\n") + (cond ((== (car obj) 'with) + (set-point-sub (cAr obj) no x y)) + ((== (car obj) 'point) + (set-car! (cdr obj) x) + (set-car! (cddr obj) y)) + ((and (not (not no)) (list? obj) (> (length obj) (+ no 1))) + (set-point-sub (list-ref obj (+ no 1)) #f x y)) + (else #f))) + +;; Basic operations (set & add point) +(define (object_set-point no xcur ycur) + (define obj (stree-radical (car (sketch-get1)))) + (set-point-sub obj no xcur ycur) + (object-set! (car (sketch-get)))) + +(define (object_add-point no xcur ycur x y dirn) + (define obj (stree-radical (car (sketch-get1)))) + (if (not (and (in? (car obj) '(arc carc)) (> (length obj) 3))) + (with l (list-tail (cdr obj) no) + (graphics-store-state #f) + (if dirn + (begin + (set-cdr! l (cons `(point ,x ,y) (cdr l))) + (if (and xcur ycur) + (set-car! l `(point ,xcur ,ycur))) + (set! current-point-no (+ no 1))) + (begin + (set-cdr! l (cons (car l) (cdr l))) + (set-car! l `(point ,x ,y)) + (if (and xcur ycur) + (set-car! (cdr l) `(point ,xcur ,ycur))) + (set! current-point-no no)) + ) + (object-set! (car (sketch-get))) + (set! current-edge-sel? #t)))) + +;; Basic operations (remove) +(define (object_remove-point no) +;; FIXME: should read the radical & memoize it + (with l (if (<= no 0) + current-obj + (list-tail (cdr current-obj) (- no 1))) + (set-cdr! l (cddr l)) + (set! current-point-no #f) + (object-set! current-obj))) + ;; FIXME: Should assign the memoized radical, here + +(define (object_remove) + (graphics-remove current-path)) + +;; Basic operations (checkout & commit) +(define (object_checkout) + (sketch-set! `(,(path->tree current-path))) + (sketch-checkout) + ;;(display* "Checked out " (sketch-get) "\n") + (sketch-set! (map tree->stree (sketch-get)))) + +(define (object_commit) + (define obj (stree-radical (car (sketch-get1)))) + (if (not (and (in? (car obj) '(arc carc)) (<= (length obj) 3))) + (with tab (make-ahash-table) + (for (var (graphics-all-attributes)) + (when (nin? var '("gid")) + (ahash-set! tab var (ahash-ref graphical-attrs var)))) + (graphical-fetch-props (car (sketch-get))) + (set! obj (graphics-enrich-bis + obj (ahash-ref graphical-attrs "gid") tab)) + (set! current-edge-sel? #f) + (sketch-set! `(,obj)) + ;;(display* "Commited " (sketch-get) "\n") + (sketch-commit) + (set! leftclick-waiting #f) + (set! current-obj (stree-radical obj)) + (set! current-point-no #f) + (graphics-forget-states))) + (delayed + (graphics-update-constraints))) + +(tm-define (current-in? l) + (and (pair? current-obj) (in? (car current-obj) l))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Updating the constraints +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define (tree-update-constraints t) + (cond ((not (tree? t)) (noop)) + ((tree-atomic? t) (noop)) + ((and (match? t '(with "gid" :%1 (point :%2))) + (graphics-has? (tree-ref t 1))) + (let* ((old (tree-ref t :last)) + (new (graphics-ref (tree-ref t 1)))) + (when (!= new old) (tree-set t :last new)) + (graphics-notify-update (tree-ref t 1)))) + (else (for-each tree-update-constraints (tree-children t))))) + +(tm-define (graphics-update-constraints) + (when (graphics-needs-update?) + (with-innermost t 'graphics + (remove-undo-mark) + (tree-update-constraints t) + (add-undo-mark)))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Edit operations +;; +;; NOTE: Intelligent functions, which take into account the state, +;; the previous mouse clicks, etc. They also perform printing the +;; help messages. These functions maintain the value of the state +;; variables, and they manage state stacking. +;; +;; In other words, these functions implement the different states +;; of the editing automaton. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define moveclick-tolerance "5px") +(define previous-leftclick #f) + +(define (hardly-moved?) + (and previous-leftclick + (points-dist< + previous-leftclick + `(point ,current-x ,current-y) + moveclick-tolerance))) + +(define (move-over) + (set-message "Left click: new object; Drag: edit object; Middle click: remove" "") + (graphics-decorations-update) + (if current-path + (with p2 (tm-upwards-path current-path + (graphical-text-tag-list) '(graphics)) + (if (not p2) (go-to (rcons current-path 0)))))) + +(define (edit-clean-up) + ;; remove cruft which uncareful editing may create + (with-innermost t 'graphics + (for (i (reverse (.. 0 (tree-arity t)))) + (with c (tree-ref t i) + (if (tm-func? c 'with) (set! c (tree-ref c :last))) + (when (and (graphical-text-context? c) + (== (tree->stree (tree-ref c 0)) "")) + (tree-remove! t i 1)))))) + +(define (edit-insert x y) + (edit-clean-up) + (object_create (cadr (graphics-mode)) x y)) + +(define (start-move) + (define edge current-edge-sel?) + (graphics-store-state 'start-move) + (object_checkout) + (graphics-group-start) + (set! current-edge-sel? #t) + (set! leftclick-waiting #f) + (if (and edge + (not (and (current-in? '(arc carc)) + (> (length current-obj) 3)))) + (begin + (object_add-point current-point-no #f #f current-x current-y #t) + (graphics-decorations-update))) + (graphics-store-state #f)) + +(define (move-point) + (if (and leftclick-waiting (not (hardly-moved?))) + (begin + (set! leftclick-waiting #f) + (object_add-point + current-point-no + (cadr previous-leftclick) (caddr previous-leftclick) + current-x current-y + (== (logand (get-keyboard-modifiers) ShiftMask) 0))) + (begin + (if leftclick-waiting + (set-message "Left click: finish; Middle click: undo" "") + (set-message "Left click: add point; Middle click: undo" "")) + (object_set-point current-point-no current-x current-y))) + (graphics-decorations-update)) + +(define (last-point) + (object_set-point current-point-no current-x current-y) + (object_commit)) + +(define (next-point) + (cond ((not (hardly-moved?)) + (set-message "Left click: finish; Middle click: undo" "") + (set! leftclick-waiting #t)) + (leftclick-waiting + (last-point)) + ((== current-point-no 1) + (undo 0) + (set! leftclick-waiting #f)) + (else + (set-message "Left click: finish; Middle click: undo" "") + (graphics-back-state #f) + (graphics-move current-x current-y) + (set! leftclick-waiting #t)))) + +(define (remove-point) + (if (or (current-in? gr-tags-oneshot) (null? (cdddr current-obj)) + (not (current-in? gr-tags-all)) + (!= (logand (get-keyboard-modifiers) ShiftMask) 0)) + (begin + (object_remove) + (graphics-decorations-reset) + (graphics-group-start)) + (begin + (object_remove-point current-point-no) + (graphics-decorations-update)))) + +;; Middle button +(tm-define (middle-button) + (if sticky-point + (begin + (graphics-back-state #f) + (graphics-move current-x current-y)) + (remove-point))) + +(tm-define (graphics-update-decorations) + (:state graphics-state) + (if current-obj (graphics-decorations-update))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Default global dispatching +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (edit_move mode x y) + (display* "Uncaptured graphical move " mode ", " x ", " y "\n")) + +(tm-define (edit_left-button mode x y) + (display* "Uncaptured graphical left-button " mode ", " x ", " y "\n")) + +(tm-define (edit_middle-button mode x y) + (display* "Uncaptured graphical middle-button " mode ", " x ", " y "\n")) + +(tm-define (edit_right-button mode x y) + (display* "Uncaptured graphical right-button " mode ", " x ", " y "\n")) + +(tm-define (edit_start-drag mode x y) + (edit_left-button mode x y)) + +(tm-define (edit_drag mode x y) + (edit_move mode x y)) + +(tm-define (edit_end-drag mode x y) + (edit_left-button mode x y)) + +(tm-define (edit_tab-key mode inc) + (display* "Uncaptured graphical tab-key " mode ", " inc "\n")) + +(tm-define (edit_delete) + (:state graphics-state) + (edit_middle-button 'edit current-x current-y)) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Global dispatching +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (edit_move mode x y) + (:require (== mode 'edit)) + (:state graphics-state) + (set-texmacs-pointer 'graphics-cross #t) + (if current-obj + (begin + (if (current-in? (graphical-text-tag-list)) + (set! current-point-no 1)) + (if sticky-point + (move-point) + (move-over))) + (begin + (set-message "Left click: new object" "") + (graphics-decorations-reset)))) + +(tm-define (edit_left-button mode x y) + (:require (== mode 'edit)) + (:state graphics-state) + (set-texmacs-pointer 'graphics-cross) + (cond (sticky-point + (if (current-in? (graphical-text-tag-list)) + (object_commit) + (next-point))) + ((and (current-in? (graphical-text-tag-list)) + (== (car (graphics-mode)) 'edit) + (graphical-text-tag? (cadr (graphics-mode)))) + (set-texmacs-pointer 'text-arrow) + (go-to (car (select-first (s2f current-x) (s2f current-y))))) + (else + (edit-insert x y))) + (set! previous-leftclick `(point ,current-x ,current-y))) + +(tm-define (edit_middle-button mode x y) + (:require (== mode 'edit)) + (:state graphics-state) + (set-texmacs-pointer 'graphics-cross) + (when current-obj + (middle-button))) + +(tm-define (edit_start-drag mode x y) + (:require (== mode 'edit)) + (:state graphics-state) + (set-texmacs-pointer 'graphics-cross) + (set! dragging-create? (or sticky-point (not current-obj))) + (if (or sticky-point current-obj) + (begin + (if (current-in? (graphical-text-tag-list)) + (set! current-point-no 1)) + (if sticky-point + (next-point) + (start-move))) + (edit-insert x y)) + (set! previous-leftclick `(point ,current-x ,current-y))) + +(tm-define (edit_drag mode x y) + (:require (== mode 'edit)) + (:state graphics-state) + (edit_move mode x y) + (set-message "Release left button: finish editing" "")) + +(tm-define (edit_end-drag mode x y) + (:require (== mode 'edit)) + (:state graphics-state) + (set-texmacs-pointer 'graphics-cross) + (if (or sticky-point current-obj) + (if dragging-create? + (edit_move mode x y) + (last-point))) + (set! dragging-create? #f) + (set! previous-leftclick `(point ,current-x ,current-y))) + +(tm-define (edit_tab-key mode inc) + (:require (== mode 'edit)) + (:state graphics-state) + (if (and current-x current-y) + (begin + (select-next inc) + (graphics-update-decorations)) + (invalidate-graphical-object))) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-utils.scm texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-utils.scm --- texmacs-1.0.7.13/TeXmacs/progs/graphics/graphics-utils.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/graphics/graphics-utils.scm 2011-10-06 07:38:25.000000000 +0000 @@ -5,6 +5,7 @@ ;; DESCRIPTION : utilities routines for graphics mode ;; COPYRIGHT : (C) 2001 Joris van der Hoeven ;; (C) 2004, 2005, 2006 Joris van der Hoeven and Henri Lesourd +;; (C) 2011 Joris van der Hoeven ;; ;; This software falls under the GNU general public license version 3 or later. ;; It comes WITHOUT ANY WARRANTY WHATSOEVER. For details, see the file LICENSE @@ -13,7 +14,20 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (texmacs-module (graphics graphics-utils) - (:use (utils library cursor) (utils library tree))) + (:use (graphics graphics-drd))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Some global definitions +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define ShiftMask 256) +(tm-define LockMask 512) +(tm-define ControlMask 1024) +(tm-define Mod1Mask 2048) +(tm-define Mod2Mask 4096) +(tm-define Mod3Mask 8192) +(tm-define Mod4Mask 16384) +(tm-define Mod5Mask 32768) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Basic scheme processing @@ -65,7 +79,7 @@ ;; Error (tm-define (graphics-error . msg) - (foreach (e msg) + (for (e msg) (display e)) (newline) ;(quit-TeXmacs) ) @@ -108,9 +122,8 @@ `(remove-eq0? ,x ,l))) ;; Iterators -(define-public foreach for) -(define-public-macro (foreach-number what . body) +(tm-define-macro (foreach-number what . body) (let ((n (length what))) (cond ((== n 3) ;;(foreach-number (i i0 iN) body[i]) @@ -133,7 +146,7 @@ ,(- 0 (car (cddddr what))) ,(caddr what)) ,@body))) (else '(noop))))) -(define-public-macro (foreach-cons i . b) +(tm-define-macro (foreach-cons i . b) ;;(foreach-cons (e l) i body[elt]) -> for each cons e of the list l ;;(foreach-cons (e l1 l2) body[elt]) -> for each cons e in [l1...l2] (if (null? (cddr i)) @@ -280,17 +293,6 @@ ;; Subroutines for accessing the graphics ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;NOTE: This section is OK. -(tm-define gr-tags-all '(point - line cline spline cspline - arc carc - text-at - gr-group)) -(tm-define gr-tags-curves '(line cline spline cspline arc carc)) -(tm-define gr-tags-point-curves `(point . ,gr-tags-curves)) -(tm-define gr-tags-noncurves '(point text-at gr-group)) -(tm-define gr-tags-oneshot '(point arc carc text-at gr-group)) - (tm-define (stree-at p) (tree->stree (path->tree p))) ;; TODO: Put this in kernel/library/tree.scm @@ -310,7 +312,8 @@ (with o (path->tree p) (if (and (tree? o) ;; (in? (tree-label o) gr-tags-all) (not (eq? (tree-label o) 'string)) - (tm-upwards-path (cDr p) '(graphics) '(text-at))) + (tm-upwards-path (cDr p) '(graphics) + (graphical-text-tag-list))) (begin ;;(display* "gp=" (path->tree (cDr path)) "\n") (if (eq? (tree-label o) 'graphics) #f p)) @@ -333,17 +336,6 @@ (graphics "")) '(6 1))) -(tm-define (graphics-mode-attribute? mode attr) - (if (func? mode 'edit 1) (set! mode (cadr mode))) - (cond ((in? mode '(point)) - (in? attr '("opacity" "color" "point-style"))) - ((in? mode gr-tags-curves) - (in? attr '("opacity" "color" "line-width" "dash-style" - "dash-style-unit" "line-arrows" "fill-color"))) - ((in? mode '(text-at)) - (in? attr '("opacity" "color" "text-at-halign" "text-at-valign"))) - (else #f))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Subroutines for accessing the properties of the graphics ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -351,185 +343,83 @@ ;;NOTE: This section is OK. (define (graphics-get-raw-property var) (with val (get-upwards-tree-property (graphics-graphics-path) var) - (if (eq? val nothing) - (get-default-tree-val var) - (if (eq? (tm-car val) 'quote) - (tree-ref val 0) - val)))) - -(tm-define (graphics-frozen-property? var) - (with val (graphics-get-raw-property var) - (and (tree? val) (== (tree-label val) 'freeze)))) - -(tm-define (graphics-frozen-property! var b) - (if b - (if (not (graphics-frozen-property? var)) - (graphics-set-property var - `(quote (freeze ,(tree->stree (get-env-tree var)))))) - (if (graphics-frozen-property? var) - (graphics-set-property - var (tree-ref (graphics-get-raw-property var) 0))))) - + (if (eq? val nothing) + (get-default-tree-val var) + (if (eq? (tm-car val) 'quote) + (tree-ref val 0) + val)))) + (tm-define (graphics-get-property var) (with val (graphics-get-raw-property var) - (tree->stree - (if (graphics-frozen-property? var) - (tree-ref val 0) - val)))) - -(tm-define (graphics-change-property var val) - (set! val (t2o val)) - (if (graphics-frozen-property? var) - (graphics-set-property var `(quote (freeze ,val))) - (graphics-set-property var val))) + (tree->stree val))) (tm-define (graphics-set-property var val) (with p (graphics-graphics-path) - (if p (path-insert-with p var val)))) + (cond ((tree? val) (graphics-set-property var (tree->stree val))) + ((== val "default") (graphics-remove-property var)) + ((== val (graphics-attribute-default var)) + (graphics-remove-property var)) + (p (path-insert-with p var val))))) (tm-define (graphics-remove-property var) (with p (graphics-graphics-path) (if p (path-remove-with p var)))) ;; Magnification -(tm-define (graphics-eval-magnification) - (tree->stree (get-env-tree-at - "magnification" (rcons (graphics-graphics-path) 0)))) - -(tm-define (graphics-eval-magnification-at path) - (tree->stree (get-env-tree-at "magnification" path))) - -(define (convert-magn m) - (if (== m "default") - (set! m 1.0)) - (if (string? m) - (set! m (s2f m))) - m) - ;; FIXME: Using this function is crappy ; it would be - ;; much better to be sure that a magnification equal - ;; to "default" never enters the functions below. - ;; But this seems to depend on some realtime-dependent - ;; behaviour, thus testing this has not (yet) been - ;; done correctly. - -(tm-define (multiply-magnification magn h) - (set! h (convert-magn h)) - (cond ((equal? h 1.0) - #t - ) - ((and (pair? magn) (eq? (car magn) 'times)) - (set! h (* h (s2f (cadr magn)))) - ) - ((or (string? magn) (number? magn)) - (set! magn (convert-magn magn)) - (set! h (* h magn)) - ) - (else - (set! h 1.0)) - ) - (if (equal? h 1.0) - #f - `(times ,(f2s h) (value "magnification")))) +(tm-define (graphics-eval-magnify) + (graphical-get-attribute (path->tree (graphics-graphics-path)) "magnify")) + +(tm-define (graphics-eval-magnify-at path) + (graphical-get-attribute (path->tree (cDr path)) "magnify")) -(tm-define (local-magnification amagn) - (set! amagn (convert-magn amagn)) - `(times ,(f2s (/ amagn (s2f (graphics-eval-magnification)))) - (value "magnification"))) +(tm-define (magnify->number m) + (cond ((number? m) m) + ((== m "default") 1) + ((== m #f) 1) + (else (string->number m)))) + +(tm-define (number->magnify m) + (cond ((and (> m 0.999999) (< m 1.000001)) "default") + (else (number->string m)))) + +(tm-define (multiply-magnify m1 m2) + (number->magnify (* (magnify->number m1) (magnify->number m2)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Enriching graphics with properties like color, line width, etc. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;NOTE: This section is OK. -(tm-define (graphics-valid-attribute? attr tag) - (cond ((== tag 'point) - (in? attr '("opacity" "color" "fill-color" "point-style"))) - ((not (in? tag gr-tags-noncurves)) - (in? attr '("opacity" "color" "fill-color" "line-width" - "magnification" "dash-style" "dash-style-unit" - "line-arrows"))) - ((== tag 'text-at) - (in? attr '("opacity" "color" - "text-at-halign" "text-at-valign" "magnification"))) - ((== tag 'gr-group) - (in? attr '("opacity" "color" "fill-color" - "point-style" "line-width" - "magnification" "dash-style" "dash-style-unit" - "line-arrows" - "text-at-halign" "text-at-valign"))) - (else #f))) - (tm-define (graphics-enrich-filter t l) (if (null? l) l (let* ((head (car l)) (tail (graphics-enrich-filter t (cdr l)))) - (if (or (== (cadr head) "default") + (if (or (not (cadr head)) + (== (cadr head) "default") (== (cadr head) (get-default-val (car head))) - (and (== (car head) "magnification") - (or (== (cadr head) "1.0") - (== (cadr head) '(times "1.0" (value "magnification"))))) - (not (graphics-valid-attribute? (car head) t))) + (not (graphics-attribute? t (car head)))) tail (cons* (car head) (cadr head) tail))))) (tm-define (graphics-enrich-sub t l) (with f (graphics-enrich-filter (car t) l) - (if (null? f) - t - `(with ,@f ,t)))) - -(tm-define (graphics-enrich-bis t op color ps lw mag st stu lp fc ha va) - (let* ((mode (car t))) - (cond ((== mode 'point) - (graphics-enrich-sub t - `(("opacity" ,op) - ("color" ,color) - ("fill-color" ,fc) - ("point-style" ,ps)))) - ((not (in? mode gr-tags-noncurves)) - (graphics-enrich-sub t - `(("opacity" ,op) - ("color" ,color) - ("line-width" ,lw) - ;;("magnification" ,mag) - ("dash-style" ,st) ("dash-style-unit" ,stu) - ("line-arrows" ,lp) - ("fill-color" ,fc)))) - ((== mode 'text-at) - (graphics-enrich-sub t - `(;;("magnification" ,mag) - ("opacity" ,op) - ("color" ,color) - ("text-at-halign" ,ha) - ("text-at-valign" ,va)))) - ((== mode 'gr-group) - (graphics-enrich-sub t - `(("opacity" ,op) - ("color" ,color) - ("point-style" ,ps) - ("line-width" ,lw) - ;;("magnification" ,mag) - ("dash-style" ,st) ("dash-style-unit" ,stu) - ("line-arrows" ,lp) - ("fill-color" ,fc) - ("text-at-halign" ,ha) - ("text-at-valign" ,va)))) - (else - (graphics-enrich-sub t '()))))) + (if (null? f) t `(with ,@f ,t)))) + +(tm-define (graphics-enrich-bis t id tab) + (set! tab (list->ahash-table (ahash-table->list tab))) + (ahash-remove! tab "gid") + (let* ((attrs (graphical-relevant-attributes t)) + (sel (ahash-table-select tab attrs)) + (l1 (cons (cons "gid" id) (ahash-table->list sel))) + (l2 (map (lambda (x) (list (car x) (cdr x))) l1))) + ;;(display* "l= " l2 "\n") + (graphics-enrich-sub t l2))) (tm-define (graphics-enrich t) - (let* ((op (graphics-get-property "gr-opacity")) - (color (graphics-get-property "gr-color")) - (ps (graphics-get-property "gr-point-style")) - (lw (graphics-get-property "gr-line-width")) - (mag "1.0") - (st (graphics-get-property "gr-dash-style")) - (stu (graphics-get-property "gr-dash-style-unit")) - (lp (graphics-get-property "gr-line-arrows")) - (fc (graphics-get-property "gr-fill-color")) - (ha (graphics-get-property "gr-text-at-halign")) - (va (graphics-get-property "gr-text-at-valign"))) - (graphics-enrich-bis t op color ps lw mag st stu lp fc ha va))) + (let* ((l1 (graphics-all-attributes)) + (l2 (map gr-prefix l1)) + (l3 (map graphics-get-property l2)) + (tab (list->ahash-table (map cons l1 l3)))) + (graphics-enrich-bis t "default" tab))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Subroutines for modifying the innermost group of graphics @@ -538,8 +428,7 @@ (tm-define (graphics-group-insert-bis t go-into) ;(display* "t=" t "\n") (let* ((p (graphics-group-path)) - (p2 #f) - ) + (p2 #f)) (if (null? layer-of-last-removed-object) (set! layer-of-last-removed-object #f)) (if p (with n (if layer-of-last-removed-object @@ -552,17 +441,15 @@ (tree-arity (path->tree p))) (tree-insert (path->tree p) n (list t)) (if (func? t 'with) - (if (and go-into (func? (cAr t) 'text-at)) + (if (and go-into (graphical-text-context? (cAr t))) (set! p2 (append p (list n (- (length t) 2) 0 0))) (set! p2 (append p (list n (- (length t) 2) 1)))) - (if (and go-into (func? t 'text-at)) + (if (and go-into (graphical-text-context? t)) (set! p2 (append p (list n 0 0))) - (set! p2 (append p (list n 0)))) - ) + (set! p2 (append p (list n 0))))) (go-to p2) - (graphics-path p2) - ) - #f))) + (graphics-path p2)) + #f))) (tm-define (graphics-group-insert t) (graphics-group-insert-bis t #t)) @@ -570,10 +457,9 @@ (tm-define (graphics-group-enrich-insert t) (graphics-group-insert (graphics-enrich t))) -(tm-define (graphics-group-enrich-insert-bis - t op color ps lw mag st stu lp fc ha va go-into) - (graphics-group-insert-bis - (graphics-enrich-bis t op color ps lw mag st stu lp fc ha va) go-into)) +(tm-define (graphics-group-enrich-insert-table t tab go-into) + (graphics-group-insert-bis (graphics-enrich-bis t "default" tab) + go-into)) (tm-define (graphics-group-start) (graphics-finish) @@ -593,41 +479,16 @@ (with p (graphics-path path) (if p (tree->stree (path->tree p)) #f))) -(tm-define (graphics-active-tree) - (with p (graphics-active-path) - (if p (path->tree p) #f))) - (tm-define (graphics-active-object) (with p (graphics-active-path) (if p (tree->stree (path->tree p)) #f))) -(tm-define (graphics-active-type) - (with t (graphics-active-tree) - (if t (tm-car t) #f))) - ;;NOTE: Currently unused. - ;;TODO: Test it. - -(tm-define (graphics-active-val var) - (graphics-active-property var (get-default-val var))) - ;;NOTE: Currently unused. - ;;TODO: Test it. - (tm-define (get-default-tree-val var) (get-init-tree var)) (tm-define (get-default-val var) (tree->stree (get-init-tree var))) -(tm-define (graphics-active-color) - (graphics-active-val "color")) - ;;NOTE: Currently unused. - ;;TODO: Test it. - -(tm-define (graphics-active-lwidth) - (graphics-active-val "line-width")) - ;;NOTE: Currently unused. - ;;TODO: Test it. - (tm-define (graphics-path-property-bis p var default-val) (with c (get-upwards-property p var) (if (== c nothing) default-val c))) @@ -642,54 +503,31 @@ (tm-define (graphics-path-property-1 p var) (graphics-path-property-bis-1 p var "default")) -(tm-define (graphics-active-property var default-val) - (graphics-path-property-bis (graphics-active-path) var default-val)) - -(tm-define (graphics-active-assign t) - (with p (graphics-active-path) - (if p (begin - (tree-assign (path->tree p) t) - (go-to (rcons p 1)))))) - -(tm-define (graphics-active-set-tag l) - (with t (graphics-active-object) - (if t (graphics-active-assign (cons l (cdr t)))))) - -(tm-define (graphics-active-insert t) - (with p (graphics-active-path) - (if p (with n (tree-arity (path->tree p)) - (tree-insert (path->tree p) n (list t)) - (go-to (rcons p 1)))))) - (tm-define (graphics-object-root-path p) (let* ((q (tm-upwards-path p '(with) '())) - (path (if (and q - (== (+ (length q) 1) (length p))) - q p - ))) - path)) - + (path (if (and q (== (+ (length q) 1) (length p))) q p))) + path)) + (tm-define (graphics-remove p . parms) - (if p - (with p0 (graphics-object-root-path p) - (set! layer-of-last-removed-object - (if (and (pair? parms) (eq? (car parms) 'memoize-layer)) - (if (list? layer-of-last-removed-object) - (cons (cAr p0) layer-of-last-removed-object) - (cAr p0)) - #f)) - (tree-remove (path->tree (cDr p0)) (cAr p0) 1)))) + (when p + (with p0 (graphics-object-root-path p) + (set! layer-of-last-removed-object + (if (and (pair? parms) (eq? (car parms) 'memoize-layer)) + (if (list? layer-of-last-removed-object) + (cons (cAr p0) layer-of-last-removed-object) + (cAr p0)) + #f)) + (tree-remove (path->tree (cDr p0)) (cAr p0) 1)))) (tm-define (graphics-assign p t) - (if p (begin - (tree-assign (path->tree p) t) - (go-to (rcons p 1))))) + (when p + (tree-assign (path->tree p) t) + (go-to (rcons p 1)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Box info & frame ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;NOTE: This section is OK. (tm-define (box-info t cmd) (tree->stree (texmacs-exec `(box-info ,t ,cmd)))) @@ -703,28 +541,24 @@ (let* ((i1a (car i1)) (i1b (cadr i1)) (i2a (car i2)) - (i2b (cadr i2)) - ) - (or (and (<= i1a i2a) (>= i1b i2b)) - (and (<= i2a i1a) (>= i2b i1b)) - (and (>= i1a i2a) (<= i1a i2b)) - (and (>= i2a i1a) (<= i2a i1b))))) + (i2b (cadr i2))) + (or (and (<= i1a i2a) (>= i1b i2b)) + (and (<= i2a i1a) (>= i2b i1b)) + (and (>= i1a i2a) (<= i1a i2b)) + (and (>= i2a i1a) (<= i2a i1b))))) (tm-define (box-intersects t1 t2) (define (max-box t) - (let* ((bx1 (box-info t "lbrt")) - (bx2 (box-info t "LBRT")) - ) - (set! bx1 (map s2f (cdr bx1))) - (set! bx2 (map s2f (cdr bx2))) - `(,(min (car bx1) (car bx2)) - ,(min (cadr bx1) (cadr bx2)) - ,(max (caddr bx1) (caddr bx2)) - ,(max (cadddr bx1) (cadddr bx2)))) - ) + (let* ((bx1 (box-info t "lbrt")) + (bx2 (box-info t "LBRT"))) + (set! bx1 (map s2f (cdr bx1))) + (set! bx2 (map s2f (cdr bx2))) + `(,(min (car bx1) (car bx2)) + ,(min (cadr bx1) (cadr bx2)) + ,(max (caddr bx1) (caddr bx2)) + ,(max (cadddr bx1) (cadddr bx2))))) (let* ((box1 (max-box t1)) - (box2 (max-box t2)) - ) + (box2 (max-box t2))) (and (interval-intersects `(,(car box1) ,(caddr box1)) `(,(car box2) ,(caddr box2))) (interval-intersects `(,(cadr box1) ,(cadddr box1)) @@ -742,53 +576,107 @@ (tree-ref t (- (tree-arity t) 1)) t)) -(tm-define (stree-radical t) - (if (and (pair? t) (eq? (car t) 'with) (nnull? (cdr t))) - (cAr t) - t)) - (tm-define (radical->enhanced-tree r) (with t (tree-up r) (if (enhanced-tree? t) t r))) -(tm-define (enhanced-tree-arity t) - (tree-arity (enhanced-tree->radical t))) - -(tm-define (enhanced-tree-ref t i) - (tree-ref (enhanced-tree->radical t) i)) +(tm-define (stree-radical t) + (if (and (pair? t) (eq? (car t) 'with) (nnull? (cdr t))) + (cAr t) + t)) -(tm-define (enhanced-tree-set! t i val) - (tree-set! (enhanced-tree->radical t) i val)) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; New style graphical attributes +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(tm-define (enhanced-tree-insert! t i val) - (tree-insert! (enhanced-tree->radical t) i `(,val))) +(define (group-pairs l) + (if (or (null? l) (null? (cdr l))) '() + (cons (cons (car l) (cadr l)) (group-pairs (cddr l))))) -(tm-define (enhanced-tree-remove! t i n) - (tree-remove! (enhanced-tree->radical t) i n)) +(tm-define (with-get-attributes t) + (let* ((a1 (cDr (tree-children t))) + (a2 (map tree->stree a1)) + (a3 (group-pairs a2))) + (list->ahash-table a3))) -(tm-define (enhanced-tree-property-ref t var) - (define res #f) - (if (string? var) - (set! var (stree->tree var))) - (if (enhanced-tree? t) - (foreach-number (i 0 < (- (tree-arity r) 1)) - (if (equal? (tree-ref t i) var) - (set! res (tree-ref t (+ i 1)))) - (set! i (+ 1 i)))) - res) - -(tm-define (enhanced-tree-property-set! t var val) - (define found #f) - (if (string? var) - (set! var (stree->tree var))) - (if (enhanced-tree? t) - (begin - (foreach-number (i 0 < (- (tree-arity r) 1)) - (if (equal? (tree-ref t i) var) - (begin - (set! found #t) - (tree-set! t (+ i 1) val))) - (set! i (+ 1 i)) - ) - (if (not found) - (tree-insert! t (tree-arity t) `(,var ,val)))))) +(define (ungroup-pairs l) + (if (null? l) l + (cons (caar l) + (cons (cdar l) + (ungroup-pairs (cdr l)))))) + +(tm-define (with-set-attributes t tab) + (let* ((a1 (ahash-table->list tab)) + (a2 (ungroup-pairs a1)) + (a3 (map tm->tree a2))) + (tree-remove! t 0 (- (tree-arity t) 1)) + (tree-insert! t 0 a3) + t)) + +(tm-define (graphical-get-attributes t) + (cond ((not (tree? t)) + (graphical-get-attributes (tm->tree t))) + ((not (tree-is? t 'with)) + (if (tree-is? t :up 'with) + (graphical-get-attributes (tree-ref t :up)) + (make-ahash-table))) + (else (with-get-attributes t)))) + +(tm-define (graphical-set-attributes t tab) + (cond ((not (tree? t)) + (tree->stree (graphical-set-attributes (tm->tree t) tab))) + ((not (tree-is? t 'with)) + (if (tree-is? t :up 'with) + (graphical-set-attributes (tree-ref t :up) tab) + (begin + (tree-insert-node! t 0 '(with)) + (graphical-set-attributes t tab)))) + (else + (set! t (with-set-attributes t tab)) + (if (and (tree-is? t 'with) (== (tree-arity t) 1)) + (tree-remove-node! t 0)) + t))) + +(tm-define (graphical-get-attribute* t var) + (ahash-ref (graphical-get-attributes t) var)) + +(tm-define (graphical-get-attribute t var) + (or (graphical-get-attribute* t var) + (graphics-attribute-default var))) + +(tm-define (graphical-set-attribute t var val) + (with new (graphical-get-attributes t) + (if val + (ahash-set! new var val) + (ahash-remove! new var)) + (graphical-set-attributes t new))) + +(tm-define (graphical-get-selected-attributes* t filter-list) + (let* ((old (graphical-get-attributes t)) + (new (make-ahash-table))) + (for (var filter-list) + (if (ahash-ref old var) + (ahash-set! new var (ahash-ref old var)))) + new)) + +(tm-define (graphical-get-selected-attributes t filter-list) + (with tab (graphical-get-selected-attributes t filter-list) + (for (var filter-list) + (if (and (not (ahash-ref tab var)) (graphics-attribute-default var)) + (ahash-set! tab var (graphics-attribute-default var)))) + tab)) + +(tm-define (graphical-set-selected-attributes t filter-list tab) + (with new (graphical-get-attributes t) + (for (var filter-list) + (if (ahash-ref tab var) + (ahash-set! new var (ahash-ref tab var)) + (ahash-remove! new var))) + (graphical-set-attributes t new))) + +(tm-define (graphical-relevant-attributes t) + (cond ((tm-is? t 'with) + (graphical-relevant-attributes (tm-ref t :last))) + ((tm-compound? t) + (graphical-relevant-attributes (tm-car t))) + (else (graphics-attributes t)))) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/init-texmacs.scm texmacs-1.0.7.14/TeXmacs/progs/init-texmacs.scm --- texmacs-1.0.7.13/TeXmacs/progs/init-texmacs.scm 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/init-texmacs.scm 2011-10-03 08:48:33.000000000 +0000 @@ -45,7 +45,8 @@ (kernel texmacs tm-preferences) (kernel texmacs tm-modes) (kernel texmacs tm-plugins) (kernel texmacs tm-secure) (kernel texmacs tm-convert) (kernel texmacs tm-dialogue) - (kernel texmacs tm-language) (kernel texmacs tm-file-system)) + (kernel texmacs tm-language) (kernel texmacs tm-file-system) + (kernel texmacs tm-states)) (inherit-modules (kernel gui gui-markup) (kernel gui menu-define) (kernel gui menu-widget) (kernel gui kbd-define) (kernel gui kbd-handlers) @@ -131,12 +132,14 @@ ;(display* "time: " (- (texmacs-time) boot-start) "\n") ;(display "Booting graphics mode\n") +(lazy-keyboard (graphics graphics-kbd) in-active-graphics?) (lazy-menu (graphics graphics-menu) graphics-menu graphics-icons) (lazy-define (graphics graphics-edit) + graphics-busy? graphics-reset-context graphics-undo-enabled - graphics-insert-point graphics-remove-point - graphics-last-point graphics-start-drag - graphics-dragging graphics-end-drag) + graphics-release-left graphics-release-middle + graphics-release-right graphics-start-drag-left + graphics-dragging-left graphics-end-drag-left) ;(display* "time: " (- (texmacs-time) boot-start) "\n") ;(display "Booting formal languages\n") diff -Nru texmacs-1.0.7.13/TeXmacs/progs/kernel/boot/abbrevs.scm texmacs-1.0.7.14/TeXmacs/progs/kernel/boot/abbrevs.scm --- texmacs-1.0.7.13/TeXmacs/progs/kernel/boot/abbrevs.scm 2011-09-07 20:50:09.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/kernel/boot/abbrevs.scm 2011-10-06 15:40:16.000000000 +0000 @@ -92,6 +92,10 @@ `(apply (lambda ,var ,@body) ,val) `(let ((,var ,val)) ,@body))) +(define-public-macro (with-define fun fun-body . body) + `(let ((,(car fun) (lambda ,(cdr fun) ,fun-body))) + ,@body)) + (define-public-macro (with-global var val . body) (let ((old (gensym)) (new (gensym))) `(let ((,old ,var)) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/kernel/boot/ahash-table.scm texmacs-1.0.7.14/TeXmacs/progs/kernel/boot/ahash-table.scm --- texmacs-1.0.7.13/TeXmacs/progs/kernel/boot/ahash-table.scm 2011-09-07 20:50:09.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/kernel/boot/ahash-table.scm 2011-10-04 10:56:08.000000000 +0000 @@ -108,6 +108,12 @@ (define-public (ahash-ref* h var val) (or (ahash-ref h var) val)) +(define-public (ahash-table-select t l) + (let ((r (make-ahash-table))) + (for-each (lambda (x) + (if (ahash-ref t x) (ahash-set! r x (ahash-ref t x)))) l) + r)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Dictionaries ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff -Nru texmacs-1.0.7.13/TeXmacs/progs/kernel/gui/kbd-handlers.scm texmacs-1.0.7.14/TeXmacs/progs/kernel/gui/kbd-handlers.scm --- texmacs-1.0.7.13/TeXmacs/progs/kernel/gui/kbd-handlers.scm 2011-09-07 20:50:09.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/kernel/gui/kbd-handlers.scm 2011-10-02 07:29:40.000000000 +0000 @@ -21,4 +21,5 @@ (noop)) (tm-define (mouse-event key x y mods time) - (mouse-any key x y mods time)) + ;;(display* "mouse-event " key ", " x ", " y ", " mods ", " time "\n") + (mouse-any key x y mods (+ time 0.0))) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/language/std-math.scm texmacs-1.0.7.14/TeXmacs/progs/language/std-math.scm --- texmacs-1.0.7.13/TeXmacs/progs/language/std-math.scm 2011-09-07 20:50:09.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/language/std-math.scm 2011-09-30 10:31:00.000000000 +0000 @@ -100,23 +100,18 @@ (:operator associative) (Relation-infix Post) (Pre Relation-infix) - Relation-symbol) + Relation-symbol + Arrow-symbol + (:) + (:)) (define Relation-prefix (:operator) (Relation-prefix Post) - Relation-symbol) - - (define Arrow-infix - (:operator associative) - (Arrow-infix Post) - (Pre Arrow-infix) - Arrow-symbol) - - (define Arrow-prefix - (:operator) - (Arrow-prefix Post) - Arrow-symbol) + Relation-symbol + Arrow-symbol + (:) + (:)) (define Union-infix (:operator associative) @@ -227,6 +222,15 @@ Close-symbol (:)) + (define Middle + (:operator associative) + Middle-symbol + (:)) + + (define Comma + (:operator associative) + Ponctuation-symbol) + (define Separator (:operator associative) Ponctuation-symbol @@ -278,14 +282,18 @@ Relaxed-expressions) (define Relaxed-expressions - (Relaxed-expressions Separator Relaxed-expression) + (Relaxed-expressions Middle Relaxed-expression-list) + Relaxed-expression-list) + + (define Relaxed-expression-list + Informal-relation + (Relaxed-expression-list Comma Relaxed-expression) Relaxed-expression) (define Relaxed-expression Assignment (Assign-prefix Modeling) - (Relation-prefix Arrow) - (Arrow-prefix Union) + (Relation-prefix Union) (Times-prefix Power) (Over-prefix Power) (Power-prefix Prefixed) @@ -299,7 +307,12 @@ (:)) (define Expressions - (Expressions Separator Expression) + (Expressions Middle Expression-list) + Expression-list) + + (define Expression-list + Informal-relation + (Expression-list Comma Expression) Expression) (define Expression @@ -309,6 +322,13 @@ Infix Prefix Postfix) + + (define Informal-relation + (Union-list Relation-infix Union)) + + (define Union-list + (Union-list Comma Union) + (Union Comma Union)) (define Assignment (Modeling Assign-infix Assignment) @@ -358,11 +378,7 @@ Relation) (define Relation - (Relation Relation-infix Arrow) - Arrow) - - (define Arrow - (Arrow Arrow-infix Union) + (Relation Relation-infix Union) Union) (define Union diff -Nru texmacs-1.0.7.13/TeXmacs/progs/math/math-edit.scm texmacs-1.0.7.14/TeXmacs/progs/math/math-edit.scm --- texmacs-1.0.7.13/TeXmacs/progs/math/math-edit.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/math/math-edit.scm 2011-09-30 10:26:31.000000000 +0000 @@ -269,6 +269,20 @@ (tree-set t 1 (list-ref wide-list-3 j))))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Wide arrows +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(tm-define (make-long-arrow s) + (when (and (string? s) (string-starts? s "<") (string-ends? s ">")) + (with rs (string-append "")) + (with rs (string-append "") ("< = = > !" "") + ("- ^" (make-long-arrow "")) + ("- > ^" (make-long-arrow "")) + ("< - ^" (make-long-arrow "")) + ("< - > ^" (make-long-arrow "")) + ("| - > ^" (make-long-arrow "")) + ("| var - > ^" (make-long-arrow "")) + ("< - | ^" (make-long-arrow "")) + ("= ^" (make-long-arrow "")) + ("= > ^" (make-long-arrow "")) + ("< = ^" (make-long-arrow "")) + ("< = > ^" (make-long-arrow "")) + ("- - ^" (make-long-arrow "")) + ("- - > ^" (make-long-arrow "")) + ("< - - ^" (make-long-arrow "")) + ("< - - > ^" (make-long-arrow "")) + ("| - - > ^" (make-long-arrow "")) + ("| var - - > ^" (make-long-arrow "")) + ("< - - | ^" (make-long-arrow "")) + ("= = ^" (make-long-arrow "")) + ("= = > ^" (make-long-arrow "")) + ("< = = ^" (make-long-arrow "")) + ("< = = > ^" (make-long-arrow "")) + + ("- _" (make-long-arrow* "")) + ("- > _" (make-long-arrow* "")) + ("< - _" (make-long-arrow* "")) + ("< - > _" (make-long-arrow* "")) + ("| - > _" (make-long-arrow* "")) + ("| var - > _" (make-long-arrow* "")) + ("< - | _" (make-long-arrow* "")) + ("= _" (make-long-arrow* "")) + ("= > _" (make-long-arrow* "")) + ("< = _" (make-long-arrow* "")) + ("< = > _" (make-long-arrow* "")) + ("- - _" (make-long-arrow* "")) + ("- - > _" (make-long-arrow* "")) + ("< - - _" (make-long-arrow* "")) + ("< - - > _" (make-long-arrow* "")) + ("| - - > _" (make-long-arrow* "")) + ("| var - - > _" (make-long-arrow* "")) + ("< - - | _" (make-long-arrow* "")) + ("= = _" (make-long-arrow* "")) + ("= = > _" (make-long-arrow* "")) + ("< = = _" (make-long-arrow* "")) + ("< = = > _" (make-long-arrow* "")) + ("@" "") ("@ /" "") ("@ +" "") diff -Nru texmacs-1.0.7.13/TeXmacs/progs/math/math-menu.scm texmacs-1.0.7.14/TeXmacs/progs/math/math-menu.scm --- texmacs-1.0.7.13/TeXmacs/progs/math/math-menu.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/math/math-menu.scm 2011-09-30 10:29:23.000000000 +0000 @@ -177,7 +177,9 @@ --- (tile 8 (link vertical-arrow-menu)) --- - (tile 6 (link long-arrow-menu))) + (tile 6 (link long-arrow-menu)) + --- + (link extensible-arrow-menu)) (-> "Negation" ("General negation" (key-press "/")) --- @@ -536,6 +538,10 @@ (symbol "") (symbol "")) +(menu-bind extensible-arrow-menu + ("Extensible left arrow" (make-long-arrow "")) + ("Extensible right arrow" (make-long-arrow ""))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Negations ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1021,7 +1027,9 @@ --- (tile 8 (link vertical-arrow-menu)) --- - (tile 6 (link long-arrow-menu))) + (tile 6 (link long-arrow-menu)) + --- + (link extensible-arrow-menu)) (=> (balloon (icon "tm_unequal.xpm") "Insert a negation") (tile 9 (link negation-menu-1)) --- diff -Nru texmacs-1.0.7.13/TeXmacs/progs/source/source-menu.scm texmacs-1.0.7.14/TeXmacs/progs/source/source-menu.scm --- texmacs-1.0.7.13/TeXmacs/progs/source/source-menu.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/source/source-menu.scm 2011-10-02 19:48:47.000000000 +0000 @@ -167,4 +167,5 @@ (make-style-with "src-compact" "none")) ((balloon (icon "tm_compact.xpm") "Compactify") (make-style-with "src-compact" "all")) + / (link text-format-icons)) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/text/format-text-menu.scm texmacs-1.0.7.14/TeXmacs/progs/text/format-text-menu.scm --- texmacs-1.0.7.13/TeXmacs/progs/text/format-text-menu.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/text/format-text-menu.scm 2011-09-18 07:42:27.000000000 +0000 @@ -427,33 +427,21 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (menu-bind text-format-icons - (if (style-has? "std-markup-dtd") + (if (not (style-has? "std-markup-dtd")) + (=> (balloon (icon "tm_parstyle.xpm") "Set paragraph mode") + ((balloon (icon "tm_left.xpm") "Align text to the left") + (make-line-with "par-mode" "left")) + ((balloon (icon "tm_center.xpm") "Center text") + (make-line-with "par-mode" "center")) + ((balloon (icon "tm_right.xpm") "Align text to the right") + (make-line-with "par-mode" "right")) + ((balloon (icon "tm_justify.xpm") "Justify text") + (make-line-with "par-mode" "justify"))) + (=> (balloon (icon "tm_parindent.xpm") "Set paragraph margins") + ("Left margin" (make-interactive-line-with "par-left")) + ("Right margin" (make-interactive-line-with "par-right")) + ("First indentation" (make-interactive-line-with "par-first"))) /) - (=> (balloon (icon "tm_parstyle.xpm") "Set paragraph mode") - ((balloon (icon "tm_left.xpm") "Align text to the left") - (make-line-with "par-mode" "left")) - ((balloon (icon "tm_center.xpm") "Center text") - (make-line-with "par-mode" "center")) - ((balloon (icon "tm_right.xpm") "Align text to the right") - (make-line-with "par-mode" "right")) - ((balloon (icon "tm_justify.xpm") "Justify text") - (make-line-with "par-mode" "justify"))) - (=> (balloon (icon "tm_parindent.xpm") "Set paragraph margins") - ("Left margin" (make-interactive-line-with "par-left")) - ("Right margin" (make-interactive-line-with "par-right")) - ("First indentation" (make-interactive-line-with "par-first"))) - (if (and (style-has? "env-float-dtd") (detailed-menus?)) - (if (not (inside? 'float)) - (=> (balloon (icon "tm_pageins.xpm") "Make a page insertion") - (link insert-page-insertion-menu))) - (if (inside? 'float) - (=> (balloon (icon "tm_floatpos.xpm") "Position floating object") - (link position-float-menu)))) - ;;((balloon (icon "tm_footnote.xpm") "Insert a footnote") ()) - ;;((balloon (icon "tm_margin.xpm") "Insert a marginal note") ()) - ;;((balloon (icon "tm_floating.xpm") "Insert a floating object") ()) - ;;((balloon (icon "tm_multicol.xpm") "Start multicolumn context") ()) - / (if (and (style-has? "std-markup-dtd") (not (in-source?))) ;;((balloon ;;(text (roman rm bold right 12 600) "S") diff -Nru texmacs-1.0.7.13/TeXmacs/progs/text/std-text-drd.scm texmacs-1.0.7.14/TeXmacs/progs/text/std-text-drd.scm --- texmacs-1.0.7.13/TeXmacs/progs/text/std-text-drd.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/text/std-text-drd.scm 2011-09-24 17:00:39.000000000 +0000 @@ -97,7 +97,7 @@ definition axiom notation) (define-group remark-tag - remark note example convention warning) + remark note example convention warning acknowledgments) (define-group exercise-tag exercise problem question) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/text/text-menu.scm texmacs-1.0.7.14/TeXmacs/progs/text/text-menu.scm --- texmacs-1.0.7.13/TeXmacs/progs/text/text-menu.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/text/text-menu.scm 2011-09-24 17:03:21.000000000 +0000 @@ -82,11 +82,13 @@ ("Axiom" (make 'axiom)) ("Definition" (make 'definition)) ("Notation" (make 'notation)) + ("Convention" (make 'convention)) --- ("Remark" (make 'remark)) ("Note" (make 'note)) ("Example" (make 'example)) ("Warning" (make 'warning)) + ("Acknowledgments" (make 'acknowledgments*)) ---) ("Exercise" (make 'exercise)) ("Problem" (make 'problem)) @@ -103,6 +105,14 @@ ("Underlined" (make 'underlined)) ("Lines around" (make 'bothlined)) ("Framed" (make 'framed)) + --- + ("Indent" (make 'indent)) + ("Jump in" (make 'jump-in)) + ("Compact" (make 'compact)) + --- + ("Centered" (make 'center)) + ("Left aligned" (make 'left-aligned)) + ("Right aligned" (make 'right-aligned)) (if (style-has? "ornaments-dtd") --- ("Manila paper" (make 'manila-paper)) @@ -323,10 +333,23 @@ (if (style-has? "std-list-dtd") (=> (balloon (icon "tm_list.xpm") "Insert a list") (link list-menu))) + (if (and (style-has? "env-float-dtd") (detailed-menus?)) + ;;((balloon (icon "tm_footnote.xpm") "Insert a footnote") ()) + ;;((balloon (icon "tm_margin.xpm") "Insert a marginal note") ()) + ;;((balloon (icon "tm_floating.xpm") "Insert a floating object") ()) + ;;((balloon (icon "tm_multicol.xpm") "Start multicolumn context") ()) + (if (not (inside? 'float)) + (=> (balloon (icon "tm_pageins.xpm") "Make a page insertion") + (link insert-page-insertion-menu))) + (if (inside? 'float) + (=> (balloon (icon "tm_floatpos.xpm") "Position floating object") + (link position-float-menu)))) (if (style-has? "section-base-dtd") (=> (balloon (icon "tm_index.xpm") "Insert automatically generated content") (link automatic-menu))) + (if (style-has? "std-markup-dtd") + /) (link text-format-icons) (link texmacs-insert-icons)) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/tm-mode.el texmacs-1.0.7.14/TeXmacs/progs/tm-mode.el --- texmacs-1.0.7.13/TeXmacs/progs/tm-mode.el 2011-09-07 20:50:11.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/tm-mode.el 2011-10-06 15:39:55.000000000 +0000 @@ -73,7 +73,7 @@ (append unary-keywords unary-definitions unary-no-highlight)) (setq binary-keywords - '(with with-global and-with with-innermost receive + '(with with-define with-global and-with with-innermost receive with-environment with-environment* converter hidden-input pagelet radio-button toggle-button $with)) diff -Nru texmacs-1.0.7.13/TeXmacs/progs/utils/library/cursor.scm texmacs-1.0.7.14/TeXmacs/progs/utils/library/cursor.scm --- texmacs-1.0.7.13/TeXmacs/progs/utils/library/cursor.scm 2011-09-07 20:50:10.000000000 +0000 +++ texmacs-1.0.7.14/TeXmacs/progs/utils/library/cursor.scm 2011-10-06 15:55:44.000000000 +0000 @@ -83,13 +83,33 @@ (define (go-to-next-inside-sub fun l) (do ((p (cursor-path) (cursor-path)) (q (begin (fun) (cursor-path)) (begin (fun) (cursor-path)))) - ((or (== p q) (innermost-pattern q l)) (noop)))) + ((or (== p q) (innermost-pattern q l)) + ;;(display* " End " q ", " (path->tree (cDr q)) "\n") + q) + ;;(display* " Next " q ", " (path->tree (cDr q)) "\n") + (noop))) (tm-define (go-to-next-inside fun . l) (with p (cursor-path) + ;;(display* " First " p ", " (path->tree (cDr p)) ", " (procedure-source fun) ", " l "\n") (go-to-next-inside-sub fun l) (if (not (innermost-pattern (cursor-path) l)) (go-to p)))) +(define (go-to-next-such-that fun pred?) + (do ((p (cursor-path) (cursor-path)) + (q (begin (fun) (cursor-path)) (begin (fun) (cursor-path)))) + ((or (== p q) (pred? (path->tree (cDr q)))) + ;;(display* "End " q ", " (path->tree (cDr q)) "\n") + q) + ;;(display* "Next " q ", " (path->tree (cDr q)) "\n") + (noop))) + +(tm-define (go-to-next-such-that fun pred?) + (with p (cursor-path) + ;;(display* "First " p ", " (path->tree (cDr p)) ", " (procedure-source fun) ", " pred? "\n") + (go-to-next-such-that fun pred?) + (if (not (pred? (path->tree (cDr (cursor-path))))) (go-to p)))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Routines for cursor movement ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;