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:
Nicolas Goaziou 2015-05-15 19:20:11 +02:00
parent 09fface1a9 00dc3b1b72
commit 45555db2bd
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lisp/ox-html.el
View File

@ -286,9 +286,9 @@ for the JavaScript code in this tag.
padding: 2px; font-size: 80%; font-weight: normal; } padding: 2px; font-size: 80%; font-weight: normal; }
.timestamp { color: #bebebe; } .timestamp { color: #bebebe; }
.timestamp-kwd { color: #5f9ea0; } .timestamp-kwd { color: #5f9ea0; }
.right { margin-left: auto; margin-right: 0px; text-align: right; } .org-right { margin-left: auto; margin-right: 0px; text-align: right; }
.left { margin-left: 0px; margin-right: auto; text-align: left; } .org-left { margin-left: 0px; margin-right: auto; text-align: left; }
.center { margin-left: auto; margin-right: auto; text-align: center; } .org-center { margin-left: auto; margin-right: auto; text-align: center; }
.underline { text-decoration: underline; } .underline { text-decoration: underline; }
#postamble p, #preamble p { font-size: 90%; margin: .2em; } #postamble p, #preamble p { font-size: 90%; margin: .2em; }
p.verse { margin-left: 3%; } p.verse { margin-left: 3%; }
@ -327,12 +327,12 @@ for the JavaScript code in this tag.
caption.t-above { caption-side: top; } caption.t-above { caption-side: top; }
caption.t-bottom { caption-side: bottom; } caption.t-bottom { caption-side: bottom; }
td, th { vertical-align:top; } td, th { vertical-align:top; }
th.right { text-align: center; } th.org-right { text-align: center; }
th.left { text-align: center; } th.org-left { text-align: center; }
th.center { text-align: center; } th.org-center { text-align: center; }
td.right { text-align: right; } td.org-right { text-align: right; }
td.left { text-align: left; } td.org-left { text-align: left; }
td.center { text-align: center; } td.org-center { text-align: center; }
dt { font-weight: bold; } dt { font-weight: bold; }
.footpara:nth-child(2) { display: inline; } .footpara:nth-child(2) { display: inline; }
.footpara { display: block; } .footpara { display: block; }
@ -3273,7 +3273,7 @@ channel."
(if (not (plist-get info :html-table-align-individual-fields)) "" (if (not (plist-get info :html-table-align-individual-fields)) ""
(format (if (and (boundp 'org-html-format-table-no-css) (format (if (and (boundp 'org-html-format-table-no-css)
org-html-format-table-no-css) org-html-format-table-no-css)
" align=\"%s\"" " class=\"%s\"") " align=\"%s\"" " class=\"org-%s\"")
(org-export-table-cell-alignment table-cell info))))) (org-export-table-cell-alignment table-cell info)))))
(when (or (not contents) (string= "" (org-trim contents))) (when (or (not contents) (string= "" (org-trim contents)))
(setq contents " ")) (setq contents " "))
@ -3393,7 +3393,7 @@ contextual information."
(alignspec (alignspec
(if (and (boundp 'org-html-format-table-no-css) (if (and (boundp 'org-html-format-table-no-css)
org-html-format-table-no-css) org-html-format-table-no-css)
"align=\"%s\"" "class=\"%s\"")) "align=\"%s\"" "class=\"org-%s\""))
(table-column-specs (table-column-specs
(function (function
(lambda (table info) (lambda (table info)

4
testing/lisp/test-org-table.el
View File

@ -1482,11 +1482,11 @@ See also `test-org-table/copy-field'."
<colgroup> <colgroup>
<col class=\"left\" /> <col class=\"org-left\" />
</colgroup> </colgroup>
<tbody> <tbody>
<tr> <tr>
<td class=\"left\">a</td> <td class=\"org-left\">a</td>
</tr> </tr>
</tbody> </tbody>
</table>")) </table>"))