bug#42851: 27.1; nXML schema-locating file

bug#42851: 27.1; nXML schema-locating file

[Ladislav Lhotka]

In Git commit 165f738382 (Update Org to 9.3), the nXML schema-locating
file etc/schema/schemas.xml got rewritten to the version that is in Org
distribution and contains only two OpenDocument schemas. This means that
all other RELAX NG schemas in etc/schema (such as xslt.rnc) cannot be
directly used.

Thanks, Ladislav

-- 
Ladislav Lhotka
Head, CZ.NIC Labs
PGP Key ID: 0xB8F92B08A9F76C67

bug#42851: 27.1; nXML schema-locating file

[Stefan Kangas]

tags 42851 + confirmed
thanks

Ladislav Lhotka <ladislav.lhotka@nic.cz> writes:

> In Git commit 165f738382 (Update Org to 9.3), the nXML schema-locating
> file etc/schema/schemas.xml got rewritten to the version that is in Org
> distribution and contains only two OpenDocument schemas. This means that
> all other RELAX NG schemas in etc/schema (such as xslt.rnc) cannot be
> directly used.

Indeed, that looks like a mistake that should be reverted.

Besides deletions of lines, the only thing I see added to schemas.xml in
commit 165f738382 is this line:

+<?xml version="1.0"?>

The rest I think should obviously be reverted, but should that line be
kept?  Bastien, do you have any comments?

Best regards,
Stefan Kangas

bug#42851: 27.1; nXML schema-locating file

[Stefan Kangas]

Stefan Kangas <stefankangas@gmail.com> writes:

> Ladislav Lhotka <ladislav.lhotka@nic.cz> writes:
>
>> In Git commit 165f738382 (Update Org to 9.3), the nXML schema-locating
>> file etc/schema/schemas.xml got rewritten to the version that is in Org
>> distribution and contains only two OpenDocument schemas. This means that
>> all other RELAX NG schemas in etc/schema (such as xslt.rnc) cannot be
>> directly used.
>
> Indeed, that looks like a mistake that should be reverted.
>
> Besides deletions of lines, the only thing I see added to schemas.xml in
> commit 165f738382 is this line:
>
> +<?xml version="1.0"?>
>
> The rest I think should obviously be reverted, but should that line be
> kept?  Bastien, do you have any comments?

Bastien, could you please take a look at this when you find some time?

Thanks in advance.

bug#42851: 27.1; nXML schema-locating file

[Bastien]

Hi Stefan,

Stefan Kangas <stefan@marxist.se> writes:

> Bastien, could you please take a look at this when you find some
> time?

I will, thanks for the heads up.  

Don't hold your breath though, I can hear some hard deadlines flying
over my head already.

-- 
 Bastien

bug#42851: 27.1; nXML schema-locating file

[Stefan Kangas]

Bastien <bzg@gnu.org> writes:

> > Bastien, could you please take a look at this when you find some
> > time?
>
> I will, thanks for the heads up.
>
> Don't hold your breath though, I can hear some hard deadlines flying
> over my head already.

Thanks!  It would be great to get this sorted before Emacs 27.2.

bug#42851: 27.1; nXML schema-locating file

[Bastien]

Stefan Kangas <stefan@marxist.se> writes:

> Thanks!  It would be great to get this sorted before Emacs 27.2.

Do you have a tentative date for Emacs 27.2?

-- 
 Bastien

bug#42851: 27.1; nXML schema-locating file

[Stefan Kangas]

Bastien <bzg@gnu.org> writes:

> > Thanks!  It would be great to get this sorted before Emacs 27.2.
>
> Do you have a tentative date for Emacs 27.2?

I'm hoping our maintainers will chime in, but based on past release
dates I'd guess a couple of months at least.  Perhaps not until early
next year?

bug#42851: 27.1; nXML schema-locating file

[Bastien]

Stefan Kangas <stefan@marxist.se> writes:

> Bastien <bzg@gnu.org> writes:
>
>> > Thanks!  It would be great to get this sorted before Emacs 27.2.
>>
>> Do you have a tentative date for Emacs 27.2?
>
> I'm hoping our maintainers will chime in, but based on past release
> dates I'd guess a couple of months at least.  Perhaps not until early
> next year?

Thanks.  I'm hoping of going down to the bottom of my Org todo list by
the end of the year, so that should be okay.

-- 
 Bastien

bug#42851: 27.1; nXML schema-locating file

[Ladislav Lhotka]

Bastien <bzg@gnu.org> writes:

> Stefan Kangas <stefan@marxist.se> writes:
>
>> Bastien <bzg@gnu.org> writes:
>>
>>> > Thanks!  It would be great to get this sorted before Emacs 27.2.
>>>
>>> Do you have a tentative date for Emacs 27.2?
>>
>> I'm hoping our maintainers will chime in, but based on past release
>> dates I'd guess a couple of months at least.  Perhaps not until early
>> next year?
>
> Thanks.  I'm hoping of going down to the bottom of my Org todo list by
> the end of the year, so that should be okay.

This bug is clearly a regression, so it shouldn't be too difficult to revert the offending change.

Thanks, Ladislav

>
> -- 
>  Bastien

-- 
Ladislav Lhotka 
Head, CZ.NIC Labs
PGP Key ID: 0xB8F92B08A9F76C67

bug#42851: 27.1; nXML schema-locating file

[Bastien]

Hi,

Ladislav Lhotka <ladislav.lhotka@nic.cz> writes:

> This bug is clearly a regression, so it shouldn't be too difficult
> to revert the offending change.

Can you look for the offending change?

-- 
 Bastien

bug#42851: 27.1; nXML schema-locating file

[Stefan Kangas]

Bastien <bzg@gnu.org> writes:

