emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: [RFC] Moving "manual.org" into core
Date: Sat, 20 Jan 2018 18:41:26 +0100	[thread overview]
Message-ID: <87tvvgmnqx.fsf@Rainer.invalid> (raw)
In-Reply-To: 87bmhooaj9.fsf@nicolasgoaziou.fr

Nicolas Goaziou writes:
> "manual.org" was updated a month ago, and, so far, nobody complained
> about it. So, I think it's a good time to discuss about what could be
> done next.

The lack of complaints is unlikely to mean that everybody tried it and
found nothing to complain about.  I haven't had much time to do anything
with it so far, but I did at least check that I could use the build
system extension that I created while Tom was working on his version
with it.  The export to texi is still relatively slow, but since I have
a much faster machine now it works OK for me.  I have not yet tried how
long it would take on my old machine.

> The first obvious step is to move the file into "doc/" directory. Then
> I assume we could delete "org.texi" and "org.info" there and generate
> new ones from the Org file. For example, the following command, called
> from the "manual.org" file,
>
>     (let ((org-texinfo-logfiles-extensions
>            (cons "texi" org-texinfo-logfiles-extensions)))
>       (org-texinfo-export-to-info))
>
> produces an "org.info" file without an "org.texi". It thus prevents
> direct editing of "org.texi". I assume this could be called by "make
> info" target.

Maybe not directly in the way you show it here, but yes. 

For the record, the build system extension from years ago involves
creating a directory orgmanual, then you should symlink orgmanual.org to
the actual file in contrib/, then put the follwing Makefile there:

--8<---------------cut here---------------start------------->8---
TEXI2PDF+=--tidy
BEXP=$(BATCH) \
	--eval '(add-to-list '"'"'load-path "../lisp")' \
	--eval '(setq org-footnote-auto-adjust nil)'
EXTEXI=	-l ox-texinfo \
	--eval '(add-to-list '"'"'org-export-snippet-translation-alist '"'"'("info" . "texinfo"))'
EXHTML=	-l ox-html \
	$(BTEST_POST) \
	--eval '(add-to-list '"'"'org-export-snippet-translation-alist '"'"'("info" . "texinfo"))'
ORG2TEXI=-f org-texinfo-export-to-texinfo
ORG2HTML=-f org-html-export-to-html
ORG2INFO=--eval "(org-texinfo-compile \"./$<\")"

.SUFFIXES:	# we don't need default suffix rules
ifeq ($(MAKELEVEL), 0)
  $(error This make needs to be started as a sub-make from the toplevel directory.)
endif
.PHONY:		all info html pdf

all:		$(ORG_MAKE_DOC)

info:		org.info

html:		orgmanual org.html

pdf:		org.pdf

org.texi:	orgmanual.org
	$(BEXP) $(EXTEXI) $< $(ORG2TEXI)
org.info:	org.texi
	$(MAKEINFO)  --no-split $< -o $@
# LANG=C # to work around a bug in texi2dvi
org.pdf:	LC_ALL=C
org.pdf:	LANG=C
org.pdf:	org.texi
	$(TEXI2PDF) $<
orgmanual:	org.texi
	$(TEXI2HTML) $< -o $@
org.html: orgmanual.org
	$(BEXP) $(EXHTML) $< $(ORG2HTML)

clean:
	$(RM) org org.t2d *.pdf *.html *.texi *.info *~ \
	      *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs \
	      *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps
cleanall:	clean
	$(RMR) org.t2d orgmanual

--8<---------------cut here---------------start------------->8---

Then add the following to local.mk

--8<---------------cut here---------------end--------------->8---
.PHONY: orgmanual
EXTRADIRS=orgmanual
orgmanual:
	$(MAKE) -C $@
manclean:
	$(MAKE) -C orgmanual clean
mancleanall:
	$(MAKE) -C orgmanual cleanall
clean:	manclean
cleanall:	mancleanall
--8<---------------cut here---------------end--------------->8---

You can now say "make orgmanual" and have it do the right thing.  YOu
could even further extend local.mk so that the "doc" target includes the
new manual by adding this line:

--8<---------------cut here---------------end--------------->8---
doc:	orgmanual
--8<---------------cut here---------------end--------------->8---

The whole thing can easily be adapted to work in doc/ if it gets decided
that we should switch to manual.org (or better org.org maybe) as our
primary source file.

> So basically, the idea would be to not provide anymore an "org.texi"
> file. Only "manual.org" and "org.info". Emacs developers already apply
> fixes to ORG-NEWS, which is a plain Org file, so I guess it would not
> make their life harder if "manual.org" replaces "org.texi".

