Allow multiple #+STYLE lines in the buffer.

ORGWEBPAGE/Changes.org

@@ -22,7 +22,7 @@
 
     IDs created by Org have changed a bit:
     - By default, there is no prefix on the ID.  There used to be
-      an "Org" prefix, but I now think this is not necesary.
+      an "Org" prefix, but I now think this is not necessary.
     - IDs use only lower-case letters, no upper-case letters
       anymore.  The reason for this is that IDs are now also used
       as directory names for org-attach, and some systems do not
@@ -57,10 +57,11 @@
 *** New file in contrib: lisp/org-checklist.el
     Thanks to James TD Smith for this contribution.
 
-*** New in-buffer seting #+STYLE
+*** New in-buffer setting #+STYLE
     It can be used to locally set the variable
-    `org-expor-html-style-extra'.  See the [[http://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.php][publishing tutorial]]
-    for an example on how tu use it.
+    `org-export-html-style-extra'.  Several such lines are
+    allowed-, they will all be concatenated.  For an example on
+    how to use it, see the [[http://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.php][publishing tutorial]].
 
 * Version 6.07
 :PROPERTIES:

lisp/ChangeLog

@@ -1,3 +1,7 @@
+2008-10-01  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org-exp.el (org-infile-export-plist): Allow multiple STYLE lines.
+
 2008-09-30  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-entry-get-multivalued-property)

lisp/org-exp.el

@@ -868,7 +868,7 @@ modified) list.")
 		    "LINK_UP" "LINK_HOME" "SETUPFILE" "STYLE"
 		    "EXPORT_SELECT_TAGS" "EXPORT_EXCLUDE_TAGS")
 		  (mapcar 'car org-export-inbuffer-options-extra))))
-	    p key val text options js-up js-main js-css js-opt a pr
+	    p key val text options js-up js-main js-css js-opt a pr style
 	    ext-setup-or-nil setup-contents (start 0))
 	(while (or (and ext-setup-or-nil
 			(string-match re ext-setup-or-nil start)
@@ -886,7 +886,8 @@ modified) list.")
 	   ((string-equal key "EMAIL") (setq p (plist-put p :email val)))
 	   ((string-equal key "DATE") (setq p (plist-put p :date val)))
 	   ((string-equal key "LANGUAGE") (setq p (plist-put p :language val)))
-	   ((string-equal key "STYLE") (setq p (plist-put p :style-extra val)))
+	   ((string-equal key "STYLE")
+	    (setq style (concat style "\n" val)))
 	   ((string-equal key "TEXT")
 	    (setq text (if text (concat text "\n" val) val)))
 	   ((string-equal key "OPTIONS")
@@ -912,6 +913,7 @@ modified) list.")
 			    "\n" setup-contents "\n"
 			    (substring ext-setup-or-nil start)))))))
 	(setq p (plist-put p :text text))
+	(if style (setq p (plist-put p :style-extra style)))
 	(when options
 	  (setq p (org-export-add-options-to-plist p options)))
 	p))))