yatex
diff yahtml.el @ 190:3db120d6b7d1
Calculation of indentation depth revised. (included again after merge conflict)
author | yuuji@gentei.org |
---|---|
date | Sat, 17 Dec 2011 13:02:40 +0900 |
parents | 8abdd3cc87d0 |
children | af2098da767b |
line diff
1.1 --- a/yahtml.el Sat Dec 17 12:54:25 2011 +0900 1.2 +++ b/yahtml.el Sat Dec 17 13:02:40 2011 +0900 1.3 @@ -1,6 +1,6 @@ 1.4 ;;; -*- Emacs-Lisp -*- 1.5 ;;; (c) 1994-2011 by HIROSE Yuuji [yuuji(@)yatex.org] 1.6 -;;; Last modified Mon May 16 15:49:38 2011 on firestorm 1.7 +;;; Last modified Sat Dec 17 13:00:34 2011 on firestorm 1.8 ;;; $Id$ 1.9 1.10 (defconst yahtml-revision-number "1.74.2" 1.11 @@ -250,7 +250,9 @@ 1.12 %x: width, %y: height, %s: size in bytes, %c: first comment string, 1.13 %f: filename") 1.14 1.15 -(defvar yahtml-faithful-to-htmllint nil) 1.16 +(defvar yahtml-faithful-to-htmllint (not yahtml-always-/li) 1.17 + "*Non-nil doesn't put space after opening tags.") 1.18 + 1.19 (defvar yahtml-error-line-regexp 1.20 "^\\(.*\\)(\\([0-9]+\\)):\\|^line \\([0-9]+\\)" 1.21 "*Regexp of error position which is produced by lint program.") 1.22 @@ -2509,11 +2511,11 @@ 1.23 (yahtml-indent-line-real)))) 1.24 1.25 (defun yahtml-this-indent () 1.26 - (let ((envs "[uod]l\\|table\\|[ht][rhd0-6]\\|select\\|blockquote\\|center\\|menu\\|dir\\|font") 1.27 - (itemizing-envs "^\\([uod]l\\|menu\\|dir\\)$") 1.28 + (let ((envs "[uod]l\\|table\\|[ht][rhd0-6]\\|select\\|blockquote\\|center\\|menu\\|dir\\|d[td]\\|li") 1.29 + (itemizing-envs "^\\([uod]l\\|menu\\|dir\\|li\\|d[td]\\)$") 1.30 (itms "<\\(dt\\|dd\\|li\\|t[rdh]\\|option\\)\\b") 1.31 (excludes 1.32 - "\\(a\\|p\\|span\\|code\\|tt\\|em\\|u\\|i\\|big\\|small\\|font\\)\\b") 1.33 + "\\b\\(a\\|p\\|span\\|code\\|tt\\|em\\|u\\|i\\|big\\|small\\|font\\)\\b") 1.34 inenv p col peol (case-fold-search t)) 1.35 (save-excursion 1.36 (beginning-of-line)