From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Kim Subject: patch for HTML links to GNU documents Date: Sun, 27 Mar 2016 15:55:10 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a1137389e376f31052f0fb071 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akJaT-0005bq-23 for emacs-orgmode@gnu.org; Sun, 27 Mar 2016 18:55:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akJaR-0002zw-QC for emacs-orgmode@gnu.org; Sun, 27 Mar 2016 18:55:12 -0400 Received: from mail-qg0-x230.google.com ([2607:f8b0:400d:c04::230]:34552) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akJaR-0002zs-KH for emacs-orgmode@gnu.org; Sun, 27 Mar 2016 18:55:11 -0400 Received: by mail-qg0-x230.google.com with SMTP id c67so63173062qgc.1 for ; Sun, 27 Mar 2016 15:55:11 -0700 (PDT) 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Org-Mode mailing list --001a1137389e376f31052f0fb071 Content-Type: multipart/alternative; boundary=001a1137389e376f2a052f0fb06f --001a1137389e376f2a052f0fb06f Content-Type: text/plain; charset=UTF-8 Attached patch affects how 'info' links in org mode are converted to HTML links. Today info links such as [[info:emacs#List Buffers]] are converted to this HTML link: emacs#List Buffers With the patch applied, the HTML link generated would be emacs#List Buffers The general idea is that couple of list variables describe how to map info file names to URLs so that those URL's would be used if available. One motivation for this patch is to make it easy for elisp package authors to to create links to wonderful emacs documents, because writing an org info-link to emacs manual in org files is trivial once you know the info node name. --001a1137389e376f2a052f0fb06f Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Attached patch affects how 'info' links in or= g mode are converted to HTML
links.=C2=A0 Today info links such a= s

=C2=A0 =C2=A0 [[info:emacs#List Buffers]]
<= div>
are converted to this HTML link:

=C2=A0 =C2=A0 <a href=3D"emacs.html#List-Buffers">emacs#L= ist Buffers</a>

With the patch applied, the = HTML link generated would be

=C2=A0 =C2=A0 <a h= ref=3D"http://www.gnu.org/software/emacs/manual/html_mono/= emacs.html#List-Buffers">emacs#List Buffers</a>

The general idea is that couple of list variables describe = how to map
info file names to URLs so that those URL's would = be used if available.

One motivation for this patc= h is to make it easy for elisp package
authors to to create links= to wonderful emacs documents, because writing
an org info-link t= o emacs manual in org files is trivial once you know
the info nod= e name.

--001a1137389e376f2a052f0fb06f-- --001a1137389e376f31052f0fb071 Content-Type: text/x-patch; charset=US-ASCII; name="0001-org-info.el-generate-HTML-links-to-gnu.org.patch" Content-Disposition: attachment; filename="0001-org-info.el-generate-HTML-links-to-gnu.org.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_imb5yk6k0 RnJvbSBmMGE4YTdkMTJkOTBkMjE5Y2Q0ZDhmNGQzZDliYzU4MGUwMmMyNTVhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNoYXJkIEtpbSA8ZW1hY3MxOEBnbWFpbC5jb20+CkRhdGU6 IFRodSwgMTAgTWFyIDIwMTYgMDY6Mjk6NDggLTA4MDAKU3ViamVjdDogW1BBVENIXSBvcmctaW5m by5lbDogZ2VuZXJhdGUgSFRNTCBsaW5rcyB0byBnbnUub3JnCgoqIGxpc3Avb3JnLWluZm8uZWwg KG9yZy1pbmZvLWV4cG9ydCk6IENvbnZlcnQgaW5mbyBsaW5rcyB0byBIVE1MIFVSTCdzCnRoYXQg cG9pbnQgdG8gYXBwcm9wcmlhdGUgZ251Lm9yZyBvciBvdGhlciBwYWdlcy4gIFVzZXIncyBjYW4g Y3VzdG9taXplCnRoZSBiZWhhdmlvciB1c2luZyBgb3JnLWluZm8tZW1hY3MtZG9jdW1lbnRzJyBh bmQKYG9yZy1pbmZvLW90aGVyLWRvY3VtZXRzJyBuZXcgdmFyaWFibGVzLgoKVElOWUNIQU5HRQot LS0KIGxpc3Avb3JnLWluZm8uZWwgfCAzNSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KystLQogMSBmaWxlIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvbGlzcC9vcmctaW5mby5lbCBiL2xpc3Avb3JnLWluZm8uZWwKaW5kZXggMjcw YzE5Zi4uZTdmZjllZCAxMDA2NDQKLS0tIGEvbGlzcC9vcmctaW5mby5lbAorKysgYi9saXNwL29y Zy1pbmZvLmVsCkBAIC04MSw2ICs4MSwzNyBAQAogCQkJCSAgICBub2RlbmFtZS1vci1pbmRleCkp KSkpCiAgICAgKHVzZXItZXJyb3IgIkNvdWxkIG5vdCBvcGVuOiAlcyIgbmFtZSkpKQogCisoZGVm dmFyIG9yZy1pbmZvLWVtYWNzLWRvY3VtZW50cworICAnKCJhZGEtbW9kZSIgImF1dGgiICJhdXRv dHlwZSIgImJvdmluZSIgImNhbGMiICJjY21vZGUiICJjbCIgImRidXMiICJkaXJlZC14IgorICAg ICJlYnJvd3NlIiAiZWRlIiAiZWRpZmYiICJlZHQiICJlZmFxLXczMiIgImVmYXEiICJlaWVpbyIg ImVpbnRyIiAiZWxpc3AiCisgICAgImVtYWNzLWdudXRscyIgImVtYWNzLW1pbWUiICJlbWFjcyIg ImVwYSIgImVyYyIgImVydCIgImVzaGVsbCIgImV1ZGMiICJld3ciCisgICAgImZseW1ha2UiICJm b3JtcyIgImdudXMiICJodG1sZm9udGlmeSIgImlkbHdhdmUiICJpZG8iICJpbmZvIiAibWFpcml4 LWVsIgorICAgICJtZXNzYWdlIiAibWgtZSIgIm5ld3N0aWNrZXIiICJueG1sLW1vZGUiICJvY3Rh dmUtbW9kZSIgIm9yZyIgInBjbC1jdnMiCisgICAgInBnZyIgInJjaXJjIiAicmVmdGV4IiAicmVt ZW1iZXIiICJzYXNsIiAic2MiICJzZW1hbnRpYyIgInNlcyIgInNpZXZlIgorICAgICJzbXRwbWFp bCIgInNwZWVkYmFyIiAic3JlY29kZSIgInRvZG8tbW9kZSIgInRyYW1wIiAidXJsIiAidmlwIiAi dmlwZXIiCisgICAgIndpZGdldCIgIndpc2VudCIgIndvbWFuIikKKyAgIkxpc3Qgb2YgZW1hY3Mg ZG9jdW1lbnRzIGF2YWlsYWJsZSBhdCB0aGUgb2ZmaWNpYWwgVVJMCis8aHR0cDovL3d3dy5nbnUu b3JnL3NvZnR3YXJlL2VtYWNzL21hbnVhbC9odG1sX21vbm8vLj4iKQorCisoZGVmdmFyIG9yZy1p bmZvLW90aGVyLWRvY3VtZW50cworICAnKCgiZ2NjIiAgLiAiaHR0cHM6Ly9nY2MuZ251Lm9yZy9v bmxpbmVkb2NzL2djYy01LjMuMC9nY2MvaW5kZXguaHRtbCIpCisgICAgKCJsaWJjIiAuICJodHRw Oi8vd3d3LmdudS5vcmcvc29mdHdhcmUvbGliYy9tYW51YWwvaHRtbF9tb25vL2xpYmMuaHRtbCIp CisgICAgKCJtYWtlIiAuICJodHRwOi8vd3d3LmdudS5vcmcvc29mdHdhcmUvbWFrZS9tYW51YWwv aW5kZXguaHRtbCIpKQorICAiQWxpc3Qgb2YgZG9jdW1lbnRzIGdlbmVyYXRlZCBmcm9tIHRleGlu Zm8gc291cmNlLgorCitXaGVuIGNvbnZlcnRpbmcgaW5mbyBsaW5rcyB0byBodG1sLCBsaW5rcyB0 byBhbnkgb25lIG9mIHRoZXNlIG1hbnVhbHMKK2FyZSBjb252ZXJ0ZWQgdG8gcG9pbnQgdG8gdGhl c2UgbGlua3MuIikKKworKGRlZnVuIG9yZy1pbmZvLW1hcC1odG1sLXVybCAoZmlsZW5hbWUpCisg ICJHaXZlbiBpbmZvIEZJTEVOQU1FLCBlaXRoZXIgcmV0dXJuIGl0IG9yIGNvbnZlcnQgaXQgdG8g VVJMIHBvaW50aW5nCit0byB0aGUgb2ZmaWNpYWwgcGFnZSBvbiBpbnRlcm5ldCwgZS5nLiwgdXNl IGdudS5vcmcgZm9yIGFsbCBlbWFjcyByZWxhdGVkIGRvY3VtZW50cy4KK1NlZSBgb3JnLWluZm8t b2ZmaWNpYWwtZ251LWRvY3VtZW50JyBhbmQgYG9yZy1pbmZvLW90aGVyLWRvY3VtZW50cycgZm9y IGRldGFpbHMuIgorICAoaWYgKG1lbWJlciBmaWxlbmFtZSBvcmctaW5mby1lbWFjcy1kb2N1bWVu dHMpCisgICAgICAoZm9ybWF0ICJodHRwOi8vd3d3LmdudS5vcmcvc29mdHdhcmUvZW1hY3MvbWFu dWFsL2h0bWxfbW9uby8lcy5odG1sIgorICAgICAgICAgICAgICBmaWxlbmFtZSkKKyAgICAobGV0 ICgodXJsIChjZHIgKGFzc29jIGZpbGVuYW1lIG9yZy1pbmZvLW90aGVyLWRvY3VtZW50cykpKSkK KyAgICAgIChvciB1cmwgKGNvbmNhdCBmaWxlbmFtZSAiLmh0bWwiKSkpKSkKKwogKGRlZnVuIG9y Zy1pbmZvLWV4cG9ydCAocGF0aCBkZXNjIGZvcm1hdCkKICAgIkV4cG9ydCBhbiBpbmZvIGxpbmsu CiBTZWUgYG9yZy1hZGQtbGluay10eXBlJyBmb3IgZGV0YWlscyBhYm91dCBQQVRILCBERVNDIGFu ZCBGT1JNQVQuIgpAQCAtODksOCArMTIwLDggQEAgU2VlIGBvcmctYWRkLWxpbmstdHlwZScgZm9y IGRldGFpbHMgYWJvdXQgUEFUSCwgREVTQyBhbmQgRk9STUFULiIKIAkoc3RyaW5nLW1hdGNoICJc XCguKlxcKSIgcGF0aCkpCiAgICAgKGxldCAoKGZpbGVuYW1lIChtYXRjaC1zdHJpbmcgMSBwYXRo KSkKIAkgIChub2RlIChvciAobWF0Y2gtc3RyaW5nIDIgcGF0aCkgIlRvcCIpKSkKLSAgICAgIChm b3JtYXQgIjxhIGhyZWY9XCIlcy5odG1sIyVzXCI+JXM8L2E+IgotCSAgICAgIGZpbGVuYW1lCisg ICAgICAoZm9ybWF0ICI8YSBocmVmPVwiJXMjJXNcIj4lczwvYT4iCisJICAgICAgKG9yZy1pbmZv LW1hcC1odG1sLXVybCBmaWxlbmFtZSkKIAkgICAgICAocmVwbGFjZS1yZWdleHAtaW4tc3RyaW5n ICIgIiAiLSIgbm9kZSkKIAkgICAgICAob3IgZGVzYyBwYXRoKSkpKSkKIAotLSAKMi41LjAKCg== --001a1137389e376f31052f0fb071-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcin Borkowski Subject: Re: patch for HTML links to GNU documents Date: Mon, 28 Mar 2016 06:25:11 +0200 Message-ID: <87d1qfb55k.fsf@mbork.pl> References: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akOk0-0008PH-PJ for emacs-orgmode@gnu.org; Mon, 28 Mar 2016 00:25:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akOjx-0005Tx-GG for emacs-orgmode@gnu.org; Mon, 28 Mar 2016 00:25:24 -0400 Received: from mail.mojserwer.eu ([2a01:5e00:2:52::8]:59362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akOjx-0005Tr-8L for emacs-orgmode@gnu.org; Mon, 28 Mar 2016 00:25:21 -0400 In-reply-to: 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Richard Kim Cc: Org-Mode mailing list On 2016-03-28, at 00:55, Richard Kim wrote: > Attached patch affects how 'info' links in org mode are converted to HTML > links. Today info links such as > > [[info:emacs#List Buffers]] > > are converted to this HTML link: > > emacs#List Buffers > > With the patch applied, the HTML link generated would be > > emacs#List > Buffers > > The general idea is that couple of list variables describe how to map > info file names to URLs so that those URL's would be used if available. > > One motivation for this patch is to make it easy for elisp package > authors to to create links to wonderful emacs documents, because writing > an org info-link to emacs manual in org files is trivial once you know > the info node name. That looks great; if it's accepted, I /immediatelly/ fetch the bleeding-edge Org and start using it!!! My use case is writing blog posts about Emacs using Org. Thanks, -- Marcin Borkowski http://octd.wmi.amu.edu.pl/en/Marcin_Borkowski Faculty of Mathematics and Computer Science Adam Mickiewicz University From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: Re: patch for HTML links to GNU documents Date: Mon, 28 Mar 2016 10:59:28 +0200 Message-ID: <871t6vrn9r.fsf@nicolasgoaziou.fr> References: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akSzF-00061X-Dd for emacs-orgmode@gnu.org; Mon, 28 Mar 2016 04:57:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akSzC-0004e7-7I for emacs-orgmode@gnu.org; Mon, 28 Mar 2016 04:57:25 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:48958) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akSzC-0004dw-0D for emacs-orgmode@gnu.org; Mon, 28 Mar 2016 04:57:22 -0400 In-Reply-To: (Richard Kim's message of "Sun, 27 Mar 2016 15:55:10 -0700") 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Richard Kim Cc: Org-Mode mailing list Hello, Richard Kim writes: > Attached patch affects how 'info' links in org mode are converted to HTML > links. Today info links such as > > [[info:emacs#List Buffers]] > > are converted to this HTML link: > > emacs#List Buffers > > With the patch applied, the HTML link generated would be > > emacs#List > Buffers Thank you. Some comments follow. > +(defvar org-info-emacs-documents I suggest to use `defconst' instead, since you're not modifying or let-binding the variable whatsoever. > + '("ada-mode" "auth" "autotype" "bovine" "calc" "ccmode" "cl" "dbus" "dired-x" > + "ebrowse" "ede" "ediff" "edt" "efaq-w32" "efaq" "eieio" "eintr" "elisp" > + "emacs-gnutls" "emacs-mime" "emacs" "epa" "erc" "ert" "eshell" "eudc" "eww" > + "flymake" "forms" "gnus" "htmlfontify" "idlwave" "ido" "info" "mairix-el" > + "message" "mh-e" "newsticker" "nxml-mode" "octave-mode" "org" "pcl-cvs" > + "pgg" "rcirc" "reftex" "remember" "sasl" "sc" "semantic" "ses" "sieve" > + "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper" > + "widget" "wisent" "woman") > + "List of emacs documents available at the official URL > +") The first sentence in the docstring is expected to be on a single line, e.g. "List of emacs documents available. Taken from " > +(defvar org-info-other-documents `defconst' Could you also write an entry about it in ORG-NEWS? Regards, -- Nicolas Goaziou From mboxrd@z Thu Jan 1 00:00:00 1970 From: emacs18@gmail.com (Richard Y. Kim) Subject: Re: patch for HTML links to GNU documents Date: Mon, 28 Mar 2016 22:24:41 -0700 Message-ID: References: <871t6vrn9r.fsf@nicolasgoaziou.fr> Reply-To: emacs18@gmail.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akmEH-000318-2g for emacs-orgmode@gnu.org; Tue, 29 Mar 2016 01:30:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1akmEC-00032X-15 for emacs-orgmode@gnu.org; Tue, 29 Mar 2016 01:30:13 -0400 Received: from plane.gmane.org ([80.91.229.3]:37080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1akmEB-00031Q-Mk for emacs-orgmode@gnu.org; Tue, 29 Mar 2016 01:30:07 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1akmE8-0001Kg-T9 for emacs-orgmode@gnu.org; Tue, 29 Mar 2016 07:30:05 +0200 Received: from us03-fw-02-hide.synopsys.com ([149.117.7.28]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 29 Mar 2016 07:30:04 +0200 Received: from emacs18 by us03-fw-02-hide.synopsys.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 29 Mar 2016 07:30:04 +0200 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Nicolas Goaziou writes: > Hello, > > Richard Kim writes: > >> Attached patch affects how 'info' links in org mode are converted to HTML >> links. Today info links such as >> >> [[info:emacs#List Buffers]] >> >> are converted to this HTML link: >> >> emacs#List Buffers >> >> With the patch applied, the HTML link generated would be >> >> emacs#List >> Buffers > > Thank you. Some comments follow. > >> +(defvar org-info-emacs-documents > > I suggest to use `defconst' instead, since you're not modifying or > let-binding the variable whatsoever. > >> + '("ada-mode" "auth" "autotype" "bovine" "calc" "ccmode" "cl" "dbus" "dired-x" >> + "ebrowse" "ede" "ediff" "edt" "efaq-w32" "efaq" "eieio" "eintr" "elisp" >> + "emacs-gnutls" "emacs-mime" "emacs" "epa" "erc" "ert" "eshell" "eudc" "eww" >> + "flymake" "forms" "gnus" "htmlfontify" "idlwave" "ido" "info" "mairix-el" >> + "message" "mh-e" "newsticker" "nxml-mode" "octave-mode" "org" "pcl-cvs" >> + "pgg" "rcirc" "reftex" "remember" "sasl" "sc" "semantic" "ses" "sieve" >> + "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper" >> + "widget" "wisent" "woman") >> + "List of emacs documents available at the official URL >> +") > > The first sentence in the docstring is expected to be on a single line, > e.g. > > "List of emacs documents available. > Taken from " > >> +(defvar org-info-other-documents > > `defconst' > > Could you also write an entry about it in ORG-NEWS? Nicolas, I made all the changes that you suggested in the attached patch. Please let me know if further changes are needed. I mailed in my signed licensing paper for emacs to FSF today, so that it FSF should get it later this week. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-org-info.el-generate-HTML-links-to-gnu.org.patch Content-Description: updated patch >From 20adf43716f602e0c4be1a427bf8c6afd5e44c7e Mon Sep 17 00:00:00 2001 From: Richard Kim Date: Thu, 10 Mar 2016 06:29:48 -0800 Subject: [PATCH] org-info.el: generate HTML links to gnu.org * lisp/org-info.el (org-info-export): Convert info links to HTML URL's that point to appropriate gnu.org or other pages. User's can customize the behavior using `org-info-emacs-documents' and `org-info-other-documets' new variables. TINYCHANGE --- etc/ORG-NEWS | 14 ++++++++++++++ lisp/org-info.el | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 4e6c7cb..3ddc3f9 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -317,6 +317,20 @@ called with 6 parameters. *** =ITEM= special property returns headline without stars *** Rename ~org-insert-columns-dblock~ into ~org-columns-insert-dblock~ The previous name is, for the time being, kept as an obsolete alias. +*** Function ~org-info-export~ changes. +HTML links created from certain info links now point to =gnu.org= URL's rather +than just to local files. For example info links such as =info:emacs#List +Buffers= used to be converted to HTML links like this: + +: emacs#List Buffers + +where local file =emacs.html= is referenced. +For most folks this file does not exist. +Thus the new behavior is to generate this HTML link instead: + +: emacs#List Buffers + +All emacs related info links are similarly translated plus few other =gnu.org= manuals. * Version 8.3 ** Incompatible changes diff --git a/lisp/org-info.el b/lisp/org-info.el index 270c19f..07693fe 100644 --- a/lisp/org-info.el +++ b/lisp/org-info.el @@ -81,6 +81,37 @@ nodename-or-index))))) (user-error "Could not open: %s" name))) +(defconst org-info-emacs-documents + '("ada-mode" "auth" "autotype" "bovine" "calc" "ccmode" "cl" "dbus" "dired-x" + "ebrowse" "ede" "ediff" "edt" "efaq-w32" "efaq" "eieio" "eintr" "elisp" + "emacs-gnutls" "emacs-mime" "emacs" "epa" "erc" "ert" "eshell" "eudc" "eww" + "flymake" "forms" "gnus" "htmlfontify" "idlwave" "ido" "info" "mairix-el" + "message" "mh-e" "newsticker" "nxml-mode" "octave-mode" "org" "pcl-cvs" + "pgg" "rcirc" "reftex" "remember" "sasl" "sc" "semantic" "ses" "sieve" + "smtpmail" "speedbar" "srecode" "todo-mode" "tramp" "url" "vip" "viper" + "widget" "wisent" "woman") + "List of emacs documents available. +Taken from ") + +(defconst org-info-other-documents + '(("libc" . "http://www.gnu.org/software/libc/manual/html_mono/libc.html") + ("make" . "http://www.gnu.org/software/make/manual/make.html")) + "Alist of documents generated from texinfo source. + +When converting info links to html, links to any one of these manuals are +converted to use these URL's.") + +(defun org-info-map-html-url (filename) + "Given info FILENAME, either return it (plus '.html' suffix added) or convert +it to URL pointing to the official page on internet, e.g., use gnu.org for all +emacs related documents. See `org-info-official-gnu-document' and +`org-info-other-documents' for details." + (if (member filename org-info-emacs-documents) + (format "http://www.gnu.org/software/emacs/manual/html_mono/%s.html" + filename) + (let ((url (cdr (assoc filename org-info-other-documents)))) + (or url (concat filename ".html"))))) + (defun org-info-export (path desc format) "Export an info link. See `org-add-link-type' for details about PATH, DESC and FORMAT." @@ -89,8 +120,8 @@ See `org-add-link-type' for details about PATH, DESC and FORMAT." (string-match "\\(.*\\)" path)) (let ((filename (match-string 1 path)) (node (or (match-string 2 path) "Top"))) - (format "%s" - filename + (format "%s" + (org-info-map-html-url filename) (replace-regexp-in-string " " "-" node) (or desc path))))) -- 2.5.0 --=-=-=-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Goaziou Subject: Re: patch for HTML links to GNU documents Date: Wed, 30 Mar 2016 15:58:09 +0200 Message-ID: <87d1qc3w5q.fsf@nicolasgoaziou.fr> References: <871t6vrn9r.fsf@nicolasgoaziou.fr> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alGbO-0002Cg-Vd for emacs-orgmode@gnu.org; Wed, 30 Mar 2016 09:56:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alGbL-0002Rq-7G for emacs-orgmode@gnu.org; Wed, 30 Mar 2016 09:56:06 -0400 Received: from relay4-d.mail.gandi.net ([2001:4b98:c:538::196]:35107) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alGbL-0002RP-1S for emacs-orgmode@gnu.org; Wed, 30 Mar 2016 09:56:03 -0400 In-Reply-To: (Richard Y. Kim's message of "Mon, 28 Mar 2016 22:24:41 -0700") 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: "Richard Y. Kim" Cc: emacs-orgmode@gnu.org Hello, emacs18@gmail.com (Richard Y. Kim) writes: > I made all the changes that you suggested in the attached patch. > Please let me know if further changes are needed. It looks good. I applied the patch. Thank you. > I mailed in my signed licensing paper for emacs to FSF today, so that it > FSF should get it later this week. Great. Regards, -- Nicolas Goaziou