From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mOvSITAzq2B7ggAAgWs5BA (envelope-from ) for ; Mon, 24 May 2021 07:01:36 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4FBwHTAzq2BWZgAAbx9fmQ (envelope-from ) for ; Mon, 24 May 2021 05:01:36 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BACC815895 for ; Mon, 24 May 2021 07:01:35 +0200 (CEST) Received: from localhost ([::1]:34068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ll2ic-0003EH-3Z for larch@yhetil.org; Mon, 24 May 2021 01:01:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ll2ey-000100-OV for emacs-orgmode@gnu.org; Mon, 24 May 2021 00:57:48 -0400 Received: from out2.migadu.com ([2001:41d0:2:aacc::]:37060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ll2eu-0005HI-28 for emacs-orgmode@gnu.org; Mon, 24 May 2021 00:57:48 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1621832257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=DBlgqeQNyVht8HJ1UryAIm3aN81iYVFhFXehlqh1znY=; b=Lxxn71GaLG1eCJUmX40UzymlzkUL993QnMS0RMZBsb8NXCBcviyr401e0CumpmRKipqO4F UgeF/Y3/W0BDTAFQ1QOdJbKOMhyHb13MYt6zfgdHRCI2qnc76GxM1ENcWV+sh09Wojno2d vGL4qUl4YP5QAEy5RNcEIOWn0t/eirHUs+/j7jb1HM4ldwdNoL82WtKO/nlqVuw5VAs9ZX X1vxvZn6sqQ5aQcZkZsu0DWNaidp5wxFHxtYOjkQSPGlHScQ0fSwghpyxV70O8ORxrB/KB FN75jKi93mjtDRCNeFYRRxxDr9bWqVW9prV4w+olK17gWvsxcE+2l+5riirh1g== From: Kyle Meyer To: emacs-orgmode@gnu.org Subject: [RFH] thoughts on porting an Emacs etc/schema/ change Date: Mon, 24 May 2021 00:57:36 -0400 Message-ID: <87o8d07mpr.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Auth-User: kyle@kyleam.com Received-SPF: pass client-ip=2001:41d0:2:aacc::; envelope-from=kyle@kyleam.com; helo=out2.migadu.com X-Spam_score_int: 10 X-Spam_score: 1.0 X-Spam_bar: + X-Spam_report: (1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HEXHASH_WORD=2.999, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Mark A. Hershberger" Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621832496; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=DBlgqeQNyVht8HJ1UryAIm3aN81iYVFhFXehlqh1znY=; b=na13tidbMCmGftr6ELuFPReCtYlWsUuvW/8ZZls/McbLTZosm1szyO2ff2E/5LI+wsmj11 lhTppJrkGlpSxOnViEoDGQ6VFfflgipLk/n1W+PdQu65MoMA4RZ/qC/nk5/i73hJ6E7by1 Lb3A1BrYudorZNCLVK6UJraIgo6ieAnDYzU8YeTDoyjXiDbkwTIvRF++H+J9ruiwIr6gOU f3IB7X0L7k82hr4iWDwQUJIpxWellUFy83BE2qIa/WT63nB5AM6YnzumfTQwhfR0BTeuhk WLB/kurGE7Y2t1ff6BwfqX+qDWcR2yGjxT0Z2fkkBEUjDpI5W3eC7tAL30CiyQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621832496; a=rsa-sha256; cv=none; b=Ujj7HyoyphX6suPXjBZAzRkbvTOV5e1asjQrT1KD0q6Ou/+ZR5ByJNjZDpEL4o2Ki0GB5+ 6BDhqYCEXeE0WD78Ng7a6lBblyiXz/FvGnWB3DwhwrL6bhudDeserw2mhMDhDrQZrzBNza EZL0zA19YOXiltZn3RRHfHJlAXkIjys6SrxSJDfH7FOFps8bE+AyXsc+CQjxrHUHC1arpJ vsOHteAYhqPwV7NNLf+JKDJu8J8AyafJSmSCAqzMs5yhNaGtLulRjuTlnXfK75TmkryYpy 1wui74zEwa0v5Hqpz7o1L8udjhX4dlZYYsZ6k8/RD0fm8ClIXnBgLHFbFgTtxQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kyleam.com header.s=key1 header.b=Lxxn71Ga; dmarc=none; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: 0.06 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kyleam.com header.s=key1 header.b=Lxxn71Ga; dmarc=none; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: BACC815895 X-Spam-Score: 0.06 X-Migadu-Scanner: scn1.migadu.com X-TUID: n22fZfZWWM+y I'm trying to figure out how to port changes to etc/schema/ files in the Emacs repo back to the Org repo. I'd appreciate feedback from anyone who knows anything about the etc/schema/ files in Org's tree and/or ox-odt. Background ========== Org has a few files in etc/schema: org$ git ls-files --stage etc/schema 100644 87f84d1ea87e1e0eef759fac1bd7db74ce0a704e 0 etc/schema/od-manifest-schema-v1.2-os.rnc 100644 8d679d62e4ef1a21707250cf4cabcd5b657d7683 0 etc/schema/od-schema-v1.2-os.rnc 100644 f1e0ed7856f24c58488bbeac1df922a7d5100776 0 etc/schema/schemas.xml Two of those are in Emacs's tree as is: emacs$ git ls-tree -r origin/emacs-27 -- etc/schema/ | grep od 100644 blob 87f84d1ea87e1e0eef759fac1bd7db74ce0a704e etc/schema/od-manifest-schema-v1.2-os.rnc 100644 blob 8d679d62e4ef1a21707250cf4cabcd5b657d7683 etc/schema/od-schema-v1.2-os.rnc The contents of Org's etc/schema/schemas.xml, on the other hand, are _added_ within Emacs's etc/schema/schemas.xml. org$ git show f1e0ed7856f24c58488bbeac1df922a7d5100776 emacs$ git show origin/emacs-27:etc/schema/schemas.xml | wc -l 65 emacs$ git show origin/emacs-27:etc/schema/schemas.xml | grep -i 'opendoc\|od-' Changes on the Emacs master branch ================================== A commit on Emacs's master branch (author cc'd) makes changes to these files. emacs $ git ls-tree -r master -- etc/schema/ | grep od 100644 blob 87f84d1ea87e1e0eef759fac1bd7db74ce0a704e etc/schema/od-manifest-schema-v1.2-os.rnc emacs$ git show --numstat --format=%B f1f351def3d84813d2c4b2174dfef07b01bec058 Update rnc to use Open Document's Relax-NG schema to version 1.3 * Use the LibreOffice Relax-NG files since they include a hack to support 1.2. * rng source: https://raw.githubusercontent.com/freedesktop/libreoffice-core/master/ schema/libreoffice/OpenDocument-schema-v1.3%2Blibreoffice.rng * translation to rnc with trang: trang -I rng -O rnc OpenDocument-schema-v1.3+libreoffice.rng \ OpenDocument-schema-v1.3+libreoffice.rnc 892 0 etc/schema/OpenDocument-schema-v1.3+libreoffice.rnc 5914 5780 etc/schema/{od-schema-v1.2-os.rnc => OpenDocument-schema-v1.3.rnc} 5 1 etc/schema/schemas.xml Here are the changes to schemas.xml: emacs$ git diff f1f351def3d84813d2c4b2174dfef07b01bec058^- etc/schema/schemas.xml diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml index 7fd91b8c72..f8acb0d40c 100644 --- a/etc/schema/schemas.xml +++ b/etc/schema/schemas.xml @@ -31,6 +31,10 @@ + + + + @@ -59,7 +63,7 @@ - + Porting to Org's tree ===================== So, coming back to the Org repo, I guess that'd be * delete the od-schema-v1.2-os.rnc file and add OpenDocument-schema-v1.3.rnc * update the typeID line for od-schema-v1.2-os.rnc in Org's etc/schema/schemas.xml to match the OpenDocument-schema-v1.3+libreoffice.rnc line in the diff above * add the namespace lines to Org's etc/schema/schemas.xml (?) But I know nothing about those files or ox-odt, so testing it on my end would mostly be fumbling around to see if I spot any breakage when exporting with ox-odt. Does the above approach look reasonable? Will it break ox-odt or be problematic for some other reason?