Yes, once the org file is our primary source we should stop provding the
texi file in Git at least.  I don't have any preference w.r.t. whether
an Org release tarball should still contain an org.texi or not, but
that's a separate decision.  I suspect that not delivering it would
inconvenience at least the Debian folks somewhat since they keep
insisting to use their own build recipes last I looked.  Last but not
least we'll have to check if we need any modifications for the ELPA
distributions.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Wavetables for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldUserWavetables

  reply	other threads:[~2018-01-20 17:41 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-20 14:43 [RFC] Moving "manual.org" into core Nicolas Goaziou
2018-01-20 17:41 ` Achim Gratz [this message]
2018-01-20 18:15   ` Nicolas Goaziou
2018-01-20 18:36     ` Achim Gratz
2018-01-20 18:51       ` Nicolas Goaziou
2018-01-20 17:41 ` Thomas S. Dye
2018-01-22 10:51 ` Bastien Guerry
2018-01-22 13:48   ` Nicolas Goaziou
2018-01-22 15:30     ` Kaushal Modi
2018-01-22 16:02       ` Nicolas Goaziou
2018-01-22 17:00         ` Kaushal Modi
2018-01-22 17:20           ` Nicolas Goaziou
2018-01-22 17:31             ` Kaushal Modi
2018-01-22 19:52               ` Nicolas Goaziou
2018-01-23 15:19                 ` Kaushal Modi
2018-01-23 16:30                   ` Julius Dittmar
2018-01-23 16:33                   ` Nicolas Goaziou
2018-01-23 16:37                     ` Kaushal Modi
2018-01-22 16:35       ` Bastien Guerry
2018-01-22 16:53         ` Kaushal Modi
2018-01-22 16:35       ` Bastien Guerry
2018-01-22 16:31     ` Bastien Guerry
2018-01-22 17:03       ` Nicolas Goaziou
2018-01-23  8:07         ` org-adapt-indentation 'content (was Re: [RFC] Moving "manual.org" into core) Christian Moe
2018-03-06 19:01           ` Bastien Guerry
2018-01-22 19:04       ` [RFC] Moving "manual.org" into core Achim Gratz
2018-03-03  9:17       ` Nicolas Goaziou
2018-03-03 10:18         ` Bastien Guerry
2018-03-03 11:29           ` Nicolas Goaziou
2018-03-03 15:57             ` Bastien Guerry
2018-03-03 16:15               ` Joseph Vidal-Rosset
2018-03-03 19:48               ` Glenn Morris
2018-03-04  9:30                 ` Bastien Guerry
2018-01-23 20:06     ` Thomas S. Dye
2018-01-22 13:54   ` Rasmus
2018-01-22 15:23     ` Kaushal Modi
2018-01-24  8:39     ` Yasushi SHOJI
2018-01-24 11:28       ` Nicolas Goaziou
2018-01-26  8:52         ` Yasushi SHOJI
2018-01-26 10:32           ` Nicolas Goaziou
2018-01-27  8:40             ` Yasushi SHOJI
2018-01-28 15:17               ` Nicolas Goaziou
2018-01-29  2:40                 ` Yasushi SHOJI
2018-01-29 14:41                   ` Nicolas Goaziou
2018-02-01 11:43                     ` Yasushi SHOJI
2018-02-01 12:11                       ` Yasushi SHOJI
2018-02-04  9:05                         ` Nicolas Goaziou
2018-02-01 14:55                       ` Nicolas Goaziou
2018-02-02  2:07                         ` Yasushi SHOJI
2018-02-04  9:40                           ` Nicolas Goaziou
2018-02-06 14:11                             ` Yasushi SHOJI
2018-01-22 16:41   ` Thomas S. Dye
2018-01-23  8:08   ` Christian Moe
2018-01-23 21:00   ` Samuel Wales
2018-03-04  9:32 ` Bastien Guerry
2018-03-04 10:06   ` Nicolas Goaziou
2018-03-04 10:29     ` Bastien
2018-03-05 14:20       ` Nicolas Goaziou
2018-03-05 16:23         ` Kaushal Modi
2018-03-06 17:41           ` Bastien Guerry
2018-03-06 21:39             ` Achim Gratz
2018-03-05 18:08         ` Thomas S. Dye
2018-03-06  1:08           ` Bastien Guerry
2018-03-06  9:57             ` Thomas S. Dye
2018-03-06 11:55               ` Eric S Fraga
2018-03-06 17:39               ` Bastien
2018-03-06 18:45                 ` Thomas S. Dye
2018-03-06 19:19                   ` Bastien
2018-03-07  2:53                     ` Thomas S. Dye
2018-03-05 19:01         ` Achim Gratz
2018-03-06 19:02           ` Bastien
2018-03-06 18:59         ` Bastien Guerry
     [not found]       ` <WM!6f8274ba0065f984ff76586f7cf117703ccda15adbb5042672b0d2695ee5ac6b367ee58f70aacbbc9c2b10eecb9672ea!@mailhub-mx3.ncl.ac.uk>
2018-03-05 16:22         ` Phillip Lord
2018-03-06 17:47           ` Bastien Guerry
2018-03-04 10:54     ` Bastien Guerry
2018-03-05 14:26       ` Nicolas Goaziou
2018-03-06 17:43         ` Bastien Guerry

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87tvvgmnqx.fsf@Rainer.invalid \
    --to=stromeko@nexgo.de \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).