ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Bastien Guerry 2012-08-03 14:09:54 +02:00
parent 1e34c5d34f d69de79e4a
commit c79320d5cf
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/lisp/org-e-groff.el
View File

@ -1015,14 +1015,14 @@ holding contextual information."
(let ((low-level-body (let ((low-level-body
(concat (concat
;; If the headline is the first sibling, start a list. ;; If the headline is the first sibling, start a list.
(when (org-export-first-sibling-p headline) (when (org-export-first-sibling-p headline info)
(format "%s\n" (if numberedp ".AL 1\n" ".DL \n"))) (format "%s\n" (if numberedp ".AL 1\n" ".DL \n")))
;; Itemize headline ;; Itemize headline
".LI\n" full-text "\n" headline-label pre-blanks contents))) ".LI\n" full-text "\n" headline-label pre-blanks contents)))
;; If headline is not the last sibling simply return ;; If headline is not the last sibling simply return
;; LOW-LEVEL-BODY. Otherwise, also close the list, before any ;; LOW-LEVEL-BODY. Otherwise, also close the list, before any
;; blank line. ;; blank line.
(if (not (org-export-last-sibling-p headline)) low-level-body (if (not (org-export-last-sibling-p headline info)) low-level-body
(replace-regexp-in-string (replace-regexp-in-string
"[ \t\n]*\\'" "[ \t\n]*\\'"
(concat "\n.LE" ) (concat "\n.LE" )
@ -1929,7 +1929,7 @@ a communication channel."
(match-string 1 contents) (match-string 1 contents)
(match-string 2 contents)) (match-string 2 contents))
contents ) contents )
(when (org-export-get-next-element table-cell) "\t")) (when (org-export-get-next-element table-cell info) "\t"))
) )
) )

18
contrib/lisp/org-e-man.el
View File

@ -137,7 +137,6 @@ structure of the values.")
:type 'boolean) :type 'boolean)
(defcustom org-e-man-table-scientific-notation "%sE%s" (defcustom org-e-man-table-scientific-notation "%sE%s"
"Format string to display numbers in scientific notation. "Format string to display numbers in scientific notation.
The format should have \"%s\" twice, for mantissa and exponent The format should have \"%s\" twice, for mantissa and exponent
@ -489,9 +488,8 @@ information."
(org-e-man--wrap-label (org-e-man--wrap-label
example-block example-block
(format ".RS\n.nf\n%s\n.fi\n.RE" (format ".RS\n.nf\n%s\n.fi\n.RE"
(org-export-format-code-default example-block info)))) (org-export-format-code-default example-block info))
))
;;;; Export Block ;;;; Export Block
(defun org-e-man-export-block (export-block contents info) (defun org-e-man-export-block (export-block contents info)
@ -560,7 +558,7 @@ holding contextual information."
(let ((low-level-body (let ((low-level-body
(concat (concat
;; If the headline is the first sibling, start a list. ;; If the headline is the first sibling, start a list.
(when (org-export-first-sibling-p headline) (when (org-export-first-sibling-p headline info)
(format "%s\n" ".RS")) (format "%s\n" ".RS"))
;; Itemize headline ;; Itemize headline
".TP\n.ft I\n" text "\n.ft\n" ".TP\n.ft I\n" text "\n.ft\n"
@ -568,7 +566,7 @@ holding contextual information."
;; If headline is not the last sibling simply return ;; If headline is not the last sibling simply return
;; LOW-LEVEL-BODY. Otherwise, also close the list, before any ;; LOW-LEVEL-BODY. Otherwise, also close the list, before any
;; blank line. ;; blank line.
(if (not (org-export-last-sibling-p headline)) low-level-body (if (not (org-export-last-sibling-p headline info)) low-level-body
(replace-regexp-in-string (replace-regexp-in-string
"[ \t\n]*\\'" "" "[ \t\n]*\\'" ""
low-level-body)))) low-level-body))))
@ -770,14 +768,14 @@ INFO is a plist holding contextual information. See
(t raw-path))) (t raw-path)))
protocol) protocol)
(cond (cond
;; Coderef: replace link with the reference name or the
;; equivalent line number.
;; External link with a description part. ;; External link with a description part.
((and path desc) (format "%s \\fBat\\fP \\fI%s\\fP" path desc)) ((and path desc) (format "%s \\fBat\\fP \\fI%s\\fP" path desc))
;; External link without a description part. ;; External link without a description part.
(path (format "\\fI%s\\fP" path)) (path (format "\\fI%s\\fP" path))
;; No path, only description. Try to do something useful. ;; No path, only description. Try to do something useful.
(t (format "\\fI%s\\fP" desc))))) (t (format "\\fI%s\\fP" desc))
)
))
;;;; Macro ;;;; Macro
@ -1221,7 +1219,7 @@ a communication channel."
(match-string 1 contents) (match-string 1 contents)
(match-string 2 contents)) (match-string 2 contents))
contents) contents)
(when (org-export-get-next-element table-cell) " \t "))) (when (org-export-get-next-element table-cell info) " \t ")))
;;;; Table Row ;;;; Table Row