From f6d018d608cfce0f588e5935ecfa9c02add9b897 Mon Sep 17 00:00:00 2001
From: "Tom Breton (Tehom)" <tehom@panix.com>
Date: Thu, 9 Sep 2010 17:24:30 -0400
Subject: [PATCH] Renaming tehom-org-html-* => org-html-*

---
 dia-links.el    |  5 +----
 for-org-html.el | 47 +++++++++++++++++------------------------------
 make-target.el  |  4 ----
 3 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/dia-links.el b/dia-links.el
index c00f9c4..e98bab9 100644
--- a/dia-links.el
+++ b/dia-links.el
@@ -29,9 +29,6 @@
 
 ;;;_ , Requires
 
-(when (not (fboundp 'rtest:deftest))
-    (defmacro rtest:deftest (&rest dummy))
-    (defmacro rtest:if-avail (&rest dummy)))
 (require 'org2blog/for-org-html)
 (require 'org2blog/make-target)
 ;;;_. Body
@@ -78,7 +75,7 @@
 	 
 	 ;;Cause the image to be made if out of date.
 	 (org2blog:make-target image-filename)
-	 (tehom-org-html-make-link
+	 (org-html-make-link
 	    "file" image-filename desc desc "" t))))
 ;;;_  . Tests
 
diff --git a/for-org-html.el b/for-org-html.el
index 8f64ea7..9cccc7b 100644
--- a/for-org-html.el
+++ b/for-org-html.el
@@ -2,20 +2,24 @@
 (require 'org-html)
 
 ;;;_ , General: make HTML links
-;;;_  . tehom-org-html-cvt-link-fn
-(defconst tehom-org-html-cvt-link-fn 
-   ;;May change to take more args and combine type + path + fragment
+;;;_  . org-html-cvt-link-fn
+(defconst org-html-cvt-link-fn 
+   ;;In the future this might change to take more args: type + path +
+   ;;fragment
    #'identity
    "Function to convert link URLs to exportable URLs.
+Takes one argument, PATH.
+Returns exportable URL.
 Intended for remote exporting." )
 
 ;;Special variables seen:
 ;;`html-extension' -- From plist
+;;`org-par-open' is a special variable so it's not in the arglist.
 
 
-;;;_  . tehom-org-html-make-link
+;;;_  . org-html-make-link
 ;;Adapted from `org-export-as-html'
-(defun tehom-org-html-make-link (type path fragment desc descp attr
+(defun org-html-make-link (type path fragment desc descp attr
 				   may-inline-p) 
    "Make an HTML link
 TYPE is the device-type of the link (And isn't used yet) (THIS://foo.html)
@@ -25,8 +29,8 @@ DESC is the link description, if any.
 DESCP is whether there originally was a description.
 ATTR is a string of other attributes of the a element.
 MAY-INLINE-P allows inlining it as an image."
-   ;;`org-par-open' is a special variable so it's not in the arglist.
 
+   (declare (special html-extension org-par-open))
    (let ((filename path)
 	    thefile)
       (save-match-data
@@ -52,7 +56,7 @@ MAY-INLINE-P allows inlining it as an image."
 	 ;;If applicable, convert local path to remote URL
 	 (setq thefile
 	    (or
-	       (funcall tehom-org-html-cvt-link-fn thefile)
+	       (funcall org-html-cvt-link-fn thefile)
 	       thefile))
 
 	 ;;Second pass.  Build final link except for leading type
@@ -376,7 +380,8 @@ lang=\"%s\" xml:lang=\"%s\">
 	    (push "<ul>\n<li>" thetoc)
 	    (setq lines
 		  (mapcar '(lambda (line)
-		    (if (string-match org-todo-line-regexp line)
+		    (if (and (string-match org-todo-line-regexp line)
+			     (not (get-text-property 0 'org-protected line)))
 			;; This is a headline
 			(progn
 			  (setq have-headings t)
@@ -611,7 +616,6 @@ lang=\"%s\" xml:lang=\"%s\">
 	    ;; FIXME: do we need to unescape here somewhere?
 	    (cond
 	     ((equal type "internal")
-		;;Replace this too.  Never an image.
 	      (setq rpl
 		    (concat
 		     "<a href=\""
@@ -628,10 +632,8 @@ lang=\"%s\" xml:lang=\"%s\">
 	      (save-match-data
 		(setq id-file (file-relative-name
 			       id-file (file-name-directory org-current-export-file)))
-		'(setq id-file (concat (file-name-sans-extension id-file)
-				      "." html-extension))
 		(setq rpl 
-		   (tehom-org-html-make-link
+		   (org-html-make-link
 		      "file" id-file 
 		      (concat (if (org-uuidgen-p path) "ID-") path)
 		      (org-export-html-format-desc desc)
@@ -639,25 +641,10 @@ lang=\"%s\" xml:lang=\"%s\">
 		      attr
 		      nil))))
 	     ((member type '("http" "https"))
-		;;Replace this too
-
 	      ;; standard URL, just check if we need to inline an
 	      ;; image
-		'
-	      (if (and (or (eq t org-export-html-inline-images)
-			   (and org-export-html-inline-images (not descp)))
-		       (org-file-image-p
-			path org-export-html-inline-image-extensions))
-		  (setq rpl (org-export-html-format-image
-			     (concat type ":" path) org-par-open))
-		(setq link (concat type ":" path))
-		(setq rpl (concat "<a href=\""
-				  (org-export-html-format-href link)
-				  "\"" attr ">"
-				  (org-export-html-format-desc desc)
-				  "</a>")))
 		(setq rpl
-		   (tehom-org-html-make-link
+		   (org-html-make-link
 		      type path nil
 		      (org-export-html-format-desc desc)
 		      descp
@@ -726,7 +713,7 @@ lang=\"%s\" xml:lang=\"%s\">
 			       (functionp link-validate)
 			       (not (funcall link-validate path-1 current-dir)))
 			    desc
-			    (tehom-org-html-make-link
+			    (org-html-make-link
 			       "file" path-1 fragment-1 desc-2 descp
 			       attr t))))))
 	       
@@ -988,7 +975,7 @@ lang=\"%s\" xml:lang=\"%s\">
 	  (when (and org-export-author-info author)
 	    (insert "<p class=\"author\"> "
 		    (nth 1 lang-words) ": " author "\n")
-	    (when email
+	    (when (and org-export-email-info email (string-match "\\S-" email))
 	      (if (listp (split-string email ",+ *"))
 		  (mapc (lambda(e)
 			  (insert "<a href=\"mailto:" e "\">&lt;"
diff --git a/make-target.el b/make-target.el
index 6136308..a8ae758 100644
--- a/make-target.el
+++ b/make-target.el
@@ -29,10 +29,6 @@
 
 ;;;_ , Requires
 
-(when (not (fboundp 'rtest:deftest))
-    (defmacro rtest:deftest (&rest dummy))
-    (defmacro rtest:if-avail (&rest dummy)))
-
 ;;;_. Body
 
 ;;;_ , Medium-general: link conversion help
-- 
2.11.4.GIT