From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jambunathan K Newsgroups: gmane.emacs.devel Subject: Re: Merging Org 7.8.02 before Emacs 24.1 Date: Sat, 24 Dec 2011 13:01:50 +0530 Message-ID: <81pqfemnmh.fsf@gmail.com> References: <877h1ncs1u.fsf@altern.org> <81wr9mr40d.fsf@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1324711931 19971 80.91.229.12 (24 Dec 2011 07:32:11 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 24 Dec 2011 07:32:11 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 24 08:32:07 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ReM5P-0004LK-8X for ged-emacs-devel@m.gmane.org; Sat, 24 Dec 2011 08:32:07 +0100 Original-Received: from localhost ([::1]:47309 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ReM5O-0003h6-Oq for ged-emacs-devel@m.gmane.org; Sat, 24 Dec 2011 02:32:06 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:35283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ReM5L-0003go-Ls for emacs-devel@gnu.org; Sat, 24 Dec 2011 02:32:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ReM5K-0005wl-8S for emacs-devel@gnu.org; Sat, 24 Dec 2011 02:32:03 -0500 Original-Received: from mail-iy0-f169.google.com ([209.85.210.169]:39808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ReM5K-0005wf-4R for emacs-devel@gnu.org; Sat, 24 Dec 2011 02:32:02 -0500 Original-Received: by iacb35 with SMTP id b35so17114177iac.0 for ; Fri, 23 Dec 2011 23:32:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=ncgznO5JXGvWSU/d0+eNbVq/xjGEW0Lmt2XDFB6vN9w=; b=Y06RFlN/B9nbSAW5+wdNYjqE8rkMobUoa4XkSyloY5ttMwiwm9NfeiId2XzWsLGyc5 2xOakQyfYt5cj+kaVArVIB3C1Vq5lqJkp2TkE1txzMw1oS8Zk+6DEw1EeT1BoQwhvsC2 3+t/8PSVxN8xfbHUiM5zZTflFNPdbgUzKpH70= Original-Received: by 10.50.168.70 with SMTP id zu6mr5957353igb.13.1324711921113; Fri, 23 Dec 2011 23:32:01 -0800 (PST) Original-Received: from JAMBU-NETBOOK ([115.241.40.183]) by mx.google.com with ESMTPS id h9sm50058734ibh.11.2011.12.23.23.31.57 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Dec 2011 23:32:00 -0800 (PST) In-Reply-To: <81wr9mr40d.fsf@gmail.com> (Jambunathan K.'s message of "Sat, 24 Dec 2011 09:54:18 +0530") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (windows-nt) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:146953 Archived-At: Jambunathan K writes: > Bastien > >> Org 7.8.02 comes with two major changes, both worth the merge to happen >> before the 24.1 release. >> >> 1. New ODT exporter: Jambunathan has been working very hard on this. I >> didn't merge his work into Org 7.7 because I wanted to clear up some >> copyright issues that took long to understand and to sort out. This >> is now okay, and not having this exporter in 24.1 would be a major >> frustration for Jambunathan, me and many others. > > Where will the odt styles files go? It will definitely go under etc/ > hierarchy but where exactly? I propose that under the Emacs system hierarchy, these files go under etc/org/. With this, the above files will have the following names. (i) etc/org/OrgOdtStyles.xml (ii) etc/org/OrgOdtContentTemplate.xml If some other location is chosen, the following var has to be updated suitably in the bzr repo. Otherwise org-odt will refuse to load. Please see the following commit in Org's repo. ,---- | commit f237ef8b3766c7fcf4213d8c334ef403ede1c6e5 | Author: Jambunathan K | Date: Sat Dec 24 11:33:54 2011 +0530 | | org-odt.el (org-odt-styles-dir): It is etc/org/ under vanilla Emacs | | * org-odt.el (org-odt-styles-dir): Assume that the styles | files are located under `data-directory' of Emacs distribution | as etc/org/OrgOdtStyles.xml and | etc/org/OrgOdtContentTemplate.xml. Also update docstring. | (org-export-odt-schema-dir): Update docstring. `---- > Jambunathan K. > > --