# HG changeset patch # User Karoly Lorentey # Date 1177243949 0 # Node ID 738ce3540ffb1bf8ece158116e0facdf2a1c8084 # Parent edf631bdbb7adc610f71341fa0bfaa031c946e02# Parent 6faaecee918b84da4ff3fe8dd84770d65b529f31 Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-660 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-661 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-662 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-663 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-664 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-665 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-666 Fix read-only prompt problem in isearch * emacs@sv.gnu.org/emacs--devo--0--patch-667 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-668 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-669 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-670 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-671 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-672 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-673 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-206 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-207 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-208 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600 diff -r edf631bdbb7a -r 738ce3540ffb AUTHORS --- a/AUTHORS Sun Apr 22 11:42:03 2007 +0000 +++ b/AUTHORS Sun Apr 22 12:12:29 2007 +0000 @@ -19,9 +19,7 @@ Adrian Lanz: changed mail-source.el spam.el -Agustin Martin: changed flyspell.el ispell.el - -Agust,Am(Bn Mart,Am(Bn: changed flyspell.el +Agust,Am(Bn Mart,Am(Bn: changed flyspell.el ispell.el Aidan Kehoe: changed lread.c mm-util.el erc.el objects.texi @@ -99,7 +97,7 @@ parse-time.el startup.el tramp-vc.el vc-arch.el vc-mcvs.el vc-svn.el vcdiff viper-util.el -Andre Srinivasan: changed gnus-group.el gnus-sum.el gnus.texi +Andre Srinivasan: changed gnus-group.el gnus-sum.el gnus.texi message.el mm-decode.el mml.el nnmail.el Andrea Russo: changed erc-dcc.el info-look.el @@ -123,8 +121,8 @@ Andreas Schwab: changed Makefile.in files.el lisp.h xdisp.c configure.in alloc.c fns.c print.c coding.c editfns.c dired.el info.el eval.c - fileio.c simple.el buffer.c minibuf.c xterm.c emacs.c keyboard.c - process.c and 449 other files + fileio.c simple.el buffer.c minibuf.c process.c xterm.c emacs.c + keyboard.c and 449 other files Andreas Seltenreich: changed nnweb.el gnus.texi nnslashdot.el mm-uu.el battery.el comint.el easy-mmode.el gmm-utils.el gnus-art.el gnus-ml.el @@ -153,6 +151,8 @@ Andrey Slusar: changed gnus.el +Andrey Zhdanov: changed gud.el + Andy Norman: wrote ange-ftp.el Andy Petrusenco: changed w32term.c @@ -331,11 +331,11 @@ Cheng Gao: changed MORE.STUFF flymake.el tips.texi url-dired.el url-file.el url-handlers.el url-http.el url-nfs.el -Chong Yidong: changed cus-edit.el custom.el simple.el files.el - display.texi longlines.el text.texi custom.texi files.texi - image-mode.el info.el keyboard.c compile.el frames.texi mouse.el - startup.el wid-edit.el xdisp.c xterm.c cus-theme.el misc.texi - and 225 other files +Chong Yidong: changed cus-edit.el simple.el custom.el files.el + display.texi longlines.el keyboard.c text.texi custom.texi files.texi + image-mode.el info.el mouse.el xdisp.c compile.el frames.texi + startup.el wid-edit.el xterm.c cus-theme.el misc.texi + and 237 other files Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el @@ -370,6 +370,8 @@ and changed format.el gnus-art.el gnus-picon.el message.el register.el smiley.el texinfmt.el +Christopher Allan Webber: changed gamegrid.el tetris.el + Christopher J. Madsen: wrote decipher.el and changed files.el ispell.el replace.el time.el @@ -413,7 +415,7 @@ Dan Nicolaescu: wrote iris-ansi.el romanian.el and changed term.el xterm.el hideshow.el isearch.el icon.el lisp.h - cus-edit.el faces.el font-lock.el sh-script.el eterm-color.ti grep.el + cus-edit.el faces.el font-lock.el grep.el sh-script.el eterm-color.ti ibuffer.el rxvt.el vhdl-mode.el xterm.c bindings.el compile.el dabbrev.el imenu.el outline.el and 164 other files @@ -489,7 +491,7 @@ cl.texinfo complete.el edmacro.el and changed info.el bytecomp.el -David Hansen: changed nnrss.el tempo.el +David Hansen: changed nnrss.el pcomplete.el tempo.el David Hedbor: changed gnus-art.el mm-decode.el mm-view.el gnus-agent.el gnus-cite.el gnus-cus.el gnus-eform.el gnus-group.el gnus-msg.el @@ -507,7 +509,7 @@ David Kastrup: changed greek.el replace.el faq.texi search.c ange-ftp.el help.el mouse.el Makefile.in calc.el desktop.el keymaps.texi meta-mode.el process.c search.texi subr.el DEBUG DEVEL.HUMOR - MAILINGLISTS autoload.el browse-url.el buffer.c and 33 other files + MAILINGLISTS autoload.el browse-url.el buffer.c and 34 other files David K,Ae(Bgedal: wrote tempo.el and changed sendmail.el xmenu.c @@ -540,9 +542,9 @@ David Ponce: wrote recentf.el ruler-mode.el tree-widget.el and changed w32menu.c w32term.c close.png close.xpm empty.png empty.xpm - end-guide.png end-guide.xpm guide.png guide.xpm handle.png handle.xpm - keyboard.c leaf.png leaf.xpm no-guide.png no-guide.xpm no-handle.png - no-handle.xpm open.png open.xpm and 20 other files + end-guide.png end-guide.xpm files.el guide.png guide.xpm handle.png + handle.xpm keyboard.c leaf.png leaf.xpm no-guide.png no-guide.xpm + no-handle.png no-handle.xpm open.png and 21 other files David Reitter: wrote mailclient.el and changed commands.h cus-edit.el easy-mmode.el emacsbug.el @@ -551,13 +553,11 @@ David Robinson: changed menu-bar.el x-win.el -David S Goldberg: changed message.el - -David S. Goldberg: changed gnus-art.el - -David Z Maze: changed nnml.el - -David Z. Maze: changed nnrss.el +David S. Goldberg: changed gnus-art.el message.el + +David Z. Maze: changed nnml.el nnrss.el + +Deanna Phillips: changed configure.in Decklin Foster: changed nngateway.el @@ -567,11 +567,13 @@ dired-aux.el dnd.el doctor.el ebnf2ps.el echistory.el and 50 other files +Denis Bueno: changed autorevert.el + Denis Howe: wrote browse-url.el Denis St,A|(Bnkel: changed ibuf-ext.el -Derek Atkins: changed pgg-pgp.el +Derek Atkins: changed imap.el pgg-pgp.el Derek L. Davies: changed gud.el @@ -645,7 +647,7 @@ and changed msdos.c Makefile.in makefile.w32-in files.el info.el fileio.c startup.el mainmake.v2 config.bat menu-bar.el pc-win.el msdos.h rmail.el simple.el internal.el xfaces.c frame.c dosfns.c emacs.c - faces.el frame.el and 526 other files + faces.el frame.el and 523 other files Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el sh-script.el text.texi @@ -809,9 +811,7 @@ Gary Wong: changed termcap.c tparam.c -Gaute B Strokkenes: changed imap.el gnus-fun.el process.c - -Gaute Strokkenes: changed mail-source.el +Gaute B Strokkenes: changed imap.el gnus-fun.el mail-source.el process.c Geoff Greene: changed message.el @@ -829,13 +829,11 @@ Georges Brun-Cottan: wrote easy-mmode.el -Gerd Moellmann: wrote authors.el ebrowse.el jit-lock.el rx.el tooltip.el +Gerd M,Av(Bllmann: wrote authors.el ebrowse.el jit-lock.el rx.el tooltip.el and changed xdisp.c xterm.c dispnew.c dispextern.h xfns.c xfaces.c window.c keyboard.c lisp.h Makefile.in faces.el alloc.c buffer.c startup.el xterm.h fns.c simple.el term.c configure.in frame.c xmenu.c - and 619 other files - -Gerd M,Av(Bllmann: changed gnus-ems.el gnus-srvr.el mm-uu.el + and 620 other files Gergely Nagy: changed erc.el @@ -849,10 +847,10 @@ Giuseppe Scrivano: changed buffer.c configure.in sysdep.c xsmfns.c Glenn Morris: changed f90.el calendar.el diary-lib.el fortran.el - calendar.texi appt.el sh-script.el timeclock.el Makefile.in cal-menu.el - abbrevs.texi cal-hebrew.el cal-islam.el files.el holidays.el - orgcard.tex programs.texi scroll-all.el startup.el TUTORIAL.eo - cal-coptic.el and 103 other files + calendar.texi appt.el sh-script.el Makefile.in timeclock.el cal-menu.el + startup.el abbrevs.texi cal-hebrew.el cal-islam.el emacs.texi files.el + holidays.el orgcard.tex programs.texi scroll-all.el TUTORIAL.eo + and 112 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -877,7 +875,7 @@ Gregory Neil Shapiro: changed mailabbrev.el -Guanpeng Xu: changed add-log.el TUTORIAL.cn +Guanpeng Xu: changed add-log.el TUTORIAL.cn type-break.el Guillermo J. Rozas: wrote fakemail.c @@ -1044,7 +1042,7 @@ Jari Aalto: changed add-log.el filecache.el gnus-art.el lisp-mnt.el nnmail.el apropos.el autorevert.el compile.el cperl-mode.el debug.el - executable.el files.el finder.el font-lock.el gnus.texi grep.el + executable.el files.el finder.el font-lock.el gnus.el gnus.texi grep.el ls-lisp.el man.el sendmail.el terminal.el Jason Merrill: changed gnus-sum.el gnus-salt.el imap.el nnfolder.el @@ -1059,7 +1057,7 @@ calc-aent.el calc-prog.el calc-arith.el calc-help.el calc-lang.el calcalg2.el COPYING calc-graph.el calc-store.el calc-units.el calc-misc.el calc-yank.el calc-alg.el calc-poly.el calccomp.el - calc-mode.el calc-rewr.el and 35 other files + calc-mode.el calc-forms.el and 35 other files Jay K. Adams: wrote jka-cmpr-hook.el jka-compr.el @@ -1177,6 +1175,8 @@ erc-bbdb.el erc-button.el erc-compat.el erc-dcc.el erc-list.el erc-log.el and 12 other files +Johan Bockg,be(Brd: changed icomplete.el + Johan Vromans: wrote forms-d2.el forms.el iso-acc.el and changed complete.el @@ -1278,7 +1278,7 @@ and changed files.el perl-mode.el Juanma Barranquero: changed makefile.w32-in subr.el faces.el help-fns.el - files.el w32fns.c emacsclient.c replace.el buffer.c simple.el + files.el w32fns.c buffer.c emacsclient.c replace.el simple.el vhdl-mode.el bs.el cperl-mode.el eval.c org.el xdisp.c idlwave.el sh-script.el window.c ada-mode.el allout.el and 627 other files @@ -1294,7 +1294,7 @@ Jure Cuhalev: changed ispell.el -Juri Linkov: changed info.el simple.el isearch.el replace.el compile.el +Juri Linkov: changed info.el simple.el replace.el isearch.el compile.el faces.el display.texi grep.el descr-text.el cus-edit.el dired.el dired-aux.el edebug.el files.el lisp-mode.el lisp.el modes.texi mule.el compare-w.el desktop.el files.texi and 221 other files @@ -1318,7 +1318,7 @@ and changed gnus-agent.el message.el gnus-sum.el files.el nnmail.el tramp.texi gnus.el simple.el ange-ftp.el Makefile.in dired.el paragraphs.el bindings.el files.texi gnus-art.el gnus-group.el man.el - nntp.el INSTALL crisp.el fileio.c and 45 other files + nntp.el INSTALL crisp.el fileio.c and 44 other files Kailash C. Chowksey: changed HELLO Makefile.in ind-util.el kannada.el knd-util.el loadup.el makefile.w32-in @@ -1360,8 +1360,8 @@ Katsumi Yamaoka: wrote canlock.el and changed gnus-art.el message.el gnus-sum.el gnus.texi mm-decode.el mm-view.el gnus-util.el mm-util.el gnus-msg.el gnus.el lpath.el - gnus-group.el gnus-start.el rfc2047.el dgnushack.el mm-uu.el - gnus-agent.el mml.el nnrss.el nntp.el rfc2231.el and 73 other files + gnus-group.el gnus-start.el rfc2047.el dgnushack.el mm-uu.el nntp.el + gnus-agent.el mml.el nnrss.el rfc2231.el and 73 other files Kaveh R. Ghazi: changed delta88k.h xterm.c @@ -1430,8 +1430,8 @@ Kevin Layer: changed w32proc.c -Kevin Rodgers: changed compile.el files.el mailabbrev.el dired-x.el - simple.el ange-ftp.el byte-opt.el desktop.el dired-x.texi ffap.el +Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el files.el + ange-ftp.el byte-opt.el desktop.el diff-mode.el dired-x.texi ffap.el files.texi flyspell.el isearch.el killing.texi lisp.el loadhist.el mailalias.el menu-bar.el print.c replace.el sendmail.el and 5 other files @@ -1445,10 +1445,10 @@ Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el keypad.el kmacro.el -and changed xdisp.c dispextern.h simple.el window.c process.c keyboard.c - xterm.c w32term.c dispnew.c subr.el lisp.h fringe.c macterm.c +and changed xdisp.c dispextern.h simple.el process.c window.c keyboard.c + xterm.c subr.el w32term.c dispnew.c lisp.h fringe.c macterm.c display.texi fns.c alloc.c xfaces.c keymap.c xfns.c xterm.h .gdbinit - and 250 other files + and 252 other files Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el gnus-win.el gnus-xmas.el gnus.texi message.el nndraft.el nnml.el @@ -1529,7 +1529,7 @@ and changed erc.el erc-match.el erc-nets.el erc-nickserv.el erc-button.el erc-compat.el erc-dcc.el erc-fill.el erc-list.el erc-track.el Makefile erc-autoaway.el erc-autojoin.el erc-bbdb.el erc-ezbounce.el erc-menu.el - erc-netsplit.el erc-notify.el erc-sound.el subr.el + erc-netsplit.el erc-notify.el erc-sound.el subr.el tempo.el Lawrence R. Dodd: wrote dired-x.el and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el @@ -1550,7 +1550,7 @@ Liam Healy: changed outline.el -Lloyd Zusman: changed mml.el +Lloyd Zusman: changed mml.el pgg-gpg.el Luc Teirlinck: wrote help-at-pt.el and changed files.el autorevert.el cus-edit.el subr.el simple.el @@ -1622,7 +1622,7 @@ erc-log.el and 6 other files Mark A. Hershberger: changed xml.el nnrss.el mm-url.el cperl-mode.el - gnus-group.el + esh-mode.el gnus-group.el Mark D. Baushke: changed mh-e.el mh-utils.el mh-mime.el mh-comp.el mh-customize.el mh-index.el mh-loaddefs.el Makefile mh-identity.el @@ -1648,7 +1648,7 @@ Mark Plaksin: changed nnrss.el term.el -Mark Thomas: changed gnus-util.el nnmail.el +Mark Thomas: changed flow-fill.el gnus-sum.el gnus-util.el nnmail.el Mark W Maimone: changed mpuz.el @@ -1690,10 +1690,10 @@ Martin Neitzel: changed sc.el -Martin Rudalics: changed cus-edit.el wid-edit.el flyspell.el cus-start.el - files.el font-lock.el insdel.c macmenu.c syntax.c w32menu.c wdired.el - window.el xdisp.c xmenu.c backups.texi buffer.c buffer.h casefiddle.c - cperl-mode.el custom.el dispextern.h and 29 other files +Martin Rudalics: changed cus-edit.el wid-edit.el flyspell.el font-lock.el + complete.el cus-start.el files.el insdel.c macmenu.c syntax.c w32menu.c + wdired.el window.el xdisp.c xmenu.c backups.texi buffer.c buffer.h + casefiddle.c cperl-mode.el custom.el and 30 other files Martin Stjernholm: wrote cc-bytecomp.el and changed cc-engine.el cc-cmds.el cc-langs.el cc-defs.el cc-mode.el @@ -1833,9 +1833,9 @@ Michal Nazarewicz: changed ispell.el Micha,Ak(Bl Cadilhac: changed ido.el fill.el ispell.el anti.texi battery.el - blackbox.el bs.el cmuscheme.el cus-edit.el dispnew.c faq.texi - flyspell.el footnote.el glasses.el info.el life.el lpr.el make-mode.el - misc.texi pong.el print.c and 8 other files + blackbox.el bs.el cmuscheme.el complete.el cus-edit.el dispnew.c + faq.texi flyspell.el footnote.el glasses.el info.el life.el lpr.el + make-mode.el misc.texi pong.el and 9 other files Michelangelo Grigni: wrote ffap.el and changed gnus-score.el @@ -1870,7 +1870,7 @@ and changed comint.el faces.el simple.el editfns.c xfaces.c info.el xdisp.c minibuf.c wid-edit.el xterm.c subr.el window.el cus-edit.el diff-mode.el dispextern.h quick-install-emacs xfns.c help.el lisp.h - textprop.c bytecomp.el and 240 other files + textprop.c bytecomp.el and 241 other files Miyashita Hisashi: changed ccl.c coding.c coding.h mule-cmds.el mule-conf.el mule.el pop3.el @@ -1926,8 +1926,8 @@ Nick Roberts: wrote gdb-ui.el and changed gud.el building.texi tooltip.el speedbar.el bindings.el thumbs.el .gdbinit DEBUG cc-mode.el frames.texi subr.el xt-mouse.el - comint.el display.texi help-mode.el descr-text.el dired.el - gud-display.pbm speedbar.texi t-mouse.el tumme.el and 114 other files + comint.el display.texi help-mode.el t-mouse.el compile.el descr-text.el + dired.el gud-display.pbm speedbar.texi and 114 other files Nico Francois: changed w32fns.c w32inevt.c w32menu.c @@ -1945,6 +1945,8 @@ Noel Cragg: changed mh-junk.el +Norbert Koch: changed gnus-score.el + Nozomu Ando: changed unexmacosx.c alloc.c buffer.c mips.h pmax.h smtpmail.el sysselect.h unexelf.c @@ -2295,7 +2297,7 @@ and changed cl-indent.el font-lock.el ange-ftp.el mouse.el tex-mode.el vc-cvs.el add-log.el bindings.el bookmark.el debug.el diary-lib.el dired.el pcvs.el sgml-mode.el simple.el browse-url.el buff-menu.el - bytecomp.el cc-mode.el compile.el etags.el and 95 other files + bytecomp.el cc-mode.el compile.el etags.el and 96 other files Samuel Tardieu: changed smime.el @@ -2371,8 +2373,8 @@ url-imap.el and changed message.el gnus-sum.el gnus-art.el smtpmail.el pgg.el mml2015.el pgg-gpg.el gnus-agent.el mml.el mm-decode.el mml1991.el - gnus-group.el gnus-msg.el pgg-pgp5.el gnus-sieve.el gnus.el - browse-url.el gnus-int.el pgg-parse.el gnus-cache.el mail-source.el + gnus-group.el gnus-msg.el pgg-pgp5.el gnus-sieve.el browse-url.el + gnus-int.el gnus.el pgg-parse.el gnus-cache.el mail-source.el and 89 other files Simon Leinen: changed smtpmail.el Makefile Makefile.in cm.c cm.h hpux9.h @@ -2402,8 +2404,8 @@ reveal.el smerge-mode.el and changed vc.el font-lock.el pcvs.el newcomment.el subr.el lisp.h keyboard.c keymap.c tex-mode.el fill.el alloc.c compile.el files.el - regex.c easy-mmode.el simple.el info.el syntax.c vc-hooks.el xdisp.c - sh-script.el and 515 other files + regex.c simple.el easy-mmode.el info.el syntax.c vc-hooks.el xdisp.c + sh-script.el and 517 other files Steinar Bang: changed imap.el @@ -2464,7 +2466,7 @@ Stewart M. Clamen: wrote cal-mayan.el -Stuart D. Herring: changed minibuf.c widget.texi +Stuart D. Herring: changed keymap.c minibuf.c widget.texi Stuart Herring: changed files.el isearch.el align.el allout.el comint.el edebug.el find-lisp.el @@ -2526,7 +2528,7 @@ and changed ewoc.el info.el processes.texi zone.el Makefile.in vc.el fileio.c lisp-mode.el scheme.el text.texi TUTORIAL.it bindat.el dcl-mode.el display.texi files.el pcvs.el sysdep.c MORE.STUFF - TUTORIAL.ja diary-lib.el diff-mode.el and 125 other files + TUTORIAL.ja ange-ftp.el diary-lib.el and 126 other files Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el @@ -2640,7 +2642,7 @@ Viktor Dukhovni: wrote unexsunos4.c -Ville Skytt,Ad(B: changed mh-comp.el tcl.el +Ville Skytt,Ad(B: changed mh-comp.el pgg.el tcl.el Vincent Del Vecchio: changed info.el mh-utils.el diff -r edf631bdbb7a -r 738ce3540ffb ChangeLog --- a/ChangeLog Sun Apr 22 11:42:03 2007 +0000 +++ b/ChangeLog Sun Apr 22 12:12:29 2007 +0000 @@ -1,3 +1,25 @@ +2007-03-20 Richard Stallman + + * configure.in: Fix previous change. + +2007-03-19 Deanna Phillips (tiny change) + + * configure.in (arm-*-openbsd*, hppa-*-openbsd*) + (m88k-*-openbsd*, mips64-*-openbsd*, sh-*-openbsd*): Added. + (ns32k-*-openbsd*, ns32k-*-openbsd*): Deleted. + +2007-03-19 Chong Yidong + + * configure.in: Don't define KERBEROS, KERBEROS5, or HESIOD if the + user specifies "without". + + * configure: Regenerate. + +2007-03-18 Jan Dj,Ad(Brv + + * configure.in: Warning for Gtk+ and Cygwin added. + (HAVE_XFT): OLD_CFLAGS changed to OLD_CPPFLAGS. + 2007-02-27 Glenn Morris * make-dist (oldXMenu): Remove Imakefile. diff -r edf631bdbb7a -r 738ce3540ffb admin/FOR-RELEASE --- a/admin/FOR-RELEASE Sun Apr 22 11:42:03 2007 +0000 +++ b/admin/FOR-RELEASE Sun Apr 22 12:12:29 2007 +0000 @@ -6,20 +6,10 @@ make sure all the pages really look ok in the manual as formatted. ** Check for text in manuals that assumes current version is 21. -eshell.texi 'Known Problems' (does section need updating?) -cc-mode.texi 'Performance Issues': "21.3 as of this writing" ** Cleanup temporary +++/--- lines in etc/NEWS. ** Regenerate the postscript files of the reference cards in etc. -As of 2007/2/26, only ps files older than the associated tex files are: - cs-dired-ref.ps sk-dired-ref.ps - -May need update for Emacs-22: -dired-ref.tex cs-dired-ref.tex fr-drdref.tex sk-dired-ref.tex - -Fix overfull lines p3 fr-refcard.ps. - ** Ask maintainers of refcard translations to update them. @@ -28,7 +18,7 @@ LANG Translator Status cs Pavel Janík Can't work on it now. de Sven Joachim Done -fr Eric Jacoboni Done (layout might be improved) +fr Eric Jacoboni Done pl WÅ‚odek Bzyl Done pt-br Rodrigo Real Done ru Alex Ott Done @@ -40,7 +30,8 @@ and KDE projects, to use the new Emacs icons in etc/images/icons. * WINDOWS SUPPORT BUGS. -These don't need to be fixed to start pretest, but we call the + +These don't need to be fixed before a release, but we call the attention of Windows users to fixing them. ** Drew Adams 12 Aug bug rpt: overlay display artifact: trace left behind @@ -50,22 +41,14 @@ ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin. (Did we decide that is unreproducible?) -** make-network-process :nowait t doesn't work for non-local targets - on Windows. This has been "fixed" for Emacs 22 by defining - BROKEN_NON_BLOCKING_CONNECT in ms-w32.h. - - * BUGS -** Fix up copyright confusions. - See end of admin/notes/copyright. +** Kevin Rodgers missing assignment -** simon.marshall@misys.com, Jan 12: - Font-lock decides function call is function declaration in C++ +** flyspell and check-comments -** md5i@cs.cmu.edu, Feb 20: move-end-of-line in comint buffers - -** daniel@bigwalter.net, Feb 25: Echoing of keys and process I/O +** lennart.borgman@gmail.com, Feb 22: C-h k does not catch text properties keymaps + Update: Problem is only seen when viper-mode is enabled. * DOCUMENTATION diff -r edf631bdbb7a -r 738ce3540ffb admin/notes/copyright --- a/admin/notes/copyright Sun Apr 22 11:42:03 2007 +0000 +++ b/admin/notes/copyright Sun Apr 22 12:12:29 2007 +0000 @@ -15,19 +15,26 @@ Summary for the impatient: -1. Don't add a file to Emacs written by someone other than yourself -without thinking about the legal aspect (make sure they have an -assignment, adjust the copyright statements in the file). NB the -ChangeLog entry should be in the name of the author of the code, not -the person who installs it. +1. Don't add code to Emacs written by someone other than yourself +without thinking about the legal aspect. Even if the changes are +trivial, consider if they combine with previous changes by the same +author to make a non-trivial total. If so, make sure they have an +assignment. If adding a whole file adjust the copyright statements in +the file. -2. With images, add the legal info to a README file in the directory +2. When installing code written by someone else, the ChangeLog entry +should be in the name of the author of the code, not the person who +installs it. I think it is helpful to put the author (if not yourself) +in the CVS log as well; and to not install any of your own changes in +the same commit. + +3. With images, add the legal info to a README file in the directory containing the image. -3. If you add a lot of text to a previously trivial file that had no +4. If you add a lot of text to a previously trivial file that had no legal notices, consider if you should add a copyright statement. -4. Please don't just add an FSF copyright without checking that is the +5. Please don't just add an FSF copyright without checking that is the right thing to do. @@ -133,11 +140,15 @@ src/m/news-r6.h public domain, leave alone. +etc/BABYL, ms-kermit + no notices (see below). + etc/edt-user.doc - update BOTH notices in this file etc/emacs.csh - - keep simple license for this simple file + - written by Michael DeCorte, who has no assignment. But trivial + enough to not need license. etc/future-bug - doesn't need a humourless disclaimer, because Karl Fogel says we @@ -159,6 +170,12 @@ licenses that they have. They are distributed with Emacs but they are not part of Emacs." +etc/HELLO + standard notices. Just a note that although the file itself is not + really copyrightable, in the wider context of it being part of + Emacs (and written by those with assignments), a standard notice is + fine. + etc/MAILINGLISTS rms: simple license is fine for this file @@ -361,6 +378,21 @@ ** Some notes on resolved issues, for historical information only +etc/TERMS +rms: "surely written either by me or by ESR. (If you can figure out +which year, I can probably tell you which.) Either way, we have papers +for it." It was present in Emacs-16.56 (15-jul-85). rms: "Then I +conclude it was written by me." + +etc/ulimit.hack + Very obsolete file removed March 2007. Doesn't say who the author +is, but web-search suggests Karl Kleinpaste, who has no Emacs +assignment. Trivial anyway. +http://groups.google.com/group/comp.unix.shell/browse_thread/thread/bf3df496994\ +9f1df/7e5922c67b3a98fb +http://groups.google.com/group/comp.unix.questions/msg/cc7e49cacfd1ccb4 + (original 1987 source) + lisp/term/README - had no copyright notice till Feb 2007. ChangeLog.3 suggests it was written by Eric Raymond. When asked by rms on 14 Feb 2007 he said: @@ -381,11 +413,16 @@ admin/check-doc-strings File says it's in the public domain, but that might not make it so. +etc/BABYL + File written long ago by authors with no assignment. Keep them + without notices for now, try and contact authors if possible. Be + ready to remove these files if the authors ever object. +etc/ms-kermit etc/e/eterm-color.ti src/acldef.h, chpdef.h, ndir.h On legal advice from Matt Norwood, the following comment was added - to these files in Feb 2007: + to these files in Feb/Mar 2007: The code here is forced by the interface, and is not subject to copyright, constituting the only possible expression of the @@ -396,6 +433,21 @@ and possibly add a list of all authors who have changed these files. (details in email from Matt Norwood to rms, 2007/02/03). +etc/ms-7bkermit + Says it was written by Andy Lowry and Joel Spolsky. No entry for +either in copyright.list. NB this file is not "constrained" like +ms-kermit (rms: "We know it isn't. A comment at the front says it has +other bindings which might be handy."). File removed March 2007. +Re-add if clear up status at some point. + +etc/Xkeymap.txt + No info on author. File removed March 2007. rms: "It says it is +RLK's way of remapping his keyboard, so it is not constrained. I think +it was written by RLK. Let's delete it; if we contact RLK again, we +can put it back." Actually, RLK == Robert Krawitz has an Emacs +assignment. So this could be restored if it is still useful, but Jan Djärv +says it is obsolete: + src/m/mips4.h, news-risc.h, pmax.h src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h, @@ -493,11 +545,6 @@ noted in this file. -etc/BABYL - File says it was written in 1983 by Eugene Ciccarelli, who has no - assignment. RMS: "The lawyer said we can keep BABYL." - - REMOVED etc/gnu.xpm, nt/icons/emacs21.ico, nt/icons/sink.ico - Restore if find legal info. emacs21.ico is not due to Davenport. Voelker could not immediately recall anything, but will check and @@ -528,8 +575,8 @@ *** These are copyright issues still to be addressed: - -etc/ms-kermit - no copyright, but ms-7bkermit has one +Need an assignment from Kevin Rodgers (rms), else several changes to +deal with. diff -r edf631bdbb7a -r 738ce3540ffb configure --- a/configure Sun Apr 22 11:42:03 2007 +0000 +++ b/configure Sun Apr 22 12:12:29 2007 +0000 @@ -1839,11 +1839,13 @@ # Check whether --with-kerberos was given. if test "${with_kerberos+set}" = set; then - withval=$with_kerberos; cat >>confdefs.h <<\_ACEOF + withval=$with_kerberos; if test "$withval" = yes; then + cat >>confdefs.h <<\_ACEOF #define KERBEROS 1 _ACEOF fi +fi @@ -1857,23 +1859,25 @@ _ACEOF fi -fi cat >>confdefs.h <<\_ACEOF #define KERBEROS5 1 _ACEOF fi +fi # Check whether --with-hesiod was given. if test "${with_hesiod+set}" = set; then - withval=$with_hesiod; + withval=$with_hesiod; if test "$withval" = yes; then + cat >>confdefs.h <<\_ACEOF #define HESIOD 1 _ACEOF fi +fi @@ -2245,6 +2249,17 @@ opsys=openbsd case "${canonical}" in alpha*-*-openbsd*) machine=alpha ;; + arm-*-openbsd*) machine=arm ;; + hppa-*-openbsd*) machine=hp9000s300 ;; + i386-*-openbsd*) machine=intel386 ;; + m68k-*-openbsd*) machine=hp9000s300 ;; + m88k-*-openbsd*) machine=aviion ;; + mips64-*-openbsd*) machine=mips64 ;; + powerpc-*-openbsd*) machine=macppc ;; + sh-*-openbsd*) machine=sh3el ;; + sparc*-*-openbsd*) machine=sparc ;; + vax-*-openbsd*) machine=vax ;; + x86_64-*-openbsd*) machine=amdx86-64 ;; i386-*-openbsd*) machine=intel386 ;; x86_64-*-openbsd*) machine=amdx86-64 ;; m68k-*-openbsd*) machine=hp9000s300 ;; @@ -11739,7 +11754,7 @@ if test "$HAVE_XFT" != no; then OLD_CFLAGS="$CPPFLAGS" - OLD_CFLAGS="$CFLAGS" + OLD_CPPFLAGS="$CFLAGS" OLD_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" CFLAGS="$CFLAGS $XFT_CFLAGS" @@ -23053,6 +23068,16 @@ echo fi +if test "$USE_X_TOOLKIT" = GTK; then + case "$canonical" in + *cygwin*) + echo "There are known problems with Emacs and Gtk+ on cygwin, so you + will probably get a crash on startup. If this happens, please use another + toolkit for Emacs. See etc/PROBLEMS for more information." + ;; + esac +fi + # Remove any trailing slashes in these variables. diff -r edf631bdbb7a -r 738ce3540ffb configure.in --- a/configure.in Sun Apr 22 11:42:03 2007 +0000 +++ b/configure.in Sun Apr 22 12:12:29 2007 +0000 @@ -54,7 +54,9 @@ AH_TEMPLATE(MAIL_USE_POP, [Define to support POP mail retrieval.])dnl AC_ARG_WITH(kerberos, [ --with-kerberos support Kerberos-authenticated POP], -[AC_DEFINE(KERBEROS)]) +[if test "$withval" = yes; then + AC_DEFINE(KERBEROS) +fi]) AH_TEMPLATE(KERBEROS, [Define to support Kerberos-authenticated POP mail retrieval.])dnl AC_ARG_WITH(kerberos5, @@ -64,11 +66,13 @@ with_kerberos=yes AC_DEFINE(KERBEROS) fi -fi -AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.])]) + AC_DEFINE(KERBEROS5, 1, [Define to use Kerberos 5 instead of Kerberos 4.]) +fi]) AC_ARG_WITH(hesiod, [ --with-hesiod support Hesiod to get the POP server host], -[AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])]) +[if test "$withval" = yes; then + AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.]) +fi]) AC_ARG_WITH(sound, [ --without-sound don't compile with sound support]) @@ -279,13 +283,17 @@ opsys=openbsd case "${canonical}" in alpha*-*-openbsd*) machine=alpha ;; - i386-*-openbsd*) machine=intel386 ;; - x86_64-*-openbsd*) machine=amdx86-64 ;; - m68k-*-openbsd*) machine=hp9000s300 ;; - mipsel-*-openbsd*) machine=pmax ;; - ns32k-*-openbsd*) machine=ns32000 ;; - sparc-*-openbsd*) machine=sparc ;; - vax-*-openbsd*) machine=vax ;; + arm-*-openbsd*) machine=arm ;; + hppa-*-openbsd*) machine=hp9000s300 ;; + i386-*-openbsd*) machine=intel386 ;; + m68k-*-openbsd*) machine=hp9000s300 ;; + m88k-*-openbsd*) machine=aviion ;; + mips64-*-openbsd*) machine=mips64 ;; + powerpc-*-openbsd*) machine=macppc ;; + sh-*-openbsd*) machine=sh3el ;; + sparc*-*-openbsd*) machine=sparc ;; + vax-*-openbsd*) machine=vax ;; + x86_64-*-openbsd*) machine=amdx86-64 ;; esac ;; @@ -2123,7 +2131,7 @@ PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no) if test "$HAVE_XFT" != no; then OLD_CFLAGS="$CPPFLAGS" - OLD_CFLAGS="$CFLAGS" + OLD_CPPFLAGS="$CFLAGS" OLD_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" CFLAGS="$CFLAGS $XFT_CFLAGS" @@ -3211,6 +3219,16 @@ echo fi +if test "$USE_X_TOOLKIT" = GTK; then + case "$canonical" in + *cygwin*) + echo "There are known problems with Emacs and Gtk+ on cygwin, so you + will probably get a crash on startup. If this happens, please use another + toolkit for Emacs. See etc/PROBLEMS for more information." + ;; + esac +fi + # Remove any trailing slashes in these variables. diff -r edf631bdbb7a -r 738ce3540ffb etc/ChangeLog --- a/etc/ChangeLog Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/ChangeLog Sun Apr 22 12:12:29 2007 +0000 @@ -1,3 +1,34 @@ +2007-03-21 Glenn Morris + + * fr-refcard.tex (\metax): Tweak \hsize to avoid overfull columns. + (\shortcopyrightnotice): Do not display in middle of file. + Numerous \cr and \hskip hacks to avoid overfull columns. + + * fr-refcard.ps: Regenerate. + +2007-03-19 Chong Yidong + + * dired-ref.tex: + * fr-drdref.tex: + * cs-dired-ref.tex: + * sk-dired-ref.tex: Emacs 21 -> 22. + + * dired-ref.ps: + * fr-drdref.ps: + * cs-dired-ref.ps: + * sk-dired-ref.ps: Regenerate. + +2007-03-11 Glenn Morris + + * ms-7bkermit, ulimit.hack, Xkeymap.txt: Remove files. + + * Makefile (SOURCES): ulimit.hack is removed. + +2007-03-04 David Kastrup + + * NEWS (fontification): Mention that the new default for + jit-lock-stealth-time is now nil. + 2007-03-01 Kim F. Storm * ORDERS: Reformat text. @@ -574,7 +605,7 @@ * NEWS.21, NEWS.20: ... new files for Emacs 21 and Emacs 20 news. * ONEWS, ONEWS.1, ONEWS.2, ONEWS.3, ONEWS.4: Remove (rename) files ... * NEWS.19, NEWS.18, NEWS.1-17: ... and organize news about older Emacs - versions in separte files. Update copyright notices. + versions in separate files. Update copyright notices. 2006-06-03 Eli Zaretskii diff -r edf631bdbb7a -r 738ce3540ffb etc/Makefile --- a/etc/Makefile Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/Makefile Sun Apr 22 12:12:29 2007 +0000 @@ -37,7 +37,7 @@ -rm -f DOC* core *.dvi *.log SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* etags.* ledit.l ms-* \ - spook-lines tasks.texi termcap.* ulimit.hack *.tex + spook-lines tasks.texi termcap.* *.tex unlock: chmod u+w $(SOURCES) diff -r edf631bdbb7a -r 738ce3540ffb etc/NEWS --- a/etc/NEWS Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/NEWS Sun Apr 22 12:12:29 2007 +0000 @@ -1055,10 +1055,16 @@ --- *** The default settings for JIT stealth lock parameters are changed. -The default value for the user option jit-lock-stealth-time is now 16 -instead of 3, and the default value of jit-lock-stealth-nice is now -0.5 instead of 0.125. The new defaults should lower the CPU usage -when Emacs is fontifying in the background. +The default value for the user option jit-lock-stealth-time is now nil +instead of 3. This setting of jit-lock-stealth-time disables stealth +fontification: on today's machines, it may be a bug in font lock +patterns if fontification otherwise noticeably degrades interactivity. +If you find movement in infrequently visited buffers sluggish (and the +major mode maintainer has no better idea), customizing +jit-lock-stealth-time to a non-nil value will let Emacs fontify +buffers in the background when it considers the system to be idle. +jit-lock-stealth-nice is now 0.5 instead of 0.125 which is supposed to +cause less load than the old defaults. --- *** jit-lock can now be delayed with `jit-lock-defer-time'. @@ -1749,8 +1755,8 @@ To see what modules are available, type M-x customize-option erc-modules RET. -To start an IRC session, type M-x erc, and follow the prompts for -server, port, and nick. +To start an IRC session with ERC, type M-x erc, and follow the prompts +for server, port, and nick. --- ** Rcirc is now part of the Emacs distribution. @@ -1762,8 +1768,9 @@ (one-to-one) chats. Both channel and private chats are contained in separate buffers. -To start an IRC session, type M-x irc, and follow the prompts for -server, port, nick and initial channels. +To start an IRC session using the default parameters, type M-x irc. +If you type C-u M-x irc, it prompts you for the server, nick, port and +startup channel parameters before connecting. --- ** Newsticker is now part of the Emacs distribution. @@ -4072,6 +4079,10 @@ By setting this variable to a function, you can control how the editor command loop shows the user an error message. ++++ +*** `debug-on-entry' accepts primitive functions that are not special forms +now. + ** Lisp code indentation features: +++ @@ -4673,6 +4684,9 @@ finishes. It returns nil if BODY was aborted by a quit, and t if BODY was aborted by arrival of input. ++++ +*** `recent-keys' now returns the last 300 keys. + ** Minibuffer changes: +++ diff -r edf631bdbb7a -r 738ce3540ffb etc/NEWS.19 --- a/etc/NEWS.19 Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/NEWS.19 Sun Apr 22 12:12:29 2007 +0000 @@ -4557,7 +4557,7 @@ ** Changes to calendar/diary. Time zone data is now determined automatically, including the -start/stop days and times of daylight savings time. The code now +start/stop days and times of daylight saving time. The code now works correctly almost anywhere in the world. The format of the holiday specifications has changed and IS NO LONGER diff -r edf631bdbb7a -r 738ce3540ffb etc/PROBLEMS --- a/etc/PROBLEMS Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/PROBLEMS Sun Apr 22 12:12:29 2007 +0000 @@ -2393,8 +2393,11 @@ reported to either fail or cause Emacs to segfault at run time. In addition, the Cygwin GCC 3.4.4-2 has problems with generating debug info. Cygwin users are advised not to use these versions of GCC for -compiling Emacs. GCC versions 4.0.3 and 4.1.1 reportedly build a -working Cygwin binary of Emacs, so we recommend these GCC versions. +compiling Emacs. GCC versions 4.0.3, 4.1.1, and 4.1.2 reportedly +build a working Cygwin binary of Emacs, so we recommend these GCC +versions. Note that these three versions of GCC, 4.0.3, 4.1.1, and +4.1.2, are currently the _only_ versions known to succeed in building +Emacs (as of v22.1). *** Building the native MS-Windows port with Cygwin GCC can fail. diff -r edf631bdbb7a -r 738ce3540ffb etc/TODO --- a/etc/TODO Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/TODO Sun Apr 22 12:12:29 2007 +0000 @@ -509,6 +509,9 @@ * Internal changes +** Cleanup all the GC_ mark bit stuff -- there is no longer any distiction + since the mark bit is no longer stored in the Lisp_Object itself. + ** Merge ibuffer.el and buff-menu.el. More specifically do what's needed to make ibuffer.el the default, or just an extension of buff-menu.el. diff -r edf631bdbb7a -r 738ce3540ffb etc/Xkeymap.txt --- a/etc/Xkeymap.txt Sun Apr 22 11:42:03 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,120 +0,0 @@ -# -*-Mode: Fundamental-*- -# X keymap file for rlk with some emacsified bindings -# -# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# Free Software Foundation, Inc. -# See the end of the file for license conditions. -# -# This file contains the default keyboard mapping. The first column contains a X keyboard code; the other -# 16 columns contain the mapping of the keycode to a character string, with various combinations -# of the SHIFT, LOCK, META, and CONTROL keys down. See the man page for "keycomp" for more information. -# -# Keycode constants for non-typewriter keys are found in . -# -# It is easiest to edit this file with an EMACS window running across the entire width of the display, with -# tab stop set to 4. -# -# E1=Find, E2=Insert Here, E3=Remove, E4=Select, E5=Prev Screen, E6=Next Screen -# uns L S SL M ML MS MSL C CL CS CSL CM CML CMS CMSL -0212 0023, 0023, 0023, 0023, 0223, 0223, 0223, 0223, 0022, 0022, 0022, 0022, 0222, 0222, 0222, 0222, /* E1 */ -0213 U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, /* E2 */ -0214 0004, 0004, 0177, 0177, 0304, 0304, 0377, 0377, 0004, 0004, 0177, 0177, 0204, 0204, 0377, 0377 /* E3 */ -0215 U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, U, /* E4 */ -0216 0326, 0326, 0326, 0326, 0326, 0326, 0326, 0326, "\255\226" "\255\226" "\255\226" "\255\226" "\255\226" "\255\226" "\255\226" "\255\226" /* E5 */ -0217 0026, 0026, 0026, 0026, 0026, 0026, 0026, 0026, 0226, 0226, 0226, 0226, 0226, 0226, 0226, 0226, /* E6 */ -0247 0002, 0002, 0002, 0002, 0302, 0302, 0302, 0302, 0202, 0202, 0202, 0202, 0202, 0202, 0202, 0202, /* Left arrow */ -0250 0006, 0006, 0006, 0006, 0306, 0306, 0306, 0306, 0206, 0206, 0206, 0206, 0206, 0206, 0206, 0206, /* Right arrow */ -0251 0016, 0016, 0016, 0016, 0316, 0316, 0316, 0316, 0216, 0216, 0216, 0216, 0216, 0216, 0216, 0216, /* Down arrow */ -0252 0020, 0020, 0020, 0020, 0320, 0320, 0320, 0320, 0220, 0220, 0220, 0220, 0220, 0220, 0220, 0220, /* Up arrow */ -0222 0260, '0', 0260, '0', 0260, '0', 0260, '0', 0260, '0', 0260, '0', 0260, '0', 0260, '0', /* KP 0 */ -0224 0256, '.', 0256, '.', 0256, '.', 0256, '.', 0256, '.', 0256, '.', 0256, '.', 0256, '.', /* KP . */ -0225 '\n', '\n', '\n', '\n', 0312, 0312, 0312, 0312, 0212, 0212, 0212, 0212, 0212, 0212, 0212, 0212, /* KP Enter */ -0226 0261, '1', 0261, '1', 0261, '1', 0261, '1', 0261, '1', 0261, '1', 0261, '1', 0261, '1', /* KP 1 */ -0227 0262, '2', 0262, '2', 0262, '2', 0262, '2', 0262, '2', 0262, '2', 0262, '2', 0262, '2', /* KP 2 */ -0230 0263, '3', 0263, '3', 0263, '3', 0263, '3', 0263, '3', 0263, '3', 0263, '3', 0263, '3', /* KP 3 */ -0231 0264, '4', 0264, '4', 0264, '4', 0264, '4', 0264, '4', 0264, '4', 0264, '4', 0264, '4', /* KP 4 */ -0232 0265, '5', 0265, '5', 0265, '5', 0265, '5', 0265, '5', 0265, '5', 0265, '5', 0265, '5', /* KP 5 */ -0233 0266, '6', 0266, '6', 0266, '6', 0266, '6', 0266, '6', 0266, '6', 0266, '6', 0266, '6', /* KP 6 */ -0234 0254, ',', 0254, ',', 0254, ',', 0254, ',', 0254, ',', 0254, ',', 0254, ',', 0254, ',', /* KP , */ -0235 0267, '7', 0267, '7', 0267, '7', 0267, '7', 0267, '7', 0267, '7', 0267, '7', 0267, '7', /* KP 7 */ -0236 0270, '8', 0270, '8', 0270, '8', 0270, '8', 0270, '8', 0270, '8', 0270, '8', 0270, '8', /* KP 8 */ -0237 0271, '9', 0271, '9', 0271, '9', 0271, '9', 0271, '9', 0271, '9', 0271, '9', 0271, '9', /* KP 9 */ -0240 0255, '-', 0255, '-', 0255, '-', 0255, '-', 0255, '-', 0255, '-', 0255, '-', 0255, '-', /* KP - */ -0174 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, 0010, /* F15/Help */ -0175 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, 0037, /* F16/(Un)Do */ -0161 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, 0033, /* F11/ESC */ -0162 '\b', '\b', '\b', '\b', '\b', '\b', U, U, '\b', '\b', U, U, U, U, U, U, /* F12/BS */ -0163 '\n', '\n', '\n', '\n', '\n', '\n', U, U, '\n', '\n', U, U, U, U, U, U, /* F13/LF */ -0274 0177, 0177, 0177, 0177, 0377, 0377, 0377, 0377, 0030, 0030, 0177, 0177, 0377, 0377, 0377, 0377, /* back */ -0275 '\r', '\r', '\r', '\r', 0215, 0215, 0215, 0215, '\r', '\r', U, U, U, U, U, U, /* Return */ -0276 '\t', '\t', '\t', '\t', 0211, 0211, 0211, 0211, "\021\t" "\021\t" "\021\t" "\021\t" "\021\t" "\021\t" "\021\t" "\021\t" /* Tab */ -0277 '`', '`', '~', '~', 0340, 0340, 0376, 0376, 0036, 0036, 0036, 0036, U, U, U, U, /* ` */ -0300 '1', '1', '!', '!', 0261, 0261, 0241, 0241, '1', '1', '!', '!', U, U, U, U, /* 1 */ -0301 'q', 'Q', 'Q', 'Q', 0361, 0361, 0321, 0321, 0021, 0021, 0021, 0021, 0221, 0221, 0221, 0221, /* q */ -0302 'a', 'A', 'A', 'A', 0341, 0341, 0301, 0301, 0001, 0001, 0001, 0001, 0201, 0201, 0201, 0201, /* a */ -0303 'z', 'Z', 'Z', 'Z', 0372, 0372, 0332, 0332, 0032, 0032, 0032, 0032, 0232, 0232, 0232, 0232, /* z */ -0305 '2', '2', '@', '@', 0262, 0262, 0300, 0300, 0000, 0000, 0000, 0000, 0262, 0262, 0200, 0200, /* 2 */ -0306 'w', 'W', 'W', 'W', 0367, 0367, 0327, 0327, 0027, 0027, 0027, 0027, 0227, 0227, 0227, 0227, /* w */ -0307 's', 'S', 'S', 'S', 0363, 0363, 0323, 0323, 0023, 0023, 0023, 0023, 0223, 0223, 0223, 0223, /* s */ -0310 'x', 'X', 'X', 'X', 0370, 0370, 0330, 0330, 0030, 0030, 0030, 0030, 0230, 0230, 0230, 0230, /* x */ -0311 '<', '<', '>', '>', 0274, 0274, 0276, 0276, U, U, U, U, U, U, U, U, /* < */ -0313 '3', '3', '#', '#', 0263, 0263, 0243, 0243, 0033, 0033, '#', '#', U, U, U, U, /* 3 */ -0314 'e', 'E', 'E', 'E', 0345, 0345, 0305, 0305, 0005, 0005, 0005, 0005, 0205, 0205, 0205, 0205, /* e */ -0315 'd', 'D', 'D', 'D', 0344, 0344, 0304, 0304, 0004, 0004, 0004, 0004, 0204, 0204, 0204, 0204, /* d */ -0316 'c', 'C', 'C', 'C', 0343, 0343, 0303, 0303, 0003, 0003, 0003, 0003, 0203, 0203, 0203, 0203, /* c */ -0320 '4', '4', '$', '$', 0264, 0264, 0244, 0244, 0034, 0034, '$', '$', U, U, U, U, /* 4 */ -0321 'r', 'R', 'R', 'R', 0362, 0362, 0322, 0322, 0022, 0022, 0022, 0022, 0222, 0222, 0222, 0222, /* r */ -0322 'f', 'F', 'F', 'F', 0346, 0346, 0306, 0306, 0006, 0006, 0006, 0006, 0206, 0206, 0206, 0206, /* f */ -0323 'v', 'V', 'V', 'V', 0366, 0366, 0326, 0326, 0026, 0026, 0026, 0026, 0226, 0226, 0226, 0226, /* v */ -0324 ' ', ' ', ' ', ' ', 0240, 0240, 0240, 0240, 0000, 0000, 0000, 0000, 0200, 0200, 0200, 0200, /* space */ -0326 '5', '5', '%', '%', 0265, 0265, 0245, 0245, 0035, 0035, '%', '%', U, U, U, U, /* 5 */ -0327 't', 'T', 'T', 'T', 0364, 0364, 0324, 0324, 0024, 0024, 0024, 0024, 0224, 0224, 0224, 0224, /* t */ -0330 'g', 'G', 'G', 'G', 0347, 0347, 0307, 0307, 0007, 0007, 0007, 0007, 0207, 0207, 0207, 0207, /* g */ -0331 'b', 'B', 'B', 'B', 0342, 0342, 0302, 0302, 0002, 0002, 0002, 0002, 0202, 0202, 0202, 0202, /* b */ -0333 '6', '6', '^', '^', 0266, 0266, 0336, 0336, 0036, 0036, 0036, 0036, U, U, U, U, /* 6 */ -0334 'y', 'Y', 'Y', 'Y', 0371, 0371, 0331, 0331, 0031, 0031, 0031, 0031, 0231, 0231, 0231, 0231, /* y */ -0335 'h', 'H', 'H', 'H', 0350, 0350, 0310, 0310, 0010, 0010, 0010, 0010, 0210, 0210, 0210, 0210, /* h */ -0336 'n', 'N', 'N', 'N', 0356, 0356, 0316, 0316, 0016, 0016, 0016, 0016, 0216, 0216, 0216, 0216, /* n */ -0340 '7', '7', '&', '&', 0267, 0267, 0246, 0246, 0037, 0037, '&', '&', U, U, U, U, /* 7 */ -0341 'u', 'U', 'U', 'U', 0365, 0365, 0325, 0325, 0025, 0025, 0025, 0025, 0225, 0225, 0225, 0225, /* u */ -0342 'j', 'J', 'J', 'J', 0352, 0352, 0312, 0312, 0012, 0012, 0012, 0012, 0212, 0212, 0212, 0212, /* j */ -0343 'm', 'M', 'M', 'M', 0355, 0355, 0315, 0315, 0015, 0015, 0015, 0015, 0215, 0215, 0215, 0215, /* m */ -0345 '8', '8', '*', '*', 0270, 0270, 0252, 0252, 0177, 0177, '*', '*', U, U, U, U, /* 8 */ -0346 'i', 'I', 'I', 'I', 0351, 0351, 0311, 0311, 0011, 0011, 0011, 0011, 0211, 0211, 0211, 0211, /* i */ -0347 'k', 'K', 'K', 'K', 0353, 0353, 0313, 0313, 0013, 0013, 0013, 0013, 0213, 0213, 0213, 0213, /* k */ -0350 ',', ',', '<', '<', 0254, 0254, 0274, 0274, U, U, U, U, U, U, U, U, /* , */ -0352 '9', '9', '(', '(', 0271, 0271, 0250, 0250, '9', '9', '(', '(', U, U, U, U, /* 9 */ -0353 'o', 'O', 'O', 'O', 0357, 0357, 0317, 0317, 0017, 0017, 0017, 0017, 0217, 0217, 0217, 0217, /* o */ -0354 'l', 'L', 'L', 'L', 0354, 0354, 0314, 0314, 0014, 0014, 0014, 0014, 0214, 0214, 0214, 0214, /* l */ -0355 '.', '.', '>', '>', 0256, 0256, 0276, 0276, U, U, U, U, U, U, U, U, /* . */ -0357 '0', '0', ')', ')', 0260, 0260, 0251, 0251, '0', '0', ')', ')', U, U, U, U, /* 0 */ -0360 'p', 'P', 'P', 'P', 0360, 0360, 0320, 0320, 0020, 0020, 0020, 0020, 0220, 0220, 0220, 0220, /* p */ -0362 ';', ';', ':', ':', 0273, 0273, 0272, 0272, U, U, U, U, U, U, U, U, /* ; */ -0363 '/', '/', '?', '?', 0257, 0257, 0277, 0277, 0037, 0037, 0037, 0037, 0237, 0237, 0237, 0237, /* / */ -0365 '=', '=', '+', '+', 0275, 0275, 0253, 0253, U, U, U, U, U, U, U, U, /* = */ -0366 ']', ']', '}', '}', 0335, 0335, 0376, 0376, 0035, 0035, 0035, 0035, 0335, 0335, 0335, 0335, /* ] */ -0367 '\\', '\\', '|', '|', 0334, 0334, 0374, 0374, 0034, 0034, 0034, 0034, 0334, 0334, 0334, 0334, /* \ */ -0371 '-', '-', '_', '_', 0255, 0255, 0337, 0337, 0037, 0037, 0037, 0037, 0337, 0337, 0337, 0337, /* - */ -0372 '[', '[', '{', '{', 0333, 0333, 0373, 0373, 0033, 0033, 0033, 0033, 0333, 0333, 0333, 0333, /* [ */ -0373 '\'', '\'', '"', '"', 0247, 0247, 0242, 0242, U, U, U, U, U, U, U, U, /* ' */ -# -# local variables: -# tab-width: 4 -# End: -# -# This document is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This document is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this document; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# arch-tag: cbaa71af-719b-4647-a2c1-cd4d36a4fc64 diff -r edf631bdbb7a -r 738ce3540ffb etc/cs-dired-ref.ps --- a/etc/cs-dired-ref.ps Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/cs-dired-ref.ps Sun Apr 22 12:12:29 2007 +0000 @@ -1,15 +1,17 @@ %!PS-Adobe-2.0 -%%Creator: dvips(k) 5.86d Copyright 1999 Radical Eye Software +%%Creator: dvips(k) 5.95b Copyright 2005 Radical Eye Software %%Title: cs-dired-ref.dvi %%Pages: 1 %%PageOrder: Ascend -%%BoundingBox: 0 0 596 842 +%%BoundingBox: 0 0 595 842 +%%DocumentFonts: csbx10 csr8 csbx8 cstt8 csr6 CMSY6 +%%DocumentPaperSizes: a4 %%EndComments %DVIPSWebPage: (www.radicaleye.com) %DVIPSCommandLine: dvips cs-dired-ref.dvi -%DVIPSParameters: dpi=600, compressed -%DVIPSSource: TeX output 2002.02.13:1838 -%%BeginProcSet: texc.pro +%DVIPSParameters: dpi=600 +%DVIPSSource: TeX output 2007.03.19:1906 +%%BeginProcSet: tex.pro 0 0 %! /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72 @@ -28,22 +30,10 @@ definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get }B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub} B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr -1 add N}if}B/id 0 N/rw 0 N/rc 0 N/gp 0 N/cp 0 N/G 0 N/CharBuilder{save 3 -1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx -0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx -sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{ -rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp -gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B -/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{ -/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{ -A A add 255 and S 1 and or}ifelse}ifelse put 1 adv}B/rsh{rw cp 2 copy -get A 0 eq{pop 128}{A 255 eq{pop 127}{A 2 idiv S 128 and or}ifelse} -ifelse put 1 adv}B/clr{rw cp 2 index string putinterval adv}B/set{rw cp -fillstr 0 4 index getinterval putinterval adv}B/fillstr 18 string 0 1 17 -{2 copy 255 put pop}for N/pl[{adv 1 chg}{adv 1 chg nd}{1 add chg}{1 add -chg nd}{adv lsh}{adv lsh nd}{adv rsh}{adv rsh nd}{1 add adv}{/rc X nd}{ -1 add set}{1 add clr}{adv 2 chg}{adv 2 chg nd}{pop nd}]A{bind pop} -forall N/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn +1 add N}if}B/CharBuilder{save 3 1 roll S A/base get 2 index get S +/BitMaps get S get/Cd X pop/ctr 0 N Cdx 0 Cx Cy Ch sub Cx Cw add Cy +setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx sub Cy .1 sub]{Ci}imagemask +restore}B/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn /BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put }if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{ bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A @@ -67,702 +57,2040 @@ rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end %%EndProcSet -TeXDict begin 39158280 55380996 1000 600 600 (cs-dired-ref.dvi) -@start -%DVIPSBitmapFont: Fa cstt8 8 63 -/Fa 63 127 df<123812FEB3A8127C1200A7123812FEA51238072A72A923>33 -D35 -D<130E131FA4EB7FC03803FFF04813FC001F7F487FD87FDF1380EB1F1F00FEEB0FC012FC -00F8131FA312FCEC0F8000FEEB0700007F90C7FCEA3FDF13FF000F13C06C13F0000113FC -6C6C7EEB1FFFEC7F80141F15C0007C130F00FE1307A400FC130FA2007EEB1F80007F133F -9038DFFF006CB45A6C5B00075B6C13E038007F80011FC7FCA5130E1A347CAD23>I<000F -EB01C0391F8003E0383FC007EA7FE0140FD8F9F013C0141F00F01480A2143F150000F95B -147EEA7FE014FE6C485AEA1F80EA0F0100005B13035CA213075C130F5CA2131F5C133F91 -C7FCA25B137E9038FE03C09038FC07E0EC0FF00001EB1FF813F8EC3E7C12039038F03C3C -120713E0A2000FEB3E7C13C0001FEB1FF81380EC0FF0000FEB07E039070003C01E347EAD -23>I<137CEA01FE487E487FA2EBCFC0EA0F87A21303A31307A290380FCFF8EC9FFC139F -13BF3907FF0FF801FE138013FCA29038F81F00EA0FF0381FE01E383FF03E13F8007F5BEA -7E7C00FC1378EB3EF812F86D5AA290380FE03C1307EAFC0F90381FF07C387E3FFC007FB5 -12FC393FFE7FF8EBFC3F390FF01FE03907E007C01E2B7EA923>I40 D<131EA2131F131EA30070EB0380007C130F00FEEB1FC0397F -9E7F8090B5FC001FEBFE00000713F8000113E038007F803801FFE0000713F8001F13FE00 -7FEBFF80EB9E7F39FE1E1FC0007CEB0F8000701303000090C7FCA3131F131EA21A1D7CA2 -23>42 D -I<007FB51280B612C0A46C14801A067C9623>45 D<123E127FEAFF80A5EA7F00123E0909 -738823>II50 -DI60 D<007FB512F8B612FCA4003F14F8C9FCA6003FB512F8B612FCA46C14 -F81E127E9C23>I<127012FC7E7E13C06C7EEA1FF86C7E6C7E3801FF806C7FEB3FE0EB1F -F86D7EEB03FE903801FF806D13C0143FA214FF491380903803FE00EB0FFC495AEB3FE0EB -FFC0485BD807FEC7FC485A485AEA7FE0485A90C8FC5A5A12701A247CA523>I<3801FFC0 -000713F8001F13FE487F48148039FF007FC048130F1407A2140F007C131F0038EB7F80C7 -12FF01031300EB07FCEB0FF0495A5C495AA291C7FCA6133E90C8FCA7131C137FA5131C1A -297CA823>IIII<90380FE0E090383FF9F0EBFFFD4813FF5A3807 -FC3F380FF00F381FC007A2383F80031300481301127EA2007CEB00E000FC1400A25AA97E -A2127C007E14E0EC01F0127F7EEB8003EA1FC0EC07E0380FF00F3907FC1FC06CB512806C -14006C5BEB3FF8EB0FE01C2B7DA923>I<90381FC1C090387FF3E090B5FC12035AEBF83F -380FE01F381FC00F1380003F13071300007E1303A3007CEB01C000FC90C7FCA25AA6EC7F -F815FCA27E15F8007CEB03E0127E1407A27EEB800F121FEBC01FEA0FE03807F87F90B5FC -7EC613FB90387FF1C090381FC0001E2B7EA923>71 D<397FF00FFE39FFF81FFFA3397FF0 -0FFE390F8001F0AC90B5FCA5EB8001AE397FF00FFE39FFF81FFFA3397FF00FFE20297FA8 -23>II76 D<39FF8001FFA26D5AA3391EE00778 -A3EBF00FEB700EA2EB781EA2EB381CEB3C3CA2EB1C38EB1E78A2EB0E70A3EB07E0A3EB03 -C0A290C7FCA939FFC003FFA520297FA823>I<3803FFF0000F13FC487F487FA2397F807F -80387E001F007C130FA200FC14C0481307B3A46C130FA2007C1480A2007E131F387F807F -6CB51200A26C5B6C5B000313F01A2B7CA923>79 DI<3803FFF0000F13FC487F487FA2397F807F80387E -001F007C130FA200FC14C0481307B3A3131F148700FC138F397C0FCF80A2387E07FFEA7F -876CB51200A26C5B6C5B1203C7FC147EA280A2EC1F80A2140F1A337CA923>I<387FFFC0 -B512F88014FF7E390F807F80EC1FC0140F6E7E1403A514074A5A141FEC7F8090B5C7FCA2 -14FC8080EB807F6E7E141F140FA61587ED8F80A215CFD87FF013DF39FFF807FF1600806C -486C5AC812F8212A7FA823>I<9038FF83800003EBE3C04813FF121F5AEA7FC0EB003F00 -FE131F48130FA25A1407A26CEB038091C7FC127E127FEA3FF06CB4FC6C13F06C13FC0001 -7F39001FFF80010113C0EB001FEC0FE01407EC03F0A20070130112F8A36C1303A26CEB07 -E06C130F9038E03FC090B5FC15005C00F15B38703FE01C2B7DA923>I<39FFF81FFFA539 -0F8001F0B3A7EBC003A2000714E0EBE007EBF00F000314C0EBFC3F6CB512806C14006D5A -EB1FF8EB07E0202A7FA823>85 D<397FF07FF0EBF8FFA3EBF07F3907E03F000003133EEB -F07E0001137CEBF8FC00005B13FDEB7DF0137F6D5AA26D5AA26D5AA280131F80133F8013 -7DEB7CF813F8147CEA01F0801203497E12079038C00F80120F397FE03FF8D8FFF013FCA3 -D87FE013F81E297EA823>88 D<397FF00FFE39FFF81FFFA3397FF00FFE3907C003E0EBE0 -07000314C013F00001130F01F813800000131F01FC1300137C143E133E147EEB1F7CA26D -5AA26D5AA25C1303ACEB1FFC497EA36D5A20297FA823>I<003FB512E04814F0A4397C00 -07E0140FEC1FC01580143F0038EB7F00C7127E14FE495A5C1303495A5C130F495A5C133F -49C7FC137E13FE485A5B1203485A4913E0000FEB01F0EA1FC01380123FEA7F00127EB6FC -A46C14E01C297DA823>I<133013FCEA03FF000F13C0003F13F0B512FC1387EAFE0138F8 -007C00601318160A7AA823>94 D<007FB51280B612C0A46C14801A067C7E23>I<3803FF -80000F13E04813F8487F80EB80FFEC3F80381F001FC7FC140F14FF137F0003B5FC120F5A -387FF00F130012FCA25A141F7E6C133F387F81FF90B512FC6C14FE7E000713C73901FE01 -FC1F1D7D9C23>97 D99 DII<147F903801FFC0010713E05B5BEB3FCF140F90383E07C091C7FCA4 -007FB51280B612C0A36C1480D8003EC7FCB3383FFFFE487FA36C5B1B297EA823>III<133813FEA5133890C7FCA6EA7FFC487EA3127FEA00 -3EB3387FFFFEB6FCA36C13FE182A7AA923>I<14E0EB03F8A5EB00E01400A63803FFF048 -13F8A37EC7FCB3AB13011238387C03F012FEEB0FE0B5FC14C06C13006C5AEA0FF815397D -A923>III<397E1F01F039FF7FC7FC9038FFEFFE14FF6C80390FE1FE1F -EBC1FC01C07FEB80F8A2EB00F0AE3A7FE3FE3FE026FFF3FF13F0A3267FE3FE13E0241D81 -9C23>I<38FF81FCEBC7FF01DF138090B512C0A23907FE0FE0EBF807EBF00313E0A313C0 -AD39FFFE1FFF5CA380201D7F9C23>I<133F3801FFE0487F487F487F381FC0FE383F807F -383E001F007E1480007C130F00FC14C0481307A66C130FA2007C1480007E131F6CEB3F00 -6D5A381FE1FE6CB45A6C5B6C5B6C5BD8003FC7FC1A1D7C9C23>I<38FF81FCEBC7FF01DF -13C090B512E015F03907FE0FF8EBF8039038F001FCEBE000A249137EA2153EA5157E7F15 -FC7F14019038F803F89038FE0FF090B5FC15E001DF138001CF1300EBC3F801C0C7FCAAEA -FFFEA51F2C7F9C23>I<90383FC1C09038FFF3E0000313FB4813FF5A381FF07F383FC01F -387F000F127E14075A14035AA57E1407127E140F007F131FEA3F80381FE07F90B5FC1207 -6C13FB6C13E338003F83EB0003AAEC7FFF91B51280A36E1300212C7E9C23>I<397FF00F -E039FFF87FF8ECFFFC13FB6CB5FCC613F8ECC078EC800091C7FC5BA25BA35BAA387FFFFC -B57EA36C5B1E1D7E9C23>I<3801FF9C000F13FE5A127FA2EAFF0000FC137E48133EA26C -131C6C1300EA7FF0383FFF80000F13E06C13F838007FFCEB01FEEB007F0070133F00F813 -1F7E143F7E38FF80FFEBFFFE14FC14F814F000701380181D7B9C23>I<137013F8A7007F -B51280B612C0A36C1480D800F8C7FCACEC01C0EC03E0A3EBFC07140F9038FE1FC0EB7FFF -158090383FFE00EB0FFCEB07F01B257EA423>I<39FF807FC001C013E0A400071303B014 -07140FEBE03F90B6FC7EA2C613F3EB3FC1201D7F9C23>I<39FFF03FFCA5390F8007C000 -071480A2EBC00F00031400A26D5A0001131EA2EBF03E0000133CA2EBF87CEB7878A2EB7C -F8EB3CF0A2133F6D5AA36D5A6D5A1E1D7E9C23>I<397FF00FFE39FFF81FFFA3397FF00F -FE001FC712F86C14F0A57F390783E1E0EB87F1A3EB8FF90003EB79C013CFA2EBDF7BA2EB -DE3B00011480EBFE3FA2EBFC1FA23900F80F00201D7F9C23>I<397FF07FF039FFF8FFF8 -A3397FF07FF03903E03E003801F03C3800F87CEB78F8EB7CF0EB3FE0131F6D5A5C130749 -7E497E133DEB3CF0EB7878EBF07C0001133C497E3803C01F397FF03FF839FFF87FFCA339 -7FF03FF81E1D7E9C23>I123 D125 D<3803C038380FF07C381FF8FCEA3FFF4813F8B512F038FC7FE038F83FC038 -700F0016097AA823>I E -%EndDVIPSBitmapFont -%DVIPSBitmapFont: Fb csbx10 12 40 -/Fb 40 254 df<923B1FFF8001FFC00203B5D8F01F13F0021FDAF87F13FC027F91B67E90 -2701FFF803ECC3FF49D9C001EBFE0790270FFE000349481380494815F84A4913F0494815 -E0495AA201FF4C6C13004A6D6E5A735A70EC00707092C7FCAABA12FCA5C601E0C701E0C8 -FCB3B0007F9026FFC07FEBFFF0A549467EC543>11 DI68 -D70 D77 DI<923803FFE0037F13FF0203B612E0021F15FC027F903800 -7FFF902601FFF8010F13C04901C001017F010F496D13F84948C8EA3FFC49486F7E49486F -7E01FF8448496F7F4A81488548496F7FA248496F7FA2488591CA127F4885A348854983A4 -00FF1A80AD007F1A006D5FA36C61A26E16FF6C61A36C6D4B5BA26C6D4B5B6C616E5D6C6D -4B5B6C6D4B5B6D6C4B90C7FC6D6C4B5A6D6D4A5A6D01E001035B010301F8010F13E06D01 -FF017F5B6D6C90B6C8FC021F15FC020715F0DA007F91C9FC030713F049467AC456>II83 D<001FB9FC1980A402FCC7140002C05B91C75C01FC4A5B494A5B495C495E48484A -5B5E495E4C5B90C8B5FC95C7FC4B5B003E5C5F4B5B5D5FC8485B4B5BA24B5B92B5C8FC5C -5E4A5B5C5E4A5B5C5E4A5B5C5E91B5C7EA0F80495BA2495B495B49161F5D494915005B5D -49495C90B5FC92C8FC48495D5A4A5D48495C485E4A5C48495C4849143F48EEFFFE4A130F -B9FCA47E39447AC346>90 D<903801FFF8011FEBFF80017F14E090B612F8489038807FFC -3A03FE001FFE486CEB07FF486E7F0280806F7FA36F7F6C90C7FCA26C5AEA00F890C8FCA2 -150F021FB5FC0103B6FC131F017F13C03901FFFC004813E0000F13804890C7FC485A5B48 -5AA2485AA45DA26C6C5BED07BF6C6C010F13FC6CB490391F3FFFE06C9026C0FE1F13F06C -EBFFFC6CECF007C66CD9E00113E0010790C9FC342F7DAD38>97 DIIII<902601FFF013FF010F -D9FE031380013FD9FF8F13C090B812E048D9C07F13BF489039001FF83F4848EB0FFC4848 -EB07FE001F9238FF1FC0496DEB0F8094C7FC003F82A7001F93C7FCA26D5B000F5D6C6C49 -5A6C6C495A6C9038C07FF04890B55A1680D8078F49C8FC018113F0D80F80CAFCA47F7F13 -F890B612E016FEEEFFC06C16F0836C826C82831207481780D81FF8C77ED83FE014074848 -020113C000FF8149157FA56D15FF007F17806D5C6C6C4A1300D81FFCEC0FFE6CB4EC3FFC -6C9039E001FFF8000190B612E06C6C1580010F02FCC7FCD9007F138033427DAC39>103 -D<13FCEA03FF4813804813C0A24813E0A66C13C0A26C13806C1300EA00FC90C7FCA9EB7F -C0EA7FFFA512037EB3AFB6FCA518467CC520>105 D107 DI<90287FC003FF80EB07FFB5011F01F0013F13E0037F6D90B5 -7E92B56C4880913DC1FC1FFE03F83FFC913DC3E00FFF07C01FFE00039026C7C00790398F -800FFF6CD9CF00EC9E0002DE6D01BC7F02FC03F81580A24A5D4A5DA34A5DB3A7B600C1B6 -0083B6FCA5582D7CAC5F>I<903A7FC003FF80B5011F13F0037F7F92B57E9139C1FC1FFE -9139C3E00FFF00039026C7C0077F6CEBCF0002DE7F02FC81A25C5CA35CB3A7B600C1B612 -80A5392D7CAC40>II<90397FC01FFCB590B512C002C314F002CF14FC9139DFF03FFF9126FF800F13800003 -9026FE000313C06C496D13E002F015F04A7FEF7FF8A218FC173F18FEA3EF1FFFAB18FE17 -3FA318FC177F18F817FF6E15F06E4913E06E4913C06E4913806E6C4813009238E07FFE02 -EFB55A02E314F002E01480DB1FF8C7FC92C9FCADB612C0A538407DAC40>I<90397F803F -C0B5EBFFF0028313F8028713FC91388FE7FE91389F8FFF0003EB9E0F6C13BCA214F8A291 -38F007FEED03FC9138E001F892C7FCA35CB3A5B612C0A5282D7DAC2F>114 -D<90391FFE078090B512DF000314FF5A380FF803381FE000D83F80133F127F90C7121FA2 -48140FA27FA201E090C7FC13F8EBFFC06C13FEECFFC06C14F015FC6C806C806C15800001 -15C07E011F14E01301D9000713F014000078147F00F8143F151F6C140FA37E6C15E0151F -6D14C06D133F01F0EB7F809039FC03FF0090B55A00FC5CD8F83F13F0D8F00790C7FC242F -7CAD2D>IIII<007FB5398007FFFCA5000101F0C7EA7F806CEE3E006E14 -7E017F157C8017FC013F5D6E1301011F5D6E13036D5DED80076D5DEDC00F6D5D15E0161F -6D92C7FC6F5A6D143EEDF87E027F137CEDFCFC023F5B15FF6E5BA36E5BA26E5BA26E5BA2 -6E90C8FCA26E5AA2157CA215FC5D1401000F5C383FC003D87FE05B1407D8FFF05B140F5D -141F4AC9FC387FE07E495A383F87F8EBFFF06C5B00071380D801FCCAFC36407EAB3C> -121 D<001FB7128017C0A39026FE001F138001F05B49491300495C49495A48485A4A5B5E -4A5B003E5B4A5B5E4A90C7FC5CC7485A5D495B5B495B5D499038C007C05B491380150049 -48130F01FF1580485B5C4849131F5A485B4A133F4849137F4815FF48EB000349011F1300 -B8FCA37E2A2C7DAB33>I<0070EC038000F8EC07C0007EEC1F806CEC3F00D81FC013FE6C -6C485A3907F807F8EBFE1F6C6C485A6CEBFFE06C5C6D5B6D90C7FC6D5A6D5A6D5A6D5A6D -5A6D5A91C8FCA290391FFE078090B512DF000314FF5A380FF803381FE000D83F80133F12 -7F90C7121FA248140FA27FA201E090C7FC13F8EBFFC06C13FEECFFC06C14F015FC6C806C -806C1580000115C07E011F14E01301D9000713F014000078147F00F8143F151F6C140FA3 -7E6C15E0151F6D14C06D133F01F0EB7F809039FC03FF0090B55A00FC5CD8F83F13F0D8F0 -0790C7FC24447CC22D>185 D<00071538486C147CD807E0495A6C6C495AD801FCEB0FE0 -6C6C495A90397F807F80ECE1FFD93FF390C7FC6DB45A6D5B6D5B6D5B6D5B6D5B6E5A6EC8 -FC141E140C91C9FCA4001FB7128017C0A39026FE001F138001F05B49491300495C49495A -48485A4A5B5E4A5B003E5B4A5B5E4A90C7FC5CC7485A5D495B5B495B5D499038C007C05B -49138015004948130F01FF1580485B5C4849131F5A485B4A133F4849137F4815FF48EB00 -0349011F1300B8FCA37E2A437DC233>190 D<162016FCED03FE824B7F5D5DA25D5D94C7 -FC4B5A4A5B4A13E016804A48C8FCEC0FF815E092C9FC140491CAFCA5903801FFF8011FEB -FF80017F14E090B612F8489038807FFC3A03FE001FFE486CEB07FF486E7F0280806F7FA3 -6F7F6C90C7FCA26C5AEA00F890C8FCA2150F021FB5FC0103B6FC131F017F13C03901FFFC -004813E0000F13804890C7FC485A5B485AA2485AA45DA26C6C5BED07BF6C6C010F13FC6C -B490391F3FFFE06C9026C0FE1F13F06CEBFFFC6CECF007C66CD9E00113E0010790C9FC34 -487DC638>225 D<0170EC038001F8EC07C0017EEC1F806DEC3F00D91FC013FE6D6C485A -903907F807F8ECFE1F6D6C485A6DEBFFE06D5C6E5B6E90C7FC6E5A6E5A6E5A6E5A6E5A6E -5A92C8FCA2EC3FFE49B512E0010F14F8013F8090397FF807FE9039FFE001FF4849481380 -48018014C048495A485A121FA2485A6F1380A2007F6E130049EB007C93C7FC12FFAC127F -7FA2123FEE03E06C7E16076C6C15C06C150F6C6DEB1F806C6DEB3F006C01F013FE90397F -FE03FC6DB55A010F5C010314C09026003FFCC7FC2B447CC233>232 -D<1608163FEEFF8017C04B13E05D5DA25D5D17C04B13804B1300EDFFF816E04A13804A48 -C7FC15F815C06EC8FC91C9FCA5EC1FFE49B512C0010714F0011F14FC90397FFC0FFE903A -FFE003FF804849C613C0485B4890C7EA7FE048ED3FF0485AEE1FF8485AA2007F150F4915 -FCA212FFA390B7FCA317F801F8C9FCA5127FA27FA2003F1638177C6C6C15FCA26C6CEC01 -F86C6D13036CED07F06C6DEB0FE06C01F0EB3FC0903A3FFE01FF806DB5EAFE0001075C01 -0014F0020F90C7FC2E487DC635>I<0170EC038001F8EC07C0017EEC1F806DEC3F00D91F -C013FE6D6C485A903907F807F8ECFE1F6D6C485A6DEBFFE06D5C6E5B6E90C7FC6E5A6E5A -6E5A6E5A6E5A6E5A92C8FCA2EC1FFE49B512C0010714F0011F14FC90397FFC0FFE903AFF -E003FF804849C613C0485B4890C7EA7FE048ED3FF0485AEE1FF8485AA2007F150F4915FC -A212FFA390B7FCA317F801F8C9FCA5127FA27FA2003F1638177C6C6C15FCA26C6CEC01F8 -6C6D13036CED07F06C6DEB0FE06C01F0EB3FC0903A3FFE01FF806DB5EAFE0001075C0100 -14F0020F90C7FC2E447DC235>236 D<1408143FECFF8015C04913E05B5BA25B5B15C049 -1380491300EBFFF814E04813804848C7FC13F813C06CC8FCC9FCA6EB7FC0EA7FFFA51203 -7EB3AFB6FCA51B477CC620>I<00071538486C147CD807E0EB01F86C6CEB03F0D801FCEB -0FE06C6CEB1FC090397F807F80ECE1FFD93FF313006DB45A6D5B6D5B6D5B6D5B6D5B6E5A -6EC7FC141E140C91C8FCA390397F803FC0B5EBFFF0028313F8028713FC91388FE7FE9138 -9F8FFF0003EB9E0F6C13BCA214F8A29138F007FEED03FC9138E001F892C7FCA35CB3A5B6 -12C0A528437DC22F>248 D<157F913801FFC04A7F4A7FA291380FC1F81580A515C16EB4 -5AA26E5B6E5B6E6CC9FC92CAFCA7D93FE0EC7FC0B549B5FCA50003EC00076C81B3A85EA3 -5E6C5DA26E013D7F017F02F9EBFF8090393FFC03F16DB512E16D14C1010314019026003F -FC91C7FC39467CC440>I<1602EE0FC0EE3FE0834C7E16FF5DA25D5D5F4B5B4B5B4B48C7 -FC16F8ED7FE0EDFF804BC8FC15F0154092C9FCA7007FB5398007FFFCA5000101F0C7EA7F -806CEE3E006E147E017F157C8017FC013F5D6E1301011F5D6E13036D5DED80076D5DEDC0 -0F6D5D15E0161F6D92C7FC6F5A6D143EEDF87E027F137CEDFCFC023F5B15FF6E5BA36E5B -A26E5BA26E5BA26E90C8FCA26E5AA2157CA215FC5D1401000F5C383FC003D87FE05B1407 -D8FFF05B140F5D141F4AC9FC387FE07E495A383F87F8EBFFF06C5B00071380D801FCCAFC -365B7EC63C>253 D E -%EndDVIPSBitmapFont -%DVIPSBitmapFont: Fc csbx8 8 24 -/Fc 24 249 df<14E01301EB07C0EB0F80EB1F00133E137E5B5B1201485AA2485AA2485A -A2121F5B123FA290C7FC5AA512FEAF127FA57E7FA2121F7F120FA26C7EA26C7EA26C7E12 -007F137E133E7FEB0F80EB07C0EB01E01300134378B120>40 D<12E07E127C7E7E6C7E7F -6C7E12037F6C7EA26C7EA2137EA2137F7F1480A2131F14C0A5EB0FE0AFEB1FC0A5148013 -3FA214005B137EA25BA2485AA2485A5B1207485A5B48C7FC123E5A12F05A13437CB120> -I68 D79 D<007FB548B512E0A4C690 -3AE0000FE0006D6C5C6E495A6D6C49C7FC011F5C6D6C137E6E5B6DEB81F86D13836DEBC7 -F0EDE7E06DEBFFC06E5B8093C8FC6E5A140F6E7E826E7F5C4A7F4A7F82EC3F3F91387E1F -FC02FE7F4A6C7E49487E49486C7F0107814A6C7F49487E49486D7E013F8149C76C7E017E -141F496E7EB5D8F001B512FCA4362E7DAD3D>88 D97 D99 DI106 DI<2707E00FF8EB1FF000FFD97FFEEBFF -FC01E1B5008313FF9028E7E07FCFC01380903BEF803FDF007F260FFE0013FC031FEC3FC0 -495C495CA2495CB0B53B01FFFE03FFFCA43E1E7C9D45>109 D<3907E01FF000FFEB7FFC -01E1B5FCD9E7E013809038EF807F260FFE0013C049133FA25BA25BB0B53803FFFCA4261E -7C9D2D>II<3903F03FE039FF -F1FFFC01F713FFD9FFC013809039FE007FC0D80FFCEB3FE049EB1FF05BED0FF8A216FC15 -07A8ED0FF8A3ED1FF07F6DEB3FE06DEB7FC09039FF81FF809039F7FFFE0001F113F89038 -F07FC091C8FCA9B5FCA4262B7D9D2D>I<3807E07E39FFE1FF8001E313E0EBE78F9038EF -1FF0EA0FFE13FCA29038F80FE0EC07C091C7FC5BAFB57EA41C1E7D9D22>114 -D<3801FF8E000713FE121FEA3F00007C137E0078133E00F8131EA27EB490C7FC13F0EBFF -806C13E06C13F86C13FE7E00037FD8003F13801300143F00F0131F140F7EA26CEB1F007E -38FF807EEBFFFC00FB13F000E01380191E7D9D20>I117 -D121 D<003FB512FCA39038C00FF89038001FF0003E133F48EB7FE0ECFFC04913 -8000781400495A1307C6485A495A5C495A017F133CEBFFC048138014004848137C120748 -5A484813F8485AEBE003387FC00FB6FCA31E1E7E9D24>I<000EEB01C0001FEB03E0390F -C00FC03907E01F803903F87F003801FCFE6CB45A6D5A6D5A6D5A6D5A6D5A6DC7FC90C8FC -A2003FB512FCA39038C00FF89038001FF0003E133F48EB7FE0ECFFC04913800078140049 -5A1307C6485A495A5C495A017F133CEBFFC048138014004848137C1207485A484813F848 -5AEBE003387FC00FB6FCA31E2D7EAC24>190 D225 D232 D<130E131FEB3F80137FEBFFC05A481380481300485AEA1FF0EA3FC0001EC7FC -1208C8FCA4EA03F012FFA4120FB3A3B5FCA4122F7CAE17>237 D<001CEB0380003EEB07 -C0391F801F80390FC03F003807F0FE3803F9FC6CB45A6C5B6D5A6D5A6D5A6DC7FC130690 -C8FCA23807E07E39FFE1FF8001E313E0EBE78F9038EF1FF0EA0FFE13FCA29038F80FE0EC -07C091C7FC5BAFB57EA41C2D7DAC22>248 D E -%EndDVIPSBitmapFont -%DVIPSBitmapFont: Fd csr8 8 54 -/Fd 54 254 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07 -4913FE485A00039138FC018049017CC7FCAAB712FCA22703E0007CC7FCB3A6486C13FE3A -7FFF0FFFF0A22B2F7FAE29>11 D<14FF010713E090381F80F090383E003849137C4913FC -485A1203491378153092C7FCA7157CB612FCA23803E000157CB3A5486C13FE3A7FFF0FFF -E0A2232F7FAE27>I<13031307130E131C1338137013F0EA01E013C01203EA0780A2EA0F -00A2121EA35AA45AA512F8A25AAB7EA21278A57EA47EA37EA2EA0780A2EA03C0120113E0 -EA00F013701338131C130E1307130310437AB11B>40 D<12C07E12707E7E7E120FEA0780 -120313C0EA01E0A2EA00F0A21378A3133CA4131EA5131FA2130FAB131FA2131EA5133CA4 -1378A313F0A2EA01E0A2EA03C013801207EA0F00120E5A5A5A5A5A10437CB11B>I<123C -127EB4FCA21380A2127F123D1201A312031300A25A1206120E5A5A5A126009157A8714> -44 DI<123C127E12FFA4127E123C08087A8714>I<15C0140114 -031580A214071500A25C140EA2141E141CA2143C143814781470A214F05CA213015CA213 -035C130791C7FCA25B130EA2131E131CA2133C1338A21378137013F05BA212015BA21203 -5BA2120790C8FC5A120EA2121E121CA2123C1238A212781270A212F05AA21A437CB123> -I<130C133C137CEA03FC12FFEAFC7C1200B3B113FE387FFFFEA2172C7AAB23>49 -DI68 DI71 -D78 D80 D85 D<13FF000713C0380F01F0381C00F800 -3F137C80A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E -00FE14065AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F83901FC01E01F207D -9E23>97 DII<15 -F8141FA214011400ACEB0FE0EB7FF83801F81E3803E0073807C003380F8001EA1F004813 -00123E127EA25AA9127C127EA2003E13017EEB8003000F13073903E00EFC3A01F03CFFC0 -38007FF090391FC0F800222F7EAD27>III<013F13F89038FFC3FE3903E1FF1E3807807C000F140C391F00 -3E00A2003E7FA76C133EA26C6C5A00071378380FE1F0380CFFC0D81C3FC7FC90C8FCA312 -1E121F380FFFF814FF6C14C04814F0391E0007F848130048147C12F848143CA46C147C00 -7C14F86CEB01F06CEB03E03907E01F803901FFFE0038003FF01F2D7E9D23>III<130FEB1F80EB3FC0A4EB1F -80EB0F0090C7FCA8EB07C013FFA2130F1307B3AD1230127838FC0F80A21400485AEA783E -EA3FF8EA07E0123C83AD16>III<2607C07FEB07F03BFFC3FFC03FFC903AC783F0783F3C -0FCE01F8E01F803B07DC00F9C00F01F8D9FF8013C04990387F000749137EA249137CB248 -6C01FEEB0FE03CFFFE0FFFE0FFFEA2371E7E9D3C>I<3807C0FE39FFC3FF809038C703E0 -390FDE01F0EA07F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2221E7E9D27>II<3807C0FE39FFC7FF809038CF03E0390FDC01F03907F800 -FC49137E49133E49133FED1F80A3ED0FC0A8151F1680A2ED3F00A26D137E6D137C5D9038 -FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8FCA9487EEAFFFEA2222B7E9D27>I< -380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2181E7E -9D1C>114 D<3801FE183807FFB8381E01F8EA3C00481378481338A21418A27E7EB41300 -EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138C0007E143EA26C131EA27EA26C -133CA26C137838FF01F038E3FFC000C0130017207E9E1C>I<1360A413E0A312011203A2 -1207121FB512F0A23803E000AF1418A714383801F03014703800F860EB3FE0EB0F80152A -7FA81B>II<3AFFFC01FFC0A23A0FE0007E00 -0007147C15380003143015706C6C1360A26C6C5BA390387C0180A26D48C7FCA2EB3F07EB -1F06A2EB0F8CA214DCEB07D8A2EB03F0A36D5AA26D5A221E7F9C25>I<3AFFFC07FF80A2 -3A0FF003FC000003EB01F0000114C06D485A000091C7FCEB7C06EB3E0E6D5A14B8EB0FB0 -EB07E013036D7E497E1307EB067C497EEB1C1F01387FEB700F496C7E6E7ED803C07F0007 -6D7E391FE003FC3AFFF007FFC0A2221D7F9C25>120 D<3AFFFC01FFC0A23A0FE0007E00 -0007147C1538000314306D137000011460A26C6C5BA2EBFC01017C5BEB7E03013E90C7FC -A2EB1F06A2148EEB0F8CA2EB07D8A2EB03F0A36D5AA26D5AA2495AA2130391C8FC1278EA -FC06A25B131CEA7838EA7070EA3FE0EA0F80222B7F9C25>I<003FB51280A2EB003F003C -14000038137E00305BEA700100605B495A495A130F00005B495A49C7FC5B137E9038FC01 -80EA01F8120313F03807E003EA0FC0001F1400138048485A007E5B00FE133FB6FCA2191D -7E9C1F>I<38078008380FE01C381FF838383FFFF038707FE038E01FC03840078016077A -AC23>126 D<0040130800F0133C007813786C13F0381F03E0380F87C03807CF803803FF -006C5A6C5A1378133090C7FCA23801FE183807FFB8381E01F8EA3C00481378481338A214 -18A27E7EB41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138C0007E143EA2 -6C131EA27EA26C133CA26C137838FF01F038E3FFC000C01300172E7EAC1C>185 -D<143C147E14FF1580A3147F143DEB6001140315005CEBE006140E5C0001137800031360 -91C7FC120F121FB512F0A2D803E0C7FCAF1418A714383801F03014703800F860EB3FE0EB -0F8019327FB01B>187 D<00101302003C130F6C131E6C5B3807C0F83803E1F03801F3E0 -6CB45A6D5A6DC7FC131E130C90C8FCA4003FB51280A2EB003F003C14000038137E00305B -EA700100605B495A495A130F00005B495A49C7FC5B137E9038FC0180EA01F8120313F038 -07E003EA0FC0001F1400138048485A007E5B00FE133FB6FCA2192D7EAC1F>190 -D<143C147C14FCA2495A495AEB07C0495A49C7FC131C5B131090C8FCA313FF000713C038 -0F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0 -EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F8 -3901FC01E01F2F7DAD23>225 D<00085B001EEB07806CEB0F003807801E3803E07C6C6C -5A3800F9F0EB7FE06D5A6D5A6DC7FC130690C8FCA2EB1FE0EB7FFC3801F01E3803E00739 -07C01F80EA0F80EA1F005A003EEB0F00007E90C7FCA2127C12FCA9127EA215C07E6C1301 -01801380380FC0033907E007003801F03E38007FF8EB1FC01A2E7EAC1F>232 -D<140F5C5CA2147E5CEB01F0495A495A91C7FC130E130490C8FCA3EB1F80EBFFF03803E0 -783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3B6FCA200FCC8FC -A5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F03C38007FF8EB1F -C01A2F7EAD1F>I<00085B001EEB07806CEB0F003807801E3803E07C6C6C5A3800F9F0EB -7FE06D5A6D5A6DC7FC130690C8FCA2EB1F80EBFFF03803E0783807C03E380F801E381F00 -1FEC0F80123E007E130715C0127C12FCA3B6FCA200FCC8FCA5127EA2003E14C0123F6C13 -01390F80038001C013003803E00F3801F03C38007FF8EB1FC01A2E7EAC1F>236 -D<131E133E137EA213FCEA01F8EA03E0EA07C0EA0F80EA0E005A1208C7FCA4EA07C012FF -A2120F1207B3A5EA0FE0EAFFFCA20F2E7EAD14>I<163C167E16FF03F81380141FA20201 -137F0200133D1601160317005E1606160E5E1678166093C7FCA2EB0FE0EB7FF83801F81E -3803E0073807C003380F8001EA1F00481300123E127EA25AA9127C127EA2003E13017EEB -8003000F13073903E00EFC3A01F03CFFC038007FF090261FC0F8C7FC29327EB027>239 -D<00085B001EEB07806C49C7FC3807801E3803E07C6C6C5A3800F9F0EB7FE06D5A6D5A6D -C8FC130690C9FCA33807C0FE39FFC3FF809038C703E0390FDE01F0EA07F8496C7EA25BA2 -5BB2486C487E3AFFFE1FFFC0A2222D7EAC27>242 D<00101302003C130F6C131E6C133C -3807C0F83803E1F03801F3E03800FFC0EB7F80EB3F00131E130C90C7FCA3380781F838FF -87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2182D7EAC1C>248 -DI253 D E -%EndDVIPSBitmapFont -%DVIPSBitmapFont: Fe csbx10 14.4 15 -/Fe 15 238 df -68 D82 -D<91383FFFC00107B512FC011FECFF80017F15E090B77E48D9E0077F48D9800013FE486D -EB3FFF82486D81707F8284A2707F6C5BA26C5BC648C7FC90C8FCA44BB5FC4AB6FC143F49 -B7FC130F013FEBFE0390B512E0000314004813FC4813F0485B485B5C4890C7FCA2B5FC5B -A35EA27F6C5D5E6E497F6C6D017E13FE6C6D4848EBFFF86C9026FC0FF814FC6C90B5487E -0001EDC03F6C6CEC800F011F9026FE000313F8010101E090C8FC3E387CB643>97 -D<943801FFC00407B5FCA6EE001F1707B3A3913803FFC0023F13FC49B6FC010715C74915 -F7013FD9E03FB5FC49EB0007D9FFFC130148496D7E484980484980484980A25A5C5AA25A -91C8FCA3B5FCAD7EA46C7FA27EA26C6D5CA26C6D5C6C5E6C6D49B5FC6C6D4914F0D97FFE -010FECFFC0903A3FFF807FEF6D90B512CF0107158F6DECFE0FD9007F13F00207018049C7 -FC42547BD24C>100 D<913803FFE0023F13FE91B612C0010381010F15F84901C07F903A -7FFE001FFE49486D7E48496D138048496D13C0484915E048814A15F048815C48EE7FF8A2 -5A91C8FC18FC173FB5FCA391B7FCA418F891CAFCA57EA3807EA218786C6D15FC17016C7F -6CEE03F86C6D14076E15F06C6DEC1FE06C6C6C143F6D6C6CEBFFC06DD9F0071300010790 -B55A010115F86D6C14E0021F1480020001F8C7FC36387CB63F>II<137F3801FFC0487F487F487FA2487FA76C5BA26C5B6C5B6C5B6C6C -C7FC90C8FCABEB1FF8B5FCA612017EB3B3A4B612F0A61C547BD326>105 -D107 D110 -DII<90393FF001FFB5010F13E04B13F84B7F4B7F9238FF1FFFECF1FC -00039026F3F03F1380C6EBF7E015C0ECFF80A215007013005C705AEE03F84A90C8FCA45C -B3A9B612FEA631367CB539>114 D<143FA65CA45CA25BA35B5BA25B5B5B90B5FC5A000F -91B5FCB8FCA5D8003F90C8FCB3A8EE07E0AB6DEC0FC01580161F6D01C01380163F6D9038 -F07F006DEBFFFE6D5C6D6C5B021F13E0020313802B4D7ECB35>116 -D<011CED0380011E1507D93F80EC1FC06D6CEC3F80D90FF0ECFF006E5BD907FEEB07FE6D -6C495A6D9038C03FF86D6D485A91397FF9FFE06EB55A6E5C6E91C7FC6E5B6E5B6E5B6E5B -A26F5A6F5A6F5A6FC8FC150692C9FCA2913803FFF0023FEBFF8091B612E0010315F8010F -81499038C01FFE903A7FFE0007FF4948491380485B48494913C05C5A485BA2485B701380 -5A70130048ED01FC91CAFCA3B5FCAD7E80A27EA2EF07E06C7F170F6C6D15C06C161F6E15 -806C6D143F6C6DEC7F006C6D14FE903A7FFF8003FC6D9038F01FF8010F90B55A6D5D0101 -1580D9003F49C7FC020313E033527BD03D>232 D237 -D E -%EndDVIPSBitmapFont +%%BeginProcSet: texps.pro 0 0 +%! +TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2 +index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll +exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]FontType 0 +ne{/Metrics exch def dict begin Encoding{exch dup type/integertype ne{ +pop pop 1 sub dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get +div def}ifelse}forall Metrics/Metrics currentdict end def}{{1 index type +/nametype eq{exit}if exch pop}loop}ifelse[2 index currentdict end +definefont 3 -1 roll makefont/setfont cvx]cvx def}def/ObliqueSlant{dup +sin S cos div neg}B/SlantFont{4 index mul add}def/ExtendFont{3 -1 roll +mul exch}def/ReEncodeFont{CharStrings rcheck{/Encoding false def dup[ +exch{dup CharStrings exch known not{pop/.notdef/Encoding true def}if} +forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def end + +%%EndProcSet +%%BeginFont: CMSY6 +%!PS-AdobeFont-1.1: CMSY6 1.0 +%%CreationDate: 1991 Aug 15 07:21:34 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.0) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMSY6) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle -14.035 def +/isFixedPitch false def +end readonly def +/FontName /CMSY6 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 13 /circlecopyrt put +readonly def +/FontBBox{-4 -948 1329 786}readonly def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA052F09F9C8ADE9D907C058B87E9B6964 +7D53359E51216774A4EAA1E2B58EC3176BD1184A633B951372B4198D4E8C5EF4 +A213ACB58AA0A658908035BF2ED8531779838A960DFE2B27EA49C37156989C85 +E21B3ABF72E39A89232CD9F4237FC80C9E64E8425AA3BEF7DED60B122A52922A +221A37D9A807DD01161779DDE7D5FC1B2109839E5B52DFB7605D7BA557CC35D6 +49F6EB651B83771034BA0C39DB8D426A24543EF4529E2D939125B5157482688E +9045C2242F4AFA4C489D975C029177CD6497EACD181FF151A45F521A4C4043C2 +1F3E76EF5B3291A941583E27DFC68B9211105827590393ABFB8AA4D1623D1761 +6AC0DF1D3154B0277BE821712BE7B33385E7A4105E8F3370F981B8FE9E3CF3E0 +007B8C9F2D934F24D591C330487DDF179CECEC5258C47E4B32538F948AB00673 +F9D549C971B0822056B339600FC1E3A5E51844CC8A75B857F15E7276260ED115 +C5FD550F53CE5583743B50B0F9B7C4F836DEF7499F439A6EBE9BF559D2EE0571 +CE54AEC461D354A32E69F39DD0C017BD6576F1E9500DC0328E8AF6EAB528FD7B +85132A2A9995EB211FCE849216BF6D663AD649AE92DA953C4D520AB9A22D27B5 +6C34121FD688F9E17FE39B939D8DCED9EDDE5AF6DD7DC2297F2A3E1287E5AF45 +0306EDBA3C843FB8234D0DDEC7595CDE6657E499324DA260BACAE9D6DB126FD9 +AAA7368F7164F6BBBBE11EFFFB65660DA0961A97D51ADAF2136A085FDC16C199 +72BC2CA210B330C03F4252A275FEAADC95CFBC79C3B7285C4C7B5C9665909A56 +4176C37DCB569C8EED1B59C58B5EBD3ADD31010DCFD59411FC2020E238A07B83 +2439DEB653AFF1CF197533724E45EDA9810B6793E27943CF51484A5BC7DC61C5 +E97F71E04BB623E0BC9C +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: csr6 +%!FontType1-1.0: csr6 1.1/12-Nov-94 +% CSfonts -- pfb ver.Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 25711 25989 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (csr6) readonly def +/FamilyName (csr6) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/XHeight 431 def +/Ascender 694 def +/Descender -194 def +/CapHeight 683 def +end readonly def +/FontName /csr6 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 44 /comma put +dup 45 /hyphen put +dup 46 /period put +dup 48 /zero put +dup 49 /one put +dup 50 /two put +dup 51 /three put +dup 53 /five put +dup 54 /six put +dup 55 /seven put +dup 65 /A put +dup 66 /B put +dup 67 /C put +dup 68 /D put +dup 69 /E put +dup 70 /F put +dup 71 /G put +dup 73 /I put +dup 77 /M put +dup 78 /N put +dup 80 /P put +dup 82 /R put +dup 83 /S put +dup 85 /U put +dup 97 /a put +dup 98 /b put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 102 /f put +dup 103 /g put +dup 104 /h put +dup 105 /i put +dup 107 /k put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 112 /p put +dup 114 /r put +dup 115 /s put +dup 116 /t put +dup 117 /u put +dup 118 /v put +dup 119 /w put +dup 120 /x put +dup 121 /y put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-24 -250 1193 864] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A1390082AA03548CCE363896DC +8285532C521369225C90F80D727FDE65092A0044327885EC680B2ECCDFCCC5C5 +9B4F8AE2D078A25AEEA345A6E6A1D9F372DB3CF2B4AE635D7DB823D70EC82CC7 +1CF7E7DD0D047DC2513344927562EE8FDA9076DD136C4996A22589ABE803CAFE +BDA907DB1C62DABD22A05EAF9FA8313F815BEDB67BADCEB77C1B22D845131345 +22CF2296D57DE34C11EDF6DD3E42B726C8D60E4A98663DE8F7CFBB416F0A4B01 +734649B217E4E94992F66E77AAD2A7289B5413E7F1DD41B9334CBC2EDE944C80 +D9758E1AC551D298DDCE91757B374D66B6BCB92998411DD3B7E6350480D52ADA +A0DA546F63DF2A7AE22BE6BF9A78F5C34CBB597DDC4FF03AB527637DE7F3AEBD +59ACFB058C4833A4A62A9125B4D90E7073184DAEC9D4662987F5CF6D0484D870 +C0FC4A29C03AF2BD159097D46F491069FF43EB0B92CEB9F09E71E089F2C916AA +57DF56E8F0595F9ECB2B1F2431411F7311294DFA91459BC05EFD5C1C68099335 +7BF9559397107F8ED80B43B6E113CE5AD25E1F980D08A891F2A2C0F3A99B7281 +55128F8A4CC9B78A96D6FE58AC946267448735F669C6DF170FCEBCA6108F94C6 +CF3D5DBB8B2304D66AE30096A7D7E17A5E8DCA207567091B96CFE64BA77AF942 +E51BCF3793EF5B02DBF510FAC25F4E523C54CAD23CF2F472B4B3D42BC66565A9 +F5794FAB132F78020CDAB120A21E23DBFBE16FB32F7A618A7736C5F269691069 +D8B35B291D6876340C4158958C56A6717C5DEEA0A86C9C89D9BACB999156717C +BFFE2CC56DF4F47B56EBEE1D2C3A118208D9778776104AFFE60A0C7A2BCC9ADE +FD471CD27FA8318703D497D7F1E2F51B67B9E50D9A56C85EFBED66535792D720 +974ED9168E082F5211F2F607D91F5D81AF63A2DDD31D23E65D3AF936FF194F6D +B9EF5D40498DB69F3BC87E7E19AE76FC0C54E0B4706FA34621284606BCDAB55C +32BE1E917D3B3CC1AFCDF3D35507E63D119B0A3174D32B6AB0A05A8F919A426D +9CB0E7F90458CA6C439565A9AD5648C12F47BCA98599D31E834654AD20E719AC +64D073F8DA31D1FF07C1AFAEAD34D9A58C9CFB12FF747775D5CDEC0C1D84FF41 +B8EFC696D77D2105043CD29074D828D1E03C1A2CBB80C5112F4CBCCB4A769BB9 +A4F91F4366DF0B44B0480E6D1522A779C4EA84DBF398B540A2A4546216DE7B02 +CDFEAC0DF8D9A35DFD72457B2FC7F051D85EA1437F13ED17E53D5DE0F38A5AAE +58B077651C978C555A9873AA29F0A4ADDD1B6BC50EA6C95B1588E7F8D6049EC3 +8D9D2730FF086983030ECAE9600D8A11335A186A6FE48DAFF7F663872B23F22A +C62F5ADA341F5BC0106B99ACB3A1C8268D3DA2C4F93B17749BE68AACEBA9D456 +B3F0B7B3C1FB011B20FDF4067A48421B1ACAD3F6210BCDA6D664361849170191 +7E57121F1D6787DDC6E8EF9022A91290E1534CFD830134126467D7E328E92267 +B730800397D9A384D62460853F56C6C9A634D04E02932EC17CF0F54705615E03 +58A437569FD55BD44A33C29DADE84E385C97F7B788106B018E3C265726C31E4F +B1509BB80A94E8258F503048C85DC89C7439141A587E13017010AA6DA23FA2C6 +97E37155FA9538B31C4CE0B72E1417382A1A1223828D9C4B2178EEA561BFE6B9 +43AEBE58EFAE10175760ADC68AE5642AD2D413F2B9D35DD07A69B45FDDF2673D +28B02C23EFD71C08690ADF55C233BDFB3DBD1769138EB92AB13023B5D9C8FFB6 +B0A93C729DCD5E5CB8ACF9F7E1CBBA9B67CCF2A0296C8D1FB7113405844D654C +33ED93894598563D1ECDD5CDEE590D8063C42782DCEF3812968B7F6DD27F409C +91A278CFDE7D4803E089C0769EC1C3C0CE1328EA3C53827D65DF602AB6DE79B2 +F4FD4A5C9E3047B07A084E1B48F8B9DB9C8F4F8ABA76A2E1716C8103CD1A7191 +E0DDB5627F65E3475E3436250D9000B37F82CD5092E1638F1C771BE23B3C7494 +15F16719E4C1549FBB4C5E7AE764BF97FC458319AF304B72CC1B73C5F5A0CABC +1C8134C14F861E325B030719248E3AF17D742D736AD0F07CA757AA4A1BCE50C6 +83C0DEBC1F64D96332769A65AFB4F8DF6310D8DB846431392B63CEB036A6FF54 +410E717681265F811A992B82B302F406614183A9BDBBAAEA43BBBAF8828B3D74 +7CAB59D02F4C41B5E8BB2369CC4BFDB378CC5831AEF9DF1715F915365968A422 +66FE4CC18FCE0666A1F0CE9A202B5F581D252347BA49B5F351EE40FF21F68B7C +3DFBC1920114CE2D02D564F1B5C398DD834E20E9DC2639E3B7A2935D77894960 +AFB1584B7E0094C9F22D69BDB0F005CFBFEDF56E08790DAD1D3CE2AEE6C90298 +6507CC72FDC0BDBEA2D45CB8544A7001AB67B8B3E9A359ACBFCFA135DC277A44 +D578F9E962F1CA8D31E34D3128AE12E178AF39B18159EBEA4D1D0829DC536FD5 +8C48E955D7D52D1BD6527EE388C1BB2E6A5DADD1E7C452160A5D4768146E8811 +8722D5F9D69E925D6699E7EC2DE2C645FDCA36AB6A06BAC60DE1C355401A35C7 +E287DE71AD3A6CAA532A0DF377C6E02583D6DDECA77FE50842214051AFA0418C +62244C0213DEB448711801EEF13CF96D498E45209185AB6CEFC9F304D32ACA2A +98E8D8EA3737EA2F5C2BD6A1CFD08B7E2B3C0285BBBD2199AA120AE737B8B269 +535C20CC1FCB4612EAF3EEF2B49E98CBDF1F71F997DBC89403E7CAFA2F6E2B4A +E9C90F2FE5FE13837FFE33AB01414903C905E4DA170F12C3F1A11BFCA51049CD +6A34457EB03EDCE6DDBEA995DF832AD05A84DCD3A672FE6C35556FEB442202C4 +427D004540520B66AD955F2ADC68DD53FD7E9AB3B38DF22D8C44549F06214082 +15A7F95684F1727A53EC834E9CEBDC4C599B0A9A255BE0FC78EECDC9CFBFDB35 +29EFCC293A02D52F20E3EF5C148C1F6CF5BD4FC7F42D00411FE742BAD03AFEAC +FA91FF2661AC60D5EBEC548AF4B4E0845E3D02AB7C9FC9E68CE7F1B5E4DE1EFD +077562EDE46E6790015D18C0E9D9A52D5C7D617C5B7820924D99381FB8BF04DA +5EF1732435FE328FBF8B1DEC60D5BEA45890A2B6D66A7B4B47B03FD3D19D9229 +9D1C8458085C909C125472CBC53798C16AF2C6F44ACEFA2F6CB6C5DD84B648EB +1E1468D6A89DCF23A4AFE8C8EEA44048D240D392D0CE05C082CD711BE907BE94 +1E7ECE39CB183A185E602C47680AAE88859618761CB8A5282ACE290EAED9265B +466DF5124F1C78253AC2DBABCF010D960A26E60830E11475B1BE35ACCD48036D +97EC4867D6AE95F67A563952600952D30DE1F148B2B6950E33B2FCBD7ABE5BE5 +9CFFF37354288D61FC68B3377C6C24749C3B06F87F25D4E35CD717B6A9EF1867 +D4C13E024231589C9E89A3C87AF9F926B329419728A7F04C93F186D16D322191 +AEA715EF468CAE95EF9DFC6B2B69074D10C1866651961A061B909DA1FCABE3FE +3855C578C953F5DAAAAAC876A4FEA53498B40DEABFF5DCCFAF8EF467CB26571F +6E5D54FBACFF3ABB4EA0B1C41F237E26667D9DB110A600F0CF98B6066BB145B3 +96DC26800F08437185590EE3D2C080B2A547B51C7A131E9F7B55F0772DE5C844 +C2E8B1F55EA131D16E307008E408DD8A6665C97A01A63AB6BE1B41A158EF2F27 +348737DFB0B31ED64D5EB558A8E0D99478C8A2206FA0F050ADC736BD32CA0339 +D0305441F007C7DFEE295D6360BD4DD34FB25F2A07F3B00D2A4B3CDB49F021EA +2DDC4D625F7CA6B50DED913ED0643F556A686E46BCCAEA641692FE2E996CB21F +33ED78F3010D51EDE32C0A0AE3491FB91E7AA05D015A9AEA3B727C4EE45DF853 +37C5E0BE05D272C3A0C435C9C1CB1A1966AEE7F1687524246D409B0954971282 +53F7661B5CFFC8480E1BA4C039BF214DE3C7A1D7F0DC372CEC274F0945BBB948 +831DABEC5825C95ACD926B23B2EEEE6ED531B27DC3BFF41EE7554A75A0EA4B25 +A3461ABCA0C1558DCC68D8BA7AC6A05D0BC2C32CDA016655D87E2CE0501AE6C7 +D9324D637A9D70CB9EA0F15667B1730C0DA56400298741857E6E6A426E9CD5DF +4F07CB4E882875B9DFC47786D1DFCC0C4EBA6EB5F7B890B2904E3FC00C4E2FF4 +7282022BE6254C35FCADE5AF9B6BE80864DA76D437D0284C3BEDD35B2209B5CA +7A2D69EF139C6611D38FDBD46AB7BEFFC13BBBD9FC6564BC859B531B848A7C97 +8DBFA4CD4C98CC8D3E170955222011FA738A2A940B3D71BF0A18E4604FE2331D +96588E9DCC91F026602044835C12BD112E7267DF7C0B674D48CFBCDA7B64B4ED +1C16BC6F1A17AFED38C8943994F3E07771471A950D91B3C99F1B11D85A5142E1 +DBBDB2D142CF48130AF3E03F4D06DA816AF0914D0DBA5BB270AEE4E66F9C6BA3 +A57B1A68C3C0088D2248309C0CAEA2D5AF93F1734201F7B4580DDB4A4277DD0F +FCC56F43D4B1E5DFF341C8952A723A40A02DAFCD95E57D975300484F68EF3507 +1BFB61E4E4CFFD0DE5920B271BBD4E3CB91EF76D42AB30427CCB980FA4736497 +20E8A12FD2E0B4F14E55482C99272941BBD7F75667929869C1840DC4E77B7AFC +FEFB1DE383AB74441B16736487C2071B29015C52D47E1DFF058A4393BDB2F07E +1BE759B8FBE39B80669F272BEA0ABD7C36D94C5A53806EC6F8C9FD5B68560815 +2C7933A78F7E4524C14B3CC0BCF25D44B8ED70E46026C7959E1CF055D07D8871 +8C576458B8C9DF424198A618B8E3377631DC6CC7405624160EA52171B167951A +3234D91595AEAFE425F31872F11693FA0F9B1F09C6D2E19CBBC66EC4543A90E1 +D9173ACC94F7FE489010109CE1EBB2AD8E2E807C62875867D8FACC3805650253 +21F8E64CB5ABED16CEF3FC29936DB8B06E015C041198B700B493D274E2F3CB25 +D53F5D46DDDFCAF86C876B3FCF5CE00875D8A6237DB1247199AEFA377B4BA19F +AFD56AD2FD2A463800579DAD33112DF863E2C504CFEC293D3F30BD350C77A248 +C3D0CA21D662F665407A19B6D0DF95FD73F01E530440C89924F0C2854EF730B0 +FEAA26912851247A73E99C0941CEC44FBEAA49275B96B42F61C6A446C3227562 +7751D752F3E0E8C634B129BD953C44829EB1876ADBCACE29E10F0948BB931A0E +3CD1DA2129AA3CD2CFCB25A59D581F0A10F1813FC4501B3C97CA05EA3C7F69BA +262903FA7EF879CF03FC000B23E09E9AAE09A022C0658C73730AD5822E0B989B +A845ADFDC9F83879A747309EB8B819A5F1BD54C17DEDD16B24DED8A068516060 +4E28D3559B53947CA1F9FB1DF17370F5A76CC796DE2DCB2497CB476C73063977 +CCDEFFEC5940BAD140AF5B8EF887C034E9EB5A11DB0CACBC36D91B5756E43CC1 +3F873330B15EE187C3DE825D284E81FBC790DB5FDC8D4387D970450EF2DDFA09 +74F0504B90A0A9A643AF661F7670D4054DC3D1A35F5CE3D0C6308E33ED883D28 +B6F99E31AD5C291577CA6018F34CA0A69EF627F95C3ABF760A2F29760A6C8CB5 +2339B9C653FB9E73172354E5F9256FDF9B70168CA01089017C50C17FC5004AF3 +C906F760F7D05D0AE20BD3ECB7C118A9FA2022606848CA9D0E659E0F077A6293 +3F6E8494CA79BA412FC3C535E5DA9BDC2B96A336CFC803AE8B7CDE2ED42F9FE7 +236C33353457A3387978F50558A639345FBB8BB5954A86D855DBDE9004BB24AE +6E3B6356B1C7F7EDAD3C8BA35BD02BEC40E17FB92E4E76EBA9536D8750BB4C9B +AC67FA6D253A6384FE9EE3436EF62E620E87B961358B9F09CD64C864FC9B4CD7 +4A774CE71301176885DEFF3437BA9549B4E7FA3B9A46EF380C42154131482854 +EBCEABA59FC594AE632131479D682D88982173C51E64905D4131DE51C3D241B1 +51CE0B3EC3388CDDBA6DFBBAB2C2932B597BA3F10BA2FDF57B2FE8FBDB3A89CA +B3BE45A42742D3343AAAA01C0F7A5FB1A50BDC460C9736867C41CC9D10F01863 +110AF2BA750E0920646FDD4A30F5274B295C915B2E832D01249146A9EFB7E30A +897762A22C1ECC17B3E29294DC306A27944699DAD3759D838E75435D7F52A1BD +8CB5ED924328F734A535193296AF4CC70AD6422E8ED3572B8B104BC40A28C8FC +DA9E9B8B47FA9A94BABC582D3608BAE0CB94C2B67DC65ED95281387BD40B294C +2FD516909ACEDE90991C023FDD3C5584EED0CBEA055A0221B575A62FBC5ECC72 +241D6C80260A4355B92E92EF644257C00E13D82D47CF0740CE71D1462705FBB3 +3E8F8DB59C787154BBE9E0FC791606BE3BD11537CBDD858487183595255E3360 +00EAB3E593AEA4AE635D0DCDB7F0AD2D95ACC4D6C37BE01762CB5E5D728B780E +14A139A7F5E329ADC6C406A266AE90ED6DFC86D68A417ECB7A486EF0551FDFD3 +C83793A4B3F305D380DC56FA962B5474ADB62DEF714FFFA498467934E95BC976 +BE99035AADCB5250A5DD5FCAA64D3601BD788C35C214058AAB025DD3B77864A4 +76BF7F562574DC4466B23C7256246BBEC7E47419D3B7924AFDDDB7B605D499F9 +815D19F8BD8797AAC599DC62F2B3CED680A3860BCF87428A993BDA11643B830D +ACC0D0493DCD72AAA9ABA51A8514E91EDB75DEC2378D5710332707DB8E9A3C61 +A85D1114E88D89CBDEFD3BE65C215292ABFFAF211CD17605C4DB85B9AE505150 +BDE896444F55C7A15BFEEA608D8055583487B1DFB5E831E35AEBECCA99EE9348 +2A428FF4DCEEFC005FC7D54AC750E1D228329718711AEA3AFCCFDEED13884A00 +DD02186AD492BE03EA4C836D3994CB345511AE8A0981753F77B562BA3A0F0703 +45EE012D273721070B5CC63453E78EC5B40E3F1845F08AF780885D5B55F7552D +385F2F22BC86C4D37CFB2B8D43AB30B071DCF1FF032575BD87354EB680ACF012 +3881D4428F9AD52478B55858CE48CA964291FF97AB5CB46FABB04EED462AD1CD +07404089DF52B923E492CFA2120C11DFF6156FD3A9FBE7B7AA4BCC4ED3BD4EF4 +E21200516D96DE372E8139D56C3F76FB29E42FFA6531AFCBEB2F6DA84336FA31 +8E7028E1E0D828AA135620FE30198506A3E094EAC140370D6C35293E816BE135 +96704BE5E4D6D6C83B42F91CF760D7D7E5DE20F569B31A3F49B3444AB5418B71 +9F72E599982F16AB21C83370BC1B3F9CEF750804FFF8C251368FB57850D5C49D +2D49E43890C19232329E930ED9B8543DFE943F9C325467716C1CA7B43EF7BD27 +E0CE660DF3E6EA1D32E1C51F1C1CC36D273F1A482C9A62A7983D59C75EAF354A +DBD703801513C471BEE721C2C728DB77658CC64F59FA9606FE85A3955E956EF5 +0537F5DB54B18E15622FC1187746362ADAA7B93BD0B0B3C1295FB350430E00E7 +F8C852467D0035394DDA11ECAB23FBCEF8D8888929C41577561DEC1D96D36CE9 +F45F0F17674E9C6C4133B36FB19936DBE5BABEE039C9BCD0AE86C9F15F218C39 +0CFE18EE9F26D4E0188085820F87D2BB8ED4C81191F36BB157AA2D97FEF3C500 +06DEFE2635F4A45F78FE9AD3585EEEB3F10651733DD1F4808BCAC418F92A7DF3 +B2E1712FBF5FF569E4E930E70E054A22F6862CAA271470C9F4358FB6CD1A3D3F +15048080030F17D92DB7692257C8528DC80C79B145F29720F9468CE7768BFBAB +5169811E01D06D43DD8A3B0F3C002E79248A48445DE4844855326A7E58F54876 +F9744E723980B6A61907CA9A13F4C12F823ACFC8F778E7089843E11216782D8E +89D4875DFD01BB67BF85A0692BE5048AF1D3EB1CF8C087BE6FFFD60822CA5B47 +CAC2413F7A4E8A0DA4CF76C340578918B40FEDE73C48193391BE10D7F36019A2 +732B902C426CF80FC98581251100867B6D9BB728B3D010B882CDB07CB6F9FB22 +54F0B427EAF1EDD1FAEA5FE3AD156DDAC67CB8202A4E0D0AE5B49F35FC31E6CC +87F00E54011DDE86A32DC844D0372FF2430F552545D648138C0502F46D7F90D6 +65736FB0D53F90EAB2DE0ED5ECF7C179FE1D846DF9256A669BE668F9AF96EBFA +9EB14ABA4113994A6A56FE7FB3E8CA25DDD95273549052106DB8ADC5818DCF45 +841FC9336207CF67EA835DAC1D2C3918BD570C1E56B63D563EACDB397F28E198 +BE36D9E48CC5B228994866F68F858F7CCD1283668A9A949C99F3DE12F975EEBE +D273BAB53FFDC9915F3EBBE6353C8D74B2E4517092D9BEAE2420942DF0074A69 +30A696E4B7FE4491AEEBD05385FE95E0003E14907C1BEF058D6ABD417CFAC682 +AD0949E6B0AE41D8F6C2C76BEE7F696E8FC623280F96DC4BDFC33F73FAC10265 +49F98BB4CEEF2676279F4FC5928FF7E51C7AE464377E29873E4E8D3F8A384626 +F030953654FD3A42A1127E7EF9DFF57EDD38F7BF4FC146A755FA5F6C810C706D +6A834B32E68505B9E0726624BA8B7DCA96DBDD8F2344386260478160B0F3F85B +E09A8E3AC4ACB796BCA6383A47B70F98FD798D6F2C1C385813EA7B3661D43DDE +7B3C0C6455785420553956EF58B460CCC897187847802EF8DE9FBD23934FA8D1 +AD37F59724DA239776F0F513402D86060903C24105BF537BB2C0BC4D572E6D4A +144BC35F7C1E710745FC4B02D6EF02F607489543C30B3E10FB765A73A9571845 +549565B5E4DC13EA259603958545A964C38480EDDF58FB409FC43A2909662F39 +5DE08816008CFD770B8A3B7517CBE72A5B23E5D6F96B3D6715B81F03190B3284 +E72034E0F51272427A6DA9C72CD39D8E8E5BB13D232D4D2CD741EF2550220269 +80C4B614FDB1972052A427C723FD8F774BEF5708160F46F11C702E4A35DD1AF1 +A920D08B6B91392293573169711A8A306CC5FCCD1B53B9D7A3DAF2D9911028F3 +3EED3A7E7BC346A70B919387423C91E2813A7A0892AC99BE0CA97D85975348B9 +CEC6BF3EE2BB656506244A9500A94A6CF9FA44AAEA2EBEA1A0DC7414E8B4708B +1949EE5092B13881877F5F46EA92F3A1988A2C419C6CBA6307EA93F3CDFF149C +AA132D48FD0818529452C8722E6277F8AA668E8CCB0D177248A00282A0316550 +2F6E96123B03AA20D8E7BEC2618947F71BD405BA3710043C4B627E211113F14B +ED4AB1117B0A48E925A884F3730D05480984FB80B30744A528B3653F8CFD50B9 +8753EE836F07373751BFC86BF01390080306C3CF564419EDD4D9102FF4656529 +2D88B3F816CC70FB0CDEB89AFA68F968FADA39B23321BE4DC083D7643A6F4ED4 +02CF176ABE73AAE3FAE9BFFDB8E67CDF56330FBBAD21CD1977F5746B08193528 +A23BE8C98888DD658B8655362781AAB8AC2636F06838419FF581FD66B96FECDE +C69D818BBFB8261DEF801EC40D20A6B79032F4B007C0D6F6907EA457731BA2F0 +60FA71D8886FBABA4EFD51998C1186C4BDF06CED2C2D7FF23250E48BAE3A8AE2 +ACEB2C0D0B37E2C7DA24CF6C43D76D4EBCCF409B7C7E4BC6323061703A5A3EA6 +B1A53EDACBD107296914D927D853C8840D4CF1D833741327FF21FE9BA51A9E32 +C0E97E86F03E9671E32E143894B1F05DCDADFEA60B24655EAFA58807909E90BD +A5988A86C9BD38E0B1CD98FC79D1ADB5C3ADB78F285A7A314A72DACECCA0EA35 +BAFBB5EAB396AD4729DCFFA5264DC0DD86157078024A590E6067A6F1B5B2562A +D1F15B3C8B118C15F07F6AB0BF1D9190D30976D88EA982E57D2E202AE26CD9BD +00FA6220805E6D6FE5639B12813C5A6038851299DF0BD94A205D668CE5144749 +F71A18F633BF283DA453714EFE14E5FE869E524E80BC04A0AC3DEFD93B3231CD +C88528CE3133EB6287EC0226A4DF0ECD42A13C0FD832320C0E29318D6C237D55 +AEE8B077AF3A819025EB88B94A6831B16E7BC10957C5E7CDAECB20BA23241E94 +CAC0734555505BBDD55A973A06A3C146A21AEEF899ABD43CBFEBC105FFF56C63 +7CE50DAC6913230A323201A81E101ADA71FAD718F35C74406505C62A605246D4 +EECB52D70D5E07D10D13CF303466A8A5198D02485FD445F56B2D90FA7B039711 +22523CF282CDA36BC0FC3539CBAE0E636094E7A37529A026A5AAD5B292D6E55E +F16FC9E442DDEADEDC307BBBAB221CA11033982F971EAD2AB3E2A0C47805F059 +2333D6C473E1F5CCB9F8133AF91B63A2F3F6FE9FB11EB74900AA2D20C007DBC2 +681E5CF1A025DD2C25268B441B02911492539028345B03EFEB64D2C1AE9CA7AD +94472236D7DFFCC081197351701145B365AB622CC2E5E09A17B357BBE0B0C523 +5A8D68AFC00BAD865B291678A7D9F83909B29516086D0DD4434E498F7CCD0645 +F327C654165AF137E197B17E6D37F90224F3568706852AB7BF5C78AC69A4C0F9 +23F18949932C058C8C21DC52956DA498E749437B69582751E1E12EB46231A450 +BDC05A65409630B0C6281534035BEC3FE0F3F173CA94BFF7E93E15F66D0B3C73 +F784C00BF1ED61F36996FDC82D0C9A11E1B3718675ABE286429E725A9F383B9B +168F31734B8EDCB37E82C4B26C9A8553E6C454499CC89289E6045F8810413E9C +4406391C6989AAA1BE34224B98C2EC4D3986095037158632C17F8D7A510CEEE0 +1C21F1C92593B2066AF4B86DD30E896D548C88B5946D1408D22839103C7A0EB6 +7F3D488173887A94B4A2B367DC8C67531286D131A1BDF35D6041EEAF1A086860 +22BE71A2A535B6264EE70F4C7CEE0990B33075D55733A5BDE0C63499EB9111A5 +ED5DA484D11063D8F03A2CEBC6612DC43D8C22913EB0B8E467B02A15A7595A36 +4DCB8AD0D74CB5493B59EF02B69ADAAC5F3CD7ECE0CA793A378C97E07C37C7E9 +4E5F11CDE9DFD0E61F9B88968A015CC4FB8D7966200C48C6EDCF59AC60CA9693 +74267C4A067BC76F8C0A4F204FDEB9D91CA4A69FE0E30C7158D44E1BAA50D92B +1AE92896CFFFE56EE0AC571C2AFADBBFE59F1F23D42DAEE552D4D86F00B48F42 +60D7834201C7CCD9E52A7AC3029896C251F52CF3BA23451E8A18A383411071FE +B4D214A45F297C0B9DD06578ED375B7E302B3AF410ADF197CDE49A0F58B40CC5 +64A4E14453FFB0FF7B59292AD7A63FCE0239FFFD0EBEA23C091D0760693D2ED8 +9A0B66E0125606F15424D3B3D82764BCF6A2A2BD399BDF0EB5B38E4980306D74 +558833268726829CC7579DC4AAD6E9589EB1473D8C289B9E331EA905830D07F8 +042B642F60B69D66B8D2D2FDB948BC16D16344AE983FC67352292C05EA1F5E16 +18DDA42173B00390985D3F8981FD33B102D37BB98B56A4BF76A17DAC639183D1 +8CA84E33BBC5BBA5D41821DA254A5BD4A8E8011D766319E001D2BAABF097556B +8660001C2A9938E1A08265A3912BBCBDE5B1A592EA64D1F141CC3CD437194CD4 +5E4330FFD0FC6823469A618BA4B5C0E35DC27DB79E90F6F2B563CBF7E1D86A63 +6973573D2A9A8357C4EDC4D4D5C9BF56AAE4035E93B41B8D0807474E54035A88 +997BCAAE58A4A672E47D0F44C1EDA3C3ABC7AB8F3CB4F11AA89C23B00295F763 +38F77E9C4D509C18D4B2DCAE5A26A2E2E12FE603C19C220225A78BEE4A48B371 +935761EC9E601671940DC7E0F7819110E6FE16736AAB9EA8D395ED021957DA95 +5BEF62E5BB3B440CCC5926CA3C5652E22D9DEF2EE4F39764565A505704B3F80D +37D58ED65304186111BF95C074E3B7097B953E24317BD119257C16434D5CC75B +C9EFE5B27C115CFA047BDA6B41BD82D7359FB6EBB2F515B8C6750564C316A2F5 +E515EAFA9E5415D2474A3938F85A0D7B12980D11FA95AFCDCC23D131364CC544 +D10B3BD0A4F18A6EEFB79195F7566BAEB133847422802CF3234784FB095C6BA4 +B243A6C25C7BCDDD647988E640036B2662364B87C77E57DD501A017574DF1A32 +843C71FE7091 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: cstt8 +%!FontType1-1.0: cstt8 1.1/12-Nov-94 +% CSfonts -- pfb ver.Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 27102 27374 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (cstt8) readonly def +/FamilyName (cstt8) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/CapHeight 611 def +/XHeight 431 def +/Ascender 611 def +/Descender -222 def +end readonly def +/FontName /cstt8 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 33 /exclam put +dup 35 /numbersign put +dup 36 /dollar put +dup 37 /percent put +dup 38 /ampersand put +dup 40 /parenleft put +dup 42 /asterisk put +dup 43 /plus put +dup 45 /hyphen put +dup 46 /period put +dup 47 /slash put +dup 50 /two put +dup 51 /three put +dup 60 /less put +dup 61 /equal put +dup 62 /greater put +dup 63 /question put +dup 64 /at put +dup 65 /A put +dup 66 /B put +dup 67 /C put +dup 71 /G put +dup 72 /H put +dup 73 /I put +dup 76 /L put +dup 77 /M put +dup 79 /O put +dup 80 /P put +dup 81 /Q put +dup 82 /R put +dup 83 /S put +dup 85 /U put +dup 88 /X put +dup 89 /Y put +dup 90 /Z put +dup 94 /asciicircum put +dup 95 /underscore put +dup 97 /a put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 102 /f put +dup 103 /g put +dup 104 /h put +dup 105 /i put +dup 106 /j put +dup 107 /k put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 112 /p put +dup 113 /q put +dup 114 /r put +dup 115 /s put +dup 116 /t put +dup 117 /u put +dup 118 /v put +dup 119 /w put +dup 120 /x put +dup 123 /braceleft put +dup 125 /braceright put +dup 126 /asciitilde put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-7 -232 547 749] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A2E61A0E1428E106CCC2583525 +72D46D12AB29122B2F73E8A1840E92A8B89FC7EB2DC186823768722F16340C65 +6DD7DC66340FDBED5DE27349212038949E02A53C843B61C70E1DD9DBD0087F65 +15B0F0D9BAE4BB4E41E67AD2A0627A0A172C22D63B4821EDFBCD61B658A40308 +132441266CF3C9493FFD6F22069801D31293B9BE8D89CB818E8ED600661D5183 +2E556F2B3D05DC1D4373F9890892FB7AB653D27E2633AB532F25D6EDE1857DB4 +C1F451A24EA87B44C7CE899D4978EA02D57085859C57CC3F1179AAAFA42490C7 +DA9BDBB4EDF14A2F18DD23B43727FCEAEF202CA5A65234905E786170816442CF +D6B62BA8F62C10EE680DE45AB210E79CE579DB97E6727D763F4B9054F443CABA +76BDE6AC53B3DB2F1297AFDAF08ACC65EAF52597D52CB237ECBA29A18AF0C0BE +8FE6FA66CCEA594306E6F3AE4B9E21BA245325E122B85E38C3DD1AAF78869029 +377FEB743C8E393B1CEBF5118FE83D9F35B7F94FED7CCB0368F5D961179160B3 +0060975A6E3A783ABCCE964A7FADE8A5C8BD5B2039247E9C018E827AEA49A311 +ABCEF022A409DA1D18C821DF8961891AF8DE1AC3E4C4F41F17B8E5661B7C44AE +308824113BD2D15FB2FCE33EC549E4770E65CEB695D0FE7B5377474B61759E36 +E4C91AC5818A3328B030125132AC01CE1D523E630391C1D8993B4170AD45352B +6905F6E2E60AA156C0F5111580622309D79CF79EA745830144CC8823B4B5B330 +54BFC451FD8CD5FF0E388EDEA82764535C50F417A9DC659D8326BFEC6E5CA9D8 +D34BA3C647BFE0FA7C8FAD2E87A658F558B8F627C0356DDB161520F1640386D7 +4166B19F03C8024D14BBA67CDAFA3504FE5BDBF8A19E93F313C9B5C83296F632 +3E814A5F5427196DB2633B363FEA67DF56AF73A6F78A28B81CAC57FD11493B1A +9233A404A1E8CBF2E5E4519A97070049C6E1C389020DD3219ED5D06C044E0F30 +DF4D4B472A3D0BE8B2B554F7244ABE708803E370C11E70298B1AF1E25F2D262E +4134F7A239BB81496BCCD89F963783CE73442D4305E9EA8D2D08016BECBCD25C +2E7FA6266569E55664DC7C43695B14B6FB573136E8E5B2D0A2C5EFC1E56A9C55 +021EB6A716D317768EEBE62439B6714F15EAD6402D6CB18772B202DFBCAF4A72 +01C041ECA0CE48C2D458AC0DFBBF9327D4566CD5AA138B21C0578718629C8EF4 +FE605BBD9FF46DA1FB9EBE950D6CA66A02CB7E640DCC0367D635E5CB62A8A35A +6FFFE390984900CB1385D1C5B708F743895270823715BCB69EEB8D8F36874F51 +A0972B68861EC54632209346594DD1273BDB95F5CAB8B463780B97017348ED2A +855AC367B9BA949C4F6CD562E6A4D8D49C133D5386646F9428D8AEB6790A33E7 +CE46937E6490E148362FF3DD636512B9D90063425D1BCC351789EBB732209296 +0B45B053697260E744D820447275668126FA78C3DBCB60B0C25230F87B8012CE +E09068065FF335343A90FC6BD7E62793D1E77DD557CA6169F80484F7151CDE5C +47305AA06889BEC69CB34B6678202DFF80A0B3F0D345E5C2D0EB04DCD6A378E7 +BA57A2A5EC3F26111FD8C0805ADAAF0355D0CDE87A01C7D8DFFE2EC6A870E173 +898C2B3816CD777C55A7D786FD2BF098CF4C518C728898977D97AA5BFD152219 +E0EB9D3DBBBDF115AB3E253060716D62B9CD254DAEEBE134625069483B82AC4D +2730EB6AC36A7BA36DC79D8C49FAE2E47F54593A950B869CCA9C4ECD4E93F465 +B9D4513F8BEFED9EADA808A7270CDDF26F3215F0D11373988598C514F9F63BB3 +D49E5F4D91BBC63194EE89C826F9AA488BEA86903CF6A9975D9E2977407D3FA3 +CFCAC175E2A0FEDF042203C88CADFFC1FD0D03FCB765A3B53516836CDC340A8B +07456DA4DE5BD8BE4E0CF3262F621FF6013F3814961C142F8B4A2E0AC9FC9442 +BC9A4DA90D056F7196DB877078B5A479F2AE9C206BA0CB36C1EAB352972F21BC +9EF53807A42EEAE6F55CBBBB99E7F6CAD9228F9C69F0AE42C1290457E74179BB +E7C44073664CB4714C8E56E02D4BF30458B111E0611800C761981DDBA311070E +E2B1F37775E0C98009709E5C92595B51B5C0D397DFDDF558AEA81C600EABF0E5 +BF0514311C7AA66C444C3D13EA48DBDC5B8ACB12F31BF6225EF1CA6D52F3DF87 +07FF7B7C5D60629C831578D703B70E365E05BB1C166BC09AA6445D149C132589 +12F4EDAD89D1364AF705F5CAFA2A676B4825DEF98F313F611BFA9FA840AE88EC +AB4B29E8C61162BD9ABC7AC2540AECA52D55A5277035DE68AD43B0A6D5B420B5 +4552AEEB397774E63006D34992E1755C5D0D51161C46FEEDAAA059CE145FB14D +53270F269340C9BF94C7C1717892327547568B8B5D339664A59A689B59728260 +CF3FD421110CF5B6852D46BFF6E57C26CBA870D726BF73B04A4F83FADC8973E3 +071F7AEF640E838D64B9DEE76C9B9A45E3A6AE564D65D4A5E8D94019E2860283 +68D9228D386BBA73286977CCCDFA092C5DD868936F9DD875BBE83478F031EB03 +D2F92BCA8EDAD6D72341D7A906DE3DA431B65B4CEB8CE79E3AD78BC939EF5671 +FF65A3C67426AE4E49E45F4C8154420E0647883761376178AC4167D0381EBEBC +B59A48E2B68AB15A2F99F44D6C6D6490CD60878BB9040DFA6A28DCB35F10515C +CCC43ACFD4E5B75955D307F71FEE3DF10A386B85CDF5F1033633C6EC369EBBA1 +5A415AA426B3A8B48CDE6F754A7BA8072AA99BD61C501142454872E8FF69CDAC +E63350EB72C2846AE2991E936B1B1EA4AAEB47CFEE542784F5158301015F8D10 +5020956399AA8FA4953F632EFC02A3738297871E55E1B953F0A4C6CCBFCC2361 +261ABE986A2D9BD1658B4C5BBBA208BEA23F717F0314DBF77F264FE46BE92831 +3455CAE4111E9E291E85F6774106B2F9D9339F28FEAB65B95619B07C150C3E74 +AC9C8BAB4ED7C35DFB3B3CC0BAEB67C0D49AACE9B5128E25E471C25EEAA41B8A +F4E6043DCFB80A35FB7741F0B76805698574941039A897A703F109C6B5597919 +C3CE868E5871466E683B50088A70A04DB9571EB7A5947A0BB2461F222E0D1307 +CFD27B25B505F54CE38AA58573934EBB706A72F13D6722D5CD68900B196C59A0 +D457469D5C43DBEC8EAFC88F91AF4B363D6BA39D11515D446830E1A51777D6A5 +4719EBB6D0F2B04EFCC53AF6BB70CC5B7FC88D74FAD1065CCE7BE5C545A11E30 +2E66C05AF6354AB13CD3317ABF745FEFD8E38DBA4D1AAF1641340B1E940679E2 +9FA8B6AAD0D37EE6367E0E7D37F4F30629A54D3438BDD89D6C4EFC3C3EBAF606 +0508ADBF71E54BDDB4B58704EF6B0554DD6221FDB431BAF080E6404AA9E2153E +FD34D3DCEBD3B1B7D0C80AF5EE4BB255BC08C19B1B06C7737099922BD287ED43 +BA5DECAF672051F967E0F3E9C0AADDBDA2A2546B6A56BFFD0557C864653D418A +4B1B7F87336494CB026A466F8FA6E492D1CDB9465FBAD7107DCC537D7F00C261 +16AB59B2ADE773E9D6E386DC1ABF23C612EC78058484A5E1B4D293C8D88C8E54 +892CA442C9DF3A16AB1EDD3A673FDC573E98215AB675CEF4A3CEA6EF11F1C4D2 +E643C433E6F846C5240E85DD77E8F55786F3D8219D851A4A2EC3285A8921B640 +AEA54076FE2CDE81148814D5B44994BFC8B1BA8AA0CC29D55B9D419671E75093 +86068AFCAB7CD34DE7229D555F36129AB6A006EA7B022D66CF9054994E55D1FE +0194638D21916C7DC85335EAACEC28D880D56A577C641CF1EA3519E13DCBC518 +42199B2626C95E503A4D616A255D4189EB395C5B9D5E421304C3720C90119121 +DA3B71761B7D3B88EE8F9E13B645DA1736F6127AD06F9668B437B80B9811999B +425AB8E41CC713749D0069700A8D4082388F6B951777D0D0EF327326A545DFE6 +15734679385D5B51EDEC0E627CD66320A3C8CAF528FF63DC0EEF4EDDA1708F1D +54DE66CC8689845EE2C8B199E53F2176C8DB8C16871A95F1C2B75623E495DDDC +DAC40B2F0C2AA5B4BEF34E85F7014C942EB82771ED07399426C281E6E724B4F7 +9EFC644FFD0B36835D9A29052E3CC2793CCDC387FDDCCB0AC11A01332DF05D4E +41FDDAEE1AFAEE91552789E9FCD645FC38F78E6354F28F1163B6E5F808A032CE +296B1A5F44419FB8D34D183446B99A294D9F09E7CC3E8CE953C6971BFE5745EE +6FCB7CBC1FD7DA6CF93FC65651F89FBDA2D3550DD04C1322F1FCB570F4B5D9E7 +C3162603874B40A18C9B75D33D50FE11BF835C06C4ECFAAF22F9087AB241C594 +CB769CB7C0E2396AEF11C56614DB1A25133209A780AE81C2829CD20EFA1435EA +79F444108EDA18958F4F7AA04FB1422C0862C2DA45F6F938F350D07E5CA0229F +4544185723144F9C57AB2A181EEA5EBADB6AA8354A8BF652A2EDF2E7A6BB9713 +04622F85744C6D8F818C4E32431CC4378DC69760BB773BA6D6094172EF07F4BD +5ACEA4E89A41C2E6795E238A7D7FCD4C26C33B5FA65FE89153F7E7B630E4877E +84A05776358376676CF0E11430649DD800737B8F1C91E9D822059DADE8C2C0E7 +89FF613D5B1CFD79621A7DAF5652B54B8A2761FA1C545AC80EF60C77861023D5 +0E64B65D1ABC28F524E92068ECC137E5A250F8C2FA42E9CCFB122EA19D4D03B2 +EFF72539E6738CAC2EF2AB949DE2228358EBE2A6DA9A6674DAAEE65DB92AA466 +7590B88165E9484AC4E7D9C906966AF728C7B55AE1788CBCBABA26F77BA0F226 +501CA47F81B4452197D80551834983FF7388342F85525211B5572A1E057F9E64 +6F4B281AC073401CEDEF2020E990A4AF3020F33DF136FFBDB087A4F62039A3B2 +BF1A96553CF5B0165FAC89CA21EC6E9A23F8EF5ED3F57EF1DD35C3E340D74A33 +54221A264176C1676B0A1290B13E48A043E51018666077F171D17A9A62630E33 +72D873CAC592E127EB2E2D2948A7E990674F9132B38C49BE15C335C661311FA5 +C52F446427496227B6AB973A9AE3EA5D5FDB9C4A24AE4451F0F7A05B48140B48 +6301522D8F130D5CDC8DBDD297E0F179B238642E2436B5DB98C0DD43D2B50E7B +6BA30ED317BCA71BB2B109E70C982ECFE62821D38619B31FBD0D3917628C4BDD +BBFA43DDD2D2AD28C8709ACB321570A99FAE28989412D5E3E8FE93A681207D28 +9BA01C4388EE00A94E09894B7738876110397D2D40643EA96DC8D0C780C22DF9 +5FF6BA8F46FCA42934A66CAB425270DA12383823776214FD2915C26E0228D948 +56065D62BB717E150A30CE77E8ECC4A1585CD0ABA26DC36231820B9057D9D270 +5050D4C18D22BB970709D6821D6F76F9DBC16B2D1EC6E5BE6C88DE213DE46A5C +220529B9FEBC3A0CA8D176EC0D74E32AA5CF7345B8FF8F4CE7051C6D4DFD66B9 +EA8F8BC928A6421A0025B404E263F49DB7C54CB7C08DC783FF10FD24068BEA2D +B0AC7AEEA6386EF4C98DA309231BA3EE83FE788EF7381C7ECEE3FAEB3779CBFB +E51AFE29D5C49230BE72ED828339FA5F1FE9704CF831345453A84072F3312CE3 +C066947E9CBAE98806A87240022378C2D31F9257A54B0FE5D020F5BC0EFF5479 +CE50C2B49844B0B25E0B32023C7039A746F092B1775D7780DD67A2EF4A147439 +E7E1B3D4FDB73762EF27F5F3A495E60D2DC4A54FDF2AB3AFC054CCA17DAB27EB +0B30EC4D0922EDE2B081908603E20D88BFD20221CAD443564A070ADCCE970A17 +7BDB1BBA43F4A1FDD52B849E516B1FB2EEBF91D2E6B6D1D4C10D2AF4EB2CFD63 +78B3C368414F2BA66D9D3422FD5164913495FB75B6DF1093A7C238F313AF78F4 +E48B4248C0841F0F4D1CC2BA47BF5E06E133BCA2323F7A9F2C694C7806A17977 +B83A7A714B48727D291325482D96220CDD4DB1A96089C693E57E275225472B9C +217B6EAC289B8EBBD7273431B1BB1DC243D4B2CF94718C0B2759313D6551E1AE +4C6D3A92FC3381B1F7E61ED04B063211379C4B88C5C6F22335EBDC24CAD8D9E5 +189A22C3D6F54428F5E2FEFCDE5C0EE2131C519A0DDFEC8851C02D82B5B48265 +7B11A40E8793300CE171853FD82874E09D814F5833F04441329C6650B0B7ECD3 +7FEC743EBD43E7F88542C389BED47D31A10FD8E02C23FF191B9F3174113723DF +934E3665A5034A639C17B3985CD6D2F1CA289146581EF6D1BE3717EBC7E6A824 +C3D2290BB60244E163D213FF98A281FA409513AED35F15B4097FEFE4C3AACB03 +613570E1D66D29BE3D14AA5F3266920FA088D33948D96BDBA0E3980254360DF5 +7A7E1836BCBABB7BF9C42FC87556F8D08DAAD6249B65AE106296BB7F0C36A86C +1A7DC23EFB77AF78D006DAFB6A703C6C1A16EDE52BD2B01A4218AC671769409F +90D13744FB1FBF1F2EB3DA35F5B0D13F3862D69EAC091D48C57C647F71A0D718 +233F6A7950A610E1CAA551BD702098466A9ACF3F74FB64BC0DCE6C952DD26739 +857084C96302B0B641D425EFE5A2857DC340BFD3B8ECED763B298137E930E6B9 +A3C2565EA96CD52BC01A2959B21CABEF6DF7837DB737E006A72E5945B076F197 +84EBD29B05B50A78C92D0F2EF60C8842F26B506C1BE919590F4FB4FF34923664 +868037BA9C227C790BFC0DE4DD05D54D975B64F845540CB8CA4A005F9590B511 +653C782C81F0D64F3FDF8FFB627E985E877F41292BD6B752F76AEDC9846A1408 +F3056CD2C28ECB255B5FA6F3BC782A2A194559F33DE3FE01B5FE1BC223A15E2D +19A2E61C48BDA40451EC6D1227724B9119D0F6BCA1B3E0394EC201D29EE7BD06 +99FA5D7F79A7894B801983D18A2AD3FFB641EEBC30313EF5F0E7524D1FD1FA9E +3E996BA34FD8654EF1CBF0AF94929B7FE3B59C3BE1D1328CC1041CFDD358C360 +C275535CE03332E745115BF3212802D0AEEA8B9830E8F22D91289B531EDE024E +5529E078B3F07D44CD0CED639E3F6307F3A5920C80461653CD1165276A9A8406 +C977F00D546307433DA39B3F0C7E77FBC3006B9CE33A9AF600A2E77947808B04 +C8A8432483A92B52649F0DDABE5DEEC492F4057F971D217BDAE50F2E9068F047 +65C9DC2BF810FB485424F1EEE5481F0A418BA3B04B0982F7645B72EC3434463C +D7AAD47D971B0EA27F08B4768E5534C91BC97A55DB0C507450CD8A23A69C69EC +88E3920BC8F2546A64F94DFF27825F40EA724E372853B9D6F88B076B2F3048C1 +418296D7C1C334C7978CC9CFF63D389A272D089BE63E2AE49B3111B16D7C799D +6C748B8215DEA3A0B3917E1BB566409EAD33315BAAA2DAEB3D8CF0249D77CD6A +B249757258F85CEDA706631A3A744B58199520234BD0CFFB9A2419ABDE6F672F +1A17FF37D2F90FBD4EB7FA6A61D8AAF46A0088E5A4036BAB380E009980E4E046 +D44809CAF538BEF8A6A9F9FD0F79292B7E957C9ACF483334DBCC6F74BCA0A65D +37A6F17FCB125391F0D08E5D2D103FB724254DBB0AA13D402AE99184C3769CD8 +B815348CCAF561F9D0D9E822616A8FFE8F8C5551BDBBF975772D5950C89F6205 +76477756526F9E1DC50AE067566B3BB8FDCBA50C3240425FDFC0ECC4C13F61CF +C531DCCF8409AE8F982BB83DFA61127741962E35F961259B25CFAC3B8D4B7661 +84F2B75F8675AB774DA36A90FAA5203226CE0C1559D9EF9548C42AEE0981EE2A +ADABA93DCE5749C832D6346536CC1B4EDE38FEB505C691AA2F16249555C51387 +0943062F78BF1D3E2E9BCAD32360E994A7198FB6FB73BFAE552DA090330B2EA5 +83BE32BCE7A118503C991E52A5608FC6FE369A851E21F52EF086D5290D254138 +97CCBA430363A3E9A857949EE4B0038A46139B938827D308DF12160EB4589AD4 +51F43C21C6B37F774170B52BE4B9059F4145B1CE0698FCDCFE0219543AE7EF0A +581F553986F396A9BF2DABE719F5323E022FD3009D00BAE068481B3BDD54EEC5 +2FE03CCF1026000405284A3B0B4E7CAD80CC4715DCF9876E0953529FE25CEFD6 +E880F78DAC530CE52CF4B386DF921B4FDEF292C1946E8592C991B4ADDD161CEF +343920F9D643FE7E4A134B301FB80E9F250E3D4103A6A80998565F1985517EA4 +A08B6DF5C3B04A5CE9C2E195C9F616295CEBF166EA762DACFCA087342A95CAD1 +7CF50A554DEC41BA6DC058B8DE3EE6C915C19EB54E7BE62D27A657A5E25451A0 +9AA9CF07C84F0AD930D7289E5A89ACF43B325E7AEBAE129D1F9362307603BED2 +47EB0AA9506711EB69AB7DF32FCEE97D305558147490B729B91A26BB637800F0 +D96E0A0B2F8CA9565779BDD5AE2C8953215B14D01C97AA2E6F222F3A334A4260 +793A569202E944082A535376E6C43877C42E7AF340DA943A3CAA65DE36FD7D0F +63D5416A652B245183BC054F18B9DAAC1B737E39DAC19691BE14E7C34F2CD914 +9DB9D6EEFE763E88B68C3709BB720CB64AE6B53D63EE734EF705BAA0325E5B3A +01615DCC3427909935A63DBFAE60ABA2553F4B902CD10FAE937CAEFF4CCAC346 +9BE15D5216E6AFC9EF9DB97CBD0BF84C1C0D236677754E7DEA7E8D7D70EBF3D4 +F76F085D46E3FA5B54BE692559C6A921450A80EE43AA32708580A635B3E111E4 +585ADC605208EFFF7DA65F2AB7CE1BB3797608661F24540B65B0BC2A967BA0A9 +589FCC9E21FECE0DA26FD85BCD09F79F2989B284C5F688264D43E6F2594FBFF7 +8459705BB01BA576EA4F2EB28BBE01D9178313B7B784E11F9E214CC3697E0DD3 +D71068D077867578033D1C6DECFF9E20EAB41E79D0975A99D16C886EF3452F26 +BDAF0D59C63626434165299CC6B943FDBFCFAFAF0713A07E6785CC8E8771C080 +EC6463B0FBD9903E845525CCD2DEE24A11C42C749AF67B67EEFA096DD5860AD1 +75DCA722CF280C1D76A0BE878D84FB69A34A8B5FDC115FEF5E11F14F40C522D8 +09B058982135D811ACD94E29FFF3FF91726E8E981749AA281DD237B12F994802 +530DBE2FC4254243B0D0BB483BA0F0768AB055EA84785E0E6C955E0BB66AF909 +FEFABC824EDCA7F8FE1E1D4B10D618A9B01D29ED46B5284C2BD31617099D73F9 +E33193ED394F895F40C941206876531F8CE68F6682FDC0D7110F3F72F1A896B0 +64C752337D910518EF68FF843EB63E62D466E328C3B21114E9B50C94452A0AC2 +5D145AFC71665D24C1B357B7C33F3062F3A3C62C2F261C116E6E66B23D86CF00 +497189200BD200A9CF608D78E4066A01CCA2B61D6062738B3915FB7F1F94BA84 +EFB6E7E43F62082F1F51073651925B9BAA1767E79317C54377ABBEEEE2FD8485 +FE1399F5F3DD5EDFD3003C1ED74F6A5DE9BFC51DB939E55DAFCA94D0E89323DB +68A8D52F0DF168F4ADFD436E271AD2DF4376A835B886EE3565CD2FCC642C6B3E +A01B998060F6A132C78A97D45541E4A2B6699C07AC6336BCAD8C57FC5AB74109 +D6D1AA0CBBEFDF35A43BAA60B6476F92F6BB85B3BF63A4CDF10824FB8274736A +7FABD17B443D69DF7CE29B45B716F3F5CB4B5A4C71F99D4326815C4072E97508 +A6ADB4C48B541B724A3F3BD80FF1463B910D1091C1BF280A1148DEE7F1A953F6 +61A006B614AD830337B18F5D6B2CC0EC5402E6FDCC81B76478AFEA9EF6A6D5D6 +7B09553BFD0F60AA2B36C1BE3C30E64DCBBA143B8F83644B6A7A1056DB08DBEF +846043D579B9A1A88662B4FFFB80018F9DF2B0B1292497EB1E0F19C84AB2163F +DFBBCBDFB9A487F0A825807A1F12CE7BA75CF7436F88566D31472F4BCE1F16AB +4441202980DF34AC9051E70171DE69B8C8B03D0F15D7BE95D3D0AAA6A82EABC4 +2AD24F67087AC91DF56E121DE01CBA5F202730889A03BFF834392D7859EF5BA4 +F9AA6AA0A082C5AC36CBE22668787809EBF2F471825655DC4FF532D1B4BAB278 +D0A775D3AF92B850DFDA1B7D0AD3CAE7D009CF0A12186160E29744FA239B86A8 +8DDB50CC132381EFC8BD80BEDE488C858C66966D8E84C67427A261AE1D50E127 +0FBDF478F15FA5CBE925F753FF13393BCF96F0E4CAE6C30AB6FC965B9DBB894B +DEBD651C558430F620B47EF3EBD29F239CEBDF6B89B7B94D2ED0000644CBF1EF +860DF2EC44A444E5D0328A5343329899A661EDF3878AE2C09935E16697563B20 +073A6FC372E76328803DA9BD7415B44F0B46ACB8321CB49AF1F420EA7B1D5F99 +2300AD9E8D4E8A66FDB767A4227D2252A61670A293A79E0B07BAC6BD0F12D8B2 +3FF4E170D6D2E8A0A9746A76F81B4F2FEC1F7050AE35FD468DC400626295A4D2 +52A1E243C4F52B6294F72141A0AF1A04B753F376AADC56359F7C4ADBFE79AA68 +53E3990330F33255287CB1192AE506E36FB3C3A00F2FE277722D48B526189372 +412F957A3D33F9B642DAACE6739B0096FE4B51E6FFD06027F7339778CB5BA57B +34EDCF26F51A17C0370202B3DEAA2175CB97DFE6EA831D241DEEF080B233E87A +C18672E784E66DFEBD46CDDCA5F4D98FFBA34D6BCB0DD73FC52B5168A35A7075 +E06D14A35438A35CE3D3540341C62FC9D3F1ECC4292A4783926AF2E33A8324CD +87AE643A10E4823CA797A6D874840F93565E0ACC14E8B15A367ED5B34C920F03 +44E5CF0B77F25EB6E156D91DA019D1DFFFC07DC721F1CE87EE0B5798FB05CBD9 +AF1A1B537C82516022D1C455BB3A7400D311135F91293DB610DC5ADB8726D71D +74E19DFCDA3C9C974CBEFA7DE04D0EBC0E6F36B76C0488275177AD779ACF91C6 +557E6259C55186992A07DA27629C12617EC2AD99DB78747D903606B1BD731209 +368506CB88E926D33875C1F03A076F1E2DEE72B04AE9CBBD637BAE78F85D5359 +F12FEFB099E7F79F9F4E4BC19967EADE1C774D39E17283D640CED5EEBE5F7065 +B9484913948988BB6397FA675C3CAD9184AA103ED711647FC1F2447B89A491FE +07F08861BFDD33D8BFCC29419195CB424D7CA739B071A6CB48AA07BB8D6EA149 +6D3E5F0A6C0E0810FE6EA95067216F4948F14A1B5BA099FACBE40AF2EE31FBAD +CE4203CA3A448255C2E01D848E1E16A06BF4911B3B6173DE296F8D599353943A +340B7AAF53ADD697F7F0DB8C7AE71D41291C14A6BDF48437F53521C5914DE245 +B090282984C7A044FAB93B310717E1CAE827D3709FA4B3133F4B1D48793C8B67 +7520CF5A1667ECED10F65156FF80AEF4223A3A1DD4A2B5CFDCEC54068A5110C9 +B6BE775E937F87F78BD610C30F41FEFC96CC425E1D399F87FA4E224FD6DE6156 +A6FC881D166C2EF51E74020A7DA82C23C1B44D742DD8AE7796562A3FA1403CB7 +72726FAF5243AD865F16E1C7E9CFA9FB07C8D50EC46E6BA6204D7633595D5449 +379F93B7B5DF609834A03FD494DCA24C38988143C9BE067CC851E592209CE9E3 +EB91A4EBBDE654B21162D7E5569CC136C318EE081E7843EDBF9EFFBAD2372FD6 +A8C7BC331E304175AEF4542E601C15FDAB36310C7ED2531B06E0D8ECA422765B +8FC546BA663B30831A2C948AD871BA3492A559C9E167E722EE6302981C66FEE5 +C8797E4531EEC2EE800363BEBF135FBD49958F17B3C714E30CE8150FE6B10C14 +1EE290B785A68646714C865A5525935AB83625D1C4B36030714561BAE2AFF947 +9062EB00A5553C70541C072627F4B2002B273098EA313ECF8D4304D89E4D58E4 +8894B1747BDFB183AFC1AAE2D4EBED27037840747C2B181EBB4A28F7DBB69AB4 +B1539E8256BB8FE1D496FD20C27E4F32D760A1589F1EA8B1892909A3FD5655D4 +E922F8178C513969267F3DBB4E9906EB689AE2CEE01B7E6242B2ED98F7D10FA9 +48AFDA10679C4375A6EEF12FC20DD02D21CC44995559839C1093E6EA7D867D2C +A7EF5DCD6238FDD38A0C368F199AE515C8546F8BD511C9671510D335B769FE8D +DA7554FC032DA527C628650AF7CDDEB5F0A17ABB3D30DAB0D264E523510351E3 +95B89A8B4BBC739708A9F6E2A9B2E1C246D653CD83E94847FD563F76C0F97E15 +87FBA4C60C3093D184F41BFCB3C36DD5B64D0B54D5BD45C36F4F0CA49B4B3871 +D5D7AE4848B3545FEE5508A5437B6336B0CB1BE95C52C4A956830CF0C5C77EFB +89AF33CACD05C7BC3DEA59023F12B4DFD425762683605B4D6D0578D26C89F116 +46D81D0077CA9E1B418DD33BE7BB7FA0390C3015A455BF34F9F5521C52050B8D +C467305A567984EF85ECE9BA26A60A81C57480E1342E861BB24C5DD2014E32AD +51C74DF5EE6621532F926839C389C6943D1CC25957578BAA1FC0E3946C1198E2 +CA33BDC0CD4A7146C06E9CB7A094BECDAF9DD2D8DD90398707728B7CDCC0F512 +5587FACF96DE3C0CDC40D11059DA30FC8266120F94E6760E57AB1CC6F97A3373 +DFE6E49474A9BE9BA57B204070A2181612F62C2FAE9F76FF53E1EEFEBBB418EF +AFA5D01FF7E2AAA3FC8EF390F1C90F81F7B725F577DA9E3724E4DB5D8B7EE2F3 +66989DDEB59FF71BB3FE57CB6A199A0B8904A00E7690269B916E00598CAB1321 +092F490EB7901D5E5B0CB4308CA693D9E89740F7FC86A294EA94EC5AA9E5556A +A18D56E6DC6B2D27742AC888A0233E23F5DA77B88257AE4A4B50EDEA38F3FA61 +1E23B6269E9A41ABDC22C0A8365103F27E508737038F8E1A60FD47452CAEA728 +E00BFE2CCB5CF528295D5E689136C5637CE2FC9838AA32D84C8FB5E26962EF50 +0B545B5B4DAC2A05A637074F2514D6CEA7A69CF2F88A05C0FEA61B6042E92A46 +408DF757305F686C0E3083A06833EC9C8B2B23B6649815307978F32CFC60F17F +DD370E1C0A7E5E764D212A1F385CC73725E08ACBB8CBF759F66AEF5AFF6C644C +FA9807EDD1706D83C8A5C88AE979700ECF1FB3BC3ACC1AEA58CD17177289CB96 +68A67167CF719FBF54BCA2FC0338CA22CF1BE9E6DA4193E0754B5F3F0B5645FD +19B9DB6503C2F6200CE27E6CC79D0F10EC7114E5CD60CBEFED555C8FE0F95209 +B5107D1181A4B9D6286F3DD8E664580BEFDB436E3CF716BAD8CEB658086346E7 +083EB572FDB69BDA6FED25237CFDC5DB6F1BB321B27F61C5E5899674AE1B0808 +CB878023FC1CA40AAF6E4AB02BF337FCEA41A20EFF533A03FBBECEE5CA70E196 +820A06C57FA25651940679389DD522864DC5FA35107087293FB21F8DD2C3BFF7 +4F4B5373D363BC73EB8CEB672204C8638C9EB97103590EACA1F0F3151A57E436 +AFEC0DF129291509AAD40E6BFAF8E324CD9C17AD056FD9C7AEDDD3C4791C1125 +56D15190F34753ED08855C8D1448F39AF103706BB3BD67716C0A96DCD01331C1 +F0B0C56D369AF5DA96328EA85DA2C427BD9BC6968772330442684C39CDED9D16 +F6F25A9CBD94F9AB4942017F4551168B0DA8A940668EE04404E5A62EB7CFA744 +9208A56833949C989E2464E4D4CCA2A956CE7DFEE8B6FBD69983362017FB07C3 +DB2DD65AA40E019BB3B4579D014FAB4892D5CE63C9EC14DC71D69D86B3840B7B +166908760E4E2C2A598C71048E222E0A694EA77CE21330DF75433BA06F6B93D6 +C7A68E1D370ED66AE05C03C74BF2CFEC3C1231856F0113A11B84F5E975118955 +08FC432A4EA0DE469CAEBDA7800D2224CDB7E386F81E4D27B37EA521E38B1ABF +61FF132292B87C362661225E64FDC8E9E45370CADAB9B57C9A0CD09C699D9CF0 +FB14A3ABCCB87085B33A08BE932074A7E10F5E733FB981EFA68F95DA8DAB2886 +8272D76CF125E81FA01EC92474431F9BD17EAFF42437CA4027E5A68526691A76 +A3767AC34172C5F509D8F6D3A9056F02D3ACB43BB5D70D8B24F5CF8A602F263E +1BF1184E4A12BAACD82529BE2814E73038AD71730F2AD6EF0DEEF2673B0E8600 +50D316A9988E3B35CEF343B0E5F24D0214BFB1DABA00387677AE8D16FE961B47 +6E56551AAEB6AA9ECA626ABD01CA41EB6BBC15FF2892D7675F23F8959386F24C +170610025CC0F6724E975DBF843AC45C0279895274FB57091432F504051A52C9 +819993050681762E87154B8000D436B04768061595694649ABA87131B0B8B850 +9B9AC65D1CF1CCFE6ED073AD680E9DAF2FFF847B216EA50FF97C2E0738E083D2 +54C9BD239B4D23C32A6B94BAD95102F70DE6C64BA20E480D6BB8EEBFD755586A +EECF15900961CBA26BD6FEC03C3BB51A5D17024CCF8F054980E01C45BFDC1F18 +CB160EC8722349AC2CBD62B12F0D3C3555FBD815332F15D4BD3C833B4699C5D9 +57F84D305C363D7387E4011C025AE775E218E8BFC12C8E3727BC4D0D28BE308D +6AD7E438094CDE7E2660234BE947811965606263564C7CE66853498677DD8F28 +943CBA9FD54E57B1720DBF90F6E399CED323AC651BFC4770911F515CDF8AAA69 +D2E26A8CA01859367931A33E96940EBFE29E653039622FC202A2ABDE7B451B00 +2E93E8AF6ED01D1E1A076AA60AE5CC51406DF644586AB7A9E1E20AD183AB50A9 +CF331A59D7691685C8D50EF7B473739799236302FFE5D2BD3FEC9A825DA4E686 +07E2108E32AC88F180C63C16BC300119A912D1A3D2ADB435EAF8B4B1437620C4 +9BF07318952AF158B6FBB24E3BC8C79949119CB8213864FB444FD39344C696C4 +014975DFD60E5793947D9985C668186CFF156B5A51A101FD652BC65B945EEBC0 +629D88593334CCFAB38D5E13A05037D5D91DDFBA4656494699C6DD524EA39B50 +3851D7F0FDB6AD2848426787C8B8F7C5A65CE9ACC644636D236409AD05C7AF57 +90350464847E98E9806CB4051992296FDE0D24EA95814A8F7B1FCA2B3DD7E1A4 +BFE0114B02876615F15E3BDD86C4D31619007E8FDA49EBEA8927EB28FBE0118B +5615CF1A2479B97EA9209B2336D796934C2ACCBD815A603643EBC010D77F2DFA +BE1934ED3617FB150B2D69AFC9227CCF457C31B6E98148D14F22889D3EEBE747 +1F58CBB932CECCE24B2E91EC2CBB4852957B152502BCF73BEE6172AFC954B44F +1649ADB935FB67389319E24F359A87C790B8E04D997F48FD97879D969C7F299D +99B011B9DBA379F5A90C5889DED01E871C39B9B3BF2A5F54C04E5F4AD327227F +197BEEB00E54FD85911CB14675B3FB5DA8B4FF9D80EEF5F92DD6D22F01A40B18 +8CE8F740348E6458B2749D084CCF21AD59CFAA438B5B2B52BA165C3776FA5FB0 +59F95EDEA3F05B82817790C2247B4D4BB6D04312A176986C4DC3EC5BC5BEEA12 +BA0892ADCD2E5817F971BE60529228E88173D053D8D37CEFC40A53E3A7D56655 +E78CE8D89E0C2157F462B91BF66562608E84A7CCBF0FC97DCE7C32F4937CD1BA +5A9EF98122077CCD77F0D4B413D88134428EDDD4B408A1CA44227FCC064AF791 +74B378997106AB867A0DAEB81C05A0E52046B893EB3264B13DE157487A870B21 +6B626804C90CA35C7487D8572D374F89BC214C104623F4FEB3FC9921A37BFBCD +5691FC8D34C1504ECAAC62E5639E3D603DEAF642AFB29D65510C4649D1E10029 +478F57006EB3FC50650C79EC23799E3096B920D519D2777C0558ED6148CA36A7 +6B7960FDA29951C6806E43D886F4E09885AC300738BB85CCF1B9DB2702B26D28 +E71E20C15361E0AE4E62321EF84275E6C38A5394071989EDD48A50717C47F6F5 +FBB8CE06F4B98303F87B580F791BC936B474EE9AEF5D0B520394D29864F54747 +312FD93DEEFBC9A4E8948D0F04981A4B0FFC277F5331EADB2C9B260492104D1B +9FF4A550E46526E18628FBC914FDFE4AF06FEFAAFDB7612BEB08A8F9701CF8E6 +16FEFE9F3FDD4C69CD8B94E774C6D7A5D0DA3B5542C8CCB50D99D2AA72E775B2 +F492FA87D09BDFADEBCD184F03EF0E2D32E9CB8CE536793FE7DC4FC36D4CCE41 +C7E4832CFCB89AC3C2D9424032B5200C0EBD030450E1F187C05132DA4CE553CF +34322CAE917D85EC50CE6B5FA5683402B23DC346ABDCF3E6DE9932BC41CAFD66 +D5458DBBB689B60CEFB2C684764732C290F613777624D349DC3CD27515F730D4 +F7E7452C23FD57E50888B33A9359F3834A45DD8372E4CE789A50D6B4FAA9E5EF +C300CDFF97216429E2F04F607EC88917D4F37D54A92D2B7E071A556686CC334D +ED4E2509248075FCDC6E9EE6B36E1D1A87F7E7A5AF045184C7618E9730A88CF4 +788A783A9F0FDA1A62AA5D739618DF70976B29E2070A5DA79E7BE8BCCA15B10D +C3034F128A120EE0204CBB875525B21ED31171E2671A86080DB1708AA5095096 +87B4A93754CC6728BA0FE317ADAB3D080132107CEDE64DE0E8A2169FA6CA58F0 +C0F859DED55CCC42840845EE5126C67FB7C12D06255EC8C1EA8D0818AFC432A7 +BF138150106B06296C19F723677937F0EF4916D9867A61881813165ECDAEF3B9 +DAC80ACCDA42728B299D3162F604F8EEDB5329516C21A722B6F90B44E3C178E8 +05AF55DCA05DEF68AC75F1AA91613E34B528C9E104A8A620DD863B7931441F1C +980A606A0B2004484C1A2E88D0AFE8CAA98E5A9064C923F14B2B5906F9DB8F10 +8DFD79F217C965308DAA3A6F387B0BBA044588845A80B3850D96CE61954D7E26 +EC7D7E92001BDD39F0CA86751F6FC4E987A6C3267E60C8A02FAF445916B9BB44 +2EE70009084AD0EB3ABAC072200D33EEC864D50135653DA2774B9283D8978DFA +EA91B0B759BDE7867758493A9EC7251A7C620DCCC132CD154F2F66678BA89750 +FA7E3D23D3050FC9D54F990A6F96F035CFC231302DFE51D0139FABA75A23B168 +685DDA1C9E68236A7D19541193F753A633B103FC09BBFB3E6F384DB7639429E1 +76EF95062BBA +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: csbx10 +%!FontType1-1.0: csbx10 1.1/12-Nov-94 +% CSfonts -- pfb ver. Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 25027 25304 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (csbx10) readonly def +/FamilyName (csbx10) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/XHeight 444 def +/Ascender 694 def +/Descender -194 def +/CapHeight 686 def +end readonly def +/FontName /csbx10 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 11 /ff put +dup 12 /fi put +dup 68 /D put +dup 70 /F put +dup 77 /M put +dup 78 /N put +dup 79 /O put +dup 80 /P put +dup 82 /R put +dup 83 /S put +dup 90 /Z put +dup 97 /a put +dup 98 /b put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 102 /f put +dup 103 /g put +dup 105 /i put +dup 107 /k put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 112 /p put +dup 114 /r put +dup 115 /s put +dup 116 /t put +dup 117 /u put +dup 118 /v put +dup 121 /y put +dup 122 /z put +dup 185 /scaron put +dup 190 /zcaron put +dup 225 /aacute put +dup 232 /ccaron put +dup 233 /eacute put +dup 236 /ecaron put +dup 237 /iacute put +dup 248 /rcaron put +dup 249 /uring put +dup 253 /yacute put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-60 -250 1164 908] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A2E729C1F3C653E51B9F09F139 +E332F81467DCD46C6B80A4E88E1FB2B35C9134E8C9E669DEEFA533F7F13511CF +F16ED856C594BE960395D34E6F1FB840870E1390BD51DF0CB99AE59E98B369A9 +308EBD4D62411D723A06592B3F044EE52173E7B573E2FBC21F32D00ADCFD4905 +7907BAC782355B39ADF860CF2381EC0CC3136060C15C7F794F54FDF9445AE615 +FA03D051B337AB511F64C838302CBEB69E431B2B66B4CF0E61EB5ACCC8F55213 +E44FC7CB51E3ACC12F45BBEDC00C9A63A43839BDAD1C0186974C7539367FB600 +B9D9DE3DFCE060C626C826CCC9C6AF9B765C6D6487D5945B01FB21FD234A6D46 +FB48C4A049CA13C82BF001906C71B5E4C7D8317DEC3B2F4A0B8F28A9CA07F8CD +FAEB3ED1ACDD5162F7D3491964E990EF808D40307E9FBDC0AB3B5BCAD56C895C +C6666B4096AFADBC5B931D07B418009ED6BF9886982EF5689E1C67D980F16913 +28DCD11AF89476D84997CBC50E8E7942C3B7AB5C03A7DF37E3120834DAAF7EB6 +E1A625F38D0EFF2CE86A1AC4ACA3A3556D98D515AD265D35FCD8750E1F4E73E3 +A74900BDC6A9FA84C7A4A36214935A985CADB31B33706C0DDE055D4BBF888C0B +38320A34A47CC395F479E84CBFB77BA6F9EB33F344B34D19ECD3466836255387 +772A0F959C9872EEBC9D69943B4CB8051FDB325D6277BBE0490A911DAE97C388 +6F9ABE08037B55845EAB04B303B6B76B4C3CABCA519101147E180A8D3CF88F01 +341CF48CAC41552A13A28513B88BB7322E9AEBAB1A3E14CC90D74A9E3AA0DF8B +F3A5E867BD5324ACA963C4ABDEC64E0D04E7A4ABAD8BA0D11BE71BC655498838 +A442E796E115A5191B3204A7363FFDBF3675992925EBDD62DB735081E2882646 +E5BA327D733475DBE42C23E2C54CED537D6A86CE4F06810D4928B0D1C42A1AE2 +DE408273DDEB2CEB0C3E5CB9E9F04DFE24FDA4EDF37857AF78EC3FDA2FED6A9E +DA127541626E0699B04C8D766749AFB2D3E936B57AE4428BA4CA687497ECE3F5 +499B20534D33C810E49CD8DE276F3B0D99C53FD5E9CCD27DE829BFF0FD5E4F48 +BC67A545E9AEF50C54F7246CEFA95B562529D99246B2B4F1C559EDF00E2F017F +01506167129C32180B57AB61C7134AAA94335873F8D910851E250DC3AC668D8B +42742D51BA8E9D80023BAC481D5DC2DE545CCA1C76119243942BC019A1711978 +9C7A58CD0337B9E03E8C7216070D6C30D4059BC9CB7CF58D522F7BDAED343F1B +D91519C333540AC41D8A6728E403B9B6C2557C58B50D553E7E840AF3D8F2FBB2 +4CEE050FCA8E999F6F0A57FA60C5AF51402FCAC90EBBFFDCD49BD7B4234BD101 +4883917199634D4B9E42E7AED1C66DF3E0D26C27359E520FFA2CB398AF4BE739 +8025B179512A9E663932EA1653E8356D6E231F48AE1A891FD9385AD22654017F +E1EA3A919C1340C53F274CC26A77505DF91CFEAA4851D98B50CA254A979DC5B2 +2B9A0D033B1C554C74679B25593D6546A9D962C222D2B31D6FF116DE24482DCA +F77A75ED699324E200ABA06441CDE480D3B4F48441FCFB2201E73AD09DACB123 +7C54566FE1C6A389C946CA44A65ED628EC7D8A3BBAF38611611C8F70F45BE9DE +26AB30F0AE1327A84398446751BE19E2BB5E212169E99334BA8E806433CA436C +A6C520F5394582907559B1693E6E0BC2C6BA13FE5401931E8B2A0BF1F2B1A2D0 +4EDA053E24BD0261C39CBDE1A027961AC7656D1865A006D5B92A690CB90505FA +2088A685E46121559A86E26528A457E181ACE06F515261A7422D11C58F9AA5F5 +86E65941910777868EB1272E4AF0F3A2E9A8EAB12FDC40D26058B4A42D97AD56 +452AB26415D69FB0180DE954B9ED498404CC1ACF96E609C2D5E056D16E78A580 +D0028C2CC6D745A872D038A67CB4EAA0C5A3A0A2C172FD42335166C2410102B4 +18F6A999AAD5FE7AF8CFC3EA743D5EAB9E76AB46B5A919054C70BAA2C6EF3C13 +7034E17A5BF56963145728CE08A2B18F09F5AA1B95071B32680F683AA8952DA7 +EA8BBD9FF5638653F13566EF821636ED5B86A283C50B73FB4A089F48CD86ABD6 +E35D47CD8864016BAF836233572CC7344F8F67FDECC31BF3DB16C57AF4198B5F +A62FFAFC990EFB33DE8E6AC7F618B7350CCF2232A0702EC0937BEFB10281BE78 +F788BE6A89D51EB0CD6DF5012D0F4CD4019DAA9933702E8191783F481E60CEB7 +6752D9CC1759F6DBEC287CD0C5DDCD0EE94AE3C7911C92EB6F6A5AEFB2DE23F8 +42DA713A4445327479E29EC15DB887E6C67BA178C86F9A3763BA8D61892DD382 +926B8CD1C9F48EB5B074B38AA0C0AE520C782C68005E17179D80DDA6C553C24F +939AACDB85AE39447EB0304C036D8FCDA6EAB3AA4025132552E48191A0C4FE08 +D3915C2B4D83C5DBC8F8FCEB4DB5E29602BAEF8EC315051303584E55427E1B49 +ED386C0719622F06AC4331DA4BF6A259823BD5F7219033BA82BF9E749FA73767 +009E84D45A60DF79A56068B345894F53C40114306289DF6B492DDC3E7599E413 +11C62A4B3AED2F5A10A974A517D32E9E43EC77F452A4974A0E5AD1A0BE300DE6 +BC0DF1662F3B2675F475E8345DECDAC564326380895C20FCE5C760D3E8BA51F5 +B1C6CD1F3B684AE3DECE3F2A030BC4A1EFAEDF5DC738D4E4D080C095BF6C4EF4 +846CF6BD53FCDA68A73E4DA19DD8CD5976E84ED25AD28F6F7A86E0B7D8B77757 +86848BE51621D6C84B63DB243BBCA42B445CD17F91BAE56DDA9082CEB3584867 +60FBE49CCF84716727B849259D75D2015CA5D9F773E62E6B4637119C5F822330 +1435877C2E04D12125E260C806C086B718AE04267A3FB688072349DB5985AF7A +3EF437E2F168779B255B7AC238A894C34FFC25A6D92F74F82E47D956F4EC4DB3 +59E60FB5E9F3F3660E35EADE4AF7B456F27B35DD50E9FBF51CE92900C2EC5A78 +41102C946879558F6F38948DF2A5CD928F5E98B9603ED288C394B23B6905FB05 +97541D2FDB342D3AAD49BD9918D6D26300F55DD3320F4D69AABD1F61D988D766 +1BAFB931275BAE69FF410DDA843B37D7BE8E1FF6F01A713806F1732CB23567DD +E34C2D0FBD53506EE3E134C6C5C6195F9F301A29D1AD0CBE1A60658BA1DC4266 +263A86A832E3AA4B6DD8F1CCF0C34FB65B044FA2E45FF2CD57CD3D434867C02B +C5CB5262E2FB0BDE3DBA3A5CAEBD7242A5AEE0798645469C42F2049584773E30 +59D3E1293D69E97B52A9462C44335EF27400304F98DC7C5AE24F45E95F4FE9B3 +E9F4DE6658E90C8DCE01020100FBA898EA9691DA0BFFCB07B4AFFBAF27BBF5DB +C1F6F4F6AB930D0A9BE3809BB680D110242EFDDA4F8FEA33BA8F45BD3BCCAB46 +C794307E700BF0441E829F8ABBC0A4303C1FA7FA6D5E7B4BE959616F0CECF008 +63597941F557757D89A622A3541E8A82B7200C84BB25C493FD1A0641BDC4224C +844BA8929EB9FE29EFAB06EDDCA954512CF32B9CA01602CCC92470502FA72F4F +A27D58A6EC3E221651BDC7E690F9C6B710982F9F5B97D29FBB2343C9DCFEEC70 +C3EF56D9DD5736EA30CBC7DD8FB02BC204C5590F2EAF9D91050C870456D4D34F +67EC04CF339202F6771154CC2FDC0A048D3FD98C4E4987FE1E4E20C30D897100 +C62EE9974659048185B985E5621FD30C30F40D6C24E3867849FA070A07C1EB07 +C1DD825557EB4CB77503F422739BCB917B200DC83B4117CEEF0677F6E34AA276 +CC8FA8D83DDEC3575E014313DDFB9E99B3818D8BF799C3E0266FC61A3C3821B4 +49B028914C6AA1B87FA5A1B5C8AAB00146F01BC5BD1BE10CFAD2631234C16C18 +FF295135D2809ED96C28D55CC9995542E143A97B3CF445E0F76DB769AB960CE1 +3AE55308293407DDBB170341F9A97F383D6DC2A397818A070A504A179DEF4D35 +D1EAA7B784406CD0FF8AE1E8BC2D22234CB961F04BE70E8737F1DE77F768CADB +A717D74D31B3BB3190417F7D240A1B5235C54A2AE2CBC44134577DC53596CCB8 +D70408D5256EE568ACE712556E7EDCF06D3610A7441731B1BA50C5F0BD700703 +DA62E88B09A09D9E1EB4BEC3505305A9CEC93DA675221FD64C03FFCB50629BC1 +A1E04AB3D1F638ACA59C7736F2DE8794B2BA32D291211671FC068FDDCB1DE76D +1756A5BC3DF771911D6AF29EF81004828EBB77B67BF155526F868133330F52FB +7CB8DE661F191040AF9A75E692053BDAA8A5F5C8FC940E5576ADCCCD09D8A143 +8038929F0F9439B5E87A5447A3158A994B6AC6C9A98C66340E528C0751DF0279 +A063A0415D0C700153CEF762F5854FFE7367590EF4534E4904CB41D6EECDECA0 +422ABCF93FA5B0340ED00D217C0D88935013B3F226D3C165BF568C3F2A4C17CF +7D42843B650B1A08137F76AC371532D9AE7AA21520276393EAE292A9F344C670 +7E94D7AD6EEDBB6D1D2D902C1486DF350E44859E2B5BBCCC4D435967F476E89E +59CE3E1B7E0D864881B2B02338DFB53DFE807D355B2FFE30E84C379067B7CBCC +53567A621A575D0BAECE6ED12600EABA8D8C1D0CC32F25B3B563D35B66CFC4B5 +6769ECF4C359B674D237AA2703E335278A7D79F745DA48008EF1283F9B18CEEB +4EBD7888F557E0338A77979751A2AB204A713AA6F5A89D3E5562890ED4D887C0 +2334D752C0038563DB6C2CE31E06AED59B3FBCDC57862401FBC525FED5847519 +2A3FC71AC25FA36816E5B0D1AE6F7A1C0604DED13A3E07353F6AF3CC4CD527B8 +BE21A197215610600E19E28C4F78C2ACBB7AE312E79CF4E0848E1F417590D90B +276D02B34DBC350BEE9D0A5466F5603E282BBF0EDD7FEE162BCBD4D22C6AE4E0 +4FA73ABD25B2328250D36C7A4253720562BEA312F998CFBD823195B70E42BF0B +843675E168A7B0E991CF2FF22256BA07ADF2E1D7D638B1E142CEAEC88CF24113 +85FB473FF7FE8E0ABCE3D954F872F2C7CBE1FB3D0B8DA5FEEE00E9BA66866D96 +952DA3DE095B10D5CA1EB1FD4A7E4DB07210DD6DC9C07D666122F9ADD34338CC +4BF3643055BD5485FF6E5B3E3A31CEF1FD1926556A5DA3DA0804954F40561629 +FF8936CBBDC2FADBB87CF7005E24300138F7CEBF962170C2B0C156ED05C19EAE +55BAE46FC4B93F0DDF3E16AFA502BAAC85AD1DFAF7B974E9BBEF45DD1B5C7DE6 +939C53ED6D183048BF2DFB5E211214B054E9802A55C8F16DA51FD7B42F2A9382 +384BC9A37B1E20E980DBC5746415B171F1EAF87D36605C168E979616E4D9AA96 +484A99E31DBF012F3B26FB88423183A5326FE13B630959029A1F4800FAD73E6E +F92F8E16EB9F4D6E12EAA0D5E9888C04FDDBE194F18FB3D410D66419554D03A8 +89F5578212669399653FED55080E1C39CCCFD5970B130C0ABE36FF91C18F103D +6F806D80A5A49EF9A1C52DC83C2516DC757F264B0DAE60FBA249D1172DC17471 +E14CFCA5DB5120E50B9CD7A0739D97FEDCC68B004A464E80819CA452059D52BF +B7C4BD4ABB1629850B5ABD8D25F9FC9AACEA2A85AF1F09D359086CD1FD58E0B6 +5C48686B54526E13EC4A7FB6EEF09DEDBEAF6F272948360D5CB1E55C89A8E311 +2E850892E9FC9667D27F3624DF302D3B2FA9827ECB528495A77CCC7C9875BED0 +660BD3E0A9FF306C982D90E2B7CCC4690DCD1C88BEE4A9499FCDBFE755199AED +7CC52DB5FE98A78F56B85F584E2F153AADF96C920BDA88829E1F515DEBFC0C72 +588BA96A43F95CFD7E080C08380757BB8A4063A0AEF257C788C5DAB8E98243CB +8034C7E8790C2679B77EA08A32EF83FDEBE49BB0F7CFE608E66BEBC8379FA52E +6166AB29276392B51AB42DE6BAC48968D4F03BEBBFFD86D92ADA04BA86AD1F97 +5B85608ED82C90F23EC1DA275082A6F3E8BB711D775FE2717485A7B39B43EEE0 +7A625E88583C186FF34E55986C626C6EEAA42863A180666DF562D80036E58C06 +34CFE10A28B12748469F8CCD2FF6540A2F580D7D2D3EAB30786263DFA95E264D +420F996C592D8F629ED1C1202DC686CB8D4FB665423535B275C1D35C8316F75C +DC7BF3780DE304298D39F7A364B70A38063D5DBD57D484CF681510FB0572AD06 +D6563CE02C2C86546DFA9397F36DAF8880359437240BE0E630A5FDB397197A6D +667B88677E0B38D441468FAE2D78A5FEA6972486A58ED81BD65F35C4A256ED23 +585EEC9979524385925FCE3FF3A27A800CC129F7940E135253ECC68A30B425B0 +A659F358BD5C5A288DEE08B3C3C028162F4822A70171A84A90683C76BC4BC526 +C8E323531ADD5275307839E018BE6CE0B0A5F07E4364CAF03B83946B489178C9 +FE1F874043C3785E18BAAE0D1835C3AC28D2EEE26DA3F48E2B97CD6F2B9E80E0 +40619FBBF20686E34348143FC5BED018AC8DF3D5C9DEB95AD514B7A996AC5329 +1B1F55C1EC2AEF52E20039258E127CFAD483160F56AE5DB7095C0DD6304CC17B +C9EFE848A5AD42BC81CBE3CBFFD2659C54626796BAB6100132CCC2B12342164E +C87D64F560DDD66350AC0F046F3DC8A1B5DD24CEE71086E1C8A3F1BBBE72BA95 +F551A6A3F45013A89F34E3D945FBDB4AF70E6C4CDB976494DF1817E72C7D8EA1 +3AAC893DED2D1B99C35E66091CFA78F3A927AD178131377C8E1DAE3F92646EA7 +BCE541D01BA4C53627967BB9D8FB5F68A971C038071D0744994270C988906CA6 +E5E8C94BBA6D23A270719D7DF35AD3ACE460FD145E769DEF10882F45F82664B3 +344E05205AAF2D7906082595FBCD9CF050B3E701E64183BEC46D36A25129C384 +8A843629A83EE691343DDFF5313EC5A25713199E4A0F1B1DE3266F5DEBEB6052 +BE408C7D62E53F90918A9FFF88A062E98A7BE2547CA99E16975960960F5ED776 +90C6D85585A9AC81292825852D0E9506652D909DD51495EA5DD581BF62A03778 +AB36D804AD9D3352ECC3D680E95B1BAC1B12718597FC2BB2DD72B23A270C544F +FCA829258659D734BFCE00654F19015674026CADCD030A4B80925AB37DF754D2 +D41CBACFE638BBA25251C850CB7D894FFDF194D4868207C29F9F1CE31D1F8AF7 +389EF8D00518348A6A07367EBFAFD7819E31E38CF8F2B9914380C37610248884 +D41AFC6470257407A794CEE55B78ADCE44E6DB072D0DF27BC810C1A2808243DD +B837ADFA97826A9D91414E47FFED56243B733B2AB1D1A030BEEAD3E8C69F3735 +E427E05CF874BDC387060E9F1D9BF0DB99540F06FD319D42B031EE9FBA014C9F +E60AD6322222607E1F3A9DA8502DF58894DE003BEF4CCF9524F605ED73053336 +B727C7F40B1736B1BFD034220F64B8D02D71D60DD7E9AC43FEC880D308BB7BFC +0B9D94A06A3F4A45984CAC742C6A71D3D0E1309CE119675357A86D0DDD6FE2B9 +0FE8D6D7E7E7C20A7BF54618DAE829FAD36EDFF77FB6D98A0A89A6CBFE592C41 +019155D9011CA0E42AF08D963B5A71D8311E06D24766F048EA52D57C4F857E5A +BDF9F31A163E0CFBFA8AE196C10EEDFE5057EE9DC504B460A4CD4094AC637143 +15DDA1DF56DC13835F41E0DB303AD299625323DFB51CAF4AF947460557D3C5B0 +5B8A17A2BCD37F2AF5DC66AD036D04E4707DD279C7DDFB8C18C465A2A11B6CEB +5C07061F85C64BDE2445AC0F3A36E7C823BDF00BF60726BE17A6829EB4C62C01 +E8923F4D067F3AB64BACF8A11AEE8F1C9ABE601C30D2F138CD56DADE5B589025 +D286722910F49A00F18D7589B3B253A8069ECC93FC90B48B37D66351FD2FCAB4 +8CF859C85536631BC5E3A73865CB7AB8891EAB705FFC67E1EA68AD5C62A94610 +9998A8BEB65CD64E252171791D04EAE837F70EA1D9807594C74F9396869398E0 +608369AA438884CC9869F5BE4209142C9416D16E2BD2FF01CB12FED8A565D5D2 +D6C0AF3B565914A67AB6A83FB5B2C95EAD0FF7C59FF304B9516ADB0B5E75FEC9 +66035FA84CA8F9CD5CE9E92517DC466245AEFA58F234CAEFDF047B7CD3EEBA3C +08CC1A6903177EB13CE12C4CF3C400613EF0FCFD1490909B3998A2B81EFA7F52 +C4B55126337A4551D79CA3A341E54779F4FA68D62D91FD78E80D8D10F8824312 +61F627CE102B981BF3CF732AAE9875DED0DCEF65E26CC75A10C959DEDC9FCC3A +F530A4B00D9529A2745725861656A2A8309F3336297334A4907998ECDB8C653B +9D8D90046885D0C1A40660219178FB669C8375FF02137420FCA7BC7B1B21E8DF +885F338BF667A3E5E80073C65B0AE1E6C306F0BDE710C8136DBC31E93DDD52CC +75AEF32CE12BC8354CAC0CA6903799410402EBE4A2FB1F883D15A140A9420FC0 +CB291BC0A72885699575D49D7F8B8EB2E3C030A2AC819A869AC5B72853E38DF3 +435B9919C6FD0AFB37BAA323F98C38D3D51FEC5C356A371E14DCCDE1ACAAA7A4 +DB341592F7177394CB3645623BAC67A3B8BC98240DB200D615AD1E128A8B2878 +620CB791186F09C1DB9588EC9E48B09C7672AD2DC45E3C32C328BB42BE5B914A +D89F1C515B6C343E41D1FB1C31618853A1BA6E9921C7D86140779DC4B66F3C1D +D3312BE6066D25A840C6793F0303752DC74DCA72F3D830E60FA3C4E6E1290ED2 +32F1FD1803DE953253B4F4C3161E6F3E7A20D5E49764F63EA05FCDAEA416AFF4 +AE3EEC56C574D41B770B4E5473F31126F3B113C7AD7EA5906B55F46B26D6F7AC +40B4546FEE7FADC1FCF087F68EA5E4D70B581595F46283A390CCCB0F655AA525 +E83FA009968CE737D2E35306186E50ED69956E099CD36F0F7E3691C3B8C99CFD +D3C6A3E6EAE218A8B243EF368522487C67B2FCACB9D68AA78047C4110A2D42AD +8BA37A568BA106CDEE5D421D8C748E5A045BBCA4CFC8FE85C571894F52B056EF +BE3E103812477C5245B4C6EDD8AB78F69A9B5C2F36D58A41F75EF7ED112633F9 +6CEE311053D6BCB9766D00202B1F263931F3E955F1FD57A4A7B618B6C016BCAE +F9C19D6DC70C737DF3B4FBAD03567885AC1BC492AB1DCA6530BC06A39219C17D +F0CA316B8B2AFB6600A07C2BFCFB1739E9E96451EF6597430E72B14A7D948E6E +8E2371945935B69B8F1BC282A97AF72765201971A52A4267FC45628ACCC06BFE +C98A35DC4D1FCFE5797621F794EE347DFD18D39716CFEF735015BA3E882BA524 +D35109BA17189D43B417E476EA2852DB86CE3CE77A780A2399DF6D8923D6F97B +38D68E6806904563E06CB5617D5EFDF4502251483C401AD9A539B3016A7EF059 +C747AFEFB7BEB41C1A1E51D86621487C64DCA3ACAEA5C2BB94B826748A5117AF +42EEFBAE42F3895A4083BC8D84D8199F5433A1551BED6AECB7A04DD56E9C366E +DAE43A5F6CBD5AB82DE09118D663088B76A2BD0B04D12D98415473B4B5EEA303 +3C19CB0DB1E3DD7B1602DBD16B7B8269BD6C1C9C3F50CB79C7EF0DD41DEDBDCD +B2BC38BF34F4A10E0D8A94C8A35C98F42EE75A6795A80A7E157B93D38CEDEF0F +AC2B355C9CE9D9C89090D130D340E051D02C0EE2339EFE9613B91347584986B5 +5EFC5C14C9887313CB79B6CEE6C7D648A253166F5BC0E3934ECC092D5491790A +F68AAD6CC7EBE7EE66BC95F1F87C55ED4F4E829AB5B336EE8077AB1403640FF9 +5FDBC4C5D57259088C117EE22538EC014340D480286B0C14473EC421477440BA +EC5E684E0C6F3FF077361B178D4EEC84F2E63820403A38347B2E3B9A61AB9973 +C80AF6D2DCCDC2D9E6A7BF5C9AA463996640567872C837BEA6530886D6043BF2 +97E92CCCCB3189709BF6ACA78EEDA7E8A3F93E113BCE9CD54ECCD2FE06E84605 +41D81F3D47197283108307DA4698709B9B6861B4CF384834184ED237C4F8F546 +480A449FBC624AA3225A86B3EA13C0D0CBD9485CA2422BF38A160342E23DC09F +793EF8DF8F4ED75A5250372C5821D4696333AFAFBA2632B1E473E7338CD3FD03 +86C8F2D029D99FF80B11E66DE94B3513A8DDA972634705AD0EB5EF16D812E628 +57BBC6BBF91DCC60A1BF37A9BB26A286EEE9D9888C17CA36535E4D2938E140F3 +A8FD340BAF43FC87A381759461D30F26EC624D0940869772D0C8DE40CDF77A61 +5F88F96D4D817F77B979438372CBD0C745262B32FE1860222B47705913BCFCDA +2BDC74DD4CEB380444E13F44521EF50215544752033875004002DD0623E016B5 +9E04DBD9E664B7A894D03FB0C8DB1C43185B2C44B4BD5E4D5626990581950FCE +C33BEF0445DF951147072D418399D9F2335F63C6D1A04FF4782D8FC92A34C077 +7B47D642CC1CD3A3368FC1A7288D40D86BBAA9B1DAAA4E100196342213F598D4 +1C79F493B6781B4CF5874599C059D3DEF8EA8EDA1CF9061C62D9A608899CA854 +79D264E5FC8FAEC71BE4B24352A7AAB81C045B5DCCE1939A9C07270608CA3D0F +A05CA9D2A23472C0B5FA6CEFE1F50B145EDC52C393C99FB0E327AE9D1F4D364F +5841B702ABBC59086F557EDBC20C59DBA04B66F3A55F3E1B87C32019252CCEFD +A440E4D711546B9BDA5A549AD1470F720B6407E1E022394BB954395483057485 +7EA59E8CDB2F7FBB2EE3E26A80425C7812D459AA47CD693A277027FBE74D9E83 +3F73F042774D9BD3810597D906B0CFEC0F9BF9A1BBFA2DA2F88CF28200D69BD6 +F405BF348FF7B1A0737F6E88DF167467DCFFA86A2A446D671E62268C3C391C33 +B565D65D606D0F1C97D1FFF7E8330527D6799E856C1EF73CDE0EF1057ED0BD6E +E8D558D4E99F0FB8DAE977DB0F2202C77993F4A7A539706C7770246C733B6E35 +0349FD83508699755790480017EF6A421AA00D0DBD6C37C89CD257D51E5184A9 +76A158CCD174166241879DF9B025FFA3082A297311DA91048F6F172C0C45C5AE +C6F03D287C84E8748C2C0517A678543C9D5875EDE21FF4A18B17D5CD03871489 +C181F781D168D2F0E4A58166F1BC27A303C7E8AFEF44F3A372954FD66E189603 +4FB24134358627CBE356490C2194FED3C84F4D28F2906E1BC0A071006ADF9CFD +F99C68672DFB2C2A59962F1608F7DDF12E507B8209A30AC52F64FC978042BF8A +0E3E6ED9460C9163B7A7D912D949C72203E1F97CB771BDEFE3B9CF1FCE6AA631 +BCFD9D66D5B1B81ED445A9EA7A6AF8DE4BA3B63EA77AB435AFDA05B966F7CE3D +D2C46AD8FA834FC5926D90E90E +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: csbx8 +%!FontType1-1.0: csbx8 1.1/12-Nov-94 +% CSfonts -- pfb ver. Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 25242 25747 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (csbx8) readonly def +/FamilyName (csbx8) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/XHeight 444 def +/Ascender 694 def +/Descender -194 def +/CapHeight 686 def +end readonly def +/FontName /csbx8 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 40 /parenleft put +dup 41 /parenright put +dup 68 /D put +dup 79 /O put +dup 88 /X put +dup 97 /a put +dup 99 /c put +dup 100 /d put +dup 106 /j put +dup 107 /k put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 112 /p put +dup 114 /r put +dup 115 /s put +dup 117 /u put +dup 121 /y put +dup 122 /z put +dup 190 /zcaron put +dup 225 /aacute put +dup 232 /ccaron put +dup 237 /iacute put +dup 248 /rcaron put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-63 -250 1235 908] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A2E2214AFC380F5ADA59470F60 +D8D2FC158BF2F0A53EF87A1802A897E4E860F34BF60C83C787AD1CA226FD5272 +574AA5061E43F5ED5C153D504B9658DAD50711C40D80A64620231075FA7ABE3E +BD352D568BFB58C633E5BF9C561DF52E008B6270A05DE0C24269DDFA6B90EC90 +A0BE858A557DD6AEC6BFE6391078465E967382FE98FF878DD1E6DF2B713AC8BD +D0E7CC7A6CA9EB806A96DE26EAA48F6BC49A016BA0950BD9EC232543199A1D6C +5DE780E51C464DEAFE906C67C49C455BF0CA836160C409FC80C6F82370C72BA8 +D5C3C0EF2535E3FA3DC2F4F540258726F28ABCA9CAA3CA878CCBDD6273639EA3 +3FFA29C328F8F9E13479B8B91887F4C073B873960EF6FEB4AD5A2D48197B28BB +F5F5889EAE914D38E97DAF6F87C2C6FC300AA4152CD5DCFCA4D25C6EC8FD9574 +F9A763F3B362A7945B7F392CB9CD126E93E93998BEB1B48FA7148FFC8A4E3D3B +FE2E959A1D12839E2549C628C4D60BB88BB045DD9113BAC0CA2AE95D514ACD8E +F7295207634056AF510379159EBC72F24E52327FEC852295DC6EA59178BD6A8D +3651E23EBD4BB12104654D566EDEE0B9D2D7134EFD01281C34C1EEC0A5713A96 +4CED3F0A760F5C37C8CA3163884FDBCBC075A0210A6E76BB413DF97AD6A0C787 +835D361A6ED43349EDDF3732CFAF4E0214B3650D7DDF7650F27D78D21769D353 +CC0F680A66ABAC83137C95C8320C361E0698AED9C0D736FBBE80D4359D8CBB45 +AB5F76401EE22C6CA9D78DC4590CEF1CD7D9F9EE334E93E0147DBCE5233686D1 +607998FFE1340140D01E6381252DB48967EE6DFF5422E8B301289648A5000AC8 +A3AD9D1825FE41E9E3A55597FE88BCDAD2A05C02204EA9D8962958BF100A9189 +488F9422B96396E29C438C2829B9254719BE08BB792A23CF23AE241992E2A731 +7D274FCA140E52839EADF299B6F7FCBD91C1EED9F09ECC2B0E6AD3AB468086AB +B06ECB9CF4F23E1064585EB784AD2F5C33858B103D979480FAE1376502863F8D +EDB1B1FBEB37FD1594608A69C7E9F78B7405B7AEF8D733992A739E44AE5BB770 +3C322675D8EC3F149CF3062EECCABCA42B6F41EAF4859C250FCF197EEF370E00 +45337EA05779AC0871796EBE40AA547D1B437DF0D8C3C050FE006464A2BFF97B +39226EFA909BC04CCC5D3C5B8E6211C3F4C77C6DFDEDAF2CF0DE416D8632737C +313B4F64682B9C446A878C782BA6D48AEE80E17953AAC7FDD23465363D9DCB98 +83AE261391BB54AEF57E8A5CA874C985BA59C4D1B57B6C8C3E056166319AE0C7 +A3901006FCDF8C522D1AEE2980FC7069A31D428F46C6623C7F7CF67CC77605F9 +3ABFD90E284BCE7CD72B54BBD37D4A2258EDEDE22F0A4EBC50EBF121854647AA +569AECAAF54302F3064A3EF0B4017A8D53AAEF3115E208BC6040842D63C44911 +DCD90055D3B8AA5B91C00BF0035005D95468408633A976C2ADBA3AF8EBDCE658 +702B43ADD3832CE4BFCD1B61B37EFFD5AAF1922A3D829C633B0A4C0994611381 +2B83D3740FF3D7ED55DE1CA370209533AA5476C2EC803A7EF39EDFFB0B19E4DC +BB86CDC274A6270208D611AD95F2FB1D0B9140305A8CC535EC1DA560FC62BB88 +02155BFCDA9B115A397F6A24B542D2BF5CE69F58D7A028614167F635EC06F6B9 +0729B92BCF1E9989E34CD9F9543B0FCD8078EEC2635C2900857AADA353677EB6 +64DCFF40A7E283EC0CE969B6BDF3252E3A110479542B3B32E7C723FE2493A80D +C0018E8A59F81ABF502A114B41B33DF88895C57B85343A95B184F2BA28E14EE5 +689BAC97F36D713C3A4F330CCDF5A023998EA7C01B4BDD1063B2D3C587A4589D +BAF8CB29D5EFF9AE27B559B02FC58A52A1539D8B4BD0A20D084D67936C131409 +188B16CEA61E57F5E1052B964813364C43C45E2EEA759FBF07BF2F5D04C9BA24 +2C1ED5535945E037025782CFF3FC1B856F69D70E0D30AD1593FEAE236FB9F541 +F5A9221D1528B15AE9819CCC34402D131D86F9DB64928A522ED2C78784074430 +44D2C0EC8CCF87FBE00EF8C264BA1C880A6A70859B13B060D64EA436D48AD164 +2712073F1704BB86B04241FA7B0D8C935DB152B19BC7830CD59340949DF1F430 +C6FCE75803A7A5BCEE88B565597C7876C040CDBD7EF129A17F7286BC11D32118 +8CBD1FA12542928328F1A71F34F35AAAB2FA384296E6DC6F6437CBF1145DEAF3 +1169A7ECC3B96A24FB2E20E7058DF05CF9791681FCF22F4187358547164C516A +2FC6C88A5C84BF245D300FB71A7681E6EEF61DED2905798CB3B3D846452D280E +94CCA6C2993EDD09FAE99952192B11C8792011BC8133F2CD8D094FC3337CFF7F +C5B8E22C470E2C2FF68EB2FC57516C72999B0937C4B922CDA8C920AFDAE5350A +5743330895711F3DECD4637888E9F944C84682E115F056227FDE92CD67B1B2B5 +6BA9D6529BFEC90D2D5DB309877BFD555AF2B8FE4D0BFCF80CC9871CE1ABD06E +761F9B5C2A5714CD436C05599F3789975AB068507F0A2B51ABF01D23494BF925 +5C7C3E542B9F98330750EB8B812EC4DBA1E15ADADFB033F4B0E9A96C077340FE +CF003A372E571CF3301AB4C68A20266CFCC35C6E22398DE81E228C98E062E17F +89D7BB6B53740E100CDE0D380A964462BA8CC68ECBF1E64D103EAF4888A77687 +100631799118CE0C99CE051401AF3695762FB84DEA2D7AA7B285CDC38CA605E4 +C4B0FD712056750E69B83FD6A83DC9C6D209E2A18B58DE2A494C3454962DA271 +39B33B91D644513DBF8B75374B31780E8805D2A0531BE0E4B28DC2D5CEB1C265 +8BD3BD922E62EABE84E17AB4C25CD1648CBB43DBA692C449A431178B81889C6D +4E1032FBEF9EFF89C220773F312F53FFCD131B462E4006952A76790BBBDCE4AE +7AB227673A19AA79FB7A7CD9224F370A67C09D860ACE7EAE7487F5E28165B104 +C088DC0CBFD6A5571437F4DE8DE6C6E9A016506EC1778E6F1171C68BC45A9872 +8FAE4A72175EFF30559F4CD947B52E9E477F9650D03CD99944C792AE45774CD1 +A55F4C4E241122CB47803C2719D747035C57773B8C0E0CD43B9A24F516FA7DC2 +8ADDF81EF5A02B52FDEA27F892F34E34DBF5D0949A364DA744DF9DA530BFBAC8 +23FE332CD10437D5EE105FEFAEC1AD5211813D7553DBEF97621845E0CC9A3401 +C6C1FB129AB9E2DF41C29F15BDC50E96700C14E092B38BA3ECE03D73CFB27C8D +02967519511F398EA342F20468A761C7433EC88F214C9F6EC2034A768AB42C8E +D32ACD6FDE24EB0696A8B43F67B17670ED5EEE622A3504DE4BF090A1BBB3A3C7 +7864F1ABCF96954C91F254DCD0C1D04584F00EC74B75FCDA87AE8BFCE7291965 +5B401DD15ED38907E9674A6A7AA2477E07F6A4A7B195ABB28BAEB1D76ADAF5E8 +AF239EC345BD4DF9E0B9DACED50C097BFF1254859A1CBA9C996D81FC4D181C12 +D620CD85201924E2887A7A657E8B04CDC9CFB2F3752F1BD8643B36A03D90695A +01E30A9E5EF5C33B834E482FC042E5716F5DD110DBDF6802015C48CB57AF649B +5F7E990E1147D4088E2C0F6787F4D725CD515180E97F63FDDD6C3BB08D0AA422 +43BC9508690A5EAB2FFCF5105771B169BAECB61D05974761997720620FAE338A +79F74AE28E52BFC163D6A050998C8EC3126AEB41B4EAD69D5AD0AA051E91BFBC +C677449411DBE56D16A8E157D7DDAB9529CEFE8450EDF05842E4625CA7B26089 +DE24898E8CDE5A99A68910836B2AC5191E92CCA847357334A5337BCCAAA6AC51 +7BF16380B7022323CD8A92681DC52597F28D6351596CF146B604042DBE859DBC +327A8E0A68E74B039CD0F9845D649F9544B1A2F7FE7FCDF63514D536CAADC67B +ACEB6145D4A7B98AA86E07D3A2098EAA5AB1B207AAA35C5151317CA0A9901D31 +47446B6E8A918318C37ECED846752E444D81B670B0C0A968EEA28DF120D72851 +E39C5755218C74303FB26FF64D8D531903CC1480A48469FCAEFF55E0B90D9B06 +0209165181BCE0D75F15A2E41C340B1532D85AE40ABF01013CD4F2A62F4A37DE +0A7719A3B3BE4766F811BABBC0218EE818DA23B0BA47484A55FFA51E24D021EB +1A2465E26FCA510D0474296E4E56CEB14696F29810FAC3BA847F78DE64832F54 +0AB0F2CAD660806AF9BC3E201A18DA7CACA998D8BF1BBF6CC466F5A3D01B39C9 +8BD54A43871E3DF463AB9852932A54FBC2A3E76C4111E4FE1426319E8BA66168 +0CC305DF42A54BAC3253E6F286C4D4F72034D074984802EF88C098D684920AB3 +081030683D51F382932A64C1ECC8501BB494D0A997EEED0F508BD84262D5A5A2 +C849EF729F788D95704AFE334B395AA15EB5ACD64607E2C42BF16827E789043D +F3B8B919D4C78D703E4121D625ED91A590DA03696F9B039A79D60CCC3AB4FEC0 +95F7739E1AD3ED034D02D4AC798A8C99A7383E1B9776082A7BB8A966F837882C +27D52AC39CE0C483D23B9E2247055C3B7B9C78E08DAA7AE2AC1FBCE8780EB6CD +B73D2BA040B11AC645852EEC8527F417B96D7FEF701AA6870E85FE65F213414B +842E55CE1BB49139FA76A7F941AEB1CBF7081025A3A3CD7C766CE05AF35347FC +9882A3474F3D6D32519E14363AED5EA6C803CB292AD64C92F775E3F3A8D04012 +11C0A7B95C9D40C3BC39DA528134ED7094AD5DE36ADEC039054E9BD02C0D1064 +056999BE7EBBA183B205F3899979B19A2795749454CDC4B3A99C854E167B8EA6 +4B2ECC01A0C72E158AD47DC8BA5E083687D6CFAE20B802B5D9F49DEF54513F9E +866837F92DE4A4C0406612CFCA59A7242D36BA546F1127C39C839DB6B475525D +1F7210FE1A81ACE114BE74DE90424FF72F77312AFC4DDE0499C52FACF7215945 +49B09557444BF57FFB138E32AD5A265CA7F2E6D5167B875EE9ED1A915F48C72D +9F9CC418F45F2D2EF08453EA23A465BDE404EC14F4B4A392437AD173611048BB +715E6342C16AC1F22850D88336F28A852D7838B79493F2037C1641F38F46C8B9 +358F5496E0C75295F4A839B445234A662D8FFE3435ADDB1786CD8BE228927769 +5CA5670C664435C2168A8707496BF9EB9E078FEAC598D3C1B77270CD105DAA58 +C29FDD6498D7A999B704305EFD37FAB659892AA51F4BB1B0DD067A348F38574E +2F608B13B4B9AE2D8C5CB45F7FD1EAE93C778BF966E64600A32A3403DCAD4EB3 +AEF2158150E88F7DBC5F25BD99B034BD3905E268A68989372D1D48B8FDFBF748 +7230E3FC932D720A78112193CF1EA1BFD4F1610A9002CDF120E3BBED005C1A14 +27EF51840BC2D149944F83AF3FB4093662488D0E01C975D2931D49E5F52F4271 +DF5964A169B47C3C08D02E9D617CA4B6520F2A2F1CF6AA9E0029FF95404EA0BF +58B0D72F9F8074F6540BFCA74A09D21B2DEBA0772B3B1DB919E4616ADC7E9FAF +2C785E602707AA8D3F4E27401B4DB058F8747EF0065C77EF62E9F6504E88B78F +1F0B63C7927369866064FFF6F04163C62F7A6E3C109CD40E867628BE725E7ECE +82DB51581E381D6DEEA468F60755335C02C85F0396930008C31CC57D8000DD08 +1D1D0F84B3B1B8DA507888F79EF6695F448BA76D5BE83677FA595933A6099B5C +AAF6E142C91068364DC69E11E470354C7BF6517A095A62A58EB8B3CC83359DC5 +AF3ED5EA70E617397CCED742D984ABC9AA48136D2A34345991A7E432AE3E9BA6 +4FFC99EE3D05EF868F400467FABDB37819A51D857F621656B8137DC1252D205C +4211A14CC0E2641B4D361B14496B2A450E2A71E37E6ADF9E1F673F1AB9BB2C27 +4B06ACB1AA3813C44C3C195C7EB586CA518ABBD22A54A334A2DAFC4C3977C6EC +F037BC2B7707F68EC33F232337969EB6B88742EE7F9877B90E3E878C1A1A17B8 +02BE3A55EDBD67EF205D1ABC6B5966FF8C84BF7B7FA4CAB577047BD4C109A396 +8907F8C04C23DA034182422DFBF1A3AAF80F3574B15E80C35C22615243C909D1 +8D6BF141E5D039073E79979C5C3C388EA6E5A989B8440A8AEBC109063244BAFC +5305D4B6AFF35BB8BAB08C475DD05222EE119B9FEA2AE8BBB0306BBBEC9A3A34 +01D474103CC038AD7ED830470FD5EF88BED76BE8254B7AA1E0F08CCDA660521D +5DB3643DBFD66E4479C24BD84EF340B6F3D945B233D5A53DB185383F1071198A +B3E9E89974D0B6AF446700AC703B4D462AFB42EC2CE11CC411EE210AE3FE08A5 +A30330BF83A5CCB07F36A71803656FB2B73BDDA0645906C17F0AE728103866C5 +2340838FAE2A5FD214B7C3E17B0415289D6EF0F1C2CFCC1E66AF76ABFA03DC20 +555CCB187D1D9D04ED9CE99D1DF9DC73602EC35FF09BA7F58498E918C3FE7995 +0E619B423AC51B825858BC811831FBF21B3BA3ABA6B9FE2CDCE3BFCF642BEDDB +9C6996400BAD2288AE3E3ED94A2A2508AFF4CD6C0964E6E523628B3587F7F026 +A62E24EC2C3029C02DB2639C4D22B5EB181E3F9FE074037257D8C702B8B50180 +6F4140CE66AC3029B2AC6AB16BCF8394909E4512DE4925E9298DDEEFE19FD6EB +EA2BBD39B992103F76825419E9E65AE3ED446280F5A7246B6511836EABF120ED +2838CEACB4086847ABB7C241B771EE42ED92198C21085CCE83555B6B1718C353 +4F1C50D37F6B27E82C8532CFF516A12506EA57824B7C33A36F29990D92C7 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: csr8 +%!FontType1-1.0: csr8 1.1/12-Nov-94 +% CSfonts -- pfb ver.Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 25661 25938 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (csr8) readonly def +/FamilyName (csr8) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/XHeight 431 def +/Ascender 694 def +/Descender -194 def +/CapHeight 683 def +end readonly def +/FontName /csr8 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 11 /ff put +dup 12 /fi put +dup 40 /parenleft put +dup 41 /parenright put +dup 44 /comma put +dup 45 /hyphen put +dup 46 /period put +dup 47 /slash put +dup 49 /one put +dup 50 /two put +dup 68 /D put +dup 69 /E put +dup 71 /G put +dup 78 /N put +dup 80 /P put +dup 85 /U put +dup 97 /a put +dup 98 /b put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 102 /f put +dup 103 /g put +dup 104 /h put +dup 105 /i put +dup 106 /j put +dup 107 /k put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 112 /p put +dup 114 /r put +dup 115 /s put +dup 116 /t put +dup 117 /u put +dup 118 /v put +dup 120 /x put +dup 121 /y put +dup 122 /z put +dup 126 /tilde put +dup 185 /scaron put +dup 187 /tcaron put +dup 190 /zcaron put +dup 225 /aacute put +dup 232 /ccaron put +dup 233 /eacute put +dup 236 /ecaron put +dup 237 /iacute put +dup 239 /dcaron put +dup 242 /ncaron put +dup 248 /rcaron put +dup 249 /uring put +dup 253 /yacute put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-40 -250 1111 864] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A1390082AA03548CCE363896DC +8285532C521369225C90F80D727FDE65092A0044327885EC680B2ECCDFCCC5C5 +9B4F8AE2D078A25AEEA345A6E6A1D9F372DB3CF2B4AE635D7DB823D70EC82CC7 +1CF7E7DD0D047DC2513344927562E9838BB0A17DEC4E513ACF1FF782F3D8027B +7E9250875DDD4EE3CCA440DE9C628C3EC0D771840D359B9EC8C94991ED9E551F +1B6836631196198581D2485BC6D82918C11874F095154B0872CE54E96900BB2F +F1C79982170757E4A6D158B2AD92AB11E0684F74C0AD96A690D55E3663F37009 +CC9CEA85C49FB69932378B3822EF0B43C4F6854FEA53FE3DA8C66F54621F5904 +A7167F09938B97C9827B8062CD47DB637EC42FCBE54AF3A2609355A07B317576 +DE207567493BEAC1C89FF58B9C93FFA827307FB2E6F3F01DBD6FC8E66F97A4D6 +21EE41A240574E711450DAAFDF021C9F67A3DF3B780BE6B6232F6F229F1968F3 +81E3D30852A756A7A7D78EEF9EC6B4D8D66E9D944152711B910140E070124051 +2366C14DFA3C6C1E735E950E6936B762980AFCBFE3AAE4146ED2CFCD68807BEC +214893E1E127C8EEC0CCA2876DA14304B733B1794AA02E72848E8E518B25EEBE +F97452C663FA963ACABED12285D143DA237226E2BD7A4F0716639EED78EBE378 +E9D7BC4B83C5A0A2669245F917062108AD42F9764EBFC9F03284F98EDA0ABAE4 +6318460DB152A69DFAA55B56C2F5E69CDFBECC134661F436EDFA8D8F39540F3B +93A7B07E22F72D85B1CE6F9267E138A1210A0111B763692E93E51FE8C13B4DCC +5AA11DE152CE72C8FCCE805938270B70EBFC01D84D117BE1577B3523C4D956A9 +545FF9254DE2996E83FDD2A815D4290877519219B4EB85B64619BEDA0C08CA5D +E1C9D0D0980DA8C7F15BD929AB522591E005AE22C0652878D2D7EC206E5C6D61 +327114E13F223C87CFEDC7E9C25F258C694385E5A0316AD8A8831A3A4AF84E65 +F68EB428754F318E61A39E76A0172B8011C6FD772845573C8854C48937655581 +53B0A18D3EE2C0BAE2F8B0349D1223131DF142C72064DB9E4A84745B6CFA01CF +7E5DA2B112B7F8F54C0B3BA14EDD5764B84EAD3EF89C807DDF5E2E4C2D23A46F +F3F0FC57A5E25EE152F5DF5DAC8F6410EC704A68FF2404C78744582EEC95BD5B +2C121C81022D2E47009530B47510223463311C28D4A1941C2A7515CFB99134E0 +84F95F922F3AE1AFA0486D8A0E21B71C8007216363A3B14E0B3AB8607868D4FF +7F5D71A1206B2E905C14979D53F052FF4663FFD53B43F067B52E270DE2198EDC +7A5BE9035D16F2B693749090871FD23151885BC7418CE97D127157F717C97433 +22506B1B8CD0401AD31569091149260609263F844B18EA918BE5FD3881744E9D +9CC7C0750938B34EC8563230DEA9026BF358523116A12AC096F2E1BB1A6E0C27 +695A84621BF227970D3CB3BEDD0ECFAA9279DE18B08A47C84FB448773E8A0549 +0E44F27B9FCC33D73DBE9DF89DE681CD9A7D0EEDE14F3045C6DB36195F612410 +304E8349165564465B38680E53550BAFA4D95745BE0F59F3865591DB12BE018E +C33B9AB317661CED7B2F57EB8D5467C03CEBB79663DF0CD5AD69A8E0A861D0E1 +51DCDC6D1132AD86129C41731869F207E6465A4E3A26B8F26C73A25D67D742B5 +EC79AB8E3A77DD98DF74229FD863C4D5030665B937D09587C91BFBCD7F752CDD +D4DDCCC1DB1A1D67DAB6779EFBE465F8B9201536F9622F77AE5CDA1DD0F3C9CB +D63B366562B6E664470456655783EBC337525386D59707100527E8357CC75898 +8FEA5E3AD0B4497EEF21A954D19587A602AF5ED1D5BAFB1ACF97A72D77216540 +DA4D03F83EDC6F14CEB825817324D1FE6A201FDA73ED52156C0724B7ECBCC9EB +81EE41E929A43E7AE95FB053CBDAB817746FFC0D9455858A4C47D77AE1C757C9 +8A897BC8AA3D5831D8B5A1467D96BDDFB855EF926457DD0530EE95ABAE6717E2 +61836D4BF92327592F8B5A10E6BE20C059B261096FD914A49DB9916C5A699C40 +B957FB18132E540195EEF36665F33AF703AB4F04DE32C980CF8B5C4E9120740C +25B1ECE7CE52B5E74D25FE2F0D43C64BE9EF2BEC4720C1C0B7CCD7B6E6233953 +0FDB9C061E330C15358DEDE806E2B4899B454D3B08200E422907CEB5579D7E7F +9CB1E996F0C38E617B6903D5EF0CA24784210E9791A0F067C98AF4986DAECF12 +F987CE4FD77D7C414775833BA6B07FA4C66661D754537B98018B66D5E61CEB1C +5F4AE115E3C1719356E394CBAAE763D3274250877604C5D15DBB1D72A5FF732F +65BF55BAB42CB5A242078EA6DB85A7C4ADD5052CDD000B7640B7F7C546794042 +1C2722C46AAAEDD23A4CB090A4EBFB383C13105568836CE1B3C9D1FA024FF955 +4F97D0FBCDD6F740D69EAC92C122A7269666C42EB15FA5C99238A90825B749FE +E857CCA3B62E24367EEEB325911472666A151EE6656966933D1B8A594FF39EB6 +A721BB37E198C56061AD920F185783E6383B7CA7D0556C4E29B012858B45A478 +BA75C864E4D7927435DFDD8511C32E4520655000F1F441FDBE9E9D44B304435A +A5E524CD4CA6CDF71485DCC009E99B1E229841807DFC6C36E38FE7B0BD980747 +B45CF7870CF416931F67AA15909A9A1D06CC2E6A4ECC8CA1D35BE61F55396D32 +5D782BD44B2D52CC5A4677B037909AC49E5FAA23F022C55BE96816C688704D96 +67F6C3C70028C6891B918DC0A04CD5225D329407ADCECC141D3515C057B371A5 +F6A602075C28F8B8A51BB447FDF7206AC51CF734626DFEAC942C95E85CEB2004 +A3366A2F98A4FDA1FE6A8C80A62945DE946A035B8E70841CE2B325EAB194F7EC +7E852B5CD896E7504DF6B5F3B8D5BDB70C52D987867C259CC02426CA81687261 +5E58CB15DBA06D7C7C2F7E2D53A126A794A2B518482EE0EFACFBAECD739C9CFA +2B37F331EE754ACB0F3423971E2E4BCD34026D1D93B925D54D996B4DA15A3A63 +40289243C6E07D2BED8682CDF520799F335BD2FACD24965CB21393D319D79F63 +B19F83F39F7C630D8070A426F0F1346B3E0B0E9435CE3F1A25A80A9853FEEDC0 +BDA1B7973592B4E141BAC82466E8EB94573E1FD200F882309FD4096AC2B8F6F6 +E07A9DF875E8D350F43F60FB2DE11055CAC479CC9C2A5CFE3E04818E06425C6D +80890E6944FA45A2884889F4E275158BED0F547D3D24F33042D9E7569CAE04D0 +71BC07BDAB269924FBD87514C208E2077FDF6FA87CFFB8525AC03743E01DBA9C +F52FC0A4727BDA1D8822CE79021A057D574A9C75EF5AD063AFAC144BA20C1F4A +C7B5181FCFC1FE759FDD5A3402BF41C91B497A1797C509925127F7E4C53EF6DE +4D0040450E5C3A5E483095824484B8CCEFA920D70EB2E3E41F795C301F6E9D0D +21D7C102FCBD6A1BF916ACD8F3B14615FEA13D376A1B4C8D2A3359A5C6DBD1EB +C4A6E1E8E2F9BFC53ADF676C726B2D7C5EB6A7C0CA5DA25094D486216DF00535 +416A6F482C19AD3B16C15036BB609699CCBFFE7853DDA176029EBF29E8F205B1 +0C89177F823FB4B748804D5DBE80297607B508EF4E6728C6B6247D65642114C7 +2708AD3E62C9742E638689E052EE5ADE59878F54DE580DE367AA9BB626D6D307 +337D6F870D1AF5810DF16D0AAC6B96E374B2573182239F4761E15505FB4F2685 +EAB471389EB215491FD399746539F37710DCD0E1728760B9D9BE5BDA050B736C +41862645D26D372524EFB00FC81CDBFD797E5F54B4147F1ED6015086578AB15E +57E72287840C034A16C909CD5A7FF04BA27FD671D4E4159872B4B4E96B27B50B +3DA377B326670A88BF6E74E4C967C2507491C60631ECB160B4199CC59A1AD24A +168CCDAE647B3126868C1B051BF916DE3A1578BA0361B05C59AD21B4E973C00C +8C5D05839EC9D130963275522142F9A2CD38C98D6FB9092EC753133BAE61044E +AF0EF3B40F24C102D6A7C08FB60D91550C5F0EFE58A37AA7844A142CCADD1FF7 +815634978DE281733D65F02C36F79699BA8A86F7B5B922E636671FACEA3C9792 +1D1F2C9967594FEB7B43CD07CD193D39EEF852C1214E4DA39F9CBD7CA6CDD388 +02418BC0F171B5747A573F9ACFDF3CE7EE8BFEDFCA818D880E09E57136BE1797 +026D2799BAC31C0548DAD073579A95A783295AA8AB73919A1FF72DDE6068B488 +353CCF321E50152B211C19287948779AAF605017C250ED57CB924BA6D5AC61DC +84F6061A4F38E73051BB50CF7A6B21E4A4948946E90B99497C9BA33D706A04B3 +2A4E508EB44782B51196314E5590A0EB881B54F7891DCA4B92153BFF90C3D546 +6787B0C720237D39C19C0E28709AC9709F555A502A8A159904DEF33C431F3083 +CFA502E747625491C4D31BD383A736E4389DB16875364BD7AF2FFFDFB9E46057 +D1DFEF3A1E4BE3F68FAEFFFAC98664327A77B896B8999EF15491DDB47B8AA6A5 +805612DC4A9FB7E7A8742FE400FA2C41A0ED0FE8D2EE76107D170580A75D826B +09A37EEC3DC230DE9E6A3CC691129A9CCA8126971AB888F1050CB8FD1AB2FFAD +44E76851423EDD76412B1613B8CD84938AE26517C39789AE9BB7E1FEBE211DD2 +4FA5A87AD3865224F55C4D619F904C0D39763E2C8F8EC2CD2E63CFC4AB6B5D56 +8D3D4E5729010167D589B94D4584692CC75164ABCCBBE728E3503D74CE352D43 +33CFC7BD3ACF42D7BD6EA9C1EA1A9B2944853F3FE5E54CCE93A0456AFA7C0565 +84508A01F2D2E6F649F46E494D7CF7CFADFDB6026F9677864947388FF93C75B2 +4E633C63D59F1F73D88E9E38D808FA109ED1383D46FAF3BFD1B165DEEC16701B +75F211E1F53E51B3708B29C9FDFC0706985EB593AA10B892DDCC82D1933D1663 +5A8C54E369D4E8D052DB861E7289A27057CC00A10A206C98138EDD4EBCA87EAC +867577ADF78D0B454634F96E28630D4855155260F3C9BE74834F996000A5299E +F9E7727C4CFC6A4145C004E3E6544A8F25C9BCEE4546783D110C6994C96AAA46 +261A84956F85D79942DAB51C714D906342F16FD89FD251F1B7770BCB420B5B2A +8C362D1B65C83871EBE836C4A12E0F72454F5F96951F0437DBB10C65321A85C3 +187F3CEB8167339A5783331A2BAC546D67804DD791D52576D5A5D640830D3933 +1926319D7D7FBC66443AA27781001F1D50E130AC0DE9E011AFC99551B298FFF2 +CB53B510B2615FBFC1D79A838C7FD7DA436FCB6D3CB1119C125639A5759BB7AD +122295D26639C0E0A320984833B86D9A70949C9CDCFDDF1B7A0FD55077C48A47 +6B6FCB5B0A7D5C76FBF9AEDBFF3F3E4637131A2EBE3C7F7DC29C5A65AF5D38BA +B240D103880E70CF416BC6C81A9645191CE5BF07731B25A8C45A449C470E076B +153AD6118A9D324F13BA615E2DA9C10E46D411E539E47EE72A44894CFD19892B +11FFA4BD17C1807A57899DCA90FA38A26D451707F2D754DB7E91AFAA4BD8267D +E7A58F831B45036606EF449DB930CA539033DC385EF79C093E03FEEFAEC3C7E2 +B86EEE8B1CFDC5897598F3BF1584385211065844E2829068E2EF1A31EDEC509B +2CE5D776C15B6E61B77A8A734786983D2DE5180141E26BB06CD70D234E59F6A4 +4E4DE8E9B53282FC312FEF1626CC27B8DD40E7492E8CDBB9A07FD4094ADCBF17 +A136907ED2A1E655665568ED24F36293C7521988B04AA2EFCB046D4D6C988558 +58EAE90A19296C62EC38C41B2865CF16505AF47E8E50A05CB60F7F033F4F92C2 +3F5B9E370788C66C6AD689B5F27593A254C7D85091158CF4596BA6601FFC3166 +A4560A4CAD1723F75A24E45FBDCC4EF1608793178A2480F7130161255288B315 +941DA56F7488828B95733FC8FBDD5CC6DB7175886044EA6A6E72C50573B0E6DD +BB130990FAB953103CE3152304766EAA06D3B16E4BB74D9C976546C8ABBE5267 +D2F75531A706106254AC1E3AC424345BF6B1299F22F900E81E5BFF0F7527157F +915E46FA54888B5468A0D1E602096940AFFEFD5C8AFA4BF54EBA05DFDF337C5D +D4748D66338F19DD3B4B7E1255F2C6DE78602E1671891DA0FF0DEC283B8D4108 +155D905F953ED6661431DBD024FE6E8BA93757D6FBC1DF1CA632945F6A629686 +B754D5E3F7A9C2D54589EC380F5EB2E7EB07CB4B1E0E178FF29021CD02F5A101 +CE8FF0D1298948B8D2FFDD6D9609711F478B46640B7499B7BD2B9D210919A1AD +6294411BC687835C896133EC74E0824DF346594438C42E9C3DD76C3CCCC83965 +499AF6C8125D6914544F0D8776AE20432E43BB7E4A3E87DDC4D42E816958806C +6E02236BE6EECDD67013E1196445F6D7F609D6E7F02AFCD5AF97CB825C618A7A +D1F310CA16C183D4F456FE26FD9EAF7C2E4D54FBCBAF6690D185FFD13FB48723 +2C27D385C3C7F10AD8548D437964E243BA66D9C9F85473C9A8CE493B8CF9488B +51283DF20F324D1FC76C908FB48BFDBDEBD7EE92C38F8FC552D1083615B9D5E8 +38178CA472ED4177CEDBB1E9E9F978E184C410C5C7AE4792E16E4076E5EE56E6 +8DE78A2FB0B11E6597628548C15E1FDC5047A94976F8D1518FDA3CA78EEF3B79 +D9667A5A33373E6D51AF1A5DF556D6CC3DA9B1B05D9C4A04B368273F029C339C +CB39578675EDEDA8184FB6A3677169AFAF202C47D2E2CBF996A02097ACA0661E +933B1B7F53E982B4FE33B7314998E91AC283E2264B9382D636438DC7123E75DD +947F85D9EFF43C1D1EB4A26C92023B30404334DA0A39495EAB791702CC7467C4 +A8A6E521879E4F5EA7B20B9F9051B4FEB948C4D1E8A749798012B37BAFE8FB77 +8D7E8447A752EAB82F6FD5C01D828E3F15CBB5397ADADCA87C58A0B43A850D83 +89FA2CFAF410A1B831AD97A0FF897A1B84A6D2467498170811B0C35A293D5B7E +BAA627609CCD899FF1CA966AAE7691B7B25D7FFA5E4F40DAB1B33385862EBDF3 +D41686D3CCE52D08604917825BEBA3BB9F35DDF87953F98F78BAA196D49E0E85 +CFE23DF363257A0A73C2327D20370CAEE9C8950BA933357DA37698EEB0A38A6B +982D6D74CF4E081F5918C613FA0F597B3FC0C96103339F2B6161C9629A882217 +65DBF6DD2AB7B250B4E39037A20006ED15987B94CE221347C7971953A3A4512F +1B00743EBC25D598D26A43519F0E229C977F855788EEFBA46D5DBCE45E81B9E7 +A0D4DF26910BFBF6273FAE159A578100D9D4F21C28382A4299BF59EA31ACA64F +1DB7F5E6136F1264CA76BED0314DB547BC141B66D7ED40156EB577C8A320D721 +6653C6E36945CA377DF8A3666595433371A0FD6A0A2D7FE2AB67D61014BCF291 +873E42D23BD3FA248498F6BCC68DD1B459B8F24914C9A91D8A2BCA9363A735AB +FC14684B51A96458E9079DBB187DFA7BA8A630CCE91BB7D994237A2E074D651C +8AB146922871396818ED132FD255A8D2B6D86E321A5B0E7E477B02F3EF751904 +65C3BF518E18C640CA6EE4C382C5F0FFE211EF38255869FB767AE3AA41DAE5F1 +CCA9901B64D206DC2278DC1DFD7D7EE59586147847344FEBD8C335D70CD3D328 +CE952DD2B2013A5B1023C40FE8270D6EF664B05D277FD1ACF7A6372EA5F963A4 +C361387207892C3829F80DCE51DFBE2774413BA22B36118ACE2B4497DC05C19F +5406CC425A0229C62BA814B69274BBC388C65FD776639254376D3E8A22B4DD01 +BACF07EDCB4C3BD740D90C3E9FE5442C85CD341146083275E7E6F06A325D258B +1F0DEE8DB0D535E0304623A534F21837D073F114A73EE2745389DA3DBB43DB1E +2E88D19EADB102A074ACB0FB0253685A37AC1DFAA5F2013B17304938B10370B5 +8EABD20E44F66FB1ABBE47C7ABA0283444298460020B69126BE51DAAC9F3B1E7 +D9E58127FC044BE414636AD17CF8BCA641CE70A4ECF9CFBA6FF1249CE8622663 +93F73351665140799E559D6679C95911EE6F3C56C2CC83E2EE496CCF1A14362F +2041083D4082DAB10AE54AB3EFE0ECDDD97581663A2358145D17F95ADDE05204 +893033CCFCDA729A277E7CDFA5F38CF4D3C858F48DC320D25ACBB5C5506AC7DB +B3683DD214B86B24296AD996C89C838D3A834972EABAA158ECDE3EE960F115BD +27D6297D6AC4F808A3E4EA827ADDA8AA2D36BB78A17DE2B5465A5043095B001C +AB5C79A0358A7A527107699A0DF7574F3CD9281BDA1FB1E73D980013490615DB +9119BBD64030259E6986642C49C9EF4E7C0E8FA1E47CF7F0906E67197464B928 +C530B9D7CDEE33AF8B8A6694CB986E1DAE593682FC2125A60BA60A8AD64714AB +A2D81FFCD61D69EFEB61595008DA574F713EAB23B72FCFA99C2D53461381E790 +F2CA1A2A4DF73A38EBD37F2E1C4D588AAD1BEDD4A4597E2DB11397AE8197562D +79D01EB222DAA775FD664D7DA111C25695EA6DD77658386026AFBAAAF6942DF9 +0694467DF3D00447DAD2BA92B56AEE434C4DA9D01527AF31D5833FAB8DDEE3A0 +DDCCBBE55E3D80BED233755BECC28A4B5EDA3EF7C8DB4452B59E4DF3B093C2A3 +0735AF5AB4EA5E80998BA9D5136A717AE59A6EE75DF436404D5DF18E0DBFABD1 +1EDEFBD87A79E10174374B74E7A5E382B8242EDED6A677C940EF13215BF1B023 +D83FADA38430F7EB9E6ADFA5262FDF3E7D562EADE2448F7E8396710CB518432B +B24B8ABF32B752F4F0BDB1A7972CEE139F03478FAA9325D067ECF0ECAB96E9A8 +A4C2EEB195DF23C4EEE75B5B4959FEBD59D1B65AC1656EF91ADDB9D9DB831715 +12AF56B0C5D945E393C80DA5343B0FA26C4EE8CB1EF3024574F886275C1D49A6 +2EA7220CB4FA7E00BD61BC733F588613AF065A0E3A35D6A137A1E0293A4BC043 +2E8F50E4E106B3058FFE80CE76EBD85E5FECF95A327A99AF1BE0E2A202AEA0B3 +8E2AEEDDCFFBDD7F0699352A574B640377AB11DA5031F68CF58EADE04D281A26 +B778719E7FBCE64AF62801A497FF2113F92C03B4FAF2A4DE61B2681CEF369735 +A2BA063A69C5CFCCF48C6E756CAB752C32CD92F1983CBFD83BA5233A60BE281F +3B5B204421332A0AB7638B6B2EB343AF35FFD09617F0F9642540026C2726AA1D +5714AACEFEE5E8854A21661AC9069A644770C6EDBE1FE042A8B182C09B5A3BB9 +9C16DB410F86D83F2AFF56845D61A53E463FF03A238D73FA198AC855F0FE36E9 +829A500523F12352E80619577D361D5C10ED5B565DF05517196807A15BA46165 +9EA11DE9AE0682A72F46BADDA8E516D67DAA3BDA20A87697B5DB2974D30D6208 +C9317DBF964D5296DA4798ECF0FA5D9F8ACDE71D3599003571AEEE500D368A88 +09ADAEC37C95C64531E11A545E11E11DE4953FEE9FC074A6130A19FF149F9D2D +2E4139D423D3233A1843D8937A533C97794B79CDE5DE6C520D42F9D1F44ED8EC +D3B44F1FB2999AA7EA28B3B2A0D4D4C41CE3A1D705DF2DBF3789E47EA1C0571D +6645E994D58AC8E7A738AB30AA8BA9FB392C1460EEC86FA647B352AB9B03084E +4FD965BC288830633DE604B1BBBD302EE8D981C7E798EE66714B082938DD7A18 +A74590720A9CFDAFE92166EDBE42C64891E12D1480A2C449FB8F0213874046FB +963EAB779262BFDB6C48204F5773A8AC6344889B553A481EF92836B01BF0EA68 +35B5EED77A92796E5FF32D8A58DE64871F2A155FD0227BFE1A15DBB3CB589D1C +D0AD435D360BDD8DFC58D925FFC99D8ED3C81E2552B303BB372F913060A660FA +282E3E33B244EB7F0AB212349BBB0AFBF131C13751112C055D664EE1E4567676 +F7C6645856609DB35F2E46462F98D001D67B0E6ED145834DC0A713D2C687538E +61567648555CD6C8D71346C952CADB9E69F3C1D462146BBC69DCE801951FD24F +4574BBF74CB1F08F5D1B19EE52662C30E21B602E48488CADC03B5AE8C44E2BF8 +63F8A848579BDAFFC90FCE8A002AA93A6E7F4AFD40E47F1D9EE1E3867AF6EE9C +0BF5196069D9F692B7CB82D808BE082F53DE4EF8C2B2498FE1D73E865F310D40 +CA281D744365E17876754CA2F7ACF0AF1BEB2A2CE7286AF7535720617CE06A14 +554854506513AE68B10917E92AAAAE75DCB4D96B0B9D677BEA32E92E48BB8E24 +146D9C8A9433F6675356B00797BE0C9975267EFB5A16E6820B71E684C2E3FD49 +493FF7FD60B33F9177B24DD0DC34B9A81FBCA4DFF44F0E1A2B1B1BEE87B716A6 +388223F980D90F381F8382D16B6F6C545FC9192BFE327979710883F8DA842F04 +600B8A0D6C9D9EC4A1FC352498AD38036AC92DB7CB1F0F596785C4CEDFA66C8D +D2E5407A2E11DAB7F5FAB71B962D3421C7D2C18828C1698B832A00D104515EA6 +9A04D9D00002B0B38E578728B81AB076390F1C845479AD190135B15853AE5CF8 +954DE8DB39CEE4667BB267363EDD1E6A38FAD7DF117FD2FEFDB9330267117113 +CC705D31D6FB82AF5F17648D05E8A0E2FBE679BA20B3E09E49B413F02AA9D070 +1DCF5344CC5454EAA2D1C3F37301C5436EDC34EDE79FBB1BD30F0C0A9DFA0BFD +A84646C41B70633BF8465DB553290040897D5987C13E006A67C814BBCAB2D183 +553CFC2D79DD472098B7C7CC7285AD7E580DB885DD185F179AFC2FA413775965 +92702DED2D7D9FF6BA7331A2AA4F26457AC527A550649642602B39A47809FF85 +D2360A325F92B8CF424279152430E52000E92F3804363CB9FEC734E2AC57B31F +FFA1999F351E9EA27E280118C25CA199BF9D98903D80615D15A1B4165F378942 +B57F7640E7BFBE9C5BBC948E50FFAFF4DE7F665E824E31EF84E450FCA8274C53 +00D183C99F1FE9650C493D42125EC4D18801CFE8A449C10FFF7B6D7692C6875F +4D54092FE6838B3A9E92C195D3F358A540DCCBD0EA5A51D4456FECA1A3B71A77 +A391522F630CA83CB6513FF7E98DABB1F4604AFF50A2FCEBAC23C0FDF28B2C8D +7BCEB7B70A0DC1B7F707CE3ADAAB5FA043D1BF1806FB12E6DFFCCCDA9ABA4E86 +1A2F3EEBE5B29E8B6334E37AC1B9F11502B71FCAC73AFE84A86A3D035477CB3C +89E8FFBA16DE8D505C1EAA1D38C20710EB67AF1396E59D1113C07127BD03782B +760BF4B9251A8EE2AC0061E5572951B4AC0C35620B96B215A2444458D57BF803 +7646ECC4374A7D4F397DF98A6878CAE5421BE3D6E41D69F87B4DC32B083089E1 +9F08A255D86E73B40FFEE47D9C0C1622F12DA0310A8BB4C86BE30909E154B050 +10B869B9981FB2F897F1C23A4C888F20DDE45A32B160049A4D04134044CE0D30 +3CA98E09F04B38A7745C1DF918E4775F9EEC1F91F7AA0B3D65B1797133B76F2B +46665B431610695D200B82FB8244F0AB9DFC5952C7B10D27E309EA007DA4529B +73F4791FC9B1F184D0A74BF3791A0282512C62DAEFDABE5E9B7EFD2F7F01FB30 +6A8308C81AB9434349248BAA0F7D106CED1B1FF3BD91141B717C5A2B516A5895 +874D18BDAC7F194037E7AABE63D455E32C081F5606F94C5EF44B3E4BCD529AD0 +402DC291316B20B14769CB159DE39C5A53E8E765DD0328EBEDC76A589AAB744C +C2BE5DBF1B7DB827597978D26FFA98DF2EC770CC8B81F1BEF40BF4AB5CDBFAE7 +2D59A7CA3B6FF4774E0B5D38F7E73A3DADD38AE066C0CC245EB6BE4D23ACC183 +EE16820F18FA87AF6CB9DAE987193DE161E03BC2DA310E795510DC6F6CEB8216 +2F72BDAF8C4BAC344CE3DDDF27B27AB65A2EF6E1DF7E437252FA2696FE4DFE7D +51BEAC31B86EACBF26C065B77ECCC097C9F48F09CD8BB51D97041ED93936D51D +3508339A0B9766429B4A16ED3548A6C44156B6E1E01603338F87E607A9436E5F +21C33FA7AEB571584410BAF603DB1EE387C8AA7D32F3313A6917FD31D2AB4A84 +F42DA72B35842AF21FD1F3C91E39C12B354D3BEAA16DCA445F7C92C12A52FF95 +DCD854B4CA124B18DD8A6D75BD0EE7B2439968BE5B5FBE136C892AE04AF055A0 +A8E31EA8CBF13B46587C78E339E11AA822C90F1A3AF2212A32AAA3E0F29C27D6 +124232504D64E4A2A5EF3E3AA3056119D91218D5A4427E93B1A339AA3D86013C +984C5C97CDDDA726B230DAA72E960935B311E3663C013697E9FF36154EA180EF +E02CC3FA28DA9390206346AAE5718EDD20B4F544EDABD7FBD5920AB70C2402E3 +00F45629C6C2A7145D8F0B205CAD75B14AF3BF67BE4B9CC11C35C49BDFF237E2 +460A00CAC8D265FF37A7C8F4CCCC0D68D89F3EEA3FAC2284F322067295BBD40D +8D477923080A6C4F5880D98E95AFDE661DFCE0F5D8DCBA286C0B127DAEDC3581 +8B870F14B5E9485AC07CC4AE72F3992F671117C427090882D890BBB31C434D4E +52C1608F2E11E98B26F158D685E7AB6702A9F67A93F390573F04CF2E5889A015 +F67C99EB20A5429918DF79CE4BA09D10ECDF97F7D7BBE495AD9F7049E294F68A +AB442ED09DA5F30D2BFD47FDAECE7E409B14E7AD9ADB3946F41BF7F2065E322D +0856242F9AE11AA7DD1F90447FAA9A3961852026BCEB5F472D2D6E9571B5BDBA +C61F7B2D390927C16BCB224E8051D4ABF96435A0CB8D5160A400E7A81F0F36B1 +6CB8DABC24D57E7427DD4FB42C564A95DF799F335BD2FACD1AA9953F0E1E6D51 +50C19DE2EA2C6769EF15473BD2A2B0C4050D232DA4058E016EF81005CF8318D2 +4F3A71EB57772BF734ACBA9F8CB419B3260615DE199552390345C891D0ABA7FD +4CDF12AD43DAF41E493CA7E2BA4F426B857F081E70A834DE83E9AA277BEA45C6 +F2202E3C076F8CCF23B02F8323E93DF97C7090AB931270C28F4BF8CB0FA60191 +4EFFF7B3FE507B5A423A15FC8D9795FF84F56D618045AF82E5A8E601A9E58030 +892887BBA3466B5C569C811B98A91F61C31A82237851016D67AC64B2D3374F44 +43E9C998EBB88A3CD3CE22DAB5478693CDFD256E5512A80FB951A1BDA713754F +1C85604894554B713EF28F4191E77F639215AE4418268F2406BC1B17B3765F12 +1A5067F835AF4E7E3A9F45D8B158024344DB9C0764F74D65E74703C1429A8FE5 +B98D39D6ED875C7A14087D979C01084B9BED79361ECE38D0ADA853EDFCDC120F +58BF1C99AE84BAE490025B01E13155F911C55B4CE3B94C648497102A07D36F2F +CAE2BECFB3492BF4CFAF9DF08D2EA19DF5A25D0F4CA8224E0A5D68ACB8C9F06E +8CB640C947212CCD8D2C373CB6B2C5479E27CB9550459C55BC615BF149B81346 +01C33F7338F16FBD408DC47F94206247218A3868A151D0C7C077DCE556FA0F19 +FAD984D48A617046BAD77696279988F6ED7A0BC46D224FB6AAB6146B72F4BA66 +CF5578B868DDCCBD460F2423367CBDDD9C4FF3FB18DBEBE211BA4CE357DD4747 +B2008CDAFEC9FB9E99CC724090DF4604883E31B10075B3069381EB5BD55329B3 +744DC177C4DB41A8681B1D3D0480F6039F2207DDAA3720A679E479E0C334964E +6FB1EA368F2EBB1DF6BADF5C31909190517D8427F43AD3CDF129E1B75CF70B0B +46AAA20C764E90658AF6CB7F4AC5E57DE2D9E7085365A811C34E63BF4BEFCACC +5F7F328CB0503BAE69232B26B1 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +TeXDict begin 39139632 55387786 1000 600 600 (cs-dired-ref.dvi) +@start /Fa 242[61 13[{}1 49.8132 /CMSY6 rf /Fb 134[32 +32 43 32 34 24 24 24 1[34 30 34 50 18 32 1[18 34 30 19 +27 34 27 34 30 11[45 1[34 44 1[41 1[45 54 3[22 1[47 39 +41 46 43 42 45 9[30 30 30 1[30 30 30 30 1[18 21 18 44[{}47 +49.8132 /csr6 rf /Fc 129[35 35 1[35 2[35 35 35 35 35 +35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 1[35 +1[35 35 3[35 35 35 2[35 1[35 35 35 35 35 1[35 35 2[35 +35 35 3[35 35 35 35 35 35 35 35 8[35 35 2[35 35 35 1[35 +35 1[35 1[35 35 35 35 1[35 33[{}63 66.4176 /cstt8 rf +/Fd 2[60 3[64 47 10[32 53 2[53 51 6[56 34[51 4[45 62[51 +60 2[60 64 45 45 47 1[64 57 64 95 32 60 1[32 1[57 1[53 +64 51 64 56 6[70 6[64 2[78 86 90 109 6[72 1[88 55[64 +67 11[{}40 99.6264 /csbx10 rf /Fe 7[34 10[23 4[36 6[40 +34[36 67[36 43 3[45 1[32 34 1[45 41 45 68 1[43 25 5[45 +36 1[40 8[61 8[61 10[62 26[32 32 40[{}24 66.4176 /csbx8 +rf /Ff 2[37 3[39 28 5[39 2[39 1[20 31 2[31 31 6[35 34[31 +2[27 1[28 58[35 3[31 37 37 1[37 39 27 28 28 1[39 35 39 +59 20 37 22 20 39 35 22 31 39 31 39 35 11[53 4[48 1[53 +6[55 1[48 54 17[35 35 1[35 20 24 20 2[27 27 27[39 41 +11[{}54 66.4176 /csr8 rf /Fg 18[38 4[61 115[53 1[57 1[76 +69 76 2[73 1[38 2[42 63 76 2[67 14[103 13[105 68[{}15 +119.552 /csbx10 rf end %%EndProlog %%BeginSetup %%Feature: *Resolution 600dpi TeXDict begin %%PaperSize: A4 - + end %%EndSetup %%Page: 1 1 -1 0 bop -247 -364 a Fe(Referen\350n\355)47 b(k)l(arta)e(pro)g(Dired)-50 --256 y Fd(\(ur\350eno)25 b(pro)f(Dired)f(v)g(GNU)h(Emacsu)f(21.x\))-63 --176 y(P\370\355k)n(azy)h(ozna\350en\351)i Fc(\(D)n(X\))d -Fd(vy\276aduj\355)h(dired-x)-450 20 y Fb(Spu\271t\354n\355)36 -b(a)i(uk)m(on\350en\355)f(Dired)-450 177 y Fd(spu\271t\354n\355)24 -b(dired)1098 b Fa(C-x)36 b(d)-450 257 y Fd(spu\271t\354n\355)23 -b(dired)f(v)h(adres\341\370i)f(s)g(aktu\341ln\355m)g(soub)r(orem)70 -b Fa(C-x)36 b(C-j)g Fc(\(D)n(X\))-450 336 y Fd(uk)n(on\350en\355)25 -b(dired)1079 b Fa(q)-450 530 y Fb(P\370\355k)m(azy)39 -b(pro)f(p\370esun)m(y)-450 687 y Fd(zp)r(\354t)25 b(na)f(p\370edc)n -(hoz\355)h(\370\341dku)783 b Fa(p)-450 767 y Fd(vp\370ed)24 -b(na)g(n\341sleduj\355c\355)f(\370\341dku)709 b Fa(n)-450 -847 y Fd(nahoru)24 b(na)g(p\370edc)n(hoz\355)h(adres\341\370)653 -b Fa(<)-450 926 y Fd(dol\371)24 b(na)g(n\341sleduj\355c\355)f -(adres\341\370)704 b Fa(>)-450 1006 y Fd(na)24 b(dal\271\355)f -(ozna\350en)n(\375)j(soub)r(or)759 b Fa(M-})-450 1086 -y Fd(na)24 b(p\370edc)n(hoz\355)h(ozna\350en)n(\375)h(soub)r(or)608 -b Fa(M-{)-450 1165 y Fd(zp)r(\354t)25 b(na)f(p\370edc)n(hoz\355)h(p)r -(o)r(dadres\341\370)620 b Fa(M-C-p)-450 1245 y Fd(vp\370ed)24 -b(na)g(dal\271\355)f(p)r(o)r(dadres\341\370)728 b Fa(M-C-n)-450 -1325 y Fd(na)24 b(nad\370azen)n(\375)h(adres\341\370)871 -b Fa(^)-450 1405 y Fd(jdi)23 b(na)h(prvn\355)f(p)r(o)r(dadres\341\370) -801 b Fa(M-C-d)-450 1597 y Fb(P\370\355k)m(azy)39 b(p)s(omo)s(c\355)g -(m)m(y\271i)-450 1754 y Fd(otev\370i)24 b(soub)r(or)981 -b Fa(Mouse_Button_2)-450 1833 y Fd(zobraz)25 b(men)n(u)873 -b Fa(Control-Mouse_Button_3)-450 2017 y Fb(Ok)m(am\276it\351)38 -b(ak)m(ce)f(nad)g(soub)s(ory)-450 2173 y Fd(otev\370i)24 -b(aktu\341ln\355)g(soub)r(or)846 b Fa(f)-450 2253 y Fd(otev\370i)24 -b(aktu\341ln\355)g(soub)r(or)g(p)r(ouze)h(pro)f(\350ten\355)346 -b Fa(v)-450 2333 y Fd(otev\370i)24 b(aktu\341ln\355)g(soub)r(or)g(v)g -(jin\351m)e(okn\354)425 b Fa(o)-450 2413 y Fd(otev\370i)24 -b(aktu\341ln\355)g(soub)r(or)g(v)g(jin\351m)e(r\341mci)393 -b Fa(w)-450 2492 y Fd(zobraz)25 b(aktu\341ln\355)f(soub)r(or)824 -b Fa(C-u)36 b(o)-450 2572 y Fd(vytv)n(o\370)25 b(no)n(v\375)f(p)r(o)r -(dadres\341\370)795 b Fa(+)-450 2652 y Fd(p)r(oro)n(vnej)24 -b(soub)r(or)g(p)r(o)r(d)g(kurzorem)f(s)g(ozna\350en)n(\375m)170 -b Fa(=)-450 2844 y Fb(Zna\350en\355)36 b(a)i(o)s(dzna\350en\355)f(soub) -s(or\371)-450 3001 y Fd(ozna\350)22 b(soub)r(or)f(neb)r(o)g(p)r(o)r -(dadres\341\370)g(pro)g(dal\271\355)f(p\370\355k)n(azy)71 -b Fa(m)-450 3081 y Fd(o)r(dzna\350)25 b(soub)r(or)f(neb)r(o)h(soub)r -(ory)f(p)r(o)r(dadres\341\370e)253 b Fa(u)-450 3160 y -Fd(zru\271)23 b(ozna\350en\355)j(v\271ec)n(h)e(soub)r(or\371)g(v)g -(bu\013eru)359 b Fa(M-delete)-450 3240 y Fd(ozna\350)25 -b(soub)r(ory)f(se)g(zadanou)h(p\370\355p)r(onou)430 b -Fa(*)36 b(.)-450 3320 y Fd(ozna\350)25 b(v\271ec)n(hn)n(y)g -(adres\341\370e)816 b Fa(*)36 b(/)-450 3399 y Fd(ozna\350)25 -b(v\271ec)n(hn)n(y)g(sym)n(b)r(olic)n(k)n(\351)e(o)r(dk)n(azy)500 -b Fa(*)36 b(@)-450 3479 y Fd(ozna\350)25 b(v\271ec)n(hn)n(y)g -(spustiteln\351)g(soub)r(ory)474 b Fa(*)36 b(*)-450 3559 -y Fd(in)n(v)n(ertuj)24 b(ozna\350en\355)1006 b Fa(*)36 -b(t)-450 3638 y Fd(ozna\350)20 b(v\271ec)n(hn)n(y)h(soub)r(ory)e(v)g -(aktu\341ln\355m)f(p)r(o)r(dadres\341\370i)71 b Fa(*)36 -b(s)-450 3718 y Fd(ozna\350)25 b(soub)r(ory)f(vyho)n(vuj\355c\355)g -(regul\341rn\355m)n(u)e(v\375razu)127 b Fa(*)36 b(\045)-450 -3798 y Fd(zm\354\362)23 b(zna\350)n(ku)i(na)g(jin\351)e(p\355smeno)625 -b Fa(*)36 b(c)-450 3878 y Fd(ozna\350)25 b(soub)r(ory)-6 -b(,)24 b(pro)f(kter\351)i(elisp)r(o)n(v\375)f(v\375raz)g(vrac\355)f(t) -85 b Fa(*)36 b(\()f Fc(\(D)n(X\))-450 4074 y Fb(N\341p)s(o)m(v)m -(\354da)-450 4230 y Fd(zobraz)25 b(n\341p)r(o)n(v)n(\354du)1014 -b Fa(h)-450 4310 y Fd(p\370ehled)24 b(p\370\355k)n(az\371)g(dired)871 -b Fa(?)1866 -364 y Fb(P\370\355k)m(azy)39 b(nad)e(ozna\350en)m(\375mi)g -(soub)s(ory)1866 -238 y Fd(k)n(op\355ruj)23 b(soub)r(or\(y\))992 -b Fa(C)1866 -158 y Fd(p\370ejmen)n(uj)22 b(soub)r(or)i(neb)r(o)h -(p\370esu\362)f(soub)r(ory)327 b Fa(R)1866 -79 y Fd(zm\354\362)23 -b(vlastn\355k)n(a)i(soub)r(oru\(\371\))707 b Fa(O)1866 -1 y Fd(zm\354\362)23 b(skupin)n(u)h(soub)r(oru\(\371\))745 -b Fa(G)1866 81 y Fd(zm\354\362)23 b(p\370\355stup)r(o)n(v)n(\341)i -(pr\341)n(v)n(a)f(soub)r(oru\(\371\))464 b Fa(M)1866 -160 y Fd(vytiskni)24 b(soub)r(or\(y\))964 b Fa(P)1866 -240 y Fd(zm\354\362)23 b(n\341zev)i(soub)r(oru\(\371\))g(na)f(mal\341)f -(p\355smena)262 b Fa(\045)36 b(l)1866 320 y Fd(zm\354\362)23 -b(n\341zev)i(soub)r(oru\(\371\))g(na)f(v)n(elk)n(\341)h(p\355smena)254 -b Fa(\045)36 b(u)1866 399 y Fd(sma\276)23 b(ozna\350en\351)j(soub)r -(ory)812 b Fa(X)1866 479 y Fd(pro)n(v)n(e\357)24 b(uuenco)r(de)i(neb)r -(o)f(uudeco)r(de)g(soub)r(oru\(\371\))169 b Fa(U)1866 -559 y Fd(zk)n(omprim)n(uj)21 b(neb)r(o)k(dek)n(omprim)n(uj)c(soub)r -(or\(y\))247 b Fa(Z)1866 639 y Fd(spus\273)24 b(info)f(na)h(soub)r(or) -902 b Fa(I)36 b Fc(\(D)n(X\))1866 718 y Fd(vytv)n(o\370)25 -b(sym)n(b)r(olic)n(k\375\(\351\))f(o)r(dk)n(az\(y\))587 -b Fa(S)1866 798 y Fd(vytv)n(o\370)25 b(relativn\355)e(sym)n(b)r(olic)n -(k)n(\351)g(o)r(dk)n(azy)455 b Fa(Y)1866 878 y Fd(vytv)n(o\370)25 -b(p)r(evn)n(\375)f(o)r(dk)n(az)922 b Fa(H)1866 957 y -Fd(prohledej)24 b(soub)r(ory)g(na)g(regul\341rn\355)f(v\375raz)391 -b Fa(A)1866 1037 y Fd(nahra\357)24 b(regul\341rn\355)f(v\375razy)788 -b Fa(Q)1866 1117 y Fd(p\370elo\276)24 b(soub)r(ory)g(\(b)n -(yte-compile\))609 b Fa(B)1866 1196 y Fd(na\350ti)24 -b(soub)r(ory)g(\(load-\014le\))790 b Fa(L)1866 1276 y -Fd(spus\273)24 b(p\370\355k)n(az)g(na)g(soub)r(or\(y\))738 -b Fa(!)1866 1433 y Fb(Ozna\350en\355)36 b(soub)s(or\371)j(pro)f -(smaz\341n\355)1866 1541 y Fc(Odzna\350uj\355c\355)27 -b(p\370\355k)n(azy)f(ma\276ou)f(zna\350)n(ku)i(pro)g(smaz\341n\355)1866 -1639 y Fd(ozna\350)e(soub)r(or)f(pro)f(smaz\341n\355)731 -b Fa(d)1866 1719 y Fd(o)r(dstra\362)24 b(zna\350)n(ku)h(pro)f -(smaz\341n\355)664 b Fa(delete)1866 1798 y Fd(ozna\350)25 +TeXDict begin 1 0 bop -247 -364 a Fg(Referen\350n\355)47 +b(k)l(arta)e(pro)g(Dired)-50 -256 y Ff(\(ur\350eno)25 +b(pro)f(Dired)f(v)g(GNU)h(Emacsu)g(22.x\))-63 -176 y(P\370\355k)n(azy)g +(ozna\350en\351)i Fe(\(D)n(X\))d Ff(vy\276aduj\355)h(dired-x)-450 +31 y Fd(Spu\271t\354n\355)36 b(a)i(uk)m(on\350en\355)f(Dired)-450 +196 y Ff(spu\271t\354n\355)24 b(dired)1098 b Fc(C-x)36 +b(d)-450 276 y Ff(spu\271t\354n\355)23 b(dired)f(v)h(adres\341\370i)f +(s)g(aktu\341ln\355m)h(soub)r(orem)71 b Fc(C-x)36 b(C-j)g +Fe(\(D)n(X\))-450 356 y Ff(uk)n(on\350en\355)25 b(dired)1079 +b Fc(q)-450 561 y Fd(P\370\355k)m(azy)39 b(pro)f(p\370esun)m(y)-450 +726 y Ff(zp)r(\354t)25 b(na)f(p\370edc)n(hoz\355)h(\370\341dku)783 +b Fc(p)-450 806 y Ff(vp\370ed)24 b(na)g(n\341sleduj\355c\355)f +(\370\341dku)709 b Fc(n)-450 886 y Ff(nahoru)24 b(na)g(p\370edc)n +(hoz\355)h(adres\341\370)653 b Fc(<)-450 965 y Ff(dol\371)24 +b(na)g(n\341sleduj\355c\355)f(adres\341\370)704 b Fc(>)-450 +1045 y Ff(na)24 b(dal\271\355)f(ozna\350en)n(\375)j(soub)r(or)759 +b Fc(M-})-450 1125 y Ff(na)24 b(p\370edc)n(hoz\355)h(ozna\350en)n(\375) +h(soub)r(or)608 b Fc(M-{)-450 1204 y Ff(zp)r(\354t)25 +b(na)f(p\370edc)n(hoz\355)h(p)r(o)r(dadres\341\370)620 +b Fc(M-C-p)-450 1284 y Ff(vp\370ed)24 b(na)g(dal\271\355)f(p)r(o)r +(dadres\341\370)728 b Fc(M-C-n)-450 1364 y Ff(na)24 b(nad\370azen)n +(\375)h(adres\341\370)871 b Fc(^)-450 1444 y Ff(jdi)23 +b(na)h(prvn\355)f(p)r(o)r(dadres\341\370)801 b Fc(M-C-d)-450 +1647 y Fd(P\370\355k)m(azy)39 b(p)s(omo)s(c\355)g(m)m(y\271i)-450 +1812 y Ff(otev\370i)24 b(soub)r(or)981 b Fc(Mouse_Button_2)-450 +1892 y Ff(zobraz)25 b(men)n(u)874 b Fc(Control-Mouse_Button_3)-450 +2086 y Fd(Ok)m(am\276it\351)38 b(ak)m(ce)f(nad)g(soub)s(ory)-450 +2251 y Ff(otev\370i)24 b(aktu\341ln\355)g(soub)r(or)846 +b Fc(f)-450 2331 y Ff(otev\370i)24 b(aktu\341ln\355)g(soub)r(or)g(p)r +(ouze)h(pro)f(\350ten\355)346 b Fc(v)-450 2411 y Ff(otev\370i)24 +b(aktu\341ln\355)g(soub)r(or)g(v)g(jin\351m)f(okn\354)425 +b Fc(o)-450 2491 y Ff(otev\370i)24 b(aktu\341ln\355)g(soub)r(or)g(v)g +(jin\351m)f(r\341mci)394 b Fc(w)-450 2570 y Ff(zobraz)25 +b(aktu\341ln\355)f(soub)r(or)824 b Fc(C-u)36 b(o)-450 +2650 y Ff(vytv)n(o\370)25 b(no)n(v\375)f(p)r(o)r(dadres\341\370)795 +b Fc(+)-450 2730 y Ff(p)r(oro)n(vnej)24 b(soub)r(or)g(p)r(o)r(d)g +(kurzorem)g(s)f(ozna\350en)n(\375m)171 b Fc(=)-450 2933 +y Fd(Zna\350en\355)36 b(a)i(o)s(dzna\350en\355)f(soub)s(or\371)-450 +3098 y Ff(ozna\350)22 b(soub)r(or)f(neb)r(o)g(p)r(o)r(dadres\341\370)g +(pro)g(dal\271\355)f(p\370\355k)n(azy)71 b Fc(m)-450 +3178 y Ff(o)r(dzna\350)25 b(soub)r(or)f(neb)r(o)h(soub)r(ory)f(p)r(o)r +(dadres\341\370e)253 b Fc(u)-450 3258 y Ff(zru\271)23 +b(ozna\350en\355)j(v\271ec)n(h)e(soub)r(or\371)g(v)g(bu\013eru)359 +b Fc(M-delete)-450 3337 y Ff(ozna\350)25 b(soub)r(ory)f(se)g(zadanou)h +(p\370\355p)r(onou)430 b Fc(*)36 b(.)-450 3417 y Ff(ozna\350)25 +b(v\271ec)n(hn)n(y)g(adres\341\370e)816 b Fc(*)36 b(/)-450 +3497 y Ff(ozna\350)25 b(v\271ec)n(hn)n(y)g(sym)n(b)r(olic)n(k)n(\351)f +(o)r(dk)n(azy)500 b Fc(*)36 b(@)-450 3576 y Ff(ozna\350)25 +b(v\271ec)n(hn)n(y)g(spustiteln\351)g(soub)r(ory)474 +b Fc(*)36 b(*)-450 3656 y Ff(in)n(v)n(ertuj)24 b(ozna\350en\355)1006 +b Fc(*)36 b(t)-450 3736 y Ff(ozna\350)20 b(v\271ec)n(hn)n(y)h(soub)r +(ory)e(v)g(aktu\341ln\355m)g(p)r(o)r(dadres\341\370i)71 +b Fc(*)36 b(s)-450 3816 y Ff(ozna\350)25 b(soub)r(ory)f(vyho)n +(vuj\355c\355)g(regul\341rn\355m)n(u)f(v\375razu)127 +b Fc(*)36 b(\045)-450 3895 y Ff(zm\354\362)24 b(zna\350)n(ku)h(na)g +(jin\351)e(p\355smeno)626 b Fc(*)36 b(c)-450 3975 y Ff(ozna\350)25 +b(soub)r(ory)-6 b(,)24 b(pro)f(kter\351)i(elisp)r(o)n(v\375)f(v\375raz) +g(vrac\355)f(t)85 b Fc(*)36 b(\()f Fe(\(D)n(X\))-450 +4182 y Fd(Mo)s(di\014k)m(ace)i(Dired)g(bu\013eru)-450 +4347 y Ff(vlo\276)24 b(do)g(tohoto)i(bu\013eru)e(p)r(o)r +(dadres\341\370)479 b Fc(i)-450 4427 y Ff(o)r(dstra\362)24 +b(ozna\350en\351)i(soub)r(ory)e(z)g(bu\013eru)436 b Fc(k)-450 +4507 y Ff(o)r(dstra\362)24 b(z)g(bu\013eru)g(v\375pis)g(p)r(o)r +(dadres\341\370e)420 b Fc(C-u)36 b(k)-450 4586 y Ff(zno)n(vu)25 +b(na\350ti)f(adres\341\370e)g(\(zna\350)n(ky)i(se)e(zac)n(ho)n(v)n(a)t +(j\355\))217 b Fc(g)-450 4666 y Ff(p\370epni)24 b(t\370\355d\354n\355)f +(adres\341\370e)h(p)r(o)r(dle)g(jm\351na/data)255 b Fc(s)-450 +4746 y Ff(upra)n(v)24 b(v)n(olb)n(y)g(p\370\355k)n(azu)g(ls)843 +b Fc(C-u)36 b(s)-450 4825 y Ff(obno)n(v)25 b(zna\350)n(ky)-6 +b(,)25 b(skryt\351)f(\370\341dky)g(ap)r(o)r(d.)491 b +Fc(C-_)-450 4905 y Ff(skryj)23 b(v\271ec)n(hn)n(y)i(p)r(o)r +(dadres\341\370e)720 b Fc(M-$)-450 4985 y Ff(skryj)23 +b(neb)r(o)h(o)r(dkryj)g(v\271ec)n(hn)n(y)h(p)r(o)r(dadres\341\370e)326 +b Fc($)1866 -364 y Fd(P\370\355k)m(azy)39 b(nad)e(ozna\350en)m(\375mi)g +(soub)s(ory)1866 -198 y Ff(k)n(op\355ruj)23 b(soub)r(or\(y\))992 +b Fc(C)1866 -119 y Ff(p\370ejmen)n(uj)23 b(soub)r(or)h(neb)r(o)h +(p\370esu\362)f(soub)r(ory)327 b Fc(R)1866 -39 y Ff(zm\354\362)24 +b(vlastn\355k)n(a)h(soub)r(oru\(\371\))707 b Fc(O)1866 +41 y Ff(zm\354\362)24 b(skupin)n(u)g(soub)r(oru\(\371\))745 +b Fc(G)1866 120 y Ff(zm\354\362)24 b(p\370\355stup)r(o)n(v)n(\341)h +(pr\341)n(v)n(a)f(soub)r(oru\(\371\))464 b Fc(M)1866 +200 y Ff(vytiskni)24 b(soub)r(or\(y\))964 b Fc(P)1866 +280 y Ff(zm\354\362)24 b(n\341zev)h(soub)r(oru\(\371\))g(na)f(mal\341)g +(p\355smena)263 b Fc(\045)36 b(l)1866 359 y Ff(zm\354\362)24 +b(n\341zev)h(soub)r(oru\(\371\))g(na)f(v)n(elk)n(\341)h(p\355smena)255 +b Fc(\045)36 b(u)1866 439 y Ff(sma\276)24 b(ozna\350en\351)i(soub)r +(ory)812 b Fc(X)1866 519 y Ff(pro)n(v)n(e\357)24 b(uuenco)r(de)i(neb)r +(o)f(uudeco)r(de)g(soub)r(oru\(\371\))169 b Fc(U)1866 +599 y Ff(zk)n(omprim)n(uj)23 b(neb)r(o)i(dek)n(omprim)n(uj)e(soub)r +(or\(y\))247 b Fc(Z)1866 678 y Ff(spus\273)24 b(info)f(na)h(soub)r(or) +902 b Fc(I)36 b Fe(\(D)n(X\))1866 758 y Ff(vytv)n(o\370)25 +b(sym)n(b)r(olic)n(k\375\(\351\))g(o)r(dk)n(az\(y\))587 +b Fc(S)1866 838 y Ff(vytv)n(o\370)25 b(relativn\355)e(sym)n(b)r(olic)n +(k)n(\351)h(o)r(dk)n(azy)455 b Fc(Y)1866 917 y Ff(vytv)n(o\370)25 +b(p)r(evn)n(\375)f(o)r(dk)n(az)922 b Fc(H)1866 997 y +Ff(prohledej)24 b(soub)r(ory)g(na)g(regul\341rn\355)f(v\375raz)391 +b Fc(A)1866 1077 y Ff(nahra\357)24 b(regul\341rn\355)f(v\375razy)788 +b Fc(Q)1866 1156 y Ff(p\370elo\276)24 b(soub)r(ory)g(\(b)n +(yte-compile\))610 b Fc(B)1866 1236 y Ff(na\350ti)24 +b(soub)r(ory)g(\(load-\014le\))790 b Fc(L)1866 1316 y +Ff(spus\273)24 b(p\370\355k)n(az)g(na)g(soub)r(or\(y\))738 +b Fc(!)1866 1523 y Fd(Ozna\350en\355)36 b(soub)s(or\371)j(pro)f +(smaz\341n\355)1866 1660 y Fe(Odzna\350uj\355c\355)27 +b(p\370\355k)n(azy)f(ma\276ou)g(zna\350)n(ku)h(pro)g(smaz\341n\355)1866 +1768 y Ff(ozna\350)e(soub)r(or)f(pro)f(smaz\341n\355)732 +b Fc(d)1866 1848 y Ff(o)r(dstra\362)24 b(zna\350)n(ku)h(pro)f +(smaz\341n\355)665 b Fc(delete)1866 1927 y Ff(ozna\350)25 b(v\271ec)n(hn)n(y)g(z\341loh)n(y)g(\(soub)r(ory)f(k)n(on\350\355c\355) -g(na)g(~\))162 b Fa(~)1866 1878 y Fd(ozna\350)25 b(v\271ec)n(hn)n(y)g -(z\341loh)n(y)g(\(auto-sa)n(v)n(e\))510 b Fa(#)1866 1958 -y Fd(ozna\350)25 b(r\371zn\351)f(do)r(\350asn\351)h(soub)r(ory)634 -b Fa(&)1866 2037 y Fd(ozna\350)25 b(\350\355slo)n(v)n(an\351)f +g(na)g(~\))162 b Fc(~)1866 2007 y Ff(ozna\350)25 b(v\271ec)n(hn)n(y)g +(z\341loh)n(y)g(\(auto-sa)n(v)n(e\))510 b Fc(#)1866 2087 +y Ff(ozna\350)25 b(r\371zn\351)f(do)r(\350asn\351)h(soub)r(ory)634 +b Fc(&)1866 2166 y Ff(ozna\350)25 b(\350\355slo)n(v)n(an\351)f (z\341loh)n(y)h(\(k)n(on\350\355c\355)g(na)f(.~1~)g(ap)r(o)r(d.\))109 -b Fa(.)1866 2117 y Fd(pro)n(v)n(e\357)24 b(v\375maz)g(soub)r(or\371)g -(ozna\350en)n(\375c)n(h)i(k)n(e)f(smaz\341n\355)99 b -Fa(x)1866 2197 y Fd(ozna\350)25 b(soub)r(ory)f(vyho)n(vuj\355c\355)g -(regul\341rn\355m)n(u)e(v\375razu)127 b Fa(\045)36 b(d)1866 -2350 y Fb(Mo)s(di\014k)m(ace)h(Dired)g(bu\013eru)1866 -2476 y Fd(vlo\276)24 b(do)g(tohoto)i(bu\013eru)e(p)r(o)r -(dadres\341\370)479 b Fa(i)1866 2556 y Fd(o)r(dstra\362)24 -b(ozna\350en\351)i(soub)r(ory)e(z)g(bu\013eru)436 b Fa(k)1866 -2636 y Fd(o)r(dstra\362)24 b(z)g(bu\013eru)g(v\375pis)g(p)r(o)r -(dadres\341\370e)420 b Fa(C-u)36 b(k)1866 2715 y Fd(zno)n(vu)25 -b(na\350ti)f(adres\341\370e)g(\(zna\350)n(ky)i(se)e(zac)n(ho)n(v)n(a)t -(j\355\))217 b Fa(g)1866 2795 y Fd(p\370epni)24 b(t\370\355d\354n\355)f -(adres\341\370e)h(p)r(o)r(dle)g(jm\351na/data)254 b Fa(s)1866 -2875 y Fd(upra)n(v)24 b(v)n(olb)n(y)g(p\370\355k)n(azu)g(ls)843 -b Fa(C-u)36 b(s)1866 2954 y Fd(obno)n(v)25 b(zna\350)n(ky)-6 -b(,)25 b(skryt\351)f(\370\341dky)g(ap)r(o)r(d.)491 b -Fa(C-_)1866 3034 y Fd(skryj)23 b(v\271ec)n(hn)n(y)i(p)r(o)r -(dadres\341\370e)720 b Fa(M-$)1866 3114 y Fd(skryj)23 -b(neb)r(o)h(o)r(dkryj)g(v\271ec)n(hn)n(y)h(p)r(o)r(dadres\341\370e)326 -b Fa($)1866 3267 y Fb(P\370\355k)m(azy)39 b(s)f(regul\341rn\355mi)g -(v\375razy)1866 3393 y Fd(ozna\350)25 b(soub)r(ory)f(vyho)n -(vuj\355c\355)g(regul\341rn\355m)n(u)e(v\375razu)127 -b Fa(\045)36 b(m)1866 3473 y Fd(k)n(op\355ruj)23 b(ozna\350en\351)j -(soub)r(ory)e(obsah)n(uj\355c\355)g(regexp)193 b Fa(\045)36 -b(C)1866 3553 y Fd(p\370ejmen)n(uj)22 b(ozna\350en\351)k(soub)r(ory)e -(vyho)n(vuj\355c\355)g(regexp)94 b Fa(\045)36 b(R)1866 -3632 y Fd(p)r(evn)n(\375)25 b(o)r(dk)n(az)1145 b Fa(\045)36 -b(H)1866 3712 y Fd(sym)n(b)r(olic)n(k\375)23 b(o)r(dk)n(az)988 -b Fa(\045)36 b(S)1866 3792 y Fd(sym)n(b)r(olic)n(k\375)23 -b(o)r(dk)n(az)i(s)e(relativn\355)h(cestou)440 b Fa(\045)36 -b(Y)1866 3871 y Fd(ozna\350)25 b(pro)f(smaz\341n\355)960 -b Fa(\045)36 b(d)1866 4025 y Fb(Dired)h(a)h(Find)1866 -4151 y Fd(otev\370i)24 b(v)g(dired)f(soub)r(ory)h(vyho)n(vuj\355c\355)g -(vzorku)114 b Fa(M-x)36 b(find-name-dired)1866 4230 y -Fd(otev\370i)24 b(v)g(dired)f(soub)r(ory)h(obsah)n(uj\355c\355)g -(vzorek)131 b Fa(M-x)36 b(find-grep-dired)1866 4310 y -Fd(otev\370i)24 b(v)g(dired)f(soub)r(ory)h(p)r(o)r(dle)g(v\375stupu)h -Fa(find)76 b(M-x)36 b(find-dired)1590 5603 y Fd(1)p eop +b Fc(.)1866 2246 y Ff(pro)n(v)n(e\357)24 b(v\375maz)h(soub)r(or\371)f +(ozna\350en)n(\375c)n(h)i(k)n(e)f(smaz\341n\355)100 b +Fc(x)1866 2326 y Ff(ozna\350)25 b(soub)r(ory)f(vyho)n(vuj\355c\355)g +(regul\341rn\355m)n(u)f(v\375razu)127 b Fc(\045)36 b(d)1866 +2529 y Fd(P\370\355k)m(azy)j(s)f(regul\341rn\355mi)g(v\375razy)1866 +2694 y Ff(ozna\350)25 b(soub)r(ory)f(vyho)n(vuj\355c\355)g +(regul\341rn\355m)n(u)f(v\375razu)127 b Fc(\045)36 b(m)1866 +2774 y Ff(k)n(op\355ruj)23 b(ozna\350en\351)j(soub)r(ory)e(obsah)n +(uj\355c\355)g(regexp)193 b Fc(\045)36 b(C)1866 2854 +y Ff(p\370ejmen)n(uj)23 b(ozna\350en\351)j(soub)r(ory)e(vyho)n +(vuj\355c\355)g(regexp)94 b Fc(\045)36 b(R)1866 2933 +y Ff(p)r(evn)n(\375)25 b(o)r(dk)n(az)1145 b Fc(\045)36 +b(H)1866 3013 y Ff(sym)n(b)r(olic)n(k\375)24 b(o)r(dk)n(az)988 +b Fc(\045)36 b(S)1866 3093 y Ff(sym)n(b)r(olic)n(k\375)24 +b(o)r(dk)n(az)h(s)e(relativn\355)h(cestou)440 b Fc(\045)36 +b(Y)1866 3173 y Ff(ozna\350)25 b(pro)f(smaz\341n\355)961 +b Fc(\045)36 b(d)1866 3376 y Fd(Dired)h(a)h(Find)1866 +3541 y Ff(otev\370i)24 b(v)g(dired)f(soub)r(ory)h(vyho)n(vuj\355c\355)g +(vzorku)114 b Fc(M-x)36 b(find-name-dired)1866 3621 y +Ff(otev\370i)24 b(v)g(dired)f(soub)r(ory)h(obsah)n(uj\355c\355)g +(vzorek)131 b Fc(M-x)36 b(find-grep-dired)1866 3701 y +Ff(otev\370i)24 b(v)g(dired)f(soub)r(ory)h(p)r(o)r(dle)g(v\375stupu)h +Fc(find)76 b(M-x)36 b(find-dired)1866 3904 y Fd(N\341p)s(o)m(v)m +(\354da)1866 4069 y Ff(zobraz)25 b(n\341p)r(o)n(v)n(\354du)1014 +b Fc(h)1866 4149 y Ff(p\370ehled)24 b(p\370\355k)n(az\371)g(dired)871 +b Fc(?)2219 4454 y Fb(Cop)n(yrigh)n(t)2522 4452 y(c)2505 +4454 y Fa(\015)21 b Fb(2007)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 +b(oundation,)20 b(Inc.)2302 4517 y(designed)h(b)n(y)f(Stephen)g +(Gildea,)g(Ma)n(y)i(2006)g(v0.1)2299 4581 y(for)f(GNU)f(Emacs)i(v)n +(ersion)f(22)h(on)e(Unix)g(systems)2128 4645 y(Up)r(dated)f(for)j +(Dired)e(in)f(Ma)n(y)j(2000)h(b)n(y)e(Evgen)n(y)g(Roubinc)n(h)n(tein) +1866 4737 y(P)n(ermission)d(is)g(gran)n(ted)h(to)g(mak)n(e)g(and)f +(distribute)f(copies)h(of)h(this)f(card)g(pro)n(vided)g(the)1866 +4801 y(cop)n(yrigh)n(t)k(notice)e(and)h(this)f(p)r(ermission)g(notice)h +(are)g(preserv)n(ed)h(on)e(all)h(copies.)1866 4893 y(F)-5 +b(or)17 b(copies)g(of)h(the)e(GNU)g(Emacs)h(man)n(ual,)f(write)h(to)g +(the)g(F)-5 b(ree)17 b(Soft)n(w)n(are)i(F)-5 b(oundation,)1866 +4957 y(Inc.,)20 b(51)h(F)-5 b(ranklin)20 b(Street,)h(Fifth)f(Flo)r(or,) +g(Boston,)i(MA)f(02110-1301,)j(USA.)1590 6353 y Ff(1)p +eop end %%Trailer -end + userdict /end-hook known{end-hook}if %%EOF diff -r edf631bdbb7a -r 738ce3540ffb etc/cs-dired-ref.tex --- a/etc/cs-dired-ref.tex Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/cs-dired-ref.tex Sun Apr 22 12:12:29 2007 +0000 @@ -48,7 +48,7 @@ % e.g. in the TeX Live CD). \def\versionnumber{0.1} -\def\versionemacs{21} +\def\versionemacs{22} \def\year{2007} % latest copyright year \def\version{May 2006\ v\versionnumber} diff -r edf631bdbb7a -r 738ce3540ffb etc/dired-ref.ps --- a/etc/dired-ref.ps Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/dired-ref.ps Sun Apr 22 12:12:29 2007 +0000 @@ -1,5 +1,5 @@ %!PS-Adobe-2.0 -%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software +%%Creator: dvips(k) 5.95b Copyright 2005 Radical Eye Software %%Title: dired-ref.dvi %%Pages: 1 %%PageOrder: Ascend @@ -10,7 +10,7 @@ %DVIPSWebPage: (www.radicaleye.com) %DVIPSCommandLine: dvips dired-ref.dvi %DVIPSParameters: dpi=600 -%DVIPSSource: TeX output 2007.02.22:0120 +%DVIPSSource: TeX output 2007.03.19:1902 %%BeginProcSet: tex.pro 0 0 %! /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S @@ -1752,9 +1752,9 @@ end %%EndSetup %%Page: 1 1 -TeXDict begin 1 0 bop -91 -364 a Fg(Dired)47 b(Reference)f(Card)-12 --256 y Ff(\(based)25 b(on)f(Dired)f(in)h(GNU)f(Emacs)h(21.x\))-152 --176 y(Commands)g(mark)n(ed)g(with)g Fe(\(D)n(X\))f Ff(require)g +TeXDict begin 1 0 bop -91 -364 a Fg(Dired)47 b(Reference)f(Card)17 +-256 y Ff(\(based)25 b(on)f(Dired)f(in)g(GNU)h(Emacs)f(22\))-152 +-176 y(Commands)h(mark)n(ed)g(with)g Fe(\(D)n(X\))f Ff(require)g (dired-x)-450 31 y Fd(En)m(tering)37 b(and)g(Exiting)h(Dired)-450 196 y Ff(run)23 b(dired)1244 b Fc(C-x)36 b(d)-450 276 y Ff(dired)23 b(the)i(directory)f(of)f(the)i(\014le)f(y)n(ou)g(are)g diff -r edf631bdbb7a -r 738ce3540ffb etc/dired-ref.tex --- a/etc/dired-ref.tex Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/dired-ref.tex Sun Apr 22 12:12:29 2007 +0000 @@ -250,7 +250,7 @@ \title{Dired Reference Card} -\centerline{(based on Dired in GNU Emacs 21.x)} +\centerline{(based on Dired in GNU Emacs 22)} \centerline{Commands marked with \dx{} require dired-x} % trim this down to fit everything on one page diff -r edf631bdbb7a -r 738ce3540ffb etc/emacs.csh --- a/etc/emacs.csh Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/emacs.csh Sun Apr 22 12:12:29 2007 +0000 @@ -1,22 +1,9 @@ ### emacs.csh -## Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -## Free Software Foundation, Inc. +## Add legal notice if non-trivial amounts of code are added. ## Author: Michael DeCorte -## COPYING PERMISSIONS: - -## Permission is hereby granted, free of charge, to any person -## obtaining a copy of this file, to deal in the file without -## restriction, including without limitation the rights to use, copy, -## modify, merge, publish, distribute, sublicense, and/or sell copies -## of the file, and to permit persons to whom the file is furnished to -## do so, subject to the following condition: -## -## The above copyright notice and this permission notice shall be -## included in all copies or substantial portions of the file. - ### Commentary: ## This defines a csh command named `edit' which resumes an diff -r edf631bdbb7a -r 738ce3540ffb etc/fr-drdref.ps --- a/etc/fr-drdref.ps Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/fr-drdref.ps Sun Apr 22 12:12:29 2007 +0000 @@ -1,5 +1,5 @@ %!PS-Adobe-2.0 -%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software +%%Creator: dvips(k) 5.95b Copyright 2005 Radical Eye Software %%Title: fr-drdref.dvi %%Pages: 1 %%PageOrder: Ascend @@ -10,7 +10,7 @@ %DVIPSWebPage: (www.radicaleye.com) %DVIPSCommandLine: dvips fr-drdref.dvi %DVIPSParameters: dpi=600 -%DVIPSSource: TeX output 2007.02.26:1930 +%DVIPSSource: TeX output 2007.03.19:1910 %%BeginProcSet: tex.pro 0 0 %! /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S @@ -1808,7 +1808,7 @@ %%Page: 1 1 TeXDict begin 1 0 bop -273 -364 a Fg(Carte)46 b(de)g(r)m(\023)-66 b(ef)m(\023)g(erence)46 b(de)g(Dired)-8 -256 y Ff(\(bas)n(\023)-33 -b(e)25 b(sur)e(Dired)g(de)h(GNU)f(Emacs)h(21.x\))-342 +b(e)25 b(sur)e(Dired)g(de)h(GNU)f(Emacs)h(22.x\))-342 -176 y(Les)g(commandes)g(marqu)n(\023)-33 b(ees)25 b(par)e Fe(\(D)n(X\))k(n)n(\023)-39 b(ecessiten)n(t)27 b(dired-x)-450 31 y Fd(Lancer)37 b(et)g(sortir)i(de)e(Dired)-450 196 diff -r edf631bdbb7a -r 738ce3540ffb etc/fr-drdref.tex --- a/etc/fr-drdref.tex Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/fr-drdref.tex Sun Apr 22 12:12:29 2007 +0000 @@ -253,7 +253,7 @@ \title{Carte de r\'ef\'erence de Dired} -\centerline{(bas\'e sur Dired de GNU Emacs 21.x)} +\centerline{(bas\'e sur Dired de GNU Emacs 22.x)} \centerline{Les commandes marqu\'ees par \dx{} n\'ecessitent dired-x} % trim this down to fit everything on one page diff -r edf631bdbb7a -r 738ce3540ffb etc/fr-refcard.ps --- a/etc/fr-refcard.ps Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/fr-refcard.ps Sun Apr 22 12:12:29 2007 +0000 @@ -1,18 +1,17 @@ %!PS-Adobe-2.0 -%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software +%%Creator: dvips(k) 5.92b Copyright 2002 Radical Eye Software %%Title: fr-refcard.dvi %%Pages: 3 %%PageOrder: Ascend %%Orientation: Landscape -%%BoundingBox: 0 0 595 842 -%%DocumentFonts: CMBX10 CMR8 CMTT8 CMBX8 CMR6 CMSY6 CMTI8 CMMI8 -%%DocumentPaperSizes: a4 +%%BoundingBox: 0 0 612 792 +%%DocumentFonts: CMBX10 CMR8 CMTT8 CMBX8 CMTI8 CMMI8 CMR6 CMSY6 %%EndComments %DVIPSWebPage: (www.radicaleye.com) %DVIPSCommandLine: dvips -t landscape fr-refcard.dvi -%DVIPSParameters: dpi=600 -%DVIPSSource: TeX output 2007.01.20:1524 -%%BeginProcSet: tex.pro 0 0 +%DVIPSParameters: dpi=600, compressed +%DVIPSSource: TeX output 2007.03.20:1952 +%%BeginProcSet: texc.pro %! /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72 @@ -31,10 +30,22 @@ definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get }B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub} B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr -1 add N}if}B/CharBuilder{save 3 1 roll S A/base get 2 index get S -/BitMaps get S get/Cd X pop/ctr 0 N Cdx 0 Cx Cy Ch sub Cx Cw add Cy -setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx sub Cy .1 sub]{Ci}imagemask -restore}B/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn +1 add N}if}B/id 0 N/rw 0 N/rc 0 N/gp 0 N/cp 0 N/G 0 N/CharBuilder{save 3 +1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx +0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx +sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{ +rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp +gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B +/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{ +/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{ +A A add 255 and S 1 and or}ifelse}ifelse put 1 adv}B/rsh{rw cp 2 copy +get A 0 eq{pop 128}{A 255 eq{pop 127}{A 2 idiv S 128 and or}ifelse} +ifelse put 1 adv}B/clr{rw cp 2 index string putinterval adv}B/set{rw cp +fillstr 0 4 index getinterval putinterval adv}B/fillstr 18 string 0 1 17 +{2 copy 255 put pop}for N/pl[{adv 1 chg}{adv 1 chg nd}{1 add chg}{1 add +chg nd}{adv lsh}{adv lsh nd}{adv rsh}{adv rsh nd}{1 add adv}{/rc X nd}{ +1 add set}{1 add clr}{adv 2 chg}{adv 2 chg nd}{pop nd}]A{bind pop} +forall N/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn /BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put }if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{ bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A @@ -58,7 +69,202 @@ rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end %%EndProcSet -%%BeginProcSet: texps.pro 0 0 +%%BeginProcSet: f7b6d320.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmb10 cmbx10 cmbx12 cmbx5 cmbx6 cmbx7 cmbx8 cmbx9 cmbxsl10 +% cmdunh10 cmr10 cmr12 cmr17cmr6 cmr7 cmr8 cmr9 cmsl10 cmsl12 cmsl8 +% cmsl9 cmss10cmss12 cmss17 cmss8 cmss9 cmssbx10 cmssdc10 cmssi10 +% cmssi12 cmssi17 cmssi8cmssi9 cmssq8 cmssqi8 cmvtt10 +% +/TeXf7b6d320Encoding [ +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /Omega +/ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute /caron /breve +/macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +/suppress /exclam /quotedblright /numbersign /dollar /percent /ampersand +/quoteright /parenleft /parenright /asterisk /plus /comma /hyphen +/period /slash /zero /one /two /three /four /five /six /seven /eight +/nine /colon /semicolon /exclamdown /equal /questiondown /question /at +/A /B /C /D /E /F /G /H /I /J /K /L /M /N /O /P /Q /R /S /T /U /V /W /X +/Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent +/quoteleft /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p /q /r /s /t /u +/v /w /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis /suppress +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /.notdef +/.notdef /Omega /ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute +/caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE +/OE /Oslash /suppress /dieresis /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: 09fbbfac.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmsltt10 cmtt10 cmtt12 cmtt8 cmtt9 +/TeX09fbbfacEncoding [ +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi +/Omega /arrowup /arrowdown /quotesingle /exclamdown /questiondown +/dotlessi /dotlessj /grave /acute /caron /breve /macron /ring /cedilla +/germandbls /ae /oe /oslash /AE /OE /Oslash /visiblespace /exclam +/quotedbl /numbersign /dollar /percent /ampersand /quoteright /parenleft +/parenright /asterisk /plus /comma /hyphen /period /slash /zero /one +/two /three /four /five /six /seven /eight /nine /colon /semicolon /less +/equal /greater /question /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N +/O /P /Q /R /S /T /U /V /W /X /Y /Z /bracketleft /backslash /bracketright +/asciicircum /underscore /quoteleft /a /b /c /d /e /f /g /h /i /j /k /l +/m /n /o /p /q /r /s /t /u /v /w /x /y /z /braceleft /bar /braceright +/asciitilde /dieresis /visiblespace /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /space /Gamma /Delta /Theta /Lambda /Xi /Pi +/Sigma /Upsilon /Phi /Psi /.notdef /.notdef /Omega /arrowup /arrowdown +/quotesingle /exclamdown /questiondown /dotlessi /dotlessj /grave /acute +/caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE +/OE /Oslash /visiblespace /dieresis /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: 74afc74c.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmbxti10 cmff10 cmfi10 cmfib8 cmti10 cmti12 cmti7 cmti8cmti9 cmu10 +% +/TeX74afc74cEncoding [ +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /Omega +/ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute /caron /breve +/macron /ring /cedilla /germandbls /ae /oe /oslash /AE /OE /Oslash +/suppress /exclam /quotedblright /numbersign /sterling /percent +/ampersand /quoteright /parenleft /parenright /asterisk /plus /comma +/hyphen /period /slash /zero /one /two /three /four /five /six /seven +/eight /nine /colon /semicolon /exclamdown /equal /questiondown /question +/at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O /P /Q /R /S /T /U /V /W +/X /Y /Z /bracketleft /quotedblleft /bracketright /circumflex /dotaccent +/quoteleft /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p /q /r /s /t /u +/v /w /x /y /z /endash /emdash /hungarumlaut /tilde /dieresis /suppress +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /space +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /.notdef +/.notdef /Omega /ff /fi /fl /ffi /ffl /dotlessi /dotlessj /grave /acute +/caron /breve /macron /ring /cedilla /germandbls /ae /oe /oslash /AE +/OE /Oslash /suppress /dieresis /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: aae443f0.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmmi10 cmmi12 cmmi5 cmmi6 cmmi7 cmmi8 cmmi9 cmmib10 +% +/TeXaae443f0Encoding [ +/Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi /Omega +/alpha /beta /gamma /delta /epsilon1 /zeta /eta /theta /iota /kappa +/lambda /mu /nu /xi /pi /rho /sigma /tau /upsilon /phi /chi /psi +/omega /epsilon /theta1 /pi1 /rho1 /sigma1 /phi1 /arrowlefttophalf +/arrowleftbothalf /arrowrighttophalf /arrowrightbothalf /arrowhookleft +/arrowhookright /triangleright /triangleleft /zerooldstyle /oneoldstyle +/twooldstyle /threeoldstyle /fouroldstyle /fiveoldstyle /sixoldstyle +/sevenoldstyle /eightoldstyle /nineoldstyle /period /comma /less /slash +/greater /star /partialdiff /A /B /C /D /E /F /G /H /I /J /K /L /M /N +/O /P /Q /R /S /T /U /V /W /X /Y /Z /flat /natural /sharp /slurbelow +/slurabove /lscript /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o /p +/q /r /s /t /u /v /w /x /y /z /dotlessi /dotlessj /weierstrass /vector +/tie /psi /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/space /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon /Phi /Psi +/.notdef /.notdef /Omega /alpha /beta /gamma /delta /epsilon1 /zeta /eta +/theta /iota /kappa /lambda /mu /nu /xi /pi /rho /sigma /tau /upsilon +/phi /chi /psi /tie /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: bbad153f.enc +% Thomas Esser, Dec 2002. public domain +% +% Encoding for: +% cmsy10 cmsy5 cmsy6 cmsy7 cmsy8 cmsy9 +% +/TeXbbad153fEncoding [ +/minus /periodcentered /multiply /asteriskmath /divide /diamondmath +/plusminus /minusplus /circleplus /circleminus /circlemultiply +/circledivide /circledot /circlecopyrt /openbullet /bullet +/equivasymptotic /equivalence /reflexsubset /reflexsuperset /lessequal +/greaterequal /precedesequal /followsequal /similar /approxequal +/propersubset /propersuperset /lessmuch /greatermuch /precedes /follows +/arrowleft /arrowright /arrowup /arrowdown /arrowboth /arrownortheast +/arrowsoutheast /similarequal /arrowdblleft /arrowdblright /arrowdblup +/arrowdbldown /arrowdblboth /arrownorthwest /arrowsouthwest /proportional +/prime /infinity /element /owner /triangle /triangleinv /negationslash +/mapsto /universal /existential /logicalnot /emptyset /Rfractur /Ifractur +/latticetop /perpendicular /aleph /A /B /C /D /E /F /G /H /I /J /K +/L /M /N /O /P /Q /R /S /T /U /V /W /X /Y /Z /union /intersection +/unionmulti /logicaland /logicalor /turnstileleft /turnstileright +/floorleft /floorright /ceilingleft /ceilingright /braceleft /braceright +/angbracketleft /angbracketright /bar /bardbl /arrowbothv /arrowdblbothv +/backslash /wreathproduct /radical /coproduct /nabla /integral +/unionsq /intersectionsq /subsetsqequal /supersetsqequal /section +/dagger /daggerdbl /paragraph /club /diamond /heart /spade /arrowleft +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/minus /periodcentered /multiply /asteriskmath /divide /diamondmath +/plusminus /minusplus /circleplus /circleminus /.notdef /.notdef +/circlemultiply /circledivide /circledot /circlecopyrt /openbullet +/bullet /equivasymptotic /equivalence /reflexsubset /reflexsuperset +/lessequal /greaterequal /precedesequal /followsequal /similar +/approxequal /propersubset /propersuperset /lessmuch /greatermuch +/precedes /follows /arrowleft /spade /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +] def + +%%EndProcSet +%%BeginProcSet: texps.pro %! TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2 index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll @@ -75,256 +281,6 @@ end %%EndProcSet -%%BeginFont: CMMI8 -%!PS-AdobeFont-1.1: CMMI8 1.100 -%%CreationDate: 1996 Jul 23 07:53:54 -% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. -11 dict begin -/FontInfo 7 dict dup begin -/version (1.100) readonly def -/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def -/FullName (CMMI8) readonly def -/FamilyName (Computer Modern) readonly def -/Weight (Medium) readonly def -/ItalicAngle -14.04 def -/isFixedPitch false def -end readonly def -/FontName /CMMI8 def -/PaintType 0 def -/FontType 1 def -/FontMatrix [0.001 0 0 0.001 0 0] readonly def -/Encoding 256 array -0 1 255 {1 index exch /.notdef put} for -dup 58 /period put -readonly def -/FontBBox{-24 -250 1110 750}readonly def -currentdict end -currentfile eexec -D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE -3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B -532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470 -B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B -986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE -D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5 -5250011D19E9366EB6FD153D3A100CAA6212E3D5D93990737F8D326D347B7EDC -4391C9DF440285B8FC159D0E98D4258FC57892DDF753642CD526A96ACEDA4120 -788F22B1D09F149794E66DD1AC2C2B3BC6FEC59D626F427CD5AE9C54C7F78F62 -C36F49B3C2E5E62AFB56DCEE87445A12A942C14AE618D1FE1B11A9CF9FAA1F32 -617B598CE5058715EF3051E228F72F651040AD99A741F247C68007E68C84E9D1 -D0BF99AA5D777D88A7D3CED2EA67F4AE61E8BC0495E7DA382E82DDB2B009DD63 -532C74E3BE5EC555A014BCBB6AB31B8286D7712E0E926F8696830672B8214E9B -5D0740C16ADF0AFD47C4938F373575C6CA91E46D88DE24E682DEC44B57EA8AF8 -4E57D45646073250D82C4B50CBBB0B369932618301F3D4186277103B53B3C9E6 -DB42D6B30115F67B9D078220D5752644930643BDF9FACF684EBE13E39B65055E -B1BD054C324962025EC79E1D155936FE32D9F2224353F2A46C3558EF216F6BB2 -A304BAF752BEEC36C4440B556AEFECF454BA7CBBA7537BCB10EBC21047333A89 -8936419D857CD9F59EBA20B0A3D9BA4A0D3395336B4CDA4BA6451B6E4D1370FA -D9BDABB7F271BC1C6C48D9DF1E5A6FAE788F5609DE3C48D47A67097C547D9817 -AD3A7CCE2B771843D69F860DA4059A71494281C0AD8D4BAB3F67BB6739723C04 -AE05F9E35B2B2CB9C7874C114F57A185C8563C0DCCA93F8096384D71A2994748 -A3C7C8B8AF54961A8838AD279441D9A5EB6C1FE26C98BD025F353124DA68A827 -AE2AF8D25CA48031C242AA433EEEBB8ABA4B96821786C38BACB5F58C3D5DA011 -85B385124C2B6534F3CD1866AF92009D93B97F763AA3D16684AA65F029E776DA -3BFB75EDD46D562E6A284DB4F2FDBF7CDE7C1F3772CD7B6FD372842A0E07E3EF -68A98AB9278ADC2D35891543F57ED6DCFE8923368D556F1A8B3E35863112F409 -FBE67FC270328312BAA43A9A372C510717B50AAB01A1E02A9982113E2D7C601C -B0BDA1C0E081E546A97647B74EE5194C57ACD62502B329FED4D966BDEB4028F0 -F082EDD5DFC8387653D620E9E73FDCE3C155347D5929C3A24D6121AEA46BBF3A -B1C8A4793FB7F21C84400912C27D9AB0845537103553BF8F -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -cleartomark -%%EndFont -%%BeginFont: CMTI8 -%!PS-AdobeFont-1.1: CMTI8 1.0 -%%CreationDate: 1991 Aug 18 21:07:42 -% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. -11 dict begin -/FontInfo 7 dict dup begin -/version (1.0) readonly def -/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def -/FullName (CMTI8) readonly def -/FamilyName (Computer Modern) readonly def -/Weight (Medium) readonly def -/ItalicAngle -14.04 def -/isFixedPitch false def -end readonly def -/FontName /CMTI8 def -/PaintType 0 def -/FontType 1 def -/FontMatrix [0.001 0 0 0.001 0 0] readonly def -/Encoding 256 array -0 1 255 {1 index exch /.notdef put} for -dup 45 /hyphen put -dup 97 /a put -dup 98 /b put -dup 99 /c put -dup 100 /d put -dup 101 /e put -dup 103 /g put -dup 105 /i put -dup 108 /l put -dup 109 /m put -dup 110 /n put -dup 111 /o put -dup 112 /p put -dup 114 /r put -dup 115 /s put -dup 116 /t put -dup 117 /u put -dup 121 /y put -readonly def -/FontBBox{-35 -250 1190 750}readonly def -currentdict end -currentfile eexec -D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE -3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B -532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470 -B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B -986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE -D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5 -525003F3DAD7933EB57E7DB1462E9D906F6D8F5BF740206C1EC5F36E00AAFF68 -F3EF6F3A2540E5F9564D1C215BC1E7E69C7D04DA5DB1CF195613C9CBF4BAA360 -84AEF3E10E24877FBE36AD731DC97305BDE6DB1F934909FAF60B8E28561FBC57 -0F5B6225425BFDE8F0C71CD4507B82FF803E9A301397975E38A259DE1E1B4FC0 -06BB1DC2D45B987A2268A77CE8DC025CB0D1B39788BBEE149103950650171C94 -5FED1063050A90BD38605BD9365D1C2AE42A7DA3DDB9A263FE10BD487F63D908 -D4F02758BD9D7BE53E6353A25BEFA29E42B50C1D078A8B3A746EEDB381CCE36C -93FC4BD1A8D1D6ACD0D355E948CFE397B74D243EB51597D251D0BAE6884D70E8 -FEE119462E1939A9783414DF59EEA5FF1529F13869D1FF0A44935C5198CC5DAA -E1FD2A17AEEBF4974052D06734A409E26C457C06700C55896C90BB33E044A737 -46590D9FA242819B9527FD59818D8829D4EB2D26A34CC05A2CC063E66F2DF193 -8E4F9670014BC243180E45B51DDB05AD1E6A7F619EE1CE09CFC1A4F02CB7270E -4482FEDF673EDED38EF3173C475C34BFB3F6623C5E942A7797FEDDD0EF1D54E9 -1D90D7076C0A9687E334907C22F2E7C603388D8D626B0E5A62B7543DCBB575D7 -9A6BE1528EC9BC18570001092524E4FBB02F3B29293BCB4F0EF14A2DD9DB22A5 -BB33455799E8120D2A4862424AA4A382972E2845E042506FC8F6E201D11DD0F2 -09FAD8DC29C3E12B66293ACBFB13FA0F26238981F2CD52B47A8CDE6DF5CDFAAF -3113E1A6366B806EABA9C34E5D41167CD10D7B639021FB4CFDAE28CE72A93F3C -E8929A4BB6D48613A88F926E0EB1BE5F6E29CA5350841244E1718987727B7245 -E7DDE2528073015C64AEE3BF18734A0C48AFF16A354C14E1A6D9D5DC96C06E02 -3A1FE4AF93E8349C3293F62C3466B67D25A9533C6DAA4514EA201B79042CB220 -43B3B60E13200B4F47011F95BA2EF1D6548218DCDBC1B00CCAE375F91EB60E32 -9F1198D74BC3768101AB5F2E7BDEA9FE5C1379341C604D835B50B671793DD7EF -605F60048FC9761FE50647C15C2424EABDC9AF4257F915282EFF1CF447EA3F0B -EE81FB67B04703215DB6AB3E47B7EE06435234C834DF84A3E0F99D753D596305 -85DD514BA3C5ACCD8BF6BC804AEA170A32B2080B694CF7FE994228ECCAD86C4B -CB8B963E84D46ED86B2D43DADB277A79DD100777CB0F2022C8AC9DA77D500C73 -D6E15540121B6D82457096083526C7E2697F776239E02C3E64D25AFBFB58474E -E82672F2FBEA78ED5DCA1BB4FCD627BAAB6AB50232EDBE99D6CC51A287F80DCF -14CC7DE3DCFF47A1DFA130CF7F502193C6C00B1A7A1515FF7374351238158B97 -AA26F0F2773E81CD03F4A398BEFBDCB450F0FA6450FD48B5A69E37B036BE5F85 -0F0B1AAAB2CF3098AEF32B0902398A6A9E1DB5A0C42DD39E3208C4F8BBEC0A98 -35FC84FF5EB2293644F7E6EF28FAF5F6E5205029CCFF7342BC276958EFFD7817 -5D9F367C6FF151B12353BE9DDCF75196F2C8C8C889BB097A3D9D8FF5D77A7184 -D9F3EAC4493E94DC73886AFD7652ADBF562189B0B85FA5AEA4CA44558D70A408 -4A276D6B0BCF6ED2F5E42E97933AEC978D286B3D0A99C6C7AB10AC6D1C36B07D -EA2F47489D4C2A55A6902C665B7321DD5324C6CE172349E5C6561B5F1CBBFD6E -B5FBBB914307020B218D68C45BB2E9A0BE81C9E8D5D71BC7851CD2922656337A -9659E8E0A8F240903FC34DA589EC6D1FE6CF17D238576472C0CD1E0EB21A46B5 -5B9DACB6CA3B094E51386E45C506D55EE3AC95AF333EBD0305084697383F054D -61680900B82CB80D030270CA9C614A373B0B5B26F8465AE581967C6A336D8C44 -21CED60606DF99F05AFC4C37F53D2D97450B78F1211A2682414780DFF7F6AC6E -750071385D6DC87B58D3D13E286F70B11A692F4BF57BC828C6AA98C44EFE13F8 -44535F79F5458B03AAE3ECEBF2EFD4AA83316E839EF7EBADEA22C17FF039FA85 -498379D857AE78AC68CCC7D1EB2FE84D465AA452F43EC1AFEFE568E42F13E0BC -1CDF5C873F8E3952713BD9A472E6FC9CDE8DDD9281EE3554C22A0D591C91D3E4 -0B3162930BB6F0AC229EE1C847EC39BF81DDDE1A0B0EC7BC51A05AE93B3A891A -3FEB85C68C88AADD29FD39F9DB30FB250D41EBB1124ED0069CDC49B3359D8689 -05DCE2A27EFF35751E51E2C4AEA7DC8B2AF546AB58D6BE81DDD38A3A0833AB62 -E54F54ABC2BB67EF06678D0AA3AB0B240FDFD510404D87A1EA75D5005984B7D0 -DE9EE818E8F99BA9FD646FEAB795E5048E0710CEB0CBD8CA39754BCF7957C646 -532525C2B94D55B1AF534778D653BD50DCECF8DFA4CFD08092AA4DD3D8BB43E9 -6F40CE1B0B25287C46AA961061A0AE3714A465E39694B6E62410ECB1F409F939 -51CE57A12C3CB5B4332A3BDEF4C13917982A0A4527440CAD427F1284E6534D68 -201DA7E10B4DC25CCD025DB0D7E0906C59E235CBF747ED10C3300C1BA42BF434 -1A3C9605F0D568CD938B0DEB5C5E8390309BDFA89EFA3E5F226A24910EAB3791 -0361A08FE539B158072E96BC988AB061736F7DD19DEB61DB5738F2B43682C3E7 -12D709F9E149DA4602201AD24F42BBBEDA49118A93A7F26B703AECDE574441EE -DAF7C634669C0D907B18BF4EAE198E9F3DD8F743FDBDBB2FF8C6650F17115FFF -890F0FA7B873022FABADAD05C42B65FE98E870568D2CF828CDFF7C1EEEB5BF4B -5E695EA05518191A5E8D34EB22091935E0816F8B49AFDCC44811D12D3CA85A57 -8C67D67D400ECEBADAABDC5F7D4E1DE4E330FD1A954B925E2A5B1D0CFF2D80D5 -F668367C28480C7EC3359C781279E8928DB03E274855F7001ABCCE243ED7C259 -67D4705EE2211FEF30D8E82F9EA0838B905A9FB986D1DD200524B74EC4B1AF8B -A0216BBCE594588D8C28A527BC85306960D73D85D96B652B88462881EA065E0C -84485D21B22E71768A81037FA08C48EA83AEC7118DA808CC62783E7DFB121A87 -0A8DA5BC6AD5B8C8ABD057D94DCD627E2CF3D6AACC031BCD50FF49C658EABCF1 -E6ED48E7B3A550782F077CCE21EFB7368B0D12EDF21BDA1DCD30D523A8B94729 -1E339B18677721963F0F9FF961CA6B065A881546683125114FB8BFBF996BA299 -9CA4E3F5BD5C0D614E2515BB6AAFD9D16E1F0C0409A524D91DAD55BB9630C810 -B1DF32BC5820AA059559A5095BF09750F21E3AECAD39CDB3277D06B78E2A0A08 -533EF557F6815F1C361B2417D27F7D9EFA5C2DB0B2655938C8E9E1E36C411E70 -7D57FD9EAFA6FD2C4D3A40D2F35C176E0522C6D0969A2DB598553D9C0A1940D2 -F3D8241AB8DB63E8426BF19B093D99DECC9E2633FE5C77EE55951036A7E19CC6 -27A2DDA74A95F870306ACF9945AA4FE9E10F1FBC43830B2D817016290E50F988 -7283F8E409B5BD2048CF8E8465DC3EC57EE47A7BB678093183B453FC60A8CD67 -6CE6E21A859B1EEACCB9E0A3DC1AEF41C74FE0E0245587A5E1F107BBA11C2B86 -91690DB7158BDAA3F2D82A820A36B3684CC11CCC4802C5F8135FAABDDD50091E -97AE58FE38F088A7348D08F1B9A14BFEB8E97D81066D5C244DBDD9ABECECE72C -6A91E31A815E2B22652F7813BDF07DEF9CBD0E8BB6E7999511289A0CE3CCF502 -14D9A77E29615479657F8BE9AA3EBAC9DD08A04EE7A160A1C528BD6C2CE79E67 -8913543117C32977841E710DCE7C0DAE68888C8EBEBD9883B9F9AF86B1C5790E -E520337D14F18FB14686356E4F1248B3E884634480E683DDDFE4B0221AF0825C -AF3B27DC3156F1E0B5E8D75063A10A81A78698BE4E1A4C2F49D2E530AF1ED966 -8EF252D3CBEACAD0394B9546D51768C195A23A041EC1E3F21AC91C498515EDCF -5A9977F9D72ADBBED88D5E3FFEC64A087FAB9DBDB268608247B977E435E4CE34 -F0C543383384541FF88669E53446065864769D5D3957C64011D7C93FC147B093 -9FA961A60BDDF97F1A3BF53CC18D306DFCFE04DF980F026428E84140542171F0 -F706A48EDEC416DC58F006761686EBA99598962F6E1BEC8E78AEA474CF0AD890 -A72B9906BC891564ECD5440FE6047DB452171AF35C33C24D8A23E41C112D93B5 -F1B422386DFBE80ABBF7BD43F152F0451B7B0DB2D71B75575CB5256C94F40AE2 -E8DB4CABF990502BD74BE028E14C1972E666932E04E79B743B3357737F31D08B -EB9755DF6C89C185A7F13DA21A6E6E526A9089B11C6BB1F5247E31685B028F52 -555F98CAB929558BA7BCDEAE76F93E7B00B214543EBEA0FA375B624B4553C133 -16D6E2B846FAA862F9DCBD8FCB2A59EADE462BC8FDF8DC56B888C6C5ECF9BBB2 -4197F4DDA197A9405F639643A4334545A8004F05963A05747B4905A319411086 -9A691FF410F400E7E569CF8EA99102A57A569C223B8CF8A4B285ADAEDB238FB4 -5FCCC3A9EB063BFB1F9263D8B31D8AE580B6B8F1F311388B509E224F7E600A98 -DE394C80D1CC6391D45160FC7CE92B0CD7E74B0844DD0F3562B14833A563FE6A -E5942191AA6BAE176278E9EC30533FE310F0694745C024929A65E4C411DAAF0C -F3539203284EDADDC1E27FF0EC2FED41AAD7A3CDCBF2B4177647CAEFA2FDD380 -F6483BB02F87E1B66F1F5F8B23DE0ED2EAF4C540A5D392D6B49B0BDF15DEDC09 -13DF0F14E0E49389A82445230CB58704CDF21591EC4E721119F4786523A16BA1 -95F9288C0704DE543FD38496FC59B15143CA8BA06584BE7E6C9F09DD4F207C09 -F2086D39D48B652E45BD2FC4E2C4BC1FE534CC1109E177C7494E0914CD0E45BB -C8461B6A6FEAC2A2742CB9B3441DB0340DA91F6C6BA5EF79D6363F68A52F3300 -7CF46E9F6D5A7E33762852D4BA13A1825AFCF10B00CF175EB0059D272DBAB911 -30D027A1C1AAF745E0D69B71FB455C1363AF42B7A00B142D9C8ADDF4CE9801AF -71C666C1A6773BF48F35076FED27423E1CD18139F3D8B0A3E1AE44C55382FC66 -942021B7C1E3451D679218810F816DA083A644A378D6ADEECCC212169B96FEBF -744AD8C249E092F87CE696C926ED9E61B728674F39DFB645FF5AA6D742B73CF3 -37536ABDB80094DD7CB7D0FC30B6370F8CF9B145F65F4220FA592AF67383108C -3739E4FD2E0878AF00DDEE092CCD14B1E749941F342701F07097A4DF0EE5AB3A -B3D9BFE0B1060ADAFA7D4E3392218E5A7AEFE4CC01827ACD6903C2412270367B -FC75D8C1E290C5489BF2ADE1B3FA6E11B5BCF37FFBC42D0B3E7A7435D6AA7E8F -62B96A05C15CF7025EE1B0D9CC2580A11A1F187DE686E6F8ABBE658382B212CC -D9BAB099DD7ED5EC269FF8CAC8C16E101B7AFE3BF9854884FF0746A1B0423FFC -468342D5D31CEA0EDD7EB5FEEDDB129B7C55DDA20291A18592079BD75D8DCFA1 -2182EB1AB128A319FFB027164B5F9505754A4B1C8DFAD7FF0C892D97FEA8F506 -C65585142BB9F986886117C7CFC66EE962D1609DC1DD36930A6525D1ED03AA93 -282605FCC5C7C651D657EB8ED0A55EE348994C18FF6AEF1D8D669273B6EE450E -709E6F60358F225E209AD70E96778E8375F41BCEFF74D46D595C0819C85E60DC -DB702C6AB7E90FEA2EB9EC299FDA15BE8A807EEBEB1BAFD628BB94B1E28EBD60 -B6DAFF828C2C80821C8ECE963DC90E750EB00E3418BD0858AC6595012D32C308 -DDF9F30191779BFD58D93AF0DFEDE67AD6902FCF8C953CF52188311EDD0D005C -BD31ADEE0825CE1C25725EA2D6C9E5D8D9034C -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -0000000000000000000000000000000000000000000000000000000000000000 -cleartomark -%%EndFont %%BeginFont: CMSY6 %!PS-AdobeFont-1.1: CMSY6 1.0 %%CreationDate: 1991 Aug 15 07:21:34 @@ -345,9 +301,10 @@ /FontMatrix [0.001 0 0 0.001 0 0] readonly def /Encoding 256 array 0 1 255 {1 index exch /.notdef put} for -dup 13 /circlecopyrt put +dup 0 /.notdef put readonly def /FontBBox{-4 -948 1329 786}readonly def +/UniqueID 5000816 def currentdict end currentfile eexec D9D66F633B846A97B686A97E45A3D0AA052F09F9C8ADE9D907C058B87E9B6964 @@ -401,60 +358,10 @@ /FontMatrix [0.001 0 0 0.001 0 0] readonly def /Encoding 256 array 0 1 255 {1 index exch /.notdef put} for -dup 18 /grave put -dup 19 /acute put -dup 24 /cedilla put -dup 39 /quoteright put -dup 44 /comma put -dup 45 /hyphen put -dup 46 /period put -dup 48 /zero put -dup 49 /one put -dup 50 /two put -dup 51 /three put -dup 53 /five put -dup 54 /six put -dup 55 /seven put -dup 65 /A put -dup 66 /B put -dup 67 /C put -dup 69 /E put -dup 70 /F put -dup 71 /G put -dup 73 /I put -dup 74 /J put -dup 77 /M put -dup 78 /N put -dup 80 /P put -dup 83 /S put -dup 85 /U put -dup 86 /V put -dup 97 /a put -dup 98 /b put -dup 99 /c put -dup 100 /d put -dup 101 /e put -dup 102 /f put -dup 103 /g put -dup 104 /h put -dup 105 /i put -dup 107 /k put -dup 108 /l put -dup 109 /m put -dup 110 /n put -dup 111 /o put -dup 112 /p put -dup 113 /q put -dup 114 /r put -dup 115 /s put -dup 116 /t put -dup 117 /u put -dup 118 /v put -dup 119 /w put -dup 121 /y put -dup 122 /z put +dup 0 /.notdef put readonly def /FontBBox{-20 -250 1193 750}readonly def +/UniqueID 5000789 def currentdict end currentfile eexec D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 @@ -738,6 +645,241 @@ 0000000000000000000000000000000000000000000000000000000000000000 cleartomark %%EndFont +%%BeginFont: CMMI8 +%!PS-AdobeFont-1.1: CMMI8 1.100 +%%CreationDate: 1996 Jul 23 07:53:54 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.100) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMMI8) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle -14.04 def +/isFixedPitch false def +end readonly def +/FontName /CMMI8 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-24 -250 1110 750}readonly def +/UniqueID 5087383 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE +3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B +532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470 +B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B +986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE +D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5 +5250011D19E9366EB6FD153D3A100CAA6212E3D5D93990737F8D326D347B7EDC +4391C9DF440285B8FC159D0E98D4258FC57892DDF753642CD526A96ACEDA4120 +788F22B1D09F149794E66DD1AC2C2B3BC6FEC59D626F427CD5AE9C54C7F78F62 +C36F49B3C2E5E62AFB56DCEE87445A12A942C14AE618D1FE1B11A9CF9FAA1F32 +617B598CE5058715EF3051E228F72F651040AD99A741F247C68007E68C84E9D1 +D0BF99AA5D777D88A7D3CED2EA67F4AE61E8BC0495E7DA382E82DDB2B009DD63 +532C74E3BE5EC555A014BCBB6AB31B8286D7712E0E926F8696830672B8214E9B +5D0740C16ADF0AFD47C4938F373575C6CA91E46D88DE24E682DEC44B57EA8AF8 +4E57D45646073250D82C4B50CBBB0B369932618301F3D4186277103B53B3C9E6 +DB42D6B30115F67B9D078220D5752644930643BDF9FACF684EBE13E39B65055E +B1BD054C324962025EC79E1D155936FE32D9F2224353F2A46C3558EF216F6BB2 +A304BAF752BEEC36C4440B556AEFECF454BA7CBBA7537BCB10EBC21047333A89 +8936419D857CD9F59EBA20B0A3D9BA4A0D3395336B4CDA4BA6451B6E4D1370FA +D9BDABB7F271BC1C6C48D9DF1E5A6FAE788F5609DE3C48D47A67097C547D9817 +AD3A7CCE2B771843D69F860DA4059A71494281C0AD8D4BAB3F67BB6739723C04 +AE05F9E35B2B2CB9C7874C114F57A185C8563C0DCCA93F8096384D71A2994748 +A3C7C8B8AF54961A8838AD279441D9A5EB6C1FE26C98BD025F353124DA68A827 +AE2AF8D25CA48031C242AA433EEEBB8ABA4B96821786C38BACB5F58C3D5DA011 +85B385124C2B6534F3CD1866AF92009D93B97F763AA3D16684AA65F029E776DA +3BFB75EDD46D562E6A284DB4F2FDBF7CDE7C1F3772CD7B6FD372842A0E07E3EF +68A98AB9278ADC2D35891543F57ED6DCFE8923368D556F1A8B3E35863112F409 +FBE67FC270328312BAA43A9A372C510717B50AAB01A1E02A9982113E2D7C601C +B0BDA1C0E081E546A97647B74EE5194C57ACD62502B329FED4D966BDEB4028F0 +F082EDD5DFC8387653D620E9E73FDCE3C155347D5929C3A24D6121AEA46BBF3A +B1C8A4793FB7F21C84400912C27D9AB0845537103553BF8F +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: CMTI8 +%!PS-AdobeFont-1.1: CMTI8 1.0 +%%CreationDate: 1991 Aug 18 21:07:42 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.0) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMTI8) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle -14.04 def +/isFixedPitch false def +end readonly def +/FontName /CMTI8 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 0 /.notdef put +readonly def +/FontBBox{-35 -250 1190 750}readonly def +/UniqueID 5000826 def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA0529731C99A784CCBE85B4993B2EEBDE +3B12D472B7CF54651EF21185116A69AB1096ED4BAD2F646635E019B6417CC77B +532F85D811C70D1429A19A5307EF63EB5C5E02C89FC6C20F6D9D89E7D91FE470 +B72BEFDA23F5DF76BE05AF4CE93137A219ED8A04A9D7D6FDF37E6B7FCDE0D90B +986423E5960A5D9FBB4C956556E8DF90CBFAEC476FA36FD9A5C8175C9AF513FE +D919C2DDD26BDC0D99398B9F4D03D6A8F05B47AF95EF28A9C561DBDC98C47CF5 +525003F3DAD7933EB57E7DB1462E9D906F6D8F5BF740206C1EC5F36E00AAFF68 +F3EF6F3A2540E5F9564D1C215BC1E7E69C7D04DA5DB1CF195613C9CBF4BAA360 +84AEF3E10E24877FBE36AD731DC97305BDE6DB1F934909FAF60B8E28561FBC57 +0F5B6225425BFDE8F0C71CD4507B82FF803E9A301397975E38A259DE1E1B4FC0 +06BB1DC2D45B987A2268A77CE8DC025CB0D1B39788BBEE149103950650171C94 +5FED1063050A90BD38605BD9365D1C2AE42A7DA3DDB9A263FE10BD487F63D908 +D4F02758BD9D7BE53E6353A25BEFA29E42B50C1D078A8B3A746EEDB381CCE36C +93FC4BD1A8D1D6ACD0D355E948CFE397B74D243EB51597D251D0BAE6884D70E8 +FEE119462E1939A9783414DF59EEA5FF1529F13869D1FF0A44935C5198CC5DAA +E1FD2A17AEEBF4974052D06734A409E26C457C06700C55896C90BB33E044A737 +46590D9FA242819B9527FD59818D8829D4EB2D26A34CC05A2CC063E66F2DF193 +8E4F9670014BC243180E45B51DDB05AD1E6A7F619EE1CE09CFC1A4F02CB7270E +4482FEDF673EDED38EF3173C475C34BFB3F6623C5E942A7797FEDDD0EF1D54E9 +1D90D7076C0A9687E334907C22F2E7C603388D8D626B0E5A62B7543DCBB575D7 +9A6BE1528EC9BC18570001092524E4FBB02F3B29293BCB4F0EF14A2DD9DB22A5 +BB33455799E8120D2A4862424AA4A382972E2845E042506FC8F6E201D11DD0F2 +09FAD8DC29C3E12B66293ACBFB13FA0F26238981F2CD52B47A8CDE6DF5CDFAAF +3113E1A6366B806EABA9C34E5D41167CD10D7B639021FB4CFDAE28CE72A93F3C +E8929A4BB6D48613A88F926E0EB1BE5F6E29CA5350841244E1718987727B7245 +E7DDE2528073015C64AEE3BF18734A0C48AFF16A354C14E1A6D9D5DC96C06E02 +3A1FE4AF93E8349C3293F62C3466B67D25A9533C6DAA4514EA201B79042CB220 +43B3B60E13200B4F47011F95BA2EF1D6548218DCDBC1B00CCAE375F91EB60E32 +9F1198D74BC3768101AB5F2E7BDEA9FE5C1379341C604D835B50B671793DD7EF +605F60048FC9761FE50647C15C2424EABDC9AF4257F915282EFF1CF447EA3F0B +EE81FB67B04703215DB6AB3E47B7EE06435234C834DF84A3E0F99D753D596305 +85DD514BA3C5ACCD8BF6BC804AEA170A32B2080B694CF7FE994228ECCAD86C4B +CB8B963E84D46ED86B2D43DADB277A79DD100777CB0F2022C8AC9DA77D500C73 +D6E15540121B6D82457096083526C7E2697F776239E02C3E64D25AFBFB58474E +E82672F2FBEA78ED5DCA1BB4FCD627BAAB6AB50232EDBE99D6CC51A287F80DCF +14CC7DE3DCFF47A1DFA130CF7F502193C6C00B1A7A1515FF7374351238158B97 +AA26F0F2773E81CD03F4A398BEFBDCB450F0FA6450FD48B5A69E37B036BE5F85 +0F0B1AAAB2CF3098AEF32B0902398A6A9E1DB5A0C42DD39E3208C4F8BBEC0A98 +35FC84FF5EB2293644F7E6EF28FAF5F6E5205029CCFF7342BC276958EFFD7817 +5D9F367C6FF151B12353BE9DDCF75196F2C8C8C889BB097A3D9D8FF5D77A7184 +D9F3EAC4493E94DC73886AFD7652ADBF562189B0B85FA5AEA4CA44558D70A408 +4A276D6B0BCF6ED2F5E42E97933AEC978D286B3D0A99C6C7AB10AC6D1C36B07D +EA2F47489D4C2A55A6902C665B7321DD5324C6CE172349E5C6561B5F1CBBFD6E +B5FBBB914307020B218D68C45BB2E9A0BE81C9E8D5D71BC7851CD2922656337A +9659E8E0A8F240903FC34DA589EC6D1FE6CF17D238576472C0CD1E0EB21A46B5 +5B9DACB6CA3B094E51386E45C506D55EE3AC95AF333EBD0305084697383F054D +61680900B82CB80D030270CA9C614A373B0B5B26F8465AE581967C6A336D8C44 +21CED60606DF99F05AFC4C37F53D2D97450B78F1211A2682414780DFF7F6AC6E +750071385D6DC87B58D3D13E286F70B11A692F4BF57BC828C6AA98C44EFE13F8 +44535F79F5458B03AAE3ECEBF2EFD4AA83316E839EF7EBADEA22C17FF039FA85 +498379D857AE78AC68CCC7D1EB2FE84D465AA452F43EC1AFEFE568E42F13E0BC +1CDF5C873F8E3952713BD9A472E6FC9CDE8DDD9281EE3554C22A0D591C91D3E4 +0B3162930BB6F0AC229EE1C847EC39BF81DDDE1A0B0EC7BC51A05AE93B3A891A +3FEB85C68C88AADD29FD39F9DB30FB250D41EBB1124ED0069CDC49B3359D8689 +05DCE2A27EFF35751E51E2C4AEA7DC8B2AF546AB58D6BE81DDD38A3A0833AB62 +E54F54ABC2BB67EF06678D0AA3AB0B240FDFD510404D87A1EA75D5005984B7D0 +DE9EE818E8F99BA9FD646FEAB795E5048E0710CEB0CBD8CA39754BCF7957C646 +532525C2B94D55B1AF534778D653BD50DCECF8DFA4CFD08092AA4DD3D8BB43E9 +6F40CE1B0B25287C46AA961061A0AE3714A465E39694B6E62410ECB1F409F939 +51CE57A12C3CB5B4332A3BDEF4C13917982A0A4527440CAD427F1284E6534D68 +201DA7E10B4DC25CCD025DB0D7E0906C59E235CBF747ED10C3300C1BA42BF434 +1A3C9605F0D568CD938B0DEB5C5E8390309BDFA89EFA3E5F226A24910EAB3791 +0361A08FE539B158072E96BC988AB061736F7DD19DEB61DB5738F2B43682C3E7 +12D709F9E149DA4602201AD24F42BBBEDA49118A93A7F26B703AECDE574441EE +DAF7C634669C0D907B18BF4EAE198E9F3DD8F743FDBDBB2FF8C6650F17115FFF +890F0FA7B873022FABADAD05C42B65FE98E870568D2CF828CDFF7C1EEEB5BF4B +5E695EA05518191A5E8D34EB22091935E0816F8B49AFDCC44811D12D3CA85A57 +8C67D67D400ECEBADAABDC5F7D4E1DE4E330FD1A954B925E2A5B1D0CFF2D80D5 +F668367C28480C7EC3359C781279E8928DB03E274855F7001ABCCE243ED7C259 +67D4705EE2211FEF30D8E82F9EA0838B905A9FB986D1DD200524B74EC4B1AF8B +A0216BBCE594588D8C28A527BC85306960D73D85D96B652B88462881EA065E0C +84485D21B22E71768A81037FA08C48EA83AEC7118DA808CC62783E7DFB121A87 +0A8DA5BC6AD5B8C8ABD057D94DCD627E2CF3D6AACC031BCD50FF49C658EABCF1 +E6ED48E7B3A550782F077CCE21EFB7368B0D12EDF21BDA1DCD30D523A8B94729 +1E339B18677721963F0F9FF961CA6B065A881546683125114FB8BFBF996BA299 +9CA4E3F5BD5C0D614E2515BB6AAFD9D16E1F0C0409A524D91DAD55BB9630C810 +B1DF32BC5820AA059559A5095BF09750F21E3AECAD39CDB3277D06B78E2A0A08 +533EF557F6815F1C361B2417D27F7D9EFA5C2DB0B2655938C8E9E1E36C411E70 +7D57FD9EAFA6FD2C4D3A40D2F35C176E0522C6D0969A2DB598553D9C0A1940D2 +F3D8241AB8DB63E8426BF19B093D99DECC9E2633FE5C77EE55951036A7E19CC6 +27A2DDA74A95F870306ACF9945AA4FE9E10F1FBC43830B2D817016290E50F988 +7283F8E409B5BD2048CF8E8465DC3EC57EE47A7BB678093183B453FC60A8CD67 +6CE6E21A859B1EEACCB9E0A3DC1AEF41C74FE0E0245587A5E1F107BBA11C2B86 +91690DB7158BDAA3F2D82A820A36B3684CC11CCC4802C5F8135FAABDDD50091E +97AE58FE38F088A7348D08F1B9A14BFEB8E97D81066D5C244DBDD9ABECECE72C +6A91E31A815E2B22652F7813BDF07DEF9CBD0E8BB6E7999511289A0CE3CCF502 +14D9A77E29615479657F8BE9AA3EBAC9DD08A04EE7A160A1C528BD6C2CE79E67 +8913543117C32977841E710DCE7C0DAE68888C8EBEBD9883B9F9AF86B1C5790E +E520337D14F18FB14686356E4F1248B3E884634480E683DDDFE4B0221AF0825C +AF3B27DC3156F1E0B5E8D75063A10A81A78698BE4E1A4C2F49D2E530AF1ED966 +8EF252D3CBEACAD0394B9546D51768C195A23A041EC1E3F21AC91C498515EDCF +5A9977F9D72ADBBED88D5E3FFEC64A087FAB9DBDB268608247B977E435E4CE34 +F0C543383384541FF88669E53446065864769D5D3957C64011D7C93FC147B093 +9FA961A60BDDF97F1A3BF53CC18D306DFCFE04DF980F026428E84140542171F0 +F706A48EDEC416DC58F006761686EBA99598962F6E1BEC8E78AEA474CF0AD890 +A72B9906BC891564ECD5440FE6047DB452171AF35C33C24D8A23E41C112D93B5 +F1B422386DFBE80ABBF7BD43F152F0451B7B0DB2D71B75575CB5256C94F40AE2 +E8DB4CABF990502BD74BE028E14C1972E666932E04E79B743B3357737F31D08B +EB9755DF6C89C185A7F13DA21A6E6E526A9089B11C6BB1F5247E31685B028F52 +555F98CAB929558BA7BCDEAE76F93E7B00B214543EBEA0FA375B624B4553C133 +16D6E2B846FAA862F9DCBD8FCB2A59EADE462BC8FDF8DC56B888C6C5ECF9BBB2 +4197F4DDA197A9405F639643A4334545A8004F05963A05747B4905A319411086 +9A691FF410F400E7E569CF8EA99102A57A569C223B8CF8A4B285ADAEDB238FB4 +5FCCC3A9EB063BFB1F9263D8B31D8AE580B6B8F1F311388B509E224F7E600A98 +DE394C80D1CC6391D45160FC7CE92B0CD7E74B0844DD0F3562B14833A563FE6A +E5942191AA6BAE176278E9EC30533FE310F0694745C024929A65E4C411DAAF0C +F3539203284EDADDC1E27FF0EC2FED41AAD7A3CDCBF2B4177647CAEFA2FDD380 +F6483BB02F87E1B66F1F5F8B23DE0ED2EAF4C540A5D392D6B49B0BDF15DEDC09 +13DF0F14E0E49389A82445230CB58704CDF21591EC4E721119F4786523A16BA1 +95F9288C0704DE543FD38496FC59B15143CA8BA06584BE7E6C9F09DD4F207C09 +F2086D39D48B652E45BD2FC4E2C4BC1FE534CC1109E177C7494E0914CD0E45BB +C8461B6A6FEAC2A2742CB9B3441DB0340DA91F6C6BA5EF79D6363F68A52F3300 +7CF46E9F6D5A7E33762852D4BA13A1825AFCF10B00CF175EB0059D272DBAB911 +30D027A1C1AAF745E0D69B71FB455C1363AF42B7A00B142D9C8ADDF4CE9801AF +71C666C1A6773BF48F35076FED27423E1CD18139F3D8B0A3E1AE44C55382FC66 +942021B7C1E3451D679218810F816DA083A644A378D6ADEECCC212169B96FEBF +744AD8C249E092F87CE696C926ED9E61B728674F39DFB645FF5AA6D742B73CF3 +37536ABDB80094DD7CB7D0FC30B6370F8CF9B145F65F4220FA592AF67383108C +3739E4FD2E0878AF00DDEE092CCD14B1E749941F342701F07097A4DF0EE5AB3A +B3D9BFE0B1060ADAFA7D4E3392218E5A7AEFE4CC01827ACD6903C2412270367B +FC75D8C1E290C5489BF2ADE1B3FA6E11B5BCF37FFBC42D0B3E7A7435D6AA7E8F +62B96A05C15CF7025EE1B0D9CC2580A11A1F187DE686E6F8ABBE658382B212CC +D9BAB099DD7ED5EC269FF8CAC8C16E101B7AFE3BF9854884FF0746A1B0423FFC +468342D5D31CEA0EDD7EB5FEEDDB129B7C55DDA20291A18592079BD75D8DCFA1 +2182EB1AB128A319FFB027164B5F9505754A4B1C8DFAD7FF0C892D97FEA8F506 +C65585142BB9F986886117C7CFC66EE962D1609DC1DD36930A6525D1ED03AA93 +282605FCC5C7C651D657EB8ED0A55EE348994C18FF6AEF1D8D669273B6EE450E +709E6F60358F225E209AD70E96778E8375F41BCEFF74D46D595C0819C85E60DC +DB702C6AB7E90FEA2EB9EC299FDA15BE8A807EEBEB1BAFD628BB94B1E28EBD60 +B6DAFF828C2C80821C8ECE963DC90E750EB00E3418BD0858AC6595012D32C308 +DDF9F30191779BFD58D93AF0DFEDE67AD6902FCF8C953CF52188311EDD0D005C +BD31ADEE0825CE1C25725EA2D6C9E5D8D9034C +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont %%BeginFont: CMBX8 %!PS-AdobeFont-1.1: CMBX8 1.0 %%CreationDate: 1991 Aug 20 16:36:07 @@ -758,34 +900,10 @@ /FontMatrix [0.001 0 0 0.001 0 0] readonly def /Encoding 256 array 0 1 255 {1 index exch /.notdef put} for -dup 12 /fi put -dup 18 /grave put -dup 19 /acute put -dup 39 /quoteright put -dup 45 /hyphen put -dup 97 /a put -dup 98 /b put -dup 99 /c put -dup 100 /d put -dup 101 /e put -dup 102 /f put -dup 103 /g put -dup 104 /h put -dup 105 /i put -dup 108 /l put -dup 109 /m put -dup 110 /n put -dup 111 /o put -dup 112 /p put -dup 113 /q put -dup 114 /r put -dup 115 /s put -dup 116 /t put -dup 117 /u put -dup 118 /v put -dup 120 /x put +dup 0 /.notdef put readonly def /FontBBox{-59 -250 1235 750}readonly def +/UniqueID 5000766 def currentdict end currentfile eexec D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 @@ -961,82 +1079,10 @@ /FontMatrix [0.001 0 0 0.001 0 0] readonly def /Encoding 256 array 0 1 255 {1 index exch /.notdef put} for -dup 33 /exclam put -dup 34 /quotedbl put -dup 35 /numbersign put -dup 36 /dollar put -dup 37 /percent put -dup 39 /quoteright put -dup 40 /parenleft put -dup 41 /parenright put -dup 42 /asterisk put -dup 43 /plus put -dup 44 /comma put -dup 45 /hyphen put -dup 46 /period put -dup 47 /slash put -dup 48 /zero put -dup 49 /one put -dup 50 /two put -dup 51 /three put -dup 52 /four put -dup 53 /five put -dup 58 /colon put -dup 60 /less put -dup 62 /greater put -dup 63 /question put -dup 64 /at put -dup 65 /A put -dup 66 /B put -dup 67 /C put -dup 68 /D put -dup 69 /E put -dup 70 /F put -dup 71 /G put -dup 76 /L put -dup 77 /M put -dup 80 /P put -dup 82 /R put -dup 83 /S put -dup 84 /T put -dup 87 /W put -dup 91 /bracketleft put -dup 92 /backslash put -dup 93 /bracketright put -dup 94 /asciicircum put -dup 95 /underscore put -dup 96 /quoteleft put -dup 97 /a put -dup 98 /b put -dup 99 /c put -dup 100 /d put -dup 101 /e put -dup 102 /f put -dup 103 /g put -dup 104 /h put -dup 105 /i put -dup 106 /j put -dup 107 /k put -dup 108 /l put -dup 109 /m put -dup 110 /n put -dup 111 /o put -dup 112 /p put -dup 113 /q put -dup 114 /r put -dup 115 /s put -dup 116 /t put -dup 117 /u put -dup 118 /v put -dup 119 /w put -dup 120 /x put -dup 121 /y put -dup 122 /z put -dup 123 /braceleft put -dup 124 /bar put -dup 125 /braceright put +dup 0 /.notdef put readonly def /FontBBox{-5 -232 545 699}readonly def +/UniqueID 5000830 def currentdict end currentfile eexec D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 @@ -1435,54 +1481,10 @@ /FontMatrix [0.001 0 0 0.001 0 0] readonly def /Encoding 256 array 0 1 255 {1 index exch /.notdef put} for -dup 12 /fi put -dup 18 /grave put -dup 19 /acute put -dup 39 /quoteright put -dup 45 /hyphen put -dup 65 /A put -dup 67 /C put -dup 68 /D put -dup 69 /E put -dup 70 /F put -dup 71 /G put -dup 73 /I put -dup 74 /J put -dup 76 /L put -dup 77 /M put -dup 78 /N put -dup 79 /O put -dup 80 /P put -dup 81 /Q put -dup 82 /R put -dup 83 /S put -dup 84 /T put -dup 85 /U put -dup 86 /V put -dup 94 /circumflex put -dup 97 /a put -dup 98 /b put -dup 99 /c put -dup 100 /d put -dup 101 /e put -dup 102 /f put -dup 103 /g put -dup 104 /h put -dup 105 /i put -dup 108 /l put -dup 109 /m put -dup 110 /n put -dup 111 /o put -dup 112 /p put -dup 113 /q put -dup 114 /r put -dup 115 /s put -dup 116 /t put -dup 117 /u put -dup 118 /v put -dup 120 /x put +dup 0 /.notdef put readonly def /FontBBox{-301 -250 1164 946}readonly def +/UniqueID 5000768 def currentdict end currentfile eexec D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 @@ -1792,69 +1794,10 @@ /FontMatrix [0.001 0 0 0.001 0 0] readonly def /Encoding 256 array 0 1 255 {1 index exch /.notdef put} for -dup 11 /ff put -dup 12 /fi put -dup 14 /ffi put -dup 16 /dotlessi put -dup 18 /grave put -dup 19 /acute put -dup 27 /oe put -dup 34 /quotedblright put -dup 39 /quoteright put -dup 40 /parenleft put -dup 41 /parenright put -dup 44 /comma put -dup 45 /hyphen put -dup 46 /period put -dup 49 /one put -dup 50 /two put -dup 57 /nine put -dup 58 /colon put -dup 65 /A put -dup 67 /C put -dup 68 /D put -dup 69 /E put -dup 70 /F put -dup 71 /G put -dup 73 /I put -dup 76 /L put -dup 78 /N put -dup 80 /P put -dup 82 /R put -dup 83 /S put -dup 85 /U put -dup 88 /X put -dup 92 /quotedblleft put -dup 94 /circumflex put -dup 97 /a put -dup 98 /b put -dup 99 /c put -dup 100 /d put -dup 101 /e put -dup 102 /f put -dup 103 /g put -dup 104 /h put -dup 105 /i put -dup 106 /j put -dup 107 /k put -dup 108 /l put -dup 109 /m put -dup 110 /n put -dup 111 /o put -dup 112 /p put -dup 113 /q put -dup 114 /r put -dup 115 /s put -dup 116 /t put -dup 117 /u put -dup 118 /v put -dup 119 /w put -dup 120 /x put -dup 121 /y put -dup 122 /z put -dup 123 /endash put +dup 0 /.notdef put readonly def /FontBBox{-36 -250 1070 750}readonly def +/UniqueID 5000791 def currentdict end currentfile eexec D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891 @@ -2187,37 +2130,42 @@ 0000000000000000000000000000000000000000000000000000000000000000 cleartomark %%EndFont -TeXDict begin 55387786 39139632 1000 600 600 (fr-refcard.dvi) -@start /Fa 197[20 58[{}1 66.4176 /CMMI8 rf /Fb 134[35 -3[38 24 29 30 1[36 36 40 58 18 2[22 1[33 1[33 36 33 33 -36 51[26 45[{}18 66.4176 /CMTI8 rf /Fc 242[61 13[{}1 -49.8132 /CMSY6 rf /Fd 133[27 32 1[43 32 34 24 24 24 32 +TeXDict begin 52099146 40258431 1000 600 600 (fr-refcard.dvi) +@start /Fa 242[61 13[{ TeXbbad153fEncoding ReEncodeFont }1 +49.8132 /CMSY6 rf /Fb 133[27 32 1[43 32 34 24 24 24 32 34 30 34 50 18 32 1[18 34 30 19 27 34 27 34 30 10[45 45 1[34 2[41 1[45 54 2[31 22 1[47 39 41 1[43 42 45 9[30 -30 30 1[30 30 30 30 1[18 21 18 4[18 14[27 4[30 30 18[{}52 -49.8132 /CMR6 rf /Fe 135[43 1[43 45 32 32 34 43 45 41 +30 30 1[30 30 30 30 1[18 21 18 4[18 14[27 4[30 30 18[{ + TeXf7b6d320Encoding ReEncodeFont }52 49.8132 /CMR6 rf +/Fc 197[20 58[{ TeXaae443f0Encoding ReEncodeFont }1 66.4176 +/CMMI8 rf /Fd 134[35 3[38 24 29 30 1[36 36 40 58 18 2[22 +1[33 1[33 36 33 33 36 51[26 45[{ TeX74afc74cEncoding ReEncodeFont }18 +66.4176 /CMTI8 rf /Fe 135[43 1[43 45 32 32 34 43 45 41 45 68 23 2[23 45 41 25 37 45 36 45 40 51[27 5[23 19[41 -41 5[45 12[{}26 66.4176 /CMBX8 rf /Ff 130[35 35 35 35 +41 5[45 12[{ TeXf7b6d320Encoding ReEncodeFont }26 66.4176 +/CMBX8 rf /Ff 130[35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 -35 35 35 35 35 35 35 35 35 35 35 35 35 3[35 2[35 35 35 -1[35 2[35 35 4[35 35 35 35 35 35 35 35 35 35 1[35 1[35 -4[35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 1[35 35 -35 35 35 33[{}74 66.4176 /CMTT8 rf /Fg 135[60 1[60 64 -45 45 47 60 64 57 64 95 32 2[32 64 57 35 53 64 51 64 -56 2[57 7[87 1[80 64 86 86 78 86 1[109 69 1[59 43 2[72 -75 88 83 1[87 19[38 5[32 19[57 57 5[64 12[{}43 99.6264 +35 35 35 35 35 3[35 2[35 35 35 1[35 2[35 35 4[35 35 35 +35 35 35 35 35 35 35 1[35 1[35 4[35 35 35 35 35 35 35 +35 35 35 35 35 35 35 35 1[35 35 35 35 35 33[{ + TeX09fbbfacEncoding ReEncodeFont }74 66.4176 /CMTT8 +rf /Fg 135[60 1[60 64 45 45 47 60 64 57 64 95 32 2[32 +64 57 35 53 64 51 64 56 2[57 7[87 1[80 64 86 86 78 86 +1[109 69 1[59 43 2[72 75 88 83 1[87 19[38 5[32 19[57 +57 5[64 12[{ TeXf7b6d320Encoding ReEncodeFont }43 99.6264 /CMBX10 rf /Fh 132[35 31 37 37 51 37 39 27 28 28 37 39 35 39 59 20 37 22 20 39 35 22 31 39 31 39 35 2[35 1[35 3[53 2[53 1[39 52 1[48 1[53 1[44 2[25 1[55 46 48 54 51 1[53 6[20 35 6[35 35 2[20 24 20 2[27 27 20 4[35 6[55 -7[35 35 1[20 1[59 1[39 41 11[{}61 66.4176 /CMR8 rf /Fi -139[53 54 57 3[76 115 6[42 63 76 61 1[67 11[106 6[108 -6[108 1[90 1[99 47[69 19[{}16 119.552 /CMBX10 rf end +7[35 35 1[20 1[59 1[39 41 11[{ TeXf7b6d320Encoding ReEncodeFont }61 +66.4176 /CMR8 rf /Fi 139[53 54 57 3[76 115 6[42 63 76 +61 1[67 11[106 6[108 6[108 1[90 1[99 47[69 19[{ + TeXf7b6d320Encoding ReEncodeFont }16 119.552 /CMBX10 +rf end %%EndProlog %%BeginSetup %%Feature: *Resolution 600dpi TeXDict begin -%%PaperSize: A4 @landscape end %%EndSetup %%Page: 1 1 @@ -2265,15 +2213,16 @@ y Fe(a)n(v)n(orter)21 b Fh(une)k(commande)f(partiellemen)n(t)h(tap)n (\023)-33 b(ee)-379 3571 y(ou)24 b(ex)n(\023)-33 b(ecut)n(\023)g(ee) 1084 b Ff(C-g)-450 3678 y Fe(r)n(\023)-39 b(ecup)n(\023)g(erer)24 -b Fh(les)f(\014c)n(hier)h(p)r(erdus)g(par)f(un)h(crash)g(du)-379 -3784 y(syst)n(\022)-33 b(eme)1109 b Ff(M-x)36 b(recover-session)-450 -3890 y Fe(ann)n(uler)23 b Fh(une)h(mo)r(di\014cation)h(non)f(souhait)n -(\023)-33 b(ee)170 b Ff(C-x)36 b(u,)g(C-_)g Fh(ou)g Ff(C-/)-450 -3996 y Fh(restaurer)24 b(un)f(tamp)r(on)i(a)n(v)n(ec)g(son)f(con)n(ten) -n(u)i(initial)35 b Ff(M-x)h(revert-buffer)-450 4103 y -Fh(r)n(\023)-33 b(ea\016c)n(her)24 b(un)e(\023)-33 b(ecran)24 -b(p)r(erturb)n(\023)-33 b(e)653 b Ff(C-l)1746 -364 y -Fg(Rec)m(herc)m(he)36 b(incr)n(\023)-55 b(emen)m(tale)1746 +b Fh(les)f(\014c)n(hier)h(p)r(erdus)g(par)f(un)-379 3784 +y(crash)g(du)h(syst)n(\022)-33 b(eme)669 b Ff(M-x)36 +b(recover-session)-450 3890 y Fe(ann)n(uler)23 b Fh(une)h(mo)r +(di\014cation)h(non)f(souhait)n(\023)-33 b(ee)16 b Ff(C-x)36 +b(u,)g(C-_)g Fh(ou)g Ff(C-/)-450 3996 y Fh(restaurer)24 +b(un)f(tamp)r(on)i(a)n(v)n(ec)g(son)f(con)n(ten)n(u)-379 +4103 y(initial)1015 b Ff(M-x)36 b(revert-buffer)-450 +4209 y Fh(r)n(\023)-33 b(ea\016c)n(her)24 b(un)e(\023)-33 +b(ecran)24 b(p)r(erturb)n(\023)-33 b(e)653 b Ff(C-l)1746 +-364 y Fg(Rec)m(herc)m(he)36 b(incr)n(\023)-55 b(emen)m(tale)1746 -201 y Fh(rec)n(herc)n(her)24 b(v)n(ers)g(l'a)n(v)l(an)n(t)823 b Ff(C-s)1746 -95 y Fh(rec)n(herc)n(her)24 b(v)n(ers)g(l'arri)n(\022) -33 b(ere)787 b Ff(C-r)1746 12 y Fh(rec)n(herc)n(her)24 @@ -2295,59 +2244,56 @@ 1064 y(quelconque.)67 b(Si)34 b(Emacs)h(est)h(encore)g(en)f(train)g(de) g(c)n(herc)n(her,)j Ff(C-g)1746 1128 y Fh(n'ann)n(ule)24 b(que)h(ce)f(qui)f(n'a)h(pas)e(\023)-33 b(et)n(\023)g(e)25 -b(fait.)1855 1367 y Fd(c)1838 1369 y Fc(\015)20 b Fd(2007)j(F)-5 -b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)27 -b(P)n(ermissions)21 b(au)g(dos.)27 b(v2.3)1746 1569 y -Fg(D)n(\023)-55 b(eplacemen)m(ts)1746 1727 y Fe(en)n(tit)n(\023)-39 -b(e)26 b(sur)i(laquelle)e(se)h(d)n(\023)-39 b(eplacer)210 -b(en)28 b(arri)n(\022)-39 b(ere)69 b(en)27 b(a)n(v)-5 -b(an)n(t)1746 1790 y Fh(caract)n(\022)-33 b(ere)992 b -Ff(C-b)313 b(C-f)1746 1854 y Fh(mot)1148 b Ff(M-b)313 -b(M-f)1746 1918 y Fh(ligne)1124 b Ff(C-p)313 b(C-n)1746 -1989 y Fh(aller)23 b(au)h(d)n(\023)-33 b(ebut)25 b(\(ou)f(\022)-35 -b(a)24 b(la)g(\014n\))g(de)g(la)f(ligne)105 b Ff(C-a)313 -b(C-e)1746 2053 y Fh(phrase)1069 b Ff(M-a)313 b(M-e)1746 -2117 y Fh(paragraphe)925 b Ff(M-{)313 b(M-})1746 2181 -y Fh(page)1129 b Ff(C-x)36 b([)242 b(C-x)36 b(])1746 -2244 y Fh(s-expression)901 b Ff(C-M-b)243 b(C-M-f)1746 -2308 y Fh(fonction)1021 b Ff(C-M-a)243 b(C-M-e)1746 2372 +b(fait.)1746 1331 y Fg(D)n(\023)-55 b(eplacemen)m(ts)1746 +1489 y Fe(en)n(tit)n(\023)-39 b(e)26 b(sur)i(laquelle)e(se)h(d)n(\023) +-39 b(eplacer)210 b(en)28 b(arri)n(\022)-39 b(ere)69 +b(en)27 b(a)n(v)-5 b(an)n(t)1746 1553 y Fh(caract)n(\022)-33 +b(ere)992 b Ff(C-b)313 b(C-f)1746 1617 y Fh(mot)1148 +b Ff(M-b)313 b(M-f)1746 1681 y Fh(ligne)1124 b Ff(C-p)313 +b(C-n)1746 1752 y Fh(aller)23 b(au)h(d)n(\023)-33 b(ebut)25 +b(\(ou)f(\022)-35 b(a)24 b(la)g(\014n\))g(de)g(la)f(ligne)105 +b Ff(C-a)313 b(C-e)1746 1816 y Fh(phrase)1069 b Ff(M-a)313 +b(M-e)1746 1879 y Fh(paragraphe)925 b Ff(M-{)313 b(M-})1746 +1943 y Fh(page)1129 b Ff(C-x)36 b([)242 b(C-x)36 b(])1746 +2007 y Fh(s-expression)901 b Ff(C-M-b)243 b(C-M-f)1746 +2071 y Fh(fonction)1021 b Ff(C-M-a)243 b(C-M-e)1746 2134 y Fh(aller)23 b(au)h(d)n(\023)-33 b(ebut)25 b(\(ou)f(\022)-35 b(a)24 b(la)g(\014n\))g(du)g(tamp)r(on)84 b Ff(M-<)313 -b(M->)1746 2494 y Fh(passer)24 b(\022)-35 b(a)23 b(l')n(\023)-33 -b(ecran)24 b(suiv)l(an)n(t)793 b Ff(C-v)1746 2600 y Fh(passer)24 +b(M->)1746 2257 y Fh(passer)24 b(\022)-35 b(a)23 b(l')n(\023)-33 +b(ecran)24 b(suiv)l(an)n(t)793 b Ff(C-v)1746 2363 y Fh(passer)24 b(\022)-35 b(a)23 b(l')n(\023)-33 b(ecran)24 b(pr)n(\023)-33 -b(ec)n(\023)g(eden)n(t)718 b Ff(M-v)1746 2707 y Fh(d)n(\023)-33 +b(ec)n(\023)g(eden)n(t)718 b Ff(M-v)1746 2469 y Fh(d)n(\023)-33 b(e\014ler)24 b(l')n(\023)-33 b(ecran)23 b(v)n(ers)h(la)f(droite)668 -b Ff(C-x)36 b(<)1746 2813 y Fh(d)n(\023)-33 b(e\014ler)24 +b Ff(C-x)36 b(<)1746 2576 y Fh(d)n(\023)-33 b(e\014ler)24 b(l')n(\023)-33 b(ecran)23 b(v)n(ers)h(la)f(gauc)n(he)640 -b Ff(C-x)36 b(>)1746 2919 y Fh(placer)24 b(la)f(ligne)h(couran)n(te)h +b Ff(C-x)36 b(>)1746 2682 y Fh(placer)24 b(la)f(ligne)h(couran)n(te)h (au)f(cen)n(tre)h(de)f(l')n(\023)-33 b(ecran)162 b Ff(C-u)36 -b(C-l)1746 3139 y Fg(D)n(\023)-55 b(etruire)36 b(et)i(supprimer)1746 -3296 y Fe(en)n(tit)n(\023)-39 b(e)26 b(\022)-40 b(a)26 +b(C-l)1746 2901 y Fg(D)n(\023)-55 b(etruire)36 b(et)i(supprimer)1746 +3059 y Fe(en)n(tit)n(\023)-39 b(e)26 b(\022)-40 b(a)26 b(supprimer)648 b(en)28 b(arri)n(\022)-39 b(ere)69 b(en)28 -b(a)n(v)-5 b(an)n(t)1746 3360 y Fh(caract)n(\022)-33 +b(a)n(v)-5 b(an)n(t)1746 3123 y Fh(caract)n(\022)-33 b(ere)25 b(\(suppression,)f(pas)g(destruction\))84 b -Ff(DEL)313 b(C-d)1746 3424 y Fh(mot)1187 b Ff(M-DEL)243 -b(M-d)1746 3488 y Fh(ligne)24 b(\(jusqu'\022)-35 b(a)23 -b(la)h(\014n\))685 b Ff(M-0)37 b(C-k)171 b(C-k)1746 3552 -y Fh(phrase)1108 b Ff(C-x)37 b(DEL)171 b(M-k)1746 3615 +Ff(DEL)313 b(C-d)1746 3187 y Fh(mot)1187 b Ff(M-DEL)243 +b(M-d)1746 3250 y Fh(ligne)24 b(\(jusqu'\022)-35 b(a)23 +b(la)h(\014n\))685 b Ff(M-0)37 b(C-k)171 b(C-k)1746 3314 +y Fh(phrase)1108 b Ff(C-x)37 b(DEL)171 b(M-k)1746 3378 y Fh(s-expression)940 b Ff(M--)37 b(C-M-k)101 b(C-M-k)1746 -3734 y Fh(d)n(\023)-33 b(etruire)24 b(une)g Fe(r)n(\023)-39 -b(egion)890 b Ff(C-w)1746 3840 y Fh(copier)24 b(une)g(r)n(\023)-33 +3497 y Fh(d)n(\023)-33 b(etruire)24 b(une)g Fe(r)n(\023)-39 +b(egion)890 b Ff(C-w)1746 3603 y Fh(copier)24 b(une)g(r)n(\023)-33 b(egion)24 b(dans)g(le)f(kill)g(ring)477 b Ff(M-w)1746 -3947 y Fh(d)n(\023)-33 b(etruire)24 b(jusqu'\022)-35 -b(a)23 b(l'o)r(ccurrence)h(suiv)l(an)n(te)h(de)f Fb(c)l(ar)147 -b Ff(M-z)36 b Fb(c)l(ar)1746 4081 y Fh(r)n(\023)-33 b(ecup)n(\023)g +3709 y Fh(d)n(\023)-33 b(etruire)24 b(jusqu'\022)-35 +b(a)23 b(l'o)r(ccurrence)h(suiv)l(an)n(te)h(de)f Fd(c)l(ar)147 +b Ff(M-z)36 b Fd(c)l(ar)1746 3844 y Fh(r)n(\023)-33 b(ecup)n(\023)g (erer)24 b(la)f(derni)n(\022)-33 b(ere)24 b(c)n(hose)h(d)n(\023)-33 -b(etruite)423 b Ff(C-y)1746 4188 y Fh(remplacer)24 b(la)f(derni)n(\022) +b(etruite)423 b Ff(C-y)1746 3950 y Fh(remplacer)24 b(la)f(derni)n(\022) -33 b(ere)24 b(r)n(\023)-33 b(ecup)n(\023)g(eration)24 -b(par)g(ce)g(qui)1817 4294 y(a)d(\023)-33 b(et)n(\023)g(e)25 +b(par)g(ce)g(qui)1817 4057 y(a)d(\023)-33 b(et)n(\023)g(e)25 b(d)n(\023)-33 b(etruit)24 b(a)n(v)l(an)n(t)868 b Ff(M-y)3942 -364 y Fg(Marquer)3942 -182 y Fh(placer)24 b(la)f(marque)h(ici)901 b Ff(C-@)36 b Fh(ou)f Ff(C-SPC)3940 -75 y Fh(\023)-33 b(ec)n(hanger)25 b(le)f(p)r(oin)n(t)g(et)g(la)g(marque)570 b Ff(C-x)36 b(C-x)3942 60 y Fh(placer)24 b(la)f(marque)h -Fb(ar)l(g)30 b Fe(mots)23 b Fh(plus)g(loin)388 b Ff(M-@)3942 +Fd(ar)l(g)30 b Fe(mots)23 b Fh(plus)g(loin)388 b Ff(M-@)3942 166 y Fh(marquer)23 b(le)h Fe(paragraphe)755 b Ff(M-h)3942 272 y Fh(marquer)23 b(la)h Fe(page)989 b Ff(C-x)36 b(C-p)3942 378 y Fh(marquer)23 b(la)h Fe(s-expression)724 b Ff(C-M-@)3942 @@ -2356,54 +2302,54 @@ Ff(C-x)36 b(h)3942 810 y Fg(Remplacemen)m(t)g(in)m(teractif)3942 993 y Fh(remplacer)24 b(in)n(teractiv)n(emen)n(t)h(une)g(c)n(ha)-8 b(^)-27 b(\020ne)24 b(de)g(texte)86 b Ff(M-\045)3942 -1099 y Fh(en)24 b(utilisan)n(t)g(les)f(expressions)h(rationnelles)227 -b Ff(M-x)36 b(query-replace-regexp)3942 1209 y Fh(Les)22 -b(r)n(\023)-33 b(ep)r(onses)23 b(admises)f(dans)h(le)f(mo)r(de)h(de)g -(remplacemen)n(t)h(in)n(teractif)3942 1273 y(son)n(t)g(:)3942 -1379 y Fe(remplacer)f Fh(celle-l\022)-35 b(a,)22 b(passer)i(\022)-35 -b(a)24 b(la)f(suiv)l(an)n(te)280 b Ff(SPC)3942 1485 y -Fh(remplacer)24 b(celle-l\022)-35 b(a,)22 b(rester)i(l\022)-35 -b(a)679 b Ff(,)3942 1591 y Fe(passer)23 b Fh(\022)-35 -b(a)24 b(la)g(suiv)l(an)n(te)g(sans)g(remplacer)400 b -Ff(DEL)3942 1698 y Fh(remplacer)24 b(toutes)h(les)e(corresp)r(ondances) -4013 1804 y(suiv)l(an)n(tes)1162 b Ff(!)3942 1910 y Fe(rev)n(enir)23 -b Fh(\022)-35 b(a)24 b(la)f(corresp)r(ondance)i(pr)n(\023)-33 -b(ec)n(\023)g(eden)n(te)279 b Ff(^)3942 2016 y Fe(sortir)22 -b Fh(du)i(remplacemen)n(t)h(in)n(teractif)460 b Ff(RET)3942 -2123 y Fh(en)n(trer)24 b(dans)g(l')n(\023)-33 b(edition)23 -b(r)n(\023)-33 b(ecursiv)n(e)24 b(\()p Ff(C-M-c)h Fh(p)r(our)4013 -2229 y(sortir\))1247 b Ff(C-r)3942 2448 y Fg(F)-10 b(en)n(^)-55 -b(etres)37 b(m)m(ultiples)3942 2606 y Fh(Lorsqu'il)25 -b(y)i(a)f(deux)i(commandes,)g(la)e(seconde)i(est)f(une)g(commande)3942 -2670 y(iden)n(tique)e(\022)-35 b(a)24 b(la)f(premi)n(\022)-33 -b(ere)23 b(p)r(our)h(un)g(cadre)g(au)g(lieu)f(d'une)i(fen)n(^)-33 -b(etre.)3942 2762 y(supprimer)23 b(toutes)i(les)e(autres)h(fen)n(^)-33 -b(etres)117 b Ff(C-x)36 b(1)212 b(C-x)37 b(5)e(1)3942 -2826 y Fh(diviser)23 b(la)g(fen)n(^)-33 b(etre)25 b(horizon)n(talemen)n -(t)184 b Ff(C-x)36 b(2)212 b(C-x)37 b(5)e(2)3942 2890 -y Fh(supprimer)23 b(cette)i(fen)n(^)-33 b(etre)499 b -Ff(C-x)36 b(0)212 b(C-x)37 b(5)e(0)3942 3008 y Fh(diviser)23 -b(la)g(fen)n(^)-33 b(etre)25 b(v)n(erticalemen)n(t)561 -b Ff(C-x)36 b(3)3942 3143 y Fh(faire)23 b(d)n(\023)-33 +1099 y Fh(en)24 b(utilisan)n(t)g(les)f(expressions)4013 +1205 y(rationnelles)594 b Ff(M-x)36 b(query-replace-regexp)3942 +1315 y Fh(Les)22 b(r)n(\023)-33 b(ep)r(onses)23 b(admises)f(dans)h(le)f +(mo)r(de)h(de)g(remplacemen)n(t)h(in)n(teractif)3942 +1379 y(son)n(t)g(:)3942 1485 y Fe(remplacer)f Fh(celle-l\022)-35 +b(a,)22 b(passer)i(\022)-35 b(a)24 b(la)f(suiv)l(an)n(te)280 +b Ff(SPC)3942 1591 y Fh(remplacer)24 b(celle-l\022)-35 +b(a,)22 b(rester)i(l\022)-35 b(a)679 b Ff(,)3942 1698 +y Fe(passer)23 b Fh(\022)-35 b(a)24 b(la)g(suiv)l(an)n(te)g(sans)g +(remplacer)400 b Ff(DEL)3942 1804 y Fh(remplacer)24 b(toutes)h(les)e +(corresp)r(ondances)4013 1910 y(suiv)l(an)n(tes)1162 +b Ff(!)3942 2016 y Fe(rev)n(enir)23 b Fh(\022)-35 b(a)24 +b(la)f(corresp)r(ondance)i(pr)n(\023)-33 b(ec)n(\023)g(eden)n(te)279 +b Ff(^)3942 2123 y Fe(sortir)22 b Fh(du)i(remplacemen)n(t)h(in)n +(teractif)460 b Ff(RET)3942 2229 y Fh(en)n(trer)24 b(dans)g(l')n(\023) +-33 b(edition)23 b(r)n(\023)-33 b(ecursiv)n(e)24 b(\()p +Ff(C-M-c)h Fh(p)r(our)4013 2335 y(sortir\))1247 b Ff(C-r)3942 +2554 y Fg(F)-10 b(en)n(^)-55 b(etres)37 b(m)m(ultiples)3942 +2712 y Fh(Lorsqu'il)25 b(y)i(a)f(deux)i(commandes,)g(la)e(seconde)i +(est)f(une)g(commande)3942 2776 y(iden)n(tique)e(\022)-35 +b(a)24 b(la)f(premi)n(\022)-33 b(ere)23 b(p)r(our)h(un)g(cadre)g(au)g +(lieu)f(d'une)i(fen)n(^)-33 b(etre.)3942 2868 y(supprimer)23 +b(toutes)i(les)e(autres)h(fen)n(^)-33 b(etres)117 b Ff(C-x)36 +b(1)212 b(C-x)37 b(5)e(1)3942 2932 y Fh(diviser)23 b(la)g(fen)n(^)-33 +b(etre)25 b(horizon)n(talemen)n(t)184 b Ff(C-x)36 b(2)212 +b(C-x)37 b(5)e(2)3942 2996 y Fh(supprimer)23 b(cette)i(fen)n(^)-33 +b(etre)499 b Ff(C-x)36 b(0)212 b(C-x)37 b(5)e(0)3942 +3115 y Fh(diviser)23 b(la)g(fen)n(^)-33 b(etre)25 b(v)n(erticalemen)n +(t)561 b Ff(C-x)36 b(3)3942 3250 y Fh(faire)23 b(d)n(\023)-33 b(e\014ler)24 b(l'autre)f(fen)n(^)-33 b(etre)708 b Ff(C-M-v)3942 -3254 y Fh(placer)24 b(le)f(curseur)h(dans)g(une)g(autre)h(fen)n(^)-33 -b(etre)519 b Ff(C-x)36 b(o)212 b(C-x)36 b(5)f(o)3942 -3318 y Fh(s)n(\023)-33 b(electionner)25 b(le)e(tamp)r(on)i(dans)f -(l'autre)f(fen)n(^)-33 b(etre)424 b Ff(C-x)36 b(4)f(b)142 -b(C-x)36 b(5)f(b)3942 3381 y Fh(a\016c)n(her)24 b(le)g(tamp)r(on)g -(dans)g(l'autre)g(fen)n(^)-33 b(etre)563 b Ff(C-x)36 -b(4)f(C-o)72 b(C-x)36 b(5)f(C-o)3942 3445 y Fh(c)n(harger)24 -b(un)g(\014c)n(hier)g(dans)g(l'autre)f(fen)n(^)-33 b(etre)583 -b Ff(C-x)36 b(4)f(f)142 b(C-x)36 b(5)f(f)3942 3509 y -Fh(c)n(harger)24 b(un)g(\014c)n(hier)g(en)g(lecture)g(seule)g(dans)g -(l'autre)g(fen)n(^)-33 b(etre)84 b Ff(C-x)36 b(4)f(r)142 -b(C-x)36 b(5)f(r)3942 3573 y Fh(lancer)24 b(Dired)f(dans)h(l'autre)g -(fen)n(^)-33 b(etre)740 b Ff(C-x)36 b(4)f(d)142 b(C-x)36 -b(5)f(d)3942 3636 y Fh(trouv)n(er)24 b(un)g(tag)h(dans)f(l'autre)f(fen) -n(^)-33 b(etre)673 b Ff(C-x)36 b(4)f(.)142 b(C-x)36 b(5)f(.)3942 -3755 y Fh(agrandir)23 b(la)h(fen)n(^)-33 b(etre)941 b -Ff(C-x)36 b(^)3942 3861 y Fh(rap)r(etisser)23 b(la)h(fen)n(^)-33 -b(etre)903 b Ff(C-x)36 b({)3940 3968 y Fh(\023)-33 b(elargir)23 +3360 y Fh(placer)24 b(le)f(curseur)h(dans)g(une)g(autre)h(fen)n(^)-33 +b(etre)25 b Ff(C-x)36 b(o)212 b(C-x)37 b(5)e(o)3942 3424 +y Fh(s)n(\023)-33 b(electionner)25 b(le)e(tamp)r(on)i(dans)4025 +3488 y(l'autre)f(fen)n(^)-33 b(etre)731 b Ff(C-x)36 b(4)g(b)141 +b(C-x)37 b(5)e(b)3942 3551 y Fh(a\016c)n(her)24 b(le)g(tamp)r(on)g +(dans)g(l'autre)g(fen)n(^)-33 b(etre)69 b Ff(C-x)36 b(4)g(C-o)71 +b(C-x)37 b(5)e(C-o)3942 3615 y Fh(c)n(harger)24 b(un)g(\014c)n(hier)g +(dans)g(l'autre)f(fen)n(^)-33 b(etre)89 b Ff(C-x)36 b(4)g(f)141 +b(C-x)37 b(5)e(f)3942 3679 y Fh(c)n(harger)24 b(un)g(\014c)n(hier)g(en) +g(lecture)g(seule)4025 3743 y(dans)g(l'autre)g(fen)n(^)-33 +b(etre)566 b Ff(C-x)36 b(4)g(r)141 b(C-x)37 b(5)e(r)3942 +3806 y Fh(lancer)24 b(Dired)f(dans)h(l'autre)g(fen)n(^)-33 +b(etre)246 b Ff(C-x)36 b(4)g(d)141 b(C-x)37 b(5)e(d)3942 +3870 y Fh(trouv)n(er)24 b(un)g(tag)h(dans)f(l'autre)f(fen)n(^)-33 +b(etre)179 b Ff(C-x)36 b(4)g(.)141 b(C-x)37 b(5)e(.)3942 +3989 y Fh(agrandir)23 b(la)h(fen)n(^)-33 b(etre)941 b +Ff(C-x)36 b(^)3942 4095 y Fh(rap)r(etisser)23 b(la)h(fen)n(^)-33 +b(etre)903 b Ff(C-x)36 b({)3940 4201 y Fh(\023)-33 b(elargir)23 b(la)g(fen)n(^)-33 b(etre)1004 b Ff(C-x)36 b(})p eop end %%Page: 2 2 @@ -2416,7 +2362,7 @@ Fh(inden)n(ter)24 b(la)g Fe(s-expression)g Fh(couran)n(te)h(\(d)n(\023) -33 b(ep)r(end)-379 192 y(du)24 b(mo)r(de\))1145 b Ff(C-M-q)-450 298 y Fh(inden)n(ter)24 b(la)g(r)n(\023)-33 b(egion)24 -b(sur)f Fb(ar)l(g)30 b Fh(colonnes)443 b Ff(C-x)36 b(TAB)-450 +b(sur)f Fd(ar)l(g)30 b Fh(colonnes)443 b Ff(C-x)36 b(TAB)-450 425 y Fh(ins)n(\023)-33 b(erer)23 b(un)h(newline)g(apr)n(\022)-33 b(es)23 b(le)h(p)r(oin)n(t)507 b Ff(C-o)-450 531 y Fh(d)n(\023)-33 b(eplacer)24 b(le)g(reste)g(de)g(la)f(ligne)h(v)n(ers)g(le)f(bas)326 @@ -2481,20 +2427,20 @@ b(l'orthographe)1746 1370 y Fh(v)n(\023)-33 b(eri\014er)23 b(l'orthographe)i(du)f(mot)g(couran)n(t)359 b Ff(M-$)1746 1476 y Fh(v)n(\023)-33 b(eri\014er)23 b(l'orthographe)i(de)f(tous)g -(les)f(mots)h(d'une)1817 1583 y(r)n(\023)-33 b(egion)1162 +(les)f(mots)1817 1583 y(d'une)h(r)n(\023)-33 b(egion)816 b Ff(M-x)36 b(ispell-region)1746 1689 y Fh(v)n(\023)-33 -b(eri\014er)23 b(l'orthographe)i(de)f(tout)h(le)e(tamp)r(on)191 -b Ff(M-x)36 b(ispell-buffer)1746 1907 y Fg(T)-10 b(ags)1746 +b(eri\014er)23 b(l'orthographe)i(de)f(tout)h(le)e(tamp)r(on)37 +b Ff(M-x)f(ispell-buffer)1746 1907 y Fg(T)-10 b(ags)1746 2090 y Fh(trouv)n(er)24 b(un)g(tag)h(\(une)f(d)n(\023)-33 b(e\014nition\))564 b Ff(M-.)1746 2196 y Fh(trouv)n(er)24 b(l'o)r(ccurrence)g(suiv)l(an)n(te)h(du)f(tag)400 b Ff(C-u)36 b(M-.)1746 2302 y Fh(sp)n(\023)-33 b(eci\014er)24 b(un)g(nouv)n(eau)h -(\014c)n(hier)f(de)g(tags)341 b Ff(M-x)36 b(visit-tags-table)1746 +(\014c)n(hier)f(de)g(tags)187 b Ff(M-x)36 b(visit-tags-table)1746 2437 y Fh(rec)n(herc)n(her)24 b(par)g(expr.)35 b(rationnelles)24 -b(dans)g(tous)1817 2543 y(les)f(\014c)n(hiers)h(du)f(tableau)i(de)f -(tags)439 b Ff(M-x)36 b(tags-search)1746 2650 y Fh(lancer)24 -b(un)g(remplacemen)n(t)h(in)n(teractif)f(sur)f(tous)h(les)1817 -2756 y(\014c)n(hiers)1136 b Ff(M-x)36 b(tags-query-replace)1746 +b(dans)1817 2543 y(tous)g(les)f(\014c)n(hiers)h(du)g(tableau)h(de)f +(tags)131 b Ff(M-x)36 b(tags-search)1746 2650 y Fh(lancer)24 +b(un)g(remplacemen)n(t)h(in)n(teractif)f(sur)1817 2756 +y(tous)g(les)f(\014c)n(hiers)652 b Ff(M-x)37 b(tags-query-replace)1746 2862 y Fh(con)n(tin)n(uer)25 b(la)e(derni)n(\022)-33 b(ere)24 b(rec)n(herc)n(he)h(de)f(tags)g(ou)g(le)1817 2969 y(remplacemen)n(t)g(in)n(teractif)710 b Ff(M-,)1746 @@ -2537,40 +2483,40 @@ 2650 y Fh(z)n(\023)-33 b(ero)24 b(ou)g(une)g(r)n(\023)-33 b(ep)n(\023)g(etition)834 b Ff(?)3942 2756 y Fh(caract)n(\022)-33 b(ere)25 b(sp)n(\023)-33 b(ecial)24 b(p)r(our)f(quoter)i(l'expression)e -(ra-)4013 2863 y(tionnelle)h Fb(c)1121 b Ff(\\)p Fb(c)3942 +(ra-)4013 2863 y(tionnelle)h Fd(c)1121 b Ff(\\)p Fd(c)3942 2969 y Fh(alternativ)n(e)25 b(\(\\ou"\))960 b Ff(\\|)3942 -3075 y Fh(regroup)r(emen)n(t)1089 b Ff(\\\()35 b Fa(:)12 +3075 y Fh(regroup)r(emen)n(t)1089 b Ff(\\\()35 b Fc(:)12 b(:)f(:)35 b Ff(\\\))3942 3181 y Fh(le)23 b(m)n(^)-33 -b(eme)24 b(texte)i(que)e(dans)g(le)g Fb(n)5 b Fh(i)n(\022)-33 -b(eme)24 b(group)r(e)264 b Ff(\\)p Fb(n)3942 3288 y Fh(limite)23 +b(eme)24 b(texte)i(que)e(dans)g(le)g Fd(n)5 b Fh(i)n(\022)-33 +b(eme)24 b(group)r(e)264 b Ff(\\)p Fd(n)3942 3288 y Fh(limite)23 b(de)h(mot)1096 b Ff(\\b)3942 3394 y Fh(non)24 b(limite)f(de)h(mot)959 -b Ff(\\B)3942 3504 y Fe(en)n(tit)n(\023)-39 b(e)704 b(d)n(\023)-39 -b(ebut)259 b(\014n)3942 3568 y Fh(ligne)763 b Ff(^)428 -b($)3942 3632 y Fh(mot)787 b Ff(\\<)393 b(\\>)3942 3696 -y Fh(tamp)r(on)672 b Ff(\\`)393 b(\\')3942 3759 y Fe(classe)27 -b(de)g(caract)n(\022)-39 b(ere)246 b(corresp)r(ond)71 -b(corresp)r(ond)26 b(\022)-40 b(a)27 b(d'autres)3942 -3823 y Fh(ensem)n(ble)d(explicite)352 b Ff([)36 b Fa(:)11 -b(:)h(:)34 b Ff(])240 b([^)36 b Fa(:)11 b(:)g(:)35 b -Ff(])3942 3887 y Fh(caract)n(\022)-33 b(ere)25 b(de)f(mot)391 -b Ff(\\w)i(\\W)3942 3951 y Fh(caract)n(\022)-33 b(ere)25 -b(a)n(v)n(ec)g(la)e(syn)n(taxe)i Fb(c)83 b Ff(\\s)p Fb(c)360 -b Ff(\\S)p Fb(c)p eop end +b Ff(\\B)3942 3504 y Fe(en)n(tit)n(\023)-39 b(e)499 b(d)n(\023)-39 +b(ebut)258 b(\014n)3942 3568 y Fh(ligne)558 b Ff(^)427 +b($)3942 3632 y Fh(mot)582 b Ff(\\<)392 b(\\>)3942 3696 +y Fh(tamp)r(on)467 b Ff(\\`)392 b(\\')3942 3759 y Fe(classe)27 +b(de)g(caract)n(\022)-39 b(ere)41 b(corresp)r(ond)70 +b(corresp)r(ond)27 b(\022)-40 b(a)26 b(d'autres)3942 +3823 y Fh(ensem)n(ble)e(explicite)147 b Ff([)35 b Fc(:)12 +b(:)f(:)35 b Ff(])239 b([^)36 b Fc(:)12 b(:)f(:)35 b +Ff(])3942 3887 y Fh(caract)n(\022)-33 b(ere)25 b(de)f(mot)186 +b Ff(\\w)392 b(\\W)3942 3951 y Fh(caract)n(\022)-33 b(ere)25 +b(a)n(v)n(ec)g(la)3984 4014 y(syn)n(taxe)g Fd(c)371 b +Ff(\\s)p Fd(c)359 b Ff(\\S)p Fd(c)p eop end %%Page: 3 3 TeXDict begin @landscape 3 2 bop -450 -364 a Fg(Jeux)38 b(de)f(caract)n(\022)-55 b(eres)37 b(in)m(ternationaux)-450 -201 y Fh(indiquer)23 b(la)h(langue)g(principale)631 b Ff(C-x)36 b(RET)g(l)-450 -95 y Fh(mon)n(trer)24 b(toutes)h(les)e(m)n -(\023)-33 b(etho)r(des)25 b(de)f(saisie)266 b Ff(M-x)36 +(\023)-33 b(etho)r(des)25 b(de)f(saisie)29 b Ff(M-x)36 b(list-input-methods)-450 12 y Fh(activ)n(er)24 b(ou)g(d)n(\023)-33 b(esactiv)n(er)25 b(la)f(m)n(\023)-33 b(etho)r(de)25 b(de)f(saisie)229 b Ff(C-\\)-450 118 y Fh(c)n(hoisir)23 b(le)g(syst)n(\022)-33 b(eme)25 b(de)f(co)r(dage)h(p)r(our)f(la)f(com-) -379 224 y(mande)h(suiv)l(an)n(te)963 b Ff(C-x)36 b(RET)g(c)-450 330 y Fh(mon)n(trer)24 b(tous)g(les)f(syst)n(\022)-33 -b(emes)25 b(de)f(co)r(dage)301 b Ff(M-x)36 b(list-coding-systems)-450 +b(emes)25 b(de)f(co)r(dage)64 b Ff(M-x)36 b(list-coding-systems)-450 437 y Fh(c)n(hoisir)23 b(le)g(syst)n(\022)-33 b(eme)25 -b(de)f(co)r(dage)h(pr)n(\023)-33 b(ef)n(\023)g(er)n(\023)g(e)322 +b(de)f(co)r(dage)h(pr)n(\023)-33 b(ef)n(\023)g(er)n(\023)g(e)85 b Ff(M-x)36 b(prefer-coding-system)-450 656 y Fg(Info)-450 819 y Fh(en)n(trer)24 b(dans)g(le)f(visualisateur)h(de)g(la)g(do)r (cumen)n(ta-)-379 925 y(tion)g(Info)1174 b Ff(C-h)36 @@ -2586,9 +2532,9 @@ b Fe(pr)n(\023)-39 b(ec)n(\023)g(eden)n(t)898 b Ff(p)-379 2008 y Fh(aller)22 b Fe(plus)i(haut)953 b Ff(u)-379 2114 y Fh(c)n(hoisir)23 b(un)g(sujet)h(de)g(men)n(u)h(par)e(son)h(nom)277 -b Ff(m)-379 2221 y Fh(c)n(hoisir)23 b(le)g Fb(n)5 b Fh(i)n(\022)-33 +b Ff(m)-379 2221 y Fh(c)n(hoisir)23 b(le)g Fd(n)5 b Fh(i)n(\022)-33 b(eme)24 b(sujet)g(de)g(men)n(u)g(par)g(son)-379 2327 -y(n)n(um)n(\023)-33 b(ero)23 b(\(1{9\))1029 b Fb(n)-379 +y(n)n(um)n(\023)-33 b(ero)23 b(\(1{9\))1029 b Fd(n)-379 2433 y Fh(suivre)23 b(une)h(r)n(\023)-33 b(ef)n(\023)g(erence)24 b(crois)n(\023)-33 b(ee)24 b(\(on)h(revien)n(t)f(a)n(v)n(ec)-379 2539 y Ff(l)p Fh(\))1378 b Ff(f)-379 2646 y Fh(rev)n(enir)23 @@ -2603,72 +2549,72 @@ 518 b Ff(i)-379 3499 y Fh(rec)n(herc)n(her)24 b(les)f(n\033uds)h(a)n(v) n(ec)h(une)f(expression)-379 3605 y(rationnelle)1115 b Ff(s)-379 3711 y Fe(quitter)22 b Fh(Info)1051 b Ff(q)1746 --364 y Fg(Registres)1746 -215 y Fh(sauv)n(er)24 b(la)f(r)n(\023)-33 +-364 y Fg(Registres)1746 -227 y Fh(sauv)n(er)24 b(la)f(r)n(\023)-33 b(egion)24 b(dans)g(un)g(registre)506 b Ff(C-x)36 b(r)f(s)1746 --109 y Fh(ins)n(\023)-33 b(erer)23 b(le)g(con)n(ten)n(u)j(du)e +-121 y Fh(ins)n(\023)-33 b(erer)23 b(le)g(con)n(ten)n(u)j(du)e (registre)f(dans)h(le)g(tamp)r(on)117 b Ff(C-x)36 b(r)f(i)1746 -18 y Fh(sauv)n(er)24 b(la)f(v)l(aleur)h(du)g(p)r(oin)n(t)g(dans)g(un)g -(registre)222 b Ff(C-x)36 b(r)f(SPC)1746 124 y Fh(sauter)24 +2 y Fh(sauv)n(er)24 b(la)f(v)l(aleur)h(du)g(p)r(oin)n(t)g(dans)g(un)g +(registre)222 b Ff(C-x)36 b(r)f(SPC)1746 109 y Fh(sauter)24 b(au)g(p)r(oin)n(t)g(sauv)n(\023)-33 b(e)25 b(dans)f(le)f(registre)355 -b Ff(C-x)36 b(r)f(j)1746 302 y Fg(Macros)j(cla)m(vier)1746 -431 y Fe(lancer)23 b Fh(la)g(d)n(\023)-33 b(e\014nition)25 +b Ff(C-x)36 b(r)f(j)1746 271 y Fg(Macros)j(cla)m(vier)1746 +388 y Fe(lancer)23 b Fh(la)g(d)n(\023)-33 b(e\014nition)25 b(d'une)f(macro)g(cla)n(vier)277 b Ff(C-x)36 b(\()1746 -538 y Fe(terminer)23 b Fh(la)g(d)n(\023)-33 b(e\014nition)25 +494 y Fe(terminer)23 b Fh(la)g(d)n(\023)-33 b(e\014nition)25 b(d'une)f(macro)f(cla)n(vier)183 b Ff(C-x)36 b(\))1746 -644 y Fe(ex)n(\023)-39 b(ecuter)24 b Fh(la)f(derni)n(\022)-33 +601 y Fe(ex)n(\023)-39 b(ecuter)24 b Fh(la)f(derni)n(\022)-33 b(ere)24 b(macro)g(cla)n(vier)f(d)n(\023)-33 b(e\014nie)203 -b Ff(C-x)36 b(e)1746 750 y Fh(a)t(jouter)24 b(\022)-35 +b Ff(C-x)36 b(e)1746 707 y Fh(a)t(jouter)24 b(\022)-35 b(a)24 b(la)f(derni)n(\022)-33 b(ere)24 b(macro)g(cla)n(vier)446 -b Ff(C-u)36 b(C-x)g(\()1746 857 y Fh(donner)24 b(un)g(nom)g(\022)-35 -b(a)24 b(la)f(derni)n(\022)-33 b(ere)24 b(macro)g(cla)n(vier)107 -b Ff(M-x)36 b(name-last-kbd-macro)1746 963 y Fh(ins)n(\023)-33 -b(erer)23 b(une)h(d)n(\023)-33 b(e\014nition)25 b(Lisp)e(dans)h(le)g -(tamp)r(on)116 b Ff(M-x)36 b(insert-kbd-macro)1746 1140 -y Fg(Commandes)i(de)f(gestion)h(d'Emacs)g(Lisp)1744 1290 -y Fh(\023)-33 b(ev)l(aluer)24 b(la)g Fe(s-expression)f -Fh(situ)n(\023)-33 b(ee)25 b(a)n(v)l(an)n(t)g(le)e(p)r(oin)n(t)115 -b Ff(C-x)36 b(C-e)1744 1396 y Fh(\023)-33 b(ev)l(aluer)24 -b(la)g Fe(defun)g Fh(couran)n(te)707 b Ff(C-M-x)1744 -1502 y Fh(\023)-33 b(ev)l(aluer)24 b(la)g Fe(r)n(\023)-39 -b(egion)880 b Ff(M-x)36 b(eval-region)1746 1608 y Fh(lire)23 -b(et)f(\023)-33 b(ev)l(aluer)24 b(le)g(mini-tamp)r(on)593 -b Ff(M-:)1746 1715 y Fh(c)n(harger)24 b(\022)-35 b(a)24 -b(partir)f(du)h(r)n(\023)-33 b(ep)r(ertoire)23 b(syst)n(\022)-33 -b(eme)1817 1821 y(standard)1080 b Ff(M-x)36 b(load-library)1746 -1998 y Fg(P)m(ersonnalisation)g(simple)1746 2148 y Fh(p)r(ersonnaliser) -23 b(les)h(v)l(ariables)f(et)h(les)g(fon)n(tes)235 b -Ff(M-x)36 b(customize)1746 2253 y Fh(Cr)n(\023)-33 b(eation)23 -b(de)g(liaisons)f(de)h(touc)n(hes)h(globales)f(en)g(Emacs)g(Lisp)f -(\(exem-)1746 2326 y(ples\):)1746 2410 y Ff(\(global-set-key)40 -b("\\C-cg")d('goto-line\))1746 2474 y(\(global-set-key)j("\\M-#")d -('query-replace-regexp\))1755 2637 y Fg(\023)1746 2662 -y(Ecriture)g(de)h(commandes)1746 2778 y Ff(\(defun)f -Fb(nom-c)l(ommande)43 b Ff(\()p Fb(ar)l(gs)5 b Ff(\))1817 -2842 y(")p Fb(do)l(cumentation)g Ff(")38 b(\(interactive)g(")p -Fb(template)5 b Ff("\))1817 2905 y Fb(b)l(o)l(dy)h Ff(\))1746 -2989 y Fh(Exemple)24 b(:)1746 3073 y Ff(\(defun)37 b -(cette-ligne-en-haut-de-)q(la-f)q(ene)q(tre)42 b(\(line\))1817 -3137 y("Repositionne)d(la)c(ligne)i(du)f(point)h(en)f(haut)g(de)g(la) -1746 3201 y(fenetre.)1746 3265 y(Avec)g(ARG,)h(place)g(le)e(point)i -(sur)f(la)g(ligne)h(ARG.")1817 3328 y(\(interactive)h("P"\))1817 -3392 y(\(recenter)f(\(if)g(\(null)f(line\))2311 3456 -y(0)2240 3520 y(\(prefix-numeric-value)41 b(line\)\)\)\))1746 -3604 y Fh(La)21 b(sp)n(\023)-33 b(eci\014cation)23 b +b Ff(C-u)36 b(C-x)g(\()1746 813 y Fh(donner)24 b(un)g(nom)g(\022)-35 +b(a)24 b(la)f(derni)n(\022)-33 b(ere)24 b(macro)1817 +919 y(cla)n(vier)996 b Ff(M-x)36 b(name-last-kbd-macro)1746 +1026 y Fh(ins)n(\023)-33 b(erer)23 b(une)h(d)n(\023)-33 +b(e\014nition)25 b(Lisp)e(dans)h(le)1817 1132 y(tamp)r(on)960 +b Ff(M-x)36 b(insert-kbd-macro)1746 1294 y Fg(Commandes)i(de)f(gestion) +h(d'Emacs)g(Lisp)1744 1431 y Fh(\023)-33 b(ev)l(aluer)24 +b(la)g Fe(s-expression)f Fh(situ)n(\023)-33 b(ee)25 b(a)n(v)l(an)n(t)g +(le)e(p)r(oin)n(t)115 b Ff(C-x)36 b(C-e)1744 1537 y Fh(\023)-33 +b(ev)l(aluer)24 b(la)g Fe(defun)g Fh(couran)n(te)707 +b Ff(C-M-x)1744 1643 y Fh(\023)-33 b(ev)l(aluer)24 b(la)g +Fe(r)n(\023)-39 b(egion)726 b Ff(M-x)36 b(eval-region)1746 +1750 y Fh(lire)23 b(et)f(\023)-33 b(ev)l(aluer)24 b(le)g(mini-tamp)r +(on)593 b Ff(M-:)1746 1856 y Fh(c)n(harger)24 b(\022)-35 +b(a)24 b(partir)f(du)h(r)n(\023)-33 b(ep)r(ertoire)23 +b(syst)n(\022)-33 b(eme)1817 1962 y(standard)926 b Ff(M-x)36 +b(load-library)1746 2124 y Fg(P)m(ersonnalisation)g(simple)1746 +2261 y Fh(p)r(ersonnaliser)23 b(les)h(v)l(ariables)f(et)h(les)g(fon)n +(tes)81 b Ff(M-x)36 b(customize)1746 2364 y Fh(Cr)n(\023)-33 +b(eation)23 b(de)g(liaisons)f(de)h(touc)n(hes)h(globales)f(en)g(Emacs)g +(Lisp)f(\(exem-)1746 2437 y(ples\):)1746 2518 y Ff(\(global-set-key)40 +b("\\C-cg")d('goto-line\))1746 2581 y(\(global-set-key)j("\\M-#")d +('query-replace-regexp\))1755 2729 y Fg(\023)1746 2753 +y(Ecriture)g(de)h(commandes)1746 2857 y Ff(\(defun)f +Fd(nom-c)l(ommande)43 b Ff(\()p Fd(ar)l(gs)5 b Ff(\))1817 +2921 y(")p Fd(do)l(cumentation)g Ff(")38 b(\(interactive)g(")p +Fd(template)5 b Ff("\))1817 2985 y Fd(b)l(o)l(dy)h Ff(\))1746 +3066 y Fh(Exemple)24 b(:)1746 3146 y Ff(\(defun)37 b +(cette-ligne-en-haut-de-)q(la-f)q(ene)q(tre)42 b(\(line\))1746 +3210 y("Repositionne)d(la)d(ligne)h(du)e(point)i(en)f(haut)g(de)g(la)g +(fenetre.)1746 3274 y(Avec)g(ARG,)h(place)g(le)e(point)i(sur)f(la)g +(ligne)h(ARG.")1817 3338 y(\(interactive)h("P"\))1817 +3401 y(\(recenter)f(\(if)g(\(null)f(line\))2311 3465 +y(0)2240 3529 y(\(prefix-numeric-value)41 b(line\)\)\)\))1746 +3610 y Fh(La)21 b(sp)n(\023)-33 b(eci\014cation)23 b Ff(interactive)h Fh(indique)d(commen)n(t)h(lire)e(in)n(teractiv)n(e-) -1746 3668 y(men)n(t)28 b(les)f(param)n(\022)-33 b(etres.)42 +1746 3674 y(men)n(t)28 b(les)f(param)n(\022)-33 b(etres.)42 b(F)-6 b(aites)28 b Ff(C-h)36 b(f)f(interactive)30 b -Fh(p)r(our)e(plus)e(de)1746 3731 y(pr)n(\023)-33 b(ecisions.)2039 -3811 y Fd(Cop)n(yrigh)n(t)2342 3809 y(c)2325 3811 y Fc(\015)21 -b Fd(2007)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 -b(Inc.)2179 3862 y(v2.3)h(p)r(our)f(GNU)g(Emacs)h(v)n(ersion)h(22,)f -(2006)2309 3913 y(conception)g(de)f(Stephen)g(Gildea)2220 -3976 y(traduction)h(fran\030)-27 b(caise)21 b(d')2831 -3963 y(\023)2826 3976 y(Eric)f(Jacob)r(oni)1746 4048 +Fh(p)r(our)e(plus)e(de)1746 3737 y(pr)n(\023)-33 b(ecisions.)2039 +3817 y Fb(Cop)n(yrigh)n(t)2342 3815 y(c)2325 3817 y Fa(\015)21 +b Fb(2007)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 +b(Inc.)2179 3868 y(v2.3)h(p)r(our)f(GNU)g(Emacs)h(v)n(ersion)h(22,)f +(2006)2309 3919 y(conception)g(de)f(Stephen)g(Gildea)2220 +3983 y(traduction)h(fran\030)-27 b(caise)21 b(d')2831 +3970 y(\023)2826 3983 y(Eric)f(Jacob)r(oni)1746 4051 y(V)-5 b(ous)22 b(p)r(ouv)n(ez)g(faire)g(et)g(distribuer)f(des)h (copies)g(de)f(cette)i(carte,)f(p)r(ourvu)f(que)h(la)1746 -4099 y(note)16 b(de)g(cop)n(yrigh)n(t)g(et)h(cette)f(note)g(de)g(p)r +4102 y(note)16 b(de)g(cop)n(yrigh)n(t)g(et)h(cette)f(note)g(de)g(p)r (ermission)f(soien)n(t)h(conserv)n(\023)-29 b(ees)19 -b(sur)c(toutes)1746 4150 y(les)21 b(copies.)1746 4221 +b(sur)c(toutes)1746 4153 y(les)21 b(copies.)1746 4221 y(P)n(our)e(les)g(copies)g(du)f(man)n(uel)g(GNU)g(Emacs,)g(\023)-29 b(ecriv)n(ez)20 b(\022)-30 b(a)19 b(la)g(F)-5 b(ree)19 b(Soft)n(w)n(are)i(F)-5 b(oun-)1746 4272 y(dation,)29 diff -r edf631bdbb7a -r 738ce3540ffb etc/fr-refcard.tex --- a/etc/fr-refcard.tex Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/fr-refcard.tex Sun Apr 22 12:12:29 2007 +0000 @@ -264,8 +264,9 @@ % \metax{description of command}{M-x command-name} % Tries to justify the beginning of the command name at the same place % as \key starts the key name. (The "M-x " sticks out to the left.) +% Note: was \hsize=.74, but changed to avoid overflow in some places. \def\metax#1#2{\leavevmode\hbox to \hsize{\vbox - {\hsize=.74\hsize\rightskip=1em + {\hsize=.66\hsize\rightskip=1em \raggedright \tolerance=20000 \hskip\keyindent\hangindent=1em\strut#1\strut\par}% %\hskip-\metaxwidth minus 1fil @@ -344,7 +345,8 @@ Si Emacs est encore en train de chercher, \kbd{C-g} n'annule que ce qui n'a pas \'et\'e fait. -\shortcopyrightnotice +%% Why was this here? +%\shortcopyrightnotice \section{D\'eplacements} @@ -403,7 +405,9 @@ \key{remplacer interactivement une cha\^\i{}ne de texte}{M-\%} % query-replace-regexp est liee a C-M-% mais on ne peut pas le % taper dans une console. -\metax{en utilisant les expressions rationnelles}{M-x query-replace-regexp} +% Hack to prevent overflow. Please someone fix this properly. +\metax{en utilisant les expressions \hskip 20pt rationnelles} +{\hskip -30pt M-x query-replace-regexp} Les r\'eponses admises dans le mode de remplacement interactif sont : @@ -430,14 +434,19 @@ \key{faire d\'efiler l'autre fen\^etre}{C-M-v} +%% tabskip reduced from 10 to 3pt to fit on letterpaper. {\setbox0=\hbox{\kbd{0}}\advance\hsize by 2\wd0 -\paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +\paralign to \hsize{#\tabskip=3pt plus 1 fil&#\tabskip=0pt&#\cr \threecol{placer le curseur dans une autre fen\^etre}{C-x o}{C-x 5 o} -\threecol{s\'electionner le tampon dans l'autre fen\^etre}{C-x 4 b}{C-x 5 b} +%% Hack in a line break to avoid overflow. +\threecol{\raggedright s\'electionner le tampon dans\cr +\hskip 10pt l'autre fen\^etre}{C-x 4 b}{C-x 5 b} \threecol{afficher le tampon dans l'autre fen\^etre}{C-x 4 C-o}{C-x 5 C-o} \threecol{charger un fichier dans l'autre fen\^etre}{C-x 4 f}{C-x 5 f} -\threecol{charger un fichier en lecture seule dans l'autre fen\^etre}{C-x 4 r}{C-x 5 r} +%% Hack in a line break to avoid overflow. +\threecol{\raggedright charger un fichier en lecture seule\cr +\hskip 10pt dans l'autre fen\^etre}{C-x 4 r}{C-x 5 r} \threecol{lancer Dired dans l'autre fen\^etre}{C-x 4 d}{C-x 5 d} \threecol{trouver un tag dans l'autre fen\^etre}{C-x 4 .}{C-x 5 .} }} @@ -523,7 +532,9 @@ \metax{rechercher par expr. rationnelles dans tous les fichiers du tableau de tags}{M-x tags-search} -\metax{lancer un remplacement interactif sur tous les fichiers}{M-x tags-query-replace} +%% Overflow hack. +\metax{lancer un remplacement interactif sur tous les fichiers}% +{\hskip -9pt M-x tags-query-replace} \key{continuer la derni\`ere recherche de tags ou le remplacement interactif}{M-,} \section{Shells} @@ -565,27 +576,36 @@ \key{limite de mot}{\\b} \key{non limite de mot}{\\B} -\paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr +%% tabskip reduced from 10 to 5pt for letterpaper. +\paralign to \hsize{#\tabskip=5pt plus 1 fil&#\tabskip=0pt&#\cr \threecol{{\bf entit\'e}}{{\bf d\'ebut}}{{\bf fin}} \threecol{ligne}{^}{\$} \threecol{mot}{\\<}{\\>} \threecol{tampon}{\\`}{\\'} -\threecol{{\bf classe de caract\`ere}}{{\bf correspond}}{{\bf correspond - \`a d'autres}} +\threecol{{\bf classe de caract\`ere}}{{\bf correspond}} +{{\bf correspond \`a d'autres}} \threecol{ensemble explicite}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]} \threecol{caract\`ere de mot}{\\w}{\\W} -\threecol{caract\`ere avec la syntaxe {\it c}}{\\s{\it c}}{\\S{\it c}} +%% Overflow hack. +\threecol{\raggedright caract\`ere avec la\cr \hskip 5pt syntaxe {\it c}}% +{\\s{\it c}}{\\S{\it c}} } \section{Jeux de caract\`eres internationaux} \key{indiquer la langue principale}{C-x RET l} -\metax{montrer toutes les m\'ethodes de saisie}{M-x list-input-methods} +%% Overflow hack. +\metax{montrer toutes les m\'ethodes de saisie} +{\hskip -10pt M-x list-input-methods} \key{activer ou d\'esactiver la m\'ethode de saisie}{C-\\} \key{choisir le syst\`eme de codage pour la commande suivante}{C-x RET c} -\metax{montrer tous les syst\`emes de codage}{M-x list-coding-systems} -\metax{choisir le syst\`eme de codage pr\'ef\'er\'e}{M-x prefer-coding-system} +%% Overflow hack. +\metax{montrer tous les syst\`emes de codage}% +{\hskip -10pt M-x list-coding-systems} +%% Overflow hack. +\metax{choisir le syst\`eme de codage pr\'ef\'er\'e}% +{\hskip -10pt M-x prefer-coding-system} \section{Info} @@ -672,7 +692,8 @@ \beginexample% (defun cette-ligne-en-haut-de-la-fenetre (line) - "Repositionne la ligne du point en haut de la fenetre. +%% Leading space omitted to avoid linebreak and underfull hbox. +"Repositionne la ligne du point en haut de la fenetre. Avec ARG, place le point sur la ligne ARG." (interactive "P") (recenter (if (null line) diff -r edf631bdbb7a -r 738ce3540ffb etc/ms-7bkermit --- a/etc/ms-7bkermit Sun Apr 22 11:42:03 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,333 +0,0 @@ -;;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -;;; Free Software Foundation, Inc. - -;;; This file is designed for 7-bit connections. -;;; Use the file ms-kermit if you have an 8-bit connection. - -;;; This kermit script maps the IBM-PC keyboard for use with Gnu Emacs. -;;; The ALT key is used to generate Meta characters and, in conjunction -;;; with the CTRL key, Control-Meta characters. A few other useful -;;; mappings are also performed. -;;; Andy Lowry, May 1989 - -;;; Exchange ESC and backquote... tilde stays put (shift-backquote) -set key \27 ` -set key ` \27 - -;;; BACKSPACE deletes backward one character -set key scan \270 \127 - -;;; The following mappings affect certain special keys... all the keys -;;; are duplicated on the numeric keypad when NUM LOCK is off, but -;;; the keypad versions are NOT mapped (string definition space too small -;;; for that) - -;;; INSERT toggles overwrite mode -set key scan \4434 \27xoverwrite-mode\13 -;;; HOME moves point to beginning of buffer -set key scan \4423 \27< -;;; PAGE-UP scrolls backward one screen -set key scan \4425 \27v -;;; DELETE deletes one character *forward* -set key scan \4435 \4 -;;; END moves point to end of buffer -set key scan \4431 \27> -;;; PAGE-DOWN scrolls forward one screen -set key scan \4433 \22 -;;; ARROW keys move in the appropriate directions -set key scan \4424 \16 -set key scan \4427 \2 -set key scan \4432 \14 -set key scan \4429 \6 - -;;; META versions of all the printing characters except uppercase -;;; letters are generated by using the ALT key. The definition string -;;; consists of an ESC character followed by the META-ized character. -;;; The characters are listed roughly left-to-right and top-to-bottom -;;; as they appear on the keyboard -set key scan \2345 \27` -set key scan \2424 \27\o61 ; need to use char code, since digit -set key scan \2425 \27\o62 ; would not terminate '\27' -set key scan \2426 \27\o63 -set key scan \2427 \27\o64 -set key scan \2428 \27\o65 -set key scan \2429 \27\o66 -set key scan \2430 \27\o67 -set key scan \2431 \27\o70 -set key scan \2432 \27\o71 -set key scan \2433 \27\o60 -set key scan \2434 \27\45 -set key scan \2435 \27= -set key scan \2857 \27~ -set key scan \2936 \27! -set key scan \2937 \27@ -set key scan \2938 \27# -set key scan \2939 \27$ -set key scan \2940 \27% -set key scan \2941 \27^ -set key scan \2942 \27& -set key scan \2943 \27* -set key scan \2944 \27( -set key scan \2945 \27) -set key scan \2946 \27_ -set key scan \2947 \27+ -set key scan \2469 \27\9 -set key scan \2320 \27q -set key scan \2321 \27w -set key scan \2322 \27e -set key scan \2323 \27r -set key scan \2324 \27t -set key scan \2325 \27y -set key scan \2326 \27u -set key scan \2327 \27i -set key scan \2328 \27o -set key scan \2329 \27p -set key scan \2330 \27[ -set key scan \2842 \27{ -set key scan \2331 \27] -set key scan \2843 \27} -set key scan \2347 \27\ -set key scan \2859 \27| -set key scan \2334 \27a -set key scan \2335 \27s -set key scan \2336 \27d -set key scan \2337 \27f -set key scan \2338 \27g -set key scan \2339 \27h -set key scan \2340 \27j -set key scan \2341 \27k -set key scan \2342 \27l -set key scan \2343 \27\59 -set key scan \2855 \27: -set key scan \2344 \27' -set key scan \2856 \27" -set key scan \2348 \27z -set key scan \2349 \27x -set key scan \2350 \27c -set key scan \2351 \27v -set key scan \2352 \27b -set key scan \2353 \27n -set key scan \2354 \27m -set key scan \2355 \27, -set key scan \2867 \27< -set key scan \2356 \27. -set key scan \2868 \27> -set key scan \2357 \27/ -set key scan \2869 \27? - -;;; CONTROL-META characters are generated by using both the CTRL and -;;; ALT keys simultaneously. All the lowercase letters are included. -;;; The definition string consists of an ESC character followed by -;;; the control character corresponding to the letter. -set key scan \3344 \27\17 -set key scan \3345 \27\23 -set key scan \3346 \27\5 -set key scan \3347 \27\18 -set key scan \3348 \27\20 -set key scan \3349 \27\25 -set key scan \3350 \27\21 -set key scan \3351 \27\9 -set key scan \3352 \27\15 -set key scan \3353 \27\16 -set key scan \3358 \27\1 -set key scan \3359 \27\19 -set key scan \3360 \27\4 -set key scan \3361 \27\6 -set key scan \3362 \27\7 -set key scan \3363 \27\8 -set key scan \3364 \27\10 -set key scan \3365 \27\11 -set key scan \3366 \27\12 -set key scan \3372 \27\26 -set key scan \3373 \27\24 -set key scan \3374 \27\3 -set key scan \3375 \27\22 -set key scan \3376 \27\2 -set key scan \3377 \27\14 -set key scan \3378 \27\13 - -end of msiem2.ini ------------------- - -msiema.hlp ------------ -Date: Wed, 14 Sep 88 05:20:08 GMT -From: spolsky@YALE.ARPA -Subject: Using MS kermit 2.31 with emacs -Keywords: MS-DOS Kermit 2.31, EMACS, Meta Key - -If you are using kermit (version 2.31 only) with emacs on a mainframe, the -following file may help you. It assigns all the Alt-keys so that the Alt key -may be used as a "Meta" shift, e.g. Alt-x produces M-x, etc. Note that it -will distinguish correctly between upper and lower case and accepts all -printables. (If anybody has the patience to do the Meta-Ctrl combinations, -please post them!) This actually sends "escapes" so you don't need 8 bits. -This file also sets up the cursor keys to behave as expected. - -On extended keyboards (the ones with a separate cursor pad, like PS/2s) you -also get assignments for Page Up/Down, Home, End, Insert, Delete, etc. - -Please let me know if you find any problems with this. - -Joel Spolsky bitnet: spolsky@yalecs uucp: ...!yale!spolsky -Yale University arpa: spolsky@yale.edu voicenet: 203-436-1483 - -[Ed. - Thanks, Joel! Your key definitions file has been put in the kermit -distribution area as msiema.ini ("ms" for MS-Kermit, "i" because it's an -initialization file, "ema" for EMACS), along with this message as msiema.hlp.] - -end of msiema.hlp ------------------ - - -msiema.ini ------------- -; Emacs keyboard layout for Kermit 2.31 -; by Joel Spolsky, Yale Univ. Save this in a file, then -; initialize it by issuing the kermit command -; take filename -; It will set up the keyboard to allow ALT to be used -; as a meta-key, and will allow cursor keys to be used -; with emacs. - -; First, define all the ALT keys to send ESC+key -; to simulate "meta" - -set key \2320 \27q ;; letters: unshifted -set key \2321 \27w -set key \2322 \27e -set key \2323 \27r -set key \2324 \27t -set key \2325 \27y -set key \2326 \27u -set key \2327 \27i -set key \2328 \27o -set key \2329 \27p -set key \2334 \27a -set key \2335 \27s -set key \2336 \27d -set key \2337 \27f -set key \2338 \27g -set key \2339 \27h -set key \2340 \27j -set key \2341 \27k -set key \2342 \27l -set key \2348 \27z -set key \2349 \27x -set key \2350 \27c -set key \2351 \27v -set key \2352 \27b -set key \2353 \27n -set key \2354 \27m -set key \2832 \27Q ;; letters: shifted -set key \2833 \27W -set key \2834 \27E -set key \2835 \27R -set key \2836 \27T -set key \2837 \27Y -set key \2838 \27U -set key \2839 \27I -set key \2840 \27O -set key \2841 \27P -set key \2846 \27A -set key \2847 \27S -set key \2848 \27D -set key \2849 \27F -set key \2850 \27G -set key \2851 \27H -set key \2852 \27J -set key \2853 \27K -set key \2854 \27L -set key \2860 \27Z -set key \2861 \27X -set key \2862 \27C -set key \2863 \27V -set key \2864 \27B -set key \2865 \27N -set key \2866 \27M -set key \2857 \27\126 ; ALT + ~ ;; special symbols begin here -set key \2345 \27\96 ; ALT + ` -set key \2936 \27\33 ; ALT + ! -set key \2937 \27\64 ; ALT + @ -set key \2938 \27\35 ; ALT + # -set key \2939 \27\36 ; ALT + $ -set key \2940 \27\37 ; ALT + % -set key \2941 \27\94 ; ALT + ^ -set key \2942 \27\38 ; ALT + & -set key \2943 \27\42 ; ALT + * -set key \2944 \27\40 ; ALT + ( -set key \2945 \27\41 ; ALT + ) -set key \2946 \27\95 ; ALT + _ -set key \2947 \27\43 ; ALT + + -set key \2842 \27\123 ; ALT + { -set key \2843 \27\125 ; ALT + } -set key \2330 \27\91 ; ALT + [ -set key \2331 \27\93 ; ALT + ] -set key \2859 \27\124 ; ALT + : -set key \2347 \27\92 ; ALT + \ -set key \2867 \27< ; ALT + < -set key \2868 \27> ; ALT + > -set key \2343 \27\59 ; ALT + ; -set key \2855 \27\58 ; ALT + : -set key \2344 \27\39 ; ALT + ' -set key \2856 \27\34 ; ALT + " -set key \2355 \27\44 ; ALT + , -set key \2356 \27\46 ; ALT + . -set key \2357 \27\47 ; ALT + / -set key \2869 \27\63 ; ALT + ? -set key \2424 \27\49 ;; numbers -set key \2425 \27\50 -set key \2426 \27\51 -set key \2427 \27\52 -set key \2428 \27\53 -set key \2429 \27\54 -set key \2430 \27\55 -set key \2431 \27\56 -set key \2432 \27\57 -set key \2433 \27\48 - -;; These 6 special keys for extended (PS/2) keyboards: -set key \4434 \25 ;; Insert is like ^Y - yank from kill ring -set key \4435 \23 ;; Delete is like ^W - kill to ring -set key \4423 \1 ;; Home is ^A -set key \4431 \5 ;; End is ^E -set key \4425 \27V ;; Page up is Esc-V -set key \4433 \22 ;; Page dn is ^v - -set key \328 \16 ;; up cursor is ^P -set key \331 \2 ;; left cursor is ^B -set key \333 \6 ;; right cursor is ^F -set key \336 \14 ;; down cursor is ^N -set key \4427 \2 ;; left cursor on extended kbd -set key \4432 \14 ;; down cursor on extended kbd -set key \4424 \16 ;; up cursor on extended kbd -set key \4429 \6 ;; right cursor on extended kbd - -set key \5491 \27b ;; ctrl-left cursor is M-b -set key \5492 \27f ;; ctrl-right cursor is M-f - -;; move kermit's screen scroll (playback) features to Alt- Home,End,PgUp,PgDn -;; (this is an issue for extended keyboards only) - -set key \2455 \khomscn -set key \2463 \kendscn -set key \2457 \kupscn -set key \2465 \kdnscn - -;;; COPYING PERMISSIONS: -;;; -;;; This document is free software; you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 2 of the License, or -;;; (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program; if not, write to the Free Software -;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -;;; arch-tag: b066a884-e956-4f46-9d9c-13502f6cf7a6 diff -r edf631bdbb7a -r 738ce3540ffb etc/ms-kermit --- a/etc/ms-kermit Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/ms-kermit Sun Apr 22 12:12:29 2007 +0000 @@ -1,3 +1,7 @@ +;;; The code here is forced by the interface, and is not subject to +;;; copyright, constituting the only possible expression of the algorithm +;;; in this format. + ;;; This file is designed for an 8-bit connection. ;;; Use the file ms-7bkermit if you have a 7-bit connection. diff -r edf631bdbb7a -r 738ce3540ffb etc/sk-dired-ref.ps --- a/etc/sk-dired-ref.ps Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/sk-dired-ref.ps Sun Apr 22 12:12:29 2007 +0000 @@ -1,15 +1,17 @@ %!PS-Adobe-2.0 -%%Creator: dvips(k) 5.86d Copyright 1999 Radical Eye Software +%%Creator: dvips(k) 5.95b Copyright 2005 Radical Eye Software %%Title: sk-dired-ref.dvi %%Pages: 1 %%PageOrder: Ascend -%%BoundingBox: 0 0 596 842 +%%BoundingBox: 0 0 595 842 +%%DocumentFonts: csbx10 csr8 csbx8 cstt8 csr6 CMSY6 +%%DocumentPaperSizes: a4 %%EndComments %DVIPSWebPage: (www.radicaleye.com) %DVIPSCommandLine: dvips sk-dired-ref.dvi -%DVIPSParameters: dpi=600, compressed -%DVIPSSource: TeX output 2002.02.13:1838 -%%BeginProcSet: texc.pro +%DVIPSParameters: dpi=600 +%DVIPSSource: TeX output 2007.03.19:1912 +%%BeginProcSet: tex.pro 0 0 %! /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S N}B/A{dup}B/TR{translate}N/isls false N/vsize 11 72 mul N/hsize 8.5 72 @@ -28,22 +30,10 @@ definefont setfont}B/Cw{Cd A length 5 sub get}B/Ch{Cd A length 4 sub get }B/Cx{128 Cd A length 3 sub get sub}B/Cy{Cd A length 2 sub get 127 sub} B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr -1 add N}if}B/id 0 N/rw 0 N/rc 0 N/gp 0 N/cp 0 N/G 0 N/CharBuilder{save 3 -1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx -0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx -sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{ -rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp -gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B -/chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{ -/cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{ -A A add 255 and S 1 and or}ifelse}ifelse put 1 adv}B/rsh{rw cp 2 copy -get A 0 eq{pop 128}{A 255 eq{pop 127}{A 2 idiv S 128 and or}ifelse} -ifelse put 1 adv}B/clr{rw cp 2 index string putinterval adv}B/set{rw cp -fillstr 0 4 index getinterval putinterval adv}B/fillstr 18 string 0 1 17 -{2 copy 255 put pop}for N/pl[{adv 1 chg}{adv 1 chg nd}{1 add chg}{1 add -chg nd}{adv lsh}{adv lsh nd}{adv rsh}{adv rsh nd}{1 add adv}{/rc X nd}{ -1 add set}{1 add clr}{adv 2 chg}{adv 2 chg nd}{pop nd}]A{bind pop} -forall N/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn +1 add N}if}B/CharBuilder{save 3 1 roll S A/base get 2 index get S +/BitMaps get S get/Cd X pop/ctr 0 N Cdx 0 Cx Cy Ch sub Cx Cw add Cy +setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx sub Cy .1 sub]{Ci}imagemask +restore}B/D{/cc X A type/stringtype ne{]}if nn/base get cc ctr put nn /BitMaps get S ctr S sf 1 ne{A A length 1 sub A 2 index S get sf div put }if put/ctr ctr 1 add N}B/I{cc 1 add D}B/bop{userdict/bop-hook known{ bop-hook}if/SI save N @rigin 0 0 moveto/V matrix currentmatrix A 1 get A @@ -67,684 +57,2015 @@ rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end %%EndProcSet -TeXDict begin 39158280 55380996 1000 600 600 (sk-dired-ref.dvi) -@start -%DVIPSBitmapFont: Fa cstt8 8 63 -/Fa 63 127 df<123812FEB3A8127C1200A7123812FEA51238072A72A923>33 -D35 -D<130E131FA4EB7FC03803FFF04813FC001F7F487FD87FDF1380EB1F1F00FEEB0FC012FC -00F8131FA312FCEC0F8000FEEB0700007F90C7FCEA3FDF13FF000F13C06C13F0000113FC -6C6C7EEB1FFFEC7F80141F15C0007C130F00FE1307A400FC130FA2007EEB1F80007F133F -9038DFFF006CB45A6C5B00075B6C13E038007F80011FC7FCA5130E1A347CAD23>I<000F -EB01C0391F8003E0383FC007EA7FE0140FD8F9F013C0141F00F01480A2143F150000F95B -147EEA7FE014FE6C485AEA1F80EA0F0100005B13035CA213075C130F5CA2131F5C133F91 -C7FCA25B137E9038FE03C09038FC07E0EC0FF00001EB1FF813F8EC3E7C12039038F03C3C -120713E0A2000FEB3E7C13C0001FEB1FF81380EC0FF0000FEB07E039070003C01E347EAD -23>I<137CEA01FE487E487FA2EBCFC0EA0F87A21303A31307A290380FCFF8EC9FFC139F -13BF3907FF0FF801FE138013FCA29038F81F00EA0FF0381FE01E383FF03E13F8007F5BEA -7E7C00FC1378EB3EF812F86D5AA290380FE03C1307EAFC0F90381FF07C387E3FFC007FB5 -12FC393FFE7FF8EBFC3F390FF01FE03907E007C01E2B7EA923>I40 D<131EA2131F131EA30070EB0380007C130F00FEEB1FC0397F -9E7F8090B5FC001FEBFE00000713F8000113E038007F803801FFE0000713F8001F13FE00 -7FEBFF80EB9E7F39FE1E1FC0007CEB0F8000701303000090C7FCA3131F131EA21A1D7CA2 -23>42 D -I<007FB51280B612C0A46C14801A067C9623>45 D<123E127FEAFF80A5EA7F00123E0909 -738823>II50 -DI60 D<007FB512F8B612FCA4003F14F8C9FCA6003FB512F8B612FCA46C14 -F81E127E9C23>I<127012FC7E7E13C06C7EEA1FF86C7E6C7E3801FF806C7FEB3FE0EB1F -F86D7EEB03FE903801FF806D13C0143FA214FF491380903803FE00EB0FFC495AEB3FE0EB -FFC0485BD807FEC7FC485A485AEA7FE0485A90C8FC5A5A12701A247CA523>I<3801FFC0 -000713F8001F13FE487F48148039FF007FC048130F1407A2140F007C131F0038EB7F80C7 -12FF01031300EB07FCEB0FF0495A5C495AA291C7FCA6133E90C8FCA7131C137FA5131C1A -297CA823>IIII<90380FE0E090383FF9F0EBFFFD4813FF5A3807 -FC3F380FF00F381FC007A2383F80031300481301127EA2007CEB00E000FC1400A25AA97E -A2127C007E14E0EC01F0127F7EEB8003EA1FC0EC07E0380FF00F3907FC1FC06CB512806C -14006C5BEB3FF8EB0FE01C2B7DA923>I<90381FC1C090387FF3E090B5FC12035AEBF83F -380FE01F381FC00F1380003F13071300007E1303A3007CEB01C000FC90C7FCA25AA6EC7F -F815FCA27E15F8007CEB03E0127E1407A27EEB800F121FEBC01FEA0FE03807F87F90B5FC -7EC613FB90387FF1C090381FC0001E2B7EA923>71 D<397FF00FFE39FFF81FFFA3397FF0 -0FFE390F8001F0AC90B5FCA5EB8001AE397FF00FFE39FFF81FFFA3397FF00FFE20297FA8 -23>II76 D<39FF8001FFA26D5AA3391EE00778 -A3EBF00FEB700EA2EB781EA2EB381CEB3C3CA2EB1C38EB1E78A2EB0E70A3EB07E0A3EB03 -C0A290C7FCA939FFC003FFA520297FA823>I<3803FFF0000F13FC487F487FA2397F807F -80387E001F007C130FA200FC14C0481307B3A46C130FA2007C1480A2007E131F387F807F -6CB51200A26C5B6C5B000313F01A2B7CA923>79 DI<3803FFF0000F13FC487F487FA2397F807F80387E -001F007C130FA200FC14C0481307B3A3131F148700FC138F397C0FCF80A2387E07FFEA7F -876CB51200A26C5B6C5B1203C7FC147EA280A2EC1F80A2140F1A337CA923>I<387FFFC0 -B512F88014FF7E390F807F80EC1FC0140F6E7E1403A514074A5A141FEC7F8090B5C7FCA2 -14FC8080EB807F6E7E141F140FA61587ED8F80A215CFD87FF013DF39FFF807FF1600806C -486C5AC812F8212A7FA823>I<9038FF83800003EBE3C04813FF121F5AEA7FC0EB003F00 -FE131F48130FA25A1407A26CEB038091C7FC127E127FEA3FF06CB4FC6C13F06C13FC0001 -7F39001FFF80010113C0EB001FEC0FE01407EC03F0A20070130112F8A36C1303A26CEB07 -E06C130F9038E03FC090B5FC15005C00F15B38703FE01C2B7DA923>I<39FFF81FFFA539 -0F8001F0B3A7EBC003A2000714E0EBE007EBF00F000314C0EBFC3F6CB512806C14006D5A -EB1FF8EB07E0202A7FA823>85 D<397FF07FF0EBF8FFA3EBF07F3907E03F000003133EEB -F07E0001137CEBF8FC00005B13FDEB7DF0137F6D5AA26D5AA26D5AA280131F80133F8013 -7DEB7CF813F8147CEA01F0801203497E12079038C00F80120F397FE03FF8D8FFF013FCA3 -D87FE013F81E297EA823>88 D<397FF00FFE39FFF81FFFA3397FF00FFE3907C003E0EBE0 -07000314C013F00001130F01F813800000131F01FC1300137C143E133E147EEB1F7CA26D -5AA26D5AA25C1303ACEB1FFC497EA36D5A20297FA823>I<003FB512E04814F0A4397C00 -07E0140FEC1FC01580143F0038EB7F00C7127E14FE495A5C1303495A5C130F495A5C133F -49C7FC137E13FE485A5B1203485A4913E0000FEB01F0EA1FC01380123FEA7F00127EB6FC -A46C14E01C297DA823>I<133013FCEA03FF000F13C0003F13F0B512FC1387EAFE0138F8 -007C00601318160A7AA823>94 D<007FB51280B612C0A46C14801A067C7E23>I<3803FF -80000F13E04813F8487F80EB80FFEC3F80381F001FC7FC140F14FF137F0003B5FC120F5A -387FF00F130012FCA25A141F7E6C133F387F81FF90B512FC6C14FE7E000713C73901FE01 -FC1F1D7D9C23>97 D99 DII<147F903801FFC0010713E05B5BEB3FCF140F90383E07C091C7FCA4 -007FB51280B612C0A36C1480D8003EC7FCB3383FFFFE487FA36C5B1B297EA823>III<133813FEA5133890C7FCA6EA7FFC487EA3127FEA00 -3EB3387FFFFEB6FCA36C13FE182A7AA923>I<14E0EB03F8A5EB00E01400A63803FFF048 -13F8A37EC7FCB3AB13011238387C03F012FEEB0FE0B5FC14C06C13006C5AEA0FF815397D -A923>III<397E1F01F039FF7FC7FC9038FFEFFE14FF6C80390FE1FE1F -EBC1FC01C07FEB80F8A2EB00F0AE3A7FE3FE3FE026FFF3FF13F0A3267FE3FE13E0241D81 -9C23>I<38FF81FCEBC7FF01DF138090B512C0A23907FE0FE0EBF807EBF00313E0A313C0 -AD39FFFE1FFF5CA380201D7F9C23>I<133F3801FFE0487F487F487F381FC0FE383F807F -383E001F007E1480007C130F00FC14C0481307A66C130FA2007C1480007E131F6CEB3F00 -6D5A381FE1FE6CB45A6C5B6C5B6C5BD8003FC7FC1A1D7C9C23>I<38FF81FCEBC7FF01DF -13C090B512E015F03907FE0FF8EBF8039038F001FCEBE000A249137EA2153EA5157E7F15 -FC7F14019038F803F89038FE0FF090B5FC15E001DF138001CF1300EBC3F801C0C7FCAAEA -FFFEA51F2C7F9C23>I<90383FC1C09038FFF3E0000313FB4813FF5A381FF07F383FC01F -387F000F127E14075A14035AA57E1407127E140F007F131FEA3F80381FE07F90B5FC1207 -6C13FB6C13E338003F83EB0003AAEC7FFF91B51280A36E1300212C7E9C23>I<397FF00F -E039FFF87FF8ECFFFC13FB6CB5FCC613F8ECC078EC800091C7FC5BA25BA35BAA387FFFFC -B57EA36C5B1E1D7E9C23>I<3801FF9C000F13FE5A127FA2EAFF0000FC137E48133EA26C -131C6C1300EA7FF0383FFF80000F13E06C13F838007FFCEB01FEEB007F0070133F00F813 -1F7E143F7E38FF80FFEBFFFE14FC14F814F000701380181D7B9C23>I<137013F8A7007F -B51280B612C0A36C1480D800F8C7FCACEC01C0EC03E0A3EBFC07140F9038FE1FC0EB7FFF -158090383FFE00EB0FFCEB07F01B257EA423>I<39FF807FC001C013E0A400071303B014 -07140FEBE03F90B6FC7EA2C613F3EB3FC1201D7F9C23>I<39FFF03FFCA5390F8007C000 -071480A2EBC00F00031400A26D5A0001131EA2EBF03E0000133CA2EBF87CEB7878A2EB7C -F8EB3CF0A2133F6D5AA36D5A6D5A1E1D7E9C23>I<397FF00FFE39FFF81FFFA3397FF00F -FE001FC712F86C14F0A57F390783E1E0EB87F1A3EB8FF90003EB79C013CFA2EBDF7BA2EB -DE3B00011480EBFE3FA2EBFC1FA23900F80F00201D7F9C23>I<397FF07FF039FFF8FFF8 -A3397FF07FF03903E03E003801F03C3800F87CEB78F8EB7CF0EB3FE0131F6D5A5C130749 -7E497E133DEB3CF0EB7878EBF07C0001133C497E3803C01F397FF03FF839FFF87FFCA339 -7FF03FF81E1D7E9C23>I123 D125 D<3803C038380FF07C381FF8FCEA3FFF4813F8B512F038FC7FE038F83FC038 -700F0016097AA823>I E -%EndDVIPSBitmapFont -%DVIPSBitmapFont: Fb csbx10 12 37 -/Fb 37 254 df<923B1FFF8001FFC00203B5D8F01F13F0021FDAF87F13FC027F91B67E90 -2701FFF803ECC3FF49D9C001EBFE0790270FFE000349481380494815F84A4913F0494815 -E0495AA201FF4C6C13004A6D6E5A735A70EC00707092C7FCAABA12FCA5C601E0C701E0C8 -FCB3B0007F9026FFC07FEBFFF0A549467EC543>11 DI68 -D70 D77 DI<923803FFE0037F13FF0203B612E0021F15FC027F903800 -7FFF902601FFF8010F13C04901C001017F010F496D13F84948C8EA3FFC49486F7E49486F -7E01FF8448496F7F4A81488548496F7FA248496F7FA2488591CA127F4885A348854983A4 -00FF1A80AD007F1A006D5FA36C61A26E16FF6C61A36C6D4B5BA26C6D4B5B6C616E5D6C6D -4B5B6C6D4B5B6D6C4B90C7FC6D6C4B5A6D6D4A5A6D01E001035B010301F8010F13E06D01 -FF017F5B6D6C90B6C8FC021F15FC020715F0DA007F91C9FC030713F049467AC456>II83 D<903801FFF8011FEBFF80017F14E090B612F8489038807FFC3A03FE001FFE486C -EB07FF486E7F0280806F7FA36F7F6C90C7FCA26C5AEA00F890C8FCA2150F021FB5FC0103 -B6FC131F017F13C03901FFFC004813E0000F13804890C7FC485A5B485AA2485AA45DA26C -6C5BED07BF6C6C010F13FC6CB490391F3FFFE06C9026C0FE1F13F06CEBFFFC6CECF007C6 -6CD9E00113E0010790C9FC342F7DAD38>97 DIIII<902601FFF013FF010FD9FE031380013FD9 -FF8F13C090B812E048D9C07F13BF489039001FF83F4848EB0FFC4848EB07FE001F9238FF -1FC0496DEB0F8094C7FC003F82A7001F93C7FCA26D5B000F5D6C6C495A6C6C495A6C9038 -C07FF04890B55A1680D8078F49C8FC018113F0D80F80CAFCA47F7F13F890B612E016FEEE -FFC06C16F0836C826C82831207481780D81FF8C77ED83FE014074848020113C000FF8149 -157FA56D15FF007F17806D5C6C6C4A1300D81FFCEC0FFE6CB4EC3FFC6C9039E001FFF800 -0190B612E06C6C1580010F02FCC7FCD9007F138033427DAC39>103 -D<13FCEA03FF4813804813C0A24813E0A66C13C0A26C13806C1300EA00FC90C7FCA9EB7F -C0EA7FFFA512037EB3AFB6FCA518467CC520>105 D107 DI<90287FC003FF80EB07FFB5011F01F0013F13E0037F6D90B5 -7E92B56C4880913DC1FC1FFE03F83FFC913DC3E00FFF07C01FFE00039026C7C00790398F -800FFF6CD9CF00EC9E0002DE6D01BC7F02FC03F81580A24A5D4A5DA34A5DB3A7B600C1B6 -0083B6FCA5582D7CAC5F>I<903A7FC003FF80B5011F13F0037F7F92B57E9139C1FC1FFE -9139C3E00FFF00039026C7C0077F6CEBCF0002DE7F02FC81A25C5CA35CB3A7B600C1B612 -80A5392D7CAC40>II<90397FC01FFCB590B512C002C314F002CF14FC9139DFF03FFF9126FF800F13800003 -9026FE000313C06C496D13E002F015F04A7FEF7FF8A218FC173F18FEA3EF1FFFAB18FE17 -3FA318FC177F18F817FF6E15F06E4913E06E4913C06E4913806E6C4813009238E07FFE02 -EFB55A02E314F002E01480DB1FF8C7FC92C9FCADB612C0A538407DAC40>I<90397F803F -C0B5EBFFF0028313F8028713FC91388FE7FE91389F8FFF0003EB9E0F6C13BCA214F8A291 -38F007FEED03FC9138E001F892C7FCA35CB3A5B612C0A5282D7DAC2F>114 -D<90391FFE078090B512DF000314FF5A380FF803381FE000D83F80133F127F90C7121FA2 -48140FA27FA201E090C7FC13F8EBFFC06C13FEECFFC06C14F015FC6C806C806C15800001 -15C07E011F14E01301D9000713F014000078147F00F8143F151F6C140FA37E6C15E0151F -6D14C06D133F01F0EB7F809039FC03FF0090B55A00FC5CD8F83F13F0D8F00790C7FC242F -7CAD2D>IIII<007FB5398007FFFCA5000101F0C7EA7F806CEE3E006E14 -7E017F157C8017FC013F5D6E1301011F5D6E13036D5DED80076D5DEDC00F6D5D15E0161F -6D92C7FC6F5A6D143EEDF87E027F137CEDFCFC023F5B15FF6E5BA36E5BA26E5BA26E5BA2 -6E90C8FCA26E5AA2157CA215FC5D1401000F5C383FC003D87FE05B1407D8FFF05B140F5D -141F4AC9FC387FE07E495A383F87F8EBFFF06C5B00071380D801FCCAFC36407EAB3C> -121 D<001FB7128017C0A39026FE001F138001F05B49491300495C49495A48485A4A5B5E -4A5B003E5B4A5B5E4A90C7FC5CC7485A5D495B5B495B5D499038C007C05B491380150049 -48130F01FF1580485B5C4849131F5A485B4A133F4849137F4815FF48EB000349011F1300 -B8FCA37E2A2C7DAB33>I<0070EC038000F8EC07C0007EEC1F806CEC3F00D81FC013FE6C -6C485A3907F807F8EBFE1F6C6C485A6CEBFFE06C5C6D5B6D90C7FC6D5A6D5A6D5A6D5A6D -5A6D5A91C8FCA290391FFE078090B512DF000314FF5A380FF803381FE000D83F80133F12 -7F90C7121FA248140FA27FA201E090C7FC13F8EBFFC06C13FEECFFC06C14F015FC6C806C -806C1580000115C07E011F14E01301D9000713F014000078147F00F8143F151F6C140FA3 -7E6C15E0151F6D14C06D133F01F0EB7F809039FC03FF0090B55A00FC5CD8F83F13F0D8F0 -0790C7FC24447CC22D>185 D<00071538486C147CD807E0495A6C6C495AD801FCEB0FE0 -6C6C495A90397F807F80ECE1FFD93FF390C7FC6DB45A6D5B6D5B6D5B6D5B6D5B6E5A6EC8 -FC141E140C91C9FCA4001FB7128017C0A39026FE001F138001F05B49491300495C49495A -48485A4A5B5E4A5B003E5B4A5B5E4A90C7FC5CC7485A5D495B5B495B5D499038C007C05B -49138015004948130F01FF1580485B5C4849131F5A485B4A133F4849137F4815FF48EB00 -0349011F1300B8FCA37E2A437DC233>190 D<162016FCED03FE824B7F5D5DA25D5D94C7 -FC4B5A4A5B4A13E016804A48C8FCEC0FF815E092C9FC140491CAFCA5903801FFF8011FEB -FF80017F14E090B612F8489038807FFC3A03FE001FFE486CEB07FF486E7F0280806F7FA3 -6F7F6C90C7FCA26C5AEA00F890C8FCA2150F021FB5FC0103B6FC131F017F13C03901FFFC -004813E0000F13804890C7FC485A5B485AA2485AA45DA26C6C5BED07BF6C6C010F13FC6C -B490391F3FFFE06C9026C0FE1F13F06CEBFFFC6CECF007C66CD9E00113E0010790C9FC34 -487DC638>225 D<0170EC038001F8EC07C0017EEC1F806DEC3F00D91FC013FE6D6C485A -903907F807F8ECFE1F6D6C485A6DEBFFE06D5C6E5B6E90C7FC6E5A6E5A6E5A6E5A6E5A6E -5A92C8FCA2EC3FFE49B512E0010F14F8013F8090397FF807FE9039FFE001FF4849481380 -48018014C048495A485A121FA2485A6F1380A2007F6E130049EB007C93C7FC12FFAC127F -7FA2123FEE03E06C7E16076C6C15C06C150F6C6DEB1F806C6DEB3F006C01F013FE90397F -FE03FC6DB55A010F5C010314C09026003FFCC7FC2B447CC233>232 -D<1608163FEEFF8017C04B13E05D5DA25D5D17C04B13804B1300EDFFF816E04A13804A48 -C7FC15F815C06EC8FC91C9FCA5EC1FFE49B512C0010714F0011F14FC90397FFC0FFE903A -FFE003FF804849C613C0485B4890C7EA7FE048ED3FF0485AEE1FF8485AA2007F150F4915 -FCA212FFA390B7FCA317F801F8C9FCA5127FA27FA2003F1638177C6C6C15FCA26C6CEC01 -F86C6D13036CED07F06C6DEB0FE06C01F0EB3FC0903A3FFE01FF806DB5EAFE0001075C01 -0014F0020F90C7FC2E487DC635>I<1408143FECFF8015C04913E05B5BA25B5B15C04913 -80491300EBFFF814E04813804848C7FC13F813C06CC8FCC9FCA6EB7FC0EA7FFFA512037E -B3AFB6FCA51B477CC620>237 D<162016FCED03FE824B7F5D5DA25D5D94C8FC4B5A4A5B -4A13E016804A48C9FCEC0FF815E092CAFC140491CBFCA6D93FE0EC7FC0B549B5FCA50003 -EC00076C81B3A85EA35E6C5DA26E013D7F017F02F9EBFF8090393FFC03F16DB512E16D14 -C1010314019026003FFC91C7FC39487CC640>250 D<1602EE0FC0EE3FE0834C7E16FF5D -A25D5D5F4B5B4B5B4B48C7FC16F8ED7FE0EDFF804BC8FC15F0154092C9FCA7007FB53980 -07FFFCA5000101F0C7EA7F806CEE3E006E147E017F157C8017FC013F5D6E1301011F5D6E -13036D5DED80076D5DEDC00F6D5D15E0161F6D92C7FC6F5A6D143EEDF87E027F137CEDFC -FC023F5B15FF6E5BA36E5BA26E5BA26E5BA26E90C8FCA26E5AA2157CA215FC5D1401000F -5C383FC003D87FE05B1407D8FFF05B140F5D141F4AC9FC387FE07E495A383F87F8EBFFF0 -6C5B00071380D801FCCAFC365B7EC63C>253 D E -%EndDVIPSBitmapFont -%DVIPSBitmapFont: Fc csbx8 8 23 -/Fc 23 251 df<14E01301EB07C0EB0F80EB1F00133E137E5B5B1201485AA2485AA2485A -A2121F5B123FA290C7FC5AA512FEAF127FA57E7FA2121F7F120FA26C7EA26C7EA26C7E12 -007F137E133E7FEB0F80EB07C0EB01E01300134378B120>40 D<12E07E127C7E7E6C7E7F -6C7E12037F6C7EA26C7EA2137EA2137F7F1480A2131F14C0A5EB0FE0AFEB1FC0A5148013 -3FA214005B137EA25BA2485AA2485A5B1207485A5B48C7FC123E5A12F05A13437CB120> -I68 D79 D<007FB548B512E0A4C690 -3AE0000FE0006D6C5C6E495A6D6C49C7FC011F5C6D6C137E6E5B6DEB81F86D13836DEBC7 -F0EDE7E06DEBFFC06E5B8093C8FC6E5A140F6E7E826E7F5C4A7F4A7F82EC3F3F91387E1F -FC02FE7F4A6C7E49487E49486C7F0107814A6C7F49487E49486D7E013F8149C76C7E017E -141F496E7EB5D8F001B512FCA4362E7DAD3D>88 D97 D99 DII105 -DII<2707E00FF8EB1FF000FFD97FFEEBFFFC01E1B5 -008313FF9028E7E07FCFC01380903BEF803FDF007F260FFE0013FC031FEC3FC0495C495C -A2495CB0B53B01FFFE03FFFCA43E1E7C9D45>109 D<3907E01FF000FFEB7FFC01E1B5FC -D9E7E013809038EF807F260FFE0013C049133FA25BA25BB0B53803FFFCA4261E7C9D2D> -I<3903F03FE039FFF1FFFC01F713FFD9FFC013809039FE007FC0D80FFCEB3FE049EB1FF0 -5BED0FF8A216FC1507A8ED0FF8A3ED1FF07F6DEB3FE06DEB7FC09039FF81FF809039F7FF -FE0001F113F89038F07FC091C8FCA9B5FCA4262B7D9D2D>112 D<3807E07E39FFE1FF80 -01E313E0EBE78F9038EF1FF0EA0FFE13FCA29038F80FE0EC07C091C7FC5BAFB57EA41C1E -7D9D22>114 D117 D121 -D<003FB512FCA39038C00FF89038001FF0003E133F48EB7FE0ECFFC04913800078140049 -5A1307C6485A495A5C495A017F133CEBFFC048138014004848137C1207485A484813F848 -5AEBE003387FC00FB6FCA31E1E7E9D24>I<000EEB01C0001FEB03E0390FC00FC03907E0 -1F803903F87F003801FCFE6CB45A6D5A6D5A6D5A6D5A6D5A6DC7FC90C8FCA2003FB512FC -A39038C00FF89038001FF0003E133F48EB7FE0ECFFC049138000781400495A1307C6485A -495A5C495A017F133CEBFFC048138014004848137C1207485A484813F8485AEBE003387F -C00FB6FCA31E2D7EAC24>190 D232 D<130E131FEB3F80137FEBFFC05A481380481300485AEA1FF0EA3FC0 -001EC7FC1208C8FCA4EA03F012FFA4120FB3A3B5FCA4122F7CAE17>237 -D250 D E -%EndDVIPSBitmapFont -%DVIPSBitmapFont: Fd csr8 8 56 -/Fd 56 254 df<9138FF807E01079038E1FF80903A1F807FC3C0D93E00EB87E049EBFF07 -4913FE485A00039138FC018049017CC7FCAAB712FCA22703E0007CC7FCB3A6486C13FE3A -7FFF0FFFF0A22B2F7FAE29>11 D<14FF010713E090381F80F090383E003849137C4913FC -485A1203491378153092C7FCA7157CB612FCA23803E000157CB3A5486C13FE3A7FFF0FFF -E0A2232F7FAE27>I<13031307130E131C1338137013F0EA01E013C01203EA0780A2EA0F -00A2121EA35AA45AA512F8A25AAB7EA21278A57EA47EA37EA2EA0780A2EA03C0120113E0 -EA00F013701338131C130E1307130310437AB11B>40 D<12C07E12707E7E7E120FEA0780 -120313C0EA01E0A2EA00F0A21378A3133CA4131EA5131FA2130FAB131FA2131EA5133CA4 -1378A313F0A2EA01E0A2EA03C013801207EA0F00120E5A5A5A5A5A10437CB11B>I<123C -127EB4FCA21380A2127F123D1201A312031300A25A1206120E5A5A5A126009157A8714> -44 DI<123C127E12FFA4127E123C08087A8714>I<15C0140114 -031580A214071500A25C140EA2141E141CA2143C143814781470A214F05CA213015CA213 -035C130791C7FCA25B130EA2131E131CA2133C1338A21378137013F05BA212015BA21203 -5BA2120790C8FC5A120EA2121E121CA2123C1238A212781270A212F05AA21A437CB123> -I<130C133C137CEA03FC12FFEAFC7C1200B3B113FE387FFFFEA2172C7AAB23>49 -DI68 DI71 -D78 D80 D85 D<13FF000713C0380F01F0381C00F800 -3F137C80A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E -00FE14065AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F83901FC01E01F207D -9E23>97 DII<15 -F8141FA214011400ACEB0FE0EB7FF83801F81E3803E0073807C003380F8001EA1F004813 -00123E127EA25AA9127C127EA2003E13017EEB8003000F13073903E00EFC3A01F03CFFC0 -38007FF090391FC0F800222F7EAD27>III<013F13F89038FFC3FE3903E1FF1E3807807C000F140C391F00 -3E00A2003E7FA76C133EA26C6C5A00071378380FE1F0380CFFC0D81C3FC7FC90C8FCA312 -1E121F380FFFF814FF6C14C04814F0391E0007F848130048147C12F848143CA46C147C00 -7C14F86CEB01F06CEB03E03907E01F803901FFFE0038003FF01F2D7E9D23>III<130FEB1F80EB3FC0A4EB1F -80EB0F0090C7FCA8EB07C013FFA2130F1307B3AD1230127838FC0F80A21400485AEA783E -EA3FF8EA07E0123C83AD16>III<2607C07FEB07F03BFFC3FFC03FFC903AC783F0783F3C -0FCE01F8E01F803B07DC00F9C00F01F8D9FF8013C04990387F000749137EA249137CB248 -6C01FEEB0FE03CFFFE0FFFE0FFFEA2371E7E9D3C>I<3807C0FE39FFC3FF809038C703E0 -390FDE01F0EA07F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2221E7E9D27>II<3807C0FE39FFC7FF809038CF03E0390FDC01F03907F800 -FC49137E49133E49133FED1F80A3ED0FC0A8151F1680A2ED3F00A26D137E6D137C5D9038 -FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8FCA9487EEAFFFEA2222B7E9D27>I< -380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2181E7E -9D1C>114 D<3801FE183807FFB8381E01F8EA3C00481378481338A21418A27E7EB41300 -EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138C0007E143EA26C131EA27EA26C -133CA26C137838FF01F038E3FFC000C0130017207E9E1C>I<1360A413E0A312011203A2 -1207121FB512F0A23803E000AF1418A714383801F03014703800F860EB3FE0EB0F80152A -7FA81B>II<3AFFFC01FFC0A23A0FE0007E00 -0007147C15380003143015706C6C1360A26C6C5BA390387C0180A26D48C7FCA2EB3F07EB -1F06A2EB0F8CA214DCEB07D8A2EB03F0A36D5AA26D5A221E7F9C25>I<3AFFFC07FF80A2 -3A0FF003FC000003EB01F0000114C06D485A000091C7FCEB7C06EB3E0E6D5A14B8EB0FB0 -EB07E013036D7E497E1307EB067C497EEB1C1F01387FEB700F496C7E6E7ED803C07F0007 -6D7E391FE003FC3AFFF007FFC0A2221D7F9C25>120 D<3AFFFC01FFC0A23A0FE0007E00 -0007147C1538000314306D137000011460A26C6C5BA2EBFC01017C5BEB7E03013E90C7FC -A2EB1F06A2148EEB0F8CA2EB07D8A2EB03F0A36D5AA26D5AA2495AA2130391C8FC1278EA -FC06A25B131CEA7838EA7070EA3FE0EA0F80222B7F9C25>I<003FB51280A2EB003F003C -14000038137E00305BEA700100605B495A495A130F00005B495A49C7FC5B137E9038FC01 -80EA01F8120313F03807E003EA0FC0001F1400138048485A007E5B00FE133FB6FCA2191D -7E9C1F>II<38078008380FE01C381FF838383FFFF038707FE038 -E01FC03840078016077AAC23>126 D181 D<0040130800F0133C007813786C13F0381F03E0380F87C03807CF803803FF -006C5A6C5A1378133090C7FCA23801FE183807FFB8381E01F8EA3C00481378481338A214 -18A27E7EB41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138C0007E143EA2 -6C131EA27EA26C133CA26C137838FF01F038E3FFC000C01300172E7EAC1C>185 -D<143C147E14FF1580A3147F143DEB6001140315005CEBE006140E5C0001137800031360 -91C7FC120F121FB512F0A2D803E0C7FCAF1418A714383801F03014703800F860EB3FE0EB -0F8019327FB01B>187 D<00101302003C130F6C131E6C5B3807C0F83803E1F03801F3E0 -6CB45A6D5A6DC7FC131E130C90C8FCA4003FB51280A2EB003F003C14000038137E00305B -EA700100605B495A495A130F00005B495A49C7FC5B137E9038FC0180EA01F8120313F038 -07E003EA0FC0001F1400138048485A007E5B00FE133FB6FCA2192D7EAC1F>190 -D<143C147C14FCA2495A495AEB07C0495A49C7FC131C5B131090C8FCA313FF000713C038 -0F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0 -EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F8 -3901FC01E01F2F7DAD23>225 D<000F131E381F803F393FC07F80A4391F803F00380F00 -1EC9FCA213FF000713C0380F01F0381C00F8003F137C80A2143F001E7FC7FCA4EB07FF13 -7F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065AA3143F7E007E137F007FEBEF -8C391F83C7FC390FFF03F83901FC01E01F2A7DA823>228 D<00085B001EEB07806CEB0F -003807801E3803E07C6C6C5A3800F9F0EB7FE06D5A6D5A6DC7FC130690C8FCA2EB1FE0EB -7FFC3801F01E3803E0073907C01F80EA0F80EA1F005A003EEB0F00007E90C7FCA2127C12 -FCA9127EA215C07E6C130101801380380FC0033907E007003801F03E38007FF8EB1FC01A -2E7EAC1F>232 D<140F5C5CA2147E5CEB01F0495A495A91C7FC130E130490C8FCA3EB1F -80EBFFF03803E0783807C03E380F801E381F001FEC0F80123E007E130715C0127C12FCA3 -B6FCA200FCC8FCA5127EA2003E14C0123F6C1301390F80038001C013003803E00F3801F0 -3C38007FF8EB1FC01A2F7EAD1F>I<131E133E137EA213FCEA01F8EA03E0EA07C0EA0F80 -EA0E005A1208C7FCA4EA07C012FFA2120F1207B3A5EA0FE0EAFFFCA20F2E7EAD14>237 -D<163C167E16FF03F81380141FA20201137F0200133D1601160317005E1606160E5E1678 -166093C7FCA2EB0FE0EB7FF83801F81E3803E0073807C003380F8001EA1F00481300123E -127EA25AA9127C127EA2003E13017EEB8003000F13073903E00EFC3A01F03CFFC038007F -F090261FC0F8C7FC29327EB027>239 D<00085B001EEB07806C49C7FC3807801E3803E0 -7C6C6C5A3800F9F0EB7FE06D5A6D5A6DC8FC130690C9FCA33807C0FE39FFC3FF809038C7 -03E0390FDE01F0EA07F8496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2222D7EAC27> -242 D244 D<141E143E147EA25C495AEB03E0495A -495A010EC8FC5B130890C9FCA4D807C013F800FF131FA2000F130100071300B21401A314 -033803E007EC0EFC3A01F81CFFC038007FF890391FE0F800222F7EAD27>250 -D253 -D E -%EndDVIPSBitmapFont -%DVIPSBitmapFont: Fe csbx10 14.4 14 -/Fe 14 233 df -68 D82 -D<91383FFFC00107B512FC011FECFF80017F15E090B77E48D9E0077F48D9800013FE486D -EB3FFF82486D81707F8284A2707F6C5BA26C5BC648C7FC90C8FCA44BB5FC4AB6FC143F49 -B7FC130F013FEBFE0390B512E0000314004813FC4813F0485B485B5C4890C7FCA2B5FC5B -A35EA27F6C5D5E6E497F6C6D017E13FE6C6D4848EBFFF86C9026FC0FF814FC6C90B5487E -0001EDC03F6C6CEC800F011F9026FE000313F8010101E090C8FC3E387CB643>97 -D<943801FFC00407B5FCA6EE001F1707B3A3913803FFC0023F13FC49B6FC010715C74915 -F7013FD9E03FB5FC49EB0007D9FFFC130148496D7E484980484980484980A25A5C5AA25A -91C8FCA3B5FCAD7EA46C7FA27EA26C6D5CA26C6D5C6C5E6C6D49B5FC6C6D4914F0D97FFE -010FECFFC0903A3FFF807FEF6D90B512CF0107158F6DECFE0FD9007F13F00207018049C7 -FC42547BD24C>100 D<913803FFE0023F13FE91B612C0010381010F15F84901C07F903A -7FFE001FFE49486D7E48496D138048496D13C0484915E048814A15F048815C48EE7FF8A2 -5A91C8FC18FC173FB5FCA391B7FCA418F891CAFCA57EA3807EA218786C6D15FC17016C7F -6CEE03F86C6D14076E15F06C6DEC1FE06C6C6C143F6D6C6CEBFFC06DD9F0071300010790 -B55A010115F86D6C14E0021F1480020001F8C7FC36387CB63F>II<137F3801FFC0487F487F487FA2487FA76C5BA26C5B6C5B6C5B6C6C -C7FC90C8FCABEB1FF8B5FCA612017EB3B3A4B612F0A61C547BD326>105 -D107 D110 -D112 -D<90393FF001FFB5010F13E04B13F84B7F4B7F9238FF1FFFECF1FC00039026F3F03F1380 -C6EBF7E015C0ECFF80A215007013005C705AEE03F84A90C8FCA45CB3A9B612FEA631367C -B539>114 D<143FA65CA45CA25BA35B5BA25B5B5B90B5FC5A000F91B5FCB8FCA5D8003F -90C8FCB3A8EE07E0AB6DEC0FC01580161F6D01C01380163F6D9038F07F006DEBFFFE6D5C -6D6C5B021F13E0020313802B4D7ECB35>116 D<17C0EE03F8EE0FFC834C7E5E5E8493B5 -FC5D4B91C7FCA24B5B4B5B4B13F017C04B90C8FCED7FFCEDFFF04A13C093C9FCEC00FC15 -F092CAFCA791383FFFC00107B512FC011FECFF80017F15E090B77E48D9E0077F48D98000 -13FE486DEB3FFF82486D81707F8284A2707F6C5BA26C5BC648C7FC90C8FCA44BB5FC4AB6 -FC143F49B7FC130F013FEBFE0390B512E0000314004813FC4813F0485B485B5C4890C7FC -A2B5FC5BA35EA27F6C5D5E6E497F6C6D017E13FE6C6D4848EBFFF86C9026FC0FF814FC6C -90B5487E0001EDC03F6C6CEC800F011F9026FE000313F8010101E090C8FC3E567CD443> -225 D<011CED0380011E1507D93F80EC1FC06D6CEC3F80D90FF0ECFF006E5BD907FEEB07 -FE6D6C495A6D9038C03FF86D6D485A91397FF9FFE06EB55A6E5C6E91C7FC6E5B6E5B6E5B -6E5BA26F5A6F5A6F5A6FC8FC150692C9FCA2913803FFF0023FEBFF8091B612E0010315F8 -010F81499038C01FFE903A7FFE0007FF4948491380485B48494913C05C5A485BA2485B70 -13805A70130048ED01FC91CAFCA3B5FCAD7E80A27EA2EF07E06C7F170F6C6D15C06C161F -6E15806C6D143F6C6DEC7F006C6D14FE903A7FFF8003FC6D9038F01FF8010F90B55A6D5D -01011580D9003F49C7FC020313E033527BD03D>232 D E -%EndDVIPSBitmapFont +%%BeginProcSet: texps.pro 0 0 +%! +TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2 +index/UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll +exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]FontType 0 +ne{/Metrics exch def dict begin Encoding{exch dup type/integertype ne{ +pop pop 1 sub dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get +div def}ifelse}forall Metrics/Metrics currentdict end def}{{1 index type +/nametype eq{exit}if exch pop}loop}ifelse[2 index currentdict end +definefont 3 -1 roll makefont/setfont cvx]cvx def}def/ObliqueSlant{dup +sin S cos div neg}B/SlantFont{4 index mul add}def/ExtendFont{3 -1 roll +mul exch}def/ReEncodeFont{CharStrings rcheck{/Encoding false def dup[ +exch{dup CharStrings exch known not{pop/.notdef/Encoding true def}if} +forall Encoding{]exch pop}{cleartomark}ifelse}if/Encoding exch def}def end + +%%EndProcSet +%%BeginFont: CMSY6 +%!PS-AdobeFont-1.1: CMSY6 1.0 +%%CreationDate: 1991 Aug 15 07:21:34 +% Copyright (C) 1997 American Mathematical Society. All Rights Reserved. +11 dict begin +/FontInfo 7 dict dup begin +/version (1.0) readonly def +/Notice (Copyright (C) 1997 American Mathematical Society. All Rights Reserved) readonly def +/FullName (CMSY6) readonly def +/FamilyName (Computer Modern) readonly def +/Weight (Medium) readonly def +/ItalicAngle -14.035 def +/isFixedPitch false def +end readonly def +/FontName /CMSY6 def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 13 /circlecopyrt put +readonly def +/FontBBox{-4 -948 1329 786}readonly def +currentdict end +currentfile eexec +D9D66F633B846A97B686A97E45A3D0AA052F09F9C8ADE9D907C058B87E9B6964 +7D53359E51216774A4EAA1E2B58EC3176BD1184A633B951372B4198D4E8C5EF4 +A213ACB58AA0A658908035BF2ED8531779838A960DFE2B27EA49C37156989C85 +E21B3ABF72E39A89232CD9F4237FC80C9E64E8425AA3BEF7DED60B122A52922A +221A37D9A807DD01161779DDE7D5FC1B2109839E5B52DFB7605D7BA557CC35D6 +49F6EB651B83771034BA0C39DB8D426A24543EF4529E2D939125B5157482688E +9045C2242F4AFA4C489D975C029177CD6497EACD181FF151A45F521A4C4043C2 +1F3E76EF5B3291A941583E27DFC68B9211105827590393ABFB8AA4D1623D1761 +6AC0DF1D3154B0277BE821712BE7B33385E7A4105E8F3370F981B8FE9E3CF3E0 +007B8C9F2D934F24D591C330487DDF179CECEC5258C47E4B32538F948AB00673 +F9D549C971B0822056B339600FC1E3A5E51844CC8A75B857F15E7276260ED115 +C5FD550F53CE5583743B50B0F9B7C4F836DEF7499F439A6EBE9BF559D2EE0571 +CE54AEC461D354A32E69F39DD0C017BD6576F1E9500DC0328E8AF6EAB528FD7B +85132A2A9995EB211FCE849216BF6D663AD649AE92DA953C4D520AB9A22D27B5 +6C34121FD688F9E17FE39B939D8DCED9EDDE5AF6DD7DC2297F2A3E1287E5AF45 +0306EDBA3C843FB8234D0DDEC7595CDE6657E499324DA260BACAE9D6DB126FD9 +AAA7368F7164F6BBBBE11EFFFB65660DA0961A97D51ADAF2136A085FDC16C199 +72BC2CA210B330C03F4252A275FEAADC95CFBC79C3B7285C4C7B5C9665909A56 +4176C37DCB569C8EED1B59C58B5EBD3ADD31010DCFD59411FC2020E238A07B83 +2439DEB653AFF1CF197533724E45EDA9810B6793E27943CF51484A5BC7DC61C5 +E97F71E04BB623E0BC9C +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: csr6 +%!FontType1-1.0: csr6 1.1/12-Nov-94 +% CSfonts -- pfb ver.Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 25711 25989 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (csr6) readonly def +/FamilyName (csr6) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/XHeight 431 def +/Ascender 694 def +/Descender -194 def +/CapHeight 683 def +end readonly def +/FontName /csr6 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 44 /comma put +dup 45 /hyphen put +dup 46 /period put +dup 48 /zero put +dup 49 /one put +dup 50 /two put +dup 51 /three put +dup 53 /five put +dup 54 /six put +dup 55 /seven put +dup 65 /A put +dup 66 /B put +dup 67 /C put +dup 68 /D put +dup 69 /E put +dup 70 /F put +dup 71 /G put +dup 73 /I put +dup 77 /M put +dup 78 /N put +dup 80 /P put +dup 82 /R put +dup 83 /S put +dup 85 /U put +dup 97 /a put +dup 98 /b put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 102 /f put +dup 103 /g put +dup 104 /h put +dup 105 /i put +dup 107 /k put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 112 /p put +dup 114 /r put +dup 115 /s put +dup 116 /t put +dup 117 /u put +dup 118 /v put +dup 119 /w put +dup 120 /x put +dup 121 /y put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-24 -250 1193 864] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A1390082AA03548CCE363896DC +8285532C521369225C90F80D727FDE65092A0044327885EC680B2ECCDFCCC5C5 +9B4F8AE2D078A25AEEA345A6E6A1D9F372DB3CF2B4AE635D7DB823D70EC82CC7 +1CF7E7DD0D047DC2513344927562EE8FDA9076DD136C4996A22589ABE803CAFE +BDA907DB1C62DABD22A05EAF9FA8313F815BEDB67BADCEB77C1B22D845131345 +22CF2296D57DE34C11EDF6DD3E42B726C8D60E4A98663DE8F7CFBB416F0A4B01 +734649B217E4E94992F66E77AAD2A7289B5413E7F1DD41B9334CBC2EDE944C80 +D9758E1AC551D298DDCE91757B374D66B6BCB92998411DD3B7E6350480D52ADA +A0DA546F63DF2A7AE22BE6BF9A78F5C34CBB597DDC4FF03AB527637DE7F3AEBD +59ACFB058C4833A4A62A9125B4D90E7073184DAEC9D4662987F5CF6D0484D870 +C0FC4A29C03AF2BD159097D46F491069FF43EB0B92CEB9F09E71E089F2C916AA +57DF56E8F0595F9ECB2B1F2431411F7311294DFA91459BC05EFD5C1C68099335 +7BF9559397107F8ED80B43B6E113CE5AD25E1F980D08A891F2A2C0F3A99B7281 +55128F8A4CC9B78A96D6FE58AC946267448735F669C6DF170FCEBCA6108F94C6 +CF3D5DBB8B2304D66AE30096A7D7E17A5E8DCA207567091B96CFE64BA77AF942 +E51BCF3793EF5B02DBF510FAC25F4E523C54CAD23CF2F472B4B3D42BC66565A9 +F5794FAB132F78020CDAB120A21E23DBFBE16FB32F7A618A7736C5F269691069 +D8B35B291D6876340C4158958C56A6717C5DEEA0A86C9C89D9BACB999156717C +BFFE2CC56DF4F47B56EBEE1D2C3A118208D9778776104AFFE60A0C7A2BCC9ADE +FD471CD27FA8318703D497D7F1E2F51B67B9E50D9A56C85EFBED66535792D720 +974ED9168E082F5211F2F607D91F5D81AF63A2DDD31D23E65D3AF936FF194F6D +B9EF5D40498DB69F3BC87E7E19AE76FC0C54E0B4706FA34621284606BCDAB55C +32BE1E917D3B3CC1AFCDF3D35507E63D119B0A3174D32B6AB0A05A8F919A426D +9CB0E7F90458CA6C439565A9AD5648C12F47BCA98599D31E834654AD20E719AC +64D073F8DA31D1FF07C1AFAEAD34D9A58C9CFB12FF747775D5CDEC0C1D84FF41 +B8EFC696D77D2105043CD29074D828D1E03C1A2CBB80C5112F4CBCCB4A769BB9 +A4F91F4366DF0B44B0480E6D1522A779C4EA84DBF398B540A2A4546216DE7B02 +CDFEAC0DF8D9A35DFD72457B2FC7F051D85EA1437F13ED17E53D5DE0F38A5AAE +58B077651C978C555A9873AA29F0A4ADDD1B6BC50EA6C95B1588E7F8D6049EC3 +8D9D2730FF086983030ECAE9600D8A11335A186A6FE48DAFF7F663872B23F22A +C62F5ADA341F5BC0106B99ACB3A1C8268D3DA2C4F93B17749BE68AACEBA9D456 +B3F0B7B3C1FB011B20FDF4067A48421B1ACAD3F6210BCDA6D664361849170191 +7E57121F1D6787DDC6E8EF9022A91290E1534CFD830134126467D7E328E92267 +B730800397D9A384D62460853F56C6C9A634D04E02932EC17CF0F54705615E03 +58A437569FD55BD44A33C29DADE84E385C97F7B788106B018E3C265726C31E4F +B1509BB80A94E8258F503048C85DC89C7439141A587E13017010AA6DA23FA2C6 +97E37155FA9538B31C4CE0B72E1417382A1A1223828D9C4B2178EEA561BFE6B9 +43AEBE58EFAE10175760ADC68AE5642AD2D413F2B9D35DD07A69B45FDDF2673D +28B02C23EFD71C08690ADF55C233BDFB3DBD1769138EB92AB13023B5D9C8FFB6 +B0A93C729DCD5E5CB8ACF9F7E1CBBA9B67CCF2A0296C8D1FB7113405844D654C +33ED93894598563D1ECDD5CDEE590D8063C42782DCEF3812968B7F6DD27F409C +91A278CFDE7D4803E089C0769EC1C3C0CE1328EA3C53827D65DF602AB6DE79B2 +F4FD4A5C9E3047B07A084E1B48F8B9DB9C8F4F8ABA76A2E1716C8103CD1A7191 +E0DDB5627F65E3475E3436250D9000B37F82CD5092E1638F1C771BE23B3C7494 +15F16719E4C1549FBB4C5E7AE764BF97FC458319AF304B72CC1B73C5F5A0CABC +1C8134C14F861E325B030719248E3AF17D742D736AD0F07CA757AA4A1BCE50C6 +83C0DEBC1F64D96332769A65AFB4F8DF6310D8DB846431392B63CEB036A6FF54 +410E717681265F811A992B82B302F406614183A9BDBBAAEA43BBBAF8828B3D74 +7CAB59D02F4C41B5E8BB2369CC4BFDB378CC5831AEF9DF1715F915365968A422 +66FE4CC18FCE0666A1F0CE9A202B5F581D252347BA49B5F351EE40FF21F68B7C +3DFBC1920114CE2D02D564F1B5C398DD834E20E9DC2639E3B7A2935D77894960 +AFB1584B7E0094C9F22D69BDB0F005CFBFEDF56E08790DAD1D3CE2AEE6C90298 +6507CC72FDC0BDBEA2D45CB8544A7001AB67B8B3E9A359ACBFCFA135DC277A44 +D578F9E962F1CA8D31E34D3128AE12E178AF39B18159EBEA4D1D0829DC536FD5 +8C48E955D7D52D1BD6527EE388C1BB2E6A5DADD1E7C452160A5D4768146E8811 +8722D5F9D69E925D6699E7EC2DE2C645FDCA36AB6A06BAC60DE1C355401A35C7 +E287DE71AD3A6CAA532A0DF377C6E02583D6DDECA77FE50842214051AFA0418C +62244C0213DEB448711801EEF13CF96D498E45209185AB6CEFC9F304D32ACA2A +98E8D8EA3737EA2F5C2BD6A1CFD08B7E2B3C0285BBBD2199AA120AE737B8B269 +535C20CC1FCB4612EAF3EEF2B49E98CBDF1F71F997DBC89403E7CAFA2F6E2B4A +E9C90F2FE5FE13837FFE33AB01414903C905E4DA170F12C3F1A11BFCA51049CD +6A34457EB03EDCE6DDBEA995DF832AD05A84DCD3A672FE6C35556FEB442202C4 +427D004540520B66AD955F2ADC68DD53FD7E9AB3B38DF22D8C44549F06214082 +15A7F95684F1727A53EC834E9CEBDC4C599B0A9A255BE0FC78EECDC9CFBFDB35 +29EFCC293A02D52F20E3EF5C148C1F6CF5BD4FC7F42D00411FE742BAD03AFEAC +FA91FF2661AC60D5EBEC548AF4B4E0845E3D02AB7C9FC9E68CE7F1B5E4DE1EFD +077562EDE46E6790015D18C0E9D9A52D5C7D617C5B7820924D99381FB8BF04DA +5EF1732435FE328FBF8B1DEC60D5BEA45890A2B6D66A7B4B47B03FD3D19D9229 +9D1C8458085C909C125472CBC53798C16AF2C6F44ACEFA2F6CB6C5DD84B648EB +1E1468D6A89DCF23A4AFE8C8EEA44048D240D392D0CE05C082CD711BE907BE94 +1E7ECE39CB183A185E602C47680AAE88859618761CB8A5282ACE290EAED9265B +466DF5124F1C78253AC2DBABCF010D960A26E60830E11475B1BE35ACCD48036D +97EC4867D6AE95F67A563952600952D30DE1F148B2B6950E33B2FCBD7ABE5BE5 +9CFFF37354288D61FC68B3377C6C24749C3B06F87F25D4E35CD717B6A9EF1867 +D4C13E024231589C9E89A3C87AF9F926B329419728A7F04C93F186D16D322191 +AEA715EF468CAE95EF9DFC6B2B69074D10C1866651961A061B909DA1FCABE3FE +3855C578C953F5DAAAAAC876A4FEA53498B40DEABFF5DCCFAF8EF467CB26571F +6E5D54FBACFF3ABB4EA0B1C41F237E26667D9DB110A600F0CF98B6066BB145B3 +96DC26800F08437185590EE3D2C080B2A547B51C7A131E9F7B55F0772DE5C844 +C2E8B1F55EA131D16E307008E408DD8A6665C97A01A63AB6BE1B41A158EF2F27 +348737DFB0B31ED64D5EB558A8E0D99478C8A2206FA0F050ADC736BD32CA0339 +D0305441F007C7DFEE295D6360BD4DD34FB25F2A07F3B00D2A4B3CDB49F021EA +2DDC4D625F7CA6B50DED913ED0643F556A686E46BCCAEA641692FE2E996CB21F +33ED78F3010D51EDE32C0A0AE3491FB91E7AA05D015A9AEA3B727C4EE45DF853 +37C5E0BE05D272C3A0C435C9C1CB1A1966AEE7F1687524246D409B0954971282 +53F7661B5CFFC8480E1BA4C039BF214DE3C7A1D7F0DC372CEC274F0945BBB948 +831DABEC5825C95ACD926B23B2EEEE6ED531B27DC3BFF41EE7554A75A0EA4B25 +A3461ABCA0C1558DCC68D8BA7AC6A05D0BC2C32CDA016655D87E2CE0501AE6C7 +D9324D637A9D70CB9EA0F15667B1730C0DA56400298741857E6E6A426E9CD5DF +4F07CB4E882875B9DFC47786D1DFCC0C4EBA6EB5F7B890B2904E3FC00C4E2FF4 +7282022BE6254C35FCADE5AF9B6BE80864DA76D437D0284C3BEDD35B2209B5CA +7A2D69EF139C6611D38FDBD46AB7BEFFC13BBBD9FC6564BC859B531B848A7C97 +8DBFA4CD4C98CC8D3E170955222011FA738A2A940B3D71BF0A18E4604FE2331D +96588E9DCC91F026602044835C12BD112E7267DF7C0B674D48CFBCDA7B64B4ED +1C16BC6F1A17AFED38C8943994F3E07771471A950D91B3C99F1B11D85A5142E1 +DBBDB2D142CF48130AF3E03F4D06DA816AF0914D0DBA5BB270AEE4E66F9C6BA3 +A57B1A68C3C0088D2248309C0CAEA2D5AF93F1734201F7B4580DDB4A4277DD0F +FCC56F43D4B1E5DFF341C8952A723A40A02DAFCD95E57D975300484F68EF3507 +1BFB61E4E4CFFD0DE5920B271BBD4E3CB91EF76D42AB30427CCB980FA4736497 +20E8A12FD2E0B4F14E55482C99272941BBD7F75667929869C1840DC4E77B7AFC +FEFB1DE383AB74441B16736487C2071B29015C52D47E1DFF058A4393BDB2F07E +1BE759B8FBE39B80669F272BEA0ABD7C36D94C5A53806EC6F8C9FD5B68560815 +2C7933A78F7E4524C14B3CC0BCF25D44B8ED70E46026C7959E1CF055D07D8871 +8C576458B8C9DF424198A618B8E3377631DC6CC7405624160EA52171B167951A +3234D91595AEAFE425F31872F11693FA0F9B1F09C6D2E19CBBC66EC4543A90E1 +D9173ACC94F7FE489010109CE1EBB2AD8E2E807C62875867D8FACC3805650253 +21F8E64CB5ABED16CEF3FC29936DB8B06E015C041198B700B493D274E2F3CB25 +D53F5D46DDDFCAF86C876B3FCF5CE00875D8A6237DB1247199AEFA377B4BA19F +AFD56AD2FD2A463800579DAD33112DF863E2C504CFEC293D3F30BD350C77A248 +C3D0CA21D662F665407A19B6D0DF95FD73F01E530440C89924F0C2854EF730B0 +FEAA26912851247A73E99C0941CEC44FBEAA49275B96B42F61C6A446C3227562 +7751D752F3E0E8C634B129BD953C44829EB1876ADBCACE29E10F0948BB931A0E +3CD1DA2129AA3CD2CFCB25A59D581F0A10F1813FC4501B3C97CA05EA3C7F69BA +262903FA7EF879CF03FC000B23E09E9AAE09A022C0658C73730AD5822E0B989B +A845ADFDC9F83879A747309EB8B819A5F1BD54C17DEDD16B24DED8A068516060 +4E28D3559B53947CA1F9FB1DF17370F5A76CC796DE2DCB2497CB476C73063977 +CCDEFFEC5940BAD140AF5B8EF887C034E9EB5A11DB0CACBC36D91B5756E43CC1 +3F873330B15EE187C3DE825D284E81FBC790DB5FDC8D4387D970450EF2DDFA09 +74F0504B90A0A9A643AF661F7670D4054DC3D1A35F5CE3D0C6308E33ED883D28 +B6F99E31AD5C291577CA6018F34CA0A69EF627F95C3ABF760A2F29760A6C8CB5 +2339B9C653FB9E73172354E5F9256FDF9B70168CA01089017C50C17FC5004AF3 +C906F760F7D05D0AE20BD3ECB7C118A9FA2022606848CA9D0E659E0F077A6293 +3F6E8494CA79BA412FC3C535E5DA9BDC2B96A336CFC803AE8B7CDE2ED42F9FE7 +236C33353457A3387978F50558A639345FBB8BB5954A86D855DBDE9004BB24AE +6E3B6356B1C7F7EDAD3C8BA35BD02BEC40E17FB92E4E76EBA9536D8750BB4C9B +AC67FA6D253A6384FE9EE3436EF62E620E87B961358B9F09CD64C864FC9B4CD7 +4A774CE71301176885DEFF3437BA9549B4E7FA3B9A46EF380C42154131482854 +EBCEABA59FC594AE632131479D682D88982173C51E64905D4131DE51C3D241B1 +51CE0B3EC3388CDDBA6DFBBAB2C2932B597BA3F10BA2FDF57B2FE8FBDB3A89CA +B3BE45A42742D3343AAAA01C0F7A5FB1A50BDC460C9736867C41CC9D10F01863 +110AF2BA750E0920646FDD4A30F5274B295C915B2E832D01249146A9EFB7E30A +897762A22C1ECC17B3E29294DC306A27944699DAD3759D838E75435D7F52A1BD +8CB5ED924328F734A535193296AF4CC70AD6422E8ED3572B8B104BC40A28C8FC +DA9E9B8B47FA9A94BABC582D3608BAE0CB94C2B67DC65ED95281387BD40B294C +2FD516909ACEDE90991C023FDD3C5584EED0CBEA055A0221B575A62FBC5ECC72 +241D6C80260A4355B92E92EF644257C00E13D82D47CF0740CE71D1462705FBB3 +3E8F8DB59C787154BBE9E0FC791606BE3BD11537CBDD858487183595255E3360 +00EAB3E593AEA4AE635D0DCDB7F0AD2D95ACC4D6C37BE01762CB5E5D728B780E +14A139A7F5E329ADC6C406A266AE90ED6DFC86D68A417ECB7A486EF0551FDFD3 +C83793A4B3F305D380DC56FA962B5474ADB62DEF714FFFA498467934E95BC976 +BE99035AADCB5250A5DD5FCAA64D3601BD788C35C214058AAB025DD3B77864A4 +76BF7F562574DC4466B23C7256246BBEC7E47419D3B7924AFDDDB7B605D499F9 +815D19F8BD8797AAC599DC62F2B3CED680A3860BCF87428A993BDA11643B830D +ACC0D0493DCD72AAA9ABA51A8514E91EDB75DEC2378D5710332707DB8E9A3C61 +A85D1114E88D89CBDEFD3BE65C215292ABFFAF211CD17605C4DB85B9AE505150 +BDE896444F55C7A15BFEEA608D8055583487B1DFB5E831E35AEBECCA99EE9348 +2A428FF4DCEEFC005FC7D54AC750E1D228329718711AEA3AFCCFDEED13884A00 +DD02186AD492BE03EA4C836D3994CB345511AE8A0981753F77B562BA3A0F0703 +45EE012D273721070B5CC63453E78EC5B40E3F1845F08AF780885D5B55F7552D +385F2F22BC86C4D37CFB2B8D43AB30B071DCF1FF032575BD87354EB680ACF012 +3881D4428F9AD52478B55858CE48CA964291FF97AB5CB46FABB04EED462AD1CD +07404089DF52B923E492CFA2120C11DFF6156FD3A9FBE7B7AA4BCC4ED3BD4EF4 +E21200516D96DE372E8139D56C3F76FB29E42FFA6531AFCBEB2F6DA84336FA31 +8E7028E1E0D828AA135620FE30198506A3E094EAC140370D6C35293E816BE135 +96704BE5E4D6D6C83B42F91CF760D7D7E5DE20F569B31A3F49B3444AB5418B71 +9F72E599982F16AB21C83370BC1B3F9CEF750804FFF8C251368FB57850D5C49D +2D49E43890C19232329E930ED9B8543DFE943F9C325467716C1CA7B43EF7BD27 +E0CE660DF3E6EA1D32E1C51F1C1CC36D273F1A482C9A62A7983D59C75EAF354A +DBD703801513C471BEE721C2C728DB77658CC64F59FA9606FE85A3955E956EF5 +0537F5DB54B18E15622FC1187746362ADAA7B93BD0B0B3C1295FB350430E00E7 +F8C852467D0035394DDA11ECAB23FBCEF8D8888929C41577561DEC1D96D36CE9 +F45F0F17674E9C6C4133B36FB19936DBE5BABEE039C9BCD0AE86C9F15F218C39 +0CFE18EE9F26D4E0188085820F87D2BB8ED4C81191F36BB157AA2D97FEF3C500 +06DEFE2635F4A45F78FE9AD3585EEEB3F10651733DD1F4808BCAC418F92A7DF3 +B2E1712FBF5FF569E4E930E70E054A22F6862CAA271470C9F4358FB6CD1A3D3F +15048080030F17D92DB7692257C8528DC80C79B145F29720F9468CE7768BFBAB +5169811E01D06D43DD8A3B0F3C002E79248A48445DE4844855326A7E58F54876 +F9744E723980B6A61907CA9A13F4C12F823ACFC8F778E7089843E11216782D8E +89D4875DFD01BB67BF85A0692BE5048AF1D3EB1CF8C087BE6FFFD60822CA5B47 +CAC2413F7A4E8A0DA4CF76C340578918B40FEDE73C48193391BE10D7F36019A2 +732B902C426CF80FC98581251100867B6D9BB728B3D010B882CDB07CB6F9FB22 +54F0B427EAF1EDD1FAEA5FE3AD156DDAC67CB8202A4E0D0AE5B49F35FC31E6CC +87F00E54011DDE86A32DC844D0372FF2430F552545D648138C0502F46D7F90D6 +65736FB0D53F90EAB2DE0ED5ECF7C179FE1D846DF9256A669BE668F9AF96EBFA +9EB14ABA4113994A6A56FE7FB3E8CA25DDD95273549052106DB8ADC5818DCF45 +841FC9336207CF67EA835DAC1D2C3918BD570C1E56B63D563EACDB397F28E198 +BE36D9E48CC5B228994866F68F858F7CCD1283668A9A949C99F3DE12F975EEBE +D273BAB53FFDC9915F3EBBE6353C8D74B2E4517092D9BEAE2420942DF0074A69 +30A696E4B7FE4491AEEBD05385FE95E0003E14907C1BEF058D6ABD417CFAC682 +AD0949E6B0AE41D8F6C2C76BEE7F696E8FC623280F96DC4BDFC33F73FAC10265 +49F98BB4CEEF2676279F4FC5928FF7E51C7AE464377E29873E4E8D3F8A384626 +F030953654FD3A42A1127E7EF9DFF57EDD38F7BF4FC146A755FA5F6C810C706D +6A834B32E68505B9E0726624BA8B7DCA96DBDD8F2344386260478160B0F3F85B +E09A8E3AC4ACB796BCA6383A47B70F98FD798D6F2C1C385813EA7B3661D43DDE +7B3C0C6455785420553956EF58B460CCC897187847802EF8DE9FBD23934FA8D1 +AD37F59724DA239776F0F513402D86060903C24105BF537BB2C0BC4D572E6D4A +144BC35F7C1E710745FC4B02D6EF02F607489543C30B3E10FB765A73A9571845 +549565B5E4DC13EA259603958545A964C38480EDDF58FB409FC43A2909662F39 +5DE08816008CFD770B8A3B7517CBE72A5B23E5D6F96B3D6715B81F03190B3284 +E72034E0F51272427A6DA9C72CD39D8E8E5BB13D232D4D2CD741EF2550220269 +80C4B614FDB1972052A427C723FD8F774BEF5708160F46F11C702E4A35DD1AF1 +A920D08B6B91392293573169711A8A306CC5FCCD1B53B9D7A3DAF2D9911028F3 +3EED3A7E7BC346A70B919387423C91E2813A7A0892AC99BE0CA97D85975348B9 +CEC6BF3EE2BB656506244A9500A94A6CF9FA44AAEA2EBEA1A0DC7414E8B4708B +1949EE5092B13881877F5F46EA92F3A1988A2C419C6CBA6307EA93F3CDFF149C +AA132D48FD0818529452C8722E6277F8AA668E8CCB0D177248A00282A0316550 +2F6E96123B03AA20D8E7BEC2618947F71BD405BA3710043C4B627E211113F14B +ED4AB1117B0A48E925A884F3730D05480984FB80B30744A528B3653F8CFD50B9 +8753EE836F07373751BFC86BF01390080306C3CF564419EDD4D9102FF4656529 +2D88B3F816CC70FB0CDEB89AFA68F968FADA39B23321BE4DC083D7643A6F4ED4 +02CF176ABE73AAE3FAE9BFFDB8E67CDF56330FBBAD21CD1977F5746B08193528 +A23BE8C98888DD658B8655362781AAB8AC2636F06838419FF581FD66B96FECDE +C69D818BBFB8261DEF801EC40D20A6B79032F4B007C0D6F6907EA457731BA2F0 +60FA71D8886FBABA4EFD51998C1186C4BDF06CED2C2D7FF23250E48BAE3A8AE2 +ACEB2C0D0B37E2C7DA24CF6C43D76D4EBCCF409B7C7E4BC6323061703A5A3EA6 +B1A53EDACBD107296914D927D853C8840D4CF1D833741327FF21FE9BA51A9E32 +C0E97E86F03E9671E32E143894B1F05DCDADFEA60B24655EAFA58807909E90BD +A5988A86C9BD38E0B1CD98FC79D1ADB5C3ADB78F285A7A314A72DACECCA0EA35 +BAFBB5EAB396AD4729DCFFA5264DC0DD86157078024A590E6067A6F1B5B2562A +D1F15B3C8B118C15F07F6AB0BF1D9190D30976D88EA982E57D2E202AE26CD9BD +00FA6220805E6D6FE5639B12813C5A6038851299DF0BD94A205D668CE5144749 +F71A18F633BF283DA453714EFE14E5FE869E524E80BC04A0AC3DEFD93B3231CD +C88528CE3133EB6287EC0226A4DF0ECD42A13C0FD832320C0E29318D6C237D55 +AEE8B077AF3A819025EB88B94A6831B16E7BC10957C5E7CDAECB20BA23241E94 +CAC0734555505BBDD55A973A06A3C146A21AEEF899ABD43CBFEBC105FFF56C63 +7CE50DAC6913230A323201A81E101ADA71FAD718F35C74406505C62A605246D4 +EECB52D70D5E07D10D13CF303466A8A5198D02485FD445F56B2D90FA7B039711 +22523CF282CDA36BC0FC3539CBAE0E636094E7A37529A026A5AAD5B292D6E55E +F16FC9E442DDEADEDC307BBBAB221CA11033982F971EAD2AB3E2A0C47805F059 +2333D6C473E1F5CCB9F8133AF91B63A2F3F6FE9FB11EB74900AA2D20C007DBC2 +681E5CF1A025DD2C25268B441B02911492539028345B03EFEB64D2C1AE9CA7AD +94472236D7DFFCC081197351701145B365AB622CC2E5E09A17B357BBE0B0C523 +5A8D68AFC00BAD865B291678A7D9F83909B29516086D0DD4434E498F7CCD0645 +F327C654165AF137E197B17E6D37F90224F3568706852AB7BF5C78AC69A4C0F9 +23F18949932C058C8C21DC52956DA498E749437B69582751E1E12EB46231A450 +BDC05A65409630B0C6281534035BEC3FE0F3F173CA94BFF7E93E15F66D0B3C73 +F784C00BF1ED61F36996FDC82D0C9A11E1B3718675ABE286429E725A9F383B9B +168F31734B8EDCB37E82C4B26C9A8553E6C454499CC89289E6045F8810413E9C +4406391C6989AAA1BE34224B98C2EC4D3986095037158632C17F8D7A510CEEE0 +1C21F1C92593B2066AF4B86DD30E896D548C88B5946D1408D22839103C7A0EB6 +7F3D488173887A94B4A2B367DC8C67531286D131A1BDF35D6041EEAF1A086860 +22BE71A2A535B6264EE70F4C7CEE0990B33075D55733A5BDE0C63499EB9111A5 +ED5DA484D11063D8F03A2CEBC6612DC43D8C22913EB0B8E467B02A15A7595A36 +4DCB8AD0D74CB5493B59EF02B69ADAAC5F3CD7ECE0CA793A378C97E07C37C7E9 +4E5F11CDE9DFD0E61F9B88968A015CC4FB8D7966200C48C6EDCF59AC60CA9693 +74267C4A067BC76F8C0A4F204FDEB9D91CA4A69FE0E30C7158D44E1BAA50D92B +1AE92896CFFFE56EE0AC571C2AFADBBFE59F1F23D42DAEE552D4D86F00B48F42 +60D7834201C7CCD9E52A7AC3029896C251F52CF3BA23451E8A18A383411071FE +B4D214A45F297C0B9DD06578ED375B7E302B3AF410ADF197CDE49A0F58B40CC5 +64A4E14453FFB0FF7B59292AD7A63FCE0239FFFD0EBEA23C091D0760693D2ED8 +9A0B66E0125606F15424D3B3D82764BCF6A2A2BD399BDF0EB5B38E4980306D74 +558833268726829CC7579DC4AAD6E9589EB1473D8C289B9E331EA905830D07F8 +042B642F60B69D66B8D2D2FDB948BC16D16344AE983FC67352292C05EA1F5E16 +18DDA42173B00390985D3F8981FD33B102D37BB98B56A4BF76A17DAC639183D1 +8CA84E33BBC5BBA5D41821DA254A5BD4A8E8011D766319E001D2BAABF097556B +8660001C2A9938E1A08265A3912BBCBDE5B1A592EA64D1F141CC3CD437194CD4 +5E4330FFD0FC6823469A618BA4B5C0E35DC27DB79E90F6F2B563CBF7E1D86A63 +6973573D2A9A8357C4EDC4D4D5C9BF56AAE4035E93B41B8D0807474E54035A88 +997BCAAE58A4A672E47D0F44C1EDA3C3ABC7AB8F3CB4F11AA89C23B00295F763 +38F77E9C4D509C18D4B2DCAE5A26A2E2E12FE603C19C220225A78BEE4A48B371 +935761EC9E601671940DC7E0F7819110E6FE16736AAB9EA8D395ED021957DA95 +5BEF62E5BB3B440CCC5926CA3C5652E22D9DEF2EE4F39764565A505704B3F80D +37D58ED65304186111BF95C074E3B7097B953E24317BD119257C16434D5CC75B +C9EFE5B27C115CFA047BDA6B41BD82D7359FB6EBB2F515B8C6750564C316A2F5 +E515EAFA9E5415D2474A3938F85A0D7B12980D11FA95AFCDCC23D131364CC544 +D10B3BD0A4F18A6EEFB79195F7566BAEB133847422802CF3234784FB095C6BA4 +B243A6C25C7BCDDD647988E640036B2662364B87C77E57DD501A017574DF1A32 +843C71FE7091 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: cstt8 +%!FontType1-1.0: cstt8 1.1/12-Nov-94 +% CSfonts -- pfb ver.Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 27102 27374 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (cstt8) readonly def +/FamilyName (cstt8) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/CapHeight 611 def +/XHeight 431 def +/Ascender 611 def +/Descender -222 def +end readonly def +/FontName /cstt8 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 33 /exclam put +dup 35 /numbersign put +dup 36 /dollar put +dup 37 /percent put +dup 38 /ampersand put +dup 40 /parenleft put +dup 42 /asterisk put +dup 43 /plus put +dup 45 /hyphen put +dup 46 /period put +dup 47 /slash put +dup 50 /two put +dup 51 /three put +dup 60 /less put +dup 61 /equal put +dup 62 /greater put +dup 63 /question put +dup 64 /at put +dup 65 /A put +dup 66 /B put +dup 67 /C put +dup 71 /G put +dup 72 /H put +dup 73 /I put +dup 76 /L put +dup 77 /M put +dup 79 /O put +dup 80 /P put +dup 81 /Q put +dup 82 /R put +dup 83 /S put +dup 85 /U put +dup 88 /X put +dup 89 /Y put +dup 90 /Z put +dup 94 /asciicircum put +dup 95 /underscore put +dup 97 /a put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 102 /f put +dup 103 /g put +dup 104 /h put +dup 105 /i put +dup 106 /j put +dup 107 /k put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 112 /p put +dup 113 /q put +dup 114 /r put +dup 115 /s put +dup 116 /t put +dup 117 /u put +dup 118 /v put +dup 119 /w put +dup 120 /x put +dup 123 /braceleft put +dup 125 /braceright put +dup 126 /asciitilde put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-7 -232 547 749] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A2E61A0E1428E106CCC2583525 +72D46D12AB29122B2F73E8A1840E92A8B89FC7EB2DC186823768722F16340C65 +6DD7DC66340FDBED5DE27349212038949E02A53C843B61C70E1DD9DBD0087F65 +15B0F0D9BAE4BB4E41E67AD2A0627A0A172C22D63B4821EDFBCD61B658A40308 +132441266CF3C9493FFD6F22069801D31293B9BE8D89CB818E8ED600661D5183 +2E556F2B3D05DC1D4373F9890892FB7AB653D27E2633AB532F25D6EDE1857DB4 +C1F451A24EA87B44C7CE899D4978EA02D57085859C57CC3F1179AAAFA42490C7 +DA9BDBB4EDF14A2F18DD23B43727FCEAEF202CA5A65234905E786170816442CF +D6B62BA8F62C10EE680DE45AB210E79CE579DB97E6727D763F4B9054F443CABA +76BDE6AC53B3DB2F1297AFDAF08ACC65EAF52597D52CB237ECBA29A18AF0C0BE +8FE6FA66CCEA594306E6F3AE4B9E21BA245325E122B85E38C3DD1AAF78869029 +377FEB743C8E393B1CEBF5118FE83D9F35B7F94FED7CCB0368F5D961179160B3 +0060975A6E3A783ABCCE964A7FADE8A5C8BD5B2039247E9C018E827AEA49A311 +ABCEF022A409DA1D18C821DF8961891AF8DE1AC3E4C4F41F17B8E5661B7C44AE +308824113BD2D15FB2FCE33EC549E4770E65CEB695D0FE7B5377474B61759E36 +E4C91AC5818A3328B030125132AC01CE1D523E630391C1D8993B4170AD45352B +6905F6E2E60AA156C0F5111580622309D79CF79EA745830144CC8823B4B5B330 +54BFC451FD8CD5FF0E388EDEA82764535C50F417A9DC659D8326BFEC6E5CA9D8 +D34BA3C647BFE0FA7C8FAD2E87A658F558B8F627C0356DDB161520F1640386D7 +4166B19F03C8024D14BBA67CDAFA3504FE5BDBF8A19E93F313C9B5C83296F632 +3E814A5F5427196DB2633B363FEA67DF56AF73A6F78A28B81CAC57FD11493B1A +9233A404A1E8CBF2E5E4519A97070049C6E1C389020DD3219ED5D06C044E0F30 +DF4D4B472A3D0BE8B2B554F7244ABE708803E370C11E70298B1AF1E25F2D262E +4134F7A239BB81496BCCD89F963783CE73442D4305E9EA8D2D08016BECBCD25C +2E7FA6266569E55664DC7C43695B14B6FB573136E8E5B2D0A2C5EFC1E56A9C55 +021EB6A716D317768EEBE62439B6714F15EAD6402D6CB18772B202DFBCAF4A72 +01C041ECA0CE48C2D458AC0DFBBF9327D4566CD5AA138B21C0578718629C8EF4 +FE605BBD9FF46DA1FB9EBE950D6CA66A02CB7E640DCC0367D635E5CB62A8A35A +6FFFE390984900CB1385D1C5B708F743895270823715BCB69EEB8D8F36874F51 +A0972B68861EC54632209346594DD1273BDB95F5CAB8B463780B97017348ED2A +855AC367B9BA949C4F6CD562E6A4D8D49C133D5386646F9428D8AEB6790A33E7 +CE46937E6490E148362FF3DD636512B9D90063425D1BCC351789EBB732209296 +0B45B053697260E744D820447275668126FA78C3DBCB60B0C25230F87B8012CE +E09068065FF335343A90FC6BD7E62793D1E77DD557CA6169F80484F7151CDE5C +47305AA06889BEC69CB34B6678202DFF80A0B3F0D345E5C2D0EB04DCD6A378E7 +BA57A2A5EC3F26111FD8C0805ADAAF0355D0CDE87A01C7D8DFFE2EC6A870E173 +898C2B3816CD777C55A7D786FD2BF098CF4C518C728898977D97AA5BFD152219 +E0EB9D3DBBBDF115AB3E253060716D62B9CD254DAEEBE134625069483B82AC4D +2730EB6AC36A7BA36DC79D8C49FAE2E47F54593A950B869CCA9C4ECD4E93F465 +B9D4513F8BEFED9EADA808A7270CDDF26F3215F0D11373988598C514F9F63BB3 +D49E5F4D91BBC63194EE89C826F9AA488BEA86903CF6A9975D9E2977407D3FA3 +CFCAC175E2A0FEDF042203C88CADFFC1FD0D03FCB765A3B53516836CDC340A8B +07456DA4DE5BD8BE4E0CF3262F621FF6013F3814961C142F8B4A2E0AC9FC9442 +BC9A4DA90D056F7196DB877078B5A479F2AE9C206BA0CB36C1EAB352972F21BC +9EF53807A42EEAE6F55CBBBB99E7F6CAD9228F9C69F0AE42C1290457E74179BB +E7C44073664CB4714C8E56E02D4BF30458B111E0611800C761981DDBA311070E +E2B1F37775E0C98009709E5C92595B51B5C0D397DFDDF558AEA81C600EABF0E5 +BF0514311C7AA66C444C3D13EA48DBDC5B8ACB12F31BF6225EF1CA6D52F3DF87 +07FF7B7C5D60629C831578D703B70E365E05BB1C166BC09AA6445D149C132589 +12F4EDAD89D1364AF705F5CAFA2A676B4825DEF98F313F611BFA9FA840AE88EC +AB4B29E8C61162BD9ABC7AC2540AECA52D55A5277035DE68AD43B0A6D5B420B5 +4552AEEB397774E63006D34992E1755C5D0D51161C46FEEDAAA059CE145FB14D +53270F269340C9BF94C7C1717892327547568B8B5D339664A59A689B59728260 +CF3FD421110CF5B6852D46BFF6E57C26CBA870D726BF73B04A4F83FADC8973E3 +071F7AEF640E838D64B9DEE76C9B9A45E3A6AE564D65D4A5E8D94019E2860283 +68D9228D386BBA73286977CCCDFA092C5DD868936F9DD875BBE83478F031EB03 +D2F92BCA8EDAD6D72341D7A906DE3DA431B65B4CEB8CE79E3AD78BC939EF5671 +FF65A3C67426AE4E49E45F4C8154420E0647883761376178AC4167D0381EBEBC +B59A48E2B68AB15A2F99F44D6C6D6490CD60878BB9040DFA6A28DCB35F10515C +CCC43ACFD4E5B75955D307F71FEE3DF10A386B85CDF5F1033633C6EC369EBBA1 +5A415AA426B3A8B48CDE6F754A7BA8072AA99BD61C501142454872E8FF69CDAC +E63350EB72C2846AE2991E936B1B1EA4AAEB47CFEE542784F5158301015F8D10 +5020956399AA8FA4953F632EFC02A3738297871E55E1B953F0A4C6CCBFCC2361 +261ABE986A2D9BD1658B4C5BBBA208BEA23F717F0314DBF77F264FE46BE92831 +3455CAE4111E9E291E85F6774106B2F9D9339F28FEAB65B95619B07C150C3E74 +AC9C8BAB4ED7C35DFB3B3CC0BAEB67C0D49AACE9B5128E25E471C25EEAA41B8A +F4E6043DCFB80A35FB7741F0B76805698574941039A897A703F109C6B5597919 +C3CE868E5871466E683B50088A70A04DB9571EB7A5947A0BB2461F222E0D1307 +CFD27B25B505F54CE38AA58573934EBB706A72F13D6722D5CD68900B196C59A0 +D457469D5C43DBEC8EAFC88F91AF4B363D6BA39D11515D446830E1A51777D6A5 +4719EBB6D0F2B04EFCC53AF6BB70CC5B7FC88D74FAD1065CCE7BE5C545A11E30 +2E66C05AF6354AB13CD3317ABF745FEFD8E38DBA4D1AAF1641340B1E940679E2 +9FA8B6AAD0D37EE6367E0E7D37F4F30629A54D3438BDD89D6C4EFC3C3EBAF606 +0508ADBF71E54BDDB4B58704EF6B0554DD6221FDB431BAF080E6404AA9E2153E +FD34D3DCEBD3B1B7D0C80AF5EE4BB255BC08C19B1B06C7737099922BD287ED43 +BA5DECAF672051F967E0F3E9C0AADDBDA2A2546B6A56BFFD0557C864653D418A +4B1B7F87336494CB026A466F8FA6E492D1CDB9465FBAD7107DCC537D7F00C261 +16AB59B2ADE773E9D6E386DC1ABF23C612EC78058484A5E1B4D293C8D88C8E54 +892CA442C9DF3A16AB1EDD3A673FDC573E98215AB675CEF4A3CEA6EF11F1C4D2 +E643C433E6F846C5240E85DD77E8F55786F3D8219D851A4A2EC3285A8921B640 +AEA54076FE2CDE81148814D5B44994BFC8B1BA8AA0CC29D55B9D419671E75093 +86068AFCAB7CD34DE7229D555F36129AB6A006EA7B022D66CF9054994E55D1FE +0194638D21916C7DC85335EAACEC28D880D56A577C641CF1EA3519E13DCBC518 +42199B2626C95E503A4D616A255D4189EB395C5B9D5E421304C3720C90119121 +DA3B71761B7D3B88EE8F9E13B645DA1736F6127AD06F9668B437B80B9811999B +425AB8E41CC713749D0069700A8D4082388F6B951777D0D0EF327326A545DFE6 +15734679385D5B51EDEC0E627CD66320A3C8CAF528FF63DC0EEF4EDDA1708F1D +54DE66CC8689845EE2C8B199E53F2176C8DB8C16871A95F1C2B75623E495DDDC +DAC40B2F0C2AA5B4BEF34E85F7014C942EB82771ED07399426C281E6E724B4F7 +9EFC644FFD0B36835D9A29052E3CC2793CCDC387FDDCCB0AC11A01332DF05D4E +41FDDAEE1AFAEE91552789E9FCD645FC38F78E6354F28F1163B6E5F808A032CE +296B1A5F44419FB8D34D183446B99A294D9F09E7CC3E8CE953C6971BFE5745EE +6FCB7CBC1FD7DA6CF93FC65651F89FBDA2D3550DD04C1322F1FCB570F4B5D9E7 +C3162603874B40A18C9B75D33D50FE11BF835C06C4ECFAAF22F9087AB241C594 +CB769CB7C0E2396AEF11C56614DB1A25133209A780AE81C2829CD20EFA1435EA +79F444108EDA18958F4F7AA04FB1422C0862C2DA45F6F938F350D07E5CA0229F +4544185723144F9C57AB2A181EEA5EBADB6AA8354A8BF652A2EDF2E7A6BB9713 +04622F85744C6D8F818C4E32431CC4378DC69760BB773BA6D6094172EF07F4BD +5ACEA4E89A41C2E6795E238A7D7FCD4C26C33B5FA65FE89153F7E7B630E4877E +84A05776358376676CF0E11430649DD800737B8F1C91E9D822059DADE8C2C0E7 +89FF613D5B1CFD79621A7DAF5652B54B8A2761FA1C545AC80EF60C77861023D5 +0E64B65D1ABC28F524E92068ECC137E5A250F8C2FA42E9CCFB122EA19D4D03B2 +EFF72539E6738CAC2EF2AB949DE2228358EBE2A6DA9A6674DAAEE65DB92AA466 +7590B88165E9484AC4E7D9C906966AF728C7B55AE1788CBCBABA26F77BA0F226 +501CA47F81B4452197D80551834983FF7388342F85525211B5572A1E057F9E64 +6F4B281AC073401CEDEF2020E990A4AF3020F33DF136FFBDB087A4F62039A3B2 +BF1A96553CF5B0165FAC89CA21EC6E9A23F8EF5ED3F57EF1DD35C3E340D74A33 +54221A264176C1676B0A1290B13E48A043E51018666077F171D17A9A62630E33 +72D873CAC592E127EB2E2D2948A7E990674F9132B38C49BE15C335C661311FA5 +C52F446427496227B6AB973A9AE3EA5D5FDB9C4A24AE4451F0F7A05B48140B48 +6301522D8F130D5CDC8DBDD297E0F179B238642E2436B5DB98C0DD43D2B50E7B +6BA30ED317BCA71BB2B109E70C982ECFE62821D38619B31FBD0D3917628C4BDD +BBFA43DDD2D2AD28C8709ACB321570A99FAE28989412D5E3E8FE93A681207D28 +9BA01C4388EE00A94E09894B7738876110397D2D40643EA96DC8D0C780C22DF9 +5FF6BA8F46FCA42934A66CAB425270DA12383823776214FD2915C26E0228D948 +56065D62BB717E150A30CE77E8ECC4A1585CD0ABA26DC36231820B9057D9D270 +5050D4C18D22BB970709D6821D6F76F9DBC16B2D1EC6E5BE6C88DE213DE46A5C +220529B9FEBC3A0CA8D176EC0D74E32AA5CF7345B8FF8F4CE7051C6D4DFD66B9 +EA8F8BC928A6421A0025B404E263F49DB7C54CB7C08DC783FF10FD24068BEA2D +B0AC7AEEA6386EF4C98DA309231BA3EE83FE788EF7381C7ECEE3FAEB3779CBFB +E51AFE29D5C49230BE72ED828339FA5F1FE9704CF831345453A84072F3312CE3 +C066947E9CBAE98806A87240022378C2D31F9257A54B0FE5D020F5BC0EFF5479 +CE50C2B49844B0B25E0B32023C7039A746F092B1775D7780DD67A2EF4A147439 +E7E1B3D4FDB73762EF27F5F3A495E60D2DC4A54FDF2AB3AFC054CCA17DAB27EB +0B30EC4D0922EDE2B081908603E20D88BFD20221CAD443564A070ADCCE970A17 +7BDB1BBA43F4A1FDD52B849E516B1FB2EEBF91D2E6B6D1D4C10D2AF4EB2CFD63 +78B3C368414F2BA66D9D3422FD5164913495FB75B6DF1093A7C238F313AF78F4 +E48B4248C0841F0F4D1CC2BA47BF5E06E133BCA2323F7A9F2C694C7806A17977 +B83A7A714B48727D291325482D96220CDD4DB1A96089C693E57E275225472B9C +217B6EAC289B8EBBD7273431B1BB1DC243D4B2CF94718C0B2759313D6551E1AE +4C6D3A92FC3381B1F7E61ED04B063211379C4B88C5C6F22335EBDC24CAD8D9E5 +189A22C3D6F54428F5E2FEFCDE5C0EE2131C519A0DDFEC8851C02D82B5B48265 +7B11A40E8793300CE171853FD82874E09D814F5833F04441329C6650B0B7ECD3 +7FEC743EBD43E7F88542C389BED47D31A10FD8E02C23FF191B9F3174113723DF +934E3665A5034A639C17B3985CD6D2F1CA289146581EF6D1BE3717EBC7E6A824 +C3D2290BB60244E163D213FF98A281FA409513AED35F15B4097FEFE4C3AACB03 +613570E1D66D29BE3D14AA5F3266920FA088D33948D96BDBA0E3980254360DF5 +7A7E1836BCBABB7BF9C42FC87556F8D08DAAD6249B65AE106296BB7F0C36A86C +1A7DC23EFB77AF78D006DAFB6A703C6C1A16EDE52BD2B01A4218AC671769409F +90D13744FB1FBF1F2EB3DA35F5B0D13F3862D69EAC091D48C57C647F71A0D718 +233F6A7950A610E1CAA551BD702098466A9ACF3F74FB64BC0DCE6C952DD26739 +857084C96302B0B641D425EFE5A2857DC340BFD3B8ECED763B298137E930E6B9 +A3C2565EA96CD52BC01A2959B21CABEF6DF7837DB737E006A72E5945B076F197 +84EBD29B05B50A78C92D0F2EF60C8842F26B506C1BE919590F4FB4FF34923664 +868037BA9C227C790BFC0DE4DD05D54D975B64F845540CB8CA4A005F9590B511 +653C782C81F0D64F3FDF8FFB627E985E877F41292BD6B752F76AEDC9846A1408 +F3056CD2C28ECB255B5FA6F3BC782A2A194559F33DE3FE01B5FE1BC223A15E2D +19A2E61C48BDA40451EC6D1227724B9119D0F6BCA1B3E0394EC201D29EE7BD06 +99FA5D7F79A7894B801983D18A2AD3FFB641EEBC30313EF5F0E7524D1FD1FA9E +3E996BA34FD8654EF1CBF0AF94929B7FE3B59C3BE1D1328CC1041CFDD358C360 +C275535CE03332E745115BF3212802D0AEEA8B9830E8F22D91289B531EDE024E +5529E078B3F07D44CD0CED639E3F6307F3A5920C80461653CD1165276A9A8406 +C977F00D546307433DA39B3F0C7E77FBC3006B9CE33A9AF600A2E77947808B04 +C8A8432483A92B52649F0DDABE5DEEC492F4057F971D217BDAE50F2E9068F047 +65C9DC2BF810FB485424F1EEE5481F0A418BA3B04B0982F7645B72EC3434463C +D7AAD47D971B0EA27F08B4768E5534C91BC97A55DB0C507450CD8A23A69C69EC +88E3920BC8F2546A64F94DFF27825F40EA724E372853B9D6F88B076B2F3048C1 +418296D7C1C334C7978CC9CFF63D389A272D089BE63E2AE49B3111B16D7C799D +6C748B8215DEA3A0B3917E1BB566409EAD33315BAAA2DAEB3D8CF0249D77CD6A +B249757258F85CEDA706631A3A744B58199520234BD0CFFB9A2419ABDE6F672F +1A17FF37D2F90FBD4EB7FA6A61D8AAF46A0088E5A4036BAB380E009980E4E046 +D44809CAF538BEF8A6A9F9FD0F79292B7E957C9ACF483334DBCC6F74BCA0A65D +37A6F17FCB125391F0D08E5D2D103FB724254DBB0AA13D402AE99184C3769CD8 +B815348CCAF561F9D0D9E822616A8FFE8F8C5551BDBBF975772D5950C89F6205 +76477756526F9E1DC50AE067566B3BB8FDCBA50C3240425FDFC0ECC4C13F61CF +C531DCCF8409AE8F982BB83DFA61127741962E35F961259B25CFAC3B8D4B7661 +84F2B75F8675AB774DA36A90FAA5203226CE0C1559D9EF9548C42AEE0981EE2A +ADABA93DCE5749C832D6346536CC1B4EDE38FEB505C691AA2F16249555C51387 +0943062F78BF1D3E2E9BCAD32360E994A7198FB6FB73BFAE552DA090330B2EA5 +83BE32BCE7A118503C991E52A5608FC6FE369A851E21F52EF086D5290D254138 +97CCBA430363A3E9A857949EE4B0038A46139B938827D308DF12160EB4589AD4 +51F43C21C6B37F774170B52BE4B9059F4145B1CE0698FCDCFE0219543AE7EF0A +581F553986F396A9BF2DABE719F5323E022FD3009D00BAE068481B3BDD54EEC5 +2FE03CCF1026000405284A3B0B4E7CAD80CC4715DCF9876E0953529FE25CEFD6 +E880F78DAC530CE52CF4B386DF921B4FDEF292C1946E8592C991B4ADDD161CEF +343920F9D643FE7E4A134B301FB80E9F250E3D4103A6A80998565F1985517EA4 +A08B6DF5C3B04A5CE9C2E195C9F616295CEBF166EA762DACFCA087342A95CAD1 +7CF50A554DEC41BA6DC058B8DE3EE6C915C19EB54E7BE62D27A657A5E25451A0 +9AA9CF07C84F0AD930D7289E5A89ACF43B325E7AEBAE129D1F9362307603BED2 +47EB0AA9506711EB69AB7DF32FCEE97D305558147490B729B91A26BB637800F0 +D96E0A0B2F8CA9565779BDD5AE2C8953215B14D01C97AA2E6F222F3A334A4260 +793A569202E944082A535376E6C43877C42E7AF340DA943A3CAA65DE36FD7D0F +63D5416A652B245183BC054F18B9DAAC1B737E39DAC19691BE14E7C34F2CD914 +9DB9D6EEFE763E88B68C3709BB720CB64AE6B53D63EE734EF705BAA0325E5B3A +01615DCC3427909935A63DBFAE60ABA2553F4B902CD10FAE937CAEFF4CCAC346 +9BE15D5216E6AFC9EF9DB97CBD0BF84C1C0D236677754E7DEA7E8D7D70EBF3D4 +F76F085D46E3FA5B54BE692559C6A921450A80EE43AA32708580A635B3E111E4 +585ADC605208EFFF7DA65F2AB7CE1BB3797608661F24540B65B0BC2A967BA0A9 +589FCC9E21FECE0DA26FD85BCD09F79F2989B284C5F688264D43E6F2594FBFF7 +8459705BB01BA576EA4F2EB28BBE01D9178313B7B784E11F9E214CC3697E0DD3 +D71068D077867578033D1C6DECFF9E20EAB41E79D0975A99D16C886EF3452F26 +BDAF0D59C63626434165299CC6B943FDBFCFAFAF0713A07E6785CC8E8771C080 +EC6463B0FBD9903E845525CCD2DEE24A11C42C749AF67B67EEFA096DD5860AD1 +75DCA722CF280C1D76A0BE878D84FB69A34A8B5FDC115FEF5E11F14F40C522D8 +09B058982135D811ACD94E29FFF3FF91726E8E981749AA281DD237B12F994802 +530DBE2FC4254243B0D0BB483BA0F0768AB055EA84785E0E6C955E0BB66AF909 +FEFABC824EDCA7F8FE1E1D4B10D618A9B01D29ED46B5284C2BD31617099D73F9 +E33193ED394F895F40C941206876531F8CE68F6682FDC0D7110F3F72F1A896B0 +64C752337D910518EF68FF843EB63E62D466E328C3B21114E9B50C94452A0AC2 +5D145AFC71665D24C1B357B7C33F3062F3A3C62C2F261C116E6E66B23D86CF00 +497189200BD200A9CF608D78E4066A01CCA2B61D6062738B3915FB7F1F94BA84 +EFB6E7E43F62082F1F51073651925B9BAA1767E79317C54377ABBEEEE2FD8485 +FE1399F5F3DD5EDFD3003C1ED74F6A5DE9BFC51DB939E55DAFCA94D0E89323DB +68A8D52F0DF168F4ADFD436E271AD2DF4376A835B886EE3565CD2FCC642C6B3E +A01B998060F6A132C78A97D45541E4A2B6699C07AC6336BCAD8C57FC5AB74109 +D6D1AA0CBBEFDF35A43BAA60B6476F92F6BB85B3BF63A4CDF10824FB8274736A +7FABD17B443D69DF7CE29B45B716F3F5CB4B5A4C71F99D4326815C4072E97508 +A6ADB4C48B541B724A3F3BD80FF1463B910D1091C1BF280A1148DEE7F1A953F6 +61A006B614AD830337B18F5D6B2CC0EC5402E6FDCC81B76478AFEA9EF6A6D5D6 +7B09553BFD0F60AA2B36C1BE3C30E64DCBBA143B8F83644B6A7A1056DB08DBEF +846043D579B9A1A88662B4FFFB80018F9DF2B0B1292497EB1E0F19C84AB2163F +DFBBCBDFB9A487F0A825807A1F12CE7BA75CF7436F88566D31472F4BCE1F16AB +4441202980DF34AC9051E70171DE69B8C8B03D0F15D7BE95D3D0AAA6A82EABC4 +2AD24F67087AC91DF56E121DE01CBA5F202730889A03BFF834392D7859EF5BA4 +F9AA6AA0A082C5AC36CBE22668787809EBF2F471825655DC4FF532D1B4BAB278 +D0A775D3AF92B850DFDA1B7D0AD3CAE7D009CF0A12186160E29744FA239B86A8 +8DDB50CC132381EFC8BD80BEDE488C858C66966D8E84C67427A261AE1D50E127 +0FBDF478F15FA5CBE925F753FF13393BCF96F0E4CAE6C30AB6FC965B9DBB894B +DEBD651C558430F620B47EF3EBD29F239CEBDF6B89B7B94D2ED0000644CBF1EF +860DF2EC44A444E5D0328A5343329899A661EDF3878AE2C09935E16697563B20 +073A6FC372E76328803DA9BD7415B44F0B46ACB8321CB49AF1F420EA7B1D5F99 +2300AD9E8D4E8A66FDB767A4227D2252A61670A293A79E0B07BAC6BD0F12D8B2 +3FF4E170D6D2E8A0A9746A76F81B4F2FEC1F7050AE35FD468DC400626295A4D2 +52A1E243C4F52B6294F72141A0AF1A04B753F376AADC56359F7C4ADBFE79AA68 +53E3990330F33255287CB1192AE506E36FB3C3A00F2FE277722D48B526189372 +412F957A3D33F9B642DAACE6739B0096FE4B51E6FFD06027F7339778CB5BA57B +34EDCF26F51A17C0370202B3DEAA2175CB97DFE6EA831D241DEEF080B233E87A +C18672E784E66DFEBD46CDDCA5F4D98FFBA34D6BCB0DD73FC52B5168A35A7075 +E06D14A35438A35CE3D3540341C62FC9D3F1ECC4292A4783926AF2E33A8324CD +87AE643A10E4823CA797A6D874840F93565E0ACC14E8B15A367ED5B34C920F03 +44E5CF0B77F25EB6E156D91DA019D1DFFFC07DC721F1CE87EE0B5798FB05CBD9 +AF1A1B537C82516022D1C455BB3A7400D311135F91293DB610DC5ADB8726D71D +74E19DFCDA3C9C974CBEFA7DE04D0EBC0E6F36B76C0488275177AD779ACF91C6 +557E6259C55186992A07DA27629C12617EC2AD99DB78747D903606B1BD731209 +368506CB88E926D33875C1F03A076F1E2DEE72B04AE9CBBD637BAE78F85D5359 +F12FEFB099E7F79F9F4E4BC19967EADE1C774D39E17283D640CED5EEBE5F7065 +B9484913948988BB6397FA675C3CAD9184AA103ED711647FC1F2447B89A491FE +07F08861BFDD33D8BFCC29419195CB424D7CA739B071A6CB48AA07BB8D6EA149 +6D3E5F0A6C0E0810FE6EA95067216F4948F14A1B5BA099FACBE40AF2EE31FBAD +CE4203CA3A448255C2E01D848E1E16A06BF4911B3B6173DE296F8D599353943A +340B7AAF53ADD697F7F0DB8C7AE71D41291C14A6BDF48437F53521C5914DE245 +B090282984C7A044FAB93B310717E1CAE827D3709FA4B3133F4B1D48793C8B67 +7520CF5A1667ECED10F65156FF80AEF4223A3A1DD4A2B5CFDCEC54068A5110C9 +B6BE775E937F87F78BD610C30F41FEFC96CC425E1D399F87FA4E224FD6DE6156 +A6FC881D166C2EF51E74020A7DA82C23C1B44D742DD8AE7796562A3FA1403CB7 +72726FAF5243AD865F16E1C7E9CFA9FB07C8D50EC46E6BA6204D7633595D5449 +379F93B7B5DF609834A03FD494DCA24C38988143C9BE067CC851E592209CE9E3 +EB91A4EBBDE654B21162D7E5569CC136C318EE081E7843EDBF9EFFBAD2372FD6 +A8C7BC331E304175AEF4542E601C15FDAB36310C7ED2531B06E0D8ECA422765B +8FC546BA663B30831A2C948AD871BA3492A559C9E167E722EE6302981C66FEE5 +C8797E4531EEC2EE800363BEBF135FBD49958F17B3C714E30CE8150FE6B10C14 +1EE290B785A68646714C865A5525935AB83625D1C4B36030714561BAE2AFF947 +9062EB00A5553C70541C072627F4B2002B273098EA313ECF8D4304D89E4D58E4 +8894B1747BDFB183AFC1AAE2D4EBED27037840747C2B181EBB4A28F7DBB69AB4 +B1539E8256BB8FE1D496FD20C27E4F32D760A1589F1EA8B1892909A3FD5655D4 +E922F8178C513969267F3DBB4E9906EB689AE2CEE01B7E6242B2ED98F7D10FA9 +48AFDA10679C4375A6EEF12FC20DD02D21CC44995559839C1093E6EA7D867D2C +A7EF5DCD6238FDD38A0C368F199AE515C8546F8BD511C9671510D335B769FE8D +DA7554FC032DA527C628650AF7CDDEB5F0A17ABB3D30DAB0D264E523510351E3 +95B89A8B4BBC739708A9F6E2A9B2E1C246D653CD83E94847FD563F76C0F97E15 +87FBA4C60C3093D184F41BFCB3C36DD5B64D0B54D5BD45C36F4F0CA49B4B3871 +D5D7AE4848B3545FEE5508A5437B6336B0CB1BE95C52C4A956830CF0C5C77EFB +89AF33CACD05C7BC3DEA59023F12B4DFD425762683605B4D6D0578D26C89F116 +46D81D0077CA9E1B418DD33BE7BB7FA0390C3015A455BF34F9F5521C52050B8D +C467305A567984EF85ECE9BA26A60A81C57480E1342E861BB24C5DD2014E32AD +51C74DF5EE6621532F926839C389C6943D1CC25957578BAA1FC0E3946C1198E2 +CA33BDC0CD4A7146C06E9CB7A094BECDAF9DD2D8DD90398707728B7CDCC0F512 +5587FACF96DE3C0CDC40D11059DA30FC8266120F94E6760E57AB1CC6F97A3373 +DFE6E49474A9BE9BA57B204070A2181612F62C2FAE9F76FF53E1EEFEBBB418EF +AFA5D01FF7E2AAA3FC8EF390F1C90F81F7B725F577DA9E3724E4DB5D8B7EE2F3 +66989DDEB59FF71BB3FE57CB6A199A0B8904A00E7690269B916E00598CAB1321 +092F490EB7901D5E5B0CB4308CA693D9E89740F7FC86A294EA94EC5AA9E5556A +A18D56E6DC6B2D27742AC888A0233E23F5DA77B88257AE4A4B50EDEA38F3FA61 +1E23B6269E9A41ABDC22C0A8365103F27E508737038F8E1A60FD47452CAEA728 +E00BFE2CCB5CF528295D5E689136C5637CE2FC9838AA32D84C8FB5E26962EF50 +0B545B5B4DAC2A05A637074F2514D6CEA7A69CF2F88A05C0FEA61B6042E92A46 +408DF757305F686C0E3083A06833EC9C8B2B23B6649815307978F32CFC60F17F +DD370E1C0A7E5E764D212A1F385CC73725E08ACBB8CBF759F66AEF5AFF6C644C +FA9807EDD1706D83C8A5C88AE979700ECF1FB3BC3ACC1AEA58CD17177289CB96 +68A67167CF719FBF54BCA2FC0338CA22CF1BE9E6DA4193E0754B5F3F0B5645FD +19B9DB6503C2F6200CE27E6CC79D0F10EC7114E5CD60CBEFED555C8FE0F95209 +B5107D1181A4B9D6286F3DD8E664580BEFDB436E3CF716BAD8CEB658086346E7 +083EB572FDB69BDA6FED25237CFDC5DB6F1BB321B27F61C5E5899674AE1B0808 +CB878023FC1CA40AAF6E4AB02BF337FCEA41A20EFF533A03FBBECEE5CA70E196 +820A06C57FA25651940679389DD522864DC5FA35107087293FB21F8DD2C3BFF7 +4F4B5373D363BC73EB8CEB672204C8638C9EB97103590EACA1F0F3151A57E436 +AFEC0DF129291509AAD40E6BFAF8E324CD9C17AD056FD9C7AEDDD3C4791C1125 +56D15190F34753ED08855C8D1448F39AF103706BB3BD67716C0A96DCD01331C1 +F0B0C56D369AF5DA96328EA85DA2C427BD9BC6968772330442684C39CDED9D16 +F6F25A9CBD94F9AB4942017F4551168B0DA8A940668EE04404E5A62EB7CFA744 +9208A56833949C989E2464E4D4CCA2A956CE7DFEE8B6FBD69983362017FB07C3 +DB2DD65AA40E019BB3B4579D014FAB4892D5CE63C9EC14DC71D69D86B3840B7B +166908760E4E2C2A598C71048E222E0A694EA77CE21330DF75433BA06F6B93D6 +C7A68E1D370ED66AE05C03C74BF2CFEC3C1231856F0113A11B84F5E975118955 +08FC432A4EA0DE469CAEBDA7800D2224CDB7E386F81E4D27B37EA521E38B1ABF +61FF132292B87C362661225E64FDC8E9E45370CADAB9B57C9A0CD09C699D9CF0 +FB14A3ABCCB87085B33A08BE932074A7E10F5E733FB981EFA68F95DA8DAB2886 +8272D76CF125E81FA01EC92474431F9BD17EAFF42437CA4027E5A68526691A76 +A3767AC34172C5F509D8F6D3A9056F02D3ACB43BB5D70D8B24F5CF8A602F263E +1BF1184E4A12BAACD82529BE2814E73038AD71730F2AD6EF0DEEF2673B0E8600 +50D316A9988E3B35CEF343B0E5F24D0214BFB1DABA00387677AE8D16FE961B47 +6E56551AAEB6AA9ECA626ABD01CA41EB6BBC15FF2892D7675F23F8959386F24C +170610025CC0F6724E975DBF843AC45C0279895274FB57091432F504051A52C9 +819993050681762E87154B8000D436B04768061595694649ABA87131B0B8B850 +9B9AC65D1CF1CCFE6ED073AD680E9DAF2FFF847B216EA50FF97C2E0738E083D2 +54C9BD239B4D23C32A6B94BAD95102F70DE6C64BA20E480D6BB8EEBFD755586A +EECF15900961CBA26BD6FEC03C3BB51A5D17024CCF8F054980E01C45BFDC1F18 +CB160EC8722349AC2CBD62B12F0D3C3555FBD815332F15D4BD3C833B4699C5D9 +57F84D305C363D7387E4011C025AE775E218E8BFC12C8E3727BC4D0D28BE308D +6AD7E438094CDE7E2660234BE947811965606263564C7CE66853498677DD8F28 +943CBA9FD54E57B1720DBF90F6E399CED323AC651BFC4770911F515CDF8AAA69 +D2E26A8CA01859367931A33E96940EBFE29E653039622FC202A2ABDE7B451B00 +2E93E8AF6ED01D1E1A076AA60AE5CC51406DF644586AB7A9E1E20AD183AB50A9 +CF331A59D7691685C8D50EF7B473739799236302FFE5D2BD3FEC9A825DA4E686 +07E2108E32AC88F180C63C16BC300119A912D1A3D2ADB435EAF8B4B1437620C4 +9BF07318952AF158B6FBB24E3BC8C79949119CB8213864FB444FD39344C696C4 +014975DFD60E5793947D9985C668186CFF156B5A51A101FD652BC65B945EEBC0 +629D88593334CCFAB38D5E13A05037D5D91DDFBA4656494699C6DD524EA39B50 +3851D7F0FDB6AD2848426787C8B8F7C5A65CE9ACC644636D236409AD05C7AF57 +90350464847E98E9806CB4051992296FDE0D24EA95814A8F7B1FCA2B3DD7E1A4 +BFE0114B02876615F15E3BDD86C4D31619007E8FDA49EBEA8927EB28FBE0118B +5615CF1A2479B97EA9209B2336D796934C2ACCBD815A603643EBC010D77F2DFA +BE1934ED3617FB150B2D69AFC9227CCF457C31B6E98148D14F22889D3EEBE747 +1F58CBB932CECCE24B2E91EC2CBB4852957B152502BCF73BEE6172AFC954B44F +1649ADB935FB67389319E24F359A87C790B8E04D997F48FD97879D969C7F299D +99B011B9DBA379F5A90C5889DED01E871C39B9B3BF2A5F54C04E5F4AD327227F +197BEEB00E54FD85911CB14675B3FB5DA8B4FF9D80EEF5F92DD6D22F01A40B18 +8CE8F740348E6458B2749D084CCF21AD59CFAA438B5B2B52BA165C3776FA5FB0 +59F95EDEA3F05B82817790C2247B4D4BB6D04312A176986C4DC3EC5BC5BEEA12 +BA0892ADCD2E5817F971BE60529228E88173D053D8D37CEFC40A53E3A7D56655 +E78CE8D89E0C2157F462B91BF66562608E84A7CCBF0FC97DCE7C32F4937CD1BA +5A9EF98122077CCD77F0D4B413D88134428EDDD4B408A1CA44227FCC064AF791 +74B378997106AB867A0DAEB81C05A0E52046B893EB3264B13DE157487A870B21 +6B626804C90CA35C7487D8572D374F89BC214C104623F4FEB3FC9921A37BFBCD +5691FC8D34C1504ECAAC62E5639E3D603DEAF642AFB29D65510C4649D1E10029 +478F57006EB3FC50650C79EC23799E3096B920D519D2777C0558ED6148CA36A7 +6B7960FDA29951C6806E43D886F4E09885AC300738BB85CCF1B9DB2702B26D28 +E71E20C15361E0AE4E62321EF84275E6C38A5394071989EDD48A50717C47F6F5 +FBB8CE06F4B98303F87B580F791BC936B474EE9AEF5D0B520394D29864F54747 +312FD93DEEFBC9A4E8948D0F04981A4B0FFC277F5331EADB2C9B260492104D1B +9FF4A550E46526E18628FBC914FDFE4AF06FEFAAFDB7612BEB08A8F9701CF8E6 +16FEFE9F3FDD4C69CD8B94E774C6D7A5D0DA3B5542C8CCB50D99D2AA72E775B2 +F492FA87D09BDFADEBCD184F03EF0E2D32E9CB8CE536793FE7DC4FC36D4CCE41 +C7E4832CFCB89AC3C2D9424032B5200C0EBD030450E1F187C05132DA4CE553CF +34322CAE917D85EC50CE6B5FA5683402B23DC346ABDCF3E6DE9932BC41CAFD66 +D5458DBBB689B60CEFB2C684764732C290F613777624D349DC3CD27515F730D4 +F7E7452C23FD57E50888B33A9359F3834A45DD8372E4CE789A50D6B4FAA9E5EF +C300CDFF97216429E2F04F607EC88917D4F37D54A92D2B7E071A556686CC334D +ED4E2509248075FCDC6E9EE6B36E1D1A87F7E7A5AF045184C7618E9730A88CF4 +788A783A9F0FDA1A62AA5D739618DF70976B29E2070A5DA79E7BE8BCCA15B10D +C3034F128A120EE0204CBB875525B21ED31171E2671A86080DB1708AA5095096 +87B4A93754CC6728BA0FE317ADAB3D080132107CEDE64DE0E8A2169FA6CA58F0 +C0F859DED55CCC42840845EE5126C67FB7C12D06255EC8C1EA8D0818AFC432A7 +BF138150106B06296C19F723677937F0EF4916D9867A61881813165ECDAEF3B9 +DAC80ACCDA42728B299D3162F604F8EEDB5329516C21A722B6F90B44E3C178E8 +05AF55DCA05DEF68AC75F1AA91613E34B528C9E104A8A620DD863B7931441F1C +980A606A0B2004484C1A2E88D0AFE8CAA98E5A9064C923F14B2B5906F9DB8F10 +8DFD79F217C965308DAA3A6F387B0BBA044588845A80B3850D96CE61954D7E26 +EC7D7E92001BDD39F0CA86751F6FC4E987A6C3267E60C8A02FAF445916B9BB44 +2EE70009084AD0EB3ABAC072200D33EEC864D50135653DA2774B9283D8978DFA +EA91B0B759BDE7867758493A9EC7251A7C620DCCC132CD154F2F66678BA89750 +FA7E3D23D3050FC9D54F990A6F96F035CFC231302DFE51D0139FABA75A23B168 +685DDA1C9E68236A7D19541193F753A633B103FC09BBFB3E6F384DB7639429E1 +76EF95062BBA +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: csbx10 +%!FontType1-1.0: csbx10 1.1/12-Nov-94 +% CSfonts -- pfb ver. Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 25027 25304 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (csbx10) readonly def +/FamilyName (csbx10) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/XHeight 444 def +/Ascender 694 def +/Descender -194 def +/CapHeight 686 def +end readonly def +/FontName /csbx10 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 11 /ff put +dup 12 /fi put +dup 68 /D put +dup 70 /F put +dup 77 /M put +dup 78 /N put +dup 79 /O put +dup 80 /P put +dup 82 /R put +dup 83 /S put +dup 97 /a put +dup 98 /b put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 102 /f put +dup 103 /g put +dup 105 /i put +dup 107 /k put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 112 /p put +dup 114 /r put +dup 115 /s put +dup 116 /t put +dup 117 /u put +dup 118 /v put +dup 121 /y put +dup 122 /z put +dup 185 /scaron put +dup 190 /zcaron put +dup 225 /aacute put +dup 232 /ccaron put +dup 233 /eacute put +dup 237 /iacute put +dup 250 /uacute put +dup 253 /yacute put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-60 -250 1164 908] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A2E729C1F3C653E51B9F09F139 +E332F81467DCD46C6B80A4E88E1FB2B35C9134E8C9E669DEEFA533F7F13511CF +F16ED856C594BE960395D34E6F1FB840870E1390BD51DF0CB99AE59E98B369A9 +308EBD4D62411D723A06592B3F044EE52173E7B573E2FBC21F32D00ADCFD4905 +7907BAC782355B39ADF860CF2381EC0CC3136060C15C7F794F54FDF9445AE615 +FA03D051B337AB511F64C838302CBEB69E431B2B66B4CF0E61EB5ACCC8F55213 +E44FC7CB51E3ACC12F45BBEDC00C9A63A43839BDAD1C0186974C7539367FB600 +B9D9DE3DFCE060C626C826CCC9C6AF9B765C6D6487D5945B01FB21FD234A6D46 +FB48C4A049CA13C82BF001906C71B5E4C7D8317DEC3B2F4A0B8F28A9CA07F8CD +FAEB3ED1ACDD5162F7D3491964E990EF808D40307E9FBDC0AB3B5BCAD56C895C +C6666B4096AFADBC5B931D07B418009ED6BF9886982EF5689E1C67D980F16913 +28DCD11AF89476D84997CBC50E8E7942C3B7AB5C03A7DF37E3120834DAAF7EB6 +E1A625F38D0EFF2CE86A1AC4ACA3A3556D98D515AD265D35FCD8750E1F4E73E3 +A74900BDC6A9FA84C7A4A36214935A985CADB31B33706C0DDE055D4BBF888C0B +38320A34A47CC395F479E84CBFB77BA6F9EB33F344B34D19ECD3466836255387 +772A0F959C9872EEBC9D69943B4CB8051FDB325D6277BBE0490A93FA59538F70 +E3AC3CB5A692944D30F6910239CC42F60DAAE4DD433F3F975668F57CAEBE86C8 +FAEBA262650D218F5DB434BC6B1DFB3532D244AB20D22A7E42C5EE6D3018269A +8541F06633E64A7213BEBCB302886322215C3D9AEEC195F65BA110D897AAE35A +FC5F90AA018E1A0C5BC69220A49AD863023AD349757E512042A101C8118DD50F +9C8BBDC7B3E70E8959857A595C27F9E77496A50E83DD2AB513681A207DE3C58D +43C0CF228D97497B4AF40E8C06F70D6F57CB07C4FE265CD1F01DF9CE14CA0687 +A58CF8150494A7C35F098E9602137EEB7EE353485A89C96E5188F9E0672AA9BD +D8BEBAC637D3C1FC1CB6A9E46A2904299DC9FCE32806235D9DC6A3CA9AB79F4D +A8B3A206698DCA8E3C32777B66C306861D1804686C70E9E677FE80A8C2EA40E3 +19260D8DF961B469BE5C0644637E9787C21146D045F3C5D5F98FEA3576D091DF +92556B47B2C5D90D8ABF8C14A0C8FD4F4FCBB68971E4439EA9547D4E09D99124 +3111D02F4C228490C47EB3D54C79D3849AF18E823911621F53D54C34855FBCBD +E727ED6A8E4E5C373769E6B9DB3E923275926683F4B77F637F9953C042A412CD +417BCBCCD4836BA816F517976C798BA49413360F4AB6E2D6D2ABFFAACD9DE329 +E24EAAD32603F2C48A25D198AC539A604DA3D9C6F90676BDC54A16586D58C8F0 +114D19D4BA338890C5E4C89A830E36982B3F7356A05BCF4DF2CCC15628B63821 +5C6BBFE1ADB167545A1FA648B401EE68EC4F25D587FA08B3DD4D7B1059ACC681 +384ED46BEB92C39E3FFFA59AFD9218ED0F0EEDB0C7CF4C9C557306C10A99284D +534F1505FE75349320256CB0F6BD29CA2177EC8E8B0528AFEE349409EACE7793 +8C1A2B7E4D651EAF719D3F6B356E8C4A7E6797F2E826F75943A0911A73DE8F31 +014CC3808CBFFDCBE9928E0062DB07EC284BE862A9A2917B4B4E0F6080580619 +246321AB5FCE069695FA75D15E336AEF8E52CF9B2903D5088F9C6F33243C3203 +F241B1E2DEE785425B8A3CB371F8AAEC54859A9BCAAC35FBF38FFFBE2BD98110 +0E8B7446C07B2DC41A4DEF18F47B79E769EE0D9B8C5CABE516B15A1C9A515676 +5D8EE4E1D799C04A464816E985F93D7A06B69964346240FBBF35D635DCBBDDA4 +4F1073D91945A036E575C7A4F038618F4851249D4680A3AD1F7BE79F4E995206 +382942615B9A280A4F3A37FD33C9BB7720E5B39FF719B82EAC5D74747F804C96 +A974D753E21D76E1E78647EF86B4D950F17B8F3119BD31D43CA2E540D8C8C091 +A8831C82B77DE71B44C81DC3CB1730481CE1BF5378F38CCDE06E9326712AF114 +DC9F86BE51C320ECFEBFD9766FC9BEBA6883584951B913DBEE0857F04B0A4600 +F5667B96E362E4848D4505965DFDDDE2CA0F51A16AF9082ABF1BAC60BEFA972D +906D012BFBB3F2E796D6B56ECD295C5DA05AE1C8BB06E60D04CC59F665A7403E +0929E42E6E0FA9505DA9D97ADDE5C05970C37DE096A4B5F8DFD283A167E1B8E8 +3785D5DACCC1DDB58523B9B359244DE9E0A8D200C202E046B6DED0F5F2414A5D +0C47948A558C53FB128DE4567568CEEFF15D36C55585E6B93FD7D953894FD71E +985328AB6EC292CFA50CE69D6AACB8B8E1FA2AE93EA4FE23B163BDF195AEE33A +149314B62997DAE4410694CE7484B9F82709F9FC520227B02C90C67FA2098530 +57ED811F412BB9E9005F378D577514D9569BDFFECC18DFA953F47B84E20D0A15 +0BC60BF983236BA8E0E902CF8E94BAB84342F86F8041C3E2F7F6104C1A8D2DAA +EABDB9499A4DBB2C2759D1AB3A34EEA5F799FA61F1813281AA4C529BF241FE17 +7603BDB87A0598EFBBF6CE8FA0DD67F4D13E26E406BF6A03605F77D7D7D7983E +8B8274B99E885FD3AF61927E6A5738EF7CE6F5F296DCC5283B0821E9D6EA198E +509B39C6BA68E9B357BBE0B0D510B157934FA99DCD8A91C01A46B33CD2AC2C55 +6DE9D95D40007EC3CF2D28474BEF6093AE8A33D7996E158D64AC4FC8AD4BF21B +8293EE770C8A73564B477CE92663195610934B515AA390A00243CE0F4BF1BB01 +A152AD7FE106A6240C2E11A64AD8CF063805D68BDE3636E7BDA6D1C01301BF6F +7825A5C5B3903A7526C4D25777401EBB72688D7F7C5DC3810CD0D40ECD22C399 +B97F231217449E66040EFA9104781BC4092E89DFDB73ABEFAB4058655D4894B2 +14224B36D9B9D21C04DA1F9CDCB6C276AC101F77A84B431DF3360B4DC4C6702C +88FDB095395FD9B90116C1AAAAA761EE60B74138B33785C750E59B8F344CF20F +8A27DF10D18AB38131097C48993268D27D99BFC273D7465C03CECD418F829BCA +0A50A4AF5FFA39E5EB97AB12250460F497A82BE12288921FD8F6E6E514D2A755 +34687D264B2B1DE4B5ABECE5696E5D158D3C9C43A08A9A5F8C55243E3C1FB561 +279FF668B4EB1006E29AE4A5053514F98B1024F261FA7488F1AFCDE0E799330C +4F9572C68FE8185581E0DFDDFD39FADB0BBAFF46C34AB17D3A1A73C8755B7A8F +F3593CB2815945C2FAD7CA5618202EB4FB57F135DF1DEAA0201FB7A8453B3FB9 +D325C73CF27BBEE93F38D40E9900B9FB602C47E2E56494963E62BB8FB6B08D91 +2DBE58633DDE655E43ED9885F7F68572F82EEF73EE362D8AD4DA6CD8C4963435 +46393A215684E0A20DB432FAAAA21570E2C79594DCE22CB6DA1ABAA46A1475FE +19CCB09ADF94BC4DD35AAF57AE000A5DAAFB9BB967A92097267E6CC790157DFD +E2617DA45E1089F30413D934A4C3F69AE085F9A68D545B0218C107D4B26EF873 +655495FFDBE58498F98ABBC55F92D085D95DAC0AC94B680CA8F0096C975B10A7 +7B0D38759FA0A8C25AF088A86903A104E0EA4567E4FBDE7C2C836E4B2154B282 +06350AAE0BF06AF1F64B08DC2B883E6FA1014DA47B77D953903F4807E54E7ECE +D9ED32206A4C0653EF1BBBED540C5726342B23E89270328961B05CE7EF8B2133 +94037B301CF2976A3C70AE59E30D24EAC361895D8B2E3098E1E40E17CE6B9DE1 +7683BBEBAD3BF4466487BB904DB43AFBE3871EACBAB6B6786B280240CFEA1378 +9B8EBD5286E03F9797ABA5F4684D21EC8C1AAD43FA373D6C45EC5B40C7C6192B +216569A115DD4C5B335B26715CB18FD8019BBD2E58BBF32164859804082369BA +148FD919D69482D0B16DB44E7EDFF65A2444AE146119B115C489A90122C13948 +7AE46F3194AFDDDFDAF95B64A06D40069577C5187B7C35C25B0FB44B93B17B61 +7BDEA227EACC07E3DDAA318D433B3DA8D14575189E5B79AE70699EE248FFC365 +403616B7CEA32DE77C2D29EF7E4F5BACF38872BE19FCD1CC402DB66E195EE094 +15F2E091012789079F24E8B75354C78D702250D0E77B7F9BC3E8D8B89A00338E +C5A1B086A3F3DB8B8F87DA48A45B223F043AA4B9F53BE5E4BAB9A9FAD17F3EA9 +B1B4CB5BA6FEAA5935AFEEE9FEC4E30144AB7296AF26FA37CCBA79445F6F3AF0 +9D473B6618D1B552B8560450D315C0CDBBEFD7B62BBB5EF5D198178DDCEAAF8E +BB76802FBF7771CA6D6081C312053B5A3365465176B636F3BA43791D8701D4B9 +45ACBA3CA361756F83233234E44F375B47B8D12A0D766BC05FAB092F6FA11EC7 +057FA9C303346E31534A7D0AC1B78CF6D9D1D03E1AB74CF3C980B466C4EA3783 +BD317F06261E4F7EEE67FE7965BE9E21E3FB99EF0AF54E554A2F02892E6546C2 +3E3CE6A9006CEC4EE733718B4B8C2B92AD09BD4CD4880EC34947708E2878CFBA +6397DE32299869CBBDB4048BB2176ADA5605E50E394B59F33F718D61BAD8AA1B +8D948010830FAE3CC75868301905CAFD5209240D23F34FDB2405F087502A2D98 +E8DDF7402C72C296D3AEB2F6A1F6FE81B25B8C3BB4570919DBB7916C62FC4C93 +CCF733A6A2B65AD88A102847533D68BF799360DC82636BEDD8B51F5529711121 +163A36BB7664B98CE379EF3787234D2E841D97FD1A8E2BC67FE045C93F403E1D +59EF5765AC4FF95D5763EC0F41D2E879E27267BFA509B93D855B61FD1F3A49D0 +836F70D833FF2E9B8E688850B1B164CB41F54990A6D9A7226C49CCC309794EDA +44CAAD11F956E3EE046B06D24579B5F04D645DF1899E189FD50D929E44305730 +BD61D30F0E2C5A3AD1DF2E3A05D25A964154FA096899CC35ACDDD9DE4921CE80 +41FB4649B556FE4E0EDF67E55154E57C96F560BEB805E5456772B80BFF822E22 +EA13847D867A1E3E56A714EB0E7D20244AA4275D964CE5515D87EC3F26B335EC +2EBBA5CB0DEE8271002AF22185905F9C9E44F90BEA91E65D9AC6DEB4395631D9 +A96DA3BDA4CB2416CE4D40AAFB44F7B026E687577F1C9046931EAE225BD536F4 +EDEC94E3DD1963602F3949C5CB357C1C0F8B6ADDB33AE6CBE95693FAA0F8C3D7 +67842045F5CA48C8EA4CFF79864A85F650212829C9B8A0055BAFBCDD88BEAF42 +9DE610C7A4E0106742E5DCB5D8C1A0C6D4F4991D514D3EB096CF6B545522FAF0 +2AAA8DCA601CA5CD0B574D31C3E065E41E322A0624E3AD48834B7F7F6C08B1C6 +6A24153617BAA52981C696D4AB49CE9798229D3C65D3451BBCAEBAE81A381573 +C138A105AA4AA27B20DCCF8AA51A35CE38F93CCB6194D295D8CC0CA80C56B5FB +DFCCAA6E311B3A99A6B6A28400B06BF95B10FBDA47AB04D59BE2A3F1492B4E56 +B2B79657B04A85F3BB9F99F9AEA511FBF449029F4F23F17F0092C2BD87D6D87D +B51498C6C7330C595F1D03C6C3F95FAF3974E0E12950A2F590EB8DD7A01A25B2 +C87EA320CC5CC5EA938CE23C9B18F0A4C28426829FEBE7BF81BC5DCCFD930FBE +2111AA91C4605FDAB56A367BC5C5B02EE4E543337BBC50A6B2C66B3E5D25A5A7 +1B8491F5589C965D5CF3EABED65A6AB96D493E3C8C9C0F9A56D0E11E0501969E +53A78C5CE968EAE73F48380BEB7063EBF9A13DE8E1580531E6692EE9CCA42E65 +DE4B0697A788AF9EC4559DA06C54B05B2DD97EF0D5248121C96AA9ECDC3F6F32 +F9A77E87712779290874AC2E8E65C016B76AD96040A483990140C4A6176CC1C6 +5E83A1E8023B095950A8673E6CBA8F4574F7F3B23B471EC220A9F2F48E90EB48 +D3BAA50ECF066C038D9EBC8384D71D868F32DB0208DAB7A08E01DBE795BB6564 +FE137F69F29155F06B86A6D4D6D05BB18AD9D189A13256231F3CBBFFF8583CC6 +61908B1AD434B98BD1092B9174A46EF3B8408EC97EFA66494DC04E177FC39200 +4C115A56E03DE423FEA6BB20C3C9CC9AA5CFA918F050C1EFCA18EA8A1FB9D5F6 +3293BF3B6AB706987D1E65EE1C82D5FC8C5B4E0532F39698AB5AB0C40382BEB7 +69259023BBDE982804F02DA684463F59BEE2F06A61DFCF3B2A082F299D34A5F3 +17B31EA18AAD9069241DF0E80C8BB025F1485E71DBD6794747BCE4807D588DD1 +C5DEDE8D24189304926B103BE2CD55439225F084AA107C207E1F718E3042A993 +1C3EDEF8C47C5FE8526D78C6B5ADF013F15628470CCA64692A4A2C61CD056928 +BA63AA3AA736FF26270C73442FE279786B99F6EF7B54B1D7D506552AE2868B17 +418DE9AB202075628331DD3D93D591825727ECC92F7F9EE7050CBC831518F3FB +DB4329339637CAF3815A39F342A9CE167B6B84BCE77BE3BD719DA663CC386A0C +20CEEAF6D4D6D7B7191AEAE05E02CC409AF50199B71F86B07E2C97B05A958ECF +8A55702227FF7C40DDF14EA0AA37FE2D4FC9AB4645B6C46894D391B2DF95C0C2 +D13868AB9738F3184445B00D501AA60836615861FF842096004D8B98E92AE327 +9950D1EE488E14EB1054A942ABFF94C6B9E28DBC57273C1DA440B3DF76A5F474 +0125A8A09347FF721CCE9E88A9329572041B9A993E614C2B9264E66FB20ECFDB +6F767575C13D97F5FDF6D1AD3FD8F58FCE2B09B4726A46A65A8466EE17174EB1 +B176D051B0AB7E03A5CDCD047B66470B773524F4A2FCBD7759733CA3844367B6 +99985D0C03AD4B5CA381218126759958B5C9979BEC428EF80FA8E2A968608855 +4473E6D5E1B930B135FE26548E2AB40C54858ACB1B0220286091E60A16063B71 +28E1C3DE0719F068CE26522D7CCF676FEED0B84EA57EE1B2C93FF5A36154776C +1FC758396623F08FAEA90414DF2C68F47284456F851B7670F453037E9220BEF3 +3F3F4E48847168B099A2157B83BCEBB6FF9171DF8C32250E74342508C32C018F +FB44A1742CFAD58F25F2754ADB210518E7C1EE81028EB98E047713F7AFCF9A94 +E5A9E64E02D2B06DE33E3D6E8714335D5096B3175A9E67ACBF2A07D26D6705F2 +1AC1B84D1E2738412F244BE490928C1CEABB2C96166F00D2BAC0247459693757 +866871848899B2C6ACF19DCEE9BC77284AD0B7EC385A270858DEEABC803F9543 +CEB27797DCB4F7AC51956017FBFF0BB7E805E558CFBDC9ABF482296489964622 +9C57DE7D8E5ADB68A9269EBB71E8A733BA4323C55FBC6C7576AE27517A3B2B01 +784D213165F51F431629B051B400DDA7579B1ED75FF8A5DE30941271756FEB99 +939B6AB6C9C71B9C6B24BF57FF338BC512B7C076C944D21ED7CABFE2309F1744 +DD9193960884337CEF1690C5BB034DF5F5867C5016568709967CA55EDD013FA9 +B40E7AB512DFE90EBCDA8C2FB04CB94664EDA6956F0BFC35B43720709E3422E3 +D3344E791F2B5CE33970446C119E95056B4F594E5D78D13DA3805F8D9FC1E2C9 +A03854E6AE35A763186CE2D09D8DBB66A850BC86D113F60C27DA5691C788C6D3 +3E614E05231FAEB6E0C04D1A12396932BC82D63B00149EE23CE6D2A4A86EFD52 +0B33EDC9DDBEE4EA34181B9C4E90828C9DFB1F41C1D6BB07B3A049E6901CB025 +80152B12A344A6174A35AF1E3F675B30768E84A0F021A3F0A3279F2176777185 +40A4BE96F01A7D58DB64D6FDE60CC421AC4A038B92D18DA5537B8D5CD573B796 +F5DBDE6F40FF8634539A03C42911B33C3CCAABE42E8E60B5F333CE6F446B8006 +A34EF3C6DDA6156EF51F45EF5E1184B518EDE218A0470418DE161013DDAF31AC +B66A079F299D74DF02468BAC37B2E8EF0F3D0760FB5B2E7DF9688EAAF624CFE1 +CF3E4904293093318498EDD1A8BB5892A1CD9B1EB2635942D40051A4EEF60177 +2D2839716F09A388464CE6325B0B05C18B816C65A28569772FC91149E7B467FC +75713A51312D46109EA46FBF9F338393D606538D0D69D272B8085774BA1E280A +14200D05585E688F4B71BA482D373B04B1FDCC303B6B2DF6087E03EF52E5285B +A0DE927E8181534BB1AE01BABAC693122D7EA7E8EC11990471697A98B9573D3F +010F5DC4C6728C9530BDD7FFE35657D848775B86899F08653BEC6FDAD2CF3ABB +BA5C9913846B08D6C4B636899A0000DA116B39C9A5B914C656E6C6FD14AD5638 +E1D19A7A029E29A70D5853D57CE6CE43AC73D7758D8ADA48F6997B250A874454 +6CE5DC51A20F19513BDFBA02F637EE9A37AE688333C6EA8142A1C464882B6F56 +04E14C88CA53E34E24AEFECDF68E673BA4A22BF5D706FC3C6632156360786DC6 +3AA69AA896BCD2A72B35842AF203B11F50CAE61F6AD4BFB275CC761C842BD467 +D614E6780FE45163E0A23259008160AA936D364710BF02267C7B4BFAB09C04B1 +2CE61BB3BD949CEA2DED2DB92E5BBBC54F72B827C26D3D8EFB07EA934E8D3DF2 +BEB9C2BFD2EA9C3B9E8EF2BBCC33E9C45D1AF7F884BBD6C6922921A6490A5475 +2C2B295A373435A845A9E0E1336FB34697ACC534E596FE3C1DEE5414E62E1CEB +CD823E1975ACE5E05AF06D4541BC9681A9C52C716A3378E86B9B4941BECDEFD4 +6A0EB5AFDDACEC487CA551E5971565E3B971116AD68075875B6EF98EF9BEDDCD +4A1626D2CB614754A8FAE0104C703C84A715516A9FD2E5C883E2D3F611D984C4 +EAC171A290C8F19376093B516952C81691C090A880A60D7C57F65F615F58D6D2 +6303AF77118B1C2F842494E8AB2BD90C2AF2484D3309F40A6070C88509B32812 +7C37A01B8051CE4719825DEDEF30EBBB0863FA45E53C724C1FFE63BC8532EDE4 +2A34BCCAF706B559C3FBA0D2341F530E2A7FC53666F0A08B81BE19083DAE033B +2AE86FCD88365A70ED2B96F07CFD6AE98A16C56BA95404514974575277099791 +5AE2D7D4C11C1F77099729D4E3A1CDC65691700D7B036919505E8B9AB1AD862D +3DA326116785E82B88A4D0FB9CA730B0164AB17951401EFF78E020AAAEB7E443 +F944118738C1DE82831BE36A58130B230F4BAD4124D1EF0B4B4C671C1EFDC56F +97798C8709363AC16CDA30E7D067BC129EEDF95624AB393AC95A78C03C175FDE +FCC2CAA112FE2E3A017A93A89B3EC023074C11D3D920C31469A68E5010C1998B +3DC48F608B077E8F961A9F45519C753E0FC8BC8AC8317ECB8A0C0BFCBFF9ECD7 +C4A93A7100CFD3A92B04C98BF99DB786990FE9FB263FE4F5A916865BD404172A +51E0C0C766BD2B93266B3634E57A076C8744B7089ACF220775582E4459BC0248 +88FB9CB698FC6F61854D9626DAB281B828FC455BEA7FA64E66147E394EFC0B19 +E94ADB65D6370DB6B74C632EBA112F622F9E59CF911C4BE6C6109B928E40FF9A +0977D655FE862C67B0C614779C13006958E288F22F78BD10DFB217CC4082277A +A3E957C1BFB6F11F64F3E3CD9C97885B9BBB92C8BC03A8B14508D59B8C07C418 +EE79AC80FCA55AE0B53DB0B300438271FF36A420FAF314BFC246ADBDA2F3CF7C +E33118904B862D053B6EDCD36A32876194CA090E89F8143F05864722177FD6A3 +4DDC7793C7E1AF2BA38A78F5B6D7DD0C026C5E219BAF6C36A5F6C4F1C7CE6054 +34108F81A473579159FB797B7D052C73383ABCC612B665EFC4B4F85B024892EA +70A7DB7737EE5A87DA21217759D4AC6DBDDDAD0D86BED1714CEE4D69D0650258 +8AAB22CEBFA0DC80FC54943171D47C22615FD50971B066766CD40EFE0EF7BF0A +BCFC6CEF84C778F2F852CAEEE77020419B52D02BE2BF67DFAB7E56DDD2B307C6 +C08419D07BB13A4CBE7B1BF08F5849BC8466C04FFACE91322652E724E486E1DE +3DACC4903B1C5A0D6D0968CC315A2256DD19A09B276588A8F1571F0C207DA338 +7682B4119A8488C67BBED9BC8467FA95FBECEB1D6429D9F0F7011A3652CC5D3D +897DDE77A28B94E56168FFC44ABA5C5DB97B2DE100DA3473084492D889B15858 +253128DB3DE7D008CBD3689A9AC130F6EB480A4035644B23696F6BCAD2213FBB +E539F9C431A2A946D3120BF4953197DDB7012BCFA77686CC2B2A8FFB7DC00FE4 +66608941FA9EA90225FCC227F83A56E61039E6FC115860F338994142275A1203 +DBEE8B235610947549930DCF1661C8ECBE8EB514AD3FC0DA56E804FE98188CF0 +FC56255636DF9C0D7F0BED0CC834CC771B8B68903A3A7F7FE3024BE4341D47D9 +2F6B6126A4116C0994E857CF1C0C8B5ACDD5C1D22056016D39137FB0E3240C2C +91650B1E140095F6F8746B65F990E40DFC6728AFB5D4AEA98799DF6220C5480C +5DAA607995C714F40C8C7111A41AF324D723870087AF582EEF7CB41AE052972D +F6E94DAD +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: csbx8 +%!FontType1-1.0: csbx8 1.1/12-Nov-94 +% CSfonts -- pfb ver. Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 25242 25747 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (csbx8) readonly def +/FamilyName (csbx8) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/XHeight 444 def +/Ascender 694 def +/Descender -194 def +/CapHeight 686 def +end readonly def +/FontName /csbx8 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 40 /parenleft put +dup 41 /parenright put +dup 68 /D put +dup 79 /O put +dup 88 /X put +dup 97 /a put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 105 /i put +dup 106 /j put +dup 107 /k put +dup 109 /m put +dup 110 /n put +dup 112 /p put +dup 114 /r put +dup 117 /u put +dup 121 /y put +dup 122 /z put +dup 190 /zcaron put +dup 232 /ccaron put +dup 237 /iacute put +dup 250 /uacute put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-63 -250 1235 908] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A2E2214AFC380F5ADA59470F60 +D8D2FC158BF2F0A53EF87A1802A897E4E860F34BF60C83C787AD1CA226FD5272 +574AA5061E43F5ED5C153D504B9658DAD50711C40D80A64620231075FA7ABE3E +BD352D568BFB58C633E5BF9C561DF52E008B6270A05DE0C24269DDFA6B90EC90 +A0BE858A557DD6AEC6BFE6391078465E967382FE98FF878DD1E6DF2B713AC8BD +D0E7CC7A6CA9EB806A96DE26EAA48F6BC49A016BA0950BD9EC232543199A1D6C +5DE780E51C464DEAFE906C67C49C455BF0CA836160C409FC80C6F82370C72BA8 +D5C3C0EF2535E3FA3DC2F4F540258726F28ABCA9CAA3CA878CCBDD6273639EA3 +3FFA29C328F8F9E13479B8B91887F4C073B873960EF6FEB4AD5A2D48197B28BB +F5F5889EAE914D38E97DAF6F87C2C6FC300AA4152CD5DCFCA4D25C6EC8FD9574 +F9A763F3B362A7945B7F392CB9CD126E93E93998BEB1B48FA7148FFC8A4E3D3B +FE2E959A1D12839E2549C628C4D60BB88BB045DD9113BAC0CA2AE95D514ACD8E +F7295207634056AF510379159EBC72F24E52327FEC852295DC6EA59178BD6A8D +3651E23EBD4BB12104654D566EDEE0B9D2D7134EFD01281C34C1EEC0A5713A96 +4CED3F0A760F5C37C8CA3163884FDBCBC075A0210A6E76BB413DF97AD6A0C787 +835D361A6ED43349EDDF3732CFAF4E0214B3650D7DDF7650F27D78D21769D353 +CC0F680A66ABAC83137C95C8320C361E0698AED9C0D736FBBE80D4359D8CBB45 +AB5F76401EE22C6CA9D78DC4590CEF1CD7D9F9EE334E93E0147DBCE5233686D1 +607998FFE1340140D01E6381252DB48967EE6DFF5422E8B301289648A5000AC8 +A3AD9D1825FE41E9E3A55597FE88BCDAD2A05C02204EA9D8962958BF100A9189 +488F9422B96396E29C438C2829B9254719BE08BB792A23CF23AE241992E2A731 +7D274FCA140E52839EADF299B6F7FCBD91C1EED9F09ECC2B0E6AD3AB468086AB +B06ECB9CF4F23E1064585EB784AD2F5C33858B103D979480FAE1376502863F8D +EDB1B1FBEB37FD1594608A69C7E9F78B7405B7AEF8D733992A739E44AE5BB770 +3C322675D8EC3F149CF3062EECCABCA42B6F41EAF4859C250FCF197EEF370E00 +45337EA05779AC0871796EBE40AA547D1B437DF0D8C3C050FE006464A2BFF97B +39226EFA909BC04CCC5D3C5B8E6211C3F4C77C6DFDEDAF2CF0DE416D8632737C +313B4F64682B9C446A878C782BA6D48AEE80E17953AAC7FDD23465363D9DCB98 +83AE261391BB54AEF57E8A5CA874C985BA59C4D1B57B6C8C3E056166319AE0C7 +A3901006FCDF8C522D1AEE2980FC7069A31D428F46C6623C7F7CF67CC77605F9 +3ABFD90E284BCE7CD72B54BBD37D4A2258EDEDE22F0A4EBC50EBF121854647AA +569AECAAF54302F3064A3EF0B4017A8D53AAEF3115E208BC6040842D63C44911 +DCD90055D3B8AA5B91C00BF0035005D95468408633A976C2ADBA3AF8EBDCE658 +702B43ADD3832CE4BFCD1B61B37EFFD5AAF1922A3D829C633B0A4C0994611381 +2B83D3740FF3D7ED55DE1CA370209533AA5476C2EC803A7EF39EDE2C8E93360E +1FC06A0069ED59ECE66C7978560BDEA165F84750F35C14DB4A4F7FC8123FD5AB +ACFC49C2E96F45762595330BA8FE7DD80BA78103202820517E60D2D875C34317 +5BAF5CD54F977CB8B5D65E8AC638E3494E00F477C8D189EFD727A97C84E6B9E3 +FB139F7B6D5ACA1C723098A78E45A7F5B5ED3832AB28CBD448250BB9FE3B87E6 +8AC82DCBDB46E5343CC380151E941D517034F7C7EC984C2A117A6C7AC1EEA683 +B440B80A35F68C6ADCF07A8658B5929F6DA9415DCEC757234D7E12B0CD5D162C +B41088E32F66C33739C33E018E5EB1F3FEE383C92177F8D7AE7E91F7DF158B16 +6366FC8E3A74845AD8C79B0A8611701B27461B74B80AAC905F9A699324CF7A3E +D1723472890054C8BFC017250AD6D0A3255FD94DDC8F6D441A34C171C40C60FB +9BA5B7DBD0A753BC363701BECDA5FCAC6F11DF3DE30A171828B9C96C964A14DC +AC4C086A4B2552B3882357A5230DC048BC38170375ADA0C62535FC1ABC15F4A2 +FFA216377D4150D390E681658A17228A9C6F30BF4B24BC797DC1DDFF20492EA3 +4DBE29160FB2F608AB1CDFAB1AE1FEA96DE6B1564624177AD14E76E25587DCD6 +7D9E8FD6E82C5117FA27CC45D4C51C05C48492B9263BC4250302A70ED13922C6 +50D444AA631FF5A60CCDC3D72AFE4055554939127138E0F75AB5E2B2628577DA +2CFD62E98C7F50275656F719DF78B72F8320B6C931FB7552302932FEB21FC02A +12A167C1AAD59FD604C64D8FF49A496976B17200E233F1933F326F03AC309AF4 +91BB3B04ED0DA2E498ECDD863A23C95EE128597D2D38D6C03BF9C52FA42197EE +2CCB4994074DD381322F9394D959C400D9106AC7DE4D83AA228285C5DB0856F5 +E1EDD10CEC92D0667EF2B62DC2DA9F2D8E92B9D67C9F47FC0985987F5CBA9D20 +87998EA5CCF56797122B3E8BC68D9176A0ED55A404FBE65F6C05799A732EED5D +21986E5722AF2088D1A5D5BB01CF220BACE1091A8C8EA3E62EE2D2937A1C8936 +83D795876F89D7012D993518B96625DF5927AFA7DBA4D2747C455AA87281AA06 +C40DB502DFDD70F5DAA87B8727255841099DA98D46CA21C000F9B4EE7F4271C6 +9A0A7B72F114AEA494B7AAFE23DB8EC3A832431BCCB348561F889C566DE515DC +06DDDA0082C6BEA629DB41CBA65377833056F60AEB2AE78441E30F4C25BF65AA +365B9FF79D24C8CA7EDF59C5916563D04F15F56C57906AFA44344C37ECFE9D34 +D137D42B6579D4E89D4E7EA45545B47F3FE2BBC26EA0F155F77B70DF96B4881C +F1A7A0765C61B0D5A0DE4826793FF7D6D8A90DBA44AD1A51816AC6B92AF3F26A +EA52EF1FC68A6168EEAFA86693D02C6CCCB18BF84094887DB6A7DAC9FF656D5A +53EEF104B0385A7C10E96165D1793754E40448F7E29691354DB9AB24C5185272 +78DA0E931D8A449F8FFB196051935C3E3E84448DECA7EF2FD8EAB8FB30F60862 +E0C0A14E58FCBE7E2EDFE1B0747D628D1093CF666217326D96A0DC7A9A2514AE +869683F646A10238919D4E5757401BD8018210C047C48265F34156AB58FD8E54 +C6CD03FB133606D555F43BC28752A3533060DC591541AC48EF83DD3D7724B934 +3DE8085F0C93839B5C0CA783EB1AE94423F279BEB73DDEB6C3F91ADC68BFAE05 +65F6F9687FB93610A1B3AE2124685641BD4A36D56B31F89C7D08D04541D701E4 +FC243CDA055B08AC954FAB21DAAE09722FE94C8C6A51834ED385991BD3502F24 +4189248E3137AFB9B71A2B2329D1C81882F21C88ABB967361B1E8A826953EB09 +966507D44698D01AA2C23ABA5B2EE35431FCF4533724D7C23EC6A3876C9513C3 +B61C58E0559A3A226EB0C32CBBA2D00579F9152B8863BDEB3E20EBB0270329E4 +AF9E25BB76C8FBCBC31B65B53654E0721EA9079752183706B01FDC3372E03545 +D2A935933326E5C973F28E2ED89AC0C070E507F40A81C21B1F18F8BEE064803C +65DF650B5852E5CFDD8EC43BF90F956B8DE26364DAAD253BD2C804BE7FE17F6A +04CB4DADC762FD5DA38D1382CD8F84AE5F504BEEFBAB13A965992F08B812836F +FAF2AB5D5379EA5487A79473A16C27831CD11803071A00908A7EDED2D002B4A2 +B374F9CB8EA325C1B49B0E34370479BB75729818F10185FD5FD8B3D9DEE0BA58 +3F1CEA4C6209E5C44842FC44CB82C64ED1E9CEDF5849735E9631617832C36C8F +6509058B788E952BB4B9A2E817BB557DFA1AAF741955687D888B13614CB78564 +E7CFEC5EF4BB753BC849423D738E956667C3D4064EA243B210914315D3D5A3E5 +FEE457C615DAFD4B867FEC8466B480FDF02A8310F51A3DA19119F4207C6BA79F +797A30268F9CB755CAAA19DE6241E5FB6A1906564D5B8F1D264C988332312240 +87B405853B6D8F43601E602090221EDE3202B90E16B9DCB3EAAC50567C7F3505 +C68532B476EAE85E0A2FD88B2A76AA3FB580636D539B30DB118010A920052589 +27B2FED128A379AB521B31BACD5705A3AE0D8803B213DC6F0F348E59F59BC214 +D00278CBFB392B3F17C71A48208AA40CE9A2AF5FE6EF2B93A0C5C91296FB83C4 +2FAD6AEA3B931E991540FCAE632C846915C267C8239B7524C7E7F770549539D4 +1CED8E5C518B8FC86577F471562E05FE36CC680AB595C65897BFBE679B7CC1F0 +F36602E1FC750A4F33F42759B3E745661D7AA2B1C1909ED9F5C6E7AC7FF063D5 +1C294863ED1492D14BD166A71CDF4EA7EFCFA3E8EA7785DD57DFA74AB3520FBF +6A169387B0425FFCD807EFE09427405DF7F52BA1200DEB0C542638176C6357DF +816ADB9ECB7C1DD940DEFFA2B5725D457B149913ACE2DD508ABFF92151B37CED +BBE13A912A19FFD52C3A020219114284809A350C9A01D05440787DA6AE6B60C5 +31751E99872175145A127940E1C108EA730E513E66FB499A348F395190C97AB6 +AF2CBA545F69445C8581C00FF7A9C1F9479E28B872087659230A81F38D8B679A +82788CB4B1296C9916D7F2933AA6DB908F2AF0AA1314E6D113D8AB42F4F2B905 +77AD60F3C9B3A04E3431F2E5BB4DA87056EF328AC60489F2F5F8891D42C916E3 +C7E5A2D1509FA283622296F4089C17C8A297158E342034A4A1BA35C71CDD6B69 +4D87176FDEF490027F6CEE15BD20A6914D3993AF6DC912608EB9C2034B201534 +D5ED5FC3B1BE12798727CA0F3BCDC4C8CE3E17099AF38A0408777269369F2B2C +D95C71475CA7A04413A83D45B5447823F86ABCD252B4A811A4CF46CCE2D496A6 +E03BB98A3FEC502D6D114D02B2058B6B206E1EB80D7B0E83DAA50E9D9481C8C1 +7FB732FA6A22349505861A8FDDD3A48AABB48065EB92E51327493207F28BDCBE +91543B64CB2261DCC97437CA61876075B836F532947F4666DEB8A72C3FE488F7 +01A26A2A927BEDF8E65A7A9695181FAB841FFEBADED7E461525D4A3110378F2A +6F691B43BF89173E1A2A184E1F9533F80F87D101FBD6F0E12F19B959FA2E81EE +BB9C6D477FE7AF117AD0FEE3FFE2713317D5E5B163F7F70FFA22DF288EEDDF61 +C28E442594D26FEA08E2F2B7B5AD4F3B25EF6D39BE6FE177A77A8B7FF22FE177 +ECF96E7586811233AB0258088FAE31FCFE20C3D5742920EA09B2F2990492D4D0 +6626F2BCDA30F65B294FFD08CAECE8E3164B3052406EBE35BD1676BE5345ABDF +7C242D0A2B503EFE816996C6D06436AAA3C6EEA4AD64FBE7CF2B47192C26CDA1 +816FB56D963AA4417595C1162883F7681228396B42979250E76B2FAF3BC2DA41 +6C56910C96F3675933468E6C2F1FC47CD1CA9E8F5F0239EE5CBC718A06BEF611 +45E64B217F2A3CD0FA4A5E9CB35378ED8E0248471EA75066F8586468757934E1 +BDFB5D6DBEE9B85818E8EDB4B5025FD23A43276EDE974975103E0898F08BB160 +E33A1BFAB2A4F0D011D468D48EEE7DA67ED1782559455422F1715498F9989423 +6733344B3BA5A9253E8A8FB515DA69E3A1F85009567B8CD92B1EC89291F6D396 +D6230F005B441694E73B958FD4E72F1CF62512394717EB14F22965C4F766D729 +6C89B363BBF3718A3D3525BACC74242E6670F4067C85E40DB39DAC0AC73C5F14 +3F8A373D2D914812298FFD77B9E63FF35D4DDD434F1C37B86C6C6B7DAEE81B8A +E1D63E37EB6A03A8749F287F40E12BE20FB3F6C8CB06F2DAB3ED9983EEB00357 +E501718D76A39C0C5A702DA0918CC86D33A9250303F157FD13916341A20DF4D7 +DD676C98D869C6E03F7034F13F8896861D75AD150EF9ED31895A0AB49E837FC0 +54E1F06DAC48562ACA61D6BCADBD419847D3DB8AA65886DBC55F1FC5998C40FD +8F4AF01BCF60E69331FA71751492FCCD83A6BF8240D828BAC7B55E51CB7B93C9 +0A0F6B47B386A9E68DD6A747B9413AB5F6144E30791E25D3DFED4046BD67E2EA +D37A94B5CB3FC06A61F65371E8436CBAEF180488947A19B6287F403C6A80F1A2 +C206AB5AACAD966DDBA7D0EF363291C16006671375B71DB175AF02861C26849A +41EFBED4CB93A0483D64DEE6800FCA2C1664FA100BEE214A28BBB0F207C8BC7A +43CBF4AB6AD83335DF0AEED9DAFC3B355F8F69595E43BDC531C18D6F880D86B6 +1EE0EF469A2CC51212C1E0E1D922E0F2DB46879040DE4C2D1FF151A43C2A892A +BDE033F31A636D54DD6AE2564C7735AE1B5F7BC302E6F353D3327CD04771CD87 +D9B0C0 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +%%BeginFont: csr8 +%!FontType1-1.0: csr8 1.1/12-Nov-94 +% CSfonts -- pfb ver.Apr.1998, generated from BaKoMa fonts. NO WARRANTY. +% Accents are added using t1accent program, (c) Petr Olsak, 1998 +%%VMusage: 25661 25938 +% T1FMT-V2.0, Copyright (c) 1993,1994, Basil K. Malyshev. All rights reserved. +12 dict begin +/FontInfo 13 dict dup begin +/version (1.1/12-Nov-94) readonly def +/Notice (Copyright \(C\) 1994, Basil K. Malyshev. All Rights Reserved.\012BaKoMa Fonts Collection, Level-B.) readonly def +/FullName (csr8) readonly def +/FamilyName (csr8) readonly def +/Weight (Regular) readonly def +/ItalicAngle 0 def +/isFixedPitch false def +/UnderlinePosition -133 def +/UnderlineThickness 20 def +/XHeight 431 def +/Ascender 694 def +/Descender -194 def +/CapHeight 683 def +end readonly def +/FontName /csr8 def +/Encoding 256 array +0 1 255 {1 index exch /.notdef put} for +dup 11 /ff put +dup 12 /fi put +dup 40 /parenleft put +dup 41 /parenright put +dup 44 /comma put +dup 45 /hyphen put +dup 46 /period put +dup 47 /slash put +dup 49 /one put +dup 50 /two put +dup 68 /D put +dup 69 /E put +dup 71 /G put +dup 78 /N put +dup 80 /P put +dup 85 /U put +dup 97 /a put +dup 98 /b put +dup 99 /c put +dup 100 /d put +dup 101 /e put +dup 102 /f put +dup 103 /g put +dup 104 /h put +dup 105 /i put +dup 106 /j put +dup 107 /k put +dup 108 /l put +dup 109 /m put +dup 110 /n put +dup 111 /o put +dup 112 /p put +dup 114 /r put +dup 115 /s put +dup 116 /t put +dup 117 /u put +dup 118 /v put +dup 120 /x put +dup 121 /y put +dup 122 /z put +dup 123 /endash put +dup 126 /tilde put +dup 181 /lcaron put +dup 185 /scaron put +dup 187 /tcaron put +dup 190 /zcaron put +dup 225 /aacute put +dup 228 /adieresis put +dup 232 /ccaron put +dup 233 /eacute put +dup 237 /iacute put +dup 239 /dcaron put +dup 242 /ncaron put +dup 244 /ocircumflex put +dup 250 /uacute put +dup 253 /yacute put +readonly def +/PaintType 0 def +/FontType 1 def +/FontMatrix [0.001 0 0 0.001 0 0] readonly def +/FontBBox [-40 -250 1111 864] readonly def +/StrokeWidth 0 def +currentdict end +currentfile eexec +D9D66F633B846A989B9974B0179FC6CC445BC2C03103C68570A7B354A4A280AE +6FBF7F98F75ADF5180CDD505CDC93F13EE312CB03AC7B00C9C4622C80D74023C +C1962BD0CAF57F3C335DED6A6C36110E591128C8861CA07DCA77CF521BEAB94F +BB761A39789AF6C405EB8B495E41C5915360664D422344DE89DA844EFDD13C45 +CB82B522B9E7256916FD366B61290914FC63045EA3C05BBD24545CC5F4451E74 +EDDDBE488ADB69505C96937B35E2D8E7DD2A21A1390082AA03548CCE363896DC +8285532C521369225C90F80D727FDE65092A0044327885EC680B2ECCDFCCC5C5 +9B4F8AE2D078A25AEEA345A6E6A1D9F372DB3CF2B4AE635D7DB823D70EC82CC7 +1CF7E7DD0D047DC2513344927562E9838BB0A17DEC4E513ACF1FF782F3D8027B +7E9250875DDD4EE3CCA440DE9C628C3EC0D771840D359B9EC8C94991ED9E551F +1B6836631196198581D2485BC6D82918C11874F095154B0872CE54E96900BB2F +F1C79982170757E4A6D158B2AD92AB11E0684F74C0AD96A690D55E3663F37009 +CC9CEA85C49FB69932378B3822EF0B43C4F6854FEA53FE3DA8C66F54621F5904 +A7167F09938B97C9827B8062CD47DB637EC42FCBE54AF3A2609355A07B317576 +DE207567493BEAC1C89FF58B9C93FFA827307FB2E6F3F01DBD6FC8E66F97A4D6 +21EE41A240574E711450DAAFDF021C9F67A3DF3B780BE6B6232F6F229F1968F3 +81E3D30852A756A7A7D78EEF9EC6B4D8D66E9D944152711B910140E070124051 +2366C14DFA3C6C1E735E950E6936B762980AFCBFE3AAE4146ED2CFCD68807BEC +214893E1E127C8EEC0CCA2876DA14304B733B1794AA02E72848E8E518B25EEBE +F97452C663FA963ACABED12285D143DA237226E2BD7A4F0716639EED78EBE378 +E9D7BC4B83C5A0A2669245F917062108AD42F9764EBE10296BF54D7986B6CA80 +087E85C5F00F28DA6531C4AE041F2E5D4AA22F9E9DA737F4A6BF14869A7EB733 +75DA3322DFDF99B3728AF856EDBC918E5E5C51A54E525BA6FC2D3371030BE5AE +092F9B858E3BB0D1D4FD4A575532A9C1CB735FA64BC79B2FC5EAE708C34EBD9D +FDC58B37503ED13115E5F582102C9783E60B190C327D29965133EBB08548C09B +85A6241DD366C39A78E5B29FC95F9144E36E45667AD3285CECAB7F9821CE3B56 +A1667E12B07CDED4A718BE3B6B348A20D957D775A1EBE00A88FA49D7162D5DA3 +49E2D10FDFCB371480AE057743F4A2F70C61188724B89583E037E1E9EB3B504E +3C216068BD41CD7D5DC36EFF5DB32968DF686401A661D6BCCB0D5FE9770F732F +294945FB2ABBC294DC7C846B0EC59A70C0509B424179FAEA0FC66E1A132AC823 +8E0DEF34A278BAAC6E0A3A5B40DFBB643D9BA7BE0DF8B50A2062A57BB60907E3 +04ED4115C6D54944FAD307A470AC86AF424D4F13281CAF3D230C946BD348053E +3C27D24DB0385CD21B828DE52FFDD3AE194DA3B93BF851F4C6221C2EDA9373D0 +F7929C6B47AB88035D0944FFFE3002DF6AE6CCF91B847EA18AECF20E65142069 +3935901493ECDC5F6A7B5003F22B01111D92525F8D0110DBBEAB16E9ED6DEFCA +7213829FFC1EEC83BB567764558776657C2AADDBB4DEAF6173DF15CCC34FD035 +C03458A6A578F45764486FDFD45E3E44D28B08340691A100CAFCE5AD44BF7F5D +0AEE079F28BAD7C8D0EA2B55E320CD7FE3B77EDA9698F8451AC1D854BB10FEFC +9C741CC32E2D7F2643AE066DA33DE7989CBBC604FFF86ABD2530630F257D4BB4 +F2260CCB88476E32262EC47A50644F962357733FC1B356B9518351776FD3DEB9 +1877503A72206810737A89929306EA0465A385D0BF218F3A11F4433B125B4BD4 +7C08478D9475A06E581ABE9CC523B9CB0558154BDC923F71E97900BA235CE8DF +21D4461A0D822365912A74FDB2B29ECD5E540440EA91FE9D2762CDEA07441BAC +714E876997F26C1556CA24219E705A01FFA2BDD006686575AA14BE7415679E50 +43D0F9A58414A458F4849476A3C322FB4BD50A4307BBC935CE5176285D4E6B60 +1F21C9D354EDF049017200333CC07F49CFE7A8E43EFA5E6E28EEDFFCE9D47C8A +761686B3CB63C93A35BEA8FE88940B5C066697D5A514160F885F43CD8AB67C9B +BF9705E0CA4DC64294D357B54C1409082A13977887FC85F0F038CB78DE39D29F +7EE11F4D31AD66E8CF87CD70E79287EA95906C9A0AC65F04B9BA12724660FE31 +D24EF556CE9C161D1DFED59645E40B7B88365D6CE8450B456FB8C10D886142EE +BB64056179E959FE6E4D9A9B2425633072B651C6982E296AC93379408538D053 +ADE1BB933C09791A87A9FCF1217AA9A67B0698A2357249CF3407C6B317DAAA07 +7140D221DB8F3554D80E2AEED997349FDA0590CFAB161B8A73E8BC46131DDF3D +6B0C1D3BC5CE7A33534D1676F129264A19BAC6F0349F89EAD1059433A5CE8E8C +5467FF6A3CB0EA04ED101DB0F62367E039B77B2B3F740A5524BAC9C650E15306 +03B66761A133F9591E9DE638B7AA9C114924274FDE6E49A2E9F423F6B3AA1E86 +06EFAF52AA6127FEB0861CC7ADDFEB958F6D45CA6877780A50C4FB6F6B93DB75 +E49A8BB0B662739B69D43B4989D4693403AE37BD7E69AE96CE00E15B86F1C6D4 +4000C37DBA4A37D8138E34098A570A8E865CA365430C8A9C4B859F60A3B2A256 +0C97C49EBDFBDE5623A6F926BF0DDA2444FAEC53BE7D7D61BD17A80537A5DFED +65A166E2DD9D565CEF04D6F4052688E451F4A4ED2D4A642AFC64074DF1060452 +C5761A1C46A69F7CAE3119EF7574AEF94F01021FAFB921CE965EC7B8EBEF82C1 +729AE5426D7D97CE45A222019C4896F9F623CC8D716F5B7772BA21252559983E +F67873D21D535F41C91B2ABFC9D7DA596B0664DB5ED87B46D5C8AE9AFA111F4F +267919AD8049F91CBDD00194B7969C3C6391E0F7B470E88B844BE4903A14BC53 +AD6A5F75E5EDDE9F3344CB109F552E4AE184CA60744601A1178B8E417519D3C5 +BC9917B7987337A60E65E07AC1AD7B44C74A2F506E1F6276B5951FE289D33760 +13371D55B1FB441D30CF22D308D636330AFAD2E713D40B3CDAD5CBAAFB9F27E8 +4CB8E251D57BC92725F58349CFF1C0694146C46A6DA7ECD8456A20D0EF5B9F53 +B7EA82A379B5405C1CD8D3C8D56E398E25FA87EA568CD18F4406A6B0B1DF8315 +8A50400F8E149F0A74B4D8108E199057E34D99FF61AC44DB4E4E3A7DA051B9FF +C766850839FAF5316DD6747D2351662379D4B42D278A7D0A2648031E19A88559 +91B2EFAC65D1017912ACFAC9903C261D2A3238A4713D25AB304CCC397AC28D04 +59CFEEC713B2C2B0DF1502F74DA2517D0635052AF45C80A628706E4964EEC43C +8C0767D37ED6234F012AA59BFF3E5B65A83756BE5276B1E4594F360BE45E5919 +86D4411CC8B8A79AE77FBE6A4ADBFFA8EB02B814E46D4D17A9B61F35F3F60A79 +361D0585C1AB96651E3C0267F5B4C9562BA19D440A20FF9F55DF2F954530A5A0 +1BDC34AE2FD29352DFBC654A9647AE21C536A7843E16DD14E64E0EB0836277B1 +1D204BA28F81B4F4E5F3C7DE5BF2797C035B2B20A86BEA475E558527CC045F16 +A0F2EBBDDCD3F3575D2709099CA113B43BC0796B4545F6BD76336E48DCDAD950 +36B8CD49ECD9CE1D2D3EDE3DA855B3CB1DC18FFD0173345D027CFB81F91607EE +42126E55948235F1EF7F15BDE8ED2BA445D887794A30754218B68B589C2CA977 +41A4433495939F58E420174767AAA196EFFC9444BD858AD48E2F47D4F2B1A4B4 +DD87BFD95175BBA16A7621B0CDFF3D12047898A6F5937F7E79BEE4624867A4D5 +15CF367AB2A0D98A0CD50C7E2F052AAE7D33B2C774CA7C0228F15CA9D65B9AE9 +72728875E6DF099D84CDCF16A93B1C4B55F5CF82D99E81F68ABE1EB0F27B44DE +235863CDAB077DCC0678E274F3C0F92332E6DD690B89835437ACF21018B70B35 +BE8B5935D1BC5C9132F4924FB4B37B6FE7341C2D03A8FDF0F239C7C36F92A885 +DB53438AE9F4EA20CFAB2967C68428067FF8FCA8921B0B534B5319F2F45A7B79 +67FEFDC358C6F93440F8DAE91E31FEFBFB875BED8C92FAC2C49178F48550D160 +71CA54E82FCB5768AA5DECD380A86E73F7F9969B12E2D84C776DC43D3F9904C2 +C9DE8B8986196FF05FB3AEB8A633FFB38449F9247F90954F3570B4AEBFE1D840 +08D127F1471614619B50CD819EF29A7F3B3E05FD6A2F01EAD9B93EEFB3336847 +A3339C54796DD8F9D179A56B213C17B7633D7425D459DBA81E168644E4EF6A1B +DF29A4941E450015D187F1EB6F2476E7A85E60F544C31146E5C09AF55066379B +E1C9C55AEB9F98CF7D4702A4B085E78D38C1EBDFFB40CE0D706DC5D28543F419 +0D8B0B53FD8BC8FB81E511AB0BD33130D9F04CC38E694C8707D19FAABA5F507C +5C1DA53DCA966B0E1836223CDBCA502B0D93CFB4B78A3EDE820F6BDC902EFD82 +F902DDD8103314600CA46BCE0CD0DAE6929BEC37D0ED814C63F7CFE6F712643C +8F7D92BE9E47851E63EF3D5236DE822CFE0E136D48EBA150505BD59DDD94CE9B +85C60E7173B2ABCC644D7FB7EBC6DF19CED6BAFC264008A72C2DF8BD0B459AD1 +52E8CE7FF30BF3DB89AE7B1DF29D52876FC81D4DF5F4DA36431BC8F6EA54B70C +0EF8BEB8604FF5FD9E3173E7DDB3BF92585C10E917475156F390C9ACCE88B06F +F707AA2F03A08A23394E2284F82393DC0F8370316E32E8B7F46ADC29F090CCEA +84E54A7EC3B68E43A7ACFC6297C470D14622F0B7253CA7E0DB6BD7F937695EAC +3D0A40409C0C67C736E669CED8A4DCE0A62204D96C94FF5BA678141D98D2D6CB +FB28685983747B5B3852619D92B819E7ACF68EBCBD752BD6163817E93BE9BE09 +1880C88708AE3198B801DF0058B40279CDD99B65FACD13E6533881716796158D +1C512DCBA26E1F3A2B8F0B5E4015522A10EA9FA4661F6D938493D376565DE1C6 +F1E885FE2BD3A2A7B8DF70C6AFD144C552591CF870650DF77C2EB6854E0ED019 +6862C7EFDB2368BF067A29EE38B98BC38B2B068033E07D1F701800439A027840 +2AB2D2FD19491397EA75713372A5261D4D69075D99F04B4CDED3B58084463B7F +C1A285144B67E4A7D7F1327DF0DDFE3C29EE7D16E72DC368A3F3F0E8F5E6E727 +289A40307AE1F46F9A902494396134D11622DF81477F24A7332ED803E491D5A9 +ED6C3484C1A41D4DABBE497E51A78D535DBEBA13589FBB672821890510107246 +3B60C95F21310B86A03B2B983D1BB92601B487E33FED11DB571AB7C34E0C3537 +4099BFE1B2E0461E4576024EE88E8553EDD187FD1E7CCCB0B72787837A04A001 +455EC052C2F61B5234EE225987A03939CF14BCC9FD679627020B983CC704A8CC +E9CEB7B5168D841F6717E4EC4A15A92CF9EAE6B8969FFF4F0794339D95093824 +F5B400A25B444876934607FCE7D07BCFCA67D4F8064CE5F446B56AB5C64D2BBD +8BA18A5FE894FB4B6E12BEE8911D0B4E379AF22675A9AAD957644E5B9D0C07CB +26F30D811D2644C8D07349C6FDCC28077704FB17619AD46F23AAA97303C3BA75 +933B7539D0DB1D970A47D6EBEA988A865E5E4E79EC89AE7A71D6F8571AF437D1 +B9E67A4C97B398DB54840FE2BFB0EDC11F852A246127888E0CA82765495C86E5 +C0B5A0EDBCAF29A8305AD10EB67585FC0F3242B56C5229ADBC45006F61C07E84 +40480BB621F8847016DFE7E3D0B3CA0201FA5B45E938BBEB4CDB67182D07CAE4 +1FE738160E8FF43A160EA0C40A1035CC7C3601D995150C5EB339FE04DA863BDF +DD3161D357887D1A1E699D5136486E2F86C48B573B987B7AC29155B637171F4B +8AEF42BD3AC44271985DD0486FED4610DAC764506D7ACA530EBB62F93479F780 +20B44398C3CE288D53F9D3F6E727E260E93C04021FC9E9B08E262CB9516BB3F3 +9B17B75D3C63B0CF4BF42E1B78D436B8D8F975CDA99DF4538EBD6E31104E0DC6 +BE56B68D9D7EE4A69806933404A9C93DAE7D6F10335C3FD37601BCD44EDB22BB +BE48C4DEF81DC29A0869280E5E05C96DF61B1A8DAE9FB396CCBE78F0BD403184 +95EB5FFD0E8A6E71CFF84EFD8B851BC1CF1BD54A9BDAFA98F9082D78B44595D1 +DC94C7E25BAD8A752AA5D7BA9B687BD47672695C0752B0F998395B5E837D05F4 +091F68DA4692E364EA2958BEE17FEA81AAB2D709999B42769F316B85BF8ECB9F +0EE57E5296E1BA089910C005A28A494691A20EA4A82EA82262B87AB14BA8FAB5 +EC572492A7C54FB7967F66036BEB8CCE631150BF4F061A57FF8FDE33D3A6F5EC +1D661554EEDAEE6F8CECB6C9AE6D1B4F438F70544BB86B631EDADB7C3A61162E +655A173CEC4F286D23A651155E46C0549202A1290B83BF3C864A071870946F1E +09958F0849CACAC8EC60BCD95A292E3B406BC3707C6D6DADE8448D28CD48CD2F +2FE0B81C6A6A258F255DFFFF895743F73267C042667808B708B634042C5D832B +487B27B8449A319073F6DB98FDD9907AF53034E58E6EE02E320B38096751A93A +2FC8903CA28C987C8C64DDECDABBEA53AE09E9EC7FAB1D76C240EC61F16A69E8 +0DDCF9B71D1D063CD3FE784DCD22CFA472A0224BB50A374FC6535BF0D2E9B971 +BCA305A872589DB11815F8533B2B6DE7AA5FB46CCE207CCD338291205D1C8011 +A4603E682C2144EF395C27D4642981D5F2BF89B61ADE6EB218FF092C12C1BC14 +F7FB77A8FA3E02AEF84199717D7F89A138E5A8E6C47D4FE968A7E75BE732BBDC +86005A6AD29138082703CF2B849E22918BC07F12C0AD7112BA408723431D7C81 +493D6844900B6334EF8C6991803FEC41EFDBA14CA8ABF21120C62C254C3FBA12 +EB82E4C5953DF4480D73654B1F50BDF395B2733C00942AF58AF1EFC21F7F5D5F +C0756D629A6B03612572CA7AE2F0683B558AFE4459F07F66491D7A5B41FAA64B +55768E1EC9DE8E705DF32C3B4DB746DEC2430FF5A37C38F80A779889F39B9BAB +01296D48E85D6550CEC37ADF4727892A2D3DE9FE489A1E434BE61E39E862CA60 +BBE55CB0480758A01ED77038065D347EC7959650B7F84A94CF496184A40B07AE +08934E9DF83E8F69BB8B183AD6663E92FA514AEF1487DBD52180B24596754387 +C99CFA9BFC5E6247C74470E5402F1D85FB4343A8766170EBB96A89369F7F72FD +5108F4E4571EF9ABF8FD0E114648881A5EE6DF669ACE73CA32976296CF3F1A58 +1B616B41EBCBD3D4C659ECAD8FDC0E597B86E974DB4A3094EA41F159A761384E +91F0D358CD07CD16D6D47C2CE9ADE6AF506409A55E5D98AA42541D85C0FA966B +B12E7E9F30037630904D3F52A7B3E7813E75B2A51620B49FC035EFA937AE9F95 +51BBCFB6E1961A42FE363BE6E5E58C5897015E5F88987A59B85A70CCC8523E68 +5A7FD1ED4078A5FE609337DAD0CADB792A88014D0C3D568A4F1D8959D9362446 +51F9A95E28140167EAA169610940D8DEE902FF76B7BA0FACD63B19FDE7042B55 +7F07ADAA9DA81A9867BBE53E02CCC491D7A5482C08AE3D2734A19342458C0FCB +92D5CDE2F297CB467E5D86D52538998AC840E31B6F3A1682A0248B5B51BB2C66 +6C273F889562F76598587B298B82AEE81A383A6601677897473CB0F12827CD64 +6DD6897BB1F10062D8A697AE87AC09675BD66C55D874D7C51F6CEE004FA2AB98 +F7F5B8C7A69469672BC60072B7285436E6D19009144E17A69AF9C75AF8CC5954 +C27B9CB2A91D40453C3D4EC731732638B9BB424AC5AC7F5FB294B8A43C8CB688 +5A1CED394A4FC1C594DF0DEFD0A887065F7CFAD4EB6258D1F3F128CE67E239AB +D781962DD3CDDE781600BED82963F8DA956398DC324B1F27AE1E4779807D461B +246D58C11E534FD0C32BEADC7D80DCBE7E5C523EEDDDB14A29D167934C4EB81D +D5FD065B14BF76676C095A4A8F7998EE8626957B1A98D19EE5868D37510FFA7A +7412CE0F8E1B7811E787D0CC8DD00EA54D778C07926E29E37A2FF2B05D80EC4B +F47A61C266D399955748F69CDFF16E1B42EC667BC32E3D7DDD2560B8AD58435B +D6A9772A6F7E5DC47A0C0A11256DC2D6E8842D816B0390EC66FEC9CC90E2D297 +2513780B68273DB761FF6B5DE0E48C9C5905B51EF916F38266D214D6B62D7A7E +7D5A0B1BB8CFB2FE3C5AA85F8493ED6012130751C711EE872657E8B88FA6EFEA +81A91F7BA8C684FFA97BCD1193EBA08F93FCAE346A66949CFAC8583A161734F6 +6760C4BCC657C5F9D6425399BAE067D1B2A9E5BBE52BBAA9F1A6A973C88FEAB5 +43F97B3DBDCFB11D1B270DB0F87F87378565EE6820BA6697E6EAEBB202D8FB44 +65F88001F83B7A71AD9FE4BBE7307F9104218EED6891B3F28F4E86EF3B6F9F1F +F93722874C53C73A9AF5691A3A90EA5E8786467895BB96DF77C7E43E80EF8459 +7FBD645DE3819474827408E10DBA6C8027D9D95052A4779AA2F57E7EB5D0BC20 +32C9A9EFC8BA2D240AB9A40C90BE5F3C6706FCCC4506CE05F45EF29301179B81 +5ABDC0226852EC246DF70261888879DB8F4B5C49549182FA278BF3029CB8E9F3 +04C6B9FB736F263093F6964508F986893F690856A3CE7A660D628F2194934315 +651AED9D746178DB8D026A4B7C153F23CDE6EFE943A18488B16BC8431659DE93 +4FEDC555D16C0DACAF7DF78E60098ABA2AD2A5ACD5748281EE6E462BA0022839 +D535DF8B9CDF6571D00FDEC1E356C879A12BE5F6AA7A7AA0E6E7882933675FEA +18A0DA3ED360570DF5DC9F4B890229F9ED8233EEB732C8351E66B92F538986C8 +7C9DF17A169A1089751D5B9B3463651BE40E477155B0E737E719945BC2E42161 +4EC791599F93AB62248F4B5805F06AF9A0A143F178CA10BE059CC65C967DA033 +D1197498669BA22297944143E61C23B278BBDF64766430F9A972AB167BE0398C +E7E925DE2FD5A7DE7278102D748C661A42C75CB5BB702E235115DE37D424A8D9 +5AB8B255B99A4FB174180F3418CCEE82747C17655E47E4B504A548CEF198D84C +8964578ACE8B5CEB3CD9BAF646C86B2B15A78076A2743FFD4B469D9BE32470F7 +EB86402331DD7D65587DBA6DD1B4D5A1BBCD12886350B490B7BD60228B5D9E7C +A900692F54A0155B3561A5389D0D94B2D3AC32A074BCB322AD4125935E9CB590 +A1BB932217D3B1CAA8B2FF0BB974EC9B02FBC926CB2433CA58866704F710BF88 +9D46043E96619716FC57FF52B2A5D290E0CFB87F675905F63475B2ACE31B60B1 +9AA6D0DDA0F1D7DC2CA3DD2F894A4F11C7C0D43B03A8FCF8E2DB70E0996480E7 +B155E65A6886FCC11241A95D135C3E7E8D81F3B582F2C6B70BCF2211484AA40A +5AE20467E1A8052A4D8600C171F9FC87745C9233E91116EB8628DB16D93147EF +5D0E092C314F9449B64FAF2C9143C5AA1FF160DD0ADE161E2C1827E2B54268CC +556B286D590F746DD8CFD671D0EE29F8BA2CAEA3B02F859AB7D28E6F0E1E51B9 +AA3087172E1E52EC0E1D508BAA2E93E29D07AAE40391D9684E616DAF52A90DE0 +9DC04DE7C5D8DDAD516E985952C55C22FAC74CF5A376FCD3FD3471CC818ED831 +7AA36C82737D14672986F14C11F572A4B979B8E65394803B3D6B34E238CC8762 +154B3A67F608B4FD76F1557B16467FA38E86DD45C76ADA664A237777FDA0483D +E021E481DB918CDAB2C4A8B6C2297262855FAC2935EB3B284F0BB97157CBB444 +196D6EAD70EA205B142BD4F55155990276FB4503A70EEB8CC626B2B2B0A0D373 +783EC741BCDA22AD1A839A14B9A97D0C85EAE401A0D7F17CD57A6CF9B3E088E0 +365F09D1C927AB4DA80D1F7AED1A79F95E48B5CEDD27D23CE1F372760B08EA7C +5DDB53598C07BB9DA3AAB787C3721288056FA3121B6AC1E6CDAEE51CD964A341 +5CE8050E8A24476C1047BB0E78367ED50199A68A19F3C8CDDBAD3FC2B8F7084A +C8D5C0E63A718D19C94DCD31E3A8D792E63C57B921E9083C68FF087F68C852DE +086AD9FC46D94634A40754BB9771F33B31CC7C15AC8048237B35F1B289487436 +2971A39EBCB636E773EE1AD4C0556B43BC3608E4BBB2FB96BAA1671C0FC7D93C +7F0CF7EEB2873730129F797669EB3716D0FB966F06D1C19E10E46257F5A44A3F +5801FA3C76985FE15E8C6C7017288EABF56FA1D0E70552C15E7C0E50C94DFBA9 +F0CE421196E07129E2753B9A3C6A04CD956D91074C5F41D862DD09A907290014 +01C32A64D486495A88E8DC8CDC94052A2A02424C07F9973CAB15F2BA5F02704A +5AB0C9C0302F60C98B264925FE6783844AA4DFD981AAA3D16E0EE21E1120CF8F +F463B6E382FADE9F6118693A6ABA6AE4014CC44D391B0B8EB9BC6FAFDBA0EDEF +B4EEA2F2CC69F29B6C5C33F587DD60D98940C508D3DDB0CD06A2CE62BE4A367C +B6938BDA64EC959F06D8B41AE8D7D469AC4F0625C9375CED6AD1FC554C79BBD8 +3D9533544936910BBFA9BA81D8DF7A41630625259B1B35EEC474C9A4E1766694 +1D825E46A5CE1C06FFA3D8CAB54DDBA0C28E22EE95ECF451A54BA43404CEAAA8 +726EDEFADB2958EB77C9911166B3AC7B4F6A96629E5528E70173903B3DE93D85 +A9358B70619C5674CC2225EA8DDB87F453D299C0644DCE1D8FF6CF025752DC97 +FD8DE71699CA9C70B8ACB4D721CC7853835452A1193A97F21C18A3B41F6C59D3 +0BD6737422214FA339E99D43BD1C590AFDD7596FF0D11C536E61E16A77B272FE +D37CD28FB1330043EDB707F3006A9FCCF2CC50030A3F738BCC81C3B785F0FA36 +A62C0570E15CBA245B37CC3637DF5E62ACBD1A6D97ED6856097C3F325A624215 +5E0385AE2D933A150B4C9DEBF7B5E0A2284992C27258F975A48B071DD5145BD2 +A8DB6BEFF219ADA81F71C5D6F82E5BB14AF17BCBDE037C010DCD92F94849286B +087F3FA85CF66C5A32C6DBE6D907B0CAD21566C51269AD28693165D82D6C5642 +3C61D381A9D2612E22993B1DD20A841721904D1E2A43EE91C23438BDB2BB2B64 +95D20C4BD5112541978C439B7E1E0FD376862F5B8E3EE945D11C4DC652B91F7C +D35D6F80C96B820FA512ADFCEE5DC8B636F3C8C353E596F77A477210C130DE8F +FEE70044ECBDD1E07163217CC782C2EA28F9A269878FC9C71B8608490958FF27 +C273B3C1266C478F151D273D78DBD999463F356D72E76BCC2FB8479A30860639 +B09B61DAAFD3C7CB6F743CB0DE661F5F009867968B936F5B2C5E2D9283108D58 +763F1C549ABF5F445B367D1EBC49F0AB2DF426CCEEAF3B016A7FE71B92F1C9AA +D954E454F825A19024461514C918DBF724835B8A7D5ABA28442F26720B3BB194 +963052CA0D54168BF24FD8CEB9FD91AACACF6D56814E30BF0D0CCFA25235231D +4038F5B4F16198D7F2DAC82F797A1AFE4F3B0AEFCA30BBD1304EA4E7C379235C +8095D02797C141D070C1F2D0053414A8394A4C02B0A68C2AA62DB0311D2736CC +700A7F1AA7043CC0956D412686A2EC165BF5EEF5399E9E209CCA99FCA2126AF3 +4D3DC19FC13AD5CE601B8457D0044C79A7F6F427842FE54DA145B03A06DB4231 +745289858ED456DD43B27709CD2C6269F4EB5E1D5D6B180B232F09DCE691F7F8 +9D472DA89A0E4AD769E52EBEEFDCDC40B9A16BD8F53B166F8CA87D42F5F03F83 +A574FCFDEFEE9A58FA0228B8EF495B879D14F5337FE08A426BEBB4E95FA1A478 +A2C0383F6D714B79839BA789B6C84CAA24B3116290C688179EBC8D8974B6B83D +6864A8BDBD3119208B65BCBD2D235AAA888F9D37B3622BF88A297004AD2E2F2B +D1D2BB1A32DD3A2A46D9E4F39755A1F16AFE8711AEAD81DB3F6EF138DD814EDF +0A0CE8667B0985B405EFBF58E68DA69C5B48A30536AE7B9E8AB0BB2882001ABE +242B837F58608BA8FCF10A948F1C909B8CD6EF0962F0B18F340AA3E9BACA6A25 +61D45476AE2984019BF108109EB8C83D16B759BC65ACB7A324984BA50BCC2D09 +ECA71CB617C18B66504F4DA9681E66B55D2D17798B8870219871187CEC31CAAB +AE42420466E634F64380F065269985B22B4B9A4BCE1F48E9964488CDDC566661 +A604EEF778A5AB11BA356A2A37E770F11E6E78E0F253585E11C0F881321C7059 +A8A62BC13DEA6879668721A0CB20DC1203F54782F9403ADCE7271415ECAC5587 +1B3EA170B8331726C049117D081E0B168FF6D0629F1A4554D8C8F574D331597B +DCEC0EEEA3718AAE845D3F6C9A0E11F789BE56641535FB75B1B2F32828FEAF1B +15C31CBA3E673758E2E04D6B607A996A12B2DE67CBFB51B6777CCEFD3BB2A317 +1818A35DD6641EAF719D3F6B356E8C4A7E67F2FCAE1B7475C18DF9DAA5BC193B +320498074BFAF27F871CF0250EDE025184F6B5646CFF95DA1C007F859BC37327 +DCD235958BF53924E79F798FA820D6DC2169F99F503DE112094EEE77DFD75C5C +6182FDEFC228C48BA87D979E4C06C5F90956B68A133F548751291E78879746BB +8F4085EB7B0038B2C835CC7F4562E082AAED3F5F803DB0BAF26D8AD1E917685C +8FAC69C85D2B069768CDE45C39CA964683DCFA5A5EE1AB0D83058A4597EAE2EF +63EEEB94184DBC2406111BF53C3515A37E78A1BAC7F3147A402F226CDB77F2CE +94EB11B6225168957C13D849623C0F59642562824D79E2CE3707D21DC6F29772 +CE1D416815DDBCD0175BCF5F5E0DE3E9BBB3128968388188892A84699D0B2A96 +9EF32168ABE59A3C9AC81F7CD7D46FC2C3EAE1F2E6C3A8DD7F425D18633F09F3 +9559E50B45E2D3485DED4ED9E48815C6667A695BDE35F5BB65B6787B0FBE278D +4E14340FB2DE92A46F16F51F0FC82E65E980C3DC333E170FB78DBF550CD830DC +2A2A1ACDD5998CA23CB71C4F2DE57E6C3F58EE85D5A7D51B6A4A94F8010CB2A5 +1EF05F55C65872EFF24332466B6A2200AAA5A8120A78893F7F9F2D5DB03378EE +104142760CD50836A96306C1592DB07ADFD88797537B6A1B0ECCDAA904C30D38 +672233ACCE77D662A7F38B30D8403D6DD720176A1CDA181D259202BAE3CB5F67 +49E680B7F9C6BDBF30654837A5761A6A52BDC262F466A1E40DF1BB5AC239A23F +B27DD3A3F9612F999880AFF524E3C915B65CB7DE8C785E05569A1A9C4EFD79D9 +ED4AA298783C8EB1B98006C9FBCB72F1C623C45068598BDDBA1FFA7D53B109DE +CC1DC908A9A0400111AB469AC20D8E8C8C705BCD4359C24B8976A440DD863FBE +615F22659C37E0B0A4B169845C717EF200876A519BB0C5F9BD066120B73D301C +14DEFED06B889DE143978FF3AD885DAC3FB1BBFB9B0A081E66720D2A2993EEA4 +B72220BF7F3E53B6FA6C2350A5156B2523053C970CD322AF91D3D775DA8F222E +FDD492E5C208883ED3FCBC0E2C7015F41137102A5F4F059CA6F51F0AA9D9EBF0 +BCBB6F2F79338847BC7C4814E976973B60FBDD0060FCA8087E00C47B81432A13 +FEC19A3F38573CA9C6E82D950C481F74032A2DBADE0DFE98228B3CAFFA44C57F +0DEEC8796EB434FA2B945085A223EC257DDDD9091ECEC1746DAE2750CBA8E112 +FD6DAFB57ED73E01AABD091D910F3F992A644C565C8E036A553DD5755C766A3C +1A50BBD02F9767486714D1F6319A0315F421B7F225F660A56911CFB94940C9F3 +D313A2D7E07BD0404FDE7B73A71932E2B343DA71B6DD9E91EF8A61F4C5E10644 +DB74ED3F2E45640E1DDE19AD7E752B92E6D8656C65DB65DEEE05765D05FE3468 +6B68C406F2070974DFB1643EC5E833EEC9AB1C3B263095A2174A5D54F7631E3C +F3953CE8A0AF2962AE604C8D32670329E49922AB48CAB1B1BC556B6363D4A421 +BB42B3D27ABD305B465E445BA5EA30162679A5B30A0F7121F4F86A060D09641A +FFD3B7378704D1A7AD005491E758E2674B5C9096400839BB0A3E585AAE44F1A3 +EF8A7468466E812B078D21DF051A4232F7DD4779D87F993F4DC55EC88F7F4EE6 +4C99A807 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +cleartomark +%%EndFont +TeXDict begin 39139632 55387786 1000 600 600 (sk-dired-ref.dvi) +@start /Fa 242[61 13[{}1 49.8132 /CMSY6 rf /Fb 134[32 +32 43 32 34 24 24 24 1[34 30 34 50 18 32 1[18 34 30 19 +27 34 27 34 30 11[45 1[34 44 1[41 1[45 54 3[22 1[47 39 +41 46 43 42 45 9[30 30 30 1[30 30 30 30 1[18 21 18 44[{}47 +49.8132 /csr6 rf /Fc 129[35 35 1[35 2[35 35 35 35 35 +35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 1[35 +1[35 35 3[35 35 35 2[35 1[35 35 35 35 35 1[35 35 2[35 +35 35 3[35 35 35 35 35 35 35 35 8[35 35 2[35 35 35 1[35 +35 1[35 1[35 35 35 35 1[35 33[{}63 66.4176 /cstt8 rf +/Fd 2[60 2[64 12[32 3[53 51 6[56 34[51 4[45 62[51 60 +2[60 64 45 45 47 1[64 57 64 95 32 60 1[32 1[57 1[53 64 +51 64 56 13[64 2[78 86 90 109 6[72 1[88 55[64 67 11[{}37 +99.6264 /csbx10 rf /Fe 5[45 12[23 4[36 41[36 67[36 43 +3[45 2[34 1[45 1[45 68 1[43 25 23 3[37 45 36 1[40 8[61 +8[61 10[62 26[32 32 40[{}23 66.4176 /csbx8 rf /Ff 2[37 +2[39 5[35 1[39 2[39 1[20 3[31 31 3[35 2[35 34[31 2[27 +1[28 3[20 54[35 2[35 31 37 37 1[37 39 27 28 28 1[39 35 +39 59 20 37 22 20 39 35 22 31 39 31 39 35 11[53 4[48 +1[53 6[55 1[48 54 17[35 35 1[35 20 24 20 2[27 27 27[39 +41 11[{}56 66.4176 /csr8 rf /Fg 23[61 6[67 108[53 1[57 +1[76 1[76 2[73 1[38 2[42 63 76 2[67 14[103 13[105 68[{}14 +119.552 /csbx10 rf end %%EndProlog %%BeginSetup %%Feature: *Resolution 600dpi TeXDict begin %%PaperSize: A4 - + end %%EndSetup %%Page: 1 1 -1 0 bop -259 -364 a Fe(Referen\350n\341)47 b(k)l(arta)e(pre)h(Dired)-42 --256 y Fd(\(ur\350en\351)25 b(pre)f(Dired)f(v)g(GNU)h(Emacse)f(21.x\)) --73 -176 y(Pr\355k)n(azy)h(ozna\350en\351)i Fc(\(D)n(X\))d -Fd(vy\276aduj\372)i(dired-x)-450 20 y Fb(Spustenie)35 -b(a)j(uk)m(on\350enie)f(Dired)-450 177 y Fd(spustenie)25 -b(dired)1066 b Fa(C-x)36 b(d)-450 257 y Fd(spustenie)21 -b(dired)e(v)h(adres\341ri)g(s)f(aktu\341ln)n(ym)h(s\372b)r(orom)70 -b Fa(C-x)36 b(C-j)g Fc(\(D)n(X\))-450 336 y Fd(uk)n(on\350enie)25 -b(dired)1048 b Fa(q)-450 530 y Fb(Pr\355k)m(azy)39 b(pre)e(presun)m(y) --450 687 y Fd(sp\344\273)24 b(na)g(predc)n(h\341dza)t(j\372ci)i(riadok) -598 b Fa(p)-450 767 y Fd(vpred)24 b(na)g(nasleduj\372ci)g(riadok)673 -b Fa(n)-450 847 y Fd(hore)24 b(na)g(predc)n(h\341dza)t(j\372ci)h -(adres\341r)565 b Fa(<)-450 926 y Fd(dole)24 b(na)g(nasleduj\372ci)g -(adres\341r)692 b Fa(>)-450 1006 y Fd(na)24 b(\357al\271\355)f -(ozna\350en)n(\375)j(s\372b)r(or)794 b Fa(M-})-450 1086 -y Fd(na)24 b(predc)n(h\341dza)t(j\372ci)h(ozna\350en)n(\375)h(s\372b)r -(or)473 b Fa(M-{)-450 1165 y Fd(sp\344\273)24 b(na)g(predc)n(h\341dza)t -(j\372ci)i(p)r(o)r(dadres\341r)451 b Fa(M-C-p)-450 1245 -y Fd(vpred)24 b(na)g(\357al\271\355)f(p)r(o)r(dadres\341r)728 -b Fa(M-C-n)-450 1325 y Fd(na)24 b(nadraden)n(\375)h(adres\341r)863 -b Fa(^)-450 1405 y Fd(c)n(ho)r(\357)25 b(na)f(prv\375)f(p)r(o)r -(dadres\341r)758 b Fa(M-C-d)-450 1597 y Fb(Pr\355k)m(azy)39 -b(p)s(omo)s(cou)g(m)m(y\271i)-450 1754 y Fd(otv)n(or)24 -b(s\372b)r(or)1034 b Fa(Mouse_Button_2)-450 1833 y Fd(zobraz)25 -b(men)n(u)873 b Fa(Control-Mouse_Button_3)-450 2017 y -Fb(Ok)m(am\276it\351)38 b(ak)m(cie)f(nad)g(s\372b)s(ormi)-450 -2173 y Fd(otv)n(or)24 b(aktu\341ln)n(y)h(s\372b)r(or)883 -b Fa(f)-450 2253 y Fd(otv)n(or)24 b(aktu\341ln)n(y)h(s\372b)r(or)f(iba) -g(pre)f(\350\355tanie)417 b Fa(v)-450 2333 y Fd(otv)n(or)24 -b(aktu\341ln)n(y)h(s\372b)r(or)f(v)g(inom)e(okne)480 -b Fa(o)-450 2413 y Fd(otv)n(or)24 b(aktu\341ln)n(y)h(s\372b)r(or)f(v)g -(inom)e(r\341mci)448 b Fa(w)-450 2492 y Fd(zobraz)25 -b(aktu\341ln)n(y)g(s\372b)r(or)843 b Fa(C-u)36 b(o)-450 -2572 y Fd(vytv)n(or)25 b(no)n(v\375)f(p)r(o)r(dadres\341r)795 -b Fa(+)-450 2652 y Fd(p)r(oro)n(vna)t(j)24 b(s\372b)r(or)g(p)r(o)r(d)g -(kurzorom)e(s)i(ozna\350en)n(\375m)193 b Fa(=)-450 2844 -y Fb(Ozna\350o)m(v)m(anie)37 b(a)g(o)s(dzna\350o)m(v)m(anie)g(s\372b)s -(oro)m(v)-450 3001 y Fd(ozna\350)21 b(s\372b)r(or)e(aleb)r(o)h(p)r(o)r +TeXDict begin 1 0 bop -259 -364 a Fg(Referen\350n\341)47 +b(k)l(arta)e(pre)h(Dired)-42 -256 y Ff(\(ur\350en\351)25 +b(pre)f(Dired)f(v)g(GNU)h(Emacse)g(22.x\))-73 -176 y(Pr\355k)n(azy)g +(ozna\350en\351)i Fe(\(D)n(X\))d Ff(vy\276aduj\372)i(dired-x)-450 +31 y Fd(Spustenie)35 b(a)j(uk)m(on\350enie)f(Dired)-450 +196 y Ff(spustenie)25 b(dired)1066 b Fc(C-x)36 b(d)-450 +276 y Ff(spustenie)21 b(dired)e(v)h(adres\341ri)g(s)f(aktu\341ln)n(ym)i +(s\372b)r(orom)71 b Fc(C-x)36 b(C-j)g Fe(\(D)n(X\))-450 +356 y Ff(uk)n(on\350enie)25 b(dired)1048 b Fc(q)-450 +561 y Fd(Pr\355k)m(azy)39 b(pre)e(presun)m(y)-450 726 +y Ff(sp\344\273)24 b(na)g(predc)n(h\341dza)t(j\372ci)i(riadok)598 +b Fc(p)-450 806 y Ff(vpred)24 b(na)g(nasleduj\372ci)g(riadok)673 +b Fc(n)-450 886 y Ff(hore)24 b(na)g(predc)n(h\341dza)t(j\372ci)h +(adres\341r)565 b Fc(<)-450 965 y Ff(dole)24 b(na)g(nasleduj\372ci)g +(adres\341r)692 b Fc(>)-450 1045 y Ff(na)24 b(\357al\271\355)f +(ozna\350en)n(\375)j(s\372b)r(or)794 b Fc(M-})-450 1125 +y Ff(na)24 b(predc)n(h\341dza)t(j\372ci)h(ozna\350en)n(\375)h(s\372b)r +(or)473 b Fc(M-{)-450 1204 y Ff(sp\344\273)24 b(na)g(predc)n(h\341dza)t +(j\372ci)i(p)r(o)r(dadres\341r)451 b Fc(M-C-p)-450 1284 +y Ff(vpred)24 b(na)g(\357al\271\355)f(p)r(o)r(dadres\341r)728 +b Fc(M-C-n)-450 1364 y Ff(na)24 b(nadraden)n(\375)h(adres\341r)863 +b Fc(^)-450 1444 y Ff(c)n(ho)r(\357)25 b(na)f(prv\375)f(p)r(o)r +(dadres\341r)758 b Fc(M-C-d)-450 1647 y Fd(Pr\355k)m(azy)39 +b(p)s(omo)s(cou)g(m)m(y\271i)-450 1812 y Ff(otv)n(or)24 +b(s\372b)r(or)1034 b Fc(Mouse_Button_2)-450 1892 y Ff(zobraz)25 +b(men)n(u)874 b Fc(Control-Mouse_Button_3)-450 2086 y +Fd(Ok)m(am\276it\351)38 b(ak)m(cie)f(nad)g(s\372b)s(ormi)-450 +2251 y Ff(otv)n(or)24 b(aktu\341ln)n(y)h(s\372b)r(or)883 +b Fc(f)-450 2331 y Ff(otv)n(or)24 b(aktu\341ln)n(y)h(s\372b)r(or)f(iba) +g(pre)f(\350\355tanie)417 b Fc(v)-450 2411 y Ff(otv)n(or)24 +b(aktu\341ln)n(y)h(s\372b)r(or)f(v)g(inom)f(okne)480 +b Fc(o)-450 2491 y Ff(otv)n(or)24 b(aktu\341ln)n(y)h(s\372b)r(or)f(v)g +(inom)f(r\341mci)449 b Fc(w)-450 2570 y Ff(zobraz)25 +b(aktu\341ln)n(y)g(s\372b)r(or)843 b Fc(C-u)36 b(o)-450 +2650 y Ff(vytv)n(or)25 b(no)n(v\375)f(p)r(o)r(dadres\341r)795 +b Fc(+)-450 2730 y Ff(p)r(oro)n(vna)t(j)24 b(s\372b)r(or)g(p)r(o)r(d)g +(kurzorom)f(s)h(ozna\350en)n(\375m)194 b Fc(=)-450 2933 +y Fd(Ozna\350o)m(v)m(anie)37 b(a)g(o)s(dzna\350o)m(v)m(anie)g(s\372b)s +(oro)m(v)-450 3098 y Ff(ozna\350)21 b(s\372b)r(or)e(aleb)r(o)h(p)r(o)r (dadres\341r)g(pre)f(\357al\271ie)g(pr\355k)n(azy)71 -b Fa(m)-450 3081 y Fd(o)r(dzna\350)25 b(s\372b)r(or)f(aleb)r(o)g -(s\372b)r(ory)g(p)r(o)r(dadres\341re)308 b Fa(u)-450 -3160 y Fd(zru\271)23 b(ozna\350enie)j(v\271etk\375c)n(h)g(s\372b)r(oro) -n(v)e(v)f(bu\013eri)249 b Fa(M-delete)-450 3240 y Fd(ozna\350)25 +b Fc(m)-450 3178 y Ff(o)r(dzna\350)25 b(s\372b)r(or)f(aleb)r(o)g +(s\372b)r(ory)g(p)r(o)r(dadres\341re)308 b Fc(u)-450 +3258 y Ff(zru\271)23 b(ozna\350enie)j(v\271etk\375c)n(h)g(s\372b)r(oro) +n(v)e(v)f(bu\013eri)249 b Fc(M-delete)-450 3337 y Ff(ozna\350)25 b(s\372b)r(ory)f(so)f(zadanou)j(pr\355p)r(onou)461 b -Fa(*)36 b(.)-450 3320 y Fd(ozna\350)25 b(v\271etky)g(adres\341re)857 -b Fa(*)36 b(/)-450 3399 y Fd(ozna\350)25 b(v\271etky)g(sym)n(b)r(olic)n -(k)n(\351)e(o)r(dk)n(azy)541 b Fa(*)36 b(@)-450 3479 -y Fd(ozna\350)25 b(v\271etky)g(spustite\265n\351)g(s\372b)r(ory)550 -b Fa(*)36 b(*)-450 3559 y Fd(in)n(v)n(ertuj)24 b(ozna\350enie)975 -b Fa(*)36 b(t)-450 3638 y Fd(ozna\350)25 b(v\271etky)g(s\372b)r(ory)f -(v)f(aktu\341lnom)h(p)r(o)r(dadres\341ri)108 b Fa(*)36 -b(s)-450 3718 y Fd(ozna\350)25 b(s\372b)r(ory)f(vyho)n(vuj\355ce)h -(regul\341rnem)n(u)e(v\375razu)138 b Fa(*)36 b(\045)-450 -3798 y Fd(zme\362)23 b(zna\350)n(ku)i(na)g(in\351)e(p\355smeno)647 -b Fa(*)36 b(c)-450 3878 y Fd(ozna\350)25 b(s\372b)r(ory)-6 +Fc(*)36 b(.)-450 3417 y Ff(ozna\350)25 b(v\271etky)g(adres\341re)857 +b Fc(*)36 b(/)-450 3497 y Ff(ozna\350)25 b(v\271etky)g(sym)n(b)r(olic)n +(k)n(\351)f(o)r(dk)n(azy)541 b Fc(*)36 b(@)-450 3576 +y Ff(ozna\350)25 b(v\271etky)g(spustite\265n\351)g(s\372b)r(ory)550 +b Fc(*)36 b(*)-450 3656 y Ff(in)n(v)n(ertuj)24 b(ozna\350enie)975 +b Fc(*)36 b(t)-450 3736 y Ff(ozna\350)25 b(v\271etky)g(s\372b)r(ory)f +(v)f(aktu\341lnom)i(p)r(o)r(dadres\341ri)108 b Fc(*)36 +b(s)-450 3816 y Ff(ozna\350)25 b(s\372b)r(ory)f(vyho)n(vuj\355ce)h +(regul\341rnem)n(u)f(v\375razu)138 b Fc(*)36 b(\045)-450 +3895 y Ff(zme\362)24 b(zna\350)n(ku)h(na)g(in\351)e(p\355smeno)648 +b Fc(*)36 b(c)-450 3975 y Ff(ozna\350)25 b(s\372b)r(ory)-6 b(,)24 b(pre)f(ktor\351)h(elisp)r(o)n(v\375)g(v\375raz)h(vrac\355)e(t) -120 b Fa(*)36 b(\()f Fc(\(D)n(X\))-450 4074 y Fb(N\341p)s(o)m(v)m(eda) --450 4230 y Fd(zobraz)25 b(n\341p)r(o)n(v)n(edu)1014 -b Fa(h)-450 4310 y Fd(preh\265ad)24 b(pr\355k)n(azo)n(v)g(dired)836 -b Fa(?)1866 -364 y Fb(Pr\355k)m(azy)39 b(nad)e(ozna\350en)m(\375mi)g -(s\372b)s(ormi)1866 -238 y Fd(k)n(op\355ruj)23 b(s\372b)r(or\(y\))1027 -b Fa(C)1866 -158 y Fd(premen)n(uj)23 b(s\372b)r(or)g(aleb)r(o)i -(presu\362)e(s\372b)r(ory)404 b Fa(R)1866 -79 y Fd(zme\362)23 -b(vlastn\355k)n(a)i(s\372b)r(oru\(o)n(v\))711 b Fa(O)1866 -1 y Fd(zme\362)23 b(skupin)n(u)h(s\372b)r(oru\(o)n(v\))749 -b Fa(G)1866 81 y Fd(zme\362)23 b(pr\355stup)r(o)n(v)n(\351)i(pr\341)n -(v)n(a)f(s\372b)r(oru\(o)n(v\))472 b Fa(M)1866 160 y -Fd(vytla\350)25 b(s\372b)r(or\(y\))1056 b Fa(P)1866 240 -y Fd(zme\362)23 b(n\341zo)n(v)i(s\372b)r(oru\(o)n(v\))g(na)f(mal\351)f -(p\355smen\341)268 b Fa(\045)36 b(l)1866 320 y Fd(zme\362)23 -b(n\341zo)n(v)i(s\372b)r(oru\(o)n(v\))g(na)f(v)n(e\265k)n(\351)h -(p\355smen\341)260 b Fa(\045)36 b(u)1866 399 y Fd(zma\276)23 -b(ozna\350en\351)j(s\372b)r(ory)844 b Fa(X)1866 479 y -Fd(vyk)n(ona)t(j)25 b(uuenco)r(de)g(aleb)r(o)f(uudeco)r(de)i(s\372b)r -(oru\(o)n(v\))118 b Fa(U)1866 559 y Fd(sk)n(omprim)n(uj)21 -b(aleb)r(o)j(dek)n(omprim)n(uj)d(s\372b)r(or\(y\))270 -b Fa(Z)1866 639 y Fd(spusti)24 b(info)f(na)h(s\372b)r(ore)886 -b Fa(I)36 b Fc(\(D)n(X\))1866 718 y Fd(vytv)n(or)25 b(sym)n(b)r(olic)n -(k\375\(\351\))f(o)r(dk)n(az\(y\))587 b Fa(S)1866 798 -y Fd(vytv)n(or)25 b(relat\355vne)f(sym)n(b)r(olic)n(k)n(\351)f(o)r(dk)n -(azy)443 b Fa(Y)1866 878 y Fd(vytv)n(or)25 b(p)r(evn)n(\375)f(o)r(dk)n -(az)922 b Fa(H)1866 957 y Fd(preh\265ada)t(j)24 b(s\372b)r(ory)f({)h -(h\265ada)t(j)g(regul\341rn)n(y)g(v\375raz)224 b Fa(A)1866 -1037 y Fd(nahra\357)24 b(regul\341rne)g(v\375razy)776 -b Fa(Q)1866 1117 y Fd(prelo\276)24 b(s\372b)r(ory)g(\(b)n -(yte-compile\))644 b Fa(B)1866 1196 y Fd(na\350\355ta)t(j)24 -b(s\372b)r(ory)g(\(load-\014le\))764 b Fa(L)1866 1276 -y Fd(spusti)24 b(pr\355k)n(az)f(nad)i(s\372b)r(orom\(mi\))576 -b Fa(!)1866 1433 y Fb(Ozna\350enie)36 b(s\372b)s(oro)m(v)j(pre)e -(zmazanie)1866 1541 y Fc(Odzna\350uj\372ce)28 b(pr\355k)n(azy)e -(ma\276\372)g(zna\350)n(ku)h(pre)g(zmazanie)1866 1639 -y Fd(ozna\350)e(s\372b)r(or)f(pre)f(zmazanie)736 b Fa(d)1866 -1719 y Fd(o)r(dstr\341\362)24 b(zna\350)n(ku)h(pre)f(zmazanie)634 -b Fa(delete)1866 1798 y Fd(ozna\350)25 b(v\271etky)g(z\341loh)n(y)f -(\(s\372b)r(ory)h(k)n(on\350iace)g(na)f(~\))191 b Fa(~)1866 -1878 y Fd(ozna\350)25 b(v\271etky)g(z\341loh)n(y)f(\(auto-sa)n(v)n(e\)) -552 b Fa(#)1866 1958 y Fd(ozna\350)25 b(r\364zne)f(do)r(\350asn\351)h -(s\372b)r(ory)673 b Fa(&)1866 2037 y Fd(ozna\350)20 b(\350\355slo)n(v)n -(an\351)g(z\341loh)n(y)g(\(k)n(on\350iace)h(na)e(.~1~)h(a)f(p)r(o)r -(d.\))71 b Fa(.)1866 2117 y Fd(vyma\276)23 b(s\372b)r(ory)h -(ozna\350en\351)i(na)e(zmazanie)397 b Fa(x)1866 2197 -y Fd(ozna\350)25 b(s\372b)r(ory)f(vyho)n(vuj\372ce)h(regul\341rnem)n(u) -e(v\375razu)119 b Fa(\045)36 b(d)1866 2350 y Fb(Mo)s(di\014k)m(\341cia) -h(Dired)g(bu\013eru)1866 2476 y Fd(vlo\276)24 b(do)g(toh)n(to)h -(bu\013eru)f(p)r(o)r(dadres\341r)517 b Fa(i)1866 2556 -y Fd(o)r(dstr\341\362)24 b(ozna\350en\351)i(s\372b)r(ory)e(z)g -(bu\013eru)471 b Fa(k)1866 2636 y Fd(o)r(dstr\341\362)24 +120 b Fc(*)36 b(\()f Fe(\(D)n(X\))-450 4182 y Fd(Mo)s(di\014k)m +(\341cia)i(Dired)g(bu\013eru)-450 4347 y Ff(vlo\276)24 +b(do)g(toh)n(to)h(bu\013eru)f(p)r(o)r(dadres\341r)517 +b Fc(i)-450 4427 y Ff(o)r(dstr\341\362)24 b(ozna\350en\351)i(s\372b)r +(ory)e(z)g(bu\013eru)471 b Fc(k)-450 4507 y Ff(o)r(dstr\341\362)24 b(z)g(bu\013eru)g(v\375pis)g(p)r(o)r(dadres\341ra)416 -b Fa(C-u)36 b(k)1866 2715 y Fd(zno)n(vu)25 b(na\350\355ta)t(j)f +b Fc(C-u)36 b(k)-450 4586 y Ff(zno)n(vu)25 b(na\350\355ta)t(j)f (adres\341r)g(\(zna\350)n(ky)h(sa)f(zac)n(ho)n(v)n(a)t(j\372\))165 -b Fa(g)1866 2795 y Fd(prepni)24 b(triedenie)g(adres\341ra)g(p)r(o)r -(d\265a)g(mena/d\341tum)n(u)104 b Fa(s)1866 2875 y Fd(upra)n(v)24 -b(v)n(o\265b)n(y)g(pr\355k)n(azu)g(ls)843 b Fa(C-u)36 -b(s)1866 2954 y Fd(obno)n(v)25 b(zna\350)n(ky)-6 b(,)25 -b(skryt\351)f(riadky)g(a)f(p)r(o)r(d.)448 b Fa(C-_)1866 -3034 y Fd(skry)23 b(v\271etky)i(p)r(o)r(dadres\341re)783 -b Fa(M-$)1866 3114 y Fd(skry)23 b(aleb)r(o)i(o)r(dkry)f(v\271etky)g(p)r -(o)r(dadres\341re)395 b Fa($)1866 3267 y Fb(Pr\355k)m(azy)39 -b(s)f(regul\341rn)m(ymi)g(v\375razmi)1866 3393 y Fd(ozna\350)25 -b(s\372b)r(ory)f(vyho)n(vuj\372ce)h(regul\341rnem)n(u)e(v\375razu)119 -b Fa(\045)36 b(m)1866 3473 y Fd(sk)n(op\355ruj)23 b(ozna\350en\351)j -(s\372b)r(ory)e(obsah)n(uj\372ce)h(regexp)169 b Fa(\045)36 -b(C)1866 3553 y Fd(premen)n(uj)23 b(ozna\350en\351)j(s\372b)r(ory)e -(vyho)n(vuj\372ce)h(regexp)119 b Fa(\045)36 b(R)1866 -3632 y Fd(p)r(evn)n(\375)25 b(o)r(dk)n(az)1145 b Fa(\045)36 -b(H)1866 3712 y Fd(sym)n(b)r(olic)n(k\375)23 b(o)r(dk)n(az)988 -b Fa(\045)36 b(S)1866 3792 y Fd(sym)n(b)r(olic)n(k\375)23 -b(o)r(dk)n(az)i(s)e(relat\355vnou)i(cestou)385 b Fa(\045)36 -b(Y)1866 3871 y Fd(ozna\350)25 b(pre)f(zmazanie)930 b -Fa(\045)36 b(d)1866 4025 y Fb(Dired)h(a)h(Find)1866 4151 -y Fd(otv)n(or)24 b(v)g(dired)f(s\372b)r(ory)h(vyho)n(vuj\372ce)i(vzork) -n(e)145 b Fa(M-x)36 b(find-name-dired)1866 4230 y Fd(otv)n(or)24 -b(v)g(dired)f(s\372b)r(ory)h(obsah)n(uj\372ce)h(vzorku)145 -b Fa(M-x)36 b(find-grep-dired)1866 4310 y Fd(otv)n(or)24 -b(v)g(dired)f(s\372b)r(ory)h(p)r(o)r(d\265a)g(v\375stupu)h -Fa(find)125 b(M-x)36 b(find-dired)1590 5603 y Fd(1)p -eop +b Fc(g)-450 4666 y Ff(prepni)24 b(triedenie)g(adres\341ra)g(p)r(o)r +(d\265a)g(mena/d\341tum)n(u)106 b Fc(s)-450 4746 y Ff(upra)n(v)24 +b(v)n(o\265b)n(y)g(pr\355k)n(azu)g(ls)843 b Fc(C-u)36 +b(s)-450 4825 y Ff(obno)n(v)25 b(zna\350)n(ky)-6 b(,)25 +b(skryt\351)f(riadky)g(a)f(p)r(o)r(d.)448 b Fc(C-_)-450 +4905 y Ff(skry)23 b(v\271etky)i(p)r(o)r(dadres\341re)783 +b Fc(M-$)-450 4985 y Ff(skry)23 b(aleb)r(o)i(o)r(dkry)f(v\271etky)g(p)r +(o)r(dadres\341re)395 b Fc($)1866 -364 y Fd(Pr\355k)m(azy)39 +b(nad)e(ozna\350en)m(\375mi)g(s\372b)s(ormi)1866 -198 +y Ff(k)n(op\355ruj)23 b(s\372b)r(or\(y\))1027 b Fc(C)1866 +-119 y Ff(premen)n(uj)24 b(s\372b)r(or)f(aleb)r(o)i(presu\362)e(s\372b) +r(ory)404 b Fc(R)1866 -39 y Ff(zme\362)24 b(vlastn\355k)n(a)h(s\372b)r +(oru\(o)n(v\))711 b Fc(O)1866 41 y Ff(zme\362)24 b(skupin)n(u)g(s\372b) +r(oru\(o)n(v\))749 b Fc(G)1866 120 y Ff(zme\362)24 b(pr\355stup)r(o)n +(v)n(\351)h(pr\341)n(v)n(a)f(s\372b)r(oru\(o)n(v\))472 +b Fc(M)1866 200 y Ff(vytla\350)25 b(s\372b)r(or\(y\))1056 +b Fc(P)1866 280 y Ff(zme\362)24 b(n\341zo)n(v)h(s\372b)r(oru\(o)n(v\))g +(na)f(mal\351)g(p\355smen\341)269 b Fc(\045)36 b(l)1866 +359 y Ff(zme\362)24 b(n\341zo)n(v)h(s\372b)r(oru\(o)n(v\))g(na)f(v)n +(e\265k)n(\351)h(p\355smen\341)261 b Fc(\045)36 b(u)1866 +439 y Ff(zma\276)24 b(ozna\350en\351)i(s\372b)r(ory)844 +b Fc(X)1866 519 y Ff(vyk)n(ona)t(j)25 b(uuenco)r(de)g(aleb)r(o)f +(uudeco)r(de)i(s\372b)r(oru\(o)n(v\))118 b Fc(U)1866 +599 y Ff(sk)n(omprim)n(uj)23 b(aleb)r(o)h(dek)n(omprim)n(uj)f(s\372b)r +(or\(y\))270 b Fc(Z)1866 678 y Ff(spusti)24 b(info)f(na)h(s\372b)r(ore) +886 b Fc(I)36 b Fe(\(D)n(X\))1866 758 y Ff(vytv)n(or)25 +b(sym)n(b)r(olic)n(k\375\(\351\))g(o)r(dk)n(az\(y\))587 +b Fc(S)1866 838 y Ff(vytv)n(or)25 b(relat\355vne)f(sym)n(b)r(olic)n(k)n +(\351)g(o)r(dk)n(azy)443 b Fc(Y)1866 917 y Ff(vytv)n(or)25 +b(p)r(evn)n(\375)f(o)r(dk)n(az)922 b Fc(H)1866 997 y +Ff(preh\265ada)t(j)24 b(s\372b)r(ory)f({)h(h\265ada)t(j)g(regul\341rn)n +(y)g(v\375raz)224 b Fc(A)1866 1077 y Ff(nahra\357)24 +b(regul\341rne)g(v\375razy)776 b Fc(Q)1866 1156 y Ff(prelo\276)24 +b(s\372b)r(ory)g(\(b)n(yte-compile\))645 b Fc(B)1866 +1236 y Ff(na\350\355ta)t(j)24 b(s\372b)r(ory)g(\(load-\014le\))764 +b Fc(L)1866 1316 y Ff(spusti)24 b(pr\355k)n(az)f(nad)i(s\372b)r +(orom\(mi\))578 b Fc(!)1866 1523 y Fd(Ozna\350enie)36 +b(s\372b)s(oro)m(v)j(pre)e(zmazanie)1866 1660 y Fe(Odzna\350uj\372ce)28 +b(pr\355k)n(azy)e(ma\276\372)h(zna\350)n(ku)g(pre)g(zmazanie)1866 +1768 y Ff(ozna\350)e(s\372b)r(or)f(pre)f(zmazanie)737 +b Fc(d)1866 1848 y Ff(o)r(dstr\341\362)24 b(zna\350)n(ku)h(pre)f +(zmazanie)635 b Fc(delete)1866 1927 y Ff(ozna\350)25 +b(v\271etky)g(z\341loh)n(y)f(\(s\372b)r(ory)h(k)n(on\350iace)g(na)f +(~\))191 b Fc(~)1866 2007 y Ff(ozna\350)25 b(v\271etky)g(z\341loh)n(y)f +(\(auto-sa)n(v)n(e\))552 b Fc(#)1866 2087 y Ff(ozna\350)25 +b(r\364zne)f(do)r(\350asn\351)h(s\372b)r(ory)673 b Fc(&)1866 +2166 y Ff(ozna\350)20 b(\350\355slo)n(v)n(an\351)g(z\341loh)n(y)g(\(k)n +(on\350iace)h(na)e(.~1~)h(a)f(p)r(o)r(d.\))71 b Fc(.)1866 +2246 y Ff(vyma\276)24 b(s\372b)r(ory)g(ozna\350en\351)i(na)e(zmazanie) +398 b Fc(x)1866 2326 y Ff(ozna\350)25 b(s\372b)r(ory)f(vyho)n +(vuj\372ce)h(regul\341rnem)n(u)f(v\375razu)119 b Fc(\045)36 +b(d)1866 2529 y Fd(Pr\355k)m(azy)j(s)f(regul\341rn)m(ymi)g(v\375razmi) +1866 2694 y Ff(ozna\350)25 b(s\372b)r(ory)f(vyho)n(vuj\372ce)h +(regul\341rnem)n(u)f(v\375razu)119 b Fc(\045)36 b(m)1866 +2774 y Ff(sk)n(op\355ruj)23 b(ozna\350en\351)j(s\372b)r(ory)e(obsah)n +(uj\372ce)h(regexp)169 b Fc(\045)36 b(C)1866 2854 y Ff(premen)n(uj)24 +b(ozna\350en\351)i(s\372b)r(ory)e(vyho)n(vuj\372ce)h(regexp)119 +b Fc(\045)36 b(R)1866 2933 y Ff(p)r(evn)n(\375)25 b(o)r(dk)n(az)1145 +b Fc(\045)36 b(H)1866 3013 y Ff(sym)n(b)r(olic)n(k\375)24 +b(o)r(dk)n(az)988 b Fc(\045)36 b(S)1866 3093 y Ff(sym)n(b)r(olic)n +(k\375)24 b(o)r(dk)n(az)h(s)e(relat\355vnou)i(cestou)385 +b Fc(\045)36 b(Y)1866 3173 y Ff(ozna\350)25 b(pre)f(zmazanie)931 +b Fc(\045)36 b(d)1866 3376 y Fd(Dired)h(a)h(Find)1866 +3541 y Ff(otv)n(or)24 b(v)g(dired)f(s\372b)r(ory)h(vyho)n(vuj\372ce)i +(vzork)n(e)145 b Fc(M-x)36 b(find-name-dired)1866 3621 +y Ff(otv)n(or)24 b(v)g(dired)f(s\372b)r(ory)h(obsah)n(uj\372ce)h +(vzorku)145 b Fc(M-x)36 b(find-grep-dired)1866 3701 y +Ff(otv)n(or)24 b(v)g(dired)f(s\372b)r(ory)h(p)r(o)r(d\265a)g +(v\375stupu)h Fc(find)125 b(M-x)36 b(find-dired)1866 +3904 y Fd(N\341p)s(o)m(v)m(eda)1866 4069 y Ff(zobraz)25 +b(n\341p)r(o)n(v)n(edu)1014 b Fc(h)1866 4149 y Ff(preh\265ad)24 +b(pr\355k)n(azo)n(v)g(dired)836 b Fc(?)2219 4454 y Fb(Cop)n(yrigh)n(t) +2522 4452 y(c)2505 4454 y Fa(\015)21 b Fb(2007)i(F)-5 +b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)2302 +4517 y(designed)h(b)n(y)f(Stephen)g(Gildea,)g(Ma)n(y)i(2006)g(v0.1)2299 +4581 y(for)f(GNU)f(Emacs)i(v)n(ersion)f(22)h(on)e(Unix)g(systems)2128 +4645 y(Up)r(dated)f(for)j(Dired)e(in)f(Ma)n(y)j(2000)h(b)n(y)e(Evgen)n +(y)g(Roubinc)n(h)n(tein)1866 4737 y(P)n(ermission)d(is)g(gran)n(ted)h +(to)g(mak)n(e)g(and)f(distribute)f(copies)h(of)h(this)f(card)g(pro)n +(vided)g(the)1866 4801 y(cop)n(yrigh)n(t)k(notice)e(and)h(this)f(p)r +(ermission)g(notice)h(are)g(preserv)n(ed)h(on)e(all)h(copies.)1866 +4893 y(F)-5 b(or)17 b(copies)g(of)h(the)e(GNU)g(Emacs)h(man)n(ual,)f +(write)h(to)g(the)g(F)-5 b(ree)17 b(Soft)n(w)n(are)i(F)-5 +b(oundation,)1866 4957 y(Inc.,)20 b(51)h(F)-5 b(ranklin)20 +b(Street,)h(Fifth)f(Flo)r(or,)g(Boston,)i(MA)f(02110-1301,)j(USA.)p +eop end %%Trailer -end + userdict /end-hook known{end-hook}if %%EOF diff -r edf631bdbb7a -r 738ce3540ffb etc/sk-dired-ref.tex --- a/etc/sk-dired-ref.tex Sun Apr 22 11:42:03 2007 +0000 +++ b/etc/sk-dired-ref.tex Sun Apr 22 12:12:29 2007 +0000 @@ -49,7 +49,7 @@ % e.g. in the TeX Live CD). \def\versionnumber{0.1} -\def\versionemacs{21} +\def\versionemacs{22} \def\year{2007} \def\version{May 2006\ v\versionnumber} diff -r edf631bdbb7a -r 738ce3540ffb etc/ulimit.hack --- a/etc/ulimit.hack Sun Apr 22 11:42:03 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -#!/bin/sh -# -# ulimit.hack: Create an intermediate program for use in -# between kernel initialization and init startup. -# This is needed on a 3b system if the standard CDLIMIT is -# so small that the dumped Emacs file cannot be written. -# This program causes everyone to get a bigger CDLIMIT value -# so that the dumped Emacs can be written out. -# -# Users of V.3.1 and later should not use this; see etc/MACHINES -# and reconfig your kernel's CDLIMIT parameter instead. -# -# Caveat: Heaven help you if you screw this up. This puts -# a new program in as /etc/init, which then execs the real init. -# -cat > ulimit.init.c << \EOF -main(argc, argv) -int argc; -char *argv[]; -{ - ulimit(2, 262144L); /* "2" is the "set" command. */ - /* 262,144 allows for 128Mb files to be written. */ - /* If that value isn't suitable, roll your own. */ - execv("/etc/real.init", argv); -} -EOF -# -# Compile it and put it in place of the usual init program. -# -cc ulimit.init.c -o ulimit.init -mv /etc/init /etc/real.init -mv ulimit.init /etc/ulimit.init -ln /etc/ulimit.init /etc/init -mv ulimit.init.c /etc/ulimit.init.c # to keep src for this hack nearby. -chmod 0754 /etc/init -exit 0 -# -# Upon system reboot, all processes will inherit the new large ulimit. - -# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# Free Software Foundation, Inc. - -# COPYING PERMISSIONS: -# -# This document is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -# arch-tag: 6f9a7072-9d07-4431-b0bb-e867648ad0b4 diff -r edf631bdbb7a -r 738ce3540ffb lib-src/makefile.w32-in --- a/lib-src/makefile.w32-in Sun Apr 22 11:42:03 2007 +0000 +++ b/lib-src/makefile.w32-in Sun Apr 22 12:12:29 2007 +0000 @@ -24,7 +24,7 @@ .PHONY: $(ALL) -VERSION = 22.0.95 +VERSION = 22.0.96 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ diff -r edf631bdbb7a -r 738ce3540ffb lisp/ChangeLog --- a/lisp/ChangeLog Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ChangeLog Sun Apr 22 12:12:29 2007 +0000 @@ -1,3 +1,474 @@ +2007-03-21 Juanma Barranquero + + * server.el (server-process-filter): Cancel any pending isearch. + +2007-03-21 Ulf Jasper + + * calendar/icalendar.el (icalendar-version): Increase to 0.15. + (icalendar--get-unfolded-buffer): Define actual arguments rather + than just using &rest. Check replace-in-string is fbound. + (icalendar-import-buffer): Doc fix. + (icalendar--convert-ical-to-diary): Set diary-file. + Check diary-file before inserting final newline. + (icalendar--add-diary-entry): Return diary-file. + +2007-03-21 Glenn Morris + + * calendar/calendar.el (diary-set-maybe-redraw): Autoload it. + (diary-display-hook): Add custom :set function. + + * calendar/diary-lib.el (diary-header-line-flag): Doc fix. + Add custom :set function. + (diary-header-line-format): Doc fix. + (diary-set-maybe-redraw): New function. + (number-of-diary-entries): Change :set to use diary-set-maybe-redraw. + (diary-list-entries): Always run diary-mode. + +2007-03-20 David Kastrup + + * files.el (magic-mode-alist): Require literal "%!PS" string for + magic postscript file detection. + +2007-03-20 Richard Stallman + + * textmodes/ispell.el (ispell-call-process): New function. + Defends against bad `default-directory.' + (ispell-check-version, ispell-find-aspell-dictionaries) + (ispell-get-aspell-config-value, lookup-words): Call it. + (ispell-call-process-region): New function. + (ispell-send-string): Call it. + +2007-03-20 Andreas Schwab + + * Makefile.in (custom-deps): Depend on $(lisp)/subdirs.el. + (finder-data): Likewise. + (autoloads): Likewise. + +2007-03-20 Martin Rudalics + + * files.el (basic-save-buffer): Do not set visited filename when + the corresponding directory does not exist or the specified + filename is that of an existing directory. + +2007-03-20 Glenn Morris + + * calendar/diary-lib.el (diary-live-p): New function. + (number-of-diary-entries): Add a :set function to redisplay diary + when necessary. + +2007-03-19 Nick Roberts + + * t-mouse.el (t-mouse-make-event-element): Use timestamp output + from client program, mev, to compute mouse event. + +2007-03-19 Chong Yidong + + * faces.el (momentary): Face removed; unused due to reversion of + 2007-01-04 changes by Kevin Rodgers. + + * mouse.el (mouse-drag-track): Remove spurious input-pending-p test. + Suggested by Johan Bockg,Ae(Brd. + +2007-03-19 Martin Rudalics + + * font-lock.el (lisp-font-lock-keywords-1): Highlight + define-globalized-minor-mode as a keyword. + +2007-03-19 Kim F. Storm + + * calc/calc-forms.el (math-std-daylight-savings) + (math-std-daylight-savings-old): Doc fix. + +2007-03-19 Juanma Barranquero + + * progmodes/python.el (python-default-template): Doc fix. + (python-buffer): Fix typo in docstring. + + * isearchb.el (isearchb-follow-char): + * subr.el (def-edebug-spec): Fix typo in docstring. + +2007-03-19 Richard Stallman + + * files.el (default-directory): Mark safe. + (basic-save-buffer-2): Put proper dir name in error message. + + * simple.el (compose-mail): Run switch-function after + setting up the mail buffer. + + * startup.el (inhibit-splash-screen, initial-major-mode): Doc fixes. + +2007-03-18 Jay Belanger + + * calc/calc-forms.el (math-parse-date): Fix a regular expression. + (math-std-daylight-savings-new): Rename from + `math-std-daylight-savings'. + (math-std-daylight-savings-old): Rename from old value of + `math-std-daylight-savings'. + (math-std-daylight-savings): Use `math-std-daylight-savings-new' or + `math-std-daylight-savings-old' depending on the year. + +2007-03-18 Detlev Zundel + + * emacs-lisp/re-builder.el (reb-update-overlays): Do not mark + zero-width regexps as invalid but rather at least count them + correctly. + +2007-03-18 Thien-Thi Nguyen + + * net/tls.el (open-tls-stream): In handshake-waiting loop, + don't wait more if there is output available to process. + +2007-03-18 Nick Roberts + + * progmodes/compile.el (compilation-find-file): Revert change + from 2006-07-18 to allow completion of directory names. + Reported by John Carter . + +2007-03-18 Kim F. Storm + + * subr.el (when, unless): Doc fix. + +2007-03-17 Thien-Thi Nguyen + + * net/tls.el (tls-program): Doc fix. + +2007-03-17 Denis Bueno (tiny change) + + * autorevert.el (auto-revert-tail-handler): + Call after-revert-hook. + +2007-03-17 Ryan Yeske + + * simple.el (switch-to-completions): No error if search for \n\n fails. + +2007-03-17 Chong Yidong + + * simple.el (line-move-1): Respect + `inhibit-line-move-field-capture' property. + +2007-03-13 Chong Yidong + + * comint.el (comint-arguments): Mark backslash-escaped chars. + (comint-delim-arg): Don't treat them as delimiters. + +2007-03-12 Kim F. Storm + * ido.el (ido-init-completion-maps): Remap delete-backward-char. + +2007-03-12 Lawrence Mitchell (tiny change) + + * tempo.el (tempo-insert): Deal with 'r> if it appears + specified with a prompt argument. + +2007-03-12 Carsten Dominik + + * textmodes/org.el (org-set-font-lock-defaults): + Handle narrow table columns correctly. + +2007-03-12 Mark A. Hershberger + + * xml.el (xml-parse-tag, xml-parse-string, xml-parse-attlist) + (xml-parse-dtd, xml-parse-elem-type, xml-substitute-special): + Return to use of the -no-properties variants. There was + consensus on emacs-devel that the speed of these variants was + prefered since we are usually parsing files (from the internet + or on disk) instead of XML created in Emacs. + + * eshell/esh-mode.el (eshell-handle-ansi-color): New function. + Add customize option. + +2007-03-12 Glenn Morris + + * calc/calc-forms.el (math-std-daylight-savings): Switch to new + North American rule. Replace "daylight savings" with "daylight + saving" in doc. + + * calendar/cal-china.el,cal-dst.el,calendar.el,diary-lib.el: + * calendar/lunar.el,solar.el: Replace "daylight savings" with + "daylight saving" in text. + + * woman.el (woman-change-fonts): Tweak previous change by using + woman-request-regexp rather than "^\\.". + + * startup.el (command-line-1): Make insertion of + initial-scratch-message not depend on scratch being selected. + +2007-03-11 Juri Linkov + + * replace.el (match): Use yellow background on light-bg terminals. + +2007-03-11 Richard Stallman + + * emacs-lisp/bytecomp.el (byte-compile-warning-prefix): + Correctly compute line number. + +2007-03-11 Guanpeng Xu + + * type-break.el (type-break-get-previous-count): + Repeat previous change here. + +2007-03-11 Dan Nicolaescu + + * progmodes/grep.el (grep-find-ignored-directories): + Add .git and .bzr to list. + +2007-03-11 Andreas Schwab + + * diff-mode.el (diff-apply-hunk): Use proper format string for error. + +2007-03-11 Stefan Monnier + + * mail/emacsbug.el (report-emacs-bug): Don't hard code the "X" name. + +2007-03-10 Chong Yidong + + * faces.el (face-set-after-frame-default): Recalculate face + customizations after applying X resources. + +2007-03-10 Ryan Yeske + + * net/rcirc.el (rcirc-timeout-seconds): New variable. + (rcirc-keepalive-seconds): Remove variable. + (rcirc-server-name, rcirc-timeout-timer, rcirc-connecting) + (rcirc-process, rcirc-user-disconnect): New variables. + (rcirc-connect): Initalize new variables. + (rcirc-keepalive): Don't send keepalive pings before connection + is completed. + (rcirc-sentinel): Do mark all channels with activity when + connection is dropped. Run hook with process buffer local. + (rcirc-reschedule-timeout, rcirc-delete-process): New functions. + (rcirc-buffer-process): Return value of rcirc-process if + rcirc-server-buffer is nil. + (rcirc-server-name): Return the reported server name. + (rcirc-update-prompt): Simplify computation of the server name. + (rcirc-format-response-string): Likewise. + (rcirc-handler-001): Mark server as connected, record the reported + server name, and schedule a timeout. + (rcirc-track-nick): Add a spec for the tty class. + (rcirc-user-non-nick): Remove function. + (rcirc-nick-prefix-chars): Add variable. + (rcirc-user-nick): Use above variable. + +2007-03-10 Johan Bockg,Ae(Brd + + * icomplete.el (icomplete-tidy, icomplete-exhibit): + Bind deactivate-mark to nil. + +2007-03-10 Martin Rudalics + + * complete.el (PC-do-completion): Bind dirlength to nil to avoid + that buffer contents get erased during completion. + +2007-03-10 Glenn Morris + + * woman.el (woman-change-fonts): Add a hack to deal with + font-escape followed by "." at start of a line. + (woman2-IP): Add a hack to deal with consecutive requests. + (woman2-tagged-paragraph): Extend existing hack to handle "sp". + +2007-03-10 Alan Mackenzie + + * progmodes/cc-mode.el (c-before-change): Wrap in save-match-data. + +2007-03-09 Richard Stallman + + * abbrev.el (abbrev): Add `provide'. + +2007-03-09 Thien-Thi Nguyen + + * net/ange-ftp.el (ange-ftp-try-passive-mode): Doc fix. + +2007-03-09 Martin Rudalics + + * complete.el (PC-try-completion): New function. + (PC-do-completion, read-file-name-internal): Use it instead of + try-completion. + +2007-03-08 Alan Mackenzie + + Remove stale tokens from `c-found-types' cache. + + * progmodes/cc-mode.el (c-unfind-enclosing-token) + (c-unfind-coalesced-tokens, c-before-change): New functions. + (c-maybe-stale-found-type): New variable. + + * progmodes/cc-engine.el (c-partial-ws-p, c-unfind-type) + (c-trim-found-types): New functions. + +2007-03-08 Stefan Monnier + + * smerge-mode.el (smerge-remove-props): Don't mark the buffer modified. + (debug-ignored-errors): Add entry from smerge-match-conflict. + +2007-03-08 J.D. Smith + + * progmodes/idlw-help.el (idlwave-do-context-help1): Don't visit + special help topics for keywords. + (idlwave-help-assistant-command): Include ".exe" for ms-dos + etc. Assistant command. + +2007-03-08 Chong Yidong + + * replace.el (occur-engine): Move buffer-undo-list binding... + (occur-1): ...to here. + + * complete.el (PC-bindings): Rebind M-TAB in read-expression-map. + + * simple.el (minibuffer-completing-symbol): New var. + (eval-expression): Use it. + (completion-setup-function): Don't bind completion-base-size when + completing a symbol in the minibuffer. + +2007-03-08 Nick Roberts + + * progmodes/gud.el (gdb): Pop up current GUD buffer if user + tries to start a second session in graphical mode. + +2007-03-07 Miles Bader + + * international/isearch-x.el + (isearch-process-search-multibyte-characters): + Strip text-properties from PROMPT to avoid an error from read-string. + +2007-03-07 Kim F. Storm + + * complete.el (PC-bindings): Remap lisp-complete-symbol to + PC-lisp-complete-symbol instead of binding M-TAB in global-map. + +2007-03-07 Micha,Ak(Bl Cadilhac + + * complete.el (PC-do-completion): Delete duplicates in the list of + possible completions. + +2007-03-07 Glenn Morris + + * ses.el (ses-mode): Doc fix. + +2007-03-06 Kim F. Storm + + * isearch.el (isearch-message-prefix): Undo 2007-03-01 change. + +2007-03-06 Kenichi Handa + + * term/x-win.el (x-select-utf8-or-ctext): Improve the strategy. + +2007-03-06 Stefan Monnier + + * simple.el (completion-setup-function): Improve last fix so it doesn't + set it to a relative directory name either. + +2007-03-05 Vinicius Jose Latorre + + * ps-print.el: Replace some (defvar VAR) by (defvar VAR nil). + +2007-03-05 Richard Stallman + + * emacs-lisp/re-builder.el (reb-re-syntax): Fix custom type. + + * files.el (find-file-noselect): No error if file no longer exists. + Display a message and avoid other questions. + +2007-03-05 Stefan Monnier + + * pcomplete.el (pcomplete-show-completions): Improve last change, so + as not to use an invisible window and to create a window if none exist. + + * progmodes/python.el (python-send-command): Restart proc if necessary. + (python-proc): Simplify. + +2007-03-05 David Hansen (tiny change) + + * pcomplete.el (pcomplete-show-completions): Search all frames for + completions buffer. + +2007-03-05 Chong Yidong + + * cus-edit.el (customize-save-variable): Clear customized-value + property (saved values are now put in theme-value property). + (customize-set-variable): Doc fix. + + * complete.el (PC-do-completion): If completion-ignore-case is + non-nil, replace field with completion string before exiting. + +2007-03-05 Michael Albinus + + * net/tramp.el (tramp-make-temp-file): New parameter FILENAME. + Append its extension to the resulting temporary file name. + (tramp-handle-file-local-copy, tramp-handle-write-region): Apply it. + + * net/tramp-smb.el (tramp-smb-handle-file-local-copy) + (tramp-smb-handle-write-region): Apply it. + +2007-03-05 Alin C. Soare (tiny change) + + * emacs-lisp/lisp-mode.el (calculate-lisp-indent): + Redo previous change. + +2007-03-04 Kevin Rodgers (tiny change) + + * diff-mode.el (diff-mode): Doc fix. + +2007-03-05 Kenichi Handa + + * international/characters.el: Set category `l' (latin) + for more characters. + +2007-03-04 Kim F. Storm + + * emacs-lisp/authors.el (authors-aliases): Add alias. + +2007-03-04 Glenn Morris + + * progmodes/hideshow.el (hs-minor-mode): Turn mode off and show + all when switching major mode. + (hs-minor-mode, hs-c-start-regexp, hs-block-start-regexp) + (hs-block-start-mdata-select, hs-block-end-regexp) + (hs-forward-sexp-func, hs-adjust-block-beginning): + Do not make these variables permanent-local. + +2007-03-04 Richard Stallman + + * progmodes/cperl-mode.el (cperl-mode): + Modify cperl-compilation-error-regexp-alist by appending. + + * emacs-lisp/edebug.el (edebug-kill-buffer): New function. + (edebug-mode): Add the hook. + (edebug-recursive-edit): Remove the hook on exiting. + + * type-break.el (type-break-get-previous-time): + Handle end-of-file errors specially + so they don't get reported wrong in .emacs. + + * startup.el (fancy-splash-text): Clarify text. + + * simple.el (beginning-of-buffer, end-of-buffer): + Avoid treating plain C-u like numeric arg. + + * simple.el (completion-setup-function): Don't set + default-directory to nil. + + * shell.el (shell-dirstack-query): Doc fix. + + * mouse.el (mouse-drag-mode-line-1, mouse-drag-vertical-line): + Don't select the window -- pass it to primitives instead. + + * faces.el (minibuffer-prompt): Use medium blue by default. + +2007-03-04 David Kastrup + + * jit-lock.el (jit-lock-stealth-time): Change default to nil. + Preserve 16 as default value for "seconds" when customizing. + +2007-03-04 Carsten Dominik + + * textmodes/org.el (org-self-insert-command) + (orgtbl-self-insert-command, org-delete-char) + (org-delete-backward-char): Set the `flyspell-delayed' property. + +2007-03-03 Chong Yidong + + * international/mule.el (find-auto-coding): Don't search for + line-ending characters past the end of the tail. + 2007-03-03 Christopher Allan Webber (tiny change) * play/gamegrid.el (gamegrid-add-score-with-update-game-score-1): @@ -111,7 +582,8 @@ 2007-02-26 Andrey Zhdanov (tiny change) - (gud-pdb-marker-regexp): Add optional keyword for Python 2.5. + * progmodes/gud.el (gud-pdb-marker-regexp): Add optional + keyword for Python 2.5. 2007-02-26 Romain Francoise @@ -149,32 +621,32 @@ (org-table-toggle-coordinate-overlays): New functions. (org-table-overlay-coordinates, org-table-coordinate-overlays): New variables. - (org-startup-with-deadline-check): Option removed. + (org-startup-with-deadline-check): Remove option. (org-mode): Remove deadline check on startup. - (org-table-limit-column-width): Option removed. - (org-table-formula-numbers-only): Option removed. - (org-link-style, org-link-format): Options removed. - (org-select-agenda-window, org-fit-agenda-window): Options removed. + (org-table-limit-column-width): Remove option. + (org-table-formula-numbers-only): Remove option. + (org-link-style, org-link-format): Remove options. + (org-select-agenda-window, org-fit-agenda-window): Remove options. (org-export-ascii-show-new-buffer) - (org-export-html-show-new-buffer): Options removed. - (org-activate-links): Camel option removed. - (org-file-link-context-use-camel-case): Option removed. - (org-camel-regexp): Veriable removed. - (org-activate-camels): Function removed. - (org-store-link): Removed Camel stuff. - (org-make-org-heading-camel): Function removed. - (org-open-at-point): Removed camel stuff. - (org-link-search): Removed camel stuff. + (org-export-html-show-new-buffer): Remove options. + (org-activate-links): Remove camel option. + (org-file-link-context-use-camel-case): Remove option. + (org-camel-regexp): Remove variable. + (org-activate-camels): Remove function. + (org-store-link): Remove Camel stuff. + (org-make-org-heading-camel): Remove function. + (org-open-at-point): Remove camel stuff. + (org-link-search): Remove camel stuff. (org-camel-to-words): Function removed. (org-get-agenda-file-buffer): Make sure we prepare the base buffers, not any indirect buffers. (org-sort-entries): Sort top-level when not on a headline, and no active region. (org-in-regexp): New function. - (org-search-not-self): Renamed from `org-search-not-link'. + (org-search-not-self): Rename from `org-search-not-link'. (org-open-link-marker): New variable. (org-open-at-point): Set `org-open-link-marker'. - (org-print-icalendar-entries): Fixed bug with excluding DONE + (org-print-icalendar-entries): Fixe bug with excluding DONE entries from the exported list. (org-edit-formula-lisp-indent): New command. (orgtbl-to-texinfo, orgtbl-to-html): New functions. @@ -190,7 +662,7 @@ (org-upgrade-old-links) (org-table-modify-formulas, org-table-replace-in-formulas) (org-table-find-dataline) - (org-table-get-vertical-vector): Functions removed. + (org-table-get-vertical-vector): Remove functions. (org-table-remove-rectangle-highlight) (org-time-stamp-format, org-toggle-log-option) (org-table-highlight-rectangle) @@ -223,17 +695,17 @@ (org-table-edit-scroll, org-table-edit-scroll-down) (org-set-frame-title, org-show-reference) (org-unhighlight-once, org-verify-change-for-undo): New functions. - (org-show-variable): Command removed. + (org-show-variable): Remove command. (org-add-log-maybe): New arguments STATE, FINDPOS - (org-table-sort-lines): Rewritten from scratch. + (org-table-sort-lines): Rewrite from scratch. (org-link-search): New argument AVOID-POS. - (org-print-icalendar-entries): Argument CATEGORY removed. - (org-run-agenda-series): Argument WONDOW removed. + (org-print-icalendar-entries): Remove argument CATEGORY. + (org-run-agenda-series): Remove argument WONDOW. (org-next-link, org-previous-link): New commands. (org-agenda-date-format): New option. (org-table-iterate): New command. (org-table-modify-formulas) - (org-table-replace-in-formulas): Functions removed. + (org-table-replace-in-formulas): Remove functions. (org-table-fix-formulas): New function. (org-table-insert-column, org-table-delete-column) (org-table-move-column): Use `org-table-fix-formulas'. @@ -254,8 +726,8 @@ (org-read-date): Accept "+N" as input for a date relative to the current date. (org-remove-subtree-entries-from-agenda): New function. - (org-agenda-archive, org-agenda-kill): Use - `org-remove-subtree-entries-from-agenda'. + (org-agenda-archive, org-agenda-kill): + Use `org-remove-subtree-entries-from-agenda'. (org-do-sort, org-sort-entries): New functions. (org-sort): New command. (org-table-sort-lines): Use `org-do-sort'. @@ -263,7 +735,7 @@ (org-table-number-regexp): Require 0x... to identify as number in tables. (org-startup-options): New keywords for note taking. - (org-upgrade-old-links): Function removed. + (org-upgrade-old-links): Remove function. (org-get-repeat): New function. (org-show-context): Also show siblings on current level. (org-show-siblings): New function. @@ -392,7 +864,7 @@ * pgg-gpg.el (pgg-gpg-process-region): Make USE-AGENT nil if PASSPHRASE is given. -2007-02-17 Chris Moore +2007-02-17 Chris Moore * jka-cmpr-hook.el (jka-compr-compression-info-list): Recognize backups of bz2 compressed files. @@ -1390,12 +1862,6 @@ * files.el (find-file-noselect-1, set-visited-file-name): Allow backup-enable-predicate to be nil. -2007-01-04 Kevin Rodgers - - * subr.el (momentary): New face. - (momentary-string-display): Display the string via a temporary - overlay using the new face, instead of inserting it in the buffer. - 2007-01-04 Andreas Schwab * progmodes/ebrowse.el (ebrowse-global-prefix-key): Fix typo in @@ -1407,8 +1873,7 @@ 2007-01-03 Alan Mackenzie - * progmode/cc-cmds.el (c-mask-paragraph): Fix yesterday's buggy - patch. + * progmode/cc-cmds.el (c-mask-paragraph): Fix yesterday's buggy patch. 2007-01-03 Chris Moore @@ -1579,7 +2044,7 @@ * international/mule-cmds.el (select-safe-coding-system-interactively): Fix message. -2006-12-30 Kevin Rodgers +2006-12-30 Kevin Rodgers (tiny change) * files.el (backup-buffer): Show entire backup file name in msg. @@ -2079,12 +2544,6 @@ * comint.el (comint-insert-input): Delete obsolete comment. -2006-12-08 Kevin Rodgers - - * files.el (insert-file-1): Compare file size to - large-file-warning-threshold and request confirmation when - warranted. - 2006-12-08 Stefan Monnier * net/browse-url.el (browse-url): Set DISPLAY to the one of the @@ -11957,14 +12416,6 @@ * files.el (magic-mode-regexp-match-limit): New defvar. (set-auto-mode): Use it to limit magic-mode-alist matching. -2006-02-04 Kevin Rodgers - - * simple.el (display-message-or-buffer): Compare the number of - characters to the frame width when determining whether a 1-line - message string will fit in the echo area. Count screen lines - instead of buffer lines when determining whether a multi-line - message will fit in the echo area/minibuffer window. - 2006-02-04 Eli Zaretskii * info.el (Info-index, Info-mode): Improve the description of the @@ -12199,7 +12650,7 @@ English aspell dictionary is installed, use the first entry of ispell-dictionary-alist-1. -2006-01-27 Kevin Rodgers +2006-01-27 Kevin Rodgers (tiny change) * textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate): Doc fix. @@ -14221,7 +14672,7 @@ (hi-lock-find-patterns, hi-lock-font-lock-hook): Replace hi-lock-buffer-mode with hi-lock-mode. -2005-12-10 Kevin Rodgers +2005-12-10 Kevin Rodgers (tiny change) * emacs-lisp/lisp.el (lisp-complete-symbol): Regenerate the completion list, even after a partial completion has been @@ -15664,7 +16115,7 @@ * progmodes/cc-defs.el (c-emacs-features): Don't assume point-min==1. -2005-12-06 Nozomu Ando (tiny patch) +2005-12-06 Nozomu Ando * mail/smtpmail.el (smtpmail-try-auth-methods): Make password prompts work for AUTH PLAIN. Also reported by Steve Allan @@ -29227,7 +29678,7 @@ * progmodes/python.el (python-close-block-statement-p) (python-outdent-p, python-current-defun): Use symbol-end. -2005-03-25 Karl Chen (tiny change) +2005-03-25 Karl Chen * files.el (save-some-buffers): Doc fix. @@ -31912,7 +32363,7 @@ * electric.el (Electric-pop-up-window): Use fit-window-to-buffer instead of calculating the right size. -2005-01-02 Karl Chen (tiny change) +2005-01-02 Karl Chen * vc-svn.el (vc-svn-diff): Stay local if possible. diff -r edf631bdbb7a -r 738ce3540ffb lisp/ChangeLog.10 --- a/lisp/ChangeLog.10 Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ChangeLog.10 Sun Apr 22 12:12:29 2007 +0000 @@ -2972,7 +2972,7 @@ (rename-buffer): Use the `newname' arg as base. (create-file-buffer): Split the file name into base and dirname. -2003-05-09 Jesper Harder (tiny change) +2003-05-09 Jesper Harder * mail/smtpmail.el (smtpmail-send-queued-mail): Don't use kill-line. @@ -3275,7 +3275,7 @@ * filesets.el (filesets-data): Add another defvar. (filesets-verbosity): Doc fix. -2003-05-02 Tak Ota (tiny change) +2003-05-02 Tak Ota * recentf.el (recentf-cleanup): Swap tests for exclusion and accessibility. @@ -3492,10 +3492,10 @@ (Info-display-images-node): New functions for displaying images. (Info-select-node): Call Info-display-images-node. -2003-04-25 Kai Gro,A_(Bjohann +2003-04-25 David Ponce * files.el (file-relative-name): Recognize "c:/foo" as absolute - file name. Tiny change from David PONCE . + file name. 2003-04-24 Sam Steingold @@ -5595,7 +5595,7 @@ beginning-of-defun to the non-existing command sh-beginning-of-compound-command. -2003-02-12 Karl Chen (tiny change) +2003-02-12 Karl Chen * files.el (find-alternate-file): Check whether `dired-directory' is bound. @@ -11971,7 +11971,7 @@ * calendar/appt.el (appt-delete): Use substring-no-properties. (appt-make-list): Don't use prin1-to-string; use the string unchanged. -2002-08-15 Jan Nieuwenhuizen (tiny change) +2002-08-15 Jan Nieuwenhuizen * server.el (server-process-filter): Simplify code. (server-goto-line-column): New function. @@ -12378,7 +12378,7 @@ * dired.el: Hide disabling of dired-find-alternate-file behind autoload-cookie. -2002-07-31 Tak Ota (tiny change) +2002-07-31 Tak Ota * makefile.w32-in: Revert some changes from 2002-07-23 because they don't work on MSVC/nmake builds. @@ -22919,14 +22919,15 @@ * startup.el: Document command line option --no-window-system instead of --no-windows. +2001-10-30 David Ponce + + * font-lock.el (java-font-lock-syntactic-face-function): New fun. + (font-lock-defaults-alist): Use it. + 2001-10-30 Stefan Monnier * progmodes/autoconf.el (autoconf-mode): Fix comment-start-skip. - * font-lock.el (java-font-lock-syntactic-face-function): New fun. - (font-lock-defaults-alist): Use it. - From David Ponce - * progmodes/perl-mode.el (perl-indent-line): Use `eq' to compare output of `char-after'. diff -r edf631bdbb7a -r 738ce3540ffb lisp/ChangeLog.11 --- a/lisp/ChangeLog.11 Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ChangeLog.11 Sun Apr 22 12:12:29 2007 +0000 @@ -4993,7 +4993,7 @@ * international/latin1-disp.el (latin1-char-displayable-p): Likewise. -2004-08-21 Peter Seibel (tiny patch) +2004-08-21 Peter Seibel (tiny change) * emacs-lisp/cl-indent.el (lisp-indent-defmethod): Correct indentation of DEFMETHODS with non-standard method @@ -6043,12 +6043,12 @@ * international/utf-8.el (ccl-decode-mule-utf-8): Fix previous change. (ccl-untranslated-to-ucs): Fix typo. -2004-06-12 Karl Chen (tiny change) +2004-06-12 Karl Chen * progmodes/python.el (python-open-block-statement-p): Fix indentation after a block opening that contains a comment. -2004-06-12 J,Ai(Br,At(Bme Marant (tiny change) +2004-06-12 J,Ai(Br,At(Bme Marant * bindings.el (completion-ignored-extensions): Add file extensions of Python byte-compiled files. @@ -6982,7 +6982,7 @@ (byte-goto-log-buffer): Delete. (byte-compile-log-file): Call compilation-forget-errors. -2004-05-19 Takaaki Ota (tiny change) +2004-05-19 Takaaki Ota * net/ldap.el (ldap-search-internal): Avoid mixing standard error output messages into the search result. @@ -6996,7 +6996,7 @@ * international/characters.el: Fix syntax (open/close) of CJK chars. -2004-05-18 Karl Chen (tiny change) +2004-05-18 Karl Chen * help-mode.el (help-go-back): Don't depend on position of back button. @@ -7121,7 +7121,7 @@ * calendar/appt.el (appt-disp-window): Use `calendar-set-mode-line' for a centered mode-line. -2004-05-13 Takaaki Ota (tiny change) +2004-05-13 Takaaki Ota * calendar/appt.el (appt-disp-window): Do not split window excessively when `split-height-threshold' is low. @@ -10484,12 +10484,12 @@ * loadhist.el (unload-feature): Doc fix. Rename flist to unload-hook-features-list. -2004-02-16 Jay Belanger (tiny change) +2004-02-16 Jay Belanger * calc/calc-embed.el (calc-do-embedded-activate): Add autoload cookie. Don't check if we are looking-at open-formula. -2004-02-16 Jesper Harder (tiny change) +2004-02-16 Jesper Harder * subr.el (match-string-no-properties): Use substring-no-properties. @@ -10564,7 +10564,7 @@ * international/ccl.el (ccl-compile-write): Pass `left' to ccl-embed-code to generate correct code of write-expr-register. -2004-02-15 Dan Nicolaescu (tiny change) +2004-02-15 Dan Nicolaescu * progmodes/grep.el (grep-compute-defaults): Fix typos. @@ -10766,7 +10766,7 @@ * vc.el (with-vc-file): Fix unsafe uses of error. (vc-cancel-version): Likewise. -2004-02-08 Jan Nieuwenhuizen (tiny change) +2004-02-08 Jan Nieuwenhuizen * progmodes/gud.el (gud-jdb-marker-filter): Add period as optional thousands separator; fixes : regexp for @@ -11113,7 +11113,7 @@ * mail/smtpmail.el (smtpmail-send-data): Don't append spurious newline. -2004-01-18 David Ponce (tiny change) +2004-01-18 David Ponce * progmodes/which-func.el (which-function-mode): Don't cancel which-func-update-timer if not set. @@ -11322,7 +11322,7 @@ * subr.el (functionp): Doc fix. -2004-01-03 Jesper Harder (tiny change) +2004-01-03 Jesper Harder * progmodes/idlwave.el (idlwave-make-tags): * textmodes/flyspell.el (flyspell-large-region):. @@ -11525,7 +11525,7 @@ (table--put-cell-indicator-property): Put yank-handler property that indicates the yank handler for the table cell. -2003-12-29 Jesper Harder (tiny change) +2003-12-29 Jesper Harder * generic-x.el (etc-modules-conf-generic-mode): A more complete set of keywords. @@ -11583,7 +11583,7 @@ (ido-file-name-all-completions1): Return empty list for non-readable directory. (ido-exhibit): Print [Not readable] if directory is not readable. - (ido-expand-directory): New defun (based on tiny fix from Karl Chen). + (ido-expand-directory): New defun (based on fix from Karl Chen). (ido-read-file-name, ido-file-internal, ido-read-directory-name): Use it. @@ -11921,7 +11921,7 @@ (breakpoint-enabled-icon, breakpoint-disabled-icon): Set :ascent to 100 for icons to avoid increasing line height when shown. -2003-11-17 Jesper Harder (tiny change) +2003-11-17 Jesper Harder * newcomment.el (comment-normalize-vars): Initialize properly if comment-start was nil. @@ -11935,7 +11935,7 @@ * international/latin1-disp.el (latin1-display-ucs-per-lynx): Fix docstring. -2003-11-17 Jesper Harder (tiny change) +2003-11-17 Jesper Harder * international/latin1-disp.el (latin1-display): Fix docstring. @@ -12665,12 +12665,12 @@ * language/chinese.el ("Chinese-GB", "Chinese-BIG5"): Set up for using a Chinese tutorial. -2003-09-28 Jesper Harder (tiny change) +2003-09-28 Jesper Harder * mail/smtpmail.el (smtpmail-via-smtp): Don't insert a space between "MAIL FROM:" and "RCPT TO:" and the following address. -2003-09-28 Jesper Harder (tiny change) +2003-09-28 Jesper Harder * textmodes/text-mode.el (paragraph-indent-minor-mode): Doc fix. @@ -13685,7 +13685,7 @@ * international/fontset.el (setup-default-fontset): Change registry names of Akurti fonts. -2003-07-29 Jesper Harder (tiny change) +2003-07-29 Jesper Harder * comint.el (comint-read-noecho): Use `clear-string' instead of `fillarray'. @@ -13701,7 +13701,7 @@ (menu): Add gdb-restore-windows to menu. Make gdba specific menus only visible from gdba. -2003-07-28 Tak Ota (tiny change) +2003-07-28 Tak Ota * progmodes/compile.el (compilation-environment): New user variable. (compile-internal): Respect it. @@ -13930,7 +13930,7 @@ * desktop.el (desktop-buffer-dired-misc-data, desktop-buffer-dired): Handle `dired-directory' being a list. -2003-07-13 Jesper Harder (tiny change) +2003-07-13 Jesper Harder * mail/smtpmail.el (smtpmail-send-it): Create smtpmail-queue-dir if it doesn't exist. diff -r edf631bdbb7a -r 738ce3540ffb lisp/ChangeLog.3 --- a/lisp/ChangeLog.3 Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ChangeLog.3 Sun Apr 22 12:12:29 2007 +0000 @@ -5091,7 +5091,7 @@ * holidays.el (calendar-holiday-function-sexp): New function. *calendar.el (calendar-holidays): Describe it and use it for daylight - savings. + saving. * calendar.el, cal-mayan.el, cal-french.el: Change names of all calendar-goto-next- or calendar-goto-previous- commands to diff -r edf631bdbb7a -r 738ce3540ffb lisp/ChangeLog.4 --- a/lisp/ChangeLog.4 Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ChangeLog.4 Sun Apr 22 12:12:29 2007 +0000 @@ -6131,7 +6131,7 @@ * cal-dst.el (calendar-time-zone-daylight-rules): Remove special case for Israel. Israel has changed its daylight - savings time rules. We don't know what the current rules are, + saving time rules. We don't know what the current rules are, but the special case was definitely incorrect. 1993-09-06 Roland McGrath (roland@churchy.gnu.ai.mit.edu) @@ -8087,7 +8087,7 @@ (general-holidays, calendar-holidays, hebrew-holidays, christian-holidays, islamic-holidays, solar-holidays): Rewritten to include require of cal-dst.el and to - show the time of the change to/from daylight savings time. + show the time of the change to/from daylight saving time. (calendar-current-time-zone, calendar-time-zone, calendar-daylight-time-offset, calendar-standard-time-zone-name, calendar-daylight-time-zone-name, calendar-daylight-savings-starts, @@ -8772,7 +8772,7 @@ (solar-time-string): Use calendar-daylight-time-offset instead of 1 hr, and use calendar-daylight-savings-switchover-time instead of midnight. Add an optional parameter to allow forcing the use of - standard or daylight savings time. Fix code so it works in + standard or daylight saving time. Fix code so it works in southern hemisphere (start of dst precedes end of dst in a calendar year) and when dst either starts or ends in a calendar year, but not both. diff -r edf631bdbb7a -r 738ce3540ffb lisp/ChangeLog.5 --- a/lisp/ChangeLog.5 Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ChangeLog.5 Sun Apr 22 12:12:29 2007 +0000 @@ -989,7 +989,7 @@ * easymenu.el (easy-menu-do-define): Add autoload cookie. -1995-05-19 Kevin Rodgers +1995-05-19 Kevin Rodgers (tiny change) * mailalias.el (expand-mail-aliases): Expand aliases in From and Reply-to headers as well, plus the Resent- variants. @@ -8278,7 +8278,7 @@ * indent.el (move-to-tab-stop): Delete spurious multiple definition. -1994-07-11 Kevin Rodgers +1994-07-11 Kevin Rodgers (tiny change) * mailabbrev.el (define-mail-abbrev): Don't try to parse empty aliases. @@ -8906,7 +8906,7 @@ * faces.el (x-create-frame-with-faces): Set the cursor color last. -1994-06-17 Kevin Rodgers (kevinr@ihs.com) +1994-06-17 Kevin Rodgers (kevinr@ihs.com) (tiny change) * mailabbrev.el (build-mail-abbrevs): Pass a recursivep argument in recursive call. diff -r edf631bdbb7a -r 738ce3540ffb lisp/ChangeLog.7 --- a/lisp/ChangeLog.7 Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ChangeLog.7 Sun Apr 22 12:12:29 2007 +0000 @@ -1297,7 +1297,7 @@ * language/misc-lang.el ("IPA"): Add coding-priority and coding-system. -1998-07-07 Kevin Rodgers +1998-07-07 Kevin Rodgers (tiny change) * vc.el (vc-finish-logentry): Only delete windows in the selected frame displaying the *VC-log* buffer, in case another @@ -2475,7 +2475,7 @@ * rsz-mini.el (resize-minibuffer-mode): * iswitchb.el (iswitchb-read-buffer): Add autoload cookie. -1998-06-03 Kevin Rodgers +1998-06-03 Kevin Rodgers (tiny change) * replace.el (esc-map): Bind C-M-% to query-replace-regexp. @@ -7508,7 +7508,7 @@ * avoid.el (mouse-avoidance-mode): Variable customized to automatically load the package. -1997-12-22 Kevin Rodgers +1997-12-22 Kevin Rodgers (tiny change) * simple.el (previous-matching-history-element): Bind case-fold-search to nil if REGEXP contains an uppercase letter. @@ -8260,7 +8260,7 @@ * cal-tex.el (cal-tex-cursor-week-iso): Delete spurious %. -1997-11-02 Kevin Rodgers +1997-11-02 Kevin Rodgers * emacs-lisp/byte-opt.el (byte-optimize-concat): New function. @@ -21588,7 +21588,7 @@ * time-stamp.el (time-stamp-dd/mm/yyyy): New function. -1996-11-04 Kevin Rodgers +1996-11-04 Kevin Rodgers * compile.el (compile-highlight-display-limit): New variable. (compilation-handle-exit): Parse error messages here diff -r edf631bdbb7a -r 738ce3540ffb lisp/ChangeLog.8 --- a/lisp/ChangeLog.8 Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ChangeLog.8 Sun Apr 22 12:12:29 2007 +0000 @@ -9846,7 +9846,7 @@ * gnus/gnus-start.el (gnus-save-newsrc-file): Bind coding-system-for-write before saving. -1998-08-26 Kevin Rodgers +1998-08-26 Kevin Rodgers (tiny change) * isearch.el (isearch-forward): Doc fix. diff -r edf631bdbb7a -r 738ce3540ffb lisp/Makefile.in --- a/lisp/Makefile.in Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/Makefile.in Sun Apr 22 12:12:29 2007 +0000 @@ -87,12 +87,12 @@ $(lisp)/cus-load.el: touch $@ -custom-deps: $(lisp)/loaddefs.el $(lisp)/cus-load.el doit +custom-deps: $(lisp)/subdirs.el $(lisp)/loaddefs.el $(lisp)/cus-load.el doit wd=$(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(EMACS) $(EMACSOPT) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins -finder-data: $(lisp)/loaddefs.el doit +finder-data: $(lisp)/subdirs.el $(lisp)/loaddefs.el doit wd=$(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(EMACS) $(EMACSOPT) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins @@ -107,7 +107,7 @@ echo ";; no-update-autoloads: t" >> $@ echo ";; End:" >> $@ echo ";;; loaddefs.el ends here" >> $@ -autoloads: $(lisp)/loaddefs.el doit +autoloads: $(lisp)/subdirs.el $(lisp)/loaddefs.el doit wd=$(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(EMACS) $(EMACSOPT) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins diff -r edf631bdbb7a -r 738ce3540ffb lisp/abbrev.el --- a/lisp/abbrev.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/abbrev.el Sun Apr 22 12:12:29 2007 +0000 @@ -363,5 +363,7 @@ (if (or noquery (y-or-n-p (format "Expand `%s'? " string))) (expand-abbrev))))))) +(provide 'abbrev) + ;; arch-tag: dbd6f3ae-dfe3-40ba-b00f-f9e3ff960df5 ;;; abbrev.el ends here diff -r edf631bdbb7a -r 738ce3540ffb lisp/autorevert.el --- a/lisp/autorevert.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/autorevert.el Sun Apr 22 12:12:29 2007 +0000 @@ -457,6 +457,7 @@ (save-excursion (goto-char (point-max)) (insert-file-contents file nil auto-revert-tail-pos size))) + (run-mode-hooks 'after-revert-hook) (undo-boundary) (setq auto-revert-tail-pos size) (set-buffer-modified-p modified))) diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-aent.el --- a/lisp/calc/calc-aent.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-aent.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-alg.el --- a/lisp/calc/calc-alg.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-alg.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-arith.el --- a/lisp/calc/calc-arith.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-arith.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-bin.el --- a/lisp/calc/calc-bin.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-bin.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-comb.el --- a/lisp/calc/calc-comb.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-comb.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-cplx.el --- a/lisp/calc/calc-cplx.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-cplx.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-embed.el --- a/lisp/calc/calc-embed.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-embed.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-ext.el --- a/lisp/calc/calc-ext.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-ext.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + ;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. - -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-fin.el --- a/lisp/calc/calc-fin.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-fin.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-forms.el --- a/lisp/calc/calc-forms.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-forms.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -508,7 +508,7 @@ (defvar math-format-date-cache nil) -;; The variables math-fd-date, math-fd-dt, math-fd-year, +;; The variables math-fd-date, math-fd-dt, math-fd-year, ;; math-fd-month, math-fd-day, math-fd-weekday, math-fd-hour, ;; math-fd-minute, math-fd-second, math-fd-bc-flag are local ;; to math-format-date, but are used by math-format-date-part, @@ -533,7 +533,7 @@ (calc-group-digits nil) (calc-leading-zeros nil) (calc-number-radix 10) - math-fd-year math-fd-month math-fd-day math-fd-weekday + math-fd-year math-fd-month math-fd-day math-fd-weekday math-fd-hour math-fd-minute math-fd-second (math-fd-bc-flag nil) (fmt (apply 'concat (mapcar 'math-format-date-part @@ -570,7 +570,7 @@ math-fd-year (car math-fd-dt) math-fd-month (nth 1 math-fd-dt) math-fd-day (nth 2 math-fd-dt) - math-fd-weekday (math-mod + math-fd-weekday (math-mod (math-add (math-floor math-fd-date) 6) 7) math-fd-hour (nth 3 math-fd-dt) math-fd-minute (nth 4 math-fd-dt) @@ -727,8 +727,8 @@ (a nil) (b nil) (c nil) (bigyear nil) temp) ;; Extract the time, if any. - (if (or (string-match "\\([0-9][0-9]?\\):\\([0-9][0-9]?\\)\\(:\\([0-9][0-9]?\\(\\.[0-9]+\\)?\\)\\)? *\\([ap]m?\\|[ap]\\. *m\\.\\|noon\\|n\\>\\|midnight\\|mid\\>\\|m\\>\\)?" math-pd-str) - (string-match "\\([0-9][0-9]?\\)\\(\\)\\(\\(\\(\\)\\)\\) *\\([ap]m?\\|[ap]\\. *m\\.\\|noon\\|n\\>\\|midnight\\|mid\\>\\|m\\>\\)" math-pd-str)) + (if (or (string-match "\\([0-9][0-9]?\\):\\([0-9][0-9]?\\)\\(:\\([0-9][0-9]?\\(\\.[0-9]+\\)?\\)\\)? *\\([ap]\\>\\|[ap]m\\|[ap]\\. *m\\.\\|noon\\|n\\>\\|midnight\\|mid\\>\\|m\\>\\)?" math-pd-str) + (string-match "\\([0-9][0-9]?\\)\\(\\)\\(\\(\\(\\)\\)\\) *\\([ap]\\>\\|[ap]m\\|[ap]\\. *m\\.\\|noon\\|n\\>\\|midnight\\|mid\\>\\|m\\>\\)" math-pd-str)) (let ((ampm (math-match-substring math-pd-str 6))) (setq hour (string-to-number (math-match-substring math-pd-str 1)) minute (math-match-substring math-pd-str 2) @@ -784,7 +784,7 @@ (while (and (string-match "[-+]?0*[1-9][0-9][0-9][0-9][0-9]+" math-pd-str) (setq temp (concat (substring math-pd-str 0 (match-beginning 0)) (substring math-pd-str (match-end 0)))) - (string-match + (string-match "[4-9][0-9]\\|[0-9][0-9][0-9]\\|[-+][0-9]+[^-]*\\'" temp)) (setq math-pd-str temp)) @@ -1173,7 +1173,7 @@ ;;; Note: Longer names must appear before shorter names which are ;;; substrings of them. (defvar math-tzone-names - '(( "UTC" 0 0) + '(( "UTC" 0 0) ( "MEGT" -1 "MET" "METDST" ) ; Middle Europe ( "METDST" -1 -1 ) ( "MET" -1 0 ) ( "MEGZ" -1 "MEZ" "MESZ" ) ( "MEZ" -1 0 ) ( "MESZ" -1 -1 ) @@ -1312,9 +1312,42 @@ (calcFunc-unixtime (calcFunc-unixtime date z1) z2))) (defun math-std-daylight-savings (date dt zone bump) - "Standard North American daylight savings algorithm. -This implements the rules for the U.S. and Canada as of 1987. -Daylight savings begins on the first Sunday of April at 2 a.m., + "Standard North American daylight saving algorithm. +Before 2007, this uses `math-std-daylight-savings-old', where +daylight saving began on the first Sunday of April at 2 a.m., +and ended on the last Sunday of October at 2 a.m. +As of 2007, this uses `math-std-daylight-savings-new', where +daylight saving begins on the second Sunday of March at 2 a.m., +and ends on the first Sunday of November at 2 a.m." + (if (< (car dt) 2007) + (math-std-daylight-savings-old date dt zone bump) + (math-std-daylight-savings-new date dt zone bump))) + +(defun math-std-daylight-savings-new (date dt zone bump) + "Standard North American daylight saving algorithm as of 2007. +This implements the rules for the U.S. and Canada. +Daylight saving begins on the second Sunday of March at 2 a.m., +and ends on the first Sunday of November at 2 a.m." + (cond ((< (nth 1 dt) 3) 0) + ((= (nth 1 dt) 3) + (let ((sunday (math-prev-weekday-in-month date dt 14 0))) + (cond ((< (nth 2 dt) sunday) 0) + ((= (nth 2 dt) sunday) + (if (>= (nth 3 dt) (+ 3 bump)) -1 0)) + (t -1)))) + ((< (nth 1 dt) 11) -1) + ((= (nth 1 dt) 11) + (let ((sunday (math-prev-weekday-in-month date dt 7 0))) + (cond ((< (nth 2 dt) sunday) -1) + ((= (nth 2 dt) sunday) + (if (>= (nth 3 dt) (+ 2 bump)) 0 -1)) + (t 0)))) + (t 0))) + +(defun math-std-daylight-savings-old (date dt zone bump) + "Standard North American daylight saving algorithm before 2007. +This implements the rules for the U.S. and Canada. +Daylight saving begins on the first Sunday of April at 2 a.m., and ends on the last Sunday of October at 2 a.m." (cond ((< (nth 1 dt) 4) 0) ((= (nth 1 dt) 4) @@ -1817,7 +1850,7 @@ (math-make-intv 2 0 b))))) ;; The variables math-exp-str and math-exp-pos are local to -;; math-read-exprs in math-aent.el, but are used by +;; math-read-exprs in math-aent.el, but are used by ;; math-read-angle-brackets, which is called (indirectly) by ;; math-read-exprs. (defvar math-exp-str) diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-frac.el --- a/lisp/calc/calc-frac.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-frac.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-funcs.el --- a/lisp/calc/calc-funcs.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-funcs.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-graph.el --- a/lisp/calc/calc-graph.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-graph.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-help.el --- a/lisp/calc/calc-help.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-help.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-incom.el --- a/lisp/calc/calc-incom.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-incom.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-keypd.el --- a/lisp/calc/calc-keypd.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-keypd.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-lang.el --- a/lisp/calc/calc-lang.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-lang.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-macs.el --- a/lisp/calc/calc-macs.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-macs.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-map.el --- a/lisp/calc/calc-map.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-map.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-math.el --- a/lisp/calc/calc-math.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-math.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-misc.el --- a/lisp/calc/calc-misc.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-misc.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-mode.el --- a/lisp/calc/calc-mode.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-mode.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-mtx.el --- a/lisp/calc/calc-mtx.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-mtx.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-poly.el --- a/lisp/calc/calc-poly.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-poly.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-prog.el --- a/lisp/calc/calc-prog.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-prog.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-rewr.el --- a/lisp/calc/calc-rewr.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-rewr.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-rules.el --- a/lisp/calc/calc-rules.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-rules.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-sel.el --- a/lisp/calc/calc-sel.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-sel.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-stat.el --- a/lisp/calc/calc-stat.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-stat.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-store.el --- a/lisp/calc/calc-store.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-store.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-stuff.el --- a/lisp/calc/calc-stuff.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-stuff.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-trail.el --- a/lisp/calc/calc-trail.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-trail.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-undo.el --- a/lisp/calc/calc-undo.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-undo.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-units.el --- a/lisp/calc/calc-units.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-units.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-vec.el --- a/lisp/calc/calc-vec.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-vec.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc-yank.el --- a/lisp/calc/calc-yank.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc-yank.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calc.el --- a/lisp/calc/calc.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calc.el Sun Apr 22 12:12:29 2007 +0000 @@ -10,20 +10,20 @@ ;; This file is part of GNU Emacs. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + ;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. - -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calcalg2.el --- a/lisp/calc/calcalg2.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calcalg2.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calcalg3.el --- a/lisp/calc/calcalg3.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calcalg3.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calccomp.el --- a/lisp/calc/calccomp.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calccomp.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calc/calcsel2.el --- a/lisp/calc/calcsel2.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calc/calcsel2.el Sun Apr 22 12:12:29 2007 +0000 @@ -8,20 +8,20 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY. No author or distributor -;; accepts responsibility to anyone for the consequences of using it -;; or for whether it serves any particular purpose or works at all, -;; unless he says so in writing. Refer to the GNU Emacs General Public -;; License for full details. +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. -;; Everyone is granted permission to copy, modify and redistribute -;; GNU Emacs, but only under the conditions described in the -;; GNU Emacs General Public License. A copy of this license is -;; supposed to have been given to you along with GNU Emacs so you -;; can know your rights and responsibilities. It should be in a -;; file named COPYING. Among other things, the copyright notice -;; and this notice must be preserved on all copies. +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: diff -r edf631bdbb7a -r 738ce3540ffb lisp/calendar/cal-china.el --- a/lisp/calendar/cal-china.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calendar/cal-china.el Sun Apr 22 12:12:29 2007 +0000 @@ -83,8 +83,8 @@ ; The correct value is as follows, but the Chinese calendrical ; authorities do NOT use DST in determining astronomical events: ; 60 - "*Number of minutes difference between daylight savings and standard time -for Chinese calendar. Default is for no daylight savings time." + "*Number of minutes difference between daylight saving and standard time +for Chinese calendar. Default is for no daylight saving time." :type 'integer :group 'chinese-calendar) @@ -99,7 +99,7 @@ :group 'chinese-calendar) (defcustom chinese-calendar-daylight-time-zone-name "CDT" - "*Abbreviated name of daylight-savings time zone used for Chinese calendar." + "*Abbreviated name of daylight saving time zone used for Chinese calendar." :type 'string :group 'chinese-calendar) @@ -109,8 +109,8 @@ ; '(cond ((< 1986 year) (calendar-nth-named-day 1 0 4 year 10)) ; ((= 1986 year) '(5 4 1986)) ; (t nil)) - "*Sexp giving the date on which daylight savings time starts for Chinese -calendar. Default is for no daylight savings time. See documentation of + "*Sexp giving the date on which daylight saving time starts for Chinese +calendar. Default is for no daylight saving time. See documentation of `calendar-daylight-savings-starts'." :type 'sexp :group 'chinese-calendar) @@ -119,21 +119,21 @@ ; The correct value is as follows, but the Chinese calendrical ; authorities do NOT use DST in determining astronomical events: ; '(if (<= 1986 year) (calendar-nth-named-day 1 0 9 year 11)) - "*Sexp giving the date on which daylight savings time ends for Chinese -calendar. Default is for no daylight savings time. See documentation of + "*Sexp giving the date on which daylight saving time ends for Chinese +calendar. Default is for no daylight saving time. See documentation of `calendar-daylight-savings-ends'." :type 'sexp :group 'chinese-calendar) (defcustom chinese-calendar-daylight-savings-starts-time 0 - "*Number of minutes after midnight that daylight savings time starts for -Chinese calendar. Default is for no daylight savings time." + "*Number of minutes after midnight that daylight saving time starts for +Chinese calendar. Default is for no daylight saving time." :type 'integer :group 'chinese-calendar) (defcustom chinese-calendar-daylight-savings-ends-time 0 - "*Number of minutes after midnight that daylight savings time ends for -Chinese calendar. Default is for no daylight savings time." + "*Number of minutes after midnight that daylight saving time ends for +Chinese calendar. Default is for no daylight saving time." :type 'integer :group 'chinese-calendar) diff -r edf631bdbb7a -r 738ce3540ffb lisp/calendar/cal-dst.el --- a/lisp/calendar/cal-dst.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calendar/cal-dst.el Sun Apr 22 12:12:29 2007 +0000 @@ -1,4 +1,4 @@ -;;; cal-dst.el --- calendar functions for daylight savings rules +;;; cal-dst.el --- calendar functions for daylight saving rules ;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007 Free Software Foundation, Inc. @@ -7,7 +7,7 @@ ;; Edward M. Reingold ;; Maintainer: Glenn Morris ;; Keywords: calendar -;; Human-Keywords: daylight savings time, calendar, diary, holidays +;; Human-Keywords: daylight saving time, calendar, diary, holidays ;; This file is part of GNU Emacs. @@ -29,7 +29,7 @@ ;;; Commentary: ;; This collection of functions implements the features of calendar.el and -;; holiday.el that deal with daylight savings time. +;; holiday.el that deal with daylight saving time. ;; Comments, corrections, and improvements should be sent to ;; Edward M. Reingold Department of Computer Science @@ -46,7 +46,7 @@ "Non-nil means to check each year for DST transitions as needed. Otherwise assume the next two transitions found after the current date apply to all years. This is faster, but not always -correct, since the dates of Daylight Saving transitions sometimes +correct, since the dates of daylight saving transitions sometimes change." :type 'boolean :version "22.1" @@ -142,8 +142,8 @@ (defun calendar-time-zone-daylight-rules (abs-date utc-diff) "Return daylight transition rule for ABS-DATE, UTC-DIFF sec offset from UTC. -ABS-DATE must specify a day that contains a daylight savings transition. -The result has the proper form for calendar-daylight-savings-starts'." +ABS-DATE must specify a day that contains a daylight saving transition. +The result has the proper form for `calendar-daylight-savings-starts'." (let* ((date (calendar-gregorian-from-absolute abs-date)) (weekday (% abs-date 7)) (m (extract-calendar-month date)) @@ -215,7 +215,7 @@ ;; See thread ;; http://lists.gnu.org/archive/html/emacs-pretest-bug/2006-11/msg00060.html (defun calendar-dst-find-data (&optional time) - "Find data on the first Daylight Saving Time transitions after TIME. + "Find data on the first daylight saving time transitions after TIME. TIME defaults to `current-time'. Return value is as described for `calendar-current-time-zone'." (let* ((t0 (or time (current-time))) @@ -228,9 +228,9 @@ (let* ((t1 (calendar-next-time-zone-transition t0)) (t2 (and t1 (calendar-next-time-zone-transition t1)))) (if (not t2) - ;; This locale does not have daylight savings time. + ;; This locale does not have daylight saving time. (list (/ t0-utc-diff 60) 0 t0-name t0-name nil nil 0 0) - ;; Use heuristics to find daylight savings parameters. + ;; Use heuristics to find daylight saving parameters. (let* ((t1-zone (current-time-zone t1)) (t1-utc-diff (car t1-zone)) (t1-name (car (cdr t1-zone))) @@ -254,14 +254,14 @@ ))))))))) (defvar calendar-dst-transition-cache nil - "Internal cal-dst variable storing date of Daylight Saving Time transitions. + "Internal cal-dst variable storing date of daylight saving time transitions. Value is a list with elements of the form (YEAR START END), where START and END are expressions that when evaluated return the start and end dates (respectively) for DST in YEAR. Used by the function `calendar-dst-find-startend'.") (defun calendar-dst-find-startend (year) - "Find the dates in YEAR on which Daylight Saving Time starts and ends. + "Find the dates in YEAR on which daylight saving time starts and ends. Returns a list (YEAR START END), where START and END are expressions that when evaluated return the start and end dates, respectively. This function first attempts to use pre-calculated @@ -288,16 +288,16 @@ UTC-DIFF is an integer specifying the number of minutes difference between standard time in the current time zone and Coordinated Universal Time (Greenwich Mean Time). A negative value means west of Greenwich. -DST-OFFSET is an integer giving the daylight savings time offset in minutes. +DST-OFFSET is an integer giving the daylight saving time offset in minutes. STD-ZONE is a string giving the name of the time zone when no seasonal time adjustment is in effect. DST-ZONE is a string giving the name of the time zone when there is a seasonal time adjustment in effect. DST-STARTS and DST-ENDS are sexps in the variable `year' giving the daylight - savings time start and end rules, in the form expected by + saving time start and end rules, in the form expected by `calendar-daylight-savings-starts'. DST-STARTS-TIME and DST-ENDS-TIME are integers giving the number of minutes - after midnight that daylight savings time starts and ends. + after midnight that daylight saving time starts and ends. If the local area does not use a seasonal time adjustment, STD-ZONE and DST-ZONE are equal, and all the DST-* integer variables are 0. @@ -308,7 +308,7 @@ (unless calendar-current-time-zone-cache (setq calendar-current-time-zone-cache (calendar-dst-find-data)))) -;;; The following eight defvars relating to daylight savings time should NOT be +;;; The following eight defvars relating to daylight saving time should NOT be ;;; marked to go into loaddefs.el where they would be evaluated when Emacs is ;;; dumped. These variables' appropriate values depend on the conditions under ;;; which the code is INVOKED; so it's inappropriate to initialize them when @@ -324,9 +324,9 @@ (defvar calendar-daylight-time-offset (or (car (cdr calendar-current-time-zone-cache)) 60) - "*Number of minutes difference between daylight savings and standard time. + "*Number of minutes difference between daylight saving and standard time. -If the locale never uses daylight savings time, set this to 0.") +If the locale never uses daylight saving time, set this to 0.") (defvar calendar-standard-time-zone-name (or (car (nthcdr 2 calendar-current-time-zone-cache)) "EST") @@ -335,12 +335,12 @@ (defvar calendar-daylight-time-zone-name (or (car (nthcdr 3 calendar-current-time-zone-cache)) "EDT") - "*Abbreviated name of daylight-savings time zone at `calendar-location-name'. + "*Abbreviated name of daylight saving time zone at `calendar-location-name'. For example, \"EDT\" in New York City, \"PDT\" for Los Angeles.") (defun calendar-dst-starts (year) - "Return the date of YEAR on which Daylight Saving Time starts. + "Return the date of YEAR on which daylight saving time starts. This function respects the value of `calendar-dst-check-each-year-flag'." (or (let ((expr (if calendar-dst-check-each-year-flag (cadr (calendar-dst-find-startend year)) @@ -351,7 +351,7 @@ (calendar-nth-named-day 2 0 3 year)))) (defun calendar-dst-ends (year) - "Return the date of YEAR on which Daylight Saving Time ends. + "Return the date of YEAR on which daylight saving time ends. This function respects the value of `calendar-dst-check-each-year-flag'." (or (let ((expr (if calendar-dst-check-each-year-flag (nth 2 (calendar-dst-find-startend year)) @@ -366,13 +366,13 @@ (put 'calendar-daylight-savings-starts 'risky-local-variable t) (defvar calendar-daylight-savings-starts '(calendar-dst-starts year) - "*Sexp giving the date on which daylight savings time starts. + "*Sexp giving the date on which daylight saving time starts. This is an expression in the variable `year' whose value gives the Gregorian -date in the form (month day year) on which daylight savings time starts. It is -used to determine the starting date of daylight savings time for the holiday +date in the form (month day year) on which daylight saving time starts. It is +used to determine the starting date of daylight saving time for the holiday list and for correcting times of day in the solar and lunar calculations. -For example, if daylight savings time is mandated to start on October 1, +For example, if daylight saving time is mandated to start on October 1, you would set `calendar-daylight-savings-starts' to '(10 1 year) @@ -381,35 +381,35 @@ '(calendar-nth-named-day 1 0 4 year) -If the locale never uses daylight savings time, set this to nil.") +If the locale never uses daylight saving time, set this to nil.") ;;;###autoload (put 'calendar-daylight-savings-ends 'risky-local-variable t) (defvar calendar-daylight-savings-ends '(calendar-dst-ends year) - "*Sexp giving the date on which daylight savings time ends. + "*Sexp giving the date on which daylight saving time ends. This is an expression in the variable `year' whose value gives the Gregorian -date in the form (month day year) on which daylight savings time ends. It is -used to determine the starting date of daylight savings time for the holiday +date in the form (month day year) on which daylight saving time ends. It is +used to determine the starting date of daylight saving time for the holiday list and for correcting times of day in the solar and lunar calculations. -For example, if daylight savings time ends on the last Sunday in October: +For example, if daylight saving time ends on the last Sunday in October: '(calendar-nth-named-day -1 0 10 year) -If the locale never uses daylight savings time, set this to nil.") +If the locale never uses daylight saving time, set this to nil.") (defvar calendar-daylight-savings-starts-time (or (car (nthcdr 6 calendar-current-time-zone-cache)) 120) - "*Number of minutes after midnight that daylight savings time starts.") + "*Number of minutes after midnight that daylight saving time starts.") (defvar calendar-daylight-savings-ends-time (or (car (nthcdr 7 calendar-current-time-zone-cache)) calendar-daylight-savings-starts-time) - "*Number of minutes after midnight that daylight savings time ends.") + "*Number of minutes after midnight that daylight saving time ends.") (defun dst-in-effect (date) - "True if on absolute DATE daylight savings time is in effect. + "True if on absolute DATE daylight saving time is in effect. Fractional part of DATE is local standard time of day." (let* ((year (extract-calendar-year (calendar-gregorian-from-absolute (floor date)))) @@ -438,10 +438,10 @@ decimal fraction time, and `zone' is a string. Optional parameter STYLE forces the result time to be standard time when its -value is 'standard and daylight savings time (if available) when its value is +value is 'standard and daylight saving time (if available) when its value is 'daylight. -Conversion to daylight savings time is done according to +Conversion to daylight saving time is done according to `calendar-daylight-savings-starts', `calendar-daylight-savings-ends', `calendar-daylight-savings-starts-time', `calendar-daylight-savings-ends-time', and diff -r edf631bdbb7a -r 738ce3540ffb lisp/calendar/calendar.el --- a/lisp/calendar/calendar.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calendar/calendar.el Sun Apr 22 12:12:29 2007 +0000 @@ -57,7 +57,7 @@ ;; appt.el Appointment notification ;; cal-china.el Chinese calendar ;; cal-coptic.el Coptic/Ethiopic calendars -;; cal-dst.el Daylight savings time rules +;; cal-dst.el Daylight saving time rules ;; cal-hebrew.el Hebrew calendar ;; cal-islam.el Islamic calendar ;; cal-bahai.el Baha'i calendar @@ -770,6 +770,8 @@ :type 'hook :group 'diary) +(autoload 'diary-set-maybe-redraw "diary-lib") + ;;;###autoload (defcustom diary-display-hook nil "List of functions that handle the display of the diary. @@ -794,6 +796,8 @@ diary buffer, set the variable `diary-list-include-blanks' to t." :type 'hook :options '(fancy-diary-display) + :initialize 'custom-initialize-default + :set 'diary-set-maybe-redraw :group 'diary) ;;;###autoload @@ -1160,7 +1164,7 @@ (funcall 'holiday-sexp calendar-daylight-savings-starts - '(format "Daylight Savings Time Begins %s" + '(format "Daylight Saving Time Begins %s" (if (fboundp 'atan) (solar-time-string (/ calendar-daylight-savings-starts-time (float 60)) @@ -1169,7 +1173,7 @@ (funcall 'holiday-sexp calendar-daylight-savings-ends - '(format "Daylight Savings Time Ends %s" + '(format "Daylight Saving Time Ends %s" (if (fboundp 'atan) (solar-time-string (/ calendar-daylight-savings-ends-time (float 60)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/calendar/diary-lib.el --- a/lisp/calendar/diary-lib.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calendar/diary-lib.el Sun Apr 22 12:12:29 2007 +0000 @@ -267,10 +267,12 @@ ;; This can be removed once the kill/yank treatment of invisible text ;; (see etc/TODO) is fixed. -- gm (defcustom diary-header-line-flag t - "If non-nil, `diary-simple-display' will show a header line. + "If non-nil, `simple-diary-display' will show a header line. The format of the header is specified by `diary-header-line-format'." :group 'diary :type 'boolean + :initialize 'custom-initialize-default + :set 'diary-set-maybe-redraw :version "22.1") (defvar diary-selective-display nil) @@ -282,7 +284,7 @@ before edit/copy" "Diary")) ?\s (frame-width))) - "Format of the header line displayed by `diary-simple-display'. + "Format of the header line displayed by `simple-diary-display'. Only used if `diary-header-line-flag' is non-nil." :group 'diary :type 'sexp @@ -290,6 +292,27 @@ (defvar diary-saved-point) ; internal +(defun diary-live-p () + "Return non-nil if the diary is being displayed. +This is not the same as just visiting the `diary-file'." + (or (get-buffer fancy-diary-buffer) + (when diary-file + (let ((dbuff (find-buffer-visiting + (substitute-in-file-name diary-file)))) + (when dbuff + (with-current-buffer dbuff + diary-selective-display)))))) + +(defun diary-set-maybe-redraw (symbol value) + "Set SYMBOL's value to VALUE, and redraw the diary if necessary. +Redraws the diary if it is being displayed (note this is not the same as +just visiting the `diary-file'), and SYMBOL's value is to be changed." + (let ((oldvalue (eval symbol))) + (custom-set-default symbol value) + (and (not (equal value oldvalue)) + (diary-live-p) + ;; Note this assumes diary was called without prefix arg. + (diary)))) (defcustom number-of-diary-entries 1 "Specifies how many days of diary entries are to be displayed initially. @@ -300,10 +323,10 @@ day's and the next day's entries will be displayed. The value can also be a vector such as [0 2 2 2 2 4 1]; this value -says to display no diary entries on Sunday, the display the entries -for the current date and the day after on Monday through Thursday, -display Friday through Monday's entries on Friday, and display only -Saturday's entries on Saturday. +says to display no diary entries on Sunday, the entries for +the current date and the day after on Monday through Thursday, +Friday through Monday's entries on Friday, and only Saturday's +entries on Saturday. This variable does not affect the diary display with the `d' command from the calendar; in that case, the prefix argument controls the @@ -317,6 +340,8 @@ (integer :tag "Thursday") (integer :tag "Friday") (integer :tag "Saturday"))) + :initialize 'custom-initialize-default + :set 'diary-set-maybe-redraw :group 'diary) @@ -410,7 +435,10 @@ (or (verify-visited-file-modtime diary-buffer) (revert-buffer t t)))) ;; Setup things like the header-line-format and invisibility-spec. - (when (eq major-mode default-major-mode) (diary-mode)) + ;; This used to only run if the major-mode was default-major-mode, + ;; but that meant eg changes to header-line-format did not + ;; take effect from one diary invocation to the next. + (diary-mode) ;; d-s-p is passed to the diary display function. (let ((diary-saved-point (point))) (save-excursion diff -r edf631bdbb7a -r 738ce3540ffb lisp/calendar/icalendar.el --- a/lisp/calendar/icalendar.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calendar/icalendar.el Sun Apr 22 12:12:29 2007 +0000 @@ -101,7 +101,7 @@ ;;; Code: -(defconst icalendar-version "0.14" +(defconst icalendar-version "0.15" "Version number of icalendar.el.") ;; ====================================================================== @@ -226,16 +226,17 @@ (replace-match "" nil nil))) unfolded-buffer)) -(defsubst icalendar--rris (&rest args) +(defsubst icalendar--rris (regexp rep string &optional fixedcase literal) "Replace regular expression in string. -Pass ARGS to `replace-regexp-in-string' (Emacs) or to -`replace-in-string' (XEmacs)." - (if (fboundp 'replace-regexp-in-string) - ;; Emacs: - (apply 'replace-regexp-in-string args) - ;; XEmacs: - (save-match-data ;; apparently XEmacs needs save-match-data - (apply 'replace-in-string args)))) +Pass arguments REGEXP REP STRING FIXEDCASE LITERAL to +`replace-regexp-in-string' (Emacs) or to `replace-in-string' (XEmacs)." + (cond ((fboundp 'replace-regexp-in-string) + ;; Emacs: + (replace-regexp-in-string regexp rep string fixedcase literal)) + ((fboundp 'replace-in-string) + ;; XEmacs: + (save-match-data ;; apparently XEmacs needs save-match-data + (replace-in-string string regexp rep literal))))) (defun icalendar--read-element (invalue inparams) "Recursively read the next iCalendar element in the current buffer. @@ -1472,8 +1473,8 @@ DIARY-FILE. It will ask for each appointment whether to add it to the diary -when DO-NOT-ASK is non-nil. When called interactively, -DO-NOT-ASK is set to t, so that you are asked fore each event. +unless DO-NOT-ASK is non-nil. When called interactively, +DO-NOT-ASK is nil, so that you are asked for each event. NON-MARKING determines whether diary events are created as non-marking. @@ -1669,8 +1670,11 @@ (concat diary-string " " (icalendar--format-ical-event e))) (if do-not-ask (setq summary nil)) - (icalendar--add-diary-entry diary-string diary-file - non-marking summary)) + ;; add entry to diary and store actual name of diary + ;; file (in case it was nil) + (setq diary-file + (icalendar--add-diary-entry diary-string diary-file + non-marking summary))) ;; event was not ok (setq found-error t) (setq error-string @@ -1684,13 +1688,15 @@ (setq error-string (format "%s\n%s\nCannot handle this event: %s" error-val error-string e)) (message "%s" error-string)))) + ;; insert final newline - (let ((b (find-buffer-visiting diary-file))) - (when b - (save-current-buffer - (set-buffer b) - (goto-char (point-max)) - (insert "\n")))) + (if diary-file + (let ((b (find-buffer-visiting diary-file))) + (when b + (save-current-buffer + (set-buffer b) + (goto-char (point-max)) + (insert "\n"))))) (if found-error (save-current-buffer (set-buffer (get-buffer-create "*icalendar-errors*")) @@ -1943,7 +1949,9 @@ (setq diary-file (read-file-name "Add appointment to this diary file: "))) ;; Note: make-diary-entry will add a trailing blank char.... :( - (make-diary-entry string non-marking diary-file)))) + (make-diary-entry string non-marking diary-file))) + ;; return diary-file in case it has been changed interactively + diary-file) (provide 'icalendar) diff -r edf631bdbb7a -r 738ce3540ffb lisp/calendar/lunar.el --- a/lisp/calendar/lunar.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calendar/lunar.el Sun Apr 22 12:12:29 2007 +0000 @@ -377,7 +377,7 @@ "Astronomical (Julian) day number of first new moon on or after astronomical \(Julian) day number d. The fractional part is the time of day. -The date and time are local time, including any daylight savings rules, +The date and time are local time, including any daylight saving rules, as governed by the values of calendar-daylight-savings-starts, calendar-daylight-savings-starts-time, calendar-daylight-savings-ends, calendar-daylight-savings-ends-time, calendar-daylight-time-offset, and diff -r edf631bdbb7a -r 738ce3540ffb lisp/calendar/solar.el --- a/lisp/calendar/solar.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/calendar/solar.el Sun Apr 22 12:12:29 2007 +0000 @@ -507,7 +507,7 @@ (defun solar-date-next-longitude (d l) "First moment on or after Julian day number D when sun's longitude is a multiple of L degrees at calendar-location-name with that location's -local time (including any daylight savings rules). +local time (including any daylight saving rules). L must be an integer divisor of 360. diff -r edf631bdbb7a -r 738ce3540ffb lisp/comint.el --- a/lisp/comint.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/comint.el Sun Apr 22 12:12:29 2007 +0000 @@ -1347,7 +1347,11 @@ (defun comint-delim-arg (arg) "Return a list of arguments from ARG. Break it up at the delimiters in `comint-delimiter-argument-list'. -Returned list is backwards." +Returned list is backwards. + +Characters with non-nil values of the text property `literal' are +assumed to have literal values (e.g., backslash-escaped +characters), and are not considered to be delimiters." (if (null comint-delimiter-argument-list) (list arg) (let ((args nil) @@ -1356,12 +1360,16 @@ (while (< pos len) (let ((char (aref arg pos)) (start pos)) - (if (memq char comint-delimiter-argument-list) + (if (and (memq char comint-delimiter-argument-list) + ;; Ignore backslash-escaped characters. + (not (get-text-property pos 'literal arg))) (while (and (< pos len) (eq (aref arg pos) char)) (setq pos (1+ pos))) (while (and (< pos len) - (not (memq (aref arg pos) - comint-delimiter-argument-list))) + (not (and (memq (aref arg pos) + comint-delimiter-argument-list) + (not (get-text-property + pos 'literal arg))))) (setq pos (1+ pos)))) (setq args (cons (substring arg start pos) args)))) args))) @@ -1381,24 +1389,32 @@ ;; The third matches '-quoted strings. ;; The fourth matches `-quoted strings. ;; This seems to fit the syntax of BASH 2.0. - (let* ((first (if (if (fboundp 'w32-shell-dos-semantics) - (w32-shell-dos-semantics)) - "[^ \n\t\"'`]+\\|" - "[^ \n\t\"'`\\]+\\|\\\\[\"'`\\ \t]+\\|")) + (let* ((backslash-escape (not (and (fboundp 'w32-shell-dos-semantics) + (w32-shell-dos-semantics)))) + (first (if backslash-escape + "[^ \n\t\"'`\\]\\|\\(\\\\.\\)\\|" + "[^ \n\t\"'`]+\\|")) (argpart (concat first "\\(\"\\([^\"\\]\\|\\\\.\\)*\"\\|\ '[^']*'\\|\ `[^`]*`\\)")) + (quote-subexpr (if backslash-escape 2 1)) (args ()) (pos 0) (count 0) beg str quotes) ;; Build a list of all the args until we have as many as we want. (while (and (or (null mth) (<= count mth)) (string-match argpart string pos)) + ;; Apply the `literal' text property to backslash-escaped + ;; characters, so that `comint-delim-arg' won't break them up. + (and backslash-escape + (match-beginning 1) + (put-text-property (match-beginning 1) (match-end 1) + 'literal t string)) (if (and beg (= pos (match-beginning 0))) ;; It's contiguous, part of the same arg. (setq pos (match-end 0) - quotes (or quotes (match-beginning 1))) + quotes (or quotes (match-beginning quote-subexpr))) ;; It's a new separate arg. (if beg ;; Put the previous arg, if there was one, onto ARGS. @@ -1406,7 +1422,7 @@ args (if quotes (cons str args) (nconc (comint-delim-arg str) args)))) (setq count (length args)) - (setq quotes (match-beginning 1)) + (setq quotes (match-beginning quote-subexpr)) (setq beg (match-beginning 0)) (setq pos (match-end 0)))) (if beg diff -r edf631bdbb7a -r 738ce3540ffb lisp/complete.el --- a/lisp/complete.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/complete.el Sun Apr 22 12:12:29 2007 +0000 @@ -147,6 +147,8 @@ (cond ((not bind) ;; These bindings are the default bindings. It would be better to ;; restore the previous bindings. + (define-key read-expression-map "\e\t" 'lisp-complete-symbol) + (define-key completion-map "\t" 'minibuffer-complete) (define-key completion-map " " 'minibuffer-complete-word) (define-key completion-map "?" 'minibuffer-completion-help) @@ -157,8 +159,10 @@ (define-key must-match-map "\n" 'minibuffer-complete-and-exit) (define-key must-match-map "?" 'minibuffer-completion-help) - (define-key global-map "\e\t" 'complete-symbol)) + (define-key global-map [remap lisp-complete-symbol] nil)) (PC-default-bindings + (define-key read-expression-map "\e\t" 'PC-lisp-complete-symbol) + (define-key completion-map "\t" 'PC-complete) (define-key completion-map " " 'PC-complete-word) (define-key completion-map "?" 'PC-completion-help) @@ -181,7 +185,7 @@ (define-key must-match-map "\e\n" 'PC-complete-and-exit) (define-key must-match-map "\e?" 'PC-completion-help) - (define-key global-map "\e\t" 'PC-lisp-complete-symbol))))) + (define-key global-map [remap lisp-complete-symbol] 'PC-lisp-complete-symbol))))) ;;;###autoload (define-minor-mode partial-completion-mode @@ -383,6 +387,29 @@ (let ((completion-ignore-case nil)) (test-completion str table pred)))) +;; The following function is an attempt to work around two problems: + +;; (1) When complete.el was written, (try-completion "" '(("") (""))) used to +;; return the value "". With a change from 2002-07-07 it returns t which caused +;; `PC-lisp-complete-symbol' to fail with a "Wrong type argument: sequencep, t" +;; error. `PC-try-completion' returns STRING in this case. + +;; (2) (try-completion "" '((""))) returned t before the above-mentioned change. +;; Since `PC-chop-word' operates on the return value of `try-completion' this +;; case might have provoked a similar error as in (1). `PC-try-completion' +;; returns "" instead. I don't know whether this is a real problem though. + +;; Since `PC-try-completion' is not a guaranteed to fix these bugs reliably, you +;; should try to look at the following discussions when you encounter problems: +;; - emacs-pretest-bug ("Partial Completion" starting 2007-02-23), +;; - emacs-devel ("[address-of-OP: Partial completion]" starting 2007-02-24), +;; - emacs-devel ("[address-of-OP: EVAL and mouse selection in *Completions*]" +;; starting 2007-03-05). +(defun PC-try-completion (string alist &optional predicate) + "Like `try-completion' but return STRING instead of t." + (let ((result (try-completion string alist predicate))) + (if (eq result t) string result))) + (defun PC-do-completion (&optional mode beg end) (or beg (setq beg (minibuffer-prompt-end))) (or end (setq end (point-max))) @@ -390,7 +417,10 @@ (pred minibuffer-completion-predicate) (filename (funcall PC-completion-as-file-name-predicate)) (dirname nil) ; non-nil only if a filename is being completed - (dirlength 0) + ;; The following used to be "(dirlength 0)" which caused the erasure of + ;; the entire buffer text before `point' when inserting a completion + ;; into a buffer. + dirlength (str (buffer-substring beg end)) (incname (and filename (string-match "<\\([^\"<>]*\\)>?$" str))) (ambig nil) @@ -404,8 +434,15 @@ ;; Check if buffer contents can already be considered complete (if (and (eq mode 'exit) - (test-completion-ignore-case str table pred)) - 'complete + (test-completion str table pred)) + (progn + ;; If completion-ignore-case is non-nil, insert the + ;; completion string since that may have a different case. + (when completion-ignore-case + (setq str (PC-try-completion str table pred)) + (delete-region beg end) + (insert str)) + 'complete) ;; Do substitutions in directory names (and filename @@ -553,6 +590,9 @@ (setq poss (cons (car p) poss)))) (setq p (cdr p))))) + ;; If table had duplicates, they can be here. + (delete-dups poss) + ;; Handle completion-ignored-extensions (and filename (not (eq mode 'help)) @@ -623,8 +663,8 @@ ;; Check if next few letters are the same in all cases (if (and (not (eq mode 'help)) - (setq prefix (try-completion (PC-chunk-after basestr skip) - poss))) + (setq prefix (PC-try-completion + (PC-chunk-after basestr skip) poss))) (let ((first t) i) ;; Retain capitalization of user input even if ;; completion-ignore-case is set. @@ -662,7 +702,7 @@ (setq skip (concat skip (regexp-quote prefix) PC-ndelims-regex) - prefix (try-completion + prefix (PC-try-completion (PC-chunk-after ;; not basestr, because that does ;; not reflect insertions @@ -996,7 +1036,7 @@ (cond ((not completion-table) nil) ((eq action 'lambda) (test-completion str2 completion-table nil)) - ((eq action nil) (try-completion str2 completion-table nil)) + ((eq action nil) (PC-try-completion str2 completion-table nil)) ((eq action t) (all-completions str2 completion-table nil))))) ad-do-it)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/cus-edit.el --- a/lisp/cus-edit.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/cus-edit.el Sun Apr 22 12:12:29 2007 +0000 @@ -938,9 +938,6 @@ If VARIABLE has a `custom-set' property, that is used for setting VARIABLE, otherwise `set-default' is used. -The `customized-value' property of the VARIABLE will be set to a list -with a quoted VALUE as its sole list member. - If VARIABLE has a `variable-interactive' property, that is used as if it were the arg to `interactive' (which see) to interactively read the value. @@ -971,9 +968,6 @@ If VARIABLE has a `custom-set' property, that is used for setting VARIABLE, otherwise `set-default' is used. -The `customized-value' property of the VARIABLE will be set to a list -with a quoted VALUE as its sole list member. - If VARIABLE has a `variable-interactive' property, that is used as if it were the arg to `interactive' (which see) to interactively read the value. @@ -993,6 +987,8 @@ (comment (put variable 'variable-comment comment) (put variable 'saved-variable-comment comment))) + (put variable 'customized-value nil) + (put variable 'customized-variable-comment nil) (custom-save-all) value) diff -r edf631bdbb7a -r 738ce3540ffb lisp/diff-mode.el --- a/lisp/diff-mode.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/diff-mode.el Sun Apr 22 12:12:29 2007 +0000 @@ -985,7 +985,9 @@ (define-derived-mode diff-mode fundamental-mode "Diff" "Major mode for viewing/editing context diffs. Supports unified and context diffs as well as (to a lesser extent) -normal diffs. +normal diffs. If you edit the buffer manually, diff-mode will try +to update the hunk headers for you on-the-fly. + When the buffer is read-only, the ESC prefix is not necessary. If you edit the buffer manually, diff-mode will try to update the hunk headers for you on-the-fly. @@ -993,7 +995,12 @@ You can also switch between context diff and unified diff with \\[diff-context->unified], or vice versa with \\[diff-unified->context] and you can also reverse the direction of a diff with \\[diff-reverse-direction]. -\\{diff-mode-map}" + +When the buffer is read-only, the Meta- modifier is not necessary +to run the Diff mode commands: + + \\{diff-mode-map}" + (set (make-local-variable 'font-lock-defaults) diff-font-lock-defaults) (set (make-local-variable 'outline-regexp) diff-outline-regexp) (set (make-local-variable 'imenu-generic-expression) @@ -1368,7 +1375,8 @@ (yes-or-no-p (format "Really apply this hunk to %s? " (file-name-nondirectory buffer-file-name))))))) - (error (substitute-command-keys + (error "%s" + (substitute-command-keys (format "Use %s\\[diff-apply-hunk] to apply it to the other file" (if (not reverse) "\\[universal-argument] "))))) ((and switched diff -r edf631bdbb7a -r 738ce3540ffb lisp/emacs-lisp/authors.el --- a/lisp/emacs-lisp/authors.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/emacs-lisp/authors.el Sun Apr 22 12:12:29 2007 +0000 @@ -70,6 +70,7 @@ ("Francesco Potort,Al(B" "Francesco Potorti" "Francesco Potorti`") ("Frederic Pierresteguy" "Fred Pierresteguy") ("Geoff Voelker" "voelker") + ("Gerd M,Av(Bllmann" "Gerd Moellmann") ("Hallvard B. Furuseth" "Hallvard B Furuseth") ("Hrvoje Nik,B9(Bi,Bf(B" "Hrvoje Niksic") (nil "(afs@hplb.hpl.hp.com)") @@ -102,6 +103,7 @@ ("Kyle Jones" "Kyle E. Jones") ("Marcus G. Daniels" "Marcus Daniels") ("Mark D. Baushke" "Mark D Baushke") + ("Agust,Am(Bn Mart,Am(Bn" "Agustin Martin") ("Martin Lorentzon" "Martin Lorentzson") ("Matt Swift" "Matthew Swift") ("Michael R. Mauger" "Michael Mauger") diff -r edf631bdbb7a -r 738ce3540ffb lisp/emacs-lisp/bytecomp.el --- a/lisp/emacs-lisp/bytecomp.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/emacs-lisp/bytecomp.el Sun Apr 22 12:12:29 2007 +0000 @@ -972,8 +972,10 @@ (pos (if (and byte-compile-current-file (integerp byte-compile-read-position)) (with-current-buffer byte-compile-current-buffer - (format "%d:%d:" (count-lines (point-min) - byte-compile-last-position) + (format "%d:%d:" + (save-excursion + (goto-char byte-compile-last-position) + (1+ (count-lines (point-min) (point-at-bol)))) (save-excursion (goto-char byte-compile-last-position) (1+ (current-column))))) diff -r edf631bdbb7a -r 738ce3540ffb lisp/emacs-lisp/edebug.el --- a/lisp/emacs-lisp/edebug.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/emacs-lisp/edebug.el Sun Apr 22 12:12:29 2007 +0000 @@ -2939,6 +2939,7 @@ (edebug-overlay-arrow)) (setq buffer-read-only edebug-buffer-read-only) (use-local-map edebug-outside-map) + (remove-hook 'kill-buffer-hook 'edebug-kill-buffer t) ) ;; gotta have a buffer to let its buffer local variables be set (get-buffer-create " bogus edebug buffer")) @@ -3942,8 +3943,18 @@ edebug-unwrap-results edebug-global-break-condition " + ;; If the user kills the buffer in which edebug is currently active, + ;; exit to top level, because the edebug command loop can't usefully + ;; continue running in such a case. + (add-hook 'kill-buffer-hook 'edebug-kill-buffer nil t) (use-local-map edebug-mode-map)) +(defun edebug-kill-buffer () + "Used on `kill-buffer-hook' when Edebug is operating in a buffer of Lisp code." + (let (kill-buffer-hook) + (kill-buffer (current-buffer))) + (top-level)) + ;;; edebug eval list mode ;; A list of expressions and their evaluations is displayed in *edebug*. diff -r edf631bdbb7a -r 738ce3540ffb lisp/emacs-lisp/lisp-mode.el --- a/lisp/emacs-lisp/lisp-mode.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/emacs-lisp/lisp-mode.el Sun Apr 22 12:12:29 2007 +0000 @@ -909,34 +909,47 @@ (cond ((elt state 3) ;; Inside a string, don't change indentation. nil) - ((save-excursion - ;; test whether current line begins with a constant - (goto-char indent-point) - (skip-chars-forward " \t") - (looking-at ":")) - (let ((desired-indent - (save-excursion - (goto-char (1+ containing-sexp)) - (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) - (point))) - (parse-sexp-ignore-comments t)) - ;; Align a constant symbol under the last constant symbol - (goto-char calculate-lisp-indent-last-sexp) - (while (> (point) desired-indent) - (if (looking-at ":") - (setq desired-indent (point)) - (backward-sexp 1)))) - (current-column)) ((and (integerp lisp-indent-offset) containing-sexp) ;; Indent by constant offset (goto-char containing-sexp) (+ (current-column) lisp-indent-offset)) + ;; in this case calculate-lisp-indent-last-sexp is not nil + (calculate-lisp-indent-last-sexp + (or + ;; try to align the parameters of a known function + (and lisp-indent-function + (not retry) + (funcall lisp-indent-function indent-point state)) + ;; If the function has no special alignment + ;; or it does not apply to this argument, + ;; try to align a constant-symbol under the last + ;; preceding constant symbol, if there is such one of + ;; the last 2 preceding symbols, in the previous + ;; uncommented line. + (and (save-excursion + (goto-char indent-point) + (skip-chars-forward " \t") + (looking-at ":")) + (> calculate-lisp-indent-last-sexp + (save-excursion + (goto-char (1+ containing-sexp)) + (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) + (point))) + (let ((parse-sexp-ignore-comments t) + indent) + (goto-char calculate-lisp-indent-last-sexp) + (or (and (looking-at ":") + (setq indent (current-column))) + (and (< (save-excursion (beginning-of-line) (point)) + (prog2 (backward-sexp) (point))) + (looking-at ":") + (setq indent (current-column)))) + indent)) + ;; another symbols or constants not preceded by a constant + ;; as defined above. + normal-indent)) + ;; in this case calculate-lisp-indent-last-sexp is nil (desired-indent) - ((and (boundp 'lisp-indent-function) - lisp-indent-function - (not retry)) - (or (funcall lisp-indent-function indent-point state) - normal-indent)) (t normal-indent)))))) diff -r edf631bdbb7a -r 738ce3540ffb lisp/emacs-lisp/re-builder.el --- a/lisp/emacs-lisp/re-builder.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/emacs-lisp/re-builder.el Sun Apr 22 12:12:29 2007 +0000 @@ -130,14 +130,13 @@ (defcustom reb-re-syntax 'read "*Syntax for the REs in the RE Builder. -Can either be `read', `string', `sregex' or `lisp-re'." +Can either be `read', `string', `sregex', `lisp-re', `rx'." :group 're-builder :type '(choice (const :tag "Read syntax" read) (const :tag "String syntax" string) (const :tag "`sregex' syntax" sregex) (const :tag "`lisp-re' syntax" lisp-re) - (const :tag "`rx' syntax" rx) - (value: string))) + (const :tag "`rx' syntax" rx))) (defcustom reb-auto-match-limit 200 "*Positive integer limiting the matches for RE Builder auto updates. @@ -640,11 +639,13 @@ (set-buffer reb-target-buffer) (reb-delete-overlays) (goto-char (point-min)) - (while (and (re-search-forward re (point-max) t) + (while (and (not (eobp)) + (re-search-forward re (point-max) t) (or (not reb-auto-match-limit) (< matches reb-auto-match-limit))) (if (= 0 (length (match-string 0))) - (error "Empty regular expression!")) + (unless (eobp) + (forward-char 1))) (let ((i 0) suffix max-suffix) (setq matches (1+ matches)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/eshell/esh-mode.el --- a/lisp/eshell/esh-mode.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/eshell/esh-mode.el Sun Apr 22 12:12:29 2007 +0000 @@ -1078,6 +1078,15 @@ (custom-add-option 'eshell-output-filter-functions 'eshell-handle-control-codes) +(defun eshell-handle-ansi-color () + "Handle ANSI color codes." + (require 'ansi-color) + (ansi-color-apply-on-region eshell-last-output-start + eshell-last-output-end)) + +(custom-add-option 'eshell-output-filter-functions + 'eshell-handle-ansi-color) + ;;; Code: ;;; arch-tag: ec65bc2b-da14-4547-81d3-a32af3a4dc57 diff -r edf631bdbb7a -r 738ce3540ffb lisp/faces.el --- a/lisp/faces.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/faces.el Sun Apr 22 12:12:29 2007 +0000 @@ -1805,7 +1805,11 @@ (face-spec-set face (face-user-default-spec face) frame) (internal-merge-in-global-face face frame) (if (memq (window-system frame) '(x w32 mac)) - (make-face-x-resource-internal face frame))) + (make-face-x-resource-internal face frame)) + ;; If the user has customized the face, don't let X + ;; resources override the customizations. + (if (get face 'theme-face) + (custom-theme-recalc-face face))) (error nil))) ;; Apply the attributes specified by frame parameters. This ;; rewrites parameters changed by make-face-x-resource-internal @@ -2195,18 +2199,12 @@ :version "22.1" :group 'basic-faces) -(defface momentary - '((t (:inherit mode-line))) - "Face for momentarily displaying text in the current buffer." - :version "22.1" - :group 'basic-faces) - (defface minibuffer-prompt '((((background dark)) :foreground "cyan") ;; Don't use blue because many users of the MS-DOS port customize ;; their foreground color to be blue. (((type pc)) :foreground "magenta") - (t :foreground "dark blue")) + (t :foreground "medium blue")) "Face for minibuffer prompts. By default, Emacs automatically adds this face to the value of `minibuffer-prompt-properties', which is a list of text properties diff -r edf631bdbb7a -r 738ce3540ffb lisp/files.el --- a/lisp/files.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/files.el Sun Apr 22 12:12:29 2007 +0000 @@ -1474,11 +1474,12 @@ (error "Aborted")) (if buf ;; We are using an existing buffer. - (progn + (let (nonexistent) (or nowarn (verify-visited-file-modtime buf) (cond ((not (file-exists-p filename)) - (error "File %s no longer exists!" filename)) + (setq nonexistent t) + (message "File %s no longer exists!" filename)) ;; Certain files should be reverted automatically ;; if they have changed on disk and not in the buffer. ((and (not (buffer-modified-p buf)) @@ -1515,7 +1516,8 @@ ;; writable and vice versa, but if the buffer agrees ;; with the new state of the file, that is ok too. (let ((read-only (not (file-writable-p buffer-file-name)))) - (unless (or (eq read-only buffer-file-read-only) + (unless (or nonexistent + (eq read-only buffer-file-read-only) (eq read-only buffer-read-only)) (when (or nowarn (let ((question @@ -1528,6 +1530,7 @@ (when (and (not (eq (not (null rawfile)) (not (null find-file-literally)))) + (not nonexistent) ;; It is confusing to ask whether to visit ;; non-literally if they have the file in ;; hexl-mode. @@ -1697,16 +1700,6 @@ (if (file-directory-p filename) (signal 'file-error (list "Opening input file" "file is a directory" filename))) - ;; Check whether the file is uncommonly large (see find-file-noselect): - (let (size) - (when (and large-file-warning-threshold - (setq size (nth 7 (file-attributes filename))) - (> size large-file-warning-threshold) - (not (y-or-n-p - (format "File %s is large (%dMB), really insert? " - (file-name-nondirectory filename) - (/ size 1048576))))) - (error "Aborted"))) (let* ((buffer (find-buffer-visiting (abbreviate-file-name (file-truename filename)) #'buffer-modified-p)) (tem (funcall insert-func filename))) @@ -2144,7 +2137,7 @@ (comment-re (concat "\\(?:!--" incomment-re "*-->[ \t\n]*<\\)"))) (concat "[ \t\n]*<" comment-re "*!DOCTYPE ")) . sgml-mode) - ("%![^V]" . ps-mode) + ("%!PS" . ps-mode) ("# xmcd " . conf-unix-mode)) "Alist of buffer beginnings vs. corresponding major mode functions. Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION). @@ -2443,6 +2436,7 @@ (mapc (lambda (pair) (put (car pair) 'safe-local-variable (cdr pair))) '((buffer-read-only . booleanp) ;; C source code + (default-directory . stringp) ;; C source code (fill-column . integerp) ;; C source code (indent-tabs-mode . booleanp) ;; C source code (left-margin . integerp) ;; C source code @@ -3602,10 +3596,21 @@ (let ((filename (expand-file-name (read-file-name "File to save in: ") nil))) - (and (file-exists-p filename) - (or (y-or-n-p (format "File `%s' exists; overwrite? " - filename)) - (error "Canceled"))) + (if (file-exists-p filename) + (if (file-directory-p filename) + ;; Signal an error if the user specified the name of an + ;; existing directory. + (error "%s is a directory" filename) + (unless (y-or-n-p (format "File `%s' exists; overwrite? " + filename)) + (error "Canceled"))) + ;; Signal an error if the specified name refers to a + ;; non-existing directory. + (let ((dir (file-name-directory filename))) + (unless (file-directory-p dir) + (if (file-exists-p dir) + (error "%s is not a directory" dir) + (error "%s: no such directory" dir))))) (set-visited-file-name filename))) (or (verify-visited-file-modtime (current-buffer)) (not (file-exists-p buffer-file-name)) @@ -3679,7 +3684,7 @@ (if (not (file-directory-p dir)) (if (file-exists-p dir) (error "%s is not a directory" dir) - (error "%s: no such directory" buffer-file-name)) + (error "%s: no such directory" dir)) (if (not (file-exists-p buffer-file-name)) (error "Directory %s write-protected" dir) (if (yes-or-no-p diff -r edf631bdbb7a -r 738ce3540ffb lisp/font-lock.el --- a/lisp/font-lock.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/font-lock.el Sun Apr 22 12:12:29 2007 +0000 @@ -2190,7 +2190,7 @@ "\\(advice\\|alias\\|generic\\|macro\\*?\\|method\\|" "setf\\|subst\\*?\\|un\\*?\\|" "ine-\\(condition\\|" - "\\(?:derived\\|\\(?:global-\\)?minor\\|generic\\)-mode\\|" + "\\(?:derived\\|\\(?:global\\(?:ized\\)?-\\)?minor\\|generic\\)-mode\\|" "method-combination\\|setf-expander\\|skeleton\\|widget\\|" "function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|" ;; Variable declarations. diff -r edf631bdbb7a -r 738ce3540ffb lisp/gnus/ChangeLog --- a/lisp/gnus/ChangeLog Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/gnus/ChangeLog Sun Apr 22 12:12:29 2007 +0000 @@ -906,7 +906,7 @@ (spam-mark-junk-as-spam-routine): Use it. Allow to disable assigning the spam-mark to new messages. -2006-03-20 Adam Sj,Ax(Bgren (tiny change) +2006-03-20 Adam Sj,Ax(Bgren (spam-ham-copy-or-move-routine): Don't declare `todo' twice. @@ -1590,7 +1590,7 @@ * nnmail.el (nnmail-fancy-expiry-target): Protect against invalid date header. -2005-11-16 Boris Samorodov (tiny patch) +2005-11-16 Boris Samorodov (tiny change) * imap.el (imap-kerberos4-open): Ignore SSL stuff. @@ -2192,7 +2192,7 @@ (gnus-decode-header-function, gnus-newsgroup-name): * spam-stat.el (gnus-original-article-buffer): Add defvars. -2005-08-22 Karl Chen (tiny change) +2005-08-22 Karl Chen * gnus-art.el (gnus-treatment-function-alist): Move date-lapsed to the end of the date treatments. diff -r edf631bdbb7a -r 738ce3540ffb lisp/gnus/ChangeLog.2 --- a/lisp/gnus/ChangeLog.2 Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/gnus/ChangeLog.2 Sun Apr 22 12:12:29 2007 +0000 @@ -76,10 +76,10 @@ * smime.el (smime-crl-check): Doc fix. -2004-01-02 Edwin Steiner +2004-01-02 Edwin Steiner (tiny change) * gnus-nocem.el (gnus-nocem-enter-article): Use the real group - hashtb (tiny patch). + hashtb. 2004-01-02 Michael Albinus @@ -463,12 +463,15 @@ * mml-smime.el (mml-smime-sign): Replace CRLF with LF in OpenSSL output. Reported by Arne J,Ax(Brgensen . -2003-12-07 Simon Josefsson +2003-12-07 Lloyd Zusman (tiny change) * pgg-gpg.el (pgg-gpg-recipient-arg): Add. - (pgg-gpg-encrypt-region): Use it. Tiny patch from Lloyd Zusman - . - (pgg-gpg-recipient-argument): Doc fix. Renamed fro p-g-r-a. + (pgg-gpg-encrypt-region): Use it. + +2003-12-07 Simon Josefsson + + * pgg-gpg.el (pgg-gpg-recipient-argument): Doc fix. + Renamed from p-g-r-a. (pgg-gpg-encrypt-region): Update. 2003-12-07 Jesper Harder @@ -907,10 +910,10 @@ * spam.el (spam-spamoracle): doc change, suggested by Jean-Marc Lasgouttes -2003-11-04 Katsumi Yamaoka +2003-11-04 Norbert Koch (tiny change) * gnus-score.el (gnus-decay-score): Protect against arithmetic - errors. Tiny patch from Norbert Koch . + errors. 2003-10-31 Teodor Zlatanov @@ -927,12 +930,14 @@ (spam-spamoracle-learn-ham, spam-spamoracle-learn-spam): change spam-log-processing-to-registry invocations appropriately -2003-10-31 Simon Josefsson +2003-10-31 Derek Atkins (tiny change) * imap.el (imap-kerberos4-open): Ignore output from ATHENA imtest. - Tiny patch from Derek Atkins . - (imap-process-connection-type): Improve docstring. Suggested by - Derek Atkins . + +2003-10-31 Simon Josefsson + + * imap.el (imap-process-connection-type): Improve docstring. + Suggested by Derek Atkins . 2003-10-31 Teodor Zlatanov @@ -964,11 +969,14 @@ * message.el (message-forward-make-body-plain): Fix ARG=1 mode after separating m-f-m-b. -2003-10-29 Simon Josefsson +2003-10-29 Andre Srinivasan (tiny change) * message.el (message-forward-make-body-plain): Remove ignored - headers. Tiny patch from Andre Srinivasan . - (message-forward-make-body-plain): Fix ARG=1. + headers. + +2003-10-29 Simon Josefsson + + * message.el (message-forward-make-body-plain): Fix ARG=1. 2003-10-28 Jesper Harder @@ -1582,7 +1590,7 @@ (mml-insert-mime-headers): Use it. Based on (tiny) patch from Lars Balker Rasmussen . -2003-08-30 Gaute Strokkenes (tiny change) +2003-08-30 Gaute B Strokkenes (tiny change) * mail-source.el (mail-source-fetch-imap): Pass correct buffer to imap-open, reverts 2003-03-17 change. Reverse remove before @@ -1656,13 +1664,12 @@ * gnus-art.el (gnus-article-edit-done, gnus-article-edit-exit): Redisplay article after editing. -2003-08-20 Simon Josefsson +2003-08-20 Jari Aalto * gnus.el (gnus-read-group): Added check to ask confirmation if Group name contains invalid character. You can use '/' in IMAP, but not in filenames. G m cannot know what the user is creating, so let user decide. See thread m2oeysiev3.fsf@naima.lensflare.org. - Tiny patch from letters@hotpop.com (Jari Aalto+mail.linux). 2003-08-13 Reiner Steib @@ -1715,7 +1722,7 @@ * gnus.el (gnus-refer-article-method): Ditto. * message.el (message-courtesy-message): Ditto. -2003-08-06 Chunyu Wang (tiny patch) +2003-08-06 Chunyu Wang (tiny change) * gnus-art.el (gnus-header-face-alist): Fix "Newsgroups" entry. @@ -1754,11 +1761,10 @@ * gnus-registry.el (gnus-registry-install): add an initial registry read to the loading when gnus-registry-install is set -2003-07-26 Kai Gro,A_(Bjohann +2003-07-26 Mark Thomas (tiny change) * flow-fill.el (fill-flowed): Empty lines separate paragraphs - even if the preceding line ends with a soft break. Tiny patch - from Mark Thomas . + even if the preceding line ends with a soft break. 2003-07-25 Teodor Zlatanov @@ -1843,7 +1849,7 @@ * imap.el (imap-arrival-filter): Fix test for missing process buffer. -2003-07-09 Gaute B Strokkenes (tiny patch). +2003-07-09 Gaute B Strokkenes (tiny change) * imap.el (imap-wait-for-tag): Clarify comment. Use timeout zero for second, after-process-has-died, accept-process-output. @@ -1899,7 +1905,7 @@ (message-canlock-generate) (message-generate-new-buffer-clone-locals): Docstring fixes. -2003-07-07 Gaute B Strokkenes (tiny patch) +2003-07-07 Gaute B Strokkenes (tiny change) * imap.el (imap-wait-for-tag): After the process has died, look for more output still pending. @@ -2421,11 +2427,10 @@ (rfc2047-syntax-table): Fix building table to work in Emacs 22. (rfc2047-unfold-region): Delete unused var `leading'. -2003-05-12 Simon Josefsson +2003-05-12 Ville Skytt,Ad(B (tiny change) * pgg.el (pgg-temp-buffer-show-function): Reuse existing visible - output window if one is available. Tiny patch from Ville Skytt,Ad(B - . + output window if one is available. 2003-05-11 Lars Magne Ingebrigtsen @@ -4750,7 +4755,7 @@ * gnus-start.el (gnus-get-unread-articles-in-group): Make sure the entry for the group exists before we alter it. -2003-02-22 David S Goldberg (tiny change) +2003-02-22 David S. Goldberg (tiny change) * message.el (message-mode): MML tags separate paragraphs. @@ -5037,7 +5042,7 @@ code that only worked under Emacs. 2003-02-08 Satyaki Das - + * pgg-gpg.el (pgg-gpg-process-region): Don't blink. 2003-02-08 Jesper Harder @@ -5372,11 +5377,10 @@ * gnus.el: Oort Gnus v0.14 is released. -2003-01-24 Kai Gro,A_(Bjohann +2003-01-24 Mark Thomas (tiny change) * gnus-sum.el (gnus-summary-prepare-threads): Reset state for %B - before beginning. Tiny patch from Mark Thomas - . + before beginning. 2003-01-24 Teodor Zlatanov @@ -13122,7 +13126,7 @@ * nnfolder.el (nnfolder-marks-changed-p): Ditto. -2001-10-20 David Z Maze +2001-10-20 David Z. Maze * nnml.el (nnml-marks-changed-p): Use `equal' when comparing conses. diff -r edf631bdbb7a -r 738ce3540ffb lisp/icomplete.el --- a/lisp/icomplete.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/icomplete.el Sun Apr 22 12:12:29 2007 +0000 @@ -219,7 +219,8 @@ (when (and icomplete-mode icomplete-eoinput) (unless (>= icomplete-eoinput (point-max)) - (let ((buffer-undo-list t)) ; prevent entry + (let ((buffer-undo-list t) ; prevent entry + deactivate-mark) (delete-region icomplete-eoinput (point-max)))) ;; Reestablish the safe value. @@ -256,7 +257,8 @@ minibuffer-completion-table minibuffer-completion-predicate (not minibuffer-completion-confirm))))) - (buffer-undo-list t)) + (buffer-undo-list t) + deactivate-mark) ;; Do nothing if while-no-input was aborted. (if (consp text) (insert (car text)))))))) diff -r edf631bdbb7a -r 738ce3540ffb lisp/ido.el --- a/lisp/ido.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ido.el Sun Apr 22 12:12:29 2007 +0000 @@ -1575,6 +1575,7 @@ (define-key map [(meta down)] 'ido-next-work-directory) (define-key map [backspace] 'ido-delete-backward-updir) (define-key map "\d" 'ido-delete-backward-updir) + (define-key map [remap delete-backward-char] 'ido-delete-backward-updir) ; BS (define-key map [remap backward-kill-word] 'ido-delete-backward-word-updir) ; M-DEL (define-key map [(control backspace)] 'ido-up-directory) diff -r edf631bdbb7a -r 738ce3540ffb lisp/international/characters.el --- a/lisp/international/characters.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/international/characters.el Sun Apr 22 12:12:29 2007 +0000 @@ -913,10 +913,14 @@ (let ((tbl (standard-case-table)) c) - ;; Latin Extended-A, Latin Extended-B + ;; Latin Extended-A, Latin Extended-B, IPA (setq c #x0100) - (while (<= c #x0233) + (while (<= c #x02AF) (modify-category-entry (decode-char 'ucs c) ?l) + (setq c (1+ c))) + + (setq c #x0100) + (while (<= c #x0177) (and (or (<= c #x012e) (and (>= c #x014a) (<= c #x0177))) (zerop (% c 2)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/international/isearch-x.el --- a/lisp/international/isearch-x.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/international/isearch-x.el Sun Apr 22 12:12:29 2007 +0000 @@ -103,6 +103,15 @@ (prompt (isearch-message-prefix)) (minibuffer-local-map isearch-minibuffer-local-map) str junk-hist) + + ;; PROMPT contains text-properties from + ;; `minibuffer-prompt-properties', and some of these can screw up + ;; its use in `read-string' below (specifically, a read-only + ;; property will cause it to signal an error), so strip them here; + ;; read-string will add the same properties itself anyway. + ;; + (set-text-properties 0 (length prompt) nil prompt) + (if isearch-input-method-function (let (;; Let input method work rather tersely. (input-method-verbose-flag nil)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/international/mule.el --- a/lisp/international/mule.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/international/mule.el Sun Apr 22 12:12:29 2007 +0000 @@ -1742,7 +1742,7 @@ ;; is just "\r" and we can't use "^" nor "$" in regexp. (when (and tail-found (or (not coding-system) (not char-trans))) (goto-char tail-start) - (re-search-forward "[\r\n]\^L" nil t) + (re-search-forward "[\r\n]\^L" tail-end t) (if (re-search-forward "[\r\n]\\([^[\r\n]*\\)[ \t]*Local Variables:[ \t]*\\([^\r\n]*\\)[\r\n]" tail-end t) diff -r edf631bdbb7a -r 738ce3540ffb lisp/international/quail.el --- a/lisp/international/quail.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/international/quail.el Sun Apr 22 12:12:29 2007 +0000 @@ -1937,6 +1937,7 @@ (let ((default-enable-multibyte-characters enable-multibyte-characters)) (setq quail-completion-buf (get-buffer-create "*Quail Completions*"))) (with-current-buffer quail-completion-buf + (setq buffer-read-only t) (setq quail-overlay (make-overlay 1 1)) (overlay-put quail-overlay 'face 'highlight)))) @@ -2162,9 +2163,11 @@ (minibuffer-scroll-window nil)) (scroll-other-window))) (setq quail-current-key key) - (erase-buffer) - (insert "Possible completion and corresponding characters are:\n") - (quail-completion-1 key map 1) + (let ((inhibit-read-only t)) + (erase-buffer) + (insert "Possible completion and corresponding characters are:\n") + (quail-completion-1 key map 1) + (set-buffer-modified-p nil)) (goto-char (point-min)) (display-buffer (current-buffer)) (setq require-update t))) diff -r edf631bdbb7a -r 738ce3540ffb lisp/isearch.el --- a/lisp/isearch.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/isearch.el Sun Apr 22 12:12:29 2007 +0000 @@ -1957,9 +1957,8 @@ (concat " [" current-input-method-title "]: ") ": ") ))) - (apply 'propertize - (concat (upcase (substring m 0 1)) (substring m 1)) - minibuffer-prompt-properties))) + (propertize (concat (upcase (substring m 0 1)) (substring m 1)) + 'face 'minibuffer-prompt))) (defun isearch-message-suffix (&optional c-q-hack ellipsis) (concat (if c-q-hack "^Q" "") diff -r edf631bdbb7a -r 738ce3540ffb lisp/isearchb.el --- a/lisp/isearchb.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/isearchb.el Sun Apr 22 12:12:29 2007 +0000 @@ -165,7 +165,7 @@ (define-key global-map (vector (list modifier i)) 'isearchb)))) (defun isearchb-follow-char () - "Function added to post-command-hook to handle the isearchb \"mode\"." + "Function added to `post-command-hook' to handle the isearchb \"mode\"." (let (keys) (if (not (and (memq last-command '(isearchb isearchb-activate)) (setq keys (this-command-keys)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/jit-lock.el --- a/lisp/jit-lock.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/jit-lock.el Sun Apr 22 12:12:29 2007 +0000 @@ -74,14 +74,14 @@ :group 'jit-lock) -(defcustom jit-lock-stealth-time 16 +(defcustom jit-lock-stealth-time nil "*Time in seconds to wait before beginning stealth fontification. Stealth fontification occurs if there is no input within this time. If nil, stealth fontification is never performed. The value of this variable is used when JIT Lock mode is turned on." :type '(choice (const :tag "never" nil) - (number :tag "seconds")) + (number :tag "seconds" :value 16)) :group 'jit-lock) diff -r edf631bdbb7a -r 738ce3540ffb lisp/ldefs-boot.el --- a/lisp/ldefs-boot.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ldefs-boot.el Sun Apr 22 12:12:29 2007 +0000 @@ -63,7 +63,7 @@ ;;;*** -;;;### (autoloads nil "abbrev" "abbrev.el" (17888 32278)) +;;;### (autoloads nil "abbrev" "abbrev.el" (17963 19063)) ;;; Generated autoloads from abbrev.el (put 'abbrev-mode 'safe-local-variable 'booleanp) @@ -830,7 +830,7 @@ ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (17888 36583)) +;;;;;; "net/ange-ftp.el" (17963 19063)) ;;; Generated autoloads from net/ange-ftp.el (defalias (quote ange-ftp-re-read-dir) (quote ange-ftp-reread-dir)) @@ -1611,7 +1611,7 @@ ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) -;;;;;; "autorevert" "autorevert.el" (17888 32278)) +;;;;;; "autorevert" "autorevert.el" (17963 19298)) ;;; Generated autoloads from autorevert.el (autoload (quote auto-revert-mode) "autorevert" "\ @@ -2687,7 +2687,7 @@ ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-warnings-safe-p) "bytecomp" -;;;;;; "emacs-lisp/bytecomp.el" (17888 36933)) +;;;;;; "emacs-lisp/bytecomp.el" (17963 19282)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2793,7 +2793,7 @@ ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17888 32279)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17963 19298)) ;;; Generated autoloads from calendar/cal-dst.el (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t) @@ -2818,7 +2818,7 @@ ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle ;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc ;;;;;; full-calc calc calc-dispatch calc-settings-file) "calc" "calc/calc.el" -;;;;;; (17888 32278)) +;;;;;; (17963 19309)) ;;; Generated autoloads from calc/calc.el (defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\ @@ -2925,7 +2925,7 @@ ;;;;;; mark-holidays-in-calendar view-calendar-holidays-initially ;;;;;; calendar-remove-frame-by-deleting mark-diary-entries-in-calendar ;;;;;; view-diary-entries-initially calendar-offset) "calendar" -;;;;;; "calendar/calendar.el" (17888 32279)) +;;;;;; "calendar/calendar.el" (17963 20580)) ;;; Generated autoloads from calendar/calendar.el (defvar calendar-offset 0 "\ @@ -3322,7 +3322,7 @@ if that day is a holiday; if you want such days to be shown in the fancy diary buffer, set the variable `diary-list-include-blanks' to t.") -(custom-autoload (quote diary-display-hook) "calendar" t) +(custom-autoload (quote diary-display-hook) "calendar" nil) (defvar nongregorian-diary-listing-hook nil "\ List of functions called for listing diary file and included files. @@ -3457,7 +3457,7 @@ (put (quote solar-holidays) (quote risky-local-variable) t) -(defvar solar-holidays (quote ((if (fboundp (quote atan)) (solar-equinoxes-solstices)) (if (progn (require (quote cal-dst)) t) (funcall (quote holiday-sexp) calendar-daylight-savings-starts (quote (format "Daylight Savings Time Begins %s" (if (fboundp (quote atan)) (solar-time-string (/ calendar-daylight-savings-starts-time (float 60)) calendar-standard-time-zone-name) ""))))) (funcall (quote holiday-sexp) calendar-daylight-savings-ends (quote (format "Daylight Savings Time Ends %s" (if (fboundp (quote atan)) (solar-time-string (/ calendar-daylight-savings-ends-time (float 60)) calendar-daylight-time-zone-name) "")))))) "\ +(defvar solar-holidays (quote ((if (fboundp (quote atan)) (solar-equinoxes-solstices)) (if (progn (require (quote cal-dst)) t) (funcall (quote holiday-sexp) calendar-daylight-savings-starts (quote (format "Daylight Saving Time Begins %s" (if (fboundp (quote atan)) (solar-time-string (/ calendar-daylight-savings-starts-time (float 60)) calendar-standard-time-zone-name) ""))))) (funcall (quote holiday-sexp) calendar-daylight-savings-ends (quote (format "Daylight Saving Time Ends %s" (if (fboundp (quote atan)) (solar-time-string (/ calendar-daylight-savings-ends-time (float 60)) calendar-daylight-time-zone-name) "")))))) "\ Sun-related holidays. See the documentation for `calendar-holidays' for details.") @@ -3523,7 +3523,7 @@ ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (17888 36644)) +;;;;;; (17963 19063)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload (quote c-guess-basic-syntax) "cc-engine" "\ @@ -3535,7 +3535,7 @@ ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode ;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (17888 32281)) +;;;;;; (17963 19063)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload (quote c-initialize-cc-mode) "cc-mode" "\ @@ -4483,7 +4483,7 @@ ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (17888 37037)) +;;;;;; (17963 19298)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\ @@ -4611,7 +4611,7 @@ ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-mode-hook) -;;;;;; "compile" "progmodes/compile.el" (17888 32281)) +;;;;;; "compile" "progmodes/compile.el" (17963 19298)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4773,7 +4773,7 @@ ;;;*** ;;;### (autoloads (partial-completion-mode) "complete" "complete.el" -;;;;;; (17888 32279)) +;;;;;; (17963 19063)) ;;; Generated autoloads from complete.el (defvar partial-completion-mode nil "\ @@ -5275,7 +5275,7 @@ ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (17888 32281)) +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (17963 19041)) ;;; Generated autoloads from progmodes/cperl-mode.el (autoload (quote cperl-mode) "cperl-mode" "\ @@ -5613,7 +5613,7 @@ ;;;;;; customize-mode customize customize-save-variable customize-set-variable ;;;;;; customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically ;;;;;; custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el" -;;;;;; (17888 37037)) +;;;;;; (17963 19047)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5652,9 +5652,6 @@ If VARIABLE has a `custom-set' property, that is used for setting VARIABLE, otherwise `set-default' is used. -The `customized-value' property of the VARIABLE will be set to a list -with a quoted VALUE as its sole list member. - If VARIABLE has a `variable-interactive' property, that is used as if it were the arg to `interactive' (which see) to interactively read the value. @@ -5672,9 +5669,6 @@ If VARIABLE has a `custom-set' property, that is used for setting VARIABLE, otherwise `set-default' is used. -The `customized-value' property of the VARIABLE will be set to a list -with a quoted VALUE as its sole list member. - If VARIABLE has a `variable-interactive' property, that is used as if it were the arg to `interactive' (which see) to interactively read the value. @@ -6757,7 +6751,7 @@ ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (17888 32279)) +;;;;;; "calendar/diary-lib.el" (17963 20580)) ;;; Generated autoloads from calendar/diary-lib.el (autoload (quote diary) "diary-lib" "\ @@ -6837,13 +6831,15 @@ ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el" -;;;;;; (17888 36650)) +;;;;;; (17963 19282)) ;;; Generated autoloads from diff-mode.el (autoload (quote diff-mode) "diff-mode" "\ Major mode for viewing/editing context diffs. Supports unified and context diffs as well as (to a lesser extent) -normal diffs. +normal diffs. If you edit the buffer manually, diff-mode will try +to update the hunk headers for you on-the-fly. + When the buffer is read-only, the ESC prefix is not necessary. If you edit the buffer manually, diff-mode will try to update the hunk headers for you on-the-fly. @@ -6851,7 +6847,11 @@ You can also switch between context diff and unified diff with \\[diff-context->unified], or vice versa with \\[diff-unified->context] and you can also reverse the direction of a diff with \\[diff-reverse-direction]. -\\{diff-mode-map} + +When the buffer is read-only, the Meta- modifier is not necessary +to run the Diff mode commands: + + \\{diff-mode-map} \(fn)" t nil) @@ -8488,7 +8488,7 @@ ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form ;;;;;; edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug" -;;;;;; "emacs-lisp/edebug.el" (17888 32279)) +;;;;;; "emacs-lisp/edebug.el" (17963 19041)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -9059,7 +9059,7 @@ ;;;*** ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el" -;;;;;; (17888 32280)) +;;;;;; (17963 19063)) ;;; Generated autoloads from mail/emacsbug.el (autoload (quote report-emacs-bug) "emacsbug" "\ @@ -9657,8 +9657,8 @@ ;;;*** -;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17888 -;;;;;; 32279)) +;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17963 +;;;;;; 19298)) ;;; Generated autoloads from eshell/esh-mode.el (autoload (quote eshell-mode) "esh-mode" "\ @@ -12670,7 +12670,7 @@ ;;;### (autoloads (rgrep lgrep grep-find grep grep-mode grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (17888 36935)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (17963 19282)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12824,7 +12824,7 @@ ;;;*** ;;;### (autoloads (gdb-script-mode jdb pdb perldb xdb dbx sdb gdb) -;;;;;; "gud" "progmodes/gud.el" (17963 18441)) +;;;;;; "gud" "progmodes/gud.el" (17963 19063)) ;;; Generated autoloads from progmodes/gud.el (autoload (quote gdb) "gud" "\ @@ -13536,7 +13536,7 @@ ;;;*** ;;;### (autoloads (hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (17888 32281)) +;;;;;; (17963 19041)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (quote ((c-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (c++-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (bibtex-mode ("^@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning))) "\ @@ -14431,7 +14431,7 @@ ;;;### (autoloads (icalendar-import-buffer icalendar-import-file ;;;;;; icalendar-export-region icalendar-export-file) "icalendar" -;;;;;; "calendar/icalendar.el" (17888 32279)) +;;;;;; "calendar/icalendar.el" (17963 20580)) ;;; Generated autoloads from calendar/icalendar.el (autoload (quote icalendar-export-file) "icalendar" "\ @@ -14469,8 +14469,8 @@ DIARY-FILE. It will ask for each appointment whether to add it to the diary -when DO-NOT-ASK is non-nil. When called interactively, -DO-NOT-ASK is set to t, so that you are asked fore each event. +unless DO-NOT-ASK is non-nil. When called interactively, +DO-NOT-ASK is nil, so that you are asked for each event. NON-MARKING determines whether diary events are created as non-marking. @@ -14483,8 +14483,8 @@ ;;;*** -;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17888 -;;;;;; 32280)) +;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17963 +;;;;;; 19063)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14707,7 +14707,7 @@ ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window ;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17963 -;;;;;; 18439)) +;;;;;; 19298)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -15783,7 +15783,7 @@ ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method ;;;;;; isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el" -;;;;;; (17888 32280)) +;;;;;; (17963 19057)) ;;; Generated autoloads from international/isearch-x.el (autoload (quote isearch-toggle-specified-input-method) "isearch-x" "\ @@ -15803,8 +15803,8 @@ ;;;*** -;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17888 -;;;;;; 36581)) +;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17963 +;;;;;; 19309)) ;;; Generated autoloads from isearchb.el (autoload (quote isearchb-activate) "isearchb" "\ @@ -15948,7 +15948,7 @@ ;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell ;;;;;; ispell-help ispell-pdict-save ispell-word ispell-local-dictionary-alist ;;;;;; ispell-personal-dictionary) "ispell" "textmodes/ispell.el" -;;;;;; (17888 36935)) +;;;;;; (17963 19313)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -17134,8 +17134,8 @@ ;;;*** -;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17888 -;;;;;; 32279)) +;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17963 +;;;;;; 19298)) ;;; Generated autoloads from calendar/lunar.el (autoload (quote phases-of-moon) "lunar" "\ @@ -19507,7 +19507,7 @@ ;;;;;; org-remember-handler org-remember org-remember-apply-template ;;;;;; org-remember-annotation org-store-link orgtbl-mode turn-on-orgtbl ;;;;;; org-global-cycle org-cycle org-mode) "org" "textmodes/org.el" -;;;;;; (17963 18455)) +;;;;;; (17963 19299)) ;;; Generated autoloads from textmodes/org.el (autoload (quote org-mode) "org" "\ @@ -20161,8 +20161,8 @@ ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list ;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete -;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17888 -;;;;;; 32280)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17963 +;;;;;; 19047)) ;;; Generated autoloads from pcomplete.el (autoload (quote pcomplete) "pcomplete" "\ @@ -21466,7 +21466,7 @@ ;;;;;; ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces ;;;;;; ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type ;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17963 -;;;;;; 18455)) +;;;;;; 19047)) ;;; Generated autoloads from ps-print.el (defvar ps-page-dimensions-database (list (list (quote a4) (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list (quote a3) (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list (quote letter) (* 72 8.5) (* 72 11.0) "Letter") (list (quote legal) (* 72 8.5) (* 72 14.0) "Legal") (list (quote letter-small) (* 72 7.68) (* 72 10.16) "LetterSmall") (list (quote tabloid) (* 72 11.0) (* 72 17.0) "Tabloid") (list (quote ledger) (* 72 17.0) (* 72 11.0) "Ledger") (list (quote statement) (* 72 5.5) (* 72 8.5) "Statement") (list (quote executive) (* 72 7.5) (* 72 10.0) "Executive") (list (quote a4small) (* 72 7.47) (* 72 10.85) "A4Small") (list (quote b4) (* 72 10.125) (* 72 14.33) "B4") (list (quote b5) (* 72 7.16) (* 72 10.125) "B5")) "\ @@ -21663,7 +21663,7 @@ ;;;*** ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" -;;;;;; (17963 18448)) +;;;;;; (17963 19313)) ;;; Generated autoloads from progmodes/python.el (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode))) @@ -21761,7 +21761,7 @@ ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (17888 36644)) +;;;;;; "international/quail.el" (17963 19309)) ;;; Generated autoloads from international/quail.el (autoload (quote quail-title) "quail" "\ @@ -22065,7 +22065,7 @@ ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (17888 32280)) +;;;;;; "net/rcirc.el" (17963 19063)) ;;; Generated autoloads from net/rcirc.el (autoload (quote rcirc) "rcirc" "\ @@ -22110,7 +22110,7 @@ ;;;*** ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el" -;;;;;; (17888 32279)) +;;;;;; (17963 19309)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias (quote regexp-builder) (quote re-builder)) @@ -24065,7 +24065,7 @@ ;;;*** ;;;### (autoloads (server-save-buffers-kill-terminal server-mode -;;;;;; server-start) "server" "server.el" (17888 32281)) +;;;;;; server-start) "server" "server.el" (17963 20687)) ;;; Generated autoloads from server.el (autoload (quote server-start) "server" "\ @@ -24109,12 +24109,12 @@ ;;;*** -;;;### (autoloads (ses-mode) "ses" "ses.el" (17888 32281)) +;;;### (autoloads (ses-mode) "ses" "ses.el" (17963 19052)) ;;; Generated autoloads from ses.el (autoload (quote ses-mode) "ses" "\ Major mode for Simple Emacs Spreadsheet. -See \"ses-example.ses\" (in the etc data directory) for more info. +See \"ses-example.ses\" (in `data-directory') for more info. Key definitions: \\{ses-mode-map} @@ -24362,7 +24362,7 @@ ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (17888 32281)) +;;;;;; (17963 19041)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\ @@ -24445,7 +24445,7 @@ ;;;*** -;;;### (autoloads nil "simple" "simple.el" (17888 36936)) +;;;### (autoloads nil "simple" "simple.el" (17963 19313)) ;;; Generated autoloads from simple.el (put 'fill-prefix 'safe-local-variable 'string-or-null-p) @@ -24611,7 +24611,7 @@ ;;;*** ;;;### (autoloads (smerge-mode smerge-ediff) "smerge-mode" "smerge-mode.el" -;;;;;; (17888 32281)) +;;;;;; (17963 19063)) ;;; Generated autoloads from smerge-mode.el (autoload (quote smerge-ediff) "smerge-mode" "\ @@ -24718,7 +24718,7 @@ ;;;### (autoloads (solar-equinoxes-solstices sunrise-sunset calendar-location-name ;;;;;; calendar-longitude calendar-latitude calendar-time-display-form) -;;;;;; "solar" "calendar/solar.el" (17888 32279)) +;;;;;; "solar" "calendar/solar.el" (17963 19298)) ;;; Generated autoloads from calendar/solar.el (defvar calendar-time-display-form (quote (12-hours ":" minutes am-pm (if time-zone " (") time-zone (if time-zone ")"))) "\ @@ -25708,7 +25708,7 @@ ;;;*** -;;;### (autoloads (locate-library) "subr" "subr.el" (17888 36928)) +;;;### (autoloads (locate-library) "subr" "subr.el" (17963 19313)) ;;; Generated autoloads from subr.el (autoload (quote locate-library) "subr" "\ @@ -25762,7 +25762,7 @@ ;;;*** -;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17888 32281)) +;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17963 19313)) ;;; Generated autoloads from t-mouse.el (defvar t-mouse-mode nil "\ @@ -27972,7 +27972,7 @@ ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-completion-file-name-regexp -;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17963 18447)) +;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17963 19047)) ;;; Generated autoloads from net/tramp.el (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\ @@ -28308,7 +28308,7 @@ ;;;;;; type-break type-break-mode type-break-keystroke-threshold ;;;;;; type-break-good-break-interval type-break-good-rest-interval ;;;;;; type-break-interval type-break-mode) "type-break" "type-break.el" -;;;;;; (17888 36583)) +;;;;;; (17963 19282)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -30843,7 +30843,7 @@ ;;;*** ;;;### (autoloads (woman-find-file woman-dired-find-file woman) "woman" -;;;;;; "woman.el" (17888 32281)) +;;;;;; "woman.el" (17963 19299)) ;;; Generated autoloads from woman.el (autoload (quote woman) "woman" "\ @@ -30992,7 +30992,7 @@ ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (17888 32281)) +;;;;;; (17963 19299)) ;;; Generated autoloads from xml.el (autoload (quote xml-parse-file) "xml" "\ @@ -31228,7 +31228,7 @@ ;;;;;; "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el" ;;;;;; "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el" ;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el" -;;;;;; "x-dnd.el") (17963 18741 697794)) +;;;;;; "x-dnd.el") (17963 20717 345010)) ;;;*** diff -r edf631bdbb7a -r 738ce3540ffb lisp/mail/emacsbug.el --- a/lisp/mail/emacsbug.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/mail/emacsbug.el Sun Apr 22 12:12:29 2007 +0000 @@ -139,7 +139,9 @@ (insert "\n\nIn " (emacs-version) "\n") (if (fboundp 'x-server-vendor) (condition-case nil - (insert "X server distributor `" (x-server-vendor) "', version " + ;; This is used not only for X11 but also W32 and others. + (insert "Windowing system distributor `" (x-server-vendor) + "', version " (mapconcat 'number-to-string (x-server-version) ".") "\n") (error t))) (if (and system-configuration-options @@ -281,5 +283,5 @@ (provide 'emacsbug) -;;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49 +;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49 ;;; emacsbug.el ends here diff -r edf631bdbb7a -r 738ce3540ffb lisp/mouse.el --- a/lisp/mouse.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/mouse.el Sun Apr 22 12:12:29 2007 +0000 @@ -409,11 +409,6 @@ should-enlarge-minibuffer event mouse y top bot edges wconfig growth) (track-mouse (progn - ;; enlarge-window only works on the selected window, so - ;; we must select the window where the start event originated. - ;; unwind-protect will restore the old selected window later. - (select-window start-event-window) - ;; if this is the bottommost ordinary window, then to ;; move its modeline the minibuffer must be enlarged. (setq should-enlarge-minibuffer @@ -421,7 +416,7 @@ mode-line-p (not (one-window-p t)) (= (nth 1 (window-edges minibuffer)) - (nth 3 (window-edges))))) + (nth 3 (window-edges start-event-window))))) ;; loop reading events and sampling the position of ;; the mouse. @@ -459,7 +454,7 @@ (t (setq y (cdr (cdr mouse)) - edges (window-edges) + edges (window-edges start-event-window) top (nth 1 edges) bot (nth 3 edges)) @@ -572,10 +567,6 @@ (error "Attempt to drag leftmost scrollbar"))) (track-mouse (progn - ;; enlarge-window only works on the selected window, so - ;; we must select the window where the start event originated. - ;; unwind-protect will restore the old selected window later. - (select-window start-event-window) ;; loop reading events and sampling the position of ;; the mouse. (while (not done) @@ -611,9 +602,9 @@ ;; If the scroll bar is on the window's left, ;; adjust the window on the left. (if (eq which-side 'right) - (selected-window) + start-event-window (mouse-drag-vertical-line-rightward-window - (selected-window))))) + start-event-window)))) (setq x (- (car (cdr mouse)) (if (eq which-side 'right) 0 2)) edges (window-edges window) @@ -1061,7 +1052,6 @@ (not (eq mouse-1-click-follows-link 'double)) (= click-count 0) (= (event-click-count event) 1) - (not (input-pending-p)) (or (not (integerp mouse-1-click-follows-link)) (let ((t0 (posn-timestamp (event-start start-event))) (t1 (posn-timestamp (event-end event)))) diff -r edf631bdbb7a -r 738ce3540ffb lisp/net/ange-ftp.el --- a/lisp/net/ange-ftp.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/net/ange-ftp.el Sun Apr 22 12:12:29 2007 +0000 @@ -1005,7 +1005,7 @@ (const :tag "Allow" 1))) (defcustom ange-ftp-try-passive-mode nil - "It t, try to use passive mode in ftp, if the client program supports it." + "If t, try to use passive mode in ftp, if the client program supports it." :group 'ange-ftp :type 'boolean :version "21.1") diff -r edf631bdbb7a -r 738ce3540ffb lisp/net/rcirc.el --- a/lisp/net/rcirc.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/net/rcirc.el Sun Apr 22 12:12:29 2007 +0000 @@ -312,9 +312,8 @@ "List of urls seen in the current buffer.") (put 'rcirc-urls 'permanent-local t) -(defvar rcirc-keepalive-seconds 60 - "Number of seconds between keepalive pings. -If nil, do not send keepalive pings.") +(defvar rcirc-timeout-seconds 60 + "Kill connection after this many seconds if there is no activity.") (defconst rcirc-id-string (concat "rcirc on GNU Emacs " emacs-version)) @@ -357,7 +356,12 @@ (defvar rcirc-topic nil) (defvar rcirc-keepalive-timer nil) (defvar rcirc-last-server-message-time nil) -(defvar rcirc-server nil) +(defvar rcirc-server nil) ; server provided by server +(defvar rcirc-server-name nil) ; server name given by 001 response +(defvar rcirc-timeout-timer nil) +(defvar rcirc-user-disconnect nil) +(defvar rcirc-connecting nil) +(defvar rcirc-process nil) ;;;###autoload (defun rcirc-connect (&optional server port nick user-name full-name startup-channels) @@ -374,7 +378,7 @@ (user-name (or user-name rcirc-default-user-name)) (full-name (or full-name rcirc-default-user-full-name)) (startup-channels startup-channels) - (process (open-network-stream server nil server port-number))) + (process (make-network-process :name server :host server :service port-number))) ;; set up process (set-process-coding-system process 'raw-text 'raw-text) (switch-to-buffer (rcirc-generate-new-buffer-name process nil)) @@ -382,8 +386,12 @@ (rcirc-mode process nil) (set-process-sentinel process 'rcirc-sentinel) (set-process-filter process 'rcirc-filter) + (make-local-variable 'rcirc-process) + (setq rcirc-process process) (make-local-variable 'rcirc-server) (setq rcirc-server server) + (make-local-variable 'rcirc-server-name) + (setq rcirc-server-name server) ; update when we get 001 response (make-local-variable 'rcirc-buffer-alist) (setq rcirc-buffer-alist nil) (make-local-variable 'rcirc-nick-table) @@ -396,6 +404,12 @@ (setq rcirc-startup-channels startup-channels) (make-local-variable 'rcirc-last-server-message-time) (setq rcirc-last-server-message-time (current-time)) + (make-local-variable 'rcirc-timeout-timer) + (setq rcirc-timeout-timer nil) + (make-local-variable 'rcirc-user-disconnect) + (setq rcirc-user-disconnect nil) + (make-local-variable 'rcirc-connecting) + (setq rcirc-connecting t) ;; identify (rcirc-send-string process (concat "NICK " nick)) @@ -404,10 +418,9 @@ full-name)) ;; setup ping timer if necessary - (when rcirc-keepalive-seconds - (unless rcirc-keepalive-timer - (setq rcirc-keepalive-timer - (run-at-time 0 rcirc-keepalive-seconds 'rcirc-keepalive)))) + (unless rcirc-keepalive-timer + (setq rcirc-keepalive-timer + (run-at-time 0 (/ rcirc-timeout-seconds 2) 'rcirc-keepalive))) (message "Connecting to %s...done" server) @@ -430,12 +443,11 @@ last ping." (if (rcirc-process-list) (mapc (lambda (process) - (with-rcirc-process-buffer process - (if (> (cadr (time-since rcirc-last-server-message-time)) - rcirc-keepalive-seconds) - (kill-process process) - (rcirc-send-string process (concat "PING " rcirc-server))))) + (with-rcirc-process-buffer process + (when (not rcirc-connecting) + (rcirc-send-string process (concat "PING " (rcirc-server-name process)))))) (rcirc-process-list)) + ;; no processes, clean up timer (cancel-timer rcirc-keepalive-timer) (setq rcirc-keepalive-timer nil))) @@ -472,12 +484,12 @@ (format "%s: %s (%S)" (process-name process) sentinel - (process-status process)) t) + (process-status process)) (not rcirc-target)) ;; remove the prompt from buffers (let ((inhibit-read-only t)) (delete-region rcirc-prompt-start-marker - rcirc-prompt-end-marker))))) - (run-hook-with-args 'rcirc-sentinel-hooks process sentinel))) + rcirc-prompt-end-marker)))) + (run-hook-with-args 'rcirc-sentinel-hooks process sentinel)))) (defun rcirc-process-list () "Return a list of rcirc processes." @@ -496,6 +508,7 @@ (defun rcirc-filter (process output) "Called when PROCESS receives OUTPUT." (rcirc-debug process output) + (rcirc-reschedule-timeout process) (with-rcirc-process-buffer process (setq rcirc-last-server-message-time (current-time)) (setq rcirc-process-output (concat rcirc-process-output output)) @@ -506,6 +519,19 @@ (split-string rcirc-process-output "[\n\r]" t)) (setq rcirc-process-output nil)))) +(defun rcirc-reschedule-timeout (process) + (with-rcirc-process-buffer process + (when (not rcirc-connecting) + (with-rcirc-process-buffer process + (when rcirc-timeout-timer (cancel-timer rcirc-timeout-timer)) + (setq rcirc-timeout-timer (run-at-time rcirc-timeout-seconds nil + 'rcirc-delete-process + process)))))) + +(defun rcirc-delete-process (process) + (message "delete process %S" process) + (delete-process process)) + (defvar rcirc-trap-errors-flag t) (defun rcirc-process-server-response (process text) (if rcirc-trap-errors-flag @@ -557,15 +583,16 @@ (defun rcirc-buffer-process (&optional buffer) "Return the process associated with channel BUFFER. With no argument or nil as argument, use the current buffer." - (get-buffer-process (if buffer - (with-current-buffer buffer - rcirc-server-buffer) - rcirc-server-buffer))) + (or (get-buffer-process (if buffer + (with-current-buffer buffer + rcirc-server-buffer) + rcirc-server-buffer)) + rcirc-process)) (defun rcirc-server-name (process) "Return PROCESS server name, given by the 001 response." (with-rcirc-process-buffer process - (or rcirc-server rcirc-default-server))) + (or rcirc-server-name rcirc-default-server))) (defun rcirc-nick (process) "Return PROCESS nick." @@ -790,7 +817,7 @@ (setq prompt (replace-regexp-in-string (car rep) (cdr rep) prompt))) (list (cons "%n" (rcirc-buffer-nick)) - (cons "%s" (with-rcirc-server-buffer (or rcirc-server ""))) + (cons "%s" (with-rcirc-server-buffer rcirc-server-name)) (cons "%t" (or rcirc-target "")))) (save-excursion (delete-region rcirc-prompt-start-marker rcirc-prompt-end-marker) @@ -1079,9 +1106,7 @@ "%") ((or (eq key ?n) (eq key ?N)) ;; %n/%N -- nick - (let ((nick (concat (if (string= (with-rcirc-process-buffer - process - rcirc-server) + (let ((nick (concat (if (string= (rcirc-server-name process) sender) "" sender) @@ -1302,19 +1327,15 @@ (rcirc-cmd-join channel process))))) ;;; nick management +(defvar rcirc-nick-prefix-chars "~&@%+") (defun rcirc-user-nick (user) "Return the nick from USER. Remove any non-nick junk." (save-match-data - (if (string-match "^[@%+]?\\([^! ]+\\)!?" (or user "")) + (if (string-match (concat "^[" rcirc-nick-prefix-chars + "]?\\([^! ]+\\)!?") (or user "")) (match-string 1 user) user))) -(defun rcirc-user-non-nick (user) - "Return the non-nick portion of USER." - (if (string-match "^[@+]?[^! ]+!?\\(.*\\)" (or user "")) - (match-string 1 user) - user)) - (defun rcirc-nick-channels (process nick) "Return list of channels for NICK." (with-rcirc-process-buffer process @@ -2009,7 +2030,9 @@ (rcirc-handler-generic process "001" sender args text) ;; set the real server name (with-rcirc-process-buffer process - (setq rcirc-server sender) + (setq rcirc-connecting nil) + (rcirc-reschedule-timeout process) + (setq rcirc-server-name sender) (setq rcirc-nick (car args)) (rcirc-update-prompt) (when rcirc-auto-authenticate-flag (rcirc-authenticate)) @@ -2419,7 +2442,8 @@ :group 'rcirc-faces) (defface rcirc-track-nick - '((t (:inverse-video t))) + '((((type tty)) (:inherit default)) + (t (:inverse-video t))) "The face used in the mode-line when your nick is mentioned." :group 'rcirc-faces) diff -r edf631bdbb7a -r 738ce3540ffb lisp/net/tls.el --- a/lisp/net/tls.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/net/tls.el Sun Apr 22 12:12:29 2007 +0000 @@ -60,7 +60,7 @@ "openssl s_client -connect %h:%p -no_ssl2") "List of strings containing commands to start TLS stream to a host. Each entry in the list is tried until a connection is successful. -%s is replaced with server hostname, %p with port to connect to. +%h is replaced with server hostname, %p with port to connect to. The program should read input on stdin and write output to stdout. Also see `tls-success' for what the program should output after successful negotiation." @@ -146,8 +146,8 @@ (set-buffer buffer) ;; XXX "blue moon" nntp.el bug (goto-char (point-min)) (not (setq done (re-search-forward tls-success nil t))))) - (accept-process-output process 1) - (sit-for 1)) + (unless (accept-process-output process 1) + (sit-for 1))) (message "Opening TLS connection with `%s'...%s" cmd (if done "done" "failed")) (if done diff -r edf631bdbb7a -r 738ce3540ffb lisp/net/tramp-smb.el --- a/lisp/net/tramp-smb.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/net/tramp-smb.el Sun Apr 22 12:12:29 2007 +0000 @@ -384,7 +384,7 @@ (save-excursion (let ((share (tramp-smb-get-share localname)) (file (tramp-smb-get-localname localname t)) - (tmpfil (tramp-make-temp-file))) + (tmpfil (tramp-make-temp-file filename))) (unless (file-exists-p filename) (error "Cannot make local copy of non-existing file `%s'" filename)) (tramp-message-for-buffer @@ -595,7 +595,7 @@ (curbuf (current-buffer)) tmpfil) ;; Write region into a tmp file. - (setq tmpfil (tramp-make-temp-file)) + (setq tmpfil (tramp-make-temp-file filename)) ;; We say `no-message' here because we don't want the visited file ;; modtime data to be clobbered from the temp file. We call ;; `set-visited-file-modtime' ourselves later on. diff -r edf631bdbb7a -r 738ce3540ffb lisp/net/tramp.el --- a/lisp/net/tramp.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/net/tramp.el Sun Apr 22 12:12:29 2007 +0000 @@ -3771,10 +3771,12 @@ ;; File Editing. -(defsubst tramp-make-temp-file () - (funcall (if (fboundp 'make-temp-file) 'make-temp-file 'make-temp-name) - (expand-file-name tramp-temp-name-prefix - (tramp-temporary-file-directory)))) +(defsubst tramp-make-temp-file (filename) + (concat + (funcall (if (fboundp 'make-temp-file) 'make-temp-file 'make-temp-name) + (expand-file-name tramp-temp-name-prefix + (tramp-temporary-file-directory))) + (file-name-extension filename t))) (defun tramp-handle-file-local-copy (filename) "Like `file-local-copy' for tramp files." @@ -3794,7 +3796,7 @@ (unless (file-exists-p filename) (error "Cannot make local copy of non-existing file `%s'" filename)) - (setq tmpfil (tramp-make-temp-file)) + (setq tmpfil (tramp-make-temp-file filename)) (cond ((tramp-method-out-of-band-p multi-method method user host) ;; `copy-file' handles out-of-band methods @@ -3846,7 +3848,7 @@ (kill-buffer tmpbuf)) ;; If tramp-decoding-function is not defined for this ;; method, we invoke tramp-decoding-command instead. - (let ((tmpfil2 (tramp-make-temp-file))) + (let ((tmpfil2 (tramp-make-temp-file filename))) (write-region (point-min) (point-max) tmpfil2) (tramp-message 6 "Decoding remote file %s with command %s..." @@ -4053,7 +4055,7 @@ ;; Write region into a tmp file. This isn't really needed if we ;; use an encoding function, but currently we use it always ;; because this makes the logic simpler. - (setq tmpfil (tramp-make-temp-file)) + (setq tmpfil (tramp-make-temp-file filename)) ;; Set current buffer. If connection wasn't open, `file-modes' has ;; changed it accidently. (set-buffer curbuf) diff -r edf631bdbb7a -r 738ce3540ffb lisp/pcomplete.el --- a/lisp/pcomplete.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/pcomplete.el Sun Apr 22 12:12:29 2007 +0000 @@ -974,18 +974,20 @@ (while (with-current-buffer (get-buffer "*Completions*") (setq event (pcomplete-read-event))) (cond - ((event-matches-key-specifier-p event ? ) + ((event-matches-key-specifier-p event ?\s) (set-window-configuration pcomplete-last-window-config) (setq pcomplete-last-window-config nil) (throw 'done nil)) ((or (event-matches-key-specifier-p event 'tab) ;; Needed on a terminal (event-matches-key-specifier-p event 9)) - (save-selected-window - (select-window (get-buffer-window "*Completions*")) - (if (pos-visible-in-window-p (point-max)) - (goto-char (point-min)) - (scroll-up))) + (let ((win (or (get-buffer-window "*Completions*" 0) + (display-buffer "*Completions*" + 'not-this-window)))) + (with-selected-window win + (if (pos-visible-in-window-p (point-max)) + (goto-char (point-min)) + (scroll-up)))) (message "")) (t (setq unread-command-events (list event)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/progmodes/cc-engine.el --- a/lisp/progmodes/cc-engine.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/progmodes/cc-engine.el Sun Apr 22 12:12:29 2007 +0000 @@ -1912,6 +1912,26 @@ ))) +;; Other whitespace tools +(defun c-partial-ws-p (beg end) + ;; Is the region (beg end) WS, and is there WS (or BOB/EOB) next to the + ;; region? This is a "heuristic" function. ..... + ;; + ;; The motivation for the second bit is to check whether the removal of this + ;; space is to check whether removing this region would coalesce two + ;; symbols. + ;; + ;; FIXME!!! This function doesn't check virtual semicolons in any way. Be + ;; careful about using this function for, e.g. AWK. (2007/3/7) + (save-excursion + (let ((end+1 (min (1+ end) (point-max)))) + (or (progn (goto-char (max (point-min) (1- beg))) + (c-skip-ws-forward end) + (eq (point) end)) + (progn (goto-char beg) + (c-skip-ws-forward end+1) + (eq (point) end+1)))))) + ;; A system for finding noteworthy parens before the point. (defvar c-state-cache nil) @@ -2491,24 +2511,25 @@ ;; Move to the beginning of the current token. Do not move if not ;; in the middle of one. BACK-LIMIT may be used to bound the ;; backward search; if given it's assumed to be at the boundary - ;; between two tokens. + ;; between two tokens. Return non-nil if the point is move, nil + ;; otherwise. ;; ;; This function might do hidden buffer changes. - (if (looking-at "\\w\\|\\s_") - (skip-syntax-backward "w_" back-limit) (let ((start (point))) - (when (< (skip-syntax-backward ".()" back-limit) 0) - (while (let ((pos (or (and (looking-at c-nonsymbol-token-regexp) - (match-end 0)) - ;; `c-nonsymbol-token-regexp' should always match - ;; since we've skipped backward over punctuator - ;; or paren syntax, but consume one char in case - ;; it doesn't so that we don't leave point before - ;; some earlier incorrect token. - (1+ (point))))) - (if (<= pos start) - (goto-char pos)) - (< pos start))))))) + (if (looking-at "\\w\\|\\s_") + (skip-syntax-backward "w_" back-limit) + (when (< (skip-syntax-backward ".()" back-limit) 0) + (while (let ((pos (or (and (looking-at c-nonsymbol-token-regexp) + (match-end 0)) + ;; `c-nonsymbol-token-regexp' should always match + ;; since we've skipped backward over punctuator + ;; or paren syntax, but consume one char in case + ;; it doesn't so that we don't leave point before + ;; some earlier incorrect token. + (1+ (point))))) + (if (<= pos start) + (goto-char pos)))))) + (< (point) start))) (defun c-end-of-current-token (&optional back-limit) ;; Move to the end of the current token. Do not move if not in the @@ -3957,6 +3978,9 @@ ;; file, and we only use this as a last resort in ambiguous cases (see ;; `c-forward-decl-or-cast-1'). ;; +;; Not every type need be in this cache. However, things which have +;; ceased to be types must be removed from it. +;; ;; Template types in C++ are added here too but with the template ;; arglist replaced with "<>" in references or "<" for the one in the ;; primary type. E.g. the type "Foo::Bar" is stored as @@ -3990,6 +4014,10 @@ (unintern (substring type 0 -1) c-found-types) (intern type c-found-types)))) +(defun c-unfind-type (name) + ;; Remove the "NAME" from c-found-types, if present. + (unintern name c-found-types)) + (defsubst c-check-type (from to) ;; Return non-nil if the given region contains a type in ;; `c-found-types'. @@ -4008,6 +4036,48 @@ c-found-types) (sort type-list 'string-lessp))) +(defun c-trim-found-types (beg end old-len) + ;; An after change function which, in conjunction with the info in + ;; c-maybe-stale-found-type (set in c-before-change), removes a type + ;; from `c-found-types', should this type have become stale. For + ;; example, this happens to "foo" when "foo \n bar();" becomes + ;; "foo(); \n bar();". Such stale types, if not removed, foul up + ;; the fontification. + ;; + ;; Have we, perhaps, added non-ws characters to the front/back of a found + ;; type? + (when (> end beg) + (save-excursion + (when (< end (point-max)) + (goto-char end) + (if (and (c-beginning-of-current-token) ; only moves when we started in the middle + (progn (goto-char end) + (c-end-of-current-token))) + (c-unfind-type (buffer-substring-no-properties + end (point))))) + (when (> beg (point-min)) + (goto-char beg) + (if (and (c-end-of-current-token) ; only moves when we started in the middle + (progn (goto-char beg) + (c-beginning-of-current-token))) + (c-unfind-type (buffer-substring-no-properties + (point) beg)))))) + + (if c-maybe-stale-found-type ; e.g. (c-decl-id-start "foo" 97 107 " (* ooka) " "o") + (cond + ;; Changing the amount of (already existing) whitespace - don't do anything. + ((and (c-partial-ws-p beg end) + (or (= beg end) ; removal of WS + ; (string-match "\\s *\\'" (nth 5 c-maybe-stale-found-type)) + (string-match "^[ \t\n\r\f\v]*$" (nth 5 c-maybe-stale-found-type))))) + + ;; The syntactic relationship which defined a "found type" has been + ;; destroyed. + ((eq (car c-maybe-stale-found-type) 'c-decl-id-start) + (c-unfind-type (cadr c-maybe-stale-found-type))) +;; ((eq (car c-maybe-stale-found-type) 'c-decl-type-start) FIXME!!! + ))) + ;; Handling of small scale constructs like types and names. diff -r edf631bdbb7a -r 738ce3540ffb lisp/progmodes/cc-mode.el --- a/lisp/progmodes/cc-mode.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/progmodes/cc-mode.el Sun Apr 22 12:12:29 2007 +0000 @@ -412,8 +412,143 @@ ;; temporary changes in some font lock support modes, causing extra ;; unnecessary work and font lock glitches due to interactions between ;; various text properties. +;; +;; (2007-02-12): The macro `combine-after-change-calls' ISN'T used any +;; more. -(defun c-after-change (beg end len) +(defun c-unfind-enclosing-token (pos) + ;; If POS is wholly inside a token, remove that id from + ;; `c-found-types', should it be present. Return t if we were in an + ;; id, else nil. + (save-excursion + (let ((tok-beg (progn (goto-char pos) + (and (c-beginning-of-current-token) (point)))) + (tok-end (progn (goto-char pos) + (and (c-end-of-current-token) (point))))) + (when (and tok-beg tok-end) + (c-unfind-type (buffer-substring-no-properties tok-beg tok-end)) + t)))) + +(defun c-unfind-coalesced-tokens (beg end) + ;; unless the non-empty region (beg end) is entirely WS and there's at + ;; least one character of WS just before or after this region, remove + ;; the tokens which touch the region from `c-found-types' should they + ;; be present. + (or (c-partial-ws-p beg end) + (save-excursion + (progn + (goto-char beg) + (or (eq beg (point-min)) + (c-skip-ws-backward (1- beg)) + (/= (point) beg) + (= (c-backward-token-2) 1) + (c-unfind-type (buffer-substring-no-properties + (point) beg))) + (goto-char end) + (or (eq end (point-max)) + (c-skip-ws-forward (1+ end)) + (/= (point) end) + (progn (forward-char) (c-end-of-current-token) nil) + (c-unfind-type (buffer-substring-no-properties + end (point)))))))) + +;; c-maybe-stale-found-type records a place near the region being +;; changed where an element of `found-types' might become stale. It +;; is set in c-before-change and is either nil, or has the form: +;; +;; (c-decl-id-start "foo" 97 107 " (* ooka) " "o"), where +;; +;; o - `c-decl-id-start' is the c-type text property value at buffer +;; pos 96. +;; +;; o - 97 107 is the region potentially containing the stale type - +;; this is delimited by a non-nil c-type text property at 96 and +;; either another one or a ";", "{", or "}" at 107. +;; +;; o - " (* ooka) " is the (before change) buffer portion containing +;; the suspect type (here "ooka"). +;; +;; o - "o" is the buffer contents which is about to be deleted. This +;; would be the empty string for an insertion. +(defvar c-maybe-stale-found-type nil) +(make-variable-buffer-local 'c-maybe-stale-found-type) + +(defun c-before-change (beg end) + ;; Function to be put on `before-change-function'. Currently + ;; (2007-02) it is used only to remove stale entries from the + ;; `c-found-types' cache, and to record entries which a + ;; `c-after-change' function might confirm as stale. + ;; + ;; Note that this function must be FAST rather than accurate. Note + ;; also that it only has any effect when font locking is enabled. + ;; We exploit this by checking for font-lock-*-face instead of doing + ;; rigourous syntactic analysis. + + ;; If either change boundary is wholly inside an identifier, delete + ;; it/them from the cache. Don't worry about being inside a string + ;; or a comment - "wrongly" removing a symbol from `c-found-types' + ;; isn't critical. + (setq c-maybe-stale-found-type nil) + (save-restriction + (save-match-data + (widen) + (save-excursion + ;; Are we inserting/deleting stuff in the middle of an identifier? + (c-unfind-enclosing-token beg) + (c-unfind-enclosing-token end) + ;; Are we coalescing two tokens together, e.g. "fo o" -> "foo"? + (when (< beg end) + (c-unfind-coalesced-tokens beg end)) + ;; Are we (potentially) disrupting the syntactic context which + ;; makes a type a type? E.g. by inserting stuff after "foo" in + ;; "foo bar;", or before "foo" in "typedef foo *bar;"? + ;; + ;; We search for appropriate c-type properties "near" the change. + ;; First, find an appropriate boundary for this property search. + (let (lim + type type-pos + marked-id term-pos + (end1 + (if (eq (get-text-property end 'face) 'font-lock-comment-face) + (previous-single-property-change end 'face) + end))) + (when (>= end1 beg) ; Don't hassle about changes entirely in comments. + ;; Find a limit for the search for a `c-type' property + (while + (and (/= (skip-chars-backward "^;{}") 0) + (> (point) (point-min)) + (memq (c-get-char-property (1- (point)) 'face) + '(font-lock-comment-face font-lock-string-face)))) + (setq lim (max (point-min) (1- (point)))) + + ;; Look for the latest `c-type' property before end1 + (when (and (> end1 1) + (setq type-pos + (if (get-text-property (1- end1) 'c-type) + end1 + (previous-single-property-change end1 'c-type nil lim)))) + (setq type (get-text-property (max (1- type-pos) lim) 'c-type)) + + (when (memq type '(c-decl-id-start c-decl-type-start)) + ;; Get the identifier, if any, that the property is on. + (goto-char (1- type-pos)) + (setq marked-id + (when (looking-at "\\(\\sw\\|\\s_\\)") + (c-beginning-of-current-token) + (buffer-substring-no-properties (point) type-pos))) + + (goto-char end1) + (skip-chars-forward "^;{}") ; FIXME!!! loop for comment, maybe + (setq lim (point)) + (setq term-pos + (or (next-single-property-change end 'c-type nil lim) lim)) + (setq c-maybe-stale-found-type + (list type marked-id + type-pos term-pos + (buffer-substring-no-properties type-pos term-pos) + (buffer-substring-no-properties beg end))))))))))) + +(defun c-after-change (beg end old-len) ;; Function put on `after-change-functions' to adjust various caches ;; etc. Prefer speed to finesse here, since there will be an order ;; of magnitude more calls to this function than any of the @@ -441,6 +576,7 @@ (when (> beg end) (setq beg end))) + (c-trim-found-types beg end old-len) ; maybe we don't need all of these. (c-invalidate-sws-region-after beg end) (c-invalidate-state-cache beg) (c-invalidate-find-decl-cache beg) @@ -577,6 +713,8 @@ ;; Install the functions that ensure that various internal caches ;; don't become invalid due to buffer changes. + (make-local-hook 'before-change-functions) + (add-hook 'before-change-functions 'c-before-change nil t) (make-local-hook 'after-change-functions) (add-hook 'after-change-functions 'c-after-change nil t)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/progmodes/compile.el --- a/lisp/progmodes/compile.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/progmodes/compile.el Sun Apr 22 12:12:29 2007 +0000 @@ -1862,17 +1862,7 @@ (let* ((name (read-file-name (format "Find this %s in (default %s): " compilation-error filename) - spec-dir filename t nil - ;; Try to make sure the user can only select - ;; a valid answer. This predicate may be ignored, - ;; tho, so we still have to double-check afterwards. - ;; TODO: We should probably fix read-file-name so - ;; that it never ignores this predicate, even when - ;; using popup dialog boxes. - (lambda (name) - (if (file-directory-p name) - (setq name (expand-file-name filename name))) - (file-exists-p name)))) + spec-dir filename t nil)) (origname name)) (cond ((not (file-exists-p name)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/progmodes/cperl-mode.el --- a/lisp/progmodes/cperl-mode.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/progmodes/cperl-mode.el Sun Apr 22 12:12:29 2007 +0000 @@ -1795,8 +1795,8 @@ ((boundp 'compilation-error-regexp-alist);; xmeacs 19.x (make-local-variable 'compilation-error-regexp-alist) (set 'compilation-error-regexp-alist - (cons cperl-compilation-error-regexp-alist - (symbol-value 'compilation-error-regexp-alist))))) + (append cperl-compilation-error-regexp-alist + (symbol-value 'compilation-error-regexp-alist))))) (make-local-variable 'font-lock-defaults) (setq font-lock-defaults (cond diff -r edf631bdbb7a -r 738ce3540ffb lisp/progmodes/grep.el --- a/lisp/progmodes/grep.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/progmodes/grep.el Sun Apr 22 12:12:29 2007 +0000 @@ -157,7 +157,8 @@ :type 'alist :group 'grep) -(defcustom grep-find-ignored-directories '("CVS" ".svn" "{arch}" ".hg" "_darcs") +(defcustom grep-find-ignored-directories '("CVS" ".svn" "{arch}" ".hg" "_darcs" + ".git" ".bzr") "*List of names of sub-directories which `rgrep' shall not recurse into." :type '(repeat string) :group 'grep) diff -r edf631bdbb7a -r 738ce3540ffb lisp/progmodes/gud.el --- a/lisp/progmodes/gud.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/progmodes/gud.el Sun Apr 22 12:12:29 2007 +0000 @@ -690,7 +690,10 @@ (buffer-name gud-comint-buffer) (get-buffer-process gud-comint-buffer) (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))) - (error "Multiple debugging requires restarting in text command mode")) + (let ((same-window-regexps)) + (display-buffer gud-comint-buffer) + (error + "Multiple debugging requires restarting in text command mode"))) (gud-common-init command-line nil 'gud-gdb-marker-filter) (set (make-local-variable 'gud-minor-mode) 'gdb) diff -r edf631bdbb7a -r 738ce3540ffb lisp/progmodes/hideshow.el --- a/lisp/progmodes/hideshow.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/progmodes/hideshow.el Sun Apr 22 12:12:29 2007 +0000 @@ -906,11 +906,18 @@ (if hs-minor-mode (progn (hs-grok-mode-type) + ;; Turn off this mode if we change major modes. + (add-hook 'change-major-mode-hook + (lambda () (hs-minor-mode -1)) + nil t) (easy-menu-add hs-minor-mode-menu) (set (make-local-variable 'line-move-ignore-invisible) t) (add-to-invisibility-spec '(hs . t))) (easy-menu-remove hs-minor-mode-menu) - (remove-from-invisibility-spec '(hs . t))) + (remove-from-invisibility-spec '(hs . t)) + ;; hs-show-all does nothing unless h-m-m is non-nil. + (let ((hs-minor-mode t)) + (hs-show-all))) (run-hooks 'hs-minor-mode-hook)) ;;--------------------------------------------------------------------------- @@ -945,7 +952,7 @@ (add-to-list 'minor-mode-map-alist (cons 'hs-minor-mode hs-minor-mode-map)) (add-to-list 'minor-mode-alist '(hs-minor-mode " hs") t) -;; make some variables permanently buffer-local +;; make some variables buffer-local (dolist (var '(hs-minor-mode hs-c-start-regexp hs-block-start-regexp @@ -953,8 +960,7 @@ hs-block-end-regexp hs-forward-sexp-func hs-adjust-block-beginning)) - (make-variable-buffer-local var) - (put var 'permanent-local t)) + (make-variable-buffer-local var)) ;;--------------------------------------------------------------------------- ;; that's it diff -r edf631bdbb7a -r 738ce3540ffb lisp/progmodes/idlw-help.el --- a/lisp/progmodes/idlw-help.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/progmodes/idlw-help.el Sun Apr 22 12:12:29 2007 +0000 @@ -386,8 +386,7 @@ (< beg (- end 4)))) module keyword cw mod1 mod2 mod3) (if (or arg - (and (not st-ass) - (not classtag) + (and (not classtag) (not structtag) (not (member (string-to-char this-word) '(?! ?.))))) ;; Need the module information @@ -408,7 +407,8 @@ (arg (setq mod1 module)) ;; A special topic -- only system help - (st-ass (setq mod1 (list (cdr st-ass)))) + ((and st-ass (not (memq cw '(function-keyword procedure-keyword)))) + (setq mod1 (list (cdr st-ass)))) ;; A system variable -- only system help ((string-match @@ -1226,7 +1226,7 @@ ;; we must pass the -profile argument as well. (defvar idlwave-help-assistant-command (if (memq system-type '(ms-dos windows-nt)) - "bin/bin.x86/idl_assistant" + "bin/bin.x86/idl_assistant.exe" "bin/idl_assistant") "The command, rooted at idlwave-system-directory, which invokes the IDL assistant.") diff -r edf631bdbb7a -r 738ce3540ffb lisp/progmodes/python.el --- a/lisp/progmodes/python.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/progmodes/python.el Sun Apr 22 12:12:29 2007 +0000 @@ -1150,7 +1150,7 @@ is used by `run-python' et al.") (defvar python-buffer nil - "*The current python process buffer. + "*The current Python process buffer. Commands that send text from source buffers to Python processes have to choose a process to send to. This is determined by buffer-local @@ -1383,11 +1383,11 @@ COMMAND should be a single statement." ;; (assert (not (string-match "\n" command))) ;; (let ((end (marker-position (process-mark (python-proc))))) - (with-current-buffer python-buffer (goto-char (point-max))) + (with-current-buffer (process-buffer (python-proc)) + (goto-char (point-max)) (compilation-forget-errors) (python-send-string command) - (with-current-buffer python-buffer - (setq compilation-last-buffer (current-buffer))) + (setq compilation-last-buffer (current-buffer))) ;; No idea what this is for but it breaks the call to ;; compilation-fake-loc in python-send-region. -- Stef ;; Must wait until this has completed before re-setting variables below. @@ -1517,9 +1517,9 @@ ;; isn't one for `python-buffer'. (unless (comint-check-proc python-buffer) (run-python nil t)) - (get-buffer-process (or (if (derived-mode-p 'inferior-python-mode) - (current-buffer) - python-buffer)))) + (get-buffer-process (if (derived-mode-p 'inferior-python-mode) + (current-buffer) + python-buffer))) (defun python-set-proc () "Set the default value of `python-buffer' to correspond to this buffer. @@ -2088,7 +2088,7 @@ > _ \n) (defvar python-default-template "if" - "Default template to expand by `python-insert-template'. + "Default template to expand by `python-expand-template'. Updated on each expansion.") (defun python-expand-template (name) diff -r edf631bdbb7a -r 738ce3540ffb lisp/ps-print.el --- a/lisp/ps-print.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ps-print.el Sun Apr 22 12:12:29 2007 +0000 @@ -3966,7 +3966,7 @@ filename)))) -(defvar ps-mark-code-directory) +(defvar ps-mark-code-directory nil) (defvar ps-print-prologue-0 "" "ps-print PostScript error handler.") @@ -3976,12 +3976,12 @@ ;; Start Editing Here: -(defvar ps-source-buffer) +(defvar ps-source-buffer nil) (defvar ps-spool-buffer-name "*PostScript*") -(defvar ps-spool-buffer) - -(defvar ps-output-head) -(defvar ps-output-tail) +(defvar ps-spool-buffer nil) + +(defvar ps-output-head nil) +(defvar ps-output-tail nil) (defvar ps-page-postscript 0) ; page number (defvar ps-page-order 0) ; PostScript page counter @@ -3991,29 +3991,29 @@ (defvar ps-page-n-up 0) ; n-up counter (defvar ps-lines-printed 0) ; total lines printed (defvar ps-showline-count 1) ; line number counter -(defvar ps-first-page) -(defvar ps-last-page) +(defvar ps-first-page nil) +(defvar ps-last-page nil) (defvar ps-print-page-p t) -(defvar ps-control-or-escape-regexp) -(defvar ps-n-up-on) - -(defvar ps-background-pages) -(defvar ps-background-all-pages) +(defvar ps-control-or-escape-regexp nil) +(defvar ps-n-up-on nil) + +(defvar ps-background-pages nil) +(defvar ps-background-all-pages nil) (defvar ps-background-text-count 0) (defvar ps-background-image-count 0) (defvar ps-current-font 0) -(defvar ps-default-foreground) -(defvar ps-default-background) -(defvar ps-default-color) -(defvar ps-current-color) -(defvar ps-current-bg) - -(defvar ps-zebra-stripe-full-p) +(defvar ps-default-foreground nil) +(defvar ps-default-background nil) +(defvar ps-default-color nil) +(defvar ps-current-color nil) +(defvar ps-current-bg nil) + +(defvar ps-zebra-stripe-full-p nil) (defvar ps-razchunk 0) -(defvar ps-color-p) +(defvar ps-color-p nil) (defvar ps-color-format (if (featurep 'xemacs) ;; XEmacs will have to make do with %s (princ) for floats. @@ -4042,20 +4042,20 @@ (defmacro ps-page-dimensions-get-height (dims) `(nth 1 ,dims)) (defmacro ps-page-dimensions-get-media (dims) `(nth 2 ,dims)) -(defvar ps-landscape-page-height) - -(defvar ps-print-width) -(defvar ps-print-height) - -(defvar ps-height-remaining) -(defvar ps-width-remaining) - -(defvar ps-font-size-internal) -(defvar ps-header-font-size-internal) -(defvar ps-header-title-font-size-internal) -(defvar ps-footer-font-size-internal) -(defvar ps-line-spacing-internal) -(defvar ps-paragraph-spacing-internal) +(defvar ps-landscape-page-height nil) + +(defvar ps-print-width nil) +(defvar ps-print-height nil) + +(defvar ps-height-remaining nil) +(defvar ps-width-remaining nil) + +(defvar ps-font-size-internal nil) +(defvar ps-header-font-size-internal nil) +(defvar ps-header-title-font-size-internal nil) +(defvar ps-footer-font-size-internal nil) +(defvar ps-line-spacing-internal nil) +(defvar ps-paragraph-spacing-internal nil) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -4252,10 +4252,10 @@ message-log-max)) -(defvar ps-print-hook) -(defvar ps-print-begin-sheet-hook) -(defvar ps-print-begin-page-hook) -(defvar ps-print-begin-column-hook) +(defvar ps-print-hook nil) +(defvar ps-print-begin-sheet-hook nil) +(defvar ps-print-begin-page-hook nil) +(defvar ps-print-begin-column-hook nil) (defun ps-print-without-faces (from to &optional filename region-p) @@ -4832,10 +4832,10 @@ content (cdr content))) (nreverse str))) -(defvar ps-lh-cache) -(defvar ps-rh-cache) -(defvar ps-lf-cache) -(defvar ps-rf-cache) +(defvar ps-lh-cache nil) +(defvar ps-rh-cache nil) +(defvar ps-lf-cache nil) +(defvar ps-rf-cache nil) (defun ps-header-footer-string () (and ps-print-header @@ -6128,7 +6128,7 @@ (/ q-done (/ q-todo 100))) )))))) -(defvar ps-last-font) +(defvar ps-last-font nil) (defun ps-set-font (font) (setq ps-last-font (format "f%d" (setq ps-current-font font))) diff -r edf631bdbb7a -r 738ce3540ffb lisp/replace.el --- a/lisp/replace.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/replace.el Sun Apr 22 12:12:29 2007 +0000 @@ -849,10 +849,12 @@ (defface match '((((class color) (min-colors 88) (background light)) - :background "Tan") + :background "yellow") (((class color) (min-colors 88) (background dark)) :background "RoyalBlue3") - (((class color) (min-colors 8)) + (((class color) (min-colors 8) (background light)) + :background "yellow" :foreground "black") + (((class color) (min-colors 8) (background dark)) :background "blue" :foreground "white") (((type tty) (class mono)) :inverse-video t) @@ -1049,7 +1051,9 @@ (with-current-buffer occur-buf (occur-mode) - (let ((inhibit-read-only t)) + (let ((inhibit-read-only t) + ;; Don't generate undo entries for creation of the initial contents. + (buffer-undo-list t)) (erase-buffer) (let ((count (occur-engine regexp active-bufs occur-buf @@ -1086,8 +1090,6 @@ title-face prefix-face match-face keep-props) (with-current-buffer out-buf (let ((globalcount 0) - ;; Don't generate undo entries for creation of the initial contents. - (buffer-undo-list t) (coding nil)) ;; Map over all the buffers (dolist (buf buffers) diff -r edf631bdbb7a -r 738ce3540ffb lisp/server.el --- a/lisp/server.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/server.el Sun Apr 22 12:12:29 2007 +0000 @@ -666,6 +666,16 @@ (run-with-timer 0 nil (lexical-let ((proc proc)) (lambda () (server-process-filter proc "")))) (top-level)) + (condition-case nil + ;; If we're running isearch, we must abort it to allow Emacs to + ;; display the buffer and switch to it. + (mapc #'(lambda (buffer) + (with-current-buffer buffer + (when (bound-and-true-p isearch-mode) + (isearch-cancel)))) + (buffer-list)) + ;; Signaled by isearch-cancel + (quit (message nil))) (let ((prev (process-get proc 'previous-string))) (when prev (setq string (concat prev string)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/ses.el --- a/lisp/ses.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/ses.el Sun Apr 22 12:12:29 2007 +0000 @@ -1485,7 +1485,7 @@ ;;;###autoload (defun ses-mode () "Major mode for Simple Emacs Spreadsheet. -See \"ses-example.ses\" (in the etc data directory) for more info. +See \"ses-example.ses\" (in `data-directory') for more info. Key definitions: \\{ses-mode-map} diff -r edf631bdbb7a -r 738ce3540ffb lisp/shell.el --- a/lisp/shell.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/shell.el Sun Apr 22 12:12:29 2007 +0000 @@ -336,7 +336,7 @@ "Keep track of last directory for ksh `cd -' command.") (defvar shell-dirstack-query nil - "Command used by `shell-resync-dir' to query the shell.") + "Command used by `shell-resync-dirs' to query the shell.") (defvar shell-mode-map nil) (cond ((not shell-mode-map) diff -r edf631bdbb7a -r 738ce3540ffb lisp/simple.el --- a/lisp/simple.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/simple.el Sun Apr 22 12:12:29 2007 +0000 @@ -746,7 +746,7 @@ (/ size 10)) (/ (+ 10 (* size (prefix-numeric-value arg))) 10))) (point-min)))) - (if arg (forward-line 1))) + (if (and arg (not (consp arg))) (forward-line 1))) (defun end-of-buffer (&optional arg) "Move point to the end of the buffer; leave mark at previous position. @@ -773,7 +773,7 @@ (point-max)))) ;; If we went to a place in the middle of the buffer, ;; adjust it to the beginning of a line. - (cond (arg (forward-line 1)) + (cond ((and arg (not (consp arg))) (forward-line 1)) ((> (point) (window-end nil t)) ;; If the end of the buffer is not already on the screen, ;; then scroll specially to put it near, but not at, the bottom. @@ -993,6 +993,9 @@ (defvar read-expression-history nil) +(defvar minibuffer-completing-symbol nil + "Non-nil means completing a Lisp symbol in the minibuffer.") + (defcustom eval-expression-print-level 4 "Value for `print-level' while printing value in `eval-expression'. A value of nil means no limit." @@ -1044,9 +1047,10 @@ If `eval-expression-debug-on-error' is non-nil, which is the default, this command arranges for all errors to enter the debugger." (interactive - (list (read-from-minibuffer "Eval: " - nil read-expression-map t - 'read-expression-history) + (list (let ((minibuffer-completing-symbol t)) + (read-from-minibuffer "Eval: " + nil read-expression-map t + 'read-expression-history)) current-prefix-arg)) (if (null eval-expression-debug-on-error) @@ -1894,14 +1898,11 @@ Optional arguments NOT-THIS-WINDOW and FRAME are as for `display-buffer', and only used if a buffer is displayed." - (cond ((and (stringp message) - (not (string-match "\n" message)) - (<= (length message) (frame-width))) + (cond ((and (stringp message) (not (string-match "\n" message))) ;; Trivial case where we can use the echo area (message "%s" message)) ((and (stringp message) - (= (string-match "\n" message) (1- (length message))) - (<= (1- (length message)) (frame-width))) + (= (string-match "\n" message) (1- (length message)))) ;; Trivial case where we can just remove single trailing newline (message "%s" (substring message 0 (1- (length message))))) (t @@ -3582,7 +3583,7 @@ 'end-of-buffer) nil))) ;; Move by arg lines, but ignore invisible ones. - (let (done line-end) + (let (done) (while (and (> arg 0) (not done)) ;; If the following character is currently invisible, ;; skip all characters with that same `invisible' property value. @@ -3591,9 +3592,11 @@ ;; Move a line. ;; We don't use `end-of-line', since we want to escape ;; from field boundaries ocurring exactly at point. - (let ((inhibit-field-text-motion t)) - (setq line-end (line-end-position))) - (goto-char (constrain-to-field line-end (point) t t)) + (goto-char (constrain-to-field + (let ((inhibit-field-text-motion t)) + (line-end-position)) + (point) t t + 'inhibit-line-move-field-capture)) ;; If there's no invisibility here, move over the newline. (cond ((eobp) @@ -4715,9 +4718,16 @@ Each action has the form (FUNCTION . ARGS)." (interactive (list nil nil nil current-prefix-arg)) - (let ((function (get mail-user-agent 'composefunc))) - (funcall function to subject other-headers continue - switch-function yank-action send-actions))) + (let ((function (get mail-user-agent 'composefunc)) + result-buffer) + (if switch-function + (save-window-excursion + (prog1 + (funcall function to subject other-headers continue + nil yank-action send-actions) + (funcall switch-function (current-buffer)))) + (funcall function to subject other-headers continue + nil yank-action send-actions)))) (defun compose-mail-other-window (&optional to subject other-headers continue yank-action send-actions) @@ -5080,7 +5090,8 @@ ;; so it will get copied into the completion list buffer. (if minibuffer-completing-file-name (with-current-buffer mainbuf - (setq default-directory (file-name-directory mbuf-contents)))) + (setq default-directory + (file-name-directory (expand-file-name mbuf-contents))))) (with-current-buffer standard-output (completion-list-mode) (set (make-local-variable 'completion-reference-buffer) mainbuf) @@ -5100,6 +5111,7 @@ (save-excursion (skip-chars-backward completion-root-regexp) (- (point) (minibuffer-prompt-end))))) + (minibuffer-completing-symbol nil) ;; Otherwise, in minibuffer, the base size is 0. ((minibufferp mainbuf) 0))) (setq common-string-length @@ -5152,7 +5164,7 @@ (when window (select-window window) (goto-char (point-min)) - (search-forward "\n\n") + (search-forward "\n\n" nil t) (forward-line 1)))) ;;; Support keyboard commands to turn on various modifiers. diff -r edf631bdbb7a -r 738ce3540ffb lisp/smerge-mode.el --- a/lisp/smerge-mode.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/smerge-mode.el Sun Apr 22 12:12:29 2007 +0000 @@ -345,7 +345,9 @@ ;; during font-locking so inhibit-modification-hooks is non-nil, so we ;; can't just modify the buffer and expect font-lock to be triggered as in: ;; (put-text-property beg end 'smerge-force-highlighting nil) - (remove-text-properties beg end '(fontified nil))) + (let ((modified (buffer-modified-p))) + (remove-text-properties beg end '(fontified nil)) + (restore-buffer-modified-p modified))) (defun smerge-popup-context-menu (event) "Pop up the Smerge mode context menu under mouse." @@ -558,6 +560,8 @@ t) (search-failed (error "Point not in conflict region"))))) +(add-to-list 'debug-ignored-errors "Point not in conflict region") + (defun smerge-conflict-overlay (pos) "Return the conflict overlay at POS if any." (let ((ols (overlays-at pos)) diff -r edf631bdbb7a -r 738ce3540ffb lisp/startup.el --- a/lisp/startup.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/startup.el Sun Apr 22 12:12:29 2007 +0000 @@ -49,7 +49,7 @@ (defcustom inhibit-splash-screen nil "Non-nil inhibits the startup screen. -It also inhibits display of the initial message in the *scratch* buffer. +It also inhibits display of the initial message in the `*scratch*' buffer. This is for use in your personal init file, once you are familiar with the contents of the startup screen." @@ -202,7 +202,7 @@ the user's init file.") (defcustom initial-major-mode 'lisp-interaction-mode - "Major mode command symbol to use for the initial *scratch* buffer." + "Major mode command symbol to use for the initial `*scratch*' buffer." :type 'function :group 'initialization) @@ -1126,13 +1126,13 @@ ;; If there is a specific tutorial for the current language ;; environment and it is not English, append its title. (concat - "Emacs Tutorial\tLearn how to use Emacs efficiently" + "Emacs Tutorial\t\tLearn how to use Emacs efficiently" (if (string= en tut) "" (concat " (" title ")")) "\n"))) :face variable-pitch "\ -Emacs FAQ\tFrequently asked questions and answers +Emacs FAQ\t\tFrequently asked questions and answers View Emacs Manual\tView the Emacs manual using Info Absence of Warranty\tGNU Emacs comes with " :face (variable-pitch :slant oblique) @@ -1142,12 +1142,13 @@ Copying Conditions\tConditions for redistributing and changing Emacs Getting New Versions\tHow to obtain the latest version of Emacs More Manuals / Ordering Manuals Buying printed manuals from the FSF\n") - (:face (variable-pitch :weight bold) + (:face variable-pitch "To quit a partially entered command, type " :face default "Control-g" :face variable-pitch - "." + ".\n" + :face (variable-pitch :weight bold) "Useful File menu items:\n" :face variable-pitch "Exit Emacs\t\t(Or type " @@ -1279,8 +1280,7 @@ :face 'variable-pitch "Type " :face 'default - (substitute-command-keys - "\\[recenter]") + "Control-l" :face 'variable-pitch " to begin editing" (if (equal (buffer-name fancy-splash-outer-buffer) @@ -1997,13 +1997,13 @@ (with-no-warnings (setq menubar-bindings-done t)) - ;; If *scratch* is selected and it is empty, insert an - ;; initial message saying not to create a file there. - (when (and initial-scratch-message - (equal (buffer-name) "*scratch*") - (= 0 (buffer-size))) - (insert initial-scratch-message) - (set-buffer-modified-p nil)) + ;; If *scratch* exists and is empty, insert initial-scratch-message. + (and initial-scratch-message + (get-buffer "*scratch*") + (with-current-buffer "*scratch*" + (when (zerop (buffer-size)) + (insert initial-scratch-message) + (set-buffer-modified-p nil)))) ;; If user typed input during all that work, ;; abort the startup screen. Otherwise, display it now. diff -r edf631bdbb7a -r 738ce3540ffb lisp/subr.el --- a/lisp/subr.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/subr.el Sun Apr 22 12:12:29 2007 +0000 @@ -55,7 +55,7 @@ (defmacro def-edebug-spec (symbol spec) "Set the `edebug-form-spec' property of SYMBOL according to SPEC. -Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol +Both SYMBOL and SPEC are unevaluated. The SPEC can be 0, t, a symbol \(naming a function), or a list." `(put (quote ,symbol) 'edebug-form-spec (quote ,spec))) @@ -99,12 +99,20 @@ (list 'setq listname (list 'cdr listname))))) (defmacro when (cond &rest body) - "If COND yields non-nil, do BODY, else return nil." + "If COND yields non-nil, do BODY, else return nil. +When COND yields non-nil, eval BODY forms sequentially and return +value of last one, or nil if there are none. + +\(fn COND BODY ...)" (declare (indent 1) (debug t)) (list 'if cond (cons 'progn body))) (defmacro unless (cond &rest body) - "If COND yields nil, do BODY, else return nil." + "If COND yields nil, do BODY, else return nil. +When COND yields nil, eval BODY forms sequentially and return +value of last one, or nil if there are none. + +\(fn COND BODY ...)" (declare (indent 1) (debug t)) (cons 'if (cons cond (cons nil body)))) @@ -1895,21 +1903,32 @@ Display MESSAGE (optional fourth arg) in the echo area. If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there." (or exit-char (setq exit-char ?\s)) - (let ((momentary-overlay (make-overlay pos pos nil t))) - (overlay-put momentary-overlay 'before-string - (propertize string 'face 'momentary)) + (let ((inhibit-read-only t) + ;; Don't modify the undo list at all. + (buffer-undo-list t) + (modified (buffer-modified-p)) + (name buffer-file-name) + insert-end) (unwind-protect (progn - ;; If the message end is off screen, recenter now. - (if (< (window-end nil t) (+ pos (length string))) - (recenter (/ (window-height) 2))) - ;; If that pushed message start off the screen, - ;; scroll to start it at the top of the screen. (save-excursion + (goto-char pos) + ;; To avoid trouble with out-of-bounds position + (setq pos (point)) + ;; defeat file locking... don't try this at home, kids! + (setq buffer-file-name nil) + (insert-before-markers string) + (setq insert-end (point)) + ;; If the message end is off screen, recenter now. + (if (< (window-end nil t) insert-end) + (recenter (/ (window-height) 2))) + ;; If that pushed message start off the screen, + ;; scroll to start it at the top of the screen. (move-to-window-line 0) (if (> (point) pos) - (goto-char pos) - (recenter 0))) + (progn + (goto-char pos) + (recenter 0)))) (message (or message "Type %s to continue editing.") (single-key-description exit-char)) (let (char) @@ -1929,7 +1948,11 @@ (or (eq char exit-char) (eq char (event-convert-list exit-char)) (setq unread-command-events (list char)))))) - (delete-overlay momentary-overlay)))) + (if insert-end + (save-excursion + (delete-region pos insert-end))) + (setq buffer-file-name name) + (set-buffer-modified-p modified)))) ;;;; Overlay operations diff -r edf631bdbb7a -r 738ce3540ffb lisp/t-mouse.el --- a/lisp/t-mouse.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/t-mouse.el Sun Apr 22 12:12:29 2007 +0000 @@ -134,14 +134,19 @@ (defun t-mouse-make-event-element (x-dot-y-avec-time) (let* ((x-dot-y (nth 0 x-dot-y-avec-time)) + (time (nth 1 x-dot-y-avec-time)) (x (car x-dot-y)) (y (cdr x-dot-y)) (w (window-at x y)) (ltrb (window-edges w)) (left (nth 0 ltrb)) - (top (nth 1 ltrb))) - (if w (posn-at-x-y (- x left) (- y top) w t) - (append (list nil 'menu-bar) (nthcdr 2 (posn-at-x-y x y w t)))))) + (top (nth 1 ltrb)) + (event (if w + (posn-at-x-y (- x left) (- y top) w t) + (append (list nil 'menu-bar) + (nthcdr 2 (posn-at-x-y x y w t)))))) + (setcar (nthcdr 3 event) time) + event)) ;;; This fun is partly Copyright (C) 1994 Per Abrahamsen (defun t-mouse-make-event () diff -r edf631bdbb7a -r 738ce3540ffb lisp/tempo.el --- a/lisp/tempo.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/tempo.el Sun Apr 22 12:12:29 2007 +0000 @@ -266,6 +266,8 @@ that you often should place this item after the text you want on the line. - `r>': Like `r', but it also indents the region. + - (r> PROMPT ): Like (r ...), but is also indents + the region. - `n>': Inserts a newline and indents line. - `o': Like `%' but leaves the point before the newline. - nil: It is ignored. @@ -352,6 +354,13 @@ (goto-char tempo-region-stop) (tempo-insert-prompt-compat (cdr element)))) + ((and (consp element) + (eq (car element) 'r>)) (if on-region + (progn + (goto-char tempo-region-stop) + (indent-region (mark) (point) nil)) + (tempo-insert-prompt-compat + (cdr element)))) ((and (consp element) (eq (car element) 's)) (tempo-insert-named (car (cdr element)))) ((and (consp element) diff -r edf631bdbb7a -r 738ce3540ffb lisp/term/x-win.el --- a/lisp/term/x-win.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/term/x-win.el Sun Apr 22 12:12:29 2007 +0000 @@ -2207,11 +2207,12 @@ ;; (1) If their lengthes are different, select the longer one. This ;; is because an X client may just cut off unsupported characters. ;; -;; (2) Otherwise, if the Nth character of CTEXT is an ASCII -;; character that is different from the Nth character of UTF8, -;; select UTF8. This is because an X client may replace unsupported -;; characters with some ASCII character (typically ` ' or `?') in -;; CTEXT. +;; (2) Otherwise, if they are different at Nth character, and that +;; of UTF8 is a Latin character and that of CTEXT belongs to a CJK +;; character set, select UTF8. Also select UTF8 if the Nth +;; character of UTF8 is non-ASCII where as that of CTEXT is ASCII. +;; This is because an X client may replace unsupported characters +;; with some ASCII character (typically ` ' or `?') in CTEXT. ;; ;; (3) Otherwise, select CTEXT. This is because legacy charsets are ;; better for the current Emacs, especially when the selection owner @@ -2226,10 +2227,16 @@ (if (/= len-utf8 len-ctext) (if (> len-utf8 len-ctext) utf8 ctext) (let ((result (compare-strings utf8 0 len-utf8 ctext 0 len-ctext))) - (if (or (eq result t) - (>= (aref ctext (1- (abs result))) 128)) + (if (eq result t) ctext - utf8))))) + (let ((utf8-char (aref utf8 (1- (abs result)))) + (ctext-char (aref ctext (1- (abs result))))) + (if (or (and (aref (char-category-set utf8-char) ?l) + (aref (char-category-set ctext-char) ?C)) + (and (>= utf8-char 128) + (< ctext-char 128))) + utf8 + ctext))))))) ;; Get a selection value of type TYPE by calling x-get-selection with ;; an appropiate DATA-TYPE argument decidd by `x-select-request-type'. diff -r edf631bdbb7a -r 738ce3540ffb lisp/textmodes/ispell.el --- a/lisp/textmodes/ispell.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/textmodes/ispell.el Sun Apr 22 12:12:29 2007 +0000 @@ -766,9 +766,7 @@ (if buf (kill-buffer buf))) (set-buffer (get-buffer-create " *ispell-tmp*")) (erase-buffer) - (unless (file-exists-p default-directory) - (setq default-directory (expand-file-name "~/"))) - (setq status (call-process + (setq status (ispell-call-process ispell-program-name nil t nil ;; aspell doesn't accept the -vv switch. (let ((case-fold-search @@ -827,6 +825,22 @@ (kill-buffer (current-buffer))) result)) +(defun ispell-call-process (&rest args) + "Like `call-process' but defend against bad `default-directory'." + (let ((default-directory default-directory)) + (unless (and (file-directory-p default-directory) + (file-readable-p default-directory)) + (setq default-directory (expand-file-name "~/"))) + (apply 'call-process args))) + +(defun ispell-call-process-region (&rest args) + "Like `call-process-region' but defend against bad `default-directory'." + (let ((default-directory default-directory)) + (unless (and (file-directory-p default-directory) + (file-readable-p default-directory)) + (setq default-directory (expand-file-name "~/"))) + (apply 'call-process-region args))) + ;;; The preparation of the menu bar menu must be autoloaded @@ -895,7 +909,7 @@ (let* ((dictionaries (split-string (with-temp-buffer - (call-process ispell-program-name nil t nil "dicts") + (ispell-call-process ispell-program-name nil t nil "dicts") (buffer-string)))) ;; Search for the named dictionaries. (found @@ -928,7 +942,7 @@ "Return value of Aspell configuration option KEY. Assumes that value contains no whitespace." (with-temp-buffer - (call-process ispell-program-name nil t nil "config" key) + (ispell-call-process ispell-program-name nil t nil "config" key) (car (split-string (buffer-string))))) (defun ispell-aspell-find-dictionary (dict-name) @@ -1500,7 +1514,8 @@ (erase-buffer) (set-buffer session-buf) (setq status - (apply 'call-process-region (point-min) (point-max) + (apply 'ispell-call-process-region + (point-min) (point-max) ispell-program-name nil output-buf nil "-a" "-m" ispell-args)) @@ -2197,7 +2212,7 @@ (while (search-backward "*" nil t) (insert ".")) (setq word (buffer-string)) (erase-buffer)) - (setq status (apply 'call-process prog nil t nil + (setq status (apply 'ispell-call-process prog nil t nil (nconc (if (and args (> (length args) 0)) (list args) (if look-p nil diff -r edf631bdbb7a -r 738ce3540ffb lisp/textmodes/org.el --- a/lisp/textmodes/org.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/textmodes/org.el Sun Apr 22 12:12:29 2007 +0000 @@ -3912,6 +3912,7 @@ (if (memq 'radio lk) '(org-activate-target-links (0 'org-link t))) (if (memq 'date lk) '(org-activate-dates (0 'org-date t))) (if (memq 'tag lk) '(org-activate-tags (1 'org-tag prepend))) + '(org-hide-wide-columns (0 nil append)) ;; TODO lines (list (concat "^\\*+[ \t]*" org-not-done-regexp) '(1 'org-todo t)) @@ -18767,6 +18768,13 @@ (put 'org-delete-char 'delete-selection 'supersede) (put 'org-delete-backward-char 'delete-selection 'supersede) +;; Make `flyspell-mode' delay after some commands +(put 'org-self-insert-command 'flyspell-delayed t) +(put 'orgtbl-self-insert-command 'flyspell-delayed t) +(put 'org-delete-char 'flyspell-delayed t) +(put 'org-delete-backward-char 'flyspell-delayed t) + + ;; How to do this: Measure non-white length of current string ;; If equal to column width, we should realign. diff -r edf631bdbb7a -r 738ce3540ffb lisp/type-break.el --- a/lisp/type-break.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/type-break.el Sun Apr 22 12:12:29 2007 +0000 @@ -562,9 +562,12 @@ (if file (timep ;; returns expected format, else nil (with-current-buffer (find-file-noselect file 'nowarn) - (save-excursion - (goto-char (point-min)) - (read (current-buffer)))))))) + (condition-case nil + (save-excursion + (goto-char (point-min)) + (read (current-buffer))) + (end-of-file + (error "End of file in `%s'" file)))))))) (defun type-break-get-previous-count () "Get previous keystroke count from `type-break-file-name'. @@ -576,10 +579,13 @@ (setq file (with-current-buffer (find-file-noselect file 'nowarn) - (save-excursion - (goto-char (point-min)) - (forward-line 1) - (read (current-buffer))))))) + (condition-case nil + (save-excursion + (goto-char (point-min)) + (forward-line 1) + (read (current-buffer))) + (end-of-file + (error "End of file in `%s'" file))))))) file 0))) diff -r edf631bdbb7a -r 738ce3540ffb lisp/woman.el --- a/lisp/woman.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/woman.el Sun Apr 22 12:12:29 2007 +0000 @@ -3284,7 +3284,7 @@ ;; Find font requests, paragraph macros and font escapes: (re-search-forward "^[.'][ \t]*\\(\\(\\ft\\)\\|\\(.P\\)\\)\\|\\(\\\\f\\)" nil 1) - (let (font beg notfont) + (let (font beg notfont fescape) ;; Match font indicator and leave point at end of sequence: (cond ((match-string 2) ;; .ft request found @@ -3299,7 +3299,8 @@ (setq font 'default)) ((match-string 4) ;; \f escape found - (setq beg (match-beginning 0)) + (setq beg (match-beginning 0) + fescape t) (woman-match-name)) (t (setq notfont t))) (if notfont @@ -3321,6 +3322,13 @@ ;; Delete font control line or escape sequence: (cond (beg (delete-region beg (point)) (if (eq font 'previous) (setq font previous-font)))) + ;; Deal with things like \fB.cvsrc\fR at the start of a line. + ;; After removing the font control codes, this would + ;; otherwise match woman-request-regexp. The "\\&" which is + ;; inserted to prevent this is removed by woman2-process-escapes. + (and fescape + (looking-at woman-request-regexp) + (insert "\\&")) (woman-set-face previous-pos (point) current-font) (if beg ;; Explicit font control @@ -3665,39 +3673,39 @@ (unwind-protect (while ;; Find next control line: - (re-search-forward woman-request-regexp nil t) - (cond - ;; Construct woman function to call: - ((setq fn (intern-soft - (concat "woman2-" - (setq request (match-string 1))))) - ;; Delete request or macro name: - (woman-delete-match 0)) - ;; Unrecognised request: - ((prog1 nil - ;; (WoMan-warn ".%s request ignored!" request) - (WoMan-warn-ignored request "ignored!") - ;; (setq fn 'woman2-LP) - ;; AVOID LEAVING A BLANK LINE! - ;; (setq fn 'woman2-format-paragraphs) - )) - ;; .LP assumes it is at eol and leaves a (blank) line, - ;; so leave point at end of line before paragraph: - ((or (looking-at "[ \t]*$") ; no argument - woman-ignore) ; ignore all - ;; (beginning-of-line) (kill-line) - ;; AVOID LEAVING A BLANK LINE! - (beginning-of-line) (woman-delete-line 1)) - (t (end-of-line) (insert ?\n)) - ) - (if (not (or fn - (and (not (memq (following-char) '(?. ?'))) - (setq fn 'woman2-format-paragraphs)))) - () - ;; Find next control line: - (set-marker to (woman-find-next-control-line)) - ;; Call the appropriate function: - (funcall fn to))) + (re-search-forward woman-request-regexp nil t) + (cond + ;; Construct woman function to call: + ((setq fn (intern-soft + (concat "woman2-" + (setq request (match-string 1))))) + ;; Delete request or macro name: + (woman-delete-match 0)) + ;; Unrecognised request: + ((prog1 nil + ;; (WoMan-warn ".%s request ignored!" request) + (WoMan-warn-ignored request "ignored!") + ;; (setq fn 'woman2-LP) + ;; AVOID LEAVING A BLANK LINE! + ;; (setq fn 'woman2-format-paragraphs) + )) + ;; .LP assumes it is at eol and leaves a (blank) line, + ;; so leave point at end of line before paragraph: + ((or (looking-at "[ \t]*$") ; no argument + woman-ignore) ; ignore all + ;; (beginning-of-line) (kill-line) + ;; AVOID LEAVING A BLANK LINE! + (beginning-of-line) (woman-delete-line 1)) + (t (end-of-line) (insert ?\n)) + ) + (if (not (or fn + (and (not (memq (following-char) '(?. ?'))) + (setq fn 'woman2-format-paragraphs)))) + () + ;; Find next control line: + (set-marker to (woman-find-next-control-line)) + ;; Call the appropriate function: + (funcall fn to))) (if (not (eobp)) ; This should not happen, but ... (woman2-format-paragraphs (copy-marker (point-max) t) woman-left-margin)) @@ -4193,7 +4201,27 @@ (let ((i (woman2-get-prevailing-indent 'leave-eol))) (beginning-of-line) (woman-leave-blank-lines) ; must be here, - (woman2-tagged-paragraph to i)))) + ;; + ;; The cvs.1 manpage contains some (possibly buggy) syntax that + ;; confuses woman, although the man program displays it ok. + ;; Most problems are caused by IP followed by another request on + ;; the next line. Without the following hack, the second request + ;; gets displayed raw in the output. Note that + ;; woman2-tagged-paragraph also contains a hack for similar + ;; issues (eg IP followed by SP). + ;; + ;; i) For IP followed by one or more IPs, we ignore all but the + ;; last (mimic man). The hack in w-t-p would only work for two + ;; consecutive IPs, and would use the first. + ;; ii) For IP followed by SP followed by one or more requests, + ;; do nothing. At least in cvs.1, there is usually another IP in + ;; there somewhere. + (unless (or (looking-at "^\\.IP") + (and (looking-at "^\\.sp") + (save-excursion + (and (zerop (forward-line 1)) + (looking-at woman-request-regexp))))) + (woman2-tagged-paragraph to i))))) (defun woman-find-next-control-line-carefully () "Find and return start of next control line, even if already there!" @@ -4208,17 +4236,21 @@ (if (not (looking-at "\\s *$")) ; non-empty tag (setq woman-leave-blank-lines nil)) - ;; Temporary hack for bash.1 and groff_mmse.7 until code is revised - ;; to process all requests uniformly: - (cond ((and (= (point) to) (looking-at "^[.'][ \t]*\\(PD\\|br\\|ta\\) *")) - (if (string= (match-string 1) "br") - (woman-delete-line 1) - (woman-delete-match 0) - (if (string= (match-string 1) "ta") ; for GetInt.3 - (woman2-ta to) - (woman-set-interparagraph-distance))) - (set-marker to (woman-find-next-control-line-carefully)) - )) + ;; Temporary hack for bash.1, cvs.1 and groff_mmse.7 until code is revised + ;; to process all requests uniformly. + ;; This hack deals with IP requests followed by other requests (eg + ;; SP) on the very next line. We skip over the SP, otherwise it gets + ;; inserted raw in the rendered output. + (cond ((and (= (point) to) + (looking-at "^[.'][ \t]*\\(PD\\|br\\|ta\\|sp\\) *")) + (if (member (match-string 1) '("br" "sp")) + (woman-delete-line 1) + (woman-delete-match 0) + (if (string= (match-string 1) "ta") ; for GetInt.3 + (woman2-ta to) + (woman-set-interparagraph-distance))) + (set-marker to (woman-find-next-control-line-carefully)) + )) (let ((tag (point))) (woman-reset-nospace) @@ -4274,6 +4306,7 @@ (let ((i (woman-get-numeric-arg))) (woman-delete-line) (or leave-eol (delete-char 1)) ;; i = 0 if the argument was not a number + ;; FIXME should this be >= 0? How else to reset to 0 indent? (if (> i 0) (setq woman-prevailing-indent i)))) woman-prevailing-indent) diff -r edf631bdbb7a -r 738ce3540ffb lisp/xml.el --- a/lisp/xml.el Sun Apr 22 11:42:03 2007 +0000 +++ b/lisp/xml.el Sun Apr 22 12:12:29 2007 +0000 @@ -76,8 +76,12 @@ ;;; Code: -;; Note that {buffer-substring,match-string}-no-properties were -;; formerly used in several places, but that removes composition info. +;; Note that buffer-substring and match-string were formerly used in +;; several places, because the -no-properties variants remove +;; composition info. However, after some discussion on emacs-devel, +;; the consensus was that the speed of the -no-properties variants was +;; a worthwhile tradeoff especially since we're usually parsing files +;; instead of hand-crafted XML. ;;******************************************************************* ;;** @@ -406,7 +410,7 @@ (unless (search-forward "]]>" nil t) (error "XML: (Not Well Formed) CDATA section does not end anywhere in the document")) (concat - (buffer-substring pos (match-beginning 0)) + (buffer-substring-no-properties pos (match-beginning 0)) (xml-parse-string)))) ;; DTD for the document ((looking-at "", but didn't see it.) (error "XML: (Well-Formed) Couldn't parse tag: %s" - (buffer-substring (- (point) 10) (+ (point) 1))))))) + (buffer-substring-no-properties (- (point) 10) (+ (point) 1))))))) (t ;; (Not one of PI, CDATA, Comment, End tag, or Start tag) (unless xml-sub-parser ; Usually, we error out. (error "XML: (Well-Formed) Invalid character")) @@ -495,7 +499,7 @@ (string (progn (if (search-forward "<" nil t) (forward-char -1) (goto-char (point-max))) - (buffer-substring pos (point))))) + (buffer-substring-no-properties pos (point))))) ;; Clean up the string. As per XML specifications, the XML ;; processor should always pass the whole string to the ;; application. But \r's should be replaced: @@ -516,7 +520,7 @@ (while (looking-at (eval-when-compile (concat "\\(" xml-name-regexp "\\)\\s-*=\\s-*"))) (setq end-pos (match-end 0)) - (setq name (xml-maybe-do-ns (match-string 1) nil xml-ns)) + (setq name (xml-maybe-do-ns (match-string-no-properties 1) nil xml-ns)) (goto-char end-pos) ;; See also: http://www.w3.org/TR/2000/REC-xml-20001006#AVNormalize @@ -535,7 +539,7 @@ ;; Multiple whitespace characters should be replaced with a single one ;; in the attributes - (let ((string (match-string 1)) + (let ((string (match-string-no-properties 1)) (pos 0)) (replace-regexp-in-string "\\s-\\{2,\\}" " " string) (let ((expansion (xml-substitute-special string))) @@ -575,7 +579,7 @@ ;; Get the name of the document (looking-at xml-name-regexp) - (let ((dtd (list (match-string 0) 'dtd)) + (let ((dtd (list (match-string-no-properties 0) 'dtd)) type element end-pos) (goto-char (match-end 0)) @@ -590,18 +594,18 @@ "\\='\\([[:space:][:alnum:]-()+,./:=?;!*#@$_%]*\\)'" nil t)) (error "XML: Missing Public ID")) - (let ((pubid (match-string 1))) + (let ((pubid (match-string-no-properties 1))) (skip-syntax-forward " ") (unless (or (re-search-forward "\\='\\([^']*\\)'" nil t) (re-search-forward "\\=\"\\([^\"]*\\)\"" nil t)) (error "XML: Missing System ID")) - (push (list pubid (match-string 1) 'public) dtd))) + (push (list pubid (match-string-no-properties 1) 'public) dtd))) ((looking-at "SYSTEM\\s-+") (goto-char (match-end 0)) (unless (or (re-search-forward "\\='\\([^']*\\)'" nil t) (re-search-forward "\\=\"\\([^\"]*\\)\"" nil t)) (error "XML: Missing System ID")) - (push (list (match-string 1) 'system) dtd))) + (push (list (match-string-no-properties 1) 'system) dtd))) (skip-syntax-forward " ") (if (eq ?> (char-after)) (forward-char) @@ -618,7 +622,7 @@ ((looking-at "]+\\)>") - (setq element (match-string 1) + (setq element (match-string-no-properties 1) type (match-string-no-properties 2)) (setq end-pos (match-end 0)) @@ -629,7 +633,7 @@ ((string-match "^ANY[ \t\n\r]*$" type) ;; any type of contents (setq type 'any)) ((string-match "^(\\(.*\\))[ \t\n\r]*$" type) ;; children ([47]) - (setq type (xml-parse-elem-type (match-string 1 type)))) + (setq type (xml-parse-elem-type (match-string-no-properties 1 type)))) ((string-match "^%[^;]+;[ \t\n\r]*$" type) ;; substitution nil) (t @@ -659,9 +663,9 @@ ((looking-at (concat "")) - (let ((name (match-string 1)) - (value (substring (match-string 2) 1 - (- (length (match-string 2)) 1)))) + (let ((name (match-string-no-properties 1)) + (value (substring (match-string-no-properties 2) 1 + (- (length (match-string-no-properties 2)) 1)))) (goto-char (match-end 0)) (setq xml-entity-alist (append xml-entity-alist @@ -681,9 +685,9 @@ "\\|'[- \r\na-zA-Z0-9()+,./:=?;!*#@$_%]*'" "[ \t\n\r]+\\(\"[^\"]*\"\\|'[^']*'\\)" "[ \t\n\r]*>"))) - (let ((name (match-string 1)) - (file (substring (match-string 2) 1 - (- (length (match-string 2)) 1)))) + (let ((name (match-string-no-properties 1)) + (file (substring (match-string-no-properties 2) 1 + (- (length (match-string-no-properties 2)) 1)))) (goto-char (match-end 0)) (setq xml-entity-alist (append xml-entity-alist @@ -722,8 +726,8 @@ (let (elem modifier) (if (string-match "(\\([^)]+\\))\\([+*?]?\\)" string) (progn - (setq elem (match-string 1 string) - modifier (match-string 2 string)) + (setq elem (match-string-no-properties 1 string) + modifier (match-string-no-properties 2 string)) (if (string-match "|" elem) (setq elem (cons 'choice (mapcar 'xml-parse-elem-type @@ -733,8 +737,8 @@ (mapcar 'xml-parse-elem-type (split-string elem ","))))))) (if (string-match "[ \t\n\r]*\\([^+*?]+\\)\\([+*?]?\\)" string) - (setq elem (match-string 1 string) - modifier (match-string 2 string)))) + (setq elem (match-string-no-properties 1 string) + modifier (match-string-no-properties 2 string)))) (if (and (stringp elem) (string= elem "#PCDATA")) (setq elem 'pcdata)) @@ -765,19 +769,19 @@ children end-point) (while (string-match "&\\([^;]*\\);" string point) (setq end-point (match-end 0)) - (let* ((this-part (match-string 1 string)) + (let* ((this-part (match-string-no-properties 1 string)) (prev-part (substring string point (match-beginning 0))) (entity (assoc this-part xml-entity-alist)) (expansion (cond ((string-match "#\\([0-9]+\\)" this-part) (let ((c (decode-char 'ucs - (string-to-number (match-string 1 this-part))))) + (string-to-number (match-string-no-properties 1 this-part))))) (if c (string c)))) ((string-match "#x\\([[:xdigit:]]+\\)" this-part) (let ((c (decode-char 'ucs - (string-to-number (match-string 1 this-part) 16)))) + (string-to-number (match-string-no-properties 1 this-part) 16)))) (if c (string c)))) (entity (cdr entity)) diff -r edf631bdbb7a -r 738ce3540ffb lispref/ChangeLog --- a/lispref/ChangeLog Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/ChangeLog Sun Apr 22 12:12:29 2007 +0000 @@ -1,3 +1,40 @@ +2007-03-19 Richard Stallman + + * os.texi (Recording Input): recent-keys now gives 300 keys. + +2007-03-12 Glenn Morris + + * os.texi: Replace "daylight savings" with "daylight saving" + throughout. + +2007-03-05 Richard Stallman + + * variables.texi (File Local Variables): Update + enable-local-variables values. + +2007-03-04 Richard Stallman + + * syntax.texi (Control Parsing): Minor clarification. + + * strings.texi (Formatting Strings): Clarify width, precision, flags. + + * sequences.texi (Sequence Functions): Move string-bytes away, + add xref. + + * nonascii.texi (Text Representations): Move string-bytes here. + + * modes.texi (Major Mode Conventions): Fundamental mode is exception. + + * minibuf.texi (Basic Completion): Minor clarification. + + * markers.texi (The Mark): Clarify existence vs activation of mark. + Other cleanup. + + * display.texi (Finding Overlays): Write better example. + + * compile.texi (Eval During Compile): Clarify putting macros + in eval-when-compile. + 2007-02-25 Vinicius Jose Latorre * loading.texi (How Programs Do Loading): Fix anchor position at diff -r edf631bdbb7a -r 738ce3540ffb lispref/compile.texi --- a/lispref/compile.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/compile.texi Sun Apr 22 12:12:29 2007 +0000 @@ -454,11 +454,10 @@ (require 'my-macro-package)) ;; only macros needed from this @end lisp -The same sort of thing goes for macros or @code{defalias}es defined -locally and only for use within the file. They can be defined while -compiling, but then not needed when executing. This is good for code -that's only a fallback for compatibility with other versions of Emacs. -For example. +The same sort of thing goes for macros and @code{defsubst} functions +defined locally and only for use within the file. They are needed for +compiling the file, but in most cases they are not needed for +execution of the compiled file. For example, @lisp (eval-when-compile @@ -467,6 +466,10 @@ (compatibility code)))) @end lisp +@noindent +This is often good for code that's only a fallback for compatibility +with other versions of Emacs. + @strong{Common Lisp Note:} At top level, @code{eval-when-compile} is analogous to the Common Lisp idiom @code{(eval-when (compile eval) @dots{})}. Elsewhere, the Common Lisp @samp{#.} reader macro (but not when interpreting) is closer diff -r edf631bdbb7a -r 738ce3540ffb lispref/display.texi --- a/lispref/display.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/display.texi Sun Apr 22 12:12:29 2007 +0000 @@ -1527,26 +1527,25 @@ @code{(point-min)}. @end defun - Here's a function which uses @code{next-overlay-change} to search -for the next character which gets a given property @code{prop} from -either its overlays or its text properties (@pxref{Property Search}): + As an example, here's a simplified (and inefficient) version of the +primitive function @code{next-single-char-property-change} +(@pxref{Property Search}). It searches forward from position +@var{pos} for the next position where the value of a given property +@code{prop}, as obtained from either overlays or text properties, +changes. @smallexample -(defun find-overlay-prop (prop) +(defun next-single-char-property-change (position prop) (save-excursion - (while (and (not (eobp)) - (not (get-char-property (point) prop))) - (goto-char (min (next-overlay-change (point)) - (next-single-property-change (point) prop)))) + (goto-char position) + (let ((propval (get-char-property (point) prop))) + (while (and (not (eobp)) + (eq (get-char-property (point) prop) propval)) + (goto-char (min (next-overlay-change (point)) + (next-single-property-change (point) prop))))) (point))) @end smallexample - Now you can search for a @code{happy} property like this: - -@smallexample -(find-overlay-prop 'happy) -@end smallexample - @node Width @section Width diff -r edf631bdbb7a -r 738ce3540ffb lispref/elisp.texi --- a/lispref/elisp.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/elisp.texi Sun Apr 22 12:12:29 2007 +0000 @@ -7,7 +7,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 2.9 -@set EMACSVER 22.0.95 +@set EMACSVER 22.0.96 @dircategory Emacs @direntry diff -r edf631bdbb7a -r 738ce3540ffb lispref/markers.texi --- a/lispref/markers.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/markers.texi Sun Apr 22 12:12:29 2007 +0000 @@ -410,10 +410,10 @@ interactive call, but permits other Lisp programs to specify arguments explicitly. @xref{Interactive Codes}. - Each buffer has its own value of the mark that is independent of the -value of the mark in other buffers. When a buffer is created, the mark -exists but does not point anywhere. We consider this state as ``the -absence of a mark in that buffer.'' + Each buffer has a marker which represents the value of the mark in +that buffer, independent of any other buffer. When a buffer is newly +created, this marker exists but does not point anywhere. That means +the mark ``doesn't exist'' in that buffer as yet. Once the mark ``exists'' in a buffer, it normally never ceases to exist. However, it may become @dfn{inactive}, if Transient Mark mode is @@ -452,10 +452,10 @@ @end defun @defun mark-marker -This function returns the current buffer's mark. This is the very marker -that records the mark location inside Emacs, not a copy. Therefore, -changing this marker's position will directly affect the position of the mark. -Don't do it unless that is the effect you want. +This function returns the marker that represents the current buffer's +mark. It is not a copy, it is the marker used internally. Therefore, +changing this marker's position will directly affect the buffer's +mark. Don't do that unless that is the effect you want. @example @group @@ -472,10 +472,10 @@ @end group @end example -Like any marker, this marker can be set to point at any buffer you like. -We don't recommend that you make it point at any buffer other than the -one of which it is the mark. If you do, it will yield perfectly -consistent, but rather odd, results. +Like any marker, this marker can be set to point at any buffer you +like. If you make it point at any buffer other than the one of which +it is the mark, it will yield perfectly consistent, but rather odd, +results. We recommend that you not do it! @end defun @ignore diff -r edf631bdbb7a -r 738ce3540ffb lispref/minibuf.texi --- a/lispref/minibuf.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/minibuf.texi Sun Apr 22 12:12:29 2007 +0000 @@ -629,12 +629,11 @@ If @var{collection} is an alist (@pxref{Association Lists}), the permissible completions are the elements of the alist that are either strings, symbols, or conses whose @sc{car} is a string or symbol. -Symbols are converted to strings using @code{symbol-name}. -Other elements of the alist are ignored. (Remember that in Emacs Lisp, -the elements of alists do not @emph{have} to be conses.) As all -elements of the alist can be strings, this case actually includes -lists of strings or symbols, even though we usually do not think of -such lists as alists. +Symbols are converted to strings using @code{symbol-name}. Other +elements of the alist are ignored. (Remember that in Emacs Lisp, the +elements of alists do not @emph{have} to be conses.) In particular, a +list of strings or symbols is allowed, even though we usually do not +think of such lists as alists. @cindex obarray in completion If @var{collection} is an obarray (@pxref{Creating Symbols}), the names diff -r edf631bdbb7a -r 738ce3540ffb lispref/modes.texi --- a/lispref/modes.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/modes.texi Sun Apr 22 12:12:29 2007 +0000 @@ -256,7 +256,9 @@ The code for existing major modes follows various coding conventions, including conventions for local keymap and syntax table initialization, global names, and hooks. Please follow these conventions when you -define a new major mode. +define a new major mode. (Fundamental mode is an exception to many +of these conventions, because its definition is to present the global +state of Emacs.) This list of conventions is only partial, because each major mode should aim for consistency in general with other Emacs major modes. diff -r edf631bdbb7a -r 738ce3540ffb lispref/nonascii.texi --- a/lispref/nonascii.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/nonascii.texi Sun Apr 22 12:12:29 2007 +0000 @@ -111,6 +111,13 @@ Return @code{t} if @var{string} is a multibyte string. @end defun +@defun string-bytes string +@cindex string, number of bytes +This function returns the number of bytes in @var{string}. +If @var{string} is a multibyte string, this can be greater than +@code{(length @var{string})}. +@end defun + @node Converting Representations @section Converting Text Representations diff -r edf631bdbb7a -r 738ce3540ffb lispref/os.texi --- a/lispref/os.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/os.texi Sun Apr 22 12:12:29 2007 +0000 @@ -1042,7 +1042,7 @@ @var{offset} is an integer giving the number of seconds ahead of UTC (east of Greenwich). A negative value means west of Greenwich. The second element, @var{name}, is a string giving the name of the time -zone. Both elements change when daylight savings time begins or ends; +zone. Both elements change when daylight saving time begins or ends; if the user has specified a time zone that does not use a seasonal time adjustment, then the value is constant through time. @@ -1125,7 +1125,7 @@ The day of week, as an integer between 0 and 6, where 0 stands for Sunday. @item dst -@code{t} if daylight savings time is effect, otherwise @code{nil}. +@code{t} if daylight saving time is effect, otherwise @code{nil}. @item zone An integer indicating the time zone, as the number of seconds east of Greenwich. @@ -1145,11 +1145,11 @@ yourself before you call @code{encode-time}. The optional argument @var{zone} defaults to the current time zone and -its daylight savings time rules. If specified, it can be either a list +its daylight saving time rules. If specified, it can be either a list (as you would get from @code{current-time-zone}), a string as in the @code{TZ} environment variable, @code{t} for Universal Time, or an integer (as you would get from @code{decode-time}). The specified -zone is used without any further alteration for daylight savings time. +zone is used without any further alteration for daylight saving time. If you pass more than seven arguments to @code{encode-time}, the first six are used as @var{seconds} through @var{year}, the last argument is @@ -1697,7 +1697,7 @@ @subsection Recording Input @defun recent-keys -This function returns a vector containing the last 100 input events from +This function returns a vector containing the last 300 input events from the keyboard or mouse. All input events are included, whether or not they were used as parts of key sequences. Thus, you always get the last 100 input events, not counting events generated by keyboard macros. diff -r edf631bdbb7a -r 738ce3540ffb lispref/sequences.texi --- a/lispref/sequences.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/sequences.texi Sun Apr 22 12:12:29 2007 +0000 @@ -111,12 +111,8 @@ @end example @end defun -@defun string-bytes string -@cindex string, number of bytes -This function returns the number of bytes in @var{string}. -If @var{string} is a multibyte string, this is greater than -@code{(length @var{string})}. -@end defun +@noindent +See also @code{string-bytes}, in @ref{Text Representations}. @defun elt sequence index @cindex elements of sequences diff -r edf631bdbb7a -r 738ce3540ffb lispref/strings.texi --- a/lispref/strings.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/strings.texi Sun Apr 22 12:12:29 2007 +0000 @@ -821,18 +821,19 @@ @cindex field width @cindex padding - All the specification characters allow an optional ``width,'' which -is a digit-string between the @samp{%} and the character. If the + A specification can have a @dfn{width}, which is a signed decimal +number between the @samp{%} and the specification character. If the printed representation of the object contains fewer characters than -this width, then it is padded. The padding is on the left if the -width is positive (or starts with zero) and on the right if the -width is negative. The padding character is normally a space, but if -the width starts with a zero, zeros are used for padding. Some of -these conventions are ignored for specification characters for which -they do not make sense. That is, @samp{%s}, @samp{%S} and @samp{%c} -accept a width starting with 0, but still pad with @emph{spaces} on -the left. Also, @samp{%%} accepts a width, but ignores it. Here are -some examples of padding: +this width, @code{format} extends it with padding. The padding goes +on the left if the width is positive (or starts with zero) and on the +right if the width is negative. The padding character is normally a +space, but it's @samp{0} if the width starts with a zero. + + Some of these conventions are ignored for specification characters +for which they do not make sense. That is, @samp{%s}, @samp{%S} and +@samp{%c} accept a width starting with 0, but still pad with +@emph{spaces} on the left. Also, @samp{%%} accepts a width, but +ignores it. Here are some examples of padding: @example (format "%06d is padded on the left with zeros" 123) @@ -842,15 +843,16 @@ @result{} "123 is padded on the right" @end example +@noindent If the width is too small, @code{format} does not truncate the object's printed representation. Thus, you can use a width to specify a minimum spacing between columns with no risk of losing information. - In the following three examples, @samp{%7s} specifies a minimum width -of 7. In the first case, the string inserted in place of @samp{%7s} has -only 3 letters, so 4 blank spaces are inserted for padding. In the -second case, the string @code{"specification"} is 13 letters wide but is -not truncated. In the third case, the padding is on the right. + In the following three examples, @samp{%7s} specifies a minimum +width of 7. In the first case, the string inserted in place of +@samp{%7s} has only 3 letters, it needs 4 blank spaces as padding. In +the second case, the string @code{"specification"} is 13 letters wide +but is not truncated. In the third case, the padding is on the right. @smallexample @group @@ -873,32 +875,35 @@ @end smallexample @cindex precision in format specifications - All the specification characters allow an optional ``precision'' + All the specification characters allow an optional @dfn{precision} before the character (after the width, if present). The precision is a decimal-point @samp{.} followed by a digit-string. For the floating-point specifications (@samp{%e}, @samp{%f}, @samp{%g}), the precision specifies how many decimal places to show; if zero, the decimal-point itself is also omitted. For @samp{%s} and @samp{%S}, -the precision truncates the string to the given width, so -@samp{%.3s} shows only the first three characters of the -representation for @var{object}. Precision is ignored for other -specification characters. +the precision truncates the string to the given width, so @samp{%.3s} +shows only the first three characters of the representation for +@var{object}. Precision has no effect for other specification +characters. @cindex flags in format specifications -Immediately after the @samp{%} and before the optional width and + Immediately after the @samp{%} and before the optional width and precision, you can put certain ``flag'' characters. -A space character inserts a space for positive numbers, a plus character -inserts a plus sign (otherwise nothing is inserted for positive -numbers). These flags are ignored except for @samp{%d}, @samp{%e}, -@samp{%f}, @samp{%g}, and if both flags are present the space is -ignored. + @samp{+} as a flag inserts a plus sign before a positive number, so +that it always has a sign. A space character as flag inserts a space +before a positive number. (Otherwise, positive numbers start with the +first digit.) Either of these two flags ensures that positive numbers +and negative numbers use the same number of columns. These flags are +ignored except for @samp{%d}, @samp{%e}, @samp{%f}, @samp{%g}, and if +both flags are used, the @samp{+} takes precedence. -The flag @samp{#} indicates ``alternate form.'' For @samp{%o} it -ensures that the result begins with a 0. For @samp{%x} and @samp{%X} -the result is prefixed with @samp{0x} or @samp{0X}. For @samp{%e}, -@samp{%f}, and @samp{%g} a decimal point is always shown even if the -precision is zero. + The flag @samp{#} specifies an ``alternate form'' which depends on +the format in use. For @samp{%o} it ensures that the result begins +with a @samp{0}. For @samp{%x} and @samp{%X}, it prefixes the result +with @samp{0x} or @samp{0X}. For @samp{%e}, @samp{%f}, and @samp{%g}, +the @samp{#} flag means include a decimal point even if the precision +is zero. @node Case Conversion @comment node-name, next, previous, up diff -r edf631bdbb7a -r 738ce3540ffb lispref/syntax.texi --- a/lispref/syntax.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/syntax.texi Sun Apr 22 12:12:29 2007 +0000 @@ -873,7 +873,8 @@ @defopt parse-sexp-ignore-comments @cindex skipping comments If the value is non-@code{nil}, then comments are treated as -whitespace by the functions in this section and by @code{forward-sexp}. +whitespace by the functions in this section and by @code{forward-sexp}, +@code{scan-lists} and @code{scan-sexps}. @end defopt @vindex parse-sexp-lookup-properties diff -r edf631bdbb7a -r 738ce3540ffb lispref/variables.texi --- a/lispref/variables.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/lispref/variables.texi Sun Apr 22 12:12:29 2007 +0000 @@ -1654,10 +1654,21 @@ processing of file local variables. @defopt enable-local-variables -This variable controls whether to process file local variables. A -value of @code{t} means to process them, querying the user if unsafe -variables are encountered; @code{nil} means ignore them; anything else -means to query the user for each file. The default value is @code{t}. +This variable controls whether to process file local variables. +The possible values are: + +@table @asis +@item @code{t} (the default) +Set the safe variables, and query (once) about any unsafe variables. +@item @code{:safe} +Set only the safe variables and do not query. +@item @code{:all} +Set all the variables and do not query. +@item @code{nil} +Don't set any variables. +@item anything else +Query (once) about all the variables. +@end table @end defopt @defun hack-local-variables &optional mode-only diff -r edf631bdbb7a -r 738ce3540ffb mac/ChangeLog --- a/mac/ChangeLog Sun Apr 22 11:42:03 2007 +0000 +++ b/mac/ChangeLog Sun Apr 22 12:12:29 2007 +0000 @@ -1,3 +1,8 @@ +2007-03-20 YAMAMOTO Mitsuharu + + * makefile.MPW (dired.c.x, editfns.c.x, fileio.c.x, lread.c.x) + (print.c.x, term.c.x): Depend on BLOCKINPUT_H_GROUP. + 2007-02-13 YAMAMOTO Mitsuharu * inc/config.h: Sync with src/config.in. diff -r edf631bdbb7a -r 738ce3540ffb mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings Sun Apr 22 11:42:03 2007 +0000 +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings Sun Apr 22 12:12:29 2007 +0000 @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "22.0.95"; -CFBundleGetInfoString = "22.0.95, Copyright (C) 2007 Free Software Foundation, Inc."; +CFBundleShortVersionString = "22.0.96"; +CFBundleGetInfoString = "22.0.96, Copyright (C) 2007 Free Software Foundation, Inc."; diff -r edf631bdbb7a -r 738ce3540ffb mac/makefile.MPW --- a/mac/makefile.MPW Sun Apr 22 11:42:03 2007 +0000 +++ b/mac/makefile.MPW Sun Apr 22 12:12:29 2007 +0000 @@ -374,7 +374,7 @@ "{Src}coding.h" ¶ "{Src}ccl.h" ¶ "{Src}regex.h" ¶ - "{Src}blockinput.h" + {BLOCKINPUT_H_GROUP} {Src}dispnew.c.x Ä ¶ {CONFIG_H_GROUP} ¶ @@ -427,7 +427,7 @@ {WINDOW_H_GROUP} ¶ "{Src}systime.h" ¶ "{Includes}sys:time.h" ¶ - "{Src}blockinput.h" + {BLOCKINPUT_H_GROUP} {Src}emacs.c.x Ä ¶ {CONFIG_H_GROUP} ¶ @@ -471,7 +471,7 @@ "{Src}systime.h" ¶ "{Includes}sys:time.h" ¶ "{Src}commands.h" ¶ - "{Src}blockinput.h" + {BLOCKINPUT_H_GROUP} {Src}filemode.c.x Ä ¶ {CONFIG_H_GROUP} ¶ @@ -640,7 +640,8 @@ "{Includes}epaths.h" ¶ "{Src}commands.h" ¶ "{Src}keyboard.h" ¶ - "{Src}termhooks.h" + "{Src}termhooks.h" ¶ + {BLOCKINPUT_H_GROUP} {Src}macros.c.x Ä ¶ {CONFIG_H_GROUP} ¶ @@ -684,7 +685,8 @@ {DISPEXTERN_H_GROUP} ¶ "{Src}termchar.h" ¶ "{Src}keyboard.h" ¶ - {INTERVALS_H_GROUP} + {INTERVALS_H_GROUP} ¶ + {BLOCKINPUT_H_GROUP} {Src}process.c.x Ä ¶ {CONFIG_H_GROUP} ¶ @@ -791,7 +793,8 @@ "{Src}cm.h" ¶ "{Src}macterm.h" ¶ "{Src}macgui.h" ¶ - "{Src}frame.h" + "{Src}frame.h" ¶ + {BLOCKINPUT_H_GROUP} {Src}termcap.c.x Ä ¶ {CONFIG_H_GROUP} ¶ diff -r edf631bdbb7a -r 738ce3540ffb mac/src/Emacs.r --- a/mac/src/Emacs.r Sun Apr 22 11:42:03 2007 +0000 +++ b/mac/src/Emacs.r Sun Apr 22 12:12:29 2007 +0000 @@ -221,10 +221,10 @@ 0x22, /* Major revision in BCD */ 0x0, /* Minor revision in BCD */ alpha, /* development, alpha, beta, or final (release) */ - 95, /* Non-final release # */ + 96, /* Non-final release # */ 0, /* Region code */ - "22.0.95", /* Short version number */ - "22.0.95, Copyright \0xa9 2007 " + "22.0.96", /* Short version number */ + "22.0.96, Copyright \0xa9 2007 " "Free Software Foundation, Inc." /* Long version number */ }; diff -r edf631bdbb7a -r 738ce3540ffb man/ChangeLog --- a/man/ChangeLog Sun Apr 22 11:42:03 2007 +0000 +++ b/man/ChangeLog Sun Apr 22 12:12:29 2007 +0000 @@ -1,3 +1,42 @@ +2007-03-21 Glenn Morris + + * eshell.texi (Known problems): Emacs 22 comes with eshell 2.4.2. + +2007-03-19 Chong Yidong + + * eshell.texi (Known problems): Emacs 21 -> 22. + + * cc-mode.texi (Performance Issues): Update note about 21.3 to 22.1. + +2007-03-18 Jay Belanger + + * calc.texi (Time Zones): Mention that the DST rules changed in 2007. + +2007-03-12 Glenn Morris + + * calc.texi (Time Zones): Switch to new North America DST rule. + + * calendar.texi, emacs.texi (Daylight Saving): Rename node from + "Daylight Savings". + + * calc.texi, calendar.texi: Replace "daylight savings" with "daylight + saving" in text throughout. + +2007-03-11 Andreas Seltenreich + + * gnus.texi (Mail and Post): Update documentation for gnus-user-agent. + The variable now uses a list of symbols instead of just a symbol. + Reported by Christoph Conrad . + +2007-03-06 Romain Francoise + + * faq.texi (New in Emacs 22): Don't say "now" too much. Add MH-E to + new packages, and mention Gnus update. + +2007-03-04 Richard Stallman + + * custom.texi (Safe File Variables): Minor correction. + 2007-02-27 Katsumi Yamaoka * gnus.texi (NNTP): Mention nntp-never-echoes-commands and @@ -306,9 +345,9 @@ 2006-12-24 Kevin Ryde - * calendar.texi (Holidays): US daylight savings begins second Sunday + * calendar.texi (Holidays): US daylight saving begins second Sunday in March for 2007 onwards. - (Daylight Savings): Show new US default daylight savings rules, 2nd + (Daylight Savings): Show new US default daylight saving rules, 2nd Sun in Mar to 1st Sun in Nov, now in cal-dst.el. 2006-12-23 Chong Yidong diff -r edf631bdbb7a -r 738ce3540ffb man/calc.texi --- a/man/calc.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/man/calc.texi Sun Apr 22 12:12:29 2007 +0000 @@ -17364,31 +17364,32 @@ @noindent @cindex Time zones -@cindex Daylight savings time -Time zones and daylight savings time are a complicated business. +@cindex Daylight saving time +Time zones and daylight saving time are a complicated business. The conversions to and from Julian and Unix-style dates automatically -compute the correct time zone and daylight savings adjustment to use, +compute the correct time zone and daylight saving adjustment to use, provided they can figure out this information. This section describes Calc's time zone adjustment algorithm in detail, in case you want to do conversions in different time zones or in case Calc's algorithms can't determine the right correction to use. -Adjustments for time zones and daylight savings time are done by +Adjustments for time zones and daylight saving time are done by @kbd{t U}, @kbd{t J}, @kbd{t N}, and @kbd{t C}, but not by any other commands. In particular, @samp{ - } evaluates -to exactly 30 days even though there is a daylight-savings +to exactly 30 days even though there is a daylight-saving transition in between. This is also true for Julian pure dates: @samp{julian() - julian()}. But Julian -and Unix date/times will adjust for daylight savings time: +and Unix date/times will adjust for daylight saving time: using Calc's +default daylight saving time rule (see the explanation below), @samp{julian(<12am may 1 1991>) - julian(<12am apr 1 1991>)} -evaluates to @samp{29.95834} (that's 29 days and 23 hours) -because one hour was lost when daylight savings commenced on +evaluates to @samp{29.95833} (that's 29 days and 23 hours) +because one hour was lost when daylight saving commenced on April 7, 1991. In brief, the idiom @samp{julian(@var{date1}) - julian(@var{date2})} computes the actual number of 24-hour periods between two dates, whereas @samp{@var{date1} - @var{date2}} computes the number of calendar -days between two dates without taking daylight savings into account. +days between two dates without taking daylight saving into account. @pindex calc-time-zone @ignore @@ -17400,7 +17401,7 @@ seconds difference from Greenwich mean time (GMT). If the argument is a number, the result is simply that value multiplied by 3600. Typical arguments for North America are 5 (Eastern) or 8 (Pacific). If -Daylight Savings time is in effect, one hour should be subtracted from +Daylight Saving time is in effect, one hour should be subtracted from the normal difference. If you give a prefix of plain @kbd{C-u}, @code{calc-time-zone} (like other @@ -17411,12 +17412,12 @@ adjustment. The time-zone argument can also be an HMS form, or it can be a variable which is a time zone name in upper- or lower-case. For example @samp{tzone(PST) = tzone(8)} and @samp{tzone(pdt) = tzone(7)} -(for Pacific standard and daylight savings times, respectively). +(for Pacific standard and daylight saving times, respectively). North American and European time zone names are defined as follows; note that for each time zone there is one name for standard time, -another for daylight savings time, and a third for ``generalized'' time -in which the daylight savings adjustment is computed from context. +another for daylight saving time, and a third for ``generalized'' time +in which the daylight saving adjustment is computed from context. @smallexample @group @@ -17441,7 +17442,7 @@ @smallexample @group ( ( "PST" 8 0 ) ; Name as an upper-case string, then standard - ( "PDT" 8 -1 ) ; adjustment, then daylight savings adjustment. + ( "PDT" 8 -1 ) ; adjustment, then daylight saving adjustment. ( "PGT" 8 "PST" "PDT" ) ) ; Generalized time zone. @end group @end smallexample @@ -17464,10 +17465,10 @@ command. If the time zone name found is one of the standard or daylight -savings zone names from the above table, and Calc's internal -daylight savings algorithm says that time and zone are consistent +saving zone names from the above table, and Calc's internal +daylight saving algorithm says that time and zone are consistent (e.g., @code{PDT} accompanies a date that Calc's algorithm would also -consider to be daylight savings, or @code{PST} accompanies a date +consider to be daylight saving, or @code{PST} accompanies a date that Calc would consider to be standard time), then Calc substitutes the corresponding generalized time zone (like @code{PGT}). @@ -17484,38 +17485,41 @@ arguments do the same thing as @samp{tzone()}. If the current time zone is a generalized time zone, e.g., @code{EGT}, Calc examines the date being converted to tell whether to use standard -or daylight savings time. But if the current time zone is explicit, +or daylight saving time. But if the current time zone is explicit, e.g., @code{EST} or @code{EDT}, then that adjustment is used exactly -and Calc's daylight savings algorithm is not consulted. - -Some places don't follow the usual rules for daylight savings time. -The state of Arizona, for example, does not observe daylight savings +and Calc's daylight saving algorithm is not consulted. + +Some places don't follow the usual rules for daylight saving time. +The state of Arizona, for example, does not observe daylight saving time. If you run Calc during the winter season in Arizona, the Unix @code{date} command will report @code{MST} time zone, which Calc will change to @code{MGT}. If you then convert a time that lies in the summer months, Calc will apply an incorrect daylight -savings time adjustment. To avoid this, set your @code{TimeZone} +saving time adjustment. To avoid this, set your @code{TimeZone} variable explicitly to @code{MST} to force the use of standard, -non-daylight-savings time. +non-daylight-saving time. @vindex math-daylight-savings-hook @findex math-std-daylight-savings -By default Calc always considers daylight savings time to begin at -2 a.m.@: on the first Sunday of April, and to end at 2 a.m.@: on the -last Sunday of October. This is the rule that has been in effect -in North America since 1987. If you are in a country that uses -different rules for computing daylight savings time, you have two -choices: Write your own daylight savings hook, or control time -zones explicitly by setting the @code{TimeZone} variable and/or +By default Calc always considers daylight saving time to begin at +2 a.m.@: on the second Sunday of March (for years from 2007 on) or on +the last Sunday in April (for years before 2007), and to end at 2 a.m.@: +on the first Sunday of November. (for years from 2007 on) or the last +Sunday in October (for years before 2007). These are the rules that have +been in effect in much of North America since 1966 and takes into +account the rule change that began in 2007. If you are in a +country that uses different rules for computing daylight saving time, +you have two choices: Write your own daylight saving hook, or control +time zones explicitly by setting the @code{TimeZone} variable and/or always giving a time-zone argument for the conversion functions. The Lisp variable @code{math-daylight-savings-hook} holds the -name of a function that is used to compute the daylight savings +name of a function that is used to compute the daylight saving adjustment for a given date. The default is @code{math-std-daylight-savings}, which computes an adjustment (either 0 or @mathit{-1}) using the North American rules given above. -The daylight savings hook function is called with four arguments: +The daylight saving hook function is called with four arguments: The date, as a floating-point number in standard Calc format; a six-element list of the date decomposed into year, month, day, hour, minute, and second, respectively; a string which contains @@ -17525,18 +17529,18 @@ @findex math-prev-weekday-in-month The Lisp function @code{math-prev-weekday-in-month} is useful for -daylight savings computations. This is an internal version of +daylight saving computations. This is an internal version of the user-level @code{pwday} function described in the previous section. It takes four arguments: The floating-point date value, the corresponding six-element date list, the day-of-month number, and the weekday number (0-6). -The default daylight savings hook ignores the time zone name, but a +The default daylight saving hook ignores the time zone name, but a more sophisticated hook could use different algorithms for different time zones. It would also be possible to use different algorithms depending on the year number, but the default hook always uses the algorithm for 1987 and later. Here is a listing of the default -daylight savings hook: +daylight saving hook: @smallexample (defun math-std-daylight-savings (date dt zone bump) @@ -17566,25 +17570,25 @@ and reasonably around the 2 a.m.@: transition in each direction. There is a ``missing'' hour between 2 a.m.@: and 3 a.m.@: at the -beginning of daylight savings time; converting a date/time form that +beginning of daylight saving time; converting a date/time form that falls in this hour results in a time value for the following hour, -from 3 a.m.@: to 4 a.m. At the end of daylight savings time, the +from 3 a.m.@: to 4 a.m. At the end of daylight saving time, the hour from 1 a.m.@: to 2 a.m.@: repeats itself; converting a date/time form that falls in this hour results in a time value for the first manifestation of that time (@emph{not} the one that occurs one hour later). If @code{math-daylight-savings-hook} is @code{nil}, then the -daylight savings adjustment is always taken to be zero. +daylight saving adjustment is always taken to be zero. In algebraic formulas, @samp{tzone(@var{zone}, @var{date})} computes the time zone adjustment for a given zone name at a given date. The @var{date} is ignored unless @var{zone} is a generalized time zone. If @var{date} is a date form, the -daylight savings computation is applied to it as it appears. +daylight saving computation is applied to it as it appears. If @var{date} is a numeric date value, it is adjusted for the -daylight-savings version of @var{zone} before being given to -the daylight savings hook. This odd-sounding rule ensures -that the daylight-savings computation is always done in +daylight-saving version of @var{zone} before being given to +the daylight saving hook. This odd-sounding rule ensures +that the daylight-saving computation is always done in local time, not in the GMT time that a numeric @var{date} is typically represented in. @@ -17593,9 +17597,9 @@ @end ignore @tindex dsadj The @samp{dsadj(@var{date}, @var{zone})} function computes the -daylight savings adjustment that is appropriate for @var{date} in +daylight saving adjustment that is appropriate for @var{date} in time zone @var{zone}. If @var{zone} is explicitly in or not in -daylight savings time (e.g., @code{PDT} or @code{PST}) the +daylight saving time (e.g., @code{PDT} or @code{PST}) the @var{date} is ignored. If @var{zone} is a generalized time zone, the algorithms described above are used. If @var{zone} is omitted, the computation is done for the current time zone. diff -r edf631bdbb7a -r 738ce3540ffb man/calendar.texi --- a/man/calendar.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/man/calendar.texi Sun Apr 22 12:12:29 2007 +0000 @@ -43,7 +43,7 @@ * Diary:: Displaying events from your diary. * Appointments:: Reminders when it's time to do something. * Importing Diary:: Converting diary events to/from other formats. -* Daylight Savings:: How to specify when daylight savings time is active. +* Daylight Saving:: How to specify when daylight saving time is active. * Time Intervals:: Keeping track of time intervals. @ifnottex * Advanced Calendar/Diary Usage:: Advanced Calendar/Diary customization. @@ -604,8 +604,8 @@ @code{calendar-standard-time-zone-name} and @code{calendar-daylight-time-zone-name} are the abbreviations used in your time zone. Emacs displays the times of sunrise and sunset -@emph{corrected for daylight savings time}. @xref{Daylight Savings}, -for how daylight savings time is determined. +@emph{corrected for daylight saving time}. @xref{Daylight Saving}, +for how daylight saving time is determined. As a user, you might find it convenient to set the calendar location variables for your usual physical location in your @file{.emacs} file. @@ -646,9 +646,9 @@ year. The dates and times given for the phases of the moon are given in -local time (corrected for daylight savings, when appropriate); but if +local time (corrected for daylight saving, when appropriate); but if the variable @code{calendar-time-zone} is void, Coordinated Universal -Time (the Greenwich time zone) is used. @xref{Daylight Savings}. +Time (the Greenwich time zone) is used. @xref{Daylight Saving}. @node Other Calendars @section Conversion To and From Other Calendars @@ -1553,14 +1553,14 @@ file, mark the relevant area, and call @code{icalendar-export-region}. In both cases the result is appended to the target file. -@node Daylight Savings -@section Daylight Savings Time -@cindex daylight savings time +@node Daylight Saving +@section Daylight Saving Time +@cindex daylight saving time Emacs understands the difference between standard time and daylight -savings time---the times given for sunrise, sunset, solstices, +saving time---the times given for sunrise, sunset, solstices, equinoxes, and the phases of the moon take that into account. The rules -for daylight savings time vary from place to place and have also varied +for daylight saving time vary from place to place and have also varied historically from year to year. To do the job properly, Emacs needs to know which rules to use. @@ -1577,12 +1577,12 @@ These values should be Lisp expressions that refer to the variable @code{year}, and evaluate to the Gregorian date on which daylight -savings time starts or (respectively) ends, in the form of a list +saving time starts or (respectively) ends, in the form of a list @code{(@var{month} @var{day} @var{year})}. The values should be -@code{nil} if your area does not use daylight savings time. +@code{nil} if your area does not use daylight saving time. Emacs uses these expressions to determine the starting date of -daylight savings time for the holiday list and for correcting times of +daylight saving time for the holiday list and for correcting times of day in the solar and lunar calculations. The values for Cambridge, Massachusetts are as follows: @@ -1595,7 +1595,7 @@ @noindent That is, the second 0th day (Sunday) of the third month (March) in the year specified by @code{year}, and the first Sunday of the eleventh month -(November) of that year. If daylight savings time were +(November) of that year. If daylight saving time were changed to start on October 1, you would set @code{calendar-daylight-savings-starts} to this: @@ -1603,13 +1603,13 @@ (list 10 1 year) @end example - If there is no daylight savings time at your location, or if you want + If there is no daylight saving time at your location, or if you want all times in standard time, set @code{calendar-daylight-savings-starts} and @code{calendar-daylight-savings-ends} to @code{nil}. @vindex calendar-daylight-time-offset The variable @code{calendar-daylight-time-offset} specifies the -difference between daylight savings time and standard time, measured in +difference between daylight saving time and standard time, measured in minutes. The value for Cambridge, Massachusetts is 60. @c @vindex calendar-daylight-savings-starts-time too long! @@ -1617,7 +1617,7 @@ The two variables @code{calendar-daylight-savings-starts-time} and @code{calendar-daylight-savings-ends-time} specify the number of minutes after midnight local time when the transition to and from daylight -savings time should occur. For Cambridge, Massachusetts both variables' +saving time should occur. For Cambridge, Massachusetts both variables' values are 120. @node Time Intervals diff -r edf631bdbb7a -r 738ce3540ffb man/cc-mode.texi --- a/man/cc-mode.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/man/cc-mode.texi Sun Apr 22 12:12:29 2007 +0000 @@ -6701,7 +6701,7 @@ is set to @code{nil} by default, since the Emacs-friendly styles should be more common (and encouraged!). Note that this variable has no effect in Emacs since the necessary built-in functions don't exist (in Emacs -21.3 as of this writing in May 2003). +22.1 as of this writing in February 2007). Text properties are used to speed up skipping over syntactic whitespace, i.e. comments and preprocessor directives. Indenting a line after a diff -r edf631bdbb7a -r 738ce3540ffb man/custom.texi --- a/man/custom.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/man/custom.texi Sun Apr 22 12:12:29 2007 +0000 @@ -1247,7 +1247,7 @@ variable's value are @code{t}, @code{nil}, and anything else, just as for @code{enable-local-variables}. The default is @code{maybe}, which is neither @code{t} nor @code{nil}, so normally Emacs does ask for -confirmation about processes @code{eval} variables. +confirmation about processing @code{eval} variables. @vindex safe-local-eval-forms But there is an exception. The @code{safe-local-eval-forms} is a diff -r edf631bdbb7a -r 738ce3540ffb man/emacs.texi --- a/man/emacs.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/man/emacs.texi Sun Apr 22 12:12:29 2007 +0000 @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 22.0.95 +@set EMACSVER 22.0.96 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual}, @@ -812,7 +812,7 @@ * Diary:: Displaying events from your diary. * Appointments:: Reminders when it's time to do something. * Importing Diary:: Converting diary events to/from other formats. -* Daylight Savings:: How to specify when daylight savings time is active. +* Daylight Saving:: How to specify when daylight saving time is active. * Time Intervals:: Keeping track of time intervals. * Advanced Calendar/Diary Usage:: Advanced Calendar/Diary customization. diff -r edf631bdbb7a -r 738ce3540ffb man/eshell.texi --- a/man/eshell.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/man/eshell.texi Sun Apr 22 12:12:29 2007 +0000 @@ -474,8 +474,8 @@ @cindex known bugs @cindex bugs, known -Below is complete list of known problems with Eshell version 2.4.1, -which is the version included with Emacs 21.1. +Below is complete list of known problems with Eshell version 2.4.2, +which is the version included with Emacs 22. @table @asis @item Documentation incomplete diff -r edf631bdbb7a -r 738ce3540ffb man/faq.texi --- a/man/faq.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/man/faq.texi Sun Apr 22 12:12:29 2007 +0000 @@ -1147,39 +1147,40 @@ @cindex Recently introduced features @cindex Default features -Font Lock mode, auto-compression mode, and file name shadow mode are now -enabled by default. On graphics displays it is now possible to follow -links with @kbd{mouse-1}, and the modeline of the selected window is now -highlighted. Window fringes are now customizable. The minibuffer -prompt is now displayed in a distinct face. +Font Lock mode, auto-compression mode, and file name shadow mode are +enabled by default. On graphics displays it is possible to follow links +with @kbd{mouse-1}. The modeline of the selected window is now +highlighted. Window fringes are customizable. The minibuffer prompt is +displayed in a distinct face. Emacs now reads abbrev definitions automatically at startup. The -maximum size of buffers has been doubled and is now 256M on 32-bit -machines. Grep mode is now separate from Compilation mode and has many -new specific options and commands. +maximum size of buffers has been doubled and is 256M on 32-bit machines. +Grep mode is separate from Compilation mode and has many new specific +options and commands. The original Emacs macro system has been replaced by the new Kmacro package, which provides many new commands and features and a simple -interface that uses the function keys F3 and F4. Macros are now stored +interface that uses the function keys F3 and F4. Macros are stored in a macro ring, and can be debugged and edited interactively. The GUD (Grand Unified Debugger) package can now be used with a full graphical user interface to the debugger which provides many features found in traditional development environments, making it easy to manipulate breakpoints, add watch points, display the call stack, etc. -Breakpoints are now displayed in the source buffer. +Breakpoints are displayed in the source buffer. @cindex GTK+ Toolkit @cindex Drag-and-drop @cindex Mouse wheel -Emacs can now be built with GTK+ widgets, and supports drag-and-drop -operation on X. Mouse wheel support is now enabled by default. +Emacs can be built with GTK+ widgets, and supports drag-and-drop +operation on X. Mouse wheel support is enabled by default. @cindex New modes -Many new modes and packages have been included in Emacs, such as Calc, -Tramp and URL, as well as IDO, CUA, rcirc, ERC, conf-mode, python-mode, -table, tumme, SES, ruler, Flymake, Org, PGG, wdired, t-mouse, longlines, -dns-mode, savehist, Password, Printing, Reveal, etc. +Many new modes and packages have been included in Emacs, such as MH-E, +Calc, Tramp and URL, as well as IDO, CUA, rcirc, ERC, conf-mode, +python-mode, table, tumme, SES, ruler, Flymake, Org, PGG, wdired, +t-mouse, longlines, dns-mode, savehist, Password, Printing, Reveal, etc. +Gnus has been updated to version 5.11. @cindex Multilingual Environment Leim is now part of Emacs. Unicode support has been much improved, and diff -r edf631bdbb7a -r 738ce3540ffb man/gnus.texi --- a/man/gnus.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/man/gnus.texi Sun Apr 22 12:12:29 2007 +0000 @@ -11799,12 +11799,12 @@ @cindex User-Agent This variable controls which information should be exposed in the -User-Agent header. It can be one of the symbols @code{gnus} (show only -Gnus version), @code{emacs-gnus} (show only Emacs and Gnus versions), -@code{emacs-gnus-config} (same as @code{emacs-gnus} plus system -configuration), @code{emacs-gnus-type} (same as @code{emacs-gnus} plus -system type) or a custom string. If you set it to a string, be sure to -use a valid format, see RFC 2616. +User-Agent header. It can be a list of symbols or a string. Valid +symbols are @code{gnus} (show Gnus version) and @code{emacs} (show Emacs +version). In addition to the Emacs version, you can add @code{codename} +(show (S)XEmacs codename) or either @code{config} (show system +configuration) or @code{type} (show system type). If you set it to a +string, be sure to use a valid format, see RFC 2616. @end table diff -r edf631bdbb7a -r 738ce3540ffb man/pgg.texi --- a/man/pgg.texi Sun Apr 22 11:42:03 2007 +0000 +++ b/man/pgg.texi Sun Apr 22 12:12:29 2007 +0000 @@ -272,7 +272,7 @@ When @code{gpg-agent} is not being used, PGG prompts for a passphrase through Emacs. It also has its own passphrase caching mechanism, -which is controlled by the variable @code{pgg-read-passphrase} (see +which is controlled by the variable @code{pgg-cache-passphrase} (see below). There is a security risk in handling passphrases through PGG rather diff -r edf631bdbb7a -r 738ce3540ffb nt/ChangeLog --- a/nt/ChangeLog Sun Apr 22 11:42:03 2007 +0000 +++ b/nt/ChangeLog Sun Apr 22 12:12:29 2007 +0000 @@ -1,7 +1,10 @@ +2007-03-09 Richard Stallman + + * INSTALL: Say explicitly this is not for Cygwin. + 2007-03-03 Eli Zaretskii - * INSTALL: Add URL of another site with detailed build - instructions. + * INSTALL: Add URL of another site with detailed build instructions. 2007-02-16 Glenn Morris @@ -9,8 +12,8 @@ * icons/gnu2b48t.ico, icons/gnu3b32.ico, icons/gnu3b32t.ico: * icons/gnu4g48.ico, icons/gnu4g48t.ico, icons/gnu5w32.ico: * icons/gnu5w32t.ico, icons/gnu6w48.ico, icons/gnu6w48t.ico: - * icons/gnu7.ico, icons/gnu8.ico, icons/gnu9.ico: Restore all but - two of icons deleted in previous change. + * icons/gnu7.ico, icons/gnu8.ico, icons/gnu9.ico: + Restore all but two of icons deleted in previous change. 2007-02-13 Chong Yidong @@ -21,8 +24,8 @@ * icons/gnu4g48.ico, icons/gnu6w48.ico, icons/gnu9.ico: * icons/gnu2b48t.ico, icons/gnu4g48t.ico: * icons/gnu6w48t.ico, icons/gnu2a32.ico, icons/gnu3b32.ico: - * icons/gnu5w32.ico, icons/gnu7.ico, icons/sink.ico: Unused icons - deleted. + * icons/gnu5w32.ico, icons/gnu7.ico, icons/sink.ico: + Unused icons deleted. 2007-01-31 Juanma Barranquero @@ -40,7 +43,7 @@ * nmake.defs (TEMACS_EXTRA_LINK): Remove duplicated flags from DEBUG_LINK. - (DEBUG_LINK): Remove -debugtype:both + (DEBUG_LINK): Remove -debugtype:both. 2006-12-27 Eli Zaretskii @@ -812,8 +815,7 @@ * install.bat: Pass on command line arguments to make. - * makefile.nt (fast_install): Bring commands up-to-date, and fix - typo. + * makefile.nt (fast_install): Bring commands up-to-date, and fix typo. 1999-11-21 Andrew Innes diff -r edf631bdbb7a -r 738ce3540ffb nt/INSTALL --- a/nt/INSTALL Sun Apr 22 11:42:03 2007 +0000 +++ b/nt/INSTALL Sun Apr 22 12:12:29 2007 +0000 @@ -8,8 +8,11 @@ * For the impatient Here are the concise instructions for configuring and building the - native Win32 binary of Emacs on Windows, for those who want to skip - the complex explanations and ``just do it'': + native Windows binary of Emacs, for those who want to skip the + complex explanations and ``just do it'': + + Do not use this recipe with Cygwin. For building on Cygwin, + use the normal installation instructions, ../INSTALL. 1. Change to the `nt' directory (the directory of this file): @@ -75,6 +78,11 @@ * Preliminaries + If you want to build a Cygwin port of Emacs, use the instructions in + the INSTALL file in the main Emacs directory (the parent of this + directory). These instructions are for building a native Windows + binary of Emacs. + If you used WinZip to unpack the distribution, we suggest to remove the files and unpack again with a different program! WinZip is known to create some subtle and hard to debug problems, diff -r edf631bdbb7a -r 738ce3540ffb nt/emacs.rc --- a/nt/emacs.rc Sun Apr 22 11:42:03 2007 +0000 +++ b/nt/emacs.rc Sun Apr 22 12:12:29 2007 +0000 @@ -6,8 +6,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 22,0,95,0 - PRODUCTVERSION 22,0,95,0 + FILEVERSION 22,0,96,0 + PRODUCTVERSION 22,0,96,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" - VALUE "FileVersion", "22, 0, 95, 0\0" + VALUE "FileVersion", "22, 0, 96, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" - VALUE "ProductVersion", "22, 0, 95, 0\0" + VALUE "ProductVersion", "22, 0, 96, 0\0" VALUE "OLESelfRegister", "\0" END END diff -r edf631bdbb7a -r 738ce3540ffb src/ChangeLog --- a/src/ChangeLog Sun Apr 22 11:42:03 2007 +0000 +++ b/src/ChangeLog Sun Apr 22 12:12:29 2007 +0000 @@ -1,7 +1,183 @@ -2007-03-02 Stuart D. Herring - - * keymap.c (Fkey_binding): Don't consider two-element lists as - events. +2007-03-20 YAMAMOTO Mitsuharu + + * Makefile.in (alloca.o, gtkutil.o): Depend on systime.h. + (dired.o, editfns.o, fileio.o, msdos.o): Depend on atimer.h. + (dosfns.o, window.o, fns.o, macselect.o): Depend on atimer.h and + systime.h. + (term.o, print.o, lread.o): Depend on blockinput.h, atimer.h, and + systime.h. + (macfns.o): Remove duplicate dependency on systime.h. + + * dispnew.c (Fopen_termscript): Add BLOCK_INPUT around fclose. + (Fsend_string_to_terminal): Add BLOCK_INPUT around fwrite. + + * fileio.c (do_auto_save_unwind): Add BLOCK_INPUT around fclose. + (Fdo_auto_save): Add BLOCK_INPUT around fwrite. + + * keyboard.c (record_char): Add BLOCK_INPUT around fwrite. + (Fopen_dribble_file): Add BLOCK_INPUT around fclose. + + * lread.c: Include blockinput.h. + (readchar, Fget_file_char): Add BLOCK_INPUT around getc. + (unreadchar): Add BLOCK_INPUT around ungetc. + (load_unwind): Add BLOCK_INPUT around fclose. + + * print.c: Include blockinput.h. + (Fredirect_debugging_output): Add BLOCK_INPUT around fclose. + + * process.c (Fmake_network_process) [HAVE_GETADDRINFO]: Clear + immediate_quit before calling freeaddrinfo. Add BLOCK_INPUT + around freeaddrinfo. + + * term.c: Include blockinput.h. + (write_glyphs, insert_glyphs): Add BLOCK_INPUT around fwrite. + +2007-03-19 Richard Stallman + + * keyboard.c (NUM_RECENT_KEYS): Bump up to 300. + + * buffer.c (syms_of_buffer): Doc fix. + +2007-03-18 Chong Yidong + + * image.c (pbm_load): Signal error for invalid image size. + +2007-03-18 YAMAMOTO Mitsuharu + + * macterm.c (note_mouse_movement): Don't return immediately for + LeaveNotify case. + + * macmenu.c (popup_activated_flag): New variable. + (x_activate_menubar, mac_menu_show): Set it during menu tracking. + (popup_activated): New function. + + * xdisp.c (redisplay_internal, note_mouse_highlight): Check + popup_activated for MAC_OS. + +2007-03-17 Juanma Barranquero + + * buffer.c (syms_of_buffer) : Doc fix. + Reported by Nikolaj Schumacher . + +2007-03-17 Richard Stallman + + * dired.c (file_name_completion): gcpro NAME. + +2007-03-17 Chong Yidong + + * xdisp.c (try_window_id): Increment matrix positions if the + buffer's byte count has increased, but not the character count. + +2007-03-12 Andreas Schwab + + * lisp.h: Declare check_obarray. + + * process.c (Fdelete_process): Properly handle deletion of first + element of deleted_pid_list. + (create_process): Declare pid as pid_t. + +2007-03-12 Kim F. Storm + + * process.c (sigchld_handler): Change type of pid to pid_t. + Scan deleted_pid_list explicitly to avoid using Fmember which don't + know about mark bits and make_fixnum_or_float which may malloc. + Reported by Andreas Schwab. + + * keyboard.c (read_key_sequence): Store original event into keybuf + when replaying sequence with local keymap(s) from string. + +2007-03-12 Glenn Morris + + * editfns.c (Fdecode_time, Fencode_time): Doc fix ("daylight + savings" to "daylight saving"). + +2007-03-11 Sam Steingold + + * process.c (sigchld_handler): Sleep before wait3 to avoid a busyloop. + +2007-03-11 YAMAMOTO Mitsuharu + + * macfns.c (Fx_server_vendor): Change vendor string to "Apple Inc.". + +2007-03-10 YAMAMOTO Mitsuharu + + * macterm.c [USE_CARBON_EVENTS] (mac_handle_mouse_event): + Ignore mouse wheel movement on title bar or tool bar. + +2007-03-10 Chong Yidong + + * keyboard.c (help_form_saved_window_configs): New var. + (read_char_help_form_unwind): New function. + (read_char): Don't restore window configuration if a mouse click + arrives while the help form is being displayed. + +2007-03-10 Kim F. Storm + + * xdisp.c (redisplay_window): Don't automatically select a new window + start for a contination line during mouse-click. + +2007-03-09 Jan Dj,Ad(Brv + + * xterm.c (handle_one_xevent): Ignore buttons > 3 for the tool bar. + +2007-03-09 Juanma Barranquero + + * keymap.c (Fdescribe_buffer_bindings): Check that BUFFER is valid. + +2007-03-08 Richard Stallman + + * keyboard.c (syms_of_keyboard): Doc fix. + +2007-03-08 Chong Yidong + + * minibuf.c (Ftry_completion): Don't short circuit if + completion-ignore-case is non-nil. + +2007-03-07 YAMAMOTO Mitsuharu + + * macfns.c (mac_set_scroll_bar_width, mac_frame_parm_handlers): + Undo 2006-03-06 changes. + + * macterm.c (XTset_vertical_scroll_bar) [MAC_OSX]: Don't show scroll + bar if its width is smaller than that of Aqua small scroll bar. + +2007-03-07 Stefan Monnier + + * minibuf.c (read_minibuf): Bind inhibit-read-only a bit longer so as + to handle correctly prompts with read-only property. + +2007-03-06 Jan Dj,Ad(Brv + + * sound.c (wav_play): Check header->data_length to see how much we + shall read. + (alsa_period_size): Convert ALSA period size in frames to bytes. + (alsa_write): Return if frames is zero. + +2007-03-06 Kenichi Handa + + * xselect.c (Vselection_coding_system): Documentation improved. + +2007-03-05 YAMAMOTO Mitsuharu + + * macterm.c (x_scroll_bar_create, XTread_socket): Replace #if + USE_TOOLKIT_SCROLL_BARS with #ifdef USE_TOOLKIT_SCROLL_BARS. + (x_set_window_size): Call SET_FRAME_GARBAGED. Clear window if + internal border width has changed. + + * macterm.h (struct mac_output): New member `internal_border_width'. + +2007-03-04 Richard Stallman + + * window.c (Fdisplay_buffer): Doc fix. + +2007-03-03 Glenn Morris + + * Makefile.in: Don't clear out LIB_X11_LIB, since XFT_LIBS does + not include -lX11 on Solaris. + +2007-03-02 Stuart D. Herring + + * keymap.c (Fkey_binding): Don't consider one-element lists as events. 2007-03-01 Kenichi Handa @@ -30,8 +206,8 @@ (x_scroll_bar_create, XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: Initialize bar->min_handle. - * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: New - member `min_handle'. + * macterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: + New member `min_handle'. 2007-02-23 Kim F. Storm @@ -54,11 +230,11 @@ (mac_flush_display_optional) [USE_CG_DRAWING]: New function. (x_redisplay_interface) [USE_CG_DRAWING]: Set it as handler for flush_display_optional. - [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press): New - argument MOUSE_POS. All uses changed. Set bar->dragging to + [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_press): + New argument MOUSE_POS. All uses changed. Set bar->dragging to negative integer if scroll bar handle is pressed. - [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release): Negative - bar->dragging means scroll bar handle is not dragged. + [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_release): + Negative bar->dragging means scroll bar handle is not dragged. [USE_TOOLKIT_SCROLL_BARS] (x_scroll_bar_handle_drag): Get initial offset of scroll bar handle from negative bar->dragging. (XTread_socket) [USE_TOOLKIT_SCROLL_BARS]: Modifiers for scroll @@ -93,8 +269,7 @@ * w32menu.c (current_popup_menu): Make available globally. (menubar_selection_callback): Free menu strings before pushing the - menu event into the keyboard buffer. Remove - menu_command_in_progress. + menu event into the keyboard buffer. Remove menu_command_in_progress. * w32fns.c (current_popup_menu): Use from w32menu.c. (w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: Use menubar_active @@ -364,8 +539,8 @@ 2007-01-14 YAMAMOTO Mitsuharu - * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]: Use - DisableControl for disabled items. Set default button to first + * macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]: + Use DisableControl for disabled items. Set default button to first enabled one. Use icon of application in execution. 2007-01-13 Eli Zaretskii diff -r edf631bdbb7a -r 738ce3540ffb src/ChangeLog.3 --- a/src/ChangeLog.3 Sun Apr 22 11:42:03 2007 +0000 +++ b/src/ChangeLog.3 Sun Apr 22 12:12:29 2007 +0000 @@ -5706,7 +5706,7 @@ HAVE_TIMEVAL is defined and NEED_TIME_H isn't. * systime.h: Note that the tz_dsttime field of the struct timezone - returned by gettimeofday doesn't say whether daylight savings is + returned by gettimeofday doesn't say whether daylight saving is _currently- active; rather it specifies whether it is *ever* active. (EMACS_GET_TZ_OFFSET_AND_SAVINGS): Removed `savings_flag' diff -r edf631bdbb7a -r 738ce3540ffb src/Makefile.in --- a/src/Makefile.in Sun Apr 22 11:42:03 2007 +0000 +++ b/src/Makefile.in Sun Apr 22 12:12:29 2007 +0000 @@ -403,8 +403,6 @@ #endif /* not USE_X_TOOLKIT */ #if HAVE_XFT -#undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */ -#define LIB_X11_LIB XFT_LIBS=@XFT_LIBS@ #endif /* HAVE_XFT */ @@ -1088,7 +1086,7 @@ They should define HAVE_ALLOCA. Some use the C version in alloca.c (these define C_ALLOCA in config.h). */ -alloca.o: alloca.c blockinput.h atimer.h +alloca.o: alloca.c blockinput.h atimer.h systime.h /* Nearly all the following files depend on lisp.h, but it is not included as a dependency because @@ -1121,7 +1119,7 @@ ecrt0.o: ecrt0.c $(config_h) CRT0_COMPILE ${srcdir}/ecrt0.c dired.o: dired.c commands.h buffer.h $(config_h) charset.h coding.h regex.h \ - systime.h blockinput.h + systime.h blockinput.h atimer.h dispnew.o: dispnew.c systime.h commands.h process.h frame.h \ window.h buffer.h dispextern.h termchar.h termopts.h termhooks.h cm.h \ disptab.h indent.h intervals.h \ @@ -1130,14 +1128,15 @@ doc.o: doc.c $(config_h) epaths.h buffer.h keyboard.h keymap.h charset.h doprnt.o: doprnt.c charset.h $(config_h) dosfns.o: buffer.h termchar.h termhooks.h frame.h blockinput.h window.h \ - msdos.h dosfns.h dispextern.h charset.h coding.h $(config_h) + msdos.h dosfns.h dispextern.h charset.h coding.h atimer.h systime.h \ + $(config_h) editfns.o: editfns.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \ - coding.h dispextern.h frame.h blockinput.h $(config_h) + coding.h dispextern.h frame.h blockinput.h atimer.h $(config_h) emacs.o: emacs.c commands.h systty.h syssignal.h blockinput.h process.h \ termhooks.h buffer.h atimer.h systime.h $(INTERVAL_SRC) $(config_h) \ window.h dispextern.h keyboard.h keymap.h fileio.o: fileio.c window.h buffer.h systime.h $(INTERVAL_SRC) charset.h \ - coding.h msdos.h dispextern.h blockinput.h $(config_h) + coding.h msdos.h dispextern.h blockinput.h atimer.h $(config_h) filelock.o: filelock.c buffer.h charset.h coding.h systime.h epaths.h $(config_h) filemode.o: filemode.c $(config_h) frame.o: frame.c xterm.h window.h frame.h termhooks.h commands.h keyboard.h \ @@ -1176,7 +1175,7 @@ mktime.o: mktime.c $(config_h) msdos.o: msdos.c msdos.h dosfns.h systime.h termhooks.h dispextern.h frame.h \ termopts.h termchar.h charset.h coding.h ccl.h disptab.h window.h \ - keyboard.h intervals.h buffer.h commands.h blockinput.h $(config_h) + keyboard.h intervals.h buffer.h commands.h blockinput.h atimer.h $(config_h) process.o: process.c process.h buffer.h window.h termhooks.h termopts.h \ commands.h syssignal.h systime.h systty.h syswait.h frame.h dispextern.h \ blockinput.h atimer.h charset.h coding.h ccl.h msdos.h composite.h \ @@ -1196,7 +1195,7 @@ frame.h atimer.h window.h msdos.h dosfns.h keyboard.h cm.h $(config_h) term.o: term.c termchar.h termhooks.h termopts.h $(config_h) cm.h frame.h \ disptab.h dispextern.h keyboard.h charset.h coding.h ccl.h msdos.h \ - window.h keymap.h + window.h keymap.h blockinput.h atimer.h systime.h termcap.o: termcap.c $(config_h) terminal.o: terminal.c frame.h termchar.h termhooks.h charset.h coding.h \ keyboard.h $(config_h) @@ -1213,7 +1212,8 @@ $(srcdir)/../lwlib/lwlib.h $(config_h) window.o: window.c indent.h commands.h frame.h window.h buffer.h termchar.h \ disptab.h keyboard.h dispextern.h msdos.h composite.h \ - keymap.h blockinput.h $(INTERVAL_SRC) xterm.h w32term.h macterm.h $(config_h) + keymap.h blockinput.h atimer.h systime.h $(INTERVAL_SRC) \ + xterm.h w32term.h macterm.h $(config_h) xdisp.o: xdisp.c macros.h commands.h process.h indent.h buffer.h dispextern.h coding.h \ termchar.h frame.h window.h disptab.h termhooks.h charset.h $(config_h) \ keyboard.h $(INTERVAL_SRC) region-cache.h xterm.h w32term.h macterm.h \ @@ -1238,7 +1238,8 @@ xsmfns.o: xsmfns.c $(config_h) systime.h sysselect.h termhooks.h xterm.h \ lisp.h termopts.h gtkutil.o: gtkutil.c gtkutil.h xterm.h lisp.h frame.h $(config_h) \ - blockinput.h window.h atimer.h termhooks.h keyboard.h charset.h coding.h + blockinput.h window.h atimer.h systime.h termhooks.h keyboard.h \ + charset.h coding.h hftctl.o: hftctl.c $(config_h) sound.o: sound.c dispextern.h $(config_h) @@ -1256,10 +1257,10 @@ floatfns.o: floatfns.c $(config_h) fns.o: fns.c commands.h $(config_h) frame.h buffer.h charset.h keyboard.h \ keymap.h frame.h window.h dispextern.h $(INTERVAL_SRC) coding.h md5.h \ - blockinput.h xterm.h termhooks.h + blockinput.h atimer.h systime.h xterm.h termhooks.h print.o: print.c process.h frame.h window.h buffer.h keyboard.h charset.h \ $(config_h) dispextern.h termchar.h $(INTERVAL_SRC) msdos.h composite.h \ - termchar.h + blockinput.h atimer.h systime.h lread.o: lread.c commands.h keyboard.h buffer.h epaths.h charset.h \ $(config_h) $(INTERVAL_SRC) termhooks.h coding.h msdos.h @@ -1285,14 +1286,15 @@ coding.h ccl.h $(config_h) macfns.o: macfns.c charset.h macterm.h macgui.h frame.h window.h buffer.h \ dispextern.h macgui.h fontset.h $(INTERVAL_SRC) keyboard.h blockinput.h \ - atimer.h systime.h epaths.h termhooks.h coding.h systime.h $(config_h) + atimer.h systime.h epaths.h termhooks.h coding.h $(config_h) macmenu.o: macmenu.c termhooks.h frame.h window.h dispextern.h macgui.h \ keyboard.h blockinput.h atimer.h systime.h buffer.h macterm.h $(config_h) macterm.o: blockinput.h atimer.h systime.h syssignal.h macterm.h macgui.h \ frame.h charset.h ccl.h dispextern.h fontset.h termhooks.h termopts.h \ termchar.h gnu.h disptab.h buffer.h window.h keyboard.h $(INTERVAL_SRC) \ process.h coding.h $(config_h) -macselect.o: blockinput.h macterm.h macgui.h frame.h keymap.h $(config_h) +macselect.o: blockinput.h atimer.h systime.h macterm.h macgui.h frame.h \ + keymap.h $(config_h) ${emacsapp}Contents/Resources/English.lproj: mkdir -p $@ diff -r edf631bdbb7a -r 738ce3540ffb src/buffer.c --- a/src/buffer.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/buffer.c Sun Apr 22 12:12:29 2007 +0000 @@ -5712,8 +5712,8 @@ default fashion; otherwise, the characters from the vector are delivered to the screen instead of the original character. -For example, (aset buffer-display-table ?X ?Y) will cause Emacs to display -a capital Y instead of each X character. +For example, (aset buffer-display-table ?X [?Y]) tells Emacs +to display a capital Y instead of each X character. In addition, a char-table has six extra slots to control the display of: diff -r edf631bdbb7a -r 738ce3540ffb src/dired.c --- a/src/dired.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/dired.c Sun Apr 22 12:12:29 2007 +0000 @@ -670,8 +670,15 @@ if (!NILP (predicate)) { Lisp_Object decoded; + Lisp_Object val; + struct gcpro gcpro1; + + GCPRO1 (name); decoded = Fexpand_file_name (DECODE_FILE (name), dirname); - if (NILP (call1 (predicate, decoded))) + val = call1 (predicate, decoded); + UNGCPRO; + + if (NILP (val)) continue; } @@ -694,7 +701,7 @@ compare = min (bestmatchsize, len); p1 = SDATA (bestmatch); p2 = (unsigned char *) dp->d_name; - matchsize = scmp(p1, p2, compare); + matchsize = scmp (p1, p2, compare); if (matchsize < 0) matchsize = compare; if (completion_ignore_case) diff -r edf631bdbb7a -r 738ce3540ffb src/dispnew.c --- a/src/dispnew.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/dispnew.c Sun Apr 22 12:12:29 2007 +0000 @@ -6381,7 +6381,11 @@ tty = CURTTY (); if (tty->termscript != 0) + { + BLOCK_INPUT; fclose (tty->termscript); + UNBLOCK_INPUT; + } tty->termscript = 0; if (! NILP (file)) @@ -6412,6 +6416,7 @@ /* ??? Perhaps we should do something special for multibyte strings here. */ CHECK_STRING (string); + BLOCK_INPUT; if (!t) error ("Unknown terminal device"); @@ -6425,6 +6430,7 @@ } fwrite (SDATA (string), 1, SBYTES (string), tty->output); fflush (tty->output); + UNBLOCK_INPUT; return Qnil; } diff -r edf631bdbb7a -r 738ce3540ffb src/editfns.c --- a/src/editfns.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/editfns.c Sun Apr 22 12:12:29 2007 +0000 @@ -1729,7 +1729,7 @@ between 0 and 23. DAY is an integer between 1 and 31. MONTH is an integer between 1 and 12. YEAR is an integer indicating the four-digit year. DOW is the day of week, an integer between 0 and 6, -where 0 is Sunday. DST is t if daylight savings time is effect, +where 0 is Sunday. DST is t if daylight saving time is in effect, otherwise nil. ZONE is an integer indicating the number of seconds east of Greenwich. (Note that Common Lisp has different meanings for DOW and ZONE.) */) @@ -1778,7 +1778,7 @@ ZONE defaults to the current time zone rule. This can be a string or t (as from `set-time-zone-rule'), or it can be a list \(as from `current-time-zone') or an integer (as from `decode-time') -applied without consideration for daylight savings time. +applied without consideration for daylight saving time. You can pass more than 7 arguments; then the first six arguments are used as SECOND through YEAR, and the *last* argument is used as ZONE. diff -r edf631bdbb7a -r 738ce3540ffb src/fileio.c --- a/src/fileio.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/fileio.c Sun Apr 22 12:12:29 2007 +0000 @@ -5806,7 +5806,11 @@ FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; auto_saving = 0; if (stream != NULL) - fclose (stream); + { + BLOCK_INPUT; + fclose (stream); + UNBLOCK_INPUT; + } return Qnil; } @@ -5936,6 +5940,7 @@ if (STRINGP (b->auto_save_file_name) && stream != NULL && do_handled_files == 0) { + BLOCK_INPUT; if (!NILP (b->filename)) { fwrite (SDATA (b->filename), 1, @@ -5945,6 +5950,7 @@ fwrite (SDATA (b->auto_save_file_name), 1, SBYTES (b->auto_save_file_name), stream); putc ('\n', stream); + UNBLOCK_INPUT; } if (!NILP (current_only) diff -r edf631bdbb7a -r 738ce3540ffb src/image.c --- a/src/image.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/image.c Sun Apr 22 12:12:29 2007 +0000 @@ -5744,6 +5744,14 @@ } else { + if (raw_p && (p + 3 * height * width > end)) + { + x_destroy_x_image (ximg); + image_error ("Invalid image size in image `%s'", + img->spec, Qnil); + goto error; + } + for (y = 0; y < height; ++y) for (x = 0; x < width; ++x) { diff -r edf631bdbb7a -r 738ce3540ffb src/keyboard.c --- a/src/keyboard.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/keyboard.c Sun Apr 22 12:12:29 2007 +0000 @@ -138,10 +138,10 @@ do not execute it; call disabled-command-function's value instead. */ Lisp_Object Qdisabled, Qdisabled_command_function; -#define NUM_RECENT_KEYS (100) +#define NUM_RECENT_KEYS (300) int recent_keys_index; /* Index for storing next element into recent_keys */ int total_keys; /* Total number of elements stored into recent_keys */ -Lisp_Object recent_keys; /* A vector, holding the last 100 keystrokes */ +Lisp_Object recent_keys; /* Vector holds the last NUM_RECENT_KEYS keystrokes */ /* Vector holding the key sequence that invoked the current command. It is reused for each command, and it may be longer than the current @@ -2533,6 +2533,17 @@ static Lisp_Object kbd_buffer_get_event (); static void record_char (); +static Lisp_Object help_form_saved_window_configs; +static Lisp_Object +read_char_help_form_unwind (arg) +{ + Lisp_Object window_config = XCAR (help_form_saved_window_configs); + help_form_saved_window_configs = XCDR (help_form_saved_window_configs); + if (!NILP (window_config)) + Fset_window_configuration (window_config); + return Qnil; +} + #define STOP_POLLING \ do { if (! polling_stopped_here) stop_polling (); \ polling_stopped_here = 1; } while (0) @@ -3427,8 +3438,10 @@ Lisp_Object tem0; count = SPECPDL_INDEX (); - record_unwind_protect (Fset_window_configuration, - Fcurrent_window_configuration (Qnil)); + help_form_saved_window_configs + = Fcons (Fcurrent_window_configuration (Qnil), + help_form_saved_window_configs); + record_unwind_protect (read_char_help_form_unwind, Qnil); tem0 = Feval (Vhelp_form); if (STRINGP (tem0)) @@ -3436,7 +3449,12 @@ cancel_echoing (); do - c = read_char (0, 0, 0, Qnil, 0, NULL); + { + c = read_char (0, 0, 0, Qnil, 0, NULL); + if (EVENT_HAS_PARAMETERS (c) + && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qmouse_click)) + XSETCAR (help_form_saved_window_configs, Qnil); + } while (BUFFERP (c)); /* Remove the help from the frame */ unbind_to (count, Qnil); @@ -3615,6 +3633,7 @@ If you, dear reader, have a better idea, you've got the source. :-) */ if (dribble) { + BLOCK_INPUT; if (INTEGERP (c)) { if (XUINT (c) < 0x100) @@ -3640,6 +3659,7 @@ } fflush (dribble); + UNBLOCK_INPUT; } } @@ -9592,6 +9612,8 @@ if (!NILP (map) || !NILP (map2)) { from_string = string; + keybuf[t++] = key; + mock_input = t; goto replay_sequence; } } @@ -10483,7 +10505,7 @@ } DEFUN ("recent-keys", Frecent_keys, Srecent_keys, 0, 0, 0, - doc: /* Return vector of last 100 events, not counting those from keyboard macros. */) + doc: /* Return vector of last 300 events, not counting those from keyboard macros. */) () { Lisp_Object *keys = XVECTOR (recent_keys)->contents; @@ -10627,7 +10649,9 @@ { if (dribble) { + BLOCK_INPUT; fclose (dribble); + UNBLOCK_INPUT; dribble = 0; } if (!NILP (file)) @@ -11731,6 +11755,9 @@ menu_bar_items_vector = Qnil; staticpro (&menu_bar_items_vector); + help_form_saved_window_configs = Qnil; + staticpro (&help_form_saved_window_configs); + defsubr (&Scurrent_idle_time); defsubr (&Sevent_convert_list); defsubr (&Sread_key_sequence); @@ -11797,7 +11824,7 @@ DEFVAR_LISP ("unread-post-input-method-events", &Vunread_post_input_method_events, doc: /* List of events to be processed as input by input methods. These events are processed before `unread-command-events' -and actual keyboard input without given to `input-method-function'. */); +and actual keyboard input, but are not given to `input-method-function'. */); Vunread_post_input_method_events = Qnil; DEFVAR_LISP ("unread-input-method-events", &Vunread_input_method_events, diff -r edf631bdbb7a -r 738ce3540ffb src/keymap.c --- a/src/keymap.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/keymap.c Sun Apr 22 12:12:29 2007 +0000 @@ -2985,6 +2985,8 @@ You type Translation\n\ -------- -----------\n"; + CHECK_BUFFER (buffer); + shadow = Qnil; GCPRO1 (shadow); diff -r edf631bdbb7a -r 738ce3540ffb src/lisp.h --- a/src/lisp.h Sun Apr 22 11:42:03 2007 +0000 +++ b/src/lisp.h Sun Apr 22 12:12:29 2007 +0000 @@ -2649,6 +2649,7 @@ EXFUN (Fread_event, 3); extern Lisp_Object read_filtered_event P_ ((int, int, int, int, Lisp_Object)); EXFUN (Feval_region, 4); +extern Lisp_Object check_obarray P_ ((Lisp_Object)); extern Lisp_Object intern P_ ((const char *)); extern Lisp_Object make_symbol P_ ((char *)); extern Lisp_Object oblookup P_ ((Lisp_Object, const char *, int, int)); diff -r edf631bdbb7a -r 738ce3540ffb src/lread.c --- a/src/lread.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/lread.c Sun Apr 22 12:12:29 2007 +0000 @@ -38,6 +38,7 @@ #include "frame.h" #include "termhooks.h" #include "coding.h" +#include "blockinput.h" #ifdef lint #include @@ -326,14 +327,18 @@ if (EQ (readcharfun, Qget_file_char)) { + BLOCK_INPUT; c = getc (instream); + UNBLOCK_INPUT; #ifdef EINTR /* Interrupted reads have been observed while reading over the network */ while (c == EOF && ferror (instream) && errno == EINTR) { QUIT; clearerr (instream); + BLOCK_INPUT; c = getc (instream); + UNBLOCK_INPUT; } #endif return c; @@ -416,7 +421,11 @@ else if (EQ (readcharfun, Qlambda)) read_bytecode_char (1); else if (EQ (readcharfun, Qget_file_char)) - ungetc (c, instream); + { + BLOCK_INPUT; + ungetc (c, instream); + UNBLOCK_INPUT; + } else call1 (readcharfun, make_number (c)); } @@ -627,7 +636,9 @@ () { register Lisp_Object val; + BLOCK_INPUT; XSETINT (val, getc (instream)); + UNBLOCK_INPUT; return val; } @@ -1046,7 +1057,11 @@ { FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer; if (stream != NULL) - fclose (stream); + { + BLOCK_INPUT; + fclose (stream); + UNBLOCK_INPUT; + } if (--load_in_progress < 0) load_in_progress = 0; return Qnil; } diff -r edf631bdbb7a -r 738ce3540ffb src/macfns.c --- a/src/macfns.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/macfns.c Sun Apr 22 12:12:29 2007 +0000 @@ -1909,24 +1909,6 @@ #endif /* not MAC_OSX */ } -void -mac_set_scroll_bar_width (f, arg, oldval) - struct frame *f; - Lisp_Object arg, oldval; -{ -#ifdef MAC_OSX - if (INTEGERP (arg) && XINT (arg) > 0) - { - if (XINT (arg) < (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH - + MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH) / 2) - XSETINT (arg, MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH); - else - XSETINT (arg, MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH); - } -#endif - x_set_scroll_bar_width (f, arg, oldval); -} - static void mac_set_font (f, arg, oldval) struct frame *f; @@ -3052,7 +3034,7 @@ (display) Lisp_Object display; { - return build_string ("Apple Computers"); + return build_string ("Apple Inc."); } DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, @@ -4677,7 +4659,7 @@ x_set_menu_bar_lines, x_set_mouse_color, x_explicitly_set_name, - mac_set_scroll_bar_width, + x_set_scroll_bar_width, x_set_title, x_set_unsplittable, x_set_vertical_scroll_bars, diff -r edf631bdbb7a -r 738ce3540ffb src/macmenu.c --- a/src/macmenu.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/macmenu.c Sun Apr 22 12:12:29 2007 +0000 @@ -259,6 +259,9 @@ /* Current depth within submenus. */ static int menu_items_submenu_depth; +/* Nonzero means a menu is currently active. */ +static int popup_activated_flag; + /* This is set nonzero after the user activates the menu bar, and set to zero again after the menu bars are redisplayed by prepare_menu_bar. While it is nonzero, all calls to set_frame_menubar go deep. @@ -1141,7 +1144,9 @@ set_frame_menubar (f, 0, 1); BLOCK_INPUT; + popup_activated_flag = 1; menu_choice = MenuSelect (saved_menu_event_location); + popup_activated_flag = 0; menu_id = HiWord (menu_choice); menu_item = LoWord (menu_choice); @@ -2237,7 +2242,9 @@ install_menu_quit_handler (MAC_MENU_POPUP_SUB, menu); /* Display the menu. */ + popup_activated_flag = 1; menu_item_choice = PopUpMenuSelect (menu, pos.v, pos.h, 0); + popup_activated_flag = 0; /* Get the refcon to find the correct item */ if (menu_item_choice) @@ -3218,6 +3225,14 @@ #endif /* HAVE_MENUS */ +/* Detect if a menu is currently active. */ + +int +popup_activated () +{ + return popup_activated_flag; +} + /* The following is used by delayed window autoselection. */ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0, diff -r edf631bdbb7a -r 738ce3540ffb src/macterm.c --- a/src/macterm.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/macterm.c Sun Apr 22 12:12:29 2007 +0000 @@ -4484,25 +4484,24 @@ last_mouse_motion_position = *pos; XSETFRAME (last_mouse_motion_frame, frame); + if (frame == dpyinfo->mouse_face_mouse_frame #if TARGET_API_MAC_CARBON - if (!PtInRect (*pos, GetWindowPortBounds (FRAME_MAC_WINDOW (frame), &r))) + && !PtInRect (*pos, GetWindowPortBounds (FRAME_MAC_WINDOW (frame), &r)) #else - if (!PtInRect (*pos, &FRAME_MAC_WINDOW (frame)->portRect)) -#endif - { - if (frame == dpyinfo->mouse_face_mouse_frame) - /* This case corresponds to LeaveNotify in X11. */ - { - /* If we move outside the frame, then we're certainly no - longer on any text in the frame. */ - clear_mouse_face (dpyinfo); - dpyinfo->mouse_face_mouse_frame = 0; - if (!dpyinfo->grabbed) - rif->define_frame_cursor (frame, - frame->output_data.mac->nontext_cursor); - } - return 1; - } + && !PtInRect (*pos, &FRAME_MAC_WINDOW (frame)->portRect) +#endif + ) + { + /* This case corresponds to LeaveNotify in X11. If we move + outside the frame, then we're certainly no longer on any text + in the frame. */ + clear_mouse_face (dpyinfo); + dpyinfo->mouse_face_mouse_frame = 0; + if (!dpyinfo->grabbed) + rif->define_frame_cursor (frame, + frame->output_data.mac->nontext_cursor); + } + /* Has the mouse moved off the glyph it was on at the last sighting? */ if (frame != last_mouse_glyph_frame || !PtInRect (*pos, &last_mouse_glyph)) @@ -4963,7 +4962,7 @@ #endif #if TARGET_API_MAC_CARBON ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", -#if USE_TOOLKIT_SCROLL_BARS +#ifdef USE_TOOLKIT_SCROLL_BARS false, #else width < disp_height, @@ -5217,7 +5216,11 @@ #ifdef USE_TOOLKIT_SCROLL_BARS if (NILP (bar->track_top)) { - if (sb_width >= disp_height) + if (sb_width >= disp_height +#ifdef MAC_OSX + || sb_width < MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH +#endif + ) { XSETINT (bar->track_top, 0); XSETINT (bar->track_height, 0); @@ -6223,6 +6226,16 @@ #endif mac_handle_size_change (f, pixelwidth, pixelheight); + if (f->output_data.mac->internal_border_width + != FRAME_INTERNAL_BORDER_WIDTH (f)) + { + mac_clear_window (f); + f->output_data.mac->internal_border_width + = FRAME_INTERNAL_BORDER_WIDTH (f); + } + + SET_FRAME_GARBAGED (f); + UNBLOCK_INPUT; } @@ -9974,23 +9987,30 @@ if (err != noErr || axis != kEventMouseWheelAxisY) break; + err = GetEventParameter (event, kEventParamMouseLocation, + typeQDPoint, NULL, sizeof (Point), + NULL, &point); + if (err != noErr) + break; + + SetPortWindowPort (wp); + GlobalToLocal (&point); + if (point.h < 0 || point.v < 0 + || EQ (window_from_coordinates (f, point.h, point.v, 0, 0, 0, 1), + f->tool_bar_window)) + break; + err = GetEventParameter (event, kEventParamMouseWheelDelta, typeSInt32, NULL, sizeof (SInt32), NULL, &delta); if (err != noErr) break; - err = GetEventParameter (event, kEventParamMouseLocation, - typeQDPoint, NULL, sizeof (Point), - NULL, &point); - if (err != noErr) - break; + read_socket_inev->kind = WHEEL_EVENT; read_socket_inev->code = 0; read_socket_inev->modifiers = (mac_event_to_emacs_modifiers (event) | ((delta < 0) ? down_modifier : up_modifier)); - SetPortWindowPort (wp); - GlobalToLocal (&point); XSETINT (read_socket_inev->x, point.h); XSETINT (read_socket_inev->y, point.v); XSETFRAME (read_socket_inev->frame_or_window, f); @@ -11045,7 +11065,7 @@ else { /* A window has been deactivated */ -#if USE_TOOLKIT_SCROLL_BARS +#ifdef USE_TOOLKIT_SCROLL_BARS if (dpyinfo->grabbed && tracked_scroll_bar) { struct input_event event; diff -r edf631bdbb7a -r 738ce3540ffb src/macterm.h --- a/src/macterm.h Sun Apr 22 11:42:03 2007 +0000 +++ b/src/macterm.h Sun Apr 22 12:12:29 2007 +0000 @@ -327,6 +327,9 @@ They are changed only when a different background is involved. */ unsigned long relief_background; + /* Width of the internal border. */ + int internal_border_width; + /* Hints for the size and the position of a window. */ XSizeHints *size_hints; diff -r edf631bdbb7a -r 738ce3540ffb src/minibuf.c --- a/src/minibuf.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/minibuf.c Sun Apr 22 12:12:29 2007 +0000 @@ -702,27 +702,27 @@ specbind (Qinhibit_read_only, Qt); specbind (Qinhibit_modification_hooks, Qt); Ferase_buffer (); + + if (!NILP (current_buffer->enable_multibyte_characters) + && ! STRING_MULTIBYTE (minibuf_prompt)) + minibuf_prompt = Fstring_make_multibyte (minibuf_prompt); + + /* Insert the prompt, record where it ends. */ + Finsert (1, &minibuf_prompt); + if (PT > BEG) + { + Fput_text_property (make_number (BEG), make_number (PT), + Qfront_sticky, Qt, Qnil); + Fput_text_property (make_number (BEG), make_number (PT), + Qrear_nonsticky, Qt, Qnil); + Fput_text_property (make_number (BEG), make_number (PT), + Qfield, Qt, Qnil); + Fadd_text_properties (make_number (BEG), make_number (PT), + Vminibuffer_prompt_properties, Qnil); + } unbind_to (count1, Qnil); } - if (!NILP (current_buffer->enable_multibyte_characters) - && ! STRING_MULTIBYTE (minibuf_prompt)) - minibuf_prompt = Fstring_make_multibyte (minibuf_prompt); - - /* Insert the prompt, record where it ends. */ - Finsert (1, &minibuf_prompt); - if (PT > BEG) - { - Fput_text_property (make_number (BEG), make_number (PT), - Qfront_sticky, Qt, Qnil); - Fput_text_property (make_number (BEG), make_number (PT), - Qrear_nonsticky, Qt, Qnil); - Fput_text_property (make_number (BEG), make_number (PT), - Qfield, Qt, Qnil); - Fadd_text_properties (make_number (BEG), make_number (PT), - Vminibuffer_prompt_properties, Qnil); - } - minibuf_prompt_width = (int) current_column (); /* iftc */ /* Put in the initial input. */ @@ -1489,6 +1489,10 @@ matchcount++; bestmatchsize = matchsize; if (matchsize <= SCHARS (string) + /* If completion-ignore-case is non-nil, don't + short-circuit because we want to find the best + possible match *including* case differences. */ + && !completion_ignore_case && matchcount > 1) /* No need to look any further. */ break; diff -r edf631bdbb7a -r 738ce3540ffb src/print.c --- a/src/print.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/print.c Sun Apr 22 12:12:29 2007 +0000 @@ -33,6 +33,7 @@ #include "dispextern.h" #include "termchar.h" #include "intervals.h" +#include "blockinput.h" Lisp_Object Vstandard_output, Qstandard_output; @@ -976,7 +977,11 @@ Lisp_Object file, append; { if (initial_stderr_stream != NULL) - fclose (stderr); + { + BLOCK_INPUT; + fclose (stderr); + UNBLOCK_INPUT; + } stderr = initial_stderr_stream; initial_stderr_stream = NULL; diff -r edf631bdbb7a -r 738ce3540ffb src/process.c --- a/src/process.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/process.c Sun Apr 22 12:12:29 2007 +0000 @@ -817,7 +817,7 @@ Lisp_Object symbol; /* Assignment to EMACS_INT stops GCC whining about limited range of data type. */ - EMACS_INT pid = p->pid;; + EMACS_INT pid = p->pid; /* No problem storing the pid here, as it is still in Vprocess_alist. */ deleted_pid_list = Fcons (make_fixnum_or_float (pid), @@ -830,7 +830,8 @@ if (CONSP (p->status)) symbol = XCAR (p->status); if (EQ (symbol, Qsignal) || EQ (symbol, Qexit)) - Fdelete (make_fixnum_or_float (pid), deleted_pid_list); + deleted_pid_list + = Fdelete (make_fixnum_or_float (pid), deleted_pid_list); else #endif { @@ -1818,7 +1819,8 @@ char **new_argv; Lisp_Object current_dir; { - int pid, inchannel, outchannel; + int inchannel, outchannel; + pid_t pid; int sv[2]; #ifdef POSIX_SIGNALS sigset_t procmask; @@ -3339,12 +3341,16 @@ #endif } + immediate_quit = 0; + #ifdef HAVE_GETADDRINFO if (res != &ai) - freeaddrinfo (res); -#endif - - immediate_quit = 0; + { + BLOCK_INPUT; + freeaddrinfo (res); + UNBLOCK_INPUT; + } +#endif /* Discard the unwind protect for closing S, if any. */ specpdl_ptr = specpdl + count1; @@ -6491,7 +6497,7 @@ while (1) { - register EMACS_INT pid; + pid_t pid; WAITTYPE w; Lisp_Object tail; @@ -6500,12 +6506,17 @@ #define WUNTRACED 0 #endif /* no WUNTRACED */ /* Keep trying to get a status until we get a definitive result. */ - do + while (1) { errno = 0; pid = wait3 (&w, WNOHANG | WUNTRACED, 0); + if (! (pid < 0 && errno == EINTR)) + break; + /* Avoid a busyloop: wait3 is a system call, so we do not want + to prevent the kernel from actually sending SIGCHLD to emacs + by asking for it all the time. */ + sleep (1); } - while (pid < 0 && errno == EINTR); if (pid <= 0) { @@ -6531,11 +6542,15 @@ /* Find the process that signaled us, and record its status. */ /* The process can have been deleted by Fdelete_process. */ - tail = Fmember (make_fixnum_or_float (pid), deleted_pid_list); - if (!NILP (tail)) + for (tail = deleted_pid_list; GC_CONSP (tail); tail = XCDR (tail)) { - Fsetcar (tail, Qnil); - goto sigchld_end_of_loop; + Lisp_Object xpid = XCAR (tail); + if ((GC_INTEGERP (xpid) && pid == (pid_t) XINT (xpid)) + || (GC_FLOATP (xpid) && pid == (pid_t) XFLOAT_DATA (xpid))) + { + XSETCAR (tail, Qnil); + goto sigchld_end_of_loop; + } } /* Otherwise, if it is asynchronous, it is in Vprocess_alist. */ diff -r edf631bdbb7a -r 738ce3540ffb src/sound.c --- a/src/sound.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/sound.c Sun Apr 22 12:12:29 2007 +0000 @@ -621,12 +621,18 @@ char *buffer; int nbytes; int blksize = sd->period_size ? sd->period_size (sd) : 2048; + int data_left = header->data_length; buffer = (char *) alloca (blksize); lseek (s->fd, sizeof *header, SEEK_SET); - - while ((nbytes = emacs_read (s->fd, buffer, blksize)) > 0) - sd->write (sd, buffer, nbytes); + while (data_left > 0 + && (nbytes = emacs_read (s->fd, buffer, blksize)) > 0) + { + /* Don't play possible garbage at the end of file */ + if (data_left < nbytes) nbytes = data_left; + data_left -= nbytes; + sd->write (sd, buffer, nbytes); + } if (nbytes < 0) sound_perror ("Error reading sound file"); @@ -986,7 +992,8 @@ struct sound_device *sd; { struct alsa_params *p = (struct alsa_params *) sd->data; - return p->period_size; + int fact = snd_pcm_format_size (sd->format, 1) * sd->channels; + return p->period_size * (fact > 0 ? fact : 1); } static void @@ -1209,9 +1216,10 @@ while (nwritten < nbytes) { - err = snd_pcm_writei (p->handle, - buffer + nwritten, - (nbytes - nwritten)/fact); + snd_pcm_uframes_t frames = (nbytes - nwritten)/fact; + if (frames == 0) break; + + err = snd_pcm_writei (p->handle, buffer + nwritten, frames); if (err < 0) { if (err == -EPIPE) diff -r edf631bdbb7a -r 738ce3540ffb src/term.c --- a/src/term.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/term.c Sun Apr 22 12:12:29 2007 +0000 @@ -47,6 +47,7 @@ #include "dispextern.h" #include "window.h" #include "keymap.h" +#include "blockinput.h" #include "syssignal.h" #include "systty.h" @@ -695,11 +696,13 @@ conversion_buffer = encode_terminal_code (string, n, coding); if (coding->produced > 0) { + BLOCK_INPUT; fwrite (conversion_buffer, 1, coding->produced, tty->output); if (ferror (tty->output)) clearerr (tty->output); if (tty->termscript) fwrite (conversion_buffer, 1, coding->produced, tty->termscript); + UNBLOCK_INPUT; } len -= n; string += n; @@ -781,11 +784,13 @@ if (coding->produced > 0) { + BLOCK_INPUT; fwrite (conversion_buffer, 1, coding->produced, tty->output); if (ferror (tty->output)) clearerr (tty->output); if (tty->termscript) fwrite (conversion_buffer, 1, coding->produced, tty->termscript); + UNBLOCK_INPUT; } OUTPUT1_IF (tty, tty->TS_pad_inserted_char); diff -r edf631bdbb7a -r 738ce3540ffb src/window.c --- a/src/window.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/window.c Sun Apr 22 12:12:29 2007 +0000 @@ -3614,11 +3614,12 @@ `same-window-regexps' customize how certain buffer names are handled. The latter two take effect only if NOT-THIS-WINDOW is nil. -If optional argument FRAME is `visible', search all visible frames. -If FRAME is 0, search all visible and iconified frames. -If FRAME is t, search all frames. -If FRAME is a frame, search only that frame. -If FRAME is nil, search only the selected frame +If optional argument FRAME is `visible', check all visible frames +for a window to use. +If FRAME is 0, check all visible and iconified frames. +If FRAME is t, check all frames. +If FRAME is a frame, check only that frame. +If FRAME is nil, check only the selected frame (actually the last nonminibuffer frame), unless `pop-up-frames' or `display-buffer-reuse-frames' is non-nil, which means search visible and iconified frames. diff -r edf631bdbb7a -r 738ce3540ffb src/xdisp.c --- a/src/xdisp.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/xdisp.c Sun Apr 22 12:12:29 2007 +0000 @@ -10876,7 +10876,7 @@ return; } -#if defined (USE_X_TOOLKIT) || defined (USE_GTK) +#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (MAC_OS) if (popup_activated ()) return; #endif @@ -13143,8 +13143,15 @@ /* If first window line is a continuation line, and window start is inside the modified region, but the first change is before - current window start, we must select a new window start.*/ + current window start, we must select a new window start. + + However, if this is the result of a down-mouse event (e.g. by + extending the mouse-drag-overlay), we don't want to select a + new window start, since that would change the position under + the mouse, resulting in an unwanted mouse-movement rather + than a simple mouse-click. */ if (NILP (w->start_at_line_beg) + && NILP (do_mouse_tracking) && CHARPOS (startp) > BEGV) { /* Make sure beg_unchanged and end_unchanged are up to date. @@ -14903,7 +14910,7 @@ sync_frame_with_window_matrix_rows (w); /* Adjust buffer positions in reused rows. */ - if (delta) + if (delta || delta_bytes) increment_matrix_positions (current_matrix, first_unchanged_at_end_vpos + dvpos, bottom_vpos, delta, delta_bytes); @@ -22679,7 +22686,7 @@ struct buffer *b; /* When a menu is active, don't highlight because this looks odd. */ -#if defined (USE_X_TOOLKIT) || defined (USE_GTK) +#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (MAC_OS) if (popup_activated ()) return; #endif diff -r edf631bdbb7a -r 738ce3540ffb src/xselect.c --- a/src/xselect.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/xselect.c Sun Apr 22 12:12:29 2007 +0000 @@ -3007,8 +3007,17 @@ DEFVAR_LISP ("selection-coding-system", &Vselection_coding_system, doc: /* Coding system for communicating with other X clients. -When sending or receiving text via selection and clipboard, the text is -encoded or decoded by this coding system. + +When sending text via selection and clipboard, if the requested +data-type is not "UTF8_STRING", the text is encoded by this coding +system. + +When receiving text, if the data-type of the received text is not +"UTF8_STRING", it is decoded by this coding system. + +See also the documentation of the variable `x-select-request-type' how +to control which data-type to request for receiving text. + The default value is `compound-text-with-extensions'. */); Vselection_coding_system = intern ("compound-text-with-extensions"); diff -r edf631bdbb7a -r 738ce3540ffb src/xterm.c --- a/src/xterm.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/xterm.c Sun Apr 22 12:12:29 2007 +0000 @@ -5292,7 +5292,7 @@ x_scroll_bar_set_handle (bar, XINT (bar->start), XINT (bar->end), 1); - /* Switch to scroll bar foreground color. */ + /* Switch to scroll bar foreground color. */ if (f->output_data.x->scroll_bar_foreground_pixel != -1) XSetForeground (FRAME_X_DISPLAY (f), gc, f->output_data.x->scroll_bar_foreground_pixel); @@ -6772,15 +6772,16 @@ int y = event.xbutton.y; window = window_from_coordinates (f, x, y, 0, 0, 0, 1); - if (EQ (window, f->tool_bar_window)) + tool_bar_p = EQ (window, f->tool_bar_window); + + if (tool_bar_p && event.xbutton.button < 4) { - if (event.xbutton.type == ButtonPress) - handle_tool_bar_click (f, x, y, 1, 0); - else - handle_tool_bar_click (f, x, y, 0, - x_x_to_emacs_modifiers (dpyinfo, + if (event.xbutton.type == ButtonPress) + handle_tool_bar_click (f, x, y, 1, 0); + else + handle_tool_bar_click (f, x, y, 0, + x_x_to_emacs_modifiers (dpyinfo, event.xbutton.state)); - tool_bar_p = 1; } }