Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added pandoc markdown table support (optional)

  • Loading branch information...
commit 7b4647a3e69d64fee92fa7b3ad6d6cddf6377533 1 parent 0b11701
@mlf176f2 mlf176f2 authored
Showing with 51 additions and 51 deletions.
  1. +13 −21 Readme.md
  2. +5 −4 Readme.org
  3. +20 −12 org-readme.el
  4. +13 −14 org-readme.texi
View
34 Readme.md
@@ -8,11 +8,11 @@
- __Author__ -- Matthew L. Fidler
- __Maintainer__ -- Matthew L. Fidler
- __Created__ -- Fri Aug 3 22:33:41 2012 (-0500)
-- __Version__ -- 0.22
+- __Version__ -- 0.23
- __Package-Requires__ -- ((http-post-simple "1.0") (yaoddmuse "0.1.1")(header2 "21.0") (lib-requires "21.0"))
-- __Last-Updated__ -- Mon Aug 13 21:53:01 2012 (-0500)
+- __Last-Updated__ -- Mon Aug 20 09:33:57 2012 (-0500)
- __By__ -- Matthew L. Fidler
-- __Update #__ -- 680
+- __Update #__ -- 685
- __URL__ -- https:__github.com_mlf176f2_org-readme
- __Keywords__ -- Header2, Readme.org, Emacswiki, Git
- __Compatibility__ -- Tested with Emacs 24.1 on Windows.
@@ -56,26 +56,18 @@ would generate a page of OrgReadme.
There are a few required libraries. This is a list of the require
libraries and why they are needed.
-
-<table border="2" cellspacing="0" cellpadding="6" rules="groups" frame="hsides">
-<caption></caption>
-<colgroup><col align="left" /><col align="left" />
-</colgroup>
-<thead>
-<tr><th scope="col" align="left">Library</th><th scope="col" align="left">Why it is needed</th></tr>
-</thead>
-<tbody>
-<tr><td align="left">yaoddmuse</td><td align="left">Publish to emacswiki</td></tr>
-<tr><td align="left">http-post-simple</td><td align="left">Publish to marmalade-repo.org</td></tr>
-<tr><td align="left">header2</td><td align="left">To create header and changelog</td></tr>
-<tr><td align="left">lib-requires</td><td align="left">To generate the library dependencies</td></tr>
-</tbody>
-</table>
-
-
++------------------+--------------------------------------+
+| Library | Why it is needed |
++------------------+--------------------------------------+
+| yaoddmuse | Publish to emacswiki |
+| http-post-simple | Publish to marmalade-repo.org |
+| header2 | To create header and changelog |
+| lib-requires | To generate the library dependencies |
++------------------+--------------------------------------+
## History
+- __20-Aug-2012__ -- Added pandoc markdown table support (optional) (Matthew L. Fidler)
- __13-Aug-2012__ -- Another attempt to make texinfo documents. (Matthew L. Fidler)
- __13-Aug-2012__ -- Added texinfo output. Allows native emacs documentation. (Matthew L. Fidler)
- __13-Aug-2012__ -- Tried to post behind firewall. Reattempting. (Matthew L. Fidler)
@@ -114,7 +106,7 @@ libraries and why they are needed.
- __11-Aug-2012__ -- Bug fix to upload to emacswiki and upload to marmalade-repo (Matthew L. Fidler)
- __11-Aug-2012__ -- Added marmalade-repo support. Now org-readme should upload to marmalade-repo when the version is different from the latest version. (Matthew L. Fidler)
- __08-Aug-2012__ -- Fixed preformatting tags in emacswiki post. Previously they may have been replaced with <PRE><_pre> instead of <pre><_pre>. This makes the emacswiki page display correctly. (Matthew L. Fidler)
-- __07-Aug-2012__ -- To use, put (require 'ess-smart-underscore) in your ~/.emacs file 7-Aug-2012 Matthew L. Fidler Last-Updated: Mon Aug 13 21:53:20 2012 (-0500)
+- __07-Aug-2012__ -- To use, put (require 'ess-smart-underscore) in your ~/.emacs file 7-Aug-2012 Matthew L. Fidler Last-Updated: Mon Aug 20 09:34:27 2012 (-0500)
- __06-Aug-2012__ -- Added support for uploading Readme.org files to emacswiki without having to have a single associated lisp file. (Matthew L. Fidler)
- __06-Aug-2012__ -- Bug fix for syncing from the single lisp file. (Matthew L. Fidler)
- __06-Aug-2012__ -- Added the ability to call `org-readme-sync` from Readme.org (Matthew L. Fidler)
View
9 Readme.org
@@ -8,11 +8,11 @@
- Author :: Matthew L. Fidler
- Maintainer :: Matthew L. Fidler
- Created :: Fri Aug 3 22:33:41 2012 (-0500)
- - Version :: 0.22
+ - Version :: 0.23
- Package-Requires :: ((http-post-simple "1.0") (yaoddmuse "0.1.1")(header2 "21.0") (lib-requires "21.0"))
- - Last-Updated :: Mon Aug 13 21:53:01 2012 (-0500)
+ - Last-Updated :: Mon Aug 20 09:33:57 2012 (-0500)
- By :: Matthew L. Fidler
- - Update # :: 680
+ - Update # :: 685
- URL :: https://github.com/mlf176f2/org-readme
- Keywords :: Header2, Readme.org, Emacswiki, Git
- Compatibility :: Tested with Emacs 24.1 on Windows.
@@ -67,6 +67,7 @@ libraries and why they are needed.
* History
+ - 20-Aug-2012 :: Added pandoc markdown table support (optional) (Matthew L. Fidler)
- 13-Aug-2012 :: Another attempt to make texinfo documents. (Matthew L. Fidler)
- 13-Aug-2012 :: Added texinfo output. Allows native emacs documentation. (Matthew L. Fidler)
- 13-Aug-2012 :: Tried to post behind firewall. Reattempting. (Matthew L. Fidler)
@@ -105,7 +106,7 @@ libraries and why they are needed.
- 11-Aug-2012 :: Bug fix to upload to emacswiki and upload to marmalade-repo (Matthew L. Fidler)
- 11-Aug-2012 :: Added marmalade-repo support. Now org-readme should upload to marmalade-repo when the version is different from the latest version. (Matthew L. Fidler)
- 08-Aug-2012 :: Fixed preformatting tags in emacswiki post. Previously they may have been replaced with <PRE></pre> instead of <pre></pre>. This makes the emacswiki page display correctly. (Matthew L. Fidler)
- - 07-Aug-2012 :: To use, put (require 'ess-smart-underscore) in your ~/.emacs file 7-Aug-2012 Matthew L. Fidler Last-Updated: Mon Aug 13 21:53:20 2012 (-0500)
+ - 07-Aug-2012 :: To use, put (require 'ess-smart-underscore) in your ~/.emacs file 7-Aug-2012 Matthew L. Fidler Last-Updated: Mon Aug 20 09:34:27 2012 (-0500)
- 06-Aug-2012 :: Added support for uploading Readme.org files to emacswiki without having to have a single associated lisp file. (Matthew L. Fidler)
- 06-Aug-2012 :: Bug fix for syncing from the single lisp file. (Matthew L. Fidler)
- 06-Aug-2012 :: Added the ability to call =org-readme-sync= from Readme.org (Matthew L. Fidler)
View
32 org-readme.el
@@ -5,11 +5,11 @@
;; Author: Matthew L. Fidler
;; Maintainer: Matthew L. Fidler
;; Created: Fri Aug 3 22:33:41 2012 (-0500)
-;; Version: 0.22
+;; Version: 0.23
;; Package-Requires: ((http-post-simple "1.0") (yaoddmuse "0.1.1")(header2 "21.0") (lib-requires "21.0"))
-;; Last-Updated: Mon Aug 13 21:53:26 2012 (-0500)
+;; Last-Updated: Mon Aug 20 09:34:36 2012 (-0500)
;; By: Matthew L. Fidler
-;; Update #: 681
+;; Update #: 686
;; URL: https://github.com/mlf176f2/org-readme
;; Keywords: Header2, Readme.org, Emacswiki, Git
;; Compatibility: Tested with Emacs 24.1 on Windows.
@@ -69,6 +69,9 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;;; Change Log:
+;; 20-Aug-2012 Matthew L. Fidler
+;; Last-Updated: Mon Aug 20 09:33:22 2012 (-0500) #684 (Matthew L. Fidler)
+;; Added pandoc markdown table support (optional)
;; 13-Aug-2012 Matthew L. Fidler
;; Last-Updated: Mon Aug 13 21:52:37 2012 (-0500) #679 (Matthew L. Fidler)
;; Another attempt to make texinfo documents.
@@ -297,6 +300,11 @@
:type 'boolean
:group 'org-readme)
+(defcustom org-readme-use-pandoc-markdown t
+ "Uses pandoc's grid tables instead of transferring the tables to html."
+ :type 'boolean
+ :group 'org-readme)
+
(defcustom org-readme-build-texi t
"Builds library-name.texi from Readme.org, using Readme.md and pandoc. Requires `org-readme-build-markdown' to be non-nil as pandoc to be found."
:type 'boolean
@@ -641,10 +649,15 @@ Returns file name if created."
(end-of-line)
(save-restriction
(narrow-to-region p1 (point))
- (org-replace-region-by-html (point-min) (point-max))
- (goto-char (point-min))
- (while (re-search-forward "class" nil t)
- (replace-match "align"))))
+ (if org-readme-use-pandoc-markdown
+ (progn
+ (goto-char (point-min))
+ (while (re-search-forward "^\\([ \t]*\\)|\\(-.*?-\\)|\\([ \t]*\\)$" nil t)
+ (replace-match "\\1+\\2+\\3")))
+ (org-replace-region-by-html (point-min) (point-max))
+ (goto-char (point-min))
+ (while (re-search-forward "class" nil t)
+ (replace-match "align")))))
;; Lists are the same.
(setq readme (buffer-string)))
@@ -910,11 +923,6 @@ When COMMENT-ADDED is non-nil, the comment has been added and the syncing should
(when org-readme-build-texi
(when (executable-find "pandoc")
(let ((default-directory (file-name-directory (buffer-file-name))))
- (message "%s\n%s" default-directory
- (concat "pandoc Readme.md -s -o "
- (file-name-sans-extension
- (file-name-nondirectory (buffer-file-name)))
- ".texi"))
(shell-command (concat "pandoc Readme.md -s -o "
(file-name-sans-extension
(file-name-nondirectory (buffer-file-name)))
View
27 org-readme.texi
@@ -27,15 +27,15 @@ Matthew L. Fidler ## Library Information @strong{org-readme.el} --- Integrates R
@item
@strong{Created} -- Fri Aug 3 22:33:41 2012 (-0500)
@item
-@strong{Version} -- 0.22
+@strong{Version} -- 0.23
@item
@strong{Package-Requires} -- ((http-post-simple "1.0") (yaoddmuse "0.1.1")(header2 "21.0") (lib-requires "21.0"))
@item
-@strong{Last-Updated} -- Mon Aug 13 21:53:01 2012 (-0500)
+@strong{Last-Updated} -- Mon Aug 20 09:33:57 2012 (-0500)
@item
@strong{By} -- Matthew L. Fidler
@item
-@strong{Update #} -- 680
+@strong{Update #} -- 685
@item
@strong{URL} -- https:__github.com_mlf176f2_org-readme
@item
@@ -97,22 +97,21 @@ When @code{org-readme-sync} is called in a @code{Readme.org} file that is not a
@subsection Why each required library is needed
There are a few required libraries. This is a list of the require libraries and why they are needed.
-
+@multitable @columnfractions 0.26 0.54
+@item
Library
-Why it is needed
-yaoddmuse
-Publish to emacswiki
-http-post-simple
-Publish to marmalade-repo.org
-header2
-To create header and changelog
-lib-requires
-To generate the library dependencies
+ @tab Why it is needed
+@item
+yaoddmuse http-post-simple header2 lib-requires
+ @tab Publish to emacswiki Publish to marmalade-repo.org To create header and changelog To generate the library dependencies
+@end multitable
@node History
@section History
@itemize
@item
+@strong{20-Aug-2012} -- Added pandoc markdown table support (optional) (Matthew L. Fidler)
+@item
@strong{13-Aug-2012} -- Another attempt to make texinfo documents. (Matthew L. Fidler)
@item
@strong{13-Aug-2012} -- Added texinfo output. Allows native emacs documentation. (Matthew L. Fidler)
@@ -191,7 +190,7 @@ To generate the library dependencies
<_pre> instead of
<_pre>. This makes the emacswiki page display correctly. (Matthew L. Fidler)
@item
-@strong{07-Aug-2012} -- To use@comma{} put (require 'ess-smart-underscore) in your ~/.emacs file 7-Aug-2012 Matthew L. Fidler Last-Updated: Mon Aug 13 21:53:20 2012 (-0500)
+@strong{07-Aug-2012} -- To use@comma{} put (require 'ess-smart-underscore) in your ~/.emacs file 7-Aug-2012 Matthew L. Fidler Last-Updated: Mon Aug 20 09:34:27 2012 (-0500)
@item
@strong{06-Aug-2012} -- Added support for uploading Readme.org files to emacswiki without having to have a single associated lisp file. (Matthew L. Fidler)
@item
Please sign in to comment.
Something went wrong with that request. Please try again.