Merge branch 'master' of orgmode.org:org-mode

contrib/lisp/org-elisp-symbol.el

@@ -104,8 +104,8 @@
 	     (stype (cond ((commandp sym-name) "Command")
 			  ((functionp sym-name) "Function")
 			  ((user-variable-p sym-name) "User variable")
-			  ((eq def "defvar") "Variable")
-			  ((eq def "defmacro") "Macro")
+			  ((string= def "defvar") "Variable")
+			  ((string= def "defmacro") "Macro")
 			  (t "Symbol")))
 	     (args (if (match-string 3)
 		       (mapconcat (lambda (a) (unless (string-match "^&" a) a))

contrib/lisp/org-odt.el

@@ -1268,38 +1268,28 @@ MAY-INLINE-P allows inlining it as an image."
 	 ;; (when par-open (org-odt-open-par))
 	 ))))))
 
-;; xml files generated on-the-fly
-(defconst org-export-odt-save-list
-  '("mimetype" "META-INF/manifest.xml" "content.xml" "meta.xml" "styles.xml"))
-
-;; xml files that contribute to the final odt file
-(defvar org-export-odt-file-list nil)
-
-(defun org-odt-copy-image-file (path &optional target-file)
+(defvar org-odt-embedded-images-count 0)
+(defun org-odt-copy-image-file (path)
   "Returns the internal name of the file"
   (let* ((image-type (file-name-extension path))
 	 (media-type (format "image/%s" image-type))
 	 (src-file (expand-file-name
 		    path (file-name-directory org-current-export-file)))
-	 (target-file (or target-file (org-odt-get-image-name src-file)))
-	 ;; FIXME
-	 (body-only nil))
-
+	 (target-dir "Images/")
+	 (target-file
+	  (format "%s%04d.%s" target-dir
+		  (incf org-odt-embedded-images-count) image-type)))
     (when (not org-lparse-to-buffer)
       (message "Embedding %s as %s ..."
 	       (substring-no-properties path) target-file)
 
-      ;; create Pictures dir if needed
-      (let ((pictures-dir (file-name-directory target-file)))
-	(unless (file-directory-p pictures-dir)
-	  (make-directory pictures-dir)
-	  (org-odt-create-manifest-file-entry "" pictures-dir)))
+      (when (= 1 org-odt-embedded-images-count)
+	(make-directory target-dir)
+	(org-odt-create-manifest-file-entry "" target-dir))
 
-      ;; copy image file
-      (unless (file-readable-p target-file)
-	(copy-file src-file target-file 'overwrite)
-	(org-odt-create-manifest-file-entry media-type target-file)
-	(push target-file org-export-odt-file-list))) target-file))
+      (copy-file src-file target-file 'overwrite)
+      (org-odt-create-manifest-file-entry media-type target-file))
+    target-file))
 
 (defun org-odt-image-attrs-from-size (&optional width height)
   (concat
@@ -1393,28 +1383,17 @@ MAY-INLINE-P allows inlining it as an image."
 (defun org-odt-init-outfile (filename)
   (unless (executable-find "zip")
     ;; Not at all OSes ship with zip by default
-    (error "Executable \"zip\" needed for creating OpenDocument files. Aborting."))
+    (error "Executable \"zip\" needed for creating OpenDocument files"))
 
   (let* ((outdir (make-temp-file org-export-odt-tmpdir-prefix t))
-	 (mimetype-file (expand-file-name "mimetype" outdir))
-	 (content-file (expand-file-name "content.xml" outdir))
-	 (manifest-file (expand-file-name "META-INF/manifest.xml" outdir))
-	 (meta-file (expand-file-name "meta.xml" outdir))
-	 (styles-file (expand-file-name "styles.xml" outdir))
-	 (pictures-dir (expand-file-name "Pictures" outdir))
-	 (body-only nil))
+	 (content-file (expand-file-name "content.xml" outdir)))
 
-    ;; content file
-    (with-current-buffer (find-file-noselect content-file t)
-      (erase-buffer))
+    ;; init conten.xml
+    (with-current-buffer (find-file-noselect content-file t))
 
-    ;; FIXME: How to factor in body-only here
-    (unless body-only
-      ;; initialize list of files that contribute to the odt file
-      (setq org-export-odt-file-list org-export-odt-save-list))
-
-    ;; no manifest file entries for now
-    (setq org-odt-manifest-file-entries nil)
+    ;; reset variables
+    (setq org-odt-manifest-file-entries nil
+	  org-odt-embedded-images-count 0)
 
     content-file))
 
@@ -1474,7 +1453,9 @@ visually."
   ;; write out the manifest entries before zipping
   (org-odt-write-manifest-file)
 
-  (let ((zipdir default-directory))
+  (let ((xml-files '("mimetype" "META-INF/manifest.xml" "content.xml"
+		     "meta.xml" "styles.xml"))
+	(zipdir default-directory))
     (message "Switching to directory %s" (expand-file-name zipdir))
 
     ;; save all xml files
@@ -1485,7 +1466,7 @@ visually."
 	      (when org-export-odt-prettify-xml
 		(indent-region (point-min) (point-max)))
 	      (save-buffer 0)))