> Can you look for the offending change?

This should work in the Emacs repository:

git diff 165f73838^..165f73838 etc/schema/schemas.xml

But I'm not sure what changed in org-mode.

bug#42851: 27.1; nXML schema-locating file

[Ladislav Lhotka]

Stefan Kangas <stefan@marxist.se> writes:

> Bastien <bzg@gnu.org> writes:
>
>> Can you look for the offending change?
>
> This should work in the Emacs repository:
>
> git diff 165f73838^..165f73838 etc/schema/schemas.xml
>
> But I'm not sure what changed in org-mode.

I believe Org mode has always had that trimmed-down schemas.xml that only covers their needs.

Ladislav

-- 
Ladislav Lhotka 
Head, CZ.NIC Labs
PGP Key ID: 0xB8F92B08A9F76C67

bug#42851: [PATCH] Recover etc/schema/schemas.xml

[Yasuhiro KIMURA]

In commit 165f738382 most lines of this file were removed. It is
obvious regression. So recover them now.

While I'm here, update copyright year to 2020.
---
 etc/schema/schemas.xml | 58 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
index f1e0ed7856..40175b056b 100644
--- a/etc/schema/schemas.xml
+++ b/etc/schema/schemas.xml
@@ -1,7 +1,65 @@
 <?xml version="1.0"?>
+<!-- Copyright (C) 2003-2004, 2007-2020 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>. -->
+
 <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
+  <transformURI fromPattern="*.xml" toPattern="*.rnc"/>
+
+  <uri pattern="*.xsl" typeId="XSLT"/>
+  <uri pattern="*.html" typeId="XHTML"/>
+  <uri pattern="*.rng" typeId="RELAX NG"/>
+  <uri pattern="*.rdf" typeId="RDF"/>
+  <uri pattern="*.dbk" typeId="DocBook"/>
+
+  <namespace ns="http://www.w3.org/1999/XSL/Transform" typeId="XSLT"/>
+  <namespace ns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" typeId="RDF"/>
+  <namespace ns="http://www.w3.org/1999/xhtml" typeId="XHTML"/>
+  <namespace ns="http://relaxng.org/ns/structure/1.0" typeId="RELAX NG"/>
+  <namespace ns="http://thaiopensource.com/ns/locating-rules/1.0"
+	     uri="locate.rnc"/>
+
+  <documentElement localName="stylesheet" typeId="XSLT"/>
+  <documentElement prefix="xsl" localName="transform" typeId="XSLT"/>
+
+  <documentElement localName="html" typeId="XHTML"/>
+
+  <documentElement localName="grammar" typeId="RELAX NG"/>
+
+  <documentElement prefix="" localName="article" typeId="DocBook"/>
+  <documentElement prefix="" localName="book" typeId="DocBook"/>
+  <documentElement prefix="" localName="chapter" typeId="DocBook"/>
+  <documentElement prefix="" localName="part" typeId="DocBook"/>
+  <documentElement prefix="" localName="refentry" typeId="DocBook"/>
+  <documentElement prefix="" localName="section" typeId="DocBook"/>
+
+  <documentElement localName="RDF" typeId="RDF"/>
+  <documentElement prefix="rdf" typeId="RDF"/>
+
+  <documentElement localName="locatingRules" uri="locate.rnc"/>
+
+  <typeId id="XSLT" uri="xslt.rnc"/>
+  <typeId id="RELAX NG" uri="relaxng.rnc"/>
+  <typeId id="XHTML" uri="xhtml.rnc"/>
+  <typeId id="DocBook" uri="docbook.rnc"/>
+  <typeId id="RDF" uri="rdfxml.rnc"/>
+
   <documentElement prefix="office" typeId="OpenDocument"/>
   <documentElement prefix="manifest" localName="manifest" typeId="OpenDocument Manifest"/>
   <typeId id="OpenDocument" uri="od-schema-v1.2-os.rnc"/>
   <typeId id="OpenDocument Manifest" uri="od-manifest-schema-v1.2-os.rnc"/>
+
 </locatingRules>
-- 
2.29.2

bug#42851: [PATCH] Recover etc/schema/schemas.xml

[Lars Ingebrigtsen]

Yasuhiro KIMURA <yasu@utahime.org> writes:

> In commit 165f738382 most lines of this file were removed. It is
> obvious regression. So recover them now.

Thanks; applied to Emacs 28.

Since this was a (partial) reversion of a commit, doing it without a
copyright assignment should be fine, I think.

This change was small enough to apply without assigning copyright to the
FSF, but for future patches you want to submit, it might make sense to
get the paperwork started now, so that subsequent patches can be applied
speedily. Would you be willing to sign such paperwork?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#42851: [PATCH] Recover etc/schema/schemas.xml

[Stefan Kangas]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Yasuhiro KIMURA <yasu@utahime.org> writes:
>
>> In commit 165f738382 most lines of this file were removed. It is
>> obvious regression. So recover them now.
>
> Thanks; applied to Emacs 28.

I think this should go to emacs-27.  It's a clear regression from 26.3.

bug#42851: [PATCH] Recover etc/schema/schemas.xml

[Lars Ingebrigtsen]

Stefan Kangas <stefankangas@gmail.com> writes:

> I think this should go to emacs-27.  It's a clear regression from 26.3.

OK; cherry-picked and pushed.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#42851: [PATCH] Recover etc/schema/schemas.xml

[Stefan Kangas]

reopen 42851
close 42851 27.2
thanks

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Stefan Kangas <stefankangas@gmail.com> writes:
>
>> I think this should go to emacs-27.  It's a clear regression from 26.3.
>
> OK; cherry-picked and pushed.

Thanks.

I'm reopening to close this against 27.2, just in case anyone is paying
attention to that.