Mercurial > emacs
view lisp/play/decipher.el @ 105973:b7d8222914b4
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-clone-subtree-with-time-shift): Make it work at the
end of the buffer.
* org-mobile.el (org-mobile-write-checksums): Specify coding
system.
(org-mobile-timestamp-buffer): Keep local variable/mode line at
beginning of buffer.
* org-latex.el (org-latex-entities-regexp): Fix typo in regexp.
* org.el (org-block-todo-from-children-or-siblings-or-parent)
(org-block-todo-from-checkboxes): Do not block changes to a nil
TODO state.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-habit.el (org-habit-parse-todo): Indicate which habit is
wrongly set up in the error messages.
* org-colview.el (org-columns-display-here): Don't try to
calculate values if the underlying property is not set.
(org-columns-string-to-number): Convert age strings back into
fractional days.
(org-agenda-colview-summarize): Handle extended summary types
properly.
* org-colview-xemacs.el (org-columns-display-here): Don't try to
calculate values if the underlying property is not set.
(org-columns-string-to-number): Convert age strings back into
fractional days.
(org-agenda-colview-summarize): Handle extended summary types
properly.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-drawer-function): New variable.
(org-export-format-drawer): New function.
(org-export-preprocess-string): Pass the backend as a parameter to
`org-export-remove-or-extract-drawers'.
(org-export-remove-or-extract-drawers): New parameter BACKEND.
* org-protocol.el (org-protocol-char-to-string): New defsubst.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file): Add error
message when no block is selected.
* org-latex.el (org-export-latex-links): Check for protectedness
in the last matched character, not after the match.
* org-datetree.el (org-datetree-find-date-create): Respect
restriction when KEEP-RESTRICTION is set.
(org-datetree-file-entry-under): New function.
(org-datetree-cleanup): New command.
2009-11-13 Dan Davison <davison@stats.ox.ac.uk>
* org-src.el (org-edit-src-code): New optional argument context
allows calling functions to avoid altering the saved window
configuration.
(org-edit-src-exit): Do not restore window configuration when this
function is used in the context of saving the edit buffer.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-out, org-clock-cancel): Revert to
instances to switching to with-current-buffer, because these seem
to cause problems - no idea why.
* org-agenda.el (org-agenda-add-entry-to-org-agenda-diary-file):
Require diary-lib for (diary-date-display-form).
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-log-reschedule, org-log-redeadline): New options.
(org-log-note-headings): Add templates for rescheduling and
deadline changing.
(org-startup-options): Add in-buffer settings for logging changing
schedule and deadline time stamps.
(org-deadline, org-schedule): Check for existing date and arrange
for logging if the user requests it.
(org-add-log-note): Prepare proper note buffers for rescheduling
and deadline changes.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file)
(org-agenda-add-entry-to-org-agenda-diary-file)
(org-agenda-insert-diary-make-new-entry): New functions.
(org-agenda-diary-entry): Call
`org-agenda-diary-entry-in-org-file' when appropriate.
* org.el (org-calendar-insert-diary-entry-key): New option.
(org-agenda-diary-file): New option.
("calendar"): Install our insertion function in the calendar.
* org-remember.el (org-datetree): Require.
(org-remember-templates): Add new positioning option.
(org-remember-reference-date): New variable.
(org-remember-apply-template): Store the reference date in a local
variable.
(org-remember-handler): Implement date tree positioning of entries.
* org-datetree.el: New file.
* org-latex.el (org-export-latex-preprocess): Protect targets in
verbatim emphasis.
* org-html.el (org-export-as-html): Protect targets in verbatim
emphasis.
* org-docbook.el (org-export-as-docbook): Protect targets in
verbatim emphasis.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-show-notification): Handle messages that
contain a percent character.
* org-remember.el (org-remember-apply-template): Turn of partial
completion.
* org-mobile.el (org-mobile-before-process-capture-hook): New hook.
(org-mobile-pull): Run `org-mobile-before-process-capture-hook'.
* org.el (org-indent-mode): Define variable already in org.el.
(org-unfontify-region): Remove line-prefix and wrap-prefix
properties only if org-indent-mode is active.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-print-icalendar-entries): Save match data
around call to verify function.
(org-print-icalendar-entries): Add a call to the verification
function.
* org.el (org-speedbar-set-agenda-restriction): Remove unnecessary
save-restrivtion' form.
2009-11-13 Dan Davison <davison@stats.ox.ac.uk>
* org-exp.el (org-export-format-source-code-or-example): restrict
scope of preserve-indentp to the let binding.
(org-src): require org-src, since org-src-preserve-indentation is used.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-timer.el (org-timer-set-timer): Set variables
org-timer-timer[123] correctly.
* org-mobile.el (org-mobile-files-alist): Make it work when
`agenda-archives' is included in
`org-agenda-text-search-extra-files'.
(org-mobile-push): Restore agenda after mobile push.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-resolve-clocks-if-idle): Another fix to the
way the amount of idle time is presented in the minibuffer.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-print-icalendar-entries): Use
org-icalendar-verify-function only if non-nil.
* org.el (org-refile): Refile to clock only if the prefix arg is
2.
(org-sparse-tree): Fix docstring to be in line with prompt.
(org-update-parent-todo-statistics): Call
`org-after-todo-statistics-hook' on each level.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-apply-template): Make sure the
buffer exists.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-tab-ind-state): New variable.
(org-cycle-level): New function.
(org-cycle-level-after-item/entry-creation): New option.
(org-flag-subtree): New function.
(org-hide-archived-subtrees): Call `org-flag-subtree'.
(org-set-effort): Indexed access.
* org-list.el (org-cycle-item-indentation): New function.
* org.el (org-refile): Make prefix argument 2 refile to current
clock.
(org-priority): Interpret action `remove' as call to remove the
priority cookie.
* org-remember.el (org-remember-apply-template): Don't depend on
buffer name being like file name.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-play-sound): Expand file in
org-clock-sound, to allow ~ for home.
* org-remember.el (org-remember-handler): Set
text-before-node-creation even if this already looks like a node,
because the string might be needed on non-org-mode target files.
* org-agenda.el (org-agenda-open-link): Make this work in agenda
clocktables.
(org-agenda-switch-to): Follow a link at point if
org-return-follows-link' is set and there is nothing else to do in
this line.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview-xemacs.el: Add in changes from org-colview.el
2009-11-13 Dan Davison <davison@stats.ox.ac.uk>
* org-exp-blocks.el: Modify split separator regexp to avoid empty
strings.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-columns-new): Make this work with the new
operators.
(org-columns-store-format): Make this work with the new operators.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el (org-src-preserve-indentation): Document that this
variable is also used during export.
* org-exp.el (org-export-format-source-code-or-example): Preserve
indentation if a block has a -i option, or if
`org-src-preserve-indentation' is set.
* org-exp-blocks.el (org-export-blocks-preprocess): Preserve
indentation if a block has a -i option, or if
`org-src-preserve-indentation' is set.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-mode-map): Define the new archiving keys.
(org-speed-commands-default): Define an archiving key in the speed
command map.
(org-org-menu): Improve the menu structure concerning archiving.
* org-archive.el (org-archive-subtree-default-with-confirmation):
New command.
* org-agenda.el (org-agenda-mode-map): Define the new archiving keys.
(org-agenda-menu): Add the new archiving commands to the menu.
(org-agenda-archive-default)
(org-agenda-archive-default-with-confirmation): New commands.
(org-agenda-archive, org-agenda-archive-to-archive-sibling): Just
call `org-agenda-archive-with'.
(org-agenda-archive-with): New function.
* org-table.el (org-table-convert-region): Inert spaces around "|"
to avoid line beginnings like "|-1" which will be mistaken as
hlines.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-offer-links-in-entry): Return nil if there are no
links, t if a link has been selected.
(org-open-at-point): Open attachment directory when called in the
headline and there are no links in the entry body.
(org-speed-commands-default): Add "o" for open-at-point as a speed
command.
* org-attach.el (org-attach-reveal): Optional prefix arg
IF-EXISTS, which avoids creating the attachment directory if it
does not yet exist.
* org-agenda.el (org-agenda, org-run-agenda-series): Evaluate
MATCH.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el ("abbrev"): Work with abbrev tables only after they have
been loaded.
* org-list.el (org-list-send-list): Fix bug related to match
data.
* org-latex.el (org-export-latex-fontify): Apply verbatim
emphasis.
(org-export-latex-make-header): Insert \obeylines if line breaks
should be preserved.
* org-exp.el (org-export-protect-verbatim): Add an
`org-verbatim-emph' property to such text.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-icalendar.el (org-icalendar-use-plain-timestamp): New option.
(org-print-icalendar-entries): Skip entries where the timestamp is
not a deadline and not scheduled, if the user requests that.
* org-latex.el (org-export-latex-quotation-marks): Allow a bracket
before an opening quote.
* org-archive.el (org-archive-subtree): Keep archive after
archiving something.
* org-id.el (org-id-update-id-locations): Add archive files if
that is required by `org-id-extra-files'.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el (org-src-window-setup): New option.
(org-src-switch-to-buffer): New function.
(org-edit-src-exit): Add optional argument CONTEXT and use it to
restore window configuration.
(org-edit-src-code, org-edit-src-continue, org-edit-src-exit):
Call `org-src-switch-to-buffer'.
* org.el (org-default-properties): Add STYLE property.
(org-files-list): Use the function call to get the files.
(org-additional-option-like-keywords): Add SETUPFILE to completion
list.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-table-convert-region): Correctly interpret
quoting in csv import.
* org.el (org-icompleting-read): Make iswitchb completion work
with lists and tables.
* org-agenda.el (org-agenda-add-entry-text): Never add entry text
while pushing the mobile agenda.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el
(org-clock-auto-clock-resolution): Now takes three values: nil, t
and `when-no-clock-is-running'.
(org-clock-in): Use `org-clock-auto-clock-resolution' to determine
whether or not to resolve Org buffers on clock in.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-colview.el (org-format-time-period): Function to format
times in fractional days for display.
(org-columns-display-here): Add support for showing a calculated
value in place of the property.
(org-columns): Set `org-columns-time' to the current time so time
difference calculations will work.
(org-columns-time): Use to store the current time when column view
is displayed, so all time differences will use the same reference
point.
(org-columns-compile-map): There is now an extra position in each
entry specifying the function to use to calculate the displayed
value for the non-calculated properties in the column,
(org-columns-compute-all): Set `org-columns-time' to the current
time so time difference calculations will work.
(org-columns-compute): Handle column operators where the values
used are calculated from the underlying property.
(org-columns-number-to-string): Handle the 'age' column format
(org-columns-string-to-number): Correct the function name (was
org-column...). Add support for the 'age' column format.
(org-columns-compile-format): Support the additional parameter in
org-columns-compile-map.
2009-11-13 Bastien Guerry <bzg@altern.org>
* org.el (org-mode-hook): Turn `org-mode-hook' into a customizable
variable.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-has-been-used): New variable.
(org-clock-in): Set `org-clock-has-been-used'.
(org-clock-save): Save only if clock data has been used or created
during this session.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-persist): New value, to store only the
clock history.
(org-clock-save): Don't save the clock if only the history should
be stored.
(org-clock-load): Turn off John Wiegley's auto resolving mechanism
when restoring a saved clock.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-clock-display, org-clock-put-overlay): Use
`org-time-clock-use-fractional'.
* org.el (org-time-clocksum-use-fractional)
(org-time-clocksum-fractional-format): Two new customizable
variables which allow the user to select fractional times (1.25
instead of 1:25) in the `org-clock-display' report.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-ascii.el (org-export-ascii-table-keep-all-vertical-lines):
New option.
* org.el (org-tag-alist): Fix customization type.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-update-checksum-for-capture-file):
Make sure the regexp search can fail without throwing an error.
(org-mobile-apply): Save the inbox buffer after removing
successfully applied changes.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-clock.el (org-resolve-clocks-if-idle): Fix to the way idle
time is reported after the user comes back (but before they
resolve time).
* org.el (org-get-repeat): Change so that this function can be
called with either `org-scheduled-string' or
`org-deadline-string'.
* org-clock.el (org-clock-auto-clock-resolution): Renamed
`org-clock-disable-clock-resolution', since negatives don't sound
good in customization variables.
(org-clock-in): Don't use the auto-resolution logic if the user is
clocking into a different task while an active clock is running.
This then allows the default behavior of clocking out of the open
task and then into the new task.
* org.el (org-modules): Made this variable more consistent, since
it was referring to Org, OrgMode and Org-mode, whereas the docs
for the variable always refer to Org-mode.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-repeat-re): The changed org-repeat-re no longer
matched simple +2d type repeaters. Fix it so it does.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-preprocess): Protect the vspace
macro in the VERSE environment.
2009-11-13 John Wiegley <jwiegley@gmail.com>
* org-habit.el (org-habit-get-priority): A new function that
determines the relative priority of a habit, based on how long
past its scheduled date it is, and how near the deadline is.
* org-agenda.el (org-agenda-get-scheduled): Set habit priority
using `org-habit-get-priority'.
* org-habit.el (org-habit-build-graph): Start displaying colors
from the first scheduled date, if that date is earlier than the
first completion date.
* org-habit.el: Changed all "color" variables to faces, and made
them appropriate for light and dark backgrounds.
* org-habit.el (org-habit-duration-to-days): Made this function
more general.
(org-habit-parse-todo): Parse the new ".+N/N" style repeater.
* org-agenda.el (org-agenda-get-deadlines): Removed all mention of
habits, since they don't use DEADLINE anymore.
* org.el (org-repeat-re, org-display-custom-time)
(org-timestamp-change): Extended to support the new ".+N/N"
syntax, used for habits.
* org-clock.el (org-clock-resolve-clock): Fixed an incorrect
variable reference.
* org-agenda.el (org-agenda-set-mode-name): Show Habit in the
modeline when habits are being displayed (if that module is being
loaded).
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org-clock.el (org-x11-idle-seconds): Add a method to get the X11
idle time using the xscreensaver extension.
(org-user-idle-seconds): Use X11 idle time if available.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-next-line): New command.
(org-agenda-previous-line): New commands.
(org-agenda-show-and-scroll-up, org-agenda-show-scroll-down): New
commands.
(org-agenda-follow-mode): Do the follow immediately if the mode is
turned on here.
(previous-line, next-line): Replace keys with the corresponding
org functions.
(org-agenda-mode-map): Bind backspace and delete to the scrolling
command.
* org.el (org-icompleting-read): Turn off partial completion mode
for the duration of this completion round.
* org-latex.el (org-export-latex-fontify-headline): Protect TeX
macros in author lines and similar stuff.
* org.el (org-file-tags): Fix docstring.
(org-get-buffer-tags): Add the #+FILETAGS tags.
("ecb"): Maks ecb show context after jumping into an Org file.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-agenda.el (org-finalize-agenda): Draw habit consistency
graphs after everything else in the buffer has been setup.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-apply): Count success and failure.
* org.el (org-indent-line-function): Fix regexp replace problem.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-clock.el (org-clock-disable-clock-resolution): New
customization variable that disable automatic clock resolution on
clock in.
(org-clock-in): If `org-clock-disable-clock-resolution' is set, do
not automatically resolve anything. This is does not affect
idle-time resolution, however, if `org-clock-idle-time' is set.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-habit.el: New file, which implements code to build a "habit
consistency graph".
* org-agenda.el (org-agenda-get-deadlines)
(org-agenda-get-scheduled): Display consistency graphs when
outputting habits into the agenda. The graphs are always relative
to the current time.
(org-format-agenda-item): Added new parameter `habitp', which
indicates whether we are formatting a habit or not. Do not
display "extra" leading information if habitp is true.
* org.el (org-repeat-re): Improved regexp to include .+ and ++
leaders for repeat strings.
(org-get-repeat): Now takes a string parameter `tagline', so the
caller can obtain the SCHEDULED repeat, or the DEADLINE repeat.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-agenda.el (org-agenda-auto-exclude-function): New
customization variable for allowing the user to create an "auto
exclusion" filter for doing context-aware auto tag filtering.
(org-agenda-filter-by-tag): Changes to support the use of
`org-agenda-auto-exclude-function'. See the new manual addition,.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org.el (org-files-list): Don't attempt to return a file name for
Org buffers which have no associated file.
* org-agenda.el (org-agenda-do-action): Fixed a typo.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-locate-entry): Interpret files
relative to org-directory.
(org-mobile-inbox-for-pull): Document the best location for this
file.
(org-mobile-check-setup): Verify `org-directory'.
(org-mobile-create-index-file): Sort the files to be listed in
index.org.
2009-11-13 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-fast-tag-selection): Add a way to display a
description for a tag group. This is done by adding a string to
either the startgroup or endgroup cell.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-resolve, org-resolve-clocks)
(org-emacs-idle-seconds): Use `org-float-time' instead of
`time-to-seconds'
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-sorting-strategy): Fix customization
type.
* org.el (org-pre-cycle-hook): Document that `empty' can also be
the value of ARG when doing local cycling.
2009-11-13 John Wiegley <johnw@newartisans.com>
* org-clock.el (org-clock-resolve-clock): If keeping or
subtracting time results in a clock out at a time in the past, and
if the resolution occurred due to idleness or invoking `M-x
org-resolve-clocks', remember that past moment in time. On the
next clock in, the user will be prompted to see if they want to
back-date their new clock to then.
(org-clock-resolve): Do not jump the user to the location of a
dangling clock if the resolution is occuring due to an idle
timeout. In that case there is typically only one dangling clock,
the active one, and there is no value gained by shuffling their
windows around to show it to them. Being prompted to resolve an
idle clock should be as inobtrusive as possible.
(org-resolve-clocks-if-idle): New function that resolves only the
currently active clock if the user has exceeded the time returned
by `org-user-idle-seconds', based on the value of
`org-clock-idle-time'.
(org-clock-in): If, after resolving clocks,
(org-clock-out): Cancel the `org-clock-idle-timer' on clock out.
* org-clock.el (org-clock-resolve-clock): New function that
resolves a clock to a specific time, closing or resuming as need
be, and possibly even starting a new clock.
(org-clock-resolve): New function used by `org-resolve-clocks'
that sets up for the call to `org-clock-resolve-clock'. It
determines the time to resolve to based on a single-character
selection from the user to either keep time, subtract away time or
cancel the clock.
(org-resolve-clocks): New user command which resolves dangling
clocks -- that is, open but not active -- anywhere in the file
list returned by `org-files-list'.
(org-clock-in): Automatically resolve dangling clocks whenever a
user clocks in.
(org-clock-cancel): If the user cancels the solely clock in a
LOGBOOK, remove the empty drawer.
* org-clock.el (org-clock-idle-time): New user customizable option
for detecting whether the user has left a clock idle. Note: it is
only used in this commit to test whether it's worthwhile to check
OS X to get the Mac user's current idle time. If the Emacs idle
time is less than the value, the user hasn't been away long enough
to be worth checking (a more expensive test than just getting
Emacs idle time).
(org-user-idle-seconds, org-mac-idle-seconds)
(org-emacs-idle-seconds): This three functions, in conjunction
with the user customization variable `org-clock-idle-time', return
the number of seconds (as a floating point) that the user has been
away from their Emacs (or, if running on OS X, their computer).
* org-clock.el (org-find-open-clocks): New function that returns a
list of all open clocks in the given FILE. Note that each clock
it returns is a cons cell of the format (MARKER . START-TIME).
This "clock" value is used by several of the new clock module
utility functions.
(org-is-active-clock): New inline function which tests whether the
given clock value is the same as the currently active clock.
Returns non-nil if this is the case.
(org-with-clock-position): New macro that evaluates FORMS with
point in the buffer and at the position of the given clock.
Changes to the current clock are global.
(org-with-clock): New macro that evaluates FORMS with point in the
buffer and at the position of the given clock. However, changes
to the current clock are local and have no effect on the user's
active clock. This allows, for example, far any clock to be
cancelled without cancelling the active clock.
(org-clock-clock-in): New inline function that switches the active
clock to the given clock. If either the argument RESUME, or the
global `org-clock-in-resume', are non-nil, it will resume a clock
that was previously left open.
(org-clock-clock-out): New inline function that clocks out the
given clock value without affecting the currently active clock.
(org-clock-clock-cancel): New inline function that cancels the
given clock value without affecting the currently active clock.
* org-clock.el (org-clock-in): Before creating
`org-clock-mode-line-timer', check to make sure an older timer is
not currently running.
(org-clock-out): Accept new third parameter `at-time', which
permits a clock to be clocked out at a specific time. Note that
no attempt is made to verify that the clock out time is later than
the clock in time.
* org.el (org-files-list): New utility function for returning a
list of all open org-mode buffers, plus all files used to build
the agenda buffer. Note that not all the files will necessarily
be visited by a buffer at time of call.
(org-entry-beginning-position): Like the function
`line-beginning-position', this inline function returns the
beginning position of the current heading/entry.
(org-entry-end-position): Like the function `line-end-position',
this inline function returns the end position of the current
heading/entry.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-list): Mark the all-todo items line as
a header line.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-inlinetask-remove-END-maybe): Declare function.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-filter-make-matcher): Allow to filter
entries that have no tags.
(org-agenda-search-view): New customize group.
(org-agenda-search-view-search-words-only): New option.
(org-search-view): Implement substring search.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-outline-level): Add doc string.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-inlinetask.el (org-inlinetask-export): Re-introduce
variable.
(org-inlinetask-export-handler): Only export inline task if the
user option calls for it.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-handle-export-tags): Remove inlinetask
END if present.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-tables): Don't format in
protected regions.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-src.el (org-edit-src-code)
(org-edit-src-find-region-and-lang, org-edit-src-exit): Handle
macro editing.
* org-agenda.el (org-prefix-category-max-length): New variable.
(org-format-agenda-item): Use `org-prefix-category-max-length'.
(org-compile-prefix-format): Set `org-prefix-category-max-length'.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-mobile.el (org-mobile-create-index-file): Improve the
listing of tags and todo keywords.
* org-latex.el (org-export-latex-format-image): New function.
(org-export-latex-links): Use `org-export-latex-format-image'.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org-inlinetask.el (org-inlinetask-get-current-indentation)
(org-inlinetask-remove-terminator): New functions.
(org-inlinetask-export-handler): Terminate the description list.
* org-exp.el (org-export-select-backend-specific-text): Remove the
region markers.
* org-inlinetask.el (org-inlinetask-export-handler): fix bug for
tasks without content.
* org-clock.el: Make sure the clock-in target position does not
move to a different node by widening the buffer.
* org-html.el (org-export-html-format-image): Wrap image into
figure div only when there is a caption.
* org-archive.el (org-archive-mark-done): Change default value to
nil.
2009-11-13 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-context): Call `bobp', not `eobp'.
* org-clock.el (org-clock-cancel): Remove quotes from marker
variables.
* org.el (org-read-date-prefer-future): New allowed value `time'.
(org-read-date-analyze): Shift day to tomorrow depending on time
entered and value of `org-read-date-prefer-future'.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Fri, 13 Nov 2009 08:37:55 +0000 |
parents | 328150f0cf76 |
children | 1d1d5d9bd884 |
line wrap: on
line source
;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers ;; ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ;; 2008, 2009 Free Software Foundation, Inc. ;; ;; Author: Christopher J. Madsen <chris_madsen@geocities.com> ;; Keywords: games ;; ;; 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 3 of the License, or ;; (at your option) any later version. ;; 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. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; ;;; Quick Start: ;; ;; To decipher a message, type or load it into a buffer and type ;; `M-x decipher'. This will format the buffer and place it into ;; Decipher mode. You can save your work to a file with the normal ;; Emacs save commands; when you reload the file it will automatically ;; enter Decipher mode. ;; ;; I'm not going to discuss how to go about breaking a cipher; try ;; your local library for a book on cryptanalysis. One book you might ;; find is: ;; Cryptanalysis: A study of ciphers and their solution ;; Helen Fouche Gaines ;; ISBN 0-486-20097-3 ;; This package is designed to help you crack simple substitution ;; ciphers where one letter stands for another. It works for ciphers ;; with or without word divisions. (You must set the variable ;; decipher-ignore-spaces for ciphers without word divisions.) ;; ;; First, some quick definitions: ;; ciphertext The encrypted message (what you start with) ;; plaintext The decrypted message (what you are trying to get) ;; ;; Decipher mode displays ciphertext in uppercase and plaintext in ;; lowercase. You must enter the plaintext in lowercase; uppercase ;; letters are interpreted as commands. The ciphertext may be entered ;; in mixed case; `M-x decipher' will convert it to uppercase. ;; ;; Decipher mode depends on special characters in the first column of ;; each line. The command `M-x decipher' inserts these characters for ;; you. The characters and their meanings are: ;; ( The plaintext & ciphertext alphabets on the first line ;; ) The ciphertext & plaintext alphabets on the second line ;; : A line of ciphertext (with plaintext below) ;; > A line of plaintext (with ciphertext above) ;; % A comment ;; Each line in the buffer MUST begin with one of these characters (or ;; be left blank). In addition, comments beginning with `%!' are reserved ;; for checkpoints; see decipher-make-checkpoint & decipher-restore-checkpoint ;; for more information. ;; ;; While the cipher message may contain digits or punctuation, Decipher ;; mode will ignore these characters. ;; ;; The buffer is made read-only so it can't be modified by normal ;; Emacs commands. ;; ;; Decipher supports Font Lock mode. To use it, you can also add ;; (add-hook 'decipher-mode-hook 'turn-on-font-lock) ;; See the variable `decipher-font-lock-keywords' if you want to customize ;; the faces used. I'd like to thank Simon Marshall for his help in making ;; Decipher work well with Font Lock. ;;; Things To Do: ;; ;; Email me if you have any suggestions or would like to help. ;; But be aware that I work on Decipher only sporadically. ;; ;; 1. The consonant-line shortcut ;; 2. More functions for analyzing ciphertext ;;;=================================================================== ;;; Variables: ;;;=================================================================== (eval-when-compile (require 'cl)) (defgroup decipher nil "Cryptanalyze monoalphabetic substitution ciphers." :prefix "decipher-" :group 'games) (defcustom decipher-force-uppercase t "Non-nil means to convert ciphertext to uppercase. nil means the case of the ciphertext is preserved. This variable must be set before typing `\\[decipher]'." :type 'boolean :group 'decipher) (defcustom decipher-ignore-spaces nil "Non-nil means to ignore spaces and punctuation when counting digrams. You should set this to nil if the cipher message is divided into words, or t if it is not. This variable is buffer-local." :type 'boolean :group 'decipher) (make-variable-buffer-local 'decipher-ignore-spaces) (defcustom decipher-undo-limit 5000 "The maximum number of entries in the undo list. When the undo list exceeds this number, 100 entries are deleted from the tail of the list." :type 'integer :group 'decipher) (defcustom decipher-mode-hook nil "Hook to run upon entry to decipher." :type 'hook :group 'decipher) ;; End of user modifiable variables ;;-------------------------------------------------------------------- (defvar decipher-font-lock-keywords '(("^:.*" . font-lock-keyword-face) ("^>.*" . font-lock-string-face) ("^%!.*" . font-lock-constant-face) ("^%.*" . font-lock-comment-face) ("\\`(\\([a-z]+\\) +\\([A-Z]+\\)" (1 font-lock-string-face) (2 font-lock-keyword-face)) ("^)\\([A-Z ]+\\)\\([a-z ]+\\)" (1 font-lock-keyword-face) (2 font-lock-string-face))) "Expressions to fontify in Decipher mode. Ciphertext uses `font-lock-keyword-face', plaintext uses `font-lock-string-face', comments use `font-lock-comment-face', and checkpoints use `font-lock-constant-face'. You can customize the display by changing these variables. For best results, I recommend that all faces use the same background color. For example, to display ciphertext in the `bold' face, use (add-hook 'decipher-mode-hook (lambda () (set (make-local-variable 'font-lock-keyword-face) 'bold))) in your `.emacs' file.") (defvar decipher-mode-map nil "Keymap for Decipher mode.") (if (not decipher-mode-map) (progn (setq decipher-mode-map (make-keymap)) (suppress-keymap decipher-mode-map) (define-key decipher-mode-map "A" 'decipher-show-alphabet) (define-key decipher-mode-map "C" 'decipher-complete-alphabet) (define-key decipher-mode-map "D" 'decipher-digram-list) (define-key decipher-mode-map "F" 'decipher-frequency-count) (define-key decipher-mode-map "M" 'decipher-make-checkpoint) (define-key decipher-mode-map "N" 'decipher-adjacency-list) (define-key decipher-mode-map "R" 'decipher-restore-checkpoint) (define-key decipher-mode-map "U" 'decipher-undo) (define-key decipher-mode-map " " 'decipher-keypress) (define-key decipher-mode-map [remap undo] 'decipher-undo) (define-key decipher-mode-map [remap advertised-undo] 'decipher-undo) (let ((key ?a)) (while (<= key ?z) (define-key decipher-mode-map (vector key) 'decipher-keypress) (incf key))))) (defvar decipher-stats-mode-map nil "Keymap for Decipher-Stats mode.") (if (not decipher-stats-mode-map) (progn (setq decipher-stats-mode-map (make-keymap)) (suppress-keymap decipher-stats-mode-map) (define-key decipher-stats-mode-map "D" 'decipher-digram-list) (define-key decipher-stats-mode-map "F" 'decipher-frequency-count) (define-key decipher-stats-mode-map "N" 'decipher-adjacency-list) )) (defvar decipher-mode-syntax-table nil "Decipher mode syntax table") (if decipher-mode-syntax-table () (let ((table (make-syntax-table)) (c ?0)) (while (<= c ?9) (modify-syntax-entry c "_" table) ;Digits are not part of words (incf c)) (setq decipher-mode-syntax-table table))) (defvar decipher-alphabet nil) ;; This is an alist containing entries (PLAIN-CHAR . CIPHER-CHAR), ;; where PLAIN-CHAR runs from ?a to ?z and CIPHER-CHAR is an uppercase ;; letter or space (which means no mapping is known for that letter). ;; This *must* contain entries for all lowercase characters. (make-variable-buffer-local 'decipher-alphabet) (defvar decipher-stats-buffer nil "The buffer which displays statistics for this ciphertext. Do not access this variable directly, use the function `decipher-stats-buffer' instead.") (make-variable-buffer-local 'decipher-stats-buffer) (defvar decipher-undo-list-size 0 "The number of entries in the undo list.") (make-variable-buffer-local 'decipher-undo-list-size) (defvar decipher-undo-list nil "The undo list for this buffer. Each element is either a cons cell (PLAIN-CHAR . CIPHER-CHAR) or a list of such cons cells.") (make-variable-buffer-local 'decipher-undo-list) (defvar decipher-pending-undo-list nil) ;; The following variables are used by the analysis functions ;; and are defined here to avoid byte-compiler warnings. ;; Don't mess with them unless you know what you're doing. (defvar decipher-char nil "See the functions decipher-loop-with-breaks and decipher-loop-no-breaks.") (defvar decipher--prev-char) (defvar decipher--digram) (defvar decipher--digram-list) (defvar decipher--before) (defvar decipher--after) (defvar decipher--freqs) ;;;=================================================================== ;;; Code: ;;;=================================================================== ;; Main entry points: ;;-------------------------------------------------------------------- ;;;###autoload (defun decipher () "Format a buffer of ciphertext for cryptanalysis and enter Decipher mode." (interactive) ;; Make sure the buffer ends in a newline: (goto-char (point-max)) (or (bolp) (insert "\n")) ;; See if it's already in decipher format: (goto-char (point-min)) (if (looking-at "^(abcdefghijklmnopqrstuvwxyz \ ABCDEFGHIJKLMNOPQRSTUVWXYZ -\\*-decipher-\\*-\n)") (message "Buffer is already formatted, entering Decipher mode...") ;; Add the alphabet at the beginning of the file (insert "(abcdefghijklmnopqrstuvwxyz \ ABCDEFGHIJKLMNOPQRSTUVWXYZ -*-decipher-*-\n)\n\n") ;; Add lines for the solution: (let (begin) (while (not (eobp)) (if (looking-at "^%") (forward-line) ;Leave comments alone (delete-horizontal-space) (if (eolp) (forward-line) ;Just leave blank lines alone (insert ":") ;Mark ciphertext line (setq begin (point)) (forward-line) (if decipher-force-uppercase (upcase-region begin (point))) ;Convert ciphertext to uppercase (insert ">\n"))))) ;Mark plaintext line (delete-blank-lines) ;Remove any blank lines (delete-blank-lines)) ; at end of buffer (goto-char (point-min)) (forward-line 3) (decipher-mode)) ;;;###autoload (defun decipher-mode () "Major mode for decrypting monoalphabetic substitution ciphers. Lower-case letters enter plaintext. Upper-case letters are commands. The buffer is made read-only so that normal Emacs commands cannot modify it. The most useful commands are: \\<decipher-mode-map> \\[decipher-digram-list] Display a list of all digrams & their frequency \\[decipher-frequency-count] Display the frequency of each ciphertext letter \\[decipher-adjacency-list]\ Show adjacency list for current letter (lists letters appearing next to it) \\[decipher-make-checkpoint] Save the current cipher alphabet (checkpoint) \\[decipher-restore-checkpoint] Restore a saved cipher alphabet (checkpoint)" (interactive) (kill-all-local-variables) (setq buffer-undo-list t ;Disable undo indent-tabs-mode nil ;Do not use tab characters major-mode 'decipher-mode mode-name "Decipher") (if decipher-force-uppercase (setq case-fold-search nil)) ;Case is significant when searching (use-local-map decipher-mode-map) (set-syntax-table decipher-mode-syntax-table) (unless (= (point-min) (point-max)) (decipher-read-alphabet)) (set (make-local-variable 'font-lock-defaults) '(decipher-font-lock-keywords t)) ;; Make the buffer writable when we exit Decipher mode: (add-hook 'change-major-mode-hook (lambda () (setq buffer-read-only nil buffer-undo-list nil)) nil t) (run-mode-hooks 'decipher-mode-hook) (setq buffer-read-only t)) (put 'decipher-mode 'mode-class 'special) ;;-------------------------------------------------------------------- ;; Normal key handling: ;;-------------------------------------------------------------------- (defmacro decipher-last-command-char () ;; Return the char which ran this command (for compatibility with XEmacs) (if (fboundp 'event-to-character) '(event-to-character last-command-event) 'last-command-event)) (defun decipher-keypress () "Enter a plaintext or ciphertext character." (interactive) (let ((decipher-function 'decipher-set-map) buffer-read-only) ;Make buffer writable (save-excursion (or (save-excursion (beginning-of-line) (let ((first-char (following-char))) (cond ((= ?: first-char) t) ((= ?> first-char) nil) ((= ?\( first-char) (setq decipher-function 'decipher-alphabet-keypress) t) ((= ?\) first-char) (setq decipher-function 'decipher-alphabet-keypress) nil) (t (error "Bad location"))))) (let (goal-column) (forward-line -1))) (let ((char-a (following-char)) (char-b (decipher-last-command-char))) (or (and (not (= ?w (char-syntax char-a))) (= char-b ?\ )) ;Spacebar just advances on non-letters (funcall decipher-function char-a char-b))))) (forward-char)) (defun decipher-alphabet-keypress (a b) ;; Handle keypresses in the alphabet lines. ;; A is the character in the alphabet row (which starts with '(') ;; B is the character pressed (cond ((and (>= a ?A) (<= a ?Z)) ;; If A is uppercase, then it is in the ciphertext alphabet: (decipher-set-map a b)) ((and (>= a ?a) (<= a ?z)) ;; If A is lowercase, then it is in the plaintext alphabet: (if (= b ?\ ) ;; We are clearing the association (if any): (if (/= ?\ (setq b (cdr (assoc a decipher-alphabet)))) (decipher-set-map b ?\ )) ;; Associate the plaintext char with the char pressed: (decipher-set-map b a))) (t ;; If A is not a letter, that's a problem: (error "Bad character")))) ;;-------------------------------------------------------------------- ;; Undo: ;;-------------------------------------------------------------------- (defun decipher-undo () "Undo a change in Decipher mode." (interactive) ;; If we don't get all the way thru, make last-command indicate that ;; for the following command. (setq this-command t) (or (eq major-mode 'decipher-mode) (error "This buffer is not in Decipher mode")) (or (eq last-command 'decipher-undo) (setq decipher-pending-undo-list decipher-undo-list)) (or decipher-pending-undo-list (error "No further undo information")) (let ((undo-rec (pop decipher-pending-undo-list)) buffer-read-only ;Make buffer writable redo-map redo-rec undo-map) (or (consp (car undo-rec)) (setq undo-rec (list undo-rec))) (while (setq undo-map (pop undo-rec)) (setq redo-map (decipher-get-undo (cdr undo-map) (car undo-map))) (if redo-map (setq redo-rec (if (consp (car redo-map)) (append redo-map redo-rec) (cons redo-map redo-rec)))) (decipher-set-map (cdr undo-map) (car undo-map) t)) (decipher-add-undo redo-rec)) (setq this-command 'decipher-undo) (message "Undo!")) (defun decipher-add-undo (undo-rec) "Add UNDO-REC to the undo list." (if undo-rec (progn (push undo-rec decipher-undo-list) (incf decipher-undo-list-size) (if (> decipher-undo-list-size decipher-undo-limit) (let ((new-size (- decipher-undo-limit 100))) ;; Truncate undo list to NEW-SIZE elements: (setcdr (nthcdr (1- new-size) decipher-undo-list) nil) (setq decipher-undo-list-size new-size)))))) (defun decipher-copy-cons (cons) (if cons (cons (car cons) (cdr cons)))) (defun decipher-get-undo (cipher-char plain-char) ;; Return an undo record that will undo the result of ;; (decipher-set-map CIPHER-CHAR PLAIN-CHAR) ;; We must copy the cons cell because the original cons cells will be ;; modified using setcdr. (let ((cipher-map (decipher-copy-cons (rassoc cipher-char decipher-alphabet))) (plain-map (decipher-copy-cons (assoc plain-char decipher-alphabet)))) (cond ((equal ?\ plain-char) cipher-map) ((equal cipher-char (cdr plain-map)) nil) ;We aren't changing anything ((equal ?\ (cdr plain-map)) (or cipher-map (cons ?\ cipher-char))) (cipher-map (list plain-map cipher-map)) (t plain-map)))) ;;-------------------------------------------------------------------- ;; Mapping ciphertext and plaintext: ;;-------------------------------------------------------------------- (defun decipher-set-map (cipher-char plain-char &optional no-undo) ;; Associate a ciphertext letter with a plaintext letter ;; CIPHER-CHAR must be an uppercase or lowercase letter ;; PLAIN-CHAR must be a lowercase letter (or a space) ;; NO-UNDO if non-nil means do not record undo information ;; Any existing associations for CIPHER-CHAR or PLAIN-CHAR will be erased. (setq cipher-char (upcase cipher-char)) (or (and (>= cipher-char ?A) (<= cipher-char ?Z)) (error "Bad character")) ;Cipher char must be uppercase letter (or no-undo (decipher-add-undo (decipher-get-undo cipher-char plain-char))) (let ((cipher-string (char-to-string cipher-char)) (plain-string (char-to-string plain-char)) case-fold-search ;Case is significant mapping bound) (save-excursion (goto-char (point-min)) (if (setq mapping (rassoc cipher-char decipher-alphabet)) (progn (setcdr mapping ?\ ) (search-forward-regexp (concat "^([a-z]*" (char-to-string (car mapping)))) (decipher-insert ?\ ) (beginning-of-line))) (if (setq mapping (assoc plain-char decipher-alphabet)) (progn (if (/= ?\ (cdr mapping)) (decipher-set-map (cdr mapping) ?\ t)) (setcdr mapping cipher-char) (search-forward-regexp (concat "^([a-z]*" plain-string)) (decipher-insert cipher-char) (beginning-of-line))) (search-forward-regexp (concat "^([a-z]+ [A-Z]*" cipher-string)) (decipher-insert plain-char) (setq case-fold-search t ;Case is not significant cipher-string (downcase cipher-string)) (let ((font-lock-fontify-region-function 'ignore)) ;; insert-and-inherit will pick the right face automatically (while (search-forward-regexp "^:" nil t) (setq bound (save-excursion (end-of-line) (point))) (while (search-forward cipher-string bound 'end) (decipher-insert plain-char))))))) (defun decipher-insert (char) ;; Insert CHAR in the row below point. It replaces any existing ;; character in that position. (let ((col (1- (current-column)))) (save-excursion (forward-line) (or (= ?\> (following-char)) (= ?\) (following-char)) (error "Bad location")) (move-to-column col t) (or (eolp) (delete-char 1)) (insert-and-inherit char)))) ;;-------------------------------------------------------------------- ;; Checkpoints: ;;-------------------------------------------------------------------- ;; A checkpoint is a comment of the form: ;; %!ABCDEFGHIJKLMNOPQRSTUVWXYZ! Description ;; Such comments are usually placed at the end of the buffer following ;; this header (which is inserted by decipher-make-checkpoint): ;; %--------------------------- ;; % Checkpoints: ;; % abcdefghijklmnopqrstuvwxyz ;; but this is not required; checkpoints can be placed anywhere. ;; ;; The description is optional; all that is required is the alphabet. (defun decipher-make-checkpoint (desc) "Checkpoint the current cipher alphabet. This records the current alphabet so you can return to it later. You may have any number of checkpoints. Type `\\[decipher-restore-checkpoint]' to restore a checkpoint." (interactive "sCheckpoint description: ") (or (stringp desc) (setq desc "")) (let (alphabet buffer-read-only ;Make buffer writable mapping) (goto-char (point-min)) (re-search-forward "^)") (move-to-column 27 t) (setq alphabet (buffer-substring-no-properties (- (point) 26) (point))) (if (re-search-forward "^%![A-Z ]+!" nil 'end) nil ; Add new checkpoint with others (if (re-search-backward "^% *Local Variables:" nil t) ;; Add checkpoints before local variables list: (progn (forward-line -1) (or (looking-at "^ *$") (progn (forward-line) (insert ?\n) (forward-line -1))))) (insert "\n%" (make-string 69 ?\-) "\n% Checkpoints:\n% abcdefghijklmnopqrstuvwxyz\n")) (beginning-of-line) (insert "%!" alphabet "! " desc ?\n))) (defun decipher-restore-checkpoint () "Restore the cipher alphabet from a checkpoint. If point is not on a checkpoint line, moves to the first checkpoint line. If point is on a checkpoint, restores that checkpoint. Type `\\[decipher-make-checkpoint]' to make a checkpoint." (interactive) (beginning-of-line) (if (looking-at "%!\\([A-Z ]+\\)!") ;; Restore this checkpoint: (let ((alphabet (match-string 1)) buffer-read-only) ;Make buffer writable (goto-char (point-min)) (re-search-forward "^)") (or (eolp) (delete-region (point) (progn (end-of-line) (point)))) (insert alphabet) (decipher-resync)) ;; Move to the first checkpoint: (goto-char (point-min)) (if (re-search-forward "^%![A-Z ]+!" nil t) (message "Select the checkpoint to restore and type `%s'" (substitute-command-keys "\\[decipher-restore-checkpoint]")) (error "No checkpoints in this buffer")))) ;;-------------------------------------------------------------------- ;; Miscellaneous commands: ;;-------------------------------------------------------------------- (defun decipher-complete-alphabet () "Complete the cipher alphabet. This fills any blanks in the cipher alphabet with the unused letters in alphabetical order. Use this when you have a keyword cipher and you have determined the keyword." (interactive) (let ((cipher-char ?A) (ptr decipher-alphabet) buffer-read-only ;Make buffer writable plain-map undo-rec) (while (setq plain-map (pop ptr)) (if (equal ?\ (cdr plain-map)) (progn (while (rassoc cipher-char decipher-alphabet) ;; Find the next unused letter (incf cipher-char)) (push (cons ?\ cipher-char) undo-rec) (decipher-set-map cipher-char (car plain-map) t)))) (decipher-add-undo undo-rec))) (defun decipher-show-alphabet () "Display the current cipher alphabet in the message line." (interactive) (message "%s" (mapconcat (lambda (a) (concat (char-to-string (car a)) (char-to-string (cdr a)))) decipher-alphabet ""))) (defun decipher-resync () "Reprocess the buffer using the alphabet from the top. This regenerates all deciphered plaintext and clears the undo list. You should use this if you edit the ciphertext." (interactive) (message "Reprocessing buffer...") (let (alphabet buffer-read-only ;Make buffer writable mapping) (save-excursion (decipher-read-alphabet) (setq alphabet decipher-alphabet) (goto-char (point-min)) (and (re-search-forward "^).+" nil t) (replace-match ")" nil nil)) (while (re-search-forward "^>.+" nil t) (replace-match ">" nil nil)) (decipher-read-alphabet) (while (setq mapping (pop alphabet)) (or (equal ?\ (cdr mapping)) (decipher-set-map (cdr mapping) (car mapping)))))) (setq decipher-undo-list nil decipher-undo-list-size 0) (message "Reprocessing buffer...done")) ;;-------------------------------------------------------------------- ;; Miscellaneous functions: ;;-------------------------------------------------------------------- (defun decipher-read-alphabet () "Build the decipher-alphabet from the alphabet line in the buffer." (save-excursion (goto-char (point-min)) (search-forward-regexp "^)") (move-to-column 27 t) (setq decipher-alphabet nil) (let ((plain-char ?z)) (while (>= plain-char ?a) (backward-char) (push (cons plain-char (following-char)) decipher-alphabet) (decf plain-char))))) ;;;=================================================================== ;;; Analyzing ciphertext: ;;;=================================================================== (defun decipher-frequency-count () "Display the frequency count in the statistics buffer." (interactive) (decipher-analyze) (decipher-display-regexp "^A" "^[A-Z][A-Z]")) (defun decipher-digram-list () "Display the list of digrams in the statistics buffer." (interactive) (decipher-analyze) (decipher-display-regexp "[A-Z][A-Z] +[0-9]" "^$")) (defun decipher-adjacency-list (cipher-char) "Display the adjacency list for the letter at point. The adjacency list shows all letters which come next to CIPHER-CHAR. An adjacency list (for the letter X) looks like this: 1 1 1 1 1 3 2 1 3 8 X: 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 * 11 14 9% 1 1 1 2 1 1 2 5 7 This says that X comes before D once, and after B once. X begins 5 words, and ends 3 words (`*' represents a space). X comes before 8 different letters, after 7 differerent letters, and is next to a total of 11 different letters. It occurs 14 times, making up 9% of the ciphertext." (interactive (list (upcase (following-char)))) (decipher-analyze) (let (start end) (with-current-buffer (decipher-stats-buffer) (goto-char (point-min)) (or (re-search-forward (format "^%c: " cipher-char) nil t) (error "Character `%c' is not used in ciphertext" cipher-char)) (forward-line -1) (setq start (point)) (forward-line 3) (setq end (point))) (decipher-display-range start end))) ;;-------------------------------------------------------------------- (defun decipher-analyze () "Perform frequency analysis on the current buffer if necessary." (cond ;; If this is the statistics buffer, do nothing: ((eq major-mode 'decipher-stats-mode)) ;; If this is the Decipher buffer, see if the stats buffer exists: ((eq major-mode 'decipher-mode) (or (and (bufferp decipher-stats-buffer) (buffer-name decipher-stats-buffer)) (decipher-analyze-buffer))) ;; Otherwise: (t (error "This buffer is not in Decipher mode")))) ;;-------------------------------------------------------------------- (defun decipher-display-range (start end) "Display text between START and END in the statistics buffer. START and END are positions in the statistics buffer. Makes the statistics buffer visible and sizes the window to just fit the displayed text, but leaves the current window selected." (let ((stats-buffer (decipher-stats-buffer)) (current-window (selected-window)) (pop-up-windows t)) (or (eq (current-buffer) stats-buffer) (pop-to-buffer stats-buffer)) (goto-char start) (or (one-window-p t) (enlarge-window (- (1+ (count-lines start end)) (window-height)))) (recenter 0) (select-window current-window))) (defun decipher-display-regexp (start-regexp end-regexp) "Display text between two regexps in the statistics buffer. START-REGEXP matches the first line to display. END-REGEXP matches the line after that which ends the display. The ending line is included in the display unless it is blank." (let (start end) (with-current-buffer (decipher-stats-buffer) (goto-char (point-min)) (re-search-forward start-regexp) (beginning-of-line) (setq start (point)) (re-search-forward end-regexp) (beginning-of-line) (or (looking-at "^ *$") (forward-line 1)) (setq end (point))) (decipher-display-range start end))) ;;-------------------------------------------------------------------- (defun decipher-loop-with-breaks (func) "Loop through ciphertext, calling FUNC once for each letter & word division. FUNC is called with no arguments, and its return value is unimportant. It may examine `decipher-char' to see the current ciphertext character. `decipher-char' contains either an uppercase letter or a space. FUNC is called exactly once between words, with `decipher-char' set to a space. See `decipher-loop-no-breaks' if you do not care about word divisions." (let ((decipher-char ?\ ) (decipher--loop-prev-char ?\ )) (save-excursion (goto-char (point-min)) (funcall func) ;Space marks beginning of first word (while (search-forward-regexp "^:" nil t) (while (not (eolp)) (setq decipher-char (upcase (following-char))) (or (and (>= decipher-char ?A) (<= decipher-char ?Z)) (setq decipher-char ?\ )) (or (and (equal decipher-char ?\ ) (equal decipher--loop-prev-char ?\ )) (funcall func)) (setq decipher--loop-prev-char decipher-char) (forward-char)) (or (equal decipher-char ?\ ) (progn (setq decipher-char ?\s decipher--loop-prev-char ?\ ) (funcall func))))))) (defun decipher-loop-no-breaks (func) "Loop through ciphertext, calling FUNC once for each letter. FUNC is called with no arguments, and its return value is unimportant. It may examine `decipher-char' to see the current ciphertext letter. `decipher-char' contains an uppercase letter. Punctuation and spacing in the ciphertext are ignored. See `decipher-loop-with-breaks' if you care about word divisions." (let (decipher-char) (save-excursion (goto-char (point-min)) (while (search-forward-regexp "^:" nil t) (while (not (eolp)) (setq decipher-char (upcase (following-char))) (and (>= decipher-char ?A) (<= decipher-char ?Z) (funcall func)) (forward-char)))))) ;;-------------------------------------------------------------------- ;; Perform the analysis: ;;-------------------------------------------------------------------- (defun decipher-insert-frequency-counts (freq-list total) "Insert frequency counts in current buffer. Each element of FREQ-LIST is a list (LETTER FREQ ...). TOTAL is the total number of letters in the ciphertext." (let ((i 4) temp-list) (while (> i 0) (setq temp-list freq-list) (while temp-list (insert (caar temp-list) (format "%4d%3d%% " (cadar temp-list) (/ (* 100 (cadar temp-list)) total))) (setq temp-list (nthcdr 4 temp-list))) (insert ?\n) (setq freq-list (cdr freq-list) i (1- i))))) (defun decipher--analyze () ;; Perform frequency analysis on ciphertext. ;; ;; This function is called repeatedly with decipher-char set to each ;; character of ciphertext. It uses decipher--prev-char to remember ;; the previous ciphertext character. ;; ;; It builds several data structures, which must be initialized ;; before the first call to decipher--analyze. The arrays are ;; indexed with A = 0, B = 1, ..., Z = 25, SPC = 26 (if used). ;; decipher--after: (initialize to zeros) ;; A vector of 26 vectors of 27 integers. The first vector ;; represents the number of times A follows each character, the ;; second vector represents B, and so on. ;; decipher--before: (initialize to zeros) ;; The same as decipher--after, but representing the number of ;; times the character precedes each other character. ;; decipher--digram-list: (initialize to nil) ;; An alist with an entry for each digram (2-character sequence) ;; encountered. Each element is a cons cell (DIGRAM . FREQ), ;; where DIGRAM is a 2 character string and FREQ is the number ;; of times it occurs. ;; decipher--freqs: (initialize to zeros) ;; A vector of 26 integers, counting the number of occurrences ;; of the corresponding characters. (setq decipher--digram (format "%c%c" decipher--prev-char decipher-char)) (incf (cdr (or (assoc decipher--digram decipher--digram-list) (car (push (cons decipher--digram 0) decipher--digram-list))))) (and (>= decipher--prev-char ?A) (incf (aref (aref decipher--before (- decipher--prev-char ?A)) (if (equal decipher-char ?\ ) 26 (- decipher-char ?A))))) (and (>= decipher-char ?A) (incf (aref decipher--freqs (- decipher-char ?A))) (incf (aref (aref decipher--after (- decipher-char ?A)) (if (equal decipher--prev-char ?\ ) 26 (- decipher--prev-char ?A))))) (setq decipher--prev-char decipher-char)) (defun decipher--digram-counts (counts) "Generate the counts for an adjacency list." (let ((total 0)) (concat (mapconcat (lambda (x) (cond ((> x 99) (incf total) "XX") ((> x 0) (incf total) (format "%2d" x)) (t " "))) counts "") (format "%4d" (if (> (aref counts 26) 0) (1- total) ;Don't count space total))))) (defun decipher--digram-total (before-count after-count) "Count the number of different letters a letter appears next to." ;; We do not include spaces (word divisions) in this count. (let ((total 0) (i 26)) (while (>= (decf i) 0) (if (or (> (aref before-count i) 0) (> (aref after-count i) 0)) (incf total))) total)) (defun decipher-analyze-buffer () "Perform frequency analysis and store results in statistics buffer. Creates the statistics buffer if it doesn't exist." (let ((decipher--prev-char (if decipher-ignore-spaces ?\ ?\*)) (decipher--before (make-vector 26 nil)) (decipher--after (make-vector 26 nil)) (decipher--freqs (make-vector 26 0)) (total-chars 0) decipher--digram decipher--digram-list freq-list) (message "Scanning buffer...") (let ((i 26)) (while (>= (decf i) 0) (aset decipher--before i (make-vector 27 0)) (aset decipher--after i (make-vector 27 0)))) (if decipher-ignore-spaces (progn (decipher-loop-no-breaks 'decipher--analyze) ;; The first character of ciphertext was marked as following a space: (let ((i 26)) (while (>= (decf i) 0) (aset (aref decipher--after i) 26 0)))) (decipher-loop-with-breaks 'decipher--analyze)) (message "Processing results...") (setcdr (last decipher--digram-list 2) nil) ;Delete the phony "* " digram ;; Sort the digram list by frequency and alphabetical order: (setq decipher--digram-list (sort (sort decipher--digram-list (lambda (a b) (string< (car a) (car b)))) (lambda (a b) (> (cdr a) (cdr b))))) ;; Generate the frequency list: ;; Each element is a list of 3 elements (LETTER FREQ DIFFERENT), ;; where LETTER is the ciphertext character, FREQ is the number ;; of times it occurs, and DIFFERENT is the number of different ;; letters it appears next to. (let ((i 26)) (while (>= (decf i) 0) (setq freq-list (cons (list (+ i ?A) (aref decipher--freqs i) (decipher--digram-total (aref decipher--before i) (aref decipher--after i))) freq-list) total-chars (+ total-chars (aref decipher--freqs i))))) ;; Switch to statistics buffer, creating it if necessary: (with-current-buffer (decipher-stats-buffer t) ;; This can't happen, but it never hurts to double-check: (or (eq major-mode 'decipher-stats-mode) (error "Buffer %s is not in Decipher-Stats mode" (buffer-name))) (setq buffer-read-only nil) (erase-buffer) ;; Display frequency counts for letters A-Z: (decipher-insert-frequency-counts freq-list total-chars) (insert ?\n) ;; Display frequency counts for letters in order of frequency: (setq freq-list (sort freq-list (lambda (a b) (> (second a) (second b))))) (decipher-insert-frequency-counts freq-list total-chars) ;; Display letters in order of frequency: (insert ?\n (mapconcat (lambda (a) (char-to-string (car a))) freq-list nil) "\n\n") ;; Display list of digrams in order of frequency: (let* ((rows (floor (+ (length decipher--digram-list) 9) 10)) (i rows) temp-list) (while (> i 0) (setq temp-list decipher--digram-list) (while temp-list (insert (caar temp-list) (format "%3d " (cdar temp-list))) (setq temp-list (nthcdr rows temp-list))) (delete-horizontal-space) (insert ?\n) (setq decipher--digram-list (cdr decipher--digram-list) i (1- i)))) ;; Display adjacency list for each letter, sorted in descending ;; order of the number of adjacent letters: (setq freq-list (sort freq-list (lambda (a b) (> (third a) (third b))))) (let ((temp-list freq-list) entry i) (while (setq entry (pop temp-list)) (if (equal 0 (second entry)) nil ;This letter was not used (setq i (- (car entry) ?A)) (insert ?\n " " (decipher--digram-counts (aref decipher--before i)) ?\n (car entry) ": 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 *" (format "%4d %4d %3d%%\n " (third entry) (second entry) (/ (* 100 (second entry)) total-chars)) (decipher--digram-counts (aref decipher--after i)) ?\n)))) (setq buffer-read-only t) (set-buffer-modified-p nil) )) (message nil)) ;;==================================================================== ;; Statistics Buffer: ;;==================================================================== (defun decipher-stats-mode () "Major mode for displaying ciphertext statistics." (interactive) (kill-all-local-variables) (setq buffer-read-only t buffer-undo-list t ;Disable undo case-fold-search nil ;Case is significant when searching indent-tabs-mode nil ;Do not use tab characters major-mode 'decipher-stats-mode mode-name "Decipher-Stats") (use-local-map decipher-stats-mode-map) (run-mode-hooks 'decipher-stats-mode-hook)) (put 'decipher-stats-mode 'mode-class 'special) ;;-------------------------------------------------------------------- (defun decipher-display-stats-buffer () "Make the statistics buffer visible, but do not select it." (let ((stats-buffer (decipher-stats-buffer)) (current-window (selected-window))) (or (eq (current-buffer) stats-buffer) (progn (pop-to-buffer stats-buffer) (select-window current-window))))) (defun decipher-stats-buffer (&optional create) "Return the buffer used for decipher statistics. If CREATE is non-nil, create the buffer if it doesn't exist. This is guaranteed to return a buffer in Decipher-Stats mode; if it can't, it signals an error." (cond ;; We may already be in the statistics buffer: ((eq major-mode 'decipher-stats-mode) (current-buffer)) ;; See if decipher-stats-buffer exists: ((and (bufferp decipher-stats-buffer) (buffer-name decipher-stats-buffer)) (or (with-current-buffer decipher-stats-buffer (eq major-mode 'decipher-stats-mode)) (error "Buffer %s is not in Decipher-Stats mode" (buffer-name decipher-stats-buffer))) decipher-stats-buffer) ;; Create a new buffer if requested: (create (let ((stats-name (concat "*" (buffer-name) "*"))) (setq decipher-stats-buffer (if (eq 'decipher-stats-mode (cdr-safe (assoc 'major-mode (buffer-local-variables (get-buffer stats-name))))) ;; We just lost track of the statistics buffer: (get-buffer stats-name) (generate-new-buffer stats-name)))) (with-current-buffer decipher-stats-buffer (decipher-stats-mode)) decipher-stats-buffer) ;; Give up: (t (error "No statistics buffer")))) ;;==================================================================== (provide 'decipher) ;;(defun decipher-show-undo-list () ;; "Display the undo list (for debugging purposes)." ;; (interactive) ;; (with-output-to-temp-buffer "*Decipher Undo*" ;; (let ((undo-list decipher-undo-list) ;; undo-rec undo-map) ;; (with-current-buffer "*Decipher Undo*" ;; (while (setq undo-rec (pop undo-list)) ;; (or (consp (car undo-rec)) ;; (setq undo-rec (list undo-rec))) ;; (insert ?\() ;; (while (setq undo-map (pop undo-rec)) ;; (insert (cdr undo-map) (car undo-map) ?\ )) ;; (delete-backward-char 1) ;; (insert ")\n")))))) ;; arch-tag: 8f094d88-ffe1-4f99-afe3-a5e81dd939d9 ;;; decipher.el ends here