From bdad4a1affd8b41b9b0064ecdadbf53a9626b0e8 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 20 Jul 2010 16:07:40 +0200 Subject: [PATCH 1/9] Update website to show 7.01e as current release --- ORGWEBPAGE/index.org | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org index 153f9bfd3..182655121 100644 --- a/ORGWEBPAGE/index.org +++ b/ORGWEBPAGE/index.org @@ -123,9 +123,9 @@ a look at our [[http://orgmode.org/worg/org-quotes.php][collected quotes about O - <2010-04-06 Tue>: Release 6.35 - <2010-01-10 Sun>: Release 6.34 -* Current Version (7.01b) +* Current Version (7.01e) -The current version is 7.01b. To see what has changed in recent +The current version is 7.01e. To see what has changed in recent releases, check this detailed list of [[file:Changes.html][user-visible changes]]. This package works on Emacs 23 and 22, and (with minor restrictions) @@ -137,7 +137,7 @@ recent version, but may lag a bit behind the website release. ** The standard distribution -Download as [[file:org-7.01b.zip][zip file]] or [[file:org-7.01b.tar.gz][gzipped tar archive]]. These archives contain +Download as [[file:org-7.01e.zip][zip file]] or [[file:org-7.01e.tar.gz][gzipped tar archive]]. These archives contain both the Lisp file org.el and the documentation in PDF and (TeX)Info formats. Follow the instructions for [[http://orgmode.org/manual/Installation.html#Installation][Installation]] and [[http://orgmode.org/manual/Activation.html#Activation][Activation]]. From 8d0735b89e4391a23c5525b6eaa84ddc073eef57 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 20 Jul 2010 16:16:13 +0200 Subject: [PATCH 2/9] Reorder Makefile OK, we finally have a make file where I can do a complete release, including all the git updates on master and maint branches, with a single command: make release TAG=N.NN It is important that the working directory is clean when calling this command. Since this command can fail and then leave the git repo in an uncertain state, it is best to first run this: make testrelease This will create a throw-away branch "testrelease" and try alll the commands there, to make sure everything is fine. --- Makefile | 93 ++++++++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index db98f9322..98b73575b 100644 --- a/Makefile +++ b/Makefile @@ -272,6 +272,41 @@ pdf: doc/org.pdf doc/orgguide.pdf card: doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgcard.txt +testrelease: + git checkout -b testrelease maint + git merge -s recursive -X theirs master + UTILITIES/set-version.pl testing + git commit -a -m "Release testing" + make distfile TAG=testversion + make cleanrel + rm -rf org-testversion* + git reset --hard + git checkout master + git branch -D testrelease + +release: + git checkout maint + git merge -s recursive -X theirs master + UTILITIES/set-version.pl $(TAG) + git commit -a -m "Release $(TAG)" + make relup TAG=$(TAG) + make cleanrel + rm -rf org-$(TAG) + rm org-$(TAG)*.zip + rm org-$(TAG)*.tar.gz + make pushreleasetag TAG=$(TAG) + git push origin maint + git checkout master + UTILITIES/set-version.pl -o $(TAG) + git commit -a -m "Update website to show $(TAG) as current release" + git push + make updateweb + +relup: + ${MAKE} makerelease + ${MAKE} upload_release + ${MAKE} upload_manual + distfile: @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi touch doc/org.texi doc/orgcard.tex # force update @@ -315,44 +350,15 @@ upload_manual: rsync -avuz --delete doc/manual/ cdominik@orgmode.org:orgmode.org/manual/ rsync -avuz --delete doc/guide/ cdominik@orgmode.org:orgmode.org/guide/ -relup0: - ${MAKE} makerelease - ${MAKE} upload_release +cleanall: + ${MAKE} clean + rm -f lisp/org-install.el -relup: - ${MAKE} makerelease - ${MAKE} upload_release - ${MAKE} upload_manual - -testrelease: - git checkout -b testrelease maint - git merge -s recursive -X theirs master - UTILITIES/set-version.pl testing - git commit -a -m "Release testing" - make distfile TAG=testversion - make cleanrel - rm -rf org-testversion* - git reset --hard - git checkout master - git branch -D testrelease - -release: - git checkout maint - git merge -s recursive -X theirs master - UTILITIES/set-version.pl $(TAG) - git commit -a -m "Release $(TAG)" - make relup TAG=$(TAG) - make cleanrel - rm -rf org-$(TAG) - rm org-$(TAG)*.zip - rm org-$(TAG)*.tar.gz - make pushreleasetag TAG=$(TAG) - git push origin maint - git checkout master - UTILITIES/set-version.pl -o $(TAG) - git commit -a -m "Update website to show $(TAG) as current release" - git push - make updateweb +clean: + ${MAKE} cleanelc + ${MAKE} cleandoc + ${MAKE} cleanrel + rm -f *~ */*~ */*/*~ cleancontrib: find contrib -name \*~ -exec rm {} \; @@ -371,16 +377,6 @@ cleanrel: rm -rf org-6.* rm -rf org-6*zip org-6*tar.gz -clean: - ${MAKE} cleanelc - ${MAKE} cleandoc - ${MAKE} cleanrel - rm -f *~ */*~ */*/*~ - -cleanall: - ${MAKE} clean - rm -f lisp/org-install.el - .el.elc: $(ELC) $< @@ -396,9 +392,6 @@ pushreleasetag: git-tag -m "Adding release tag" -a release_$(TAG) git-push git+ssh://repo.or.cz/srv/git/org-mode.git release_$(TAG) -dummy: - echo ${prefix} - # Dependencies lisp/org.elc: lisp/org-macs.el lisp/org-compat.el lisp/org-faces.el From 6aa469b116cb19fc37b6df381b841ef3369b5479 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Tue, 20 Jul 2010 17:44:54 +0200 Subject: [PATCH 3/9] Fix bug with exporting table metalines to LaTeX/PDF * lisp/org-exp.el (org-export-handle-table-metalines): Choose a better position for checking protectedness. --- lisp/org-exp.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 392566aa9..9c6fdf4ce 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -1691,7 +1691,7 @@ When it is nil, all comments will be removed." (while (or (looking-at re) (re-search-forward re nil t)) (setq pos (match-beginning 0)) - (if (get-text-property (point) 'org-protected) + (if (get-text-property (match-beginning 1) 'org-protected) (goto-char (1+ pos)) (goto-char (1+ pos)) (replace-match "") From 2a0809263e20ca6d55331d7de4b860cc6602d0c0 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Tue, 20 Jul 2010 12:40:06 -0400 Subject: [PATCH 4/9] doc: reverse order of names in org-babel author attribution --- doc/org.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index b2a61732a..9c6f5b79e 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -10979,9 +10979,9 @@ e.g. Org-mode provides a number of features for working with live source code, including editing of code blocks in their native major-mode, evaluation of -code blocks, tangling of code blocks, and exporting code blocks and -their results in several formats. This functionality was contributed by Dan -Davison and Eric Schulte, and was originally named Org-babel. +code blocks, tangling of code blocks, and exporting code blocks and their +results in several formats. This functionality was contributed by Eric +Schulte and Dan Davison, and was originally named Org-babel. The following sections describe Org-mode's code block handling facilities. From 2d01cb7db1330677843c68a43dae014b19bd6df6 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Tue, 20 Jul 2010 12:50:59 -0400 Subject: [PATCH 5/9] doc: Footnote indicating that org-R is obsolete --- doc/org.texi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index 9c6f5b79e..a7584852a 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -13286,8 +13286,10 @@ Also the @kbd{M-cursor} and @kbd{M-S-cursor} keys have this property. Add-ons can tap into this functionality by providing a function that detects special context for that add-on and executes functionality appropriate for the context. Here is an example from Dan Davison's @file{org-R.el} which -allows you to evaluate commands based on the @file{R} programming language. For -this package, special contexts are lines that start with @code{#+R:} or +allows you to evaluate commands based on the @file{R} programming language +@footnote{@file{org-R.el} has been replaced by the org-mode functionality +described in @ref{Working With Source Code} and is now obsolete.}. For this +package, special contexts are lines that start with @code{#+R:} or @code{#+RR:}. @lisp From 73d8016e8b1ceda75079f14847fd47d793e02c78 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Tue, 20 Jul 2010 11:40:57 -0700 Subject: [PATCH 6/9] babel: matching indexes in lob one-liners * lisp/ob-lob.el (org-babel-lob-execute): changing indentation to improve line length (org-babel-lob-get-info): now catching indexes passed through lob calls (org-babel-lob-one-liner-regexp): now matches optional indexes into variable results --- lisp/ob-lob.el | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el index 36a908576..a6cf048a2 100644 --- a/lisp/ob-lob.el +++ b/lisp/ob-lob.el @@ -61,9 +61,10 @@ If you change the value of this variable then your files may become unusable by other org-babel users, and vice versa.") (defconst org-babel-lob-one-liner-regexp - (concat "^\\([ \t]*\\)#\\+\\(?:" - (mapconcat #'regexp-quote org-babel-lob-call-aliases "\\|") - "\\):[ \t]+\\([^\(\)\n]+\\)\(\\([^\n]*\\)\)[ \t]*\\([^\n]*\\)") + (concat + "^\\([ \t]*\\)#\\+\\(?:" + (mapconcat #'regexp-quote org-babel-lob-call-aliases "\\|") + "\\):[ \t]+\\([^\(\)\n]+\\)\(\\([^\n]*\\)\)\\(\\[.+\\]\\)[ \t]*\\([^\n]*\\)") "Regexp to match calls to predefined source block functions.") ;; functions for executing lob one-liners @@ -92,10 +93,13 @@ the word 'call'." (save-excursion (beginning-of-line 1) (if (looking-at org-babel-lob-one-liner-regexp) - (append (mapcar #'org-babel-clean-text-properties - (list (format "%s(%s)" (match-string 2) (match-string 3)) - (match-string 4))) - (list (length (match-string 1)))))))) + (append + (mapcar #'org-babel-clean-text-properties + (list + (format "%s(%s)%s" + (match-string 2) (match-string 3) (match-string 4)) + (match-string 5))) + (list (length (match-string 1)))))))) (defun org-babel-lob-execute (info) "Execute the lob call specified by INFO." @@ -105,7 +109,8 @@ the word 'call'." (org-babel-params-from-properties) (org-babel-parse-header-arguments (org-babel-clean-text-properties - (concat ":var results=" (mapconcat #'identity (butlast info) " "))))))) + (concat ":var results=" + (mapconcat #'identity (butlast info) " "))))))) (org-babel-execute-src-block nil (list "emacs-lisp" "results" params nil nil (nth 2 info))))) From 15ca30bc8664688090cd0861df6c9c8eed623698 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Tue, 20 Jul 2010 11:49:55 -0700 Subject: [PATCH 7/9] library-of-babel: improving reading text/tables in from files * contrib/babel/library-of-babel.org(read): adding explicit format argument (gdoc-read): explicit format argument, and passing the csv specification through to org-table-import also removing org example code blocks --- contrib/babel/library-of-babel.org | 35 ++++++++++++------------------ 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/contrib/babel/library-of-babel.org b/contrib/babel/library-of-babel.org index f7d239416..41d9c41ee 100644 --- a/contrib/babel/library-of-babel.org +++ b/contrib/babel/library-of-babel.org @@ -33,8 +33,8 @@ Read the contents of the file at =file=. The =:results vector= and =:results scalar= header arguments can be used to read the contents of file as either a table or a string. #+srcname: read -#+begin_src emacs-lisp :var file="" - (if (member "vector" result-params) +#+begin_src emacs-lisp :var file="" :var format="" + (if (string= format "csv") (with-temp-buffer (org-table-import (expand-file-name file) nil) (org-table-to-lisp)) @@ -82,14 +82,13 @@ The =google= command seems to be throwing "Moved Temporarily" errors when trying to download textual documents, but this is working fine for spreadsheets. #+source: gdoc-read -#+begin_src emacs-lisp :var title="example" - (let* ((format (if (member "vector" result-params) "csv" "txt")) - (file (concat title "." format)) +#+begin_src emacs-lisp :var title="example" :var format="csv" + (let* ((file (concat title "." format)) (cmd (format "google docs get --format %S --title %S" format title))) (message cmd) (message (shell-command-to-string cmd)) (prog1 (if (string= format "csv") (with-temp-buffer - (org-table-import (shell-quote-argument file) nil) + (org-table-import (shell-quote-argument file) '(4)) (org-table-to-lisp)) (with-temp-buffer (insert-file-contents (shell-quote-argument file)) @@ -99,15 +98,11 @@ for spreadsheets. For example, a line like the following can be used to read the contents of a spreadsheet named =num-cells= into a table. -#+begin_src org - ,#+call: gdoc-read(title="num-cells"") :results vector -#+end_src +: #+call: gdoc-read(title="num-cells"") A line like the following can be used to read the contents of a document as a string. -#+begin_src org - ,#+call: gdoc-read(title="loremi") :results scalar -#+end_src +: #+call: gdoc-read(title="loremi", :format "txt") ****** write a document to a Google docs Write =data= to a google document named =title=. If =data= is tabular @@ -129,15 +124,13 @@ normal document. #+end_src example usage -#+begin_src org - ,#+source: fibs - ,#+begin_src emacs-lisp :var n=8 - , (flet ((fib (m) (if (< m 2) 1 (+ (fib (- m 1)) (fib (- m 2)))))) - , (mapcar (lambda (el) (list el (fib el))) (number-sequence 0 (- n 1)))) - ,#+end_src - - ,#+call: gdoc-write(title="fibs", data=fibs(n=10)) -#+end_src +: #+source: fibs +: #+begin_src emacs-lisp :var n=8 +: (flet ((fib (m) (if (< m 2) 1 (+ (fib (- m 1)) (fib (- m 2)))))) +: (mapcar (lambda (el) (list el (fib el))) (number-sequence 0 (- n 1)))) +: #+end_src +: +: #+call: gdoc-write(title="fibs", data=fibs(n=10)) * Plotting code From 1f6a1c0cba786abeed0446b4336d5eac85390543 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Wed, 21 Jul 2010 05:39:42 +0200 Subject: [PATCH 8/9] Fix broken link --- ORGWEBPAGE/index.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org index 182655121..aaa4e50ee 100644 --- a/ORGWEBPAGE/index.org +++ b/ORGWEBPAGE/index.org @@ -169,7 +169,7 @@ and corresponding to the latest git version. * Documentation ** The Org guide and manual - - Read the [[file:manual/index.html][online compact guide]] or download it as a [[file:orgguide.pdf][PDF document]]. + - Read the [[file:guide/index.html][online compact guide]] or download it as a [[file:orgguide.pdf][PDF document]]. The compact guide is a 40-page introduction to Org mode. It covers all features in a basic way and has links to in-depth documentation in the manual and on the web. From c3740a936b0039ffeaf7cddad80957c3a8d782bf Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Wed, 21 Jul 2010 05:53:45 +0200 Subject: [PATCH 9/9] Make release process get the tag from maint into master --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 98b73575b..01e200dd2 100644 --- a/Makefile +++ b/Makefile @@ -297,6 +297,7 @@ release: make pushreleasetag TAG=$(TAG) git push origin maint git checkout master + git merge -s ours maint UTILITIES/set-version.pl -o $(TAG) git commit -a -m "Update website to show $(TAG) as current release" git push