steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FUEL: Better looking tables in help buffers and a fix for in-cell links.

db4
Jose A. Ortega Ruiz 2009-06-02 04:34:40 +02:00
parent a381d12b6d
commit 09b08a0924
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/fuel/fuel-markup.el
View File

@ -382,7 +382,7 @@
(when (looking-at "Word *\\(Stack effect\\|Syntax\\)$") (when (looking-at "Word *\\(Stack effect\\|Syntax\\)$")
(push (list "Word" (match-string-no-properties 1)) rows) (push (list "Word" (match-string-no-properties 1)) rows)
(forward-line)) (forward-line))
(while (looking-at "\\(.+?\\)\\( +\\(.+\\)\\)?$") (while (looking-at " ?\\(.+?\\)\\( +\\(.+\\)\\)?$")
(let ((word `($link ,(match-string-no-properties 1) (let ((word `($link ,(match-string-no-properties 1)
,(match-string-no-properties 1) ,(match-string-no-properties 1)
word)) word))

57
misc/fuel/fuel-table.el
View File

@ -72,21 +72,64 @@
(push (fuel-table--pad-row (reverse frow)) frows))) (push (fuel-table--pad-row (reverse frow)) frows)))
(reverse frows))) (reverse frows)))
(defvar fuel-table-corner-lt "┌")
(defvar fuel-table-corner-lb "└")
(defvar fuel-table-corner-rt "┐")
(defvar fuel-table-corner-rb "┘")
(defvar fuel-table-line "─")
(defvar fuel-table-tee-t "┬")
(defvar fuel-table-tee-b "┴")
(defvar fuel-table-tee-l "├")
(defvar fuel-table-tee-r "┤")
(defvar fuel-table-crux "┼")
(defvar fuel-table-sep "│")
(defun fuel-table--insert-line (widths first last sep)
(insert first fuel-table-line)
(dolist (w widths)
(while (> w 0)
(insert fuel-table-line)
(setq w (1- w)))
(insert fuel-table-line sep fuel-table-line))
(delete-char -2)
(insert fuel-table-line last)
(newline))
(defun fuel-table--insert-first-line (widths)
(fuel-table--insert-line widths
fuel-table-corner-lt
fuel-table-corner-rt
fuel-table-tee-t))
(defun fuel-table--insert-middle-line (widths)
(fuel-table--insert-line widths
fuel-table-tee-l
fuel-table-tee-r
fuel-table-crux))
(defun fuel-table--insert-last-line (widths)
(fuel-table--insert-line widths
fuel-table-corner-lb
fuel-table-corner-rb
fuel-table-tee-b))
(defun fuel-table--insert (rows) (defun fuel-table--insert (rows)
(let* ((widths (fuel-table--col-widths rows)) (let* ((widths (fuel-table--col-widths rows))
(rows (fuel-table--format-rows rows widths)) (rows (fuel-table--format-rows rows widths)))
(ls (concat "+" (mapconcat (lambda (n) (make-string n ?-)) widths "-+") "-+"))) (fuel-table--insert-first-line widths)
(insert ls "\n")
(dolist (r rows) (dolist (r rows)
(let ((ln (length (car r))) (let ((ln (length (car r)))
(l 0)) (l 0))
(while (< l ln) (while (< l ln)
(insert (concat "|" (mapconcat 'identity (insert (concat fuel-table-sep " "
(mapconcat 'identity
(mapcar `(lambda (x) (nth ,l x)) r) (mapcar `(lambda (x) (nth ,l x)) r)
" |") (concat " " fuel-table-sep " "))
" |\n")) " " fuel-table-sep "\n"))
(setq l (1+ l)))) (setq l (1+ l))))
(insert ls "\n")))) (fuel-table--insert-middle-line widths))
(kill-line -1)
(fuel-table--insert-last-line widths)))
(provide 'fuel-table) (provide 'fuel-table)