marcuskammer/emacs.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Install olivetti

Browse source
This commit is contained in:
Marcus Kammer 2020-03-28 11:06:23 +01:00
parent d34d3e4c42
commit aaec051c60
5 changed files with 419 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bundle/custom.el
View file

@ -68,7 +68,7 @@
'(package-enable-at-startup t)
'(package-selected-packages
(quote
(ace-window graphviz-dot-mode dot-mode plantuml-mode elisp-format elisp-lint flymake-racket google-translate org-pomodoro elm-mode dashboard pickle poet-theme flymake-eslint json-mode elpy darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit)))
(olivetti ace-window graphviz-dot-mode dot-mode plantuml-mode elisp-format elisp-lint flymake-racket google-translate org-pomodoro elm-mode dashboard pickle poet-theme flymake-eslint json-mode elpy darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit)))
'(python-shell-interpreter "python3")
'(register-preview-delay 2)
'(register-separator 43)

30
elpa/olivetti-20200320.1154/olivetti-autoloads.el Normal file
View file

@ -0,0 +1,30 @@
;;; olivetti-autoloads.el --- automatically extracted autoloads
;;
;;; Code:
(add-to-list 'load-path (directory-file-name
(or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "olivetti" "olivetti.el" (0 0 0 0))
;;; Generated autoloads from olivetti.el
(autoload 'olivetti-mode "olivetti" "\
Olivetti provides a nice writing environment.
Window margins are set to relative widths to accomodate a text
body width set with `olivetti-body-width'.
\(fn &optional ARG)" t nil)
(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "olivetti" '("olivetti-")))
;;;***
;; Local Variables:
;; version-control: never
;; no-byte-compile: t
;; no-update-autoloads: t
;; coding: utf-8
;; End:
;;; olivetti-autoloads.el ends here

2
elpa/olivetti-20200320.1154/olivetti-pkg.el Normal file
View file

@ -0,0 +1,2 @@
;;; -*- no-byte-compile: t -*-
(define-package "olivetti" "20200320.1154" "Minor mode for a nice writing environment" '((emacs "24.5")) :commit "5dc27716c706166e1932f4a0e9f94384b6d17cb0" :keywords '("wp" "text") :authors '(("William Rankin" . "code@william.bydasein.com")) :maintainer '("William Rankin" . "code@william.bydasein.com") :url "https://gthub.com/rnkn/olivetti")

386
elpa/olivetti-20200320.1154/olivetti.el Normal file
View file

@ -0,0 +1,386 @@
;;; olivetti.el --- Minor mode for a nice writing environment -*- lexical-binding: t; -*-
;; Copyright (c) 2014-2019 Paul Wiliam Rankin
;; Copyright (c) 2019 Free Software Foundation, Inc.
;; Copyright (c) 2019-2020 Paul Wiliam Rankin
;; Author: William Rankin <code@william.bydasein.com>
;; Keywords: wp, text
;; Package-Version: 20200320.1154
;; Version: 1.9.3
;; Package-Requires: ((emacs "24.5"))
;; URL: https://gthub.com/rnkn/olivetti
;; This file is not part of GNU Emacs.
;; This program 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.
;; 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, see <https://www.gnu.org/licenses/>.
;;; Commentary:
;; # Olivetti #
;; A simple Emacs minor mode for a nice writing environment.
;; ## Features ##
;; - Set a desired text body width to automatically resize window margins to
;; keep the text comfortably in the middle of the window.
;; - Text body width can be the number of characters (an integer) or a fraction
;; of the window width (a float between 0.0 and 1.0).
;; - Interactively change body width with:
;; olivetti-shrink C-c { { { ...
;; olivetti-expand C-c } } } ...
;; olivetti-set-width C-c \
;; - If olivetti-body-width is an integer, the text body width will scale with
;; use of text-scale-mode, whereas if a fraction (float) then the text body
;; width will remain at that fraction.
;; - Optionally remember the state of visual-line-mode on entry and recall its
;; state on exit.
;; Olivetti keeps everything it does buffer-local, so you can write prose in one
;; buffer and code in another, side-by-side in the same frame. For those looking
;; for a hardcore distraction-free writing mode with a much larger scope, I
;; recommend writeroom-mode: https://github.com/joostkremers/writeroom-mode.
;; ## Requirements ##
;; - Emacs 25.3
;; ## Installation ##
;; The latest stable release of Olivetti is available via [MELPA-stable]
;; and can be installed with:
;; M-x package-install RET olivetti RET
;; Alternately, download the [latest release], move this file into your
;; load-path and add to your .emacs/init.el file:
;; (require 'olivetti)
;; If you prefer the latest but perhaps unstable version, install via
;; [MELPA], or clone the repository into your load-path and require as
;; above:
;; git clone https://github.com/rnkn/olivetti.git
;; [melpa]: https://melpa.org/#/olivetti "MELPA"
;; [melpa-stable]: https://stable.melpa.org/#/olivetti "MELPA-stable"
;; [latest release]: https://github.com/rnkn/olivetti/releases/latest "Olivetti latest release"
;; ## Contributing ##
;; Please report bugs and request features at:
;; https://github.com/rnkn/olivetti/issues
;; ## Hints ##
;; To always use a different width for a specific file, set a File
;; Variable:
;; M-x add-file-local-variable RET olivetti-body-width RET 66 RET
;; See (info "(emacs) File Variables")
;;; Code:
(defgroup olivetti ()
"Minor mode for a nice writing environment"
:prefix "olivetti-"
:group 'text)
;;; Variables
(defvar-local olivetti--visual-line-mode
nil
"Non-nil if `visual-line-mode' is active when `olivetti-mode' is turned on.")
;;; Options
(defcustom olivetti-mode-hook
nil
"Hook for `olivetti-mode', run after the mode is activated."
:type 'hook
:safe 'hook)
(defcustom olivetti-body-width
70
"Text body width to which to adjust relative margin width.
If an integer, set text body width to that integer in columns; if
a floating point between 0.0 and 1.0, set text body width to
that fraction of the total window width.
An integer is best if you want text body width to remain
constant, while a floating point is best if you want text body
width to change with window width.
The floating point can anything between 0.0 and 1.0 (exclusive),
but it's better to use a value between about 0.33 and 0.9 for
best effect.
This option does not affect file contents."
:type '(choice (integer 70) (float 0.5))
:safe 'numberp)
(make-variable-buffer-local 'olivetti-body-width)
(defcustom olivetti-minimum-body-width
40
"Minimum width in columns that text body width may be set."
:type 'integer
:safe 'integerp)
(defcustom olivetti-lighter
" Olv"
"Mode-line indicator for `olivetti-mode'."
:type '(choice (const :tag "No lighter" "") string)
:safe 'stringp)
(defcustom olivetti-recall-visual-line-mode-entry-state
t
"Recall the state of `visual-line-mode' upon exiting.
When non-nil, if `visual-line-mode' is inactive upon activating
`olivetti-mode', then `visual-line-mode' will be deactivated upon
exiting. The reverse is not true."
:type 'boolean
:safe 'booleanp)
;;; Set Environment
(defun olivetti-set-all-margins ()
"Balance window margins in all windows displaying current buffer.
Cycle through all windows in all frames displaying the current
buffer, and call `olivetti-set-margins'."
(dolist (window (get-buffer-window-list nil nil t))
(olivetti-set-margins window)))
(defun olivetti-set-margins (&optional frame-or-window)
"Balance window margins displaying current buffer.
If FRAME-OR-WINDOW is a frame, cycle through windows displaying
current buffer in that frame, otherwise only work on the selected
window.
First find the `olivetti-safe-width' to which to set
`olivetti-body-width', then find the appropriate margin size
relative to each window. Finally set the window margins, taking
care that the maximum size is 0."
(if (framep frame-or-window)
(dolist (window (get-buffer-window-list nil nil frame-or-window))
(olivetti-set-margins window))
;; FRAME-OR-WINDOW passed below *must* be a window
(olivetti-reset-window frame-or-window)
(let ((width (olivetti-safe-width olivetti-body-width frame-or-window))
(frame (window-frame frame-or-window))
(window-width (window-total-width frame-or-window))
(fringes (window-fringes frame-or-window))
left-fringe right-fringe margin-total left-margin right-margin)
(cond ((integerp width)
(setq width (olivetti-scale-width width)))
((floatp width)
(setq width (* window-width width))))
(setq left-fringe (/ (car fringes) (float (frame-char-width frame)))
right-fringe (/ (cadr fringes) (float (frame-char-width frame))))
(setq margin-total (max (/ (- window-width width) 2) 0)
left-margin (max (round (- margin-total left-fringe)) 0)
right-margin (max (round (- margin-total right-fringe)) 0))
(set-window-parameter frame-or-window 'split-window 'olivetti-split-window)
(set-window-margins frame-or-window left-margin right-margin))))
(defun olivetti-reset-all-windows ()
"Remove Olivetti's parameters and margins from all windows.
Cycle through all windows displaying current buffer and call
`olivetti-reset-window'."
(dolist (window (get-buffer-window-list nil nil t))
(olivetti-reset-window window)))
(defun olivetti-reset-window (window)
"Remove Olivetti's parameters and margins from WINDOW."
(when (eq (window-parameter window 'split-window) 'olivetti-split-window)
(set-window-parameter window 'split-window nil))
(set-window-margins window nil))
(defun olivetti-split-window (&optional window size side pixelwise)
"Call `split-window' after resetting WINDOW.
Pass SIZE, SIDE and PIXELWISE unchanged."
(olivetti-reset-window window)
(split-window window size side pixelwise))
(defun olivetti-split-window-sensibly (&optional window)
"Like `olivetti-split-window' but call `split-window-sensibly'.
Pass WINDOW unchanged."
(olivetti-reset-window window)
(split-window-sensibly window))
;;; Calculate Width
(defun olivetti-scale-width (n)
"Scale N in accordance with the face height.
For compatibility with `text-scale-mode', if
`face-remapping-alist' includes a :height property on the default
face, scale N by that factor if it is a fraction, by (height/100)
if it is an integer, and otherwise scale by 1."
(let
((height (plist-get (cadr (assq 'default face-remapping-alist)) :height)))
(cond
((integerp height) (* n (/ height 100.0)))
((floatp height) (* n height))
(t n))))
(defun olivetti-safe-width (width window)
"Parse WIDTH to a safe value for `olivetti-body-width' for WINDOW.
May return a float with many digits of precision."
(let ((window-width (window-total-width window))
(fringes (window-fringes window))
(min-width (+ olivetti-minimum-body-width
(% olivetti-minimum-body-width 2))))
(setq window-width
(- window-width
(/ (* (max (car fringes) (cadr fringes)) 2)
(float (frame-char-width (window-frame window))))
(% window-width 2)))
(cond ((integerp width)
(max min-width (min width (floor window-width))))
((floatp width)
(max (/ min-width window-width) (min width 1.0)))
((user-error "`olivetti-body-width' must be an integer or a float")
;; FIXME: This code is unreachable since we signal an error before
;; getting here!?
(eval (car (get 'olivetti-body-width 'standard-value)) t)))))
;;; Keymap
(defvar olivetti-mode-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-c }") #'olivetti-expand)
(define-key map (kbd "C-c {") #'olivetti-shrink)
(define-key map (kbd "C-c \\") #'olivetti-set-width)
map)
"Mode map for `olivetti-mode'.")
;;; Width Interaction
(defun olivetti-set-width (n)
"Set text body width to N with relative margins.
N may be an integer specifying columns or a float specifying a
fraction of the window width."
(interactive
(list (or current-prefix-arg
(read-number "Set text body width (integer or float): "
olivetti-body-width))))
(setq olivetti-body-width n)
(olivetti-set-all-margins)
(message "Text body width set to %s" olivetti-body-width))
(defun olivetti-expand (&optional arg)
"Incrementally increase the value of `olivetti-body-width'.
If prefixed with ARG, incrementally decrease."
(interactive "P")
(let* ((p (if arg -1 1))
(n (cond ((integerp olivetti-body-width)
(+ olivetti-body-width (* 2 p)))
((floatp olivetti-body-width)
(+ olivetti-body-width (* 0.01 p))))))
(setq olivetti-body-width (olivetti-safe-width n (selected-window))))
(olivetti-set-all-margins)
(message "Text body width set to %s" olivetti-body-width)
(unless overriding-terminal-local-map
(let ((keys (substring (this-single-command-keys) 0 -1))
(map (cdr olivetti-mode-map)))
(mapc (lambda (k) (setq map (assq k map))) keys)
(when (consp map) (set-transient-map (cdr map) t)))))
(defun olivetti-shrink (&optional arg)
"Incrementally decrease the value of `olivetti-body-width'.
If prefixed with ARG, incrementally increase."
(interactive "P")
(let ((p (unless arg t)))
(olivetti-expand p)))
;;; Mode Definition
(define-obsolete-function-alias 'turn-on-olivetti-mode
#'olivetti-mode "1.7.0")
;;;###autoload
(define-minor-mode olivetti-mode
"Olivetti provides a nice writing environment.
Window margins are set to relative widths to accomodate a text
body width set with `olivetti-body-width'."
:init-value nil
:lighter olivetti-lighter
(if olivetti-mode
(progn
(add-hook 'text-scale-mode-hook
#'olivetti-set-margins t t)
(cond ((<= emacs-major-version 24)
(add-hook 'window-configuration-change-hook
#'olivetti-set-all-margins t t))
((<= emacs-major-version 26)
(add-hook 'window-configuration-change-hook
#'olivetti-set-all-margins t t)
(add-hook 'window-size-change-functions
#'olivetti-set-margins t t))
((<= 27 emacs-major-version)
(add-hook 'window-size-change-functions
#'olivetti-set-margins t t)))
(add-hook 'change-major-mode-hook
#'olivetti-reset-all-windows nil t)
(setq-local split-window-preferred-function
#'olivetti-split-window-sensibly)
(setq olivetti--visual-line-mode visual-line-mode)
(unless olivetti--visual-line-mode (visual-line-mode 1))
(olivetti-set-all-margins))
(remove-hook 'text-scale-mode-hook
#'olivetti-set-margins t)
(remove-hook 'window-configuration-change-hook
#'olivetti-set-all-margins t)
(remove-hook 'window-size-change-functions
#'olivetti-set-margins t)
(olivetti-reset-all-windows)
(when (and olivetti-recall-visual-line-mode-entry-state
(not olivetti--visual-line-mode))
(visual-line-mode 0))
(kill-local-variable 'split-window-preferred-function)
(kill-local-variable 'olivetti--visual-line-mode)))
(provide 'olivetti)
;;; olivetti.el ends here
;; Local Variables:
;; coding: utf-8
;; fill-column: 80
;; require-final-newline: t
;; sentence-end-double-space: nil
;; End:

BIN
elpa/olivetti-20200320.1154/olivetti.elc Normal file
View file

Binary file not shown.