Request on modification of org-element.el

Request on modification of org-element.el

[Qiang Fang]

[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]

Hello everyone,

I am a user of kjambunathan's org-mode-ox-odt. The odt exporter needs some
changed in the upstream org mode. Can you please kindly review the request?
Thank you so much!

diff --cc lisp/org-element.el
index cdb574e17,f7498fbd1..000000000
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@@ -307,12 -322,11 +322,20 @@@ Don't modify it, set `org-element-affil
        (strike-through ,@standard-set)
        (subscript ,@standard-set)
        (superscript ,@standard-set)
++<<<<<<< HEAD
 +      ;; Ignore inline babel call and inline source block as formulas
 +      ;; are possible.  Also ignore line breaks and statistics
 +      ;; cookies.
 +      (table-cell bold code entity export-snippet footnote-reference
italic
 +                latex-fragment link macro radio-target strike-through
 +                subscript superscript target timestamp underline verbatim)
++=======
+       ;; Ignore inline babel call and inline src block as formulas are
+       ;; possible.  Also ignore line breaks and statistics cookies.
+       (table-cell ,@(append '(export-snippet footnote-reference link macro
+                                            radio-target target timestamp)
+                           minimal-set))
++>>>>>>> origin/wip-cite
        (table-row table-cell)
        (underline ,@standard-set)
        (verse-block ,@standard-set)))

[-- Attachment #2: Type: text/html, Size: 1908 bytes --]

Re: Request on modification of org-element.el

[Nicolas Goaziou]

Hello,

Qiang Fang <godblessfq@gmail.com> writes:

> I am a user of kjambunathan's org-mode-ox-odt. The odt exporter needs some
> changed in the upstream org mode. Can you please kindly review the
> request?

You need to pull again "wip-cite" branch. It was rebased against master
yesterday. So was "wip-cite-awe".

Regards,

-- 
Nicolas Goaziou

Re: Request on modification of org-element.el

[Qiang Fang]

[-- Attachment #1: Type: text/plain, Size: 1996 bytes --]

Hello Nicolas,
The complete diff is:

$ ~/src$ git clone https://code.orgmode.org/bzg/org-mode.git
$ cd org-mode
$ git merge origin/wip-cite

Auto-merging testing/lisp/test-org-element.el
Auto-merging lisp/org-element.el
CONFLICT (content): Merge conflict in lisp/org-element.el
Automatic merge failed; fix conflicts and then commit the result.

$ git diff
diff --cc lisp/org-element.el
index cdb574e17,f7498fbd1..000000000
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@@ -307,12 -322,11 +322,20 @@@ Don't modify it, set `org-element-affil
        (strike-through ,@standard-set)
        (subscript ,@standard-set)
        (superscript ,@standard-set)
++<<<<<<< HEAD
 +      ;; Ignore inline babel call and inline source block as formulas
 +      ;; are possible.  Also ignore line breaks and statistics
 +      ;; cookies.
 +      (table-cell bold code entity export-snippet footnote-reference italic
 +                latex-fragment link macro radio-target strike-through
 +                subscript superscript target timestamp underline verbatim)
++=======
+       ;; Ignore inline babel call and inline src block as formulas are
+       ;; possible.  Also ignore line breaks and statistics cookies.
+       (table-cell ,@(append '(export-snippet footnote-reference link macro
+                                            radio-target target timestamp)
+                           minimal-set))
++>>>>>>> origin/wip-cite
        (table-row table-cell)
        (underline ,@standard-set)
        (verse-block ,@standard-set)))



On Fri, Nov 23, 2018 at 2:32 PM Nicolas Goaziou <mail@nicolasgoaziou.fr>
wrote:

> Hello,
>
> Qiang Fang <godblessfq@gmail.com> writes:
>
> > I am a user of kjambunathan's org-mode-ox-odt. The odt exporter needs
> some
> > changed in the upstream org mode. Can you please kindly review the
> > request?
>
> You need to pull again "wip-cite" branch. It was rebased against master
> yesterday. So was "wip-cite-awe".
>
> Regards,
>
> --
> Nicolas Goaziou
>

[-- Attachment #2: Type: text/html, Size: 3221 bytes --]

Re: Request on modification of org-element.el

[Nicolas Goaziou]

Hello,

Qiang Fang <godblessfq@gmail.com> writes:

> Hello Nicolas,
> The complete diff is:
>
> $ ~/src$ git clone https://code.orgmode.org/bzg/org-mode.git
> $ cd org-mode
> $ git merge origin/wip-cite
>
> Auto-merging testing/lisp/test-org-element.el
> Auto-merging lisp/org-element.el
> CONFLICT (content): Merge conflict in lisp/org-element.el
> Automatic merge failed; fix conflicts and then commit the result.

As I said, I merged "wip-cite" with master two days ago, fixing merge
conflicts along the way. The command above poses no problem here.

Regards,

-- 
Nicolas Goaziou

Re: Request on modification of org-element.el

[Eric S Fraga]

On Friday, 23 Nov 2018 at 08:51, Qiang Fang wrote:
> Hello everyone,
>
> I am a user of kjambunathan's org-mode-ox-odt. The odt exporter needs some
> changed in the upstream org mode. Can you please kindly review the request?

Out of curiosity, what is the effect of this change specifically?  What
is minimal-set referenced in the code you suggest?  I cannot find any
such variable.

-- 
Eric S Fraga via Emacs 27.0.50, Org release_9.1.14-1035-gfeb442

Re: Request on modification of org-element.el

[Qiang Fang]

[-- Attachment #1: Type: text/plain, Size: 1652 bytes --]

It's in the "wip-cite" branch. And you can try kjambunathan's odt exporter
with the following setting.

The ODT and JabRef exporters can now be with Emacs Package Mananger's M-x
list-packages. The package is available at
https://raw.githubusercontent.com/kjambunathan/org-mode-ox-odt/master/elpa/.
See below for a typical configuration.

(custom-set-variables
 '(package-archives
   (quote
    (("gnu" . "https://elpa.gnu.org/packages/")
     ("ox-odt" .
"https://raw.githubusercontent.com/kjambunathan/org-mode-ox-odt/master/elpa/")))))

When you install ox-odt from the above archive, it will upgrade your Org to
9.1.14, if needed. Once you have installed the ox-odt package and restart
your Emacs. Run M-x locate-library RET org and M-x locate-library RET ox-odt
 and ensure that you see something along the following lines.

Library is file ~/.emacs.d/elpa/org-9.1.14/org.elc
Library is file ~/.emacs.d/elpa/ox-odt-9.1.14.145/ox-odt.elc

After you export an Org file to ODT, look at your *Messages* buffer and
ensure that the ODT exporter *uses` style and schema files from the ELPA
package.


On Fri, Nov 23, 2018 at 2:42 PM Eric S Fraga <esflists@gmail.com> wrote:

> On Friday, 23 Nov 2018 at 08:51, Qiang Fang wrote:
> > Hello everyone,
> >
> > I am a user of kjambunathan's org-mode-ox-odt. The odt exporter needs
> some
> > changed in the upstream org mode. Can you please kindly review the
> request?
>
> Out of curiosity, what is the effect of this change specifically?  What
> is minimal-set referenced in the code you suggest?  I cannot find any
> such variable.
>
> --
> Eric S Fraga via Emacs 27.0.50, Org release_9.1.14-1035-gfeb442
>

[-- Attachment #2: Type: text/html, Size: 7543 bytes --]