-	  org-export-odt-save-list)
+	  xml-files)
 
     (let* ((target-name (file-name-nondirectory target))
 	   (target-dir (file-name-directory target))
@@ -1513,7 +1494,7 @@ visually."
       (mapc (lambda (file)
 	      (kill-buffer
 	       (find-file-noselect (expand-file-name file zipdir) t)))
-	    org-export-odt-save-list)
+	    xml-files)
 
       (delete-directory zipdir)))
 
@@ -1544,7 +1525,8 @@ visually."
       date)
      (t
       ;; ISO 8601 format
-      (format-time-string "%Y-%m-%dT%T%:z")))))
+      (let ((stamp (format-time-string "%Y-%m-%dT%H:%M:%S%z")))
+	(format "%s:%s" (substring stamp 0 -2) (substring stamp -2)))))))
 
 (defconst org-odt-manifest-file-entry-tag
   "

lisp/org-exp.el

@@ -1738,8 +1738,14 @@ from the buffer."
 		(save-excursion
 		  (save-match-data
 		    (goto-char beg-content)
-		    (while (re-search-forward "^[ \t]*\\(,\\)" end-content t)
-		      (replace-match "" nil nil nil 1))))
+		    (let ((front-line (save-excursion
+					(re-search-forward
+					 "[^[:space:]]" end-content t)
+					(goto-char (match-beginning 0))
+					(current-column))))
+		      (while (re-search-forward "^[ \t]*\\(,\\)" end-content t)
+			(when (= (current-column) front-line)
+			  (replace-match "" nil nil nil 1))))))
 		(delete-region (match-beginning 0) (match-end 0))
 		(save-excursion
 		  (goto-char beg)

testing/examples/org-exp.org

@@ -0,0 +1,14 @@
+#+Title: a collection of examples for export tests
+#+OPTIONS: ^:nil
+
+* stripping commas from within blocks on export
+  :PROPERTIES:
+  :ID:       76d3a083-67fa-4506-a41d-837cc48158b5
+  :END:
+The following commas should not be removed.
+
+#+begin_src r
+  a <- c(1
+         , 2
+         , 3)
+#+end_src

testing/lisp/test-ob-fortran.el

@@ -1,5 +1,18 @@
-(require 'ob-fortran)
- 
+(let ((load-path (cons (expand-file-name
+			"langs"
+			(expand-file-name
+			 "babel"
+			 (expand-file-name
+			  "contrib"
+			  (expand-file-name
+			   ".."
+			   (expand-file-name
+			    ".."
+			    (file-name-directory
+			     (or load-file-name buffer-file-name)))))))
+		       load-path)))
+  (require 'ob-fortran))
+
 (ert-deftest ob-fortran/assert ()
   (should t))
 

testing/lisp/test-ob-lob.el

@@ -8,19 +8,22 @@
 
 ;;;; Comments:
 
-;; Template test file for Org-mode tests
-
-
-;;; Code:
-(let ((load-path (cons (expand-file-name
-			".." (file-name-directory
-			      (or load-file-name buffer-file-name)))
-		       load-path)))
-  (require 'org-test)
-  (require 'org-test-ob-consts))
-
 
 ;;; Tests
+(org-babel-lob-ingest
+ (expand-file-name
+  "library-of-babel.org"
+  (expand-file-name
+   "babel"
+   (expand-file-name
+    "contrib"
+    (expand-file-name
+     ".."
+     (expand-file-name
+      ".."
+      (file-name-directory
+       (or load-file-name buffer-file-name))))))))
+
 (ert-deftest test-ob-lob/ingest ()
   "Test the ingestion of an org-mode file."
   (should (< 0 (org-babel-lob-ingest

testing/lisp/test-org-exp.el

@@ -0,0 +1,8 @@
+(ert-deftest test-org-exp/stripping-commas ()
+  "Test the stripping of commas from within blocks during export."
+  (org-test-at-id "76d3a083-67fa-4506-a41d-837cc48158b5"
+    ;; don't strip internal commas
+    (org-narrow-to-subtree)
+    (should (string-match
+	     ", 2"
+	     (org-export-as-ascii nil nil nil 'string)))))

testing/lisp/test-org.el

@@ -12,12 +12,12 @@
 
 
 ;;; Code:
-(let ((load-path (cons (expand-file-name
-			".." (file-name-directory
-			      (or load-file-name buffer-file-name)))
-		       load-path)))
-  (require 'org-test)
-  (require 'org-test-ob-consts))
+(let* ((testing-lisp-dir (file-name-directory
+			  (or load-file-name buffer-file-name)))
+       (load-path (cons testing-lisp-dir load-path)))
+  (dolist (file (directory-files testing-lisp-dir 'full
+				 "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*\\.org$"))
+    (require (intern (substring file 0 (- (length file) 3))))))
 
 
 ;;; Tests