Re: [O] AUCTeX conflicting with org-mode
Hi Bastien and Suvayu, suvayu ali fatkasuvayu+li...@gmail.com writes: [snipped 35 lines] 1. Leave the bug unsolved, hoping there will be a cleaner solution later. After all, there is a very simple workaround on the user side, do (load tex.el) before using org-latex. how about this patch (to hotfix branch). diff --git a/lisp/org-latex.el b/lisp/org-latex.el index 2e11ca4..438e5a4 100644 --- a/lisp/org-latex.el +++ b/lisp/org-latex.el @@ -871,6 +871,7 @@ when PUB-DIR is set, use this as the publishing directory. filename))) (auto-insert nil); Avoid any auto-insert stuff for the new file (TeX-master (boundp 'TeX-master)) + (dummy (unless TeX-master (makunbound 'TeX-master))) ; make sure we are not introducing TeX-master (buffer (if to-buffer (cond ((eq to-buffer 'string) (get-buffer-create -- YYR
Re: [O] org-enforce-todo-dependencies setting
Carsten Dominik carsten.domi...@gmail.com writes: I had forgotten all about this, but indeed, the hook makes sure things are OK, so the sentence could be removed from the docstring. Done, thanks. -- Bastien
Re: [O] LaTeX export - can't skip a heading level
Nick Dokos nicholas.do...@hp.com writes: Especially as this is a limitation of LaTeX, not the exporter. :-) Not true - the following compiles with no problems: Yes, LaTeX doesn't really enforce it, but it makes the assumption of correct nesting. It's been a few years since I tried something like you've posted, but I've quickly learned that funny things happen when your document grows to a more realistic size (it had to do with how the counters are interacting). So I've stopped doing it and have never looked back. If you must, you can provide your own sectioning commands in LaTeX that handle this situation more gracefully, but that's really a bit much to ask of an org exporter, don't you think? Regards, Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ SD adaptation for Waldorf rackAttack V1.04R1: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada
Re: [O] org-enforce-todo-dependencies setting
Thanks! - Carsten On 21.3.2012, at 08:27, Bastien wrote: Carsten Dominik carsten.domi...@gmail.com writes: I had forgotten all about this, but indeed, the hook makes sure things are OK, so the sentence could be removed from the docstring. Done, thanks. -- Bastien
Re: [O] [DEV] New git workflow
Hi Achim,
On 03/20/2012 11:27 PM, Achim Gratz wrote:
Sorry, but cherry-picking into multiple release branches would simply
not be a sane development model for a small project like orgmode.
I just wanted to make sure it's considered.
Whether multiple branches are involved depends mainly on what releases
one intends to maintain. The nice thing in the model is the gradual
maintenance: A really critical fix could see more backports than a nicety.
I guess a decision should mostly be based on how significant the use
case back-port fix is to org-mode. The safer master role of maint
could of course be retained in a stable branch which points to
something like master@{1 month ago}.
Any point in the past is no safer than today's master. The stability
that maint should provide to users is with regards to the feature set,
i.e. no gratuitous changes between releases.
Ooops, I just wanted to illustrate that stable is typically behind
master - ultimately it should be a concious decision what is stable.
I like the goal maint is set to achieve, I'm just not convinced regular
merges are a good way to ensure it - after all, merges include
everything in a branch. If there are no doubts about that on your side,
I'm fine.
Cheers,
Simon
Re: [O] AUCTeX conflicting with org-mode
Hi Yagnesh, On Wed, Mar 21, 2012 at 07:01, Yagnesh Raghava Yakkala yagn...@live.com wrote: Hi Bastien and Suvayu, suvayu ali fatkasuvayu+li...@gmail.com writes: [snipped 35 lines] 1. Leave the bug unsolved, hoping there will be a cleaner solution later. After all, there is a very simple workaround on the user side, do (load tex.el) before using org-latex. how about this patch (to hotfix branch). I tested it, the problem is still there. I don't think you can put arbitrary code within a let* bind and expect to retain the effect in the main body. The only possible solution I can see seems to be ensuring tex.el is loaded properly. More importantly though, if more users cannot replicate this bug this might as well be a detail specific to how the AUCTeX site files behave in my setup (I use AUCTeX from the Fedora repositories). Not sure if that is something org should handle. Cheers, -- Suvayu Open source is the future. It sets us free.
Re: [O] AUCTeX conflicting with org-mode
Hello Suvayu., suvayu ali fatkasuvayu+li...@gmail.com writes: Hi Yagnesh, On Wed, Mar 21, 2012 at 07:01, Yagnesh Raghava Yakkala yagn...@live.com wrote: Hi Bastien and Suvayu, suvayu ali fatkasuvayu+li...@gmail.com writes: [snipped 35 lines] 1. Leave the bug unsolved, hoping there will be a cleaner solution later. After all, there is a very simple workaround on the user side, do (load tex.el) before using org-latex. how about this patch (to hotfix branch). I tested it, the problem is still there. That's odd. My tests have passed. I don't think you can put arbitrary code within a let* bind and expect to retain the effect in the main body. I don't understand what you mean here. Anyway it seems poking into variables from other packages is not a good idea in elisp. -- YYR
[O] [PATCH] Add Traditional Chinese translation
From 1fc081cff8f99eaa975de715c45e65a32a65cc0a Mon Sep 17 00:00:00 2001 From: FengShu tuma...@gmail.com Date: Wed, 21 Mar 2012 16:37:49 +0800 Subject: [PATCH] Add Traditional Chinese translation --- lisp/org-exp.el |7 +-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 2e1b88a..1ce 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -207,8 +207,11 @@ This option can also be set with the +OPTIONS line, e.g. \-:nil\. (ru #1040;#1074;#1090;#1086;#1088; #1044;#1072;#1090;#1072; #1057;#1086;#1076;#1077;#1088;#1078;#1072;#1085;#1080;#1077; #1057;#1085;#1086;#1089;#1082;#1080;) (sv Fouml;rfattare Datum Inneharing;ll Fotnoter) ;; Use numeric character entities for proper rendering of non-UTF8 documents -;; (zh_CN 作者 日期 目录 脚注) -(zh-CN #20316;#32773; #26085;#26399; #30446;#24405; #33050;#27880;)) +;; (zh-CN 作者 日期 目录 脚注) +(zh-CN #20316;#32773; #26085;#26399; #30446;#24405; #33050;#27880;) +;; Use numeric character entities for proper rendering of non-UTF8 documents +;; (zh-TW 作者 日期 目錄 腳註) +(zh-TW #20316;#32773; #26085;#26399; #30446;#37636; #33139;#35387;)) Terms used in export text, translated to different languages. Use the variable `org-export-default-language' to set the language, or use the +OPTION lines for a per-file setting. -- 1.7.9.1
[O] How to include a very complicated latex head
I want to set the latex-head for latex exporting, I use
*org-export-latex-append-header*,but it seem not used by
*org-preview-latex-fragment* . is there any other way?
simple way?
#+begin_latex
\ifxetex% xelatex
\usepackage[xetex]{hyperref}
\else
\ifpdf% pdflatex
\usepackage[pdftex,unicode]{hyperref}
\else % dvipdfmx or dvips
\usepackage[dvipdfmx,unicode]{hyperref}
%\usepackage[ps2pdf,unicode]{hyperref}
\fi
\fi
\ifxetex\else\ifpdf\else
% pdftex 3.1415926-1.40.10-2.2 has trouble with it
\InputIfFileExists{zhwinfonts.tex}{}{}
\fi\fi
#+end_latex
#+begin_src emacs-lisp
(setq org-export-latex-append-header
\\ifxetex% xelatex
\\usepackage[hyperref,UTF8,nofonts]{ctex}
\\setCJKmainfont[ItalicFont={AR PL UKai CN}]{AR PL UMing CN}% 文鼎宋体和楷书
\\setCJKsansfont{WenQuanYi Zen Hei}% 文泉驿的黑体
\\setCJKmonofont{WenQuanYi Zen Hei}
\\usepackage[xetex]{hyperref}
\\else
\\ifpdf% pdflatex
\\usepackage[pdftex,unicode]{hyperref}
\\else % dvipdfmx or dvips
\\usepackage[dvipdfmx,unicode]{hyperref}
%\\usepackage[ps2pdf,unicode]{hyperref}
\\fi
\\fi
\\ifxetex\\else\\ifpdf\\else
% pdftex 3.1415926-1.40.10-2.2 has trouble with it
\\InputIfFileExists{zhwinfonts.tex}{}{}
\\fi\\fi
)
#+end_src
Re: [O] [DEV] New git workflow
Simon Thum simon.t...@gmx.de writes: Whether multiple branches are involved depends mainly on what releases one intends to maintain. The nice thing in the model is the gradual maintenance: A really critical fix could see more backports than a nicety. Yes. Bastien has to make that decision since he's the one doing the maintenance. I like the goal maint is set to achieve, I'm just not convinced regular merges are a good way to ensure it - after all, merges include everything in a branch. If there are no doubts about that on your side, I'm fine. It was intended as a solution to the problem of either not getting bugfixes for the latest release or having to live on bleeding edge. It was too shortlived to judge if it had achieved that goal and how satisfied people were with it. Bastien is now trying a three-branch model since he also needs to maintain org within Emacs(*). As long as it works for him it will work for us, I'd think. (*) This should provide similar benefits to users as maint was supposed to, albeit it may not be obvious to users on how to follow that branch. Regards, Achim. -- +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+ Wavetables for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldUserWavetables
Re: [O] [PATCH] Add Traditional Chinese translation
FengShu tuma...@gmail.com writes: From 1fc081cff8f99eaa975de715c45e65a32a65cc0a Mon Sep 17 00:00:00 2001 From: FengShu tuma...@gmail.com Date: Wed, 21 Mar 2012 16:37:49 +0800 Subject: [PATCH] Add Traditional Chinese translation Applied, thanks. -- Bastien
Re: [O] List all habits with consistency graph
Hi Henning, Henning Weiss hdwe...@gmail.com writes: I was wondering how to create a list that contains all habits including their consistency graph. You should be able to do this with an agenda, skipping entries that are not habits. (See `org-agenda-skip-function' on how to use your own function for skipping entries.) HTH, -- Bastien
[O] [patch][babel] ob-lilypond maintenance
Maintenance patches: 1) Fix compiler warning 2) Leave versioning to Org 3) Set `no cache' default in audition mode 4) Redirect `homepage' to Worg Best, Martyn From 5fc49bc167c8fcc194c1c5761ea25c0a625500cb Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 09:31:53 + Subject: [PATCH 1/4] Fix compiler warning. * lisp/ob-lilypond.el: Fix compiler warning. --- lisp/ob-lilypond.el |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 0e9b0c6..0404c7e 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -34,10 +34,9 @@ (require 'ob) (require 'ob-eval) (require 'ob-tangle) +(require 'outline) (defalias 'lilypond-mode 'LilyPond-mode) -(declare-function show-all outline ()) - (add-to-list 'org-babel-tangle-lang-exts '(LilyPond . ly)) (defvar org-babel-default-header-args:lilypond '() -- 1.7.3.4 From 16bd78584237ed5699b4fe8615a8f62329b7e811 Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 09:33:34 + Subject: [PATCH 2/4] Leave versioning to Org. * lisp/ob-lilypond.el: Leave versioning to Org * testing/lisp/test-ob-lilypond.el: Leave versioning to Org --- lisp/ob-lilypond.el | 11 +-- testing/lisp/test-ob-lilypond.el | 10 -- 2 files changed, 1 insertions(+), 20 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 0404c7e..84b4c1d 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -44,9 +44,6 @@ NOTE: The arguments are determined at lilypond compile time. See (ly-set-header-args)) -(defconst ly-version 7.6 - The version number of the file ob-lilypond.el.) - (defvar ly-compile-post-tangle t Following the org-babel-tangle (C-c C-v t) command, ly-compile-post-tangle determines whether ob-lilypond should @@ -436,13 +433,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes (message (concat Arrange mode has been (if ly-arrange-mode ENABLED. DISABLED. -(defun ly-version (optional insert-at-point) - (interactive) - (let ((version (format ob-lilypond version %s ly-version))) -(when insert-at-point (insert version)) -(message version))) - - (defun ly-switch-extension (file-name ext) +(defun ly-switch-extension (file-name ext) Utility command to swap current FILE-NAME extension with EXT (concat (file-name-sans-extension diff --git a/testing/lisp/test-ob-lilypond.el b/testing/lisp/test-ob-lilypond.el index 306c48a..1a60eab 100644 --- a/testing/lisp/test-ob-lilypond.el +++ b/testing/lisp/test-ob-lilypond.el @@ -38,16 +38,6 @@ (should-error (org-babel-prep-session:lilypond nil nil)) :type 'error) -(ert-deftest ob-lilypond/ly-version-const () - (should (boundp 'ly-version))) - -(ert-deftest ob-lilypond/ly-version-command () - (should (equal ob-lilypond version 7.6 (ly-version))) - (with-temp-buffer -(ly-version t) -(should (equal ob-lilypond version 7.6 - (buffer-substring (point-min) (point-max)) - (ert-deftest ob-lilypond/ly-compile-lilyfile () (should (equal `(,(ly-determine-ly-path);program -- 1.7.3.4 From 4bb6929dc2d4514a58900c3fe1b77dbed7f95ebf Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 09:35:44 + Subject: [PATCH 3/4] Set no cache default in audition mode. * lisp/ob-lilypond.el: Set no cache default in audition mode. * testing/lisp/test-ob-lilypond.el: Set no cache default in audition mode. --- lisp/ob-lilypond.el |1 - testing/lisp/test-ob-lilypond.el |2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 84b4c1d..d77c5b6 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -447,7 +447,6 @@ mode i.e. ARRANGE-MODE is t '((:tangle . yes) (:noweb . yes) (:results . silent) - (:cache . yes) (:comments . yes))) (t '((:results . file) diff --git a/testing/lisp/test-ob-lilypond.el b/testing/lisp/test-ob-lilypond.el index 1a60eab..16cb055 100644 --- a/testing/lisp/test-ob-lilypond.el +++ b/testing/lisp/test-ob-lilypond.el @@ -354,7 +354,6 @@ (should (equal '((:tangle . yes) (:noweb . yes) (:results . silent) - (:cache . yes) (:comments . yes)) (ly-set-header-args t))) (should (equal '((:results . file) @@ -366,7 +365,6 @@ (should (equal '((:tangle . yes) (:noweb . yes) (:results . silent) - (:cache . yes) (:comments . yes)) org-babel-default-header-args:lilypond)) (ly-set-header-args nil) -- 1.7.3.4 From 7be76f27ecc67f720642fe97006a9426ee7d7328 Mon Sep 17 00:00:00 2001 From: Martyn Jago
Re: [O] how to include graphics in pdf output
Hi Christopher,
Christopher W. Ryan wrote:
However, in both cases, the inline tasks themselves also appear in the
final pdf. I was trying to avoid that, and I though todo:nil in
#+OPTIONS would accomplish that objective, but it did not. Is there a
way to not export inline tasks?
Here are the modifications to the small reproducible file I started with:
#+OPTIONS: todo:nil toc:nil tags:nil
#+LATEX_HEADER: \usepackage[margin=1in]{geometry}
#+LATEX_HEADER: \usepackage{graphicx}
* I guess I don't understand enough about Org's hierarchical trees yet
** Study design
Here's what we'll do.
Blah blah blah
*** TODO I'd like this not to appear in pdf
*** END
So now this text here appears in the pdf, as desired. But I'd like the
inline task above not to appear in the pdf. I though todo:nil would
prevent it from appearing, but it did not.
An inline task is almost a normal headline, hence you can put a tag such as
noexport on it, and have the inline task not exported.
Best regards,
Seb
--
Sebastien Vauban
Re: [O] [patch][babel] ob-lilypond maintenance
Hi Martyn, Martyn Jago martyn.j...@btinternet.com writes: Maintenance patches: 1) Fix compiler warning 2) Leave versioning to Org 3) Set `no cache' default in audition mode 4) Redirect `homepage' to Worg Thanks a lot. Patch #1 applies correctly on hotfix-7.8.06 and master. #2-3-4 apply on master but not on hotfix-7.8.06. Can you submit the patches for hotfix-7.8.06? This is not critical and we can go for master if you want. Let me know. Best, -- Bastien
Re: [O] how to include graphics in pdf output
On Wed, Mar 21, 2012 at 4:54 AM, Sebastien Vauban
wxhgmqzgw...@spammotel.com wrote:
Hi Christopher,
Christopher W. Ryan wrote:
However, in both cases, the inline tasks themselves also appear in the
final pdf. I was trying to avoid that, and I though todo:nil in
#+OPTIONS would accomplish that objective, but it did not. Is there a
way to not export inline tasks?
Here are the modifications to the small reproducible file I started with:
#+OPTIONS: todo:nil toc:nil tags:nil
#+LATEX_HEADER: \usepackage[margin=1in]{geometry}
#+LATEX_HEADER: \usepackage{graphicx}
* I guess I don't understand enough about Org's hierarchical trees yet
** Study design
Here's what we'll do.
Blah blah blah
*** TODO I'd like this not to appear in pdf
*** END
So now this text here appears in the pdf, as desired. But I'd like the
inline task above not to appear in the pdf. I though todo:nil would
prevent it from appearing, but it did not.
An inline task is almost a normal headline, hence you can put a tag such as
noexport on it, and have the inline task not exported.
Also,
,- M-x help RET v RET org-inlinetask-export -
| org-inlinetask-export is a variable defined in `org-inlinetask.el'.
| Its value is t
|
| Documentation:
| Non-nil means export inline tasks.
| When nil, they will not be exported.
|
| You can customize this variable.
`-
Best regards,
John
Best regards,
Seb
--
Sebastien Vauban
Re: [O] How to include a very complicated latex head
On 21 mars 2012, at 10:00, FengShu wrote:
I want to set the latex-head for latex exporting, I use
*org-export-latex-append-header*,but it seem not used by
*org-preview-latex-fragment* . is there any other way?
simple way?
I'm using this (I don't know if it's simpler or not).
Hope this helps,
Alan
;; using xelatex
;; from http://orgmode.org/worg/org-faq.html#using-xelatex-for-pdf-export
;; Originally taken from Bruno Tavernier:
http://thread.gmane.org/gmane.emacs.orgmode/31150/focus=31432
;; but adapted to use latexmk 4.20 or higher.
(defun my-auto-tex-cmd ()
When exporting from .org with latex, automatically run latex,
pdflatex, or xelatex as appropriate, using latexmk.
(let ((texcmd)))
;; default command: oldstyle latex via dvi
(setq texcmd latexmk -dvi -pdfps -quiet %f)
;; pdflatex - .pdf
(if (string-match LATEX_CMD: pdflatex (buffer-string))
(setq texcmd latexmk -pdf -quiet %f))
;; xelatex - .pdf
(if (string-match LATEX_CMD: xelatex (buffer-string))
(setq texcmd latexmk -pdflatex=xelatex -pdf -quiet %f))
;; LaTeX compilation command
(setq org-latex-to-pdf-process (list texcmd)))
(add-hook 'org-export-latex-after-initial-vars-hook 'my-auto-tex-cmd)
;; Specify default packages to be included in every tex file, whether pdflatex
or xelatex
(setq org-export-latex-packages-alist
'(
( graphicx t)
( longtable nil)
( float nil)
( hyperref nil)
))
(defun my-auto-tex-parameters ()
Automatically select the tex packages to include.
;; default packages for ordinary latex or pdflatex export
(setq org-export-latex-default-packages-alist
'((AUTO inputenc t)
(T1 fontenc t)
( fixltx2e nil)
( wrapfig nil)
( soul t)
( textcomp t)
( marvosym t)
( wasysym t)
( latexsym t)
( amssymb t)
))
;; Packages to include when xelatex is used
(if (string-match LATEX_CMD: xelatex (buffer-string))
(setq org-export-latex-default-packages-alist
'(( fontspec t)
( xunicode t)
( url t)
( rotating t)
;(american babel t)
;(babel csquotes t)
( soul t)
)))
(if (string-match LATEX_CMD: xelatex (buffer-string))
(setq org-export-latex-classes
(cons '(article
\\documentclass[11pt,article,oneside]{memoir}
(\\section{%s} . \\section*{%s})
(\\subsection{%s} . \\subsection*{%s})
(\\subsubsection{%s} . \\subsubsection*{%s})
(\\paragraph{%s} . \\paragraph*{%s})
(\\subparagraph{%s} . \\subparagraph*{%s}))
org-export-latex-classes
(add-hook 'org-export-latex-after-initial-vars-hook 'my-auto-tex-parameters)
Re: [O] List all habits with consistency graph
Hi Bastien, I tried using a skip function to create an agenda that only contains habits following this posthttp://lists.gnu.org/archive/html/emacs-orgmode/2012-02/msg00944.html. To display habits that are not scheduled for today, I enabled org-habit-show-habits-only-for-today. This made it possible for me to view all other habits by navigating through the agenda. The problem with this approach is that some of my habits have various intervals, ie. daily, bi-weekly, bi-monthly and monthly. This makes it quite cumbersome to track down all of the habits in the agenda. Also, there is a lot of noise because of the agenda day separators and the duplication of habits (ie. daily habits are displayed every day). How can I get a cleaner view of the habit list for entries that are scheduled at some point in the future? Maybe if it would somehow be possible to create an agenda that collapses multiple days into one, I could filter it by habit to give me a habit list. I could see myself using this collapsed agenda for other things as well. Henning On Wed, Mar 21, 2012 at 10:49 AM, Bastien b...@gnu.org wrote: Hi Henning, Henning Weiss hdwe...@gmail.com writes: I was wondering how to create a list that contains all habits including their consistency graph. You should be able to do this with an agenda, skipping entries that are not habits. (See `org-agenda-skip-function' on how to use your own function for skipping entries.) HTH, -- Bastien
Re: [O] [patch][babel] ob-lilypond maintenance
Hi Bastien Bastien b...@gnu.org writes: Hi Martyn, Martyn Jago martyn.j...@btinternet.com writes: Maintenance patches: 1) Fix compiler warning 2) Leave versioning to Org 3) Set `no cache' default in audition mode 4) Redirect `homepage' to Worg Thanks a lot. Patch #1 applies correctly on hotfix-7.8.06 and master. #2-3-4 apply on master but not on hotfix-7.8.06. Can you submit the patches for hotfix-7.8.06? This is not critical and we can go for master if you want. Let me know. Best, Here's #1,2,4. #3 Makes no sense in context of code difference between hotfix-7.8.06 against master. Best, Martyn From 2d12de6b60196871303438ca51f9d50e3ae19342 Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 10:49:57 + Subject: [PATCH 1/3] Fix compiler warning. * lisp/ob-lilypond.el: Fix compiler warning. --- lisp/ob-lilypond.el |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 1f412fd..19fe465 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -30,10 +30,9 @@ (require 'ob) (require 'ob-eval) (require 'ob-tangle) +(require 'outline) (defalias 'lilypond-mode 'LilyPond-mode) -(declare-function show-all outline ()) - (add-to-list 'org-babel-tangle-lang-exts '(LilyPond . ly)) (defvar org-babel-default-header-args:lilypond '() -- 1.7.3.4 From 78e9de9942947ea47c5983367dfee8c6b67b0f77 Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 10:52:49 + Subject: [PATCH 2/3] Leave versioning to Org. * lisp/ob-lilypond.el: Leave versioning to Org. * testing/lisp/test-ob-lilypond.el: Leave versioning to Org. --- lisp/ob-lilypond.el | 11 +-- testing/lisp/test-ob-lilypond.el | 10 -- 2 files changed, 1 insertions(+), 20 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 19fe465..90a1b60 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -38,9 +38,6 @@ (defvar org-babel-default-header-args:lilypond '() Default header arguments for js code blocks.) -(defconst ly-version 0.3 - The version number of the file ob-lilypond.el.) - (defvar ly-compile-post-tangle t Following the org-babel-tangle (C-c C-v t) command, ly-compile-post-tangle determines whether ob-lilypond should @@ -407,13 +404,7 @@ If TEST is non-nil, it contains a simulation of the OS for test purposes (message (concat Arrange mode has been (if ly-arrange-mode ENABLED. DISABLED. -(defun ly-version (optional insert-at-point) - (interactive) - (let ((version (format ob-lilypond version %s ly-version))) -(when insert-at-point (insert version)) -(message version))) - - (defun ly-switch-extension (file-name ext) +(defun ly-switch-extension (file-name ext) Utility command to swap current FILE-NAME extension with EXT (concat (file-name-sans-extension diff --git a/testing/lisp/test-ob-lilypond.el b/testing/lisp/test-ob-lilypond.el index 2ca0597..2c35eca 100644 --- a/testing/lisp/test-ob-lilypond.el +++ b/testing/lisp/test-ob-lilypond.el @@ -43,16 +43,6 @@ (should-error (org-babel-prep-session:lilypond nil nil)) :type 'error) -(ert-deftest ob-lilypond/ly-version-const () - (should (boundp 'ly-version))) - -(ert-deftest ob-lilypond/ly-version-command () - (should (equal ob-lilypond version 0.3 (ly-version))) - (with-temp-buffer -(ly-version t) -(should (equal ob-lilypond version 0.3 - (buffer-substring (point-min) (point-max)) - (ert-deftest ob-lilypond/ly-compile-lilyfile () (should (equal `(,(ly-determine-ly-path);program -- 1.7.3.4 From 71755479fd315167b67875bd647376b48c126085 Mon Sep 17 00:00:00 2001 From: Martyn Jago martyn.j...@btinternet.com Date: Wed, 21 Mar 2012 10:56:52 + Subject: [PATCH 3/3] Re-direct homepage to Worg. * lisp/ob-lilypond.el: Re-direct homepage to Worg. --- lisp/ob-lilypond.el |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index 90a1b60..6b03bd8 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -4,7 +4,7 @@ ;; Author: Martyn Jago ;; Keywords: babel language, literate programming -;; Homepage: https://github.com/mjago/ob-lilypond +;; Homepage: http://orgmode.org/worg/org-contrib/babel/languages/ob-doc-lilypond.html ;; This file is part of GNU Emacs. -- 1.7.3.4
[O] org-mobile: new edit nodes for new heading, delete, refile and archive
Hi, I have tried to extend org-mobile with four new edit nodes. One to add new headings, one for deletion of headings, one for refiling and one for archiving nodes. Having those in orgmode would allow mobileorg-android (and mobileorg) to be extended to allow a wider range of operations. The addition of new headings is already implemented in mobileorg-android and they seem to work properly. The current version of this patch is in my github repositoryhttps://github.com/hdweiss/org-mode/compare/editnode. As I don't have a lot of experience with lisp I would appreciate if someone could give me a little feedback. I still need to write a function that compares two nodes (with their subtrees) against each other. This will ensure that the edit nodes are applied to the correct nodes. Any feedback would be appreciated. Henning
Re: [O] LaTeX export - can't skip a heading level
Achim Gratz strom...@nexgo.de wrote: Nick Dokos nicholas.do...@hp.com writes: Especially as this is a limitation of LaTeX, not the exporter. :-) Not true - the following compiles with no problems: Yes, LaTeX doesn't really enforce it, but it makes the assumption of correct nesting. It's been a few years since I tried something like you've posted, but I've quickly learned that funny things happen when your document grows to a more realistic size (it had to do with how the counters are interacting). So I've stopped doing it and have never looked back. If you must, you can provide your own sectioning commands in LaTeX that handle this situation more gracefully, but that's really a bit much to ask of an org exporter, don't you think? Certainly - I did not argue that the exporter should do this. I just pointed out its limitation and that the limitation would be tough to lift. Nick
Re: [O] How to include a very complicated latex head
FengShu tuma...@gmail.com wrote:
I want to set the latex-head for latex exporting, I use
*org-export-latex-append-header*,but it seem not used by
*org-preview-latex-fragment* . is there any other way?
simple way?
You are right - org-preview-latex-fragment is independent of the latex
exporter. The preview latex header is constructed (in
org.el:org-create-formula-image) like this:
,
| (with-temp-file texfile
| (insert (org-splice-latex-header
| org-format-latex-header
| org-export-latex-default-packages-alist
| org-export-latex-packages-alist t
| org-format-latex-header-extra))
| (insert \n\\begin{document}\n string \n\\end{document}\n)
| ...
`
so you might want to experiment with the variable
org-format-latex-header-extra (and maybe some of the others as well).
Certainly far from simple: but if your trial-and-error succeed, then you
might be able to propose a simpler mechanism. Let us know.
Nick
#+begin_latex
\ifxetex% xelatex
\usepackage[xetex]{hyperref}
\else
\ifpdf% pdflatex
\usepackage[pdftex,unicode]{hyperref}
\else % dvipdfmx or dvips
\usepackage[dvipdfmx,unicode]{hyperref}
%\usepackage[ps2pdf,unicode]{hyperref}
\fi
\fi
\ifxetex\else\ifpdf\else
% pdftex 3.1415926-1.40.10-2.2 has trouble with it
\InputIfFileExists{zhwinfonts.tex}{}{}
\fi\fi
#+end_latex
#+begin_src emacs-lisp
(setq org-export-latex-append-header
\\ifxetex% xelatex
\\usepackage[hyperref,UTF8,nofonts]{ctex}
\\setCJKmainfont[ItalicFont=3D{AR PL UKai CN}]{AR PL UMing CN}% =E6=96=87=
=E9=BC=8E=E5=AE=8B=E4=BD=93=E5=92=8C=E6=A5=B7=E4=B9=A6
\\setCJKsansfont{WenQuanYi Zen Hei}% =E6=96=87=E6=B3=89=E9=A9=BF=E7=9A=84=
=E9=BB=91=E4=BD=93
\\setCJKmonofont{WenQuanYi Zen Hei}
\\usepackage[xetex]{hyperref}
\\else
\\ifpdf% pdflatex
\\usepackage[pdftex,unicode]{hyperref}
\\else % dvipdfmx or dvips
\\usepackage[dvipdfmx,unicode]{hyperref}
%\\usepackage[ps2pdf,unicode]{hyperref}
\\fi
\\fi
\\ifxetex\\else\\ifpdf\\else
% pdftex 3.1415926-1.40.10-2.2 has trouble with it
\\InputIfFileExists{zhwinfonts.tex}{}{}
\\fi\\fi
)
#+end_src
[O] bug#11042: 24.0.94; dangerous org manual: parse-time-months and parse-time-weekdays
Hi Michael, Michael Heerdegen michael_heerde...@web.de writes: The org-mode manual under the node The date/time prompt tells: [...] The function understands English month and weekday abbreviations. If you want to use unabbreviated names and/or other languages, configure the variables `parse-time-months' and `parse-time-weekdays'. It doesn't tell how the user can do that. Even worse, `parse-time-months' and `parse-time-weekdays' are not defined as user options and undocumented! After reading the above section in the org manual, users may replace the English names with e.g. German ones in their config. Seems this is not a good idea, as this user question in gnu.emacs.gnus shows: http://groups.google.com/group/gnu.emacs.gnus/browse_thread/thread/8dde85b5ff3ab454/a02ddb878bfa1eb9 The thread doesn't tell what is wrong with setting `parse-time-months' and `parse-time-weekdays'. Can you expand a bit more on this? BTW1: maybe a better solution would be to define own variables for this purpose in org, instead of letting users change variables in parse-time.el. Org heavily depends on parse-time.el. Providing a defcustom in Org that is tied to parse-time.el at the same time is not trivial. Thanks, -- Bastien
Re: [O] how to include graphics in pdf output
John Hendy wrote: On Wed, Mar 21, 2012 at 4:54 AM, Sebastien Vauban wxhgmqzgw...@spammotel.com wrote: Hi Christopher, Christopher W. Ryan wrote: However, in both cases, the inline tasks themselves also appear in the final pdf. I was trying to avoid that, and I though todo:nil in #+OPTIONS would accomplish that objective, but it did not. Is there a way to not export inline tasks? . . An inline task is almost a normal headline, hence you can put a tag such as noexport on it, and have the inline task not exported. Also, ,- M-x help RET v RET org-inlinetask-export - | org-inlinetask-export is a variable defined in `org-inlinetask.el'. | Its value is t | | Documentation: | Non-nil means export inline tasks. | When nil, they will not be exported. | | You can customize this variable. `- Best regards, John Best regards, Seb -- Sebastien Vauban Excellent! Thanks everyone. --Chris Christopher W. Ryan, MD SUNY Upstate Medical University Clinical Campus at Binghamton 425 Robinson Street, Binghamton, NY 13904 cryanatbinghamtondotedu Observation is a more powerful force than you could possibly reckon. The invisible, the overlooked, and the unobserved are the most in danger of reaching the end of the spectrum. They lose the last of their light. From there, anything can happen . . . [God, in Joan of Arcadia, episode entitled, The Uncertainty Principle.]
Re: [O] [patch][babel] ob-lilypond maintenance
Martyn Jago martyn.j...@btinternet.com writes: Here's #1,2,4. #3 Makes no sense in context of code difference between hotfix-7.8.06 against master. Applied, thanks a bunch. -- Bastien
Re: [O] HTML Export Error : org-export-replace-src-segments-and-examples: Args out of range: 0, 0
Hi, Sankalp sankalpkh...@gmail.com writes: I'm facing a strange issue. On exporting the attached .org file to HTML, I often have to do it in 2 passes. Can you share a minimal setup so that we can reproduce the problem with the regex-python.org file you provided? Thanks, -- Bastien
Re: [O] [bug] org-agenda-write does not handle date stamps without day of week
Hi! * Nick Dokos nicholas.do...@hp.com wrote: Check that you picked up Carsten's fix (commit ): git show 7d84b300f4cba8b726662113d4ce4ff40a76c5b5 I do. I did a «git pull» and the «git show» from above shows me Casten's fix. If you did M-x org-reload RET only, then that's probably the reason: check to see if the value of org-ts-regexp0 has been updated; in my case it hadn't and I ended up doing M-x load-file RET /path/to/org.el RET. Alternatively, restart emacs. Being very unsure what needs to be restarted at such updates, I quit Emacs before the git commands and start it again afterwards. So I quit Emacs again, did another «git pull» a couple of minutes ago, compiled all *.el once again, started Emacs, generated the ICS file and now the times get written to ICS: ,[ Org-mode entries ] | ** 2012-03-21 08:12 TSTest | :PROPERTIES: | :CREATED: [2012-03-20 Tue 10:38] | :END: | | ** 2012-03-21 08:07-13:12 TSTest | :PROPERTIES: | :CREATED: [2012-03-20 Tue 10:40] | :END: ` ,[ ICS entries ] | BEGIN:VEVENT | UID: TS-4ae514e8-210c-408b-bb08-254dcb3a5277 | DTSTART:20120321T081200 | DTEND:20120321T101200 | SUMMARY: TSTest | CATEGORIES:misc | END:VEVENT | BEGIN:VEVENT | UID: TS-cab4b928-1960-4335-b2e8-2179e66eec5a | DTSTART:20120321T080700 | DTEND:20120321T131200 | SUMMARY: TSTest | CATEGORIES:misc | END:VEVENT ` ICS look great! Thank you guys for tracing the problem and fixing it! I really appreciate the help! So far, Google calendar does not use the time information of those two test entries :-( But since the ICS data seems to be OK there might be another hiccup by Google this time. I created new test entries with different names and wait for Google calendar to re-read the new data. I am optimistic that this is just a caching problem of Google because I did not change the descriptions during my last test. -- Karl Voit
Re: [O] [bug] org-agenda-write does not handle date stamps without day of week
On 21.3.2012, at 17:32, Karl Voit wrote: Hi! * Nick Dokos nicholas.do...@hp.com wrote: Check that you picked up Carsten's fix (commit ): git show 7d84b300f4cba8b726662113d4ce4ff40a76c5b5 I do. I did a «git pull» and the «git show» from above shows me Casten's fix. If you did M-x org-reload RET only, then that's probably the reason: check to see if the value of org-ts-regexp0 has been updated; in my case it hadn't and I ended up doing M-x load-file RET /path/to/org.el RET. Alternatively, restart emacs. Being very unsure what needs to be restarted at such updates, The reason why just reloading a file does not work here is that the regexp is defined as a constant (defconst), which will not be changed on executing the defconst again. So exiting and restarting Emacs is the right thing to do. - Carsten I quit Emacs before the git commands and start it again afterwards. So I quit Emacs again, did another «git pull» a couple of minutes ago, compiled all *.el once again, started Emacs, generated the ICS file and now the times get written to ICS: ,[ Org-mode entries ] | ** 2012-03-21 08:12 TSTest | :PROPERTIES: | :CREATED: [2012-03-20 Tue 10:38] | :END: | | ** 2012-03-21 08:07-13:12 TSTest | :PROPERTIES: | :CREATED: [2012-03-20 Tue 10:40] | :END: ` ,[ ICS entries ] | BEGIN:VEVENT | UID: TS-4ae514e8-210c-408b-bb08-254dcb3a5277 | DTSTART:20120321T081200 | DTEND:20120321T101200 | SUMMARY: TSTest | CATEGORIES:misc | END:VEVENT | BEGIN:VEVENT | UID: TS-cab4b928-1960-4335-b2e8-2179e66eec5a | DTSTART:20120321T080700 | DTEND:20120321T131200 | SUMMARY: TSTest | CATEGORIES:misc | END:VEVENT ` ICS look great! Thank you guys for tracing the problem and fixing it! I really appreciate the help! So far, Google calendar does not use the time information of those two test entries :-( But since the ICS data seems to be OK there might be another hiccup by Google this time. I created new test entries with different names and wait for Google calendar to re-read the new data. I am optimistic that this is just a caching problem of Google because I did not change the descriptions during my last test. -- Karl Voit
[O] Find the latest changed todo items
Hi I have some todo-files with a lot of TODO-Items. Now I would like to show a list of all items sorted by the date of changes. I have following TODO-Items: * DONE Item1 - State DONE from TODO [2012-03-17 Sat 06:50] - Note taken on [2012-03-17 Sat 06:48] \\ - State TODO from[2012-03-09 Fri 08:20] * TODO Item2 - Note taken on [2012-03-17 Sat 06:48] \\ - State TODO from[2012-03-06 Thu 08:20] * TODO Item3 - State TODO from[2012-03-07 Wed 08:00] If I show a Timeline of this buffer with C-c a L and l and v [ I get following output: , | Tuesday 6 March 2012 | [ TODO Item2 | Wednesday 7 March 2012 | [ TODO Item3 | Thursday8 March 2012 | Friday 9 March 2012 | [ DONE Item1 | | [... 8 empty days omitted] | | Saturday 17 March 2012 | [ DONE Item1 | [ TODO Item2 | [ DONE Item1 ` But I would like following output without that duplicates and DONE items: , | Wednesday 7 March 2012 | [ TODO Item3 | Saturday 17 March 2012 | [ TODO Item2 ` So only the last change of that Items should be shown. Is that possible and if yes how can I do it or should I add some other stuff to my items? thx = odi -- Oliver Dunkl Software Engineer http://odi.isa-geek.org
[O] GSoC 2012 -- Elisp backend for Ragel
Hi! I'm currently studying Computer Science at Lyon 1, France and I was interested in writing an elisp backend for ragel to use in org-mode for the Google Summer of Code 2012. I hope GNU will have enough slot for this project because it's the one I would really like doing :) Here's a draft of my application. I was hoping someone (mentors?) could help me improve it (suggestion, typo, correction). Keep in mind English is not my native language. --- Name: Aurélien Aptel E-mail: aurelien.ap...@gmail.com Project name: org-mode -- Implement an Elisp backend for Ragel Summary: The objective of the project is to implement an Elisp backend for Ragel (a parser generator) in order to replace the slow, complex and error-prone parsing code in org-mode with fast code generated by Ragel from a clean and readable grammar. Benefits: * Clean, readable and reusable grammar for org-mode files * A new (fast) alternative for parsing in Elisp ; can be relevant for a lot of Elisp projects * New language backend for Ragel Deliverables: * New language backend for Ragel * New improved parsing code for org-mode * A grammar for org-mode files Plan: Communication: I can be reached via email or irc. I plan on using a DVCS like Mercurial and publish my commits on a public hosting service such as bitbucket.org so everyone can follow my progress. I will also post to the org-mode ML to present my progress after each meaningful steps. Qualification: * I've already contributed to emacs. I've added cross-platform underwave support, hopefully included in future releases. More info and patch at: http://lists.gnu.org/archive/html/bug-gnu-emacs/2012-02/msg00238.html http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00844.html * I'm familiar with FSM concepts I've had classes on languages and automata which involved the implementation of several algorithms. * I use emacs every day :) I read and sometime post on various emacs MLs and I keep up with Emacs-related news on the web. I'm familiar with Lisp-like language. I wrote an interpreter (in C) for my own Lisp-language with the help of SICP as a personnal project. I have enough Elisp knowledge to automate some of my tasks but I'm no expert at it. I have used org-mode few times but I can't say I'm a frequent user. I'm a C hacker at heart but I have an acceptable knowledge of C++ :) ---
Re: [O] GSoC 2012 -- Elisp backend for Ragel
Oops. Forgot the Plan section. I'm not sure about that one. Plan: The project has 2 clearly defined tasks: * implement the backend * replace the old parser I'm still not sure what will take the most time and I'm tempted to just have an almost-working backend as mid-term evaluation, working backend as a final evaluation and the replacement of the old parser as a bonus... The project title is Add Elisp backend to Ragel after all.
Re: [O] GSoC 2012 -- Elisp backend for Ragel
Great job. -- The Kafka Pandemic: http://thekafkapandemic.blogspot.com
[O] bug#11042: 24.0.94; dangerous org manual: parse-time-months and parse-time-weekdays
Bastien b...@altern.org writes: Hi Michael, Michael Heerdegen michael_heerde...@web.de writes: The org-mode manual under the node The date/time prompt tells: [...] The function understands English month and weekday abbreviations. If you want to use unabbreviated names and/or other languages, configure the variables `parse-time-months' and `parse-time-weekdays'. It doesn't tell how the user can do that. Even worse, `parse-time-months' and `parse-time-weekdays' are not defined as user options and undocumented! After reading the above section in the org manual, users may replace the English names with e.g. German ones in their config. Seems this is not a good idea, as this user question in gnu.emacs.gnus shows: http://groups.google.com/group/gnu.emacs.gnus/browse_thread/thread/8dde85b5ff3ab454/a02ddb878bfa1eb9 The thread doesn't tell what is wrong with setting `parse-time-months' and `parse-time-weekdays'. Can you expand a bit more on this? The thread is not completely visible in google groups, dunno why. Please read at gnu.emacs.gnus with a newsreader. The problem was that the user replaced the English names with German names - instead of adding them to the lists. This broke Gnus. Currently, `parse-time-months' and `parse-time-weekdays' are internal variables with no docstring. Seems they are not intended to be changed by the user. Other packages may rely on the fact that the default values aren't changed. If they are supposed to be configured by the user, they should get a documented defcustom. At least, the documentation in the org manual _must_ be improved, so that the user is enabled to do the right thing without breaking anything else. BTW1: maybe a better solution would be to define own variables for this purpose in org, instead of letting users change variables in parse-time.el. Org heavily depends on parse-time.el. Providing a defcustom in Org that is tied to parse-time.el at the same time is not trivial. Why not? You could just write a function `org-parse-time-string' that binds `parse-time-months' and `parse-time-weekdays' accordingly and calls `parse-time-string'. Then you would just need to call this new function from org code. Regards, Michael.
Re: [O] TODO items as part of an itemized list?
Makes sense. I realize I can achieve almost all of what I want by making my TODO items, say, level three headers, ***, then not including \subsubsection in my latex_class definition. Now each TODO item is printed in LaTeX as a separate \item in an itemize list, just as I wanted. Just one remaining problem, however. The exporter inserts a hard line-break, \\ after the first line of each of these \item entries. This is fine when there is additional text for that item, but if the TODO item is just one line, this results in unwanted extra white space being inserted between the \item entries. On 3/20/12 4:44 PM, Bastien b...@altern.org wrote: Hi Richard, Richard Stanton stan...@haas.berkeley.edu writes: To save space in LaTeX exports and also to stop my TODO items being numbered, I'd like to have TODO items as part of a list, e.g., - TODO Item 1 - TODO Item 2 However, while this prints OK, these entries are ignored by org-mode when I ask it to create a TODO list. Is there any way to do what I want? No, because you are mixing to different things: lists and TODO items. TODO items start with *. You can convert * TODO item 1 * TODO item 2 to a list by selecting the region they are in, then doing C-u C-c - You can convert a list to TODO items with C-u C-c * Best, -- Bastien
Re: [O] TODO items as part of an itemized list?
Richard Stanton stan...@haas.berkeley.edu wrote: Just one remaining problem, however. The exporter inserts a hard line-break, \\ after the first line of each of these \item entries. This is fine when there is additional text for that item, but if the TODO item is just one line, this results in unwanted extra white space being inserted between the \item entries. Yes - unfortunately it is hardwired (line 1321 of org-latex.el). AFAICT, there is no good reason for it to be included, even with additional text for the item: if one wants it, then adding one explicitly to the org file works (although the other exporters might not like that). BTW, the html exporter also adds a hardwired br/. Nick
Re: [O] [DEV] New git workflow
Hi Achim and Bastien, in case you fancy with the release-branch model now or in the foreseeable future, I'll probably be able to take over some of the work load in case it's a deciding factor. I've done that locally when necessary, and can claim enough git-foo. Cheers, Simon On 03/21/2012 10:01 AM, Achim Gratz wrote: Simon Thumsimon.t...@gmx.de writes: Whether multiple branches are involved depends mainly on what releases one intends to maintain. The nice thing in the model is the gradual maintenance: A really critical fix could see more backports than a nicety. Yes. Bastien has to make that decision since he's the one doing the maintenance. I like the goal maint is set to achieve, I'm just not convinced regular merges are a good way to ensure it - after all, merges include everything in a branch. If there are no doubts about that on your side, I'm fine. It was intended as a solution to the problem of either not getting bugfixes for the latest release or having to live on bleeding edge. It was too shortlived to judge if it had achieved that goal and how satisfied people were with it. Bastien is now trying a three-branch model since he also needs to maintain org within Emacs(*). As long as it works for him it will work for us, I'd think. (*) This should provide similar benefits to users as maint was supposed to, albeit it may not be obvious to users on how to follow that branch. Regards, Achim.
[O] [PATCH] Tags/properties matcher: Fixed issues with todo-only matches
Patch attached. Original problem was that org-map-entries for MYPROP2/! was not limiting itself to TODO entries, even though org-tags-view for the same matcher was. lisp/org.el (org-scan-tags): Require todo-only argument, and document that it should be the same one set by org-make-tags-matcher. Fix documentation to explain that todo-only is really not-done-todo-only. (org-make-tags-matcher): If todo part of matcher starts with /!, matcher now always checks that the TODO keyword is present and is a not-done state. This matters e.g. for org-map-entries which unlike org-scan-tags does not do its own separate todo-only filtering. Added docs to explain matcher dependencies. (org-map-entries): Make sure todo-only is correctly passed from org-make-tags-matcher to org-scan-tags. * lisp/org-clock.el: (org-clock-get-table-data): Make sure todo-only does not leak when it is set by make-org-tags-macher. * lisp/org-crypt.el: (org-encrypt-entries, org-decrypt-entries): Make sure todo-only is correctly passed from org-make-tags-matcher to org-scan-tags. * contrib/lisp/contacts.el: (org-contacts-filter) : Make sure todo-only is correctly passed from org-make-tags-matcher to org-scan-tags. From 3feb2edd3a705811824348546f4edad2f595f8bb Mon Sep 17 00:00:00 2001 From: Ilya Shlyakhter ilya_...@alum.mit.edu Date: Wed, 21 Mar 2012 19:49:07 -0400 Subject: [PATCH] Tags/properties matcher: Fixed issues with todo-only matches lisp/org.el (org-scan-tags): Require todo-only argument, and document that it should be the same one set by org-make-tags-matcher. Fix documentation to explain that todo-only is really not-done-todo-only. (org-make-tags-matcher): If todo part of matcher starts with /!, matcher now always checks that the TODO keyword is present and is a not-done state. This matters e.g. for org-map-entries which unlike org-scan-tags does not do its own separate todo-only filtering. Added docs to explain matcher dependencies. (org-map-entries): Make sure todo-only is correctly passed from org-make-tags-matcher to org-scan-tags. * lisp/org-clock.el: (org-clock-get-table-data): Make sure todo-only does not leak when it is set by make-org-tags-macher. * lisp/org-crypt.el: (org-encrypt-entries, org-decrypt-entries): Make sure todo-only is correctly passed from org-make-tags-matcher to org-scan-tags. * contrib/lisp/contacts.el: (org-contacts-filter) : Make sure todo-only is correctly passed from org-make-tags-matcher to org-scan-tags. --- contrib/lisp/org-contacts.el |6 -- lisp/org-clock.el|1 + lisp/org-crypt.el| 16 +-- lisp/org.el | 44 -- 4 files changed, 49 insertions(+), 18 deletions(-) diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el index bdd9996..b6d9e50 100644 --- a/contrib/lisp/org-contacts.el +++ b/contrib/lisp/org-contacts.el @@ -143,7 +143,8 @@ This overrides `org-email-link-description-format' if set. (defun org-contacts-filter (optional name-match tags-match) Search for a contact maching NAME-MATCH and TAGS-MATCH. If both match values are nil, return all contacts. - (let ((tags-matcher + (let* (todo-only + (tags-matcher (if tags-match (cdr (org-make-tags-matcher tags-match)) t)) @@ -161,7 +162,8 @@ If both match values are nil, return all contacts. (error File %s is no in `org-mode' file)) (org-scan-tags '(add-to-list 'markers (set-marker (make-marker) (point))) - `(and ,contacts-matcher ,tags-matcher ,name-matcher + `(and ,contacts-matcher ,tags-matcher ,name-matcher) +todo-only))) (dolist (marker markers result) (org-with-point-at marker (add-to-list 'result diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 46d9af8..5fca941 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2441,6 +2441,7 @@ TIME: The sum of all time spend in this tree, in minutes. This time (tags (plist-get params :tags)) (properties (plist-get params :properties)) (inherit-property-p (plist-get params :inherit-props)) +todo-only (matcher (if tags (cdr (org-make-tags-matcher tags cc range-text st p time level hdl props tsp tbl) diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index f60c61e..7e7ba30 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -237,16 +237,20 @@ See `org-crypt-disable-auto-save'. (defun org-encrypt-entries () Encrypt all top-level entries in the current buffer. (interactive) - (org-scan-tags - 'org-encrypt-entry - (cdr (org-make-tags-matcher org-crypt-tag-matcher + (let (todo-only) +(org-scan-tags + 'org-encrypt-entry + (cdr (org-make-tags-matcher org-crypt-tag-matcher)) + todo-only))) (defun org-decrypt-entries () Decrypt all entries in the current buffer. (interactive) - (org-scan-tags - 'org-decrypt-entry - (cdr
Re: [O] [PATCH] Tags/properties matcher: Fixed issues with todo-only matches
Ilya Shlyakhter ilya_...@alum.mit.edu writes: make-org-tags-macher Typo in the change log entries -Bernt
