changeset 190:3db120d6b7d1 dev

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
files yahtml.el
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/yahtml.el	Sat Dec 17 12:54:25 2011 +0900
+++ b/yahtml.el	Sat Dec 17 13:02:40 2011 +0900
@@ -1,6 +1,6 @@
 ;;; -*- Emacs-Lisp -*-
 ;;; (c) 1994-2011 by HIROSE Yuuji [yuuji(@)yatex.org]
-;;; Last modified Mon May 16 15:49:38 2011 on firestorm
+;;; Last modified Sat Dec 17 13:00:34 2011 on firestorm
 ;;; $Id$
 
 (defconst yahtml-revision-number "1.74.2"
@@ -250,7 +250,9 @@
 %x: width, %y: height, %s: size in bytes, %c: first comment string,
 %f: filename")
 
-(defvar yahtml-faithful-to-htmllint nil)
+(defvar yahtml-faithful-to-htmllint (not yahtml-always-/li)
+  "*Non-nil doesn't put space after opening tags.")
+
 (defvar yahtml-error-line-regexp
   "^\\(.*\\)(\\([0-9]+\\)):\\|^line \\([0-9]+\\)"
   "*Regexp of error position which is produced by lint program.")
@@ -2509,11 +2511,11 @@
       (yahtml-indent-line-real))))
 
 (defun yahtml-this-indent ()
-  (let ((envs "[uod]l\\|table\\|[ht][rhd0-6]\\|select\\|blockquote\\|center\\|menu\\|dir\\|font")
-	(itemizing-envs "^\\([uod]l\\|menu\\|dir\\)$")
+  (let ((envs "[uod]l\\|table\\|[ht][rhd0-6]\\|select\\|blockquote\\|center\\|menu\\|dir\\|d[td]\\|li")
+	(itemizing-envs "^\\([uod]l\\|menu\\|dir\\|li\\|d[td]\\)$")
 	(itms "<\\(dt\\|dd\\|li\\|t[rdh]\\|option\\)\\b")
 	(excludes
-	 "\\(a\\|p\\|span\\|code\\|tt\\|em\\|u\\|i\\|big\\|small\\|font\\)\\b")
+	 "\\b\\(a\\|p\\|span\\|code\\|tt\\|em\\|u\\|i\\|big\\|small\\|font\\)\\b")
 	inenv p col peol (case-fold-search t))
     (save-excursion
       (beginning-of-line)

yatex.org