From mboxrd@z Thu Jan 1 00:00:00 1970 From: Qiang Fang Subject: Request on modification of org-element.el Date: Fri, 23 Nov 2018 08:51:23 +0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="0000000000008a5d98057b4a6250" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPzh3-0007Kg-AV for emacs-orgmode@gnu.org; Thu, 22 Nov 2018 19:51:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPzh2-0003rh-FX for emacs-orgmode@gnu.org; Thu, 22 Nov 2018 19:51:37 -0500 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]:39443) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gPzh2-0003of-9h for emacs-orgmode@gnu.org; Thu, 22 Nov 2018 19:51:36 -0500 Received: by mail-pf1-x42e.google.com with SMTP id c72so2561988pfc.6 for ; Thu, 22 Nov 2018 16:51:35 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org --0000000000008a5d98057b4a6250 Content-Type: text/plain; charset="UTF-8" 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))) --0000000000008a5d98057b4a6250 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello everyone,

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

d= iff --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-eleme= nt-affil
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (strike-through ,@standard-s= et)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (subscript ,@standard-set)
<= div>=C2=A0 =C2=A0 =C2=A0 =C2=A0 (superscript ,@standard-set)
++&l= t;<<<<<< HEAD
=C2=A0+=C2=A0 =C2=A0 =C2=A0 ;; Ig= nore inline babel call and inline source block as formulas
=C2=A0= +=C2=A0 =C2=A0 =C2=A0 ;; are possible.=C2=A0 Also ignore line breaks and st= atistics
=C2=A0+=C2=A0 =C2=A0 =C2=A0 ;; cookies.
=C2=A0= +=C2=A0 =C2=A0 =C2=A0 (table-cell bold code entity export-snippet footnote-= reference italic
=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 latex-fragment link macro radio-target strike-through
<= div>=C2=A0+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 subscrip= t superscript target timestamp underline verbatim)
++=3D=3D=3D=3D= =3D=3D=3D
+=C2=A0 =C2=A0 =C2=A0 =C2=A0;; Ignore inline babel call= and inline src block as formulas are
+=C2=A0 =C2=A0 =C2=A0 =C2= =A0;; possible.=C2=A0 Also ignore line breaks and statistics cookies.
=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0(table-cell ,@(append '(export-snippet= footnote-reference link macro
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 radio-target target timest= amp)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0minimal-set))
++>>>= ;>>>> origin/wip-cite
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (ta= ble-row table-cell)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (underline ,@stan= dard-set)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (verse-block ,@standard-set= )))

--0000000000008a5d98057b4a6250--