[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Move doc to base/doc (5faf517a)
Joseph Wright
joseph.wright at morningstar2.co.uk
Sun Jul 28 18:29:24 CEST 2019
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/5faf517abc89392f170aac0300c51735f6126f41
>---------------------------------------------------------------
commit 5faf517abc89392f170aac0300c51735f6126f41
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Sun Jul 28 17:29:13 2019 +0100
Move doc to base/doc
Mumble
>---------------------------------------------------------------
5faf517abc89392f170aac0300c51735f6126f41
.gitignore | 3 +--
base/build.lua | 19 +++++++++++++---
{doc => base/doc}/cfgguide.tex | 0
{doc => base/doc}/clsguide.tex | 0
{doc => base/doc}/cyrguide.tex | 0
{doc => base/doc}/encguide.tex | 0
{doc => base/doc}/fntguide.tex | 0
{doc => base/doc}/latexchanges.tex | 0
{doc => base/doc}/ltnews.tex | 0
{doc => base/doc}/ltnews01.tex | 0
{doc => base/doc}/ltnews02.tex | 0
{doc => base/doc}/ltnews03.tex | 0
{doc => base/doc}/ltnews04.tex | 0
{doc => base/doc}/ltnews05.tex | 0
{doc => base/doc}/ltnews06.tex | 0
{doc => base/doc}/ltnews07.tex | 0
{doc => base/doc}/ltnews08.tex | 0
{doc => base/doc}/ltnews09.tex | 0
{doc => base/doc}/ltnews10.tex | 0
{doc => base/doc}/ltnews11.tex | 0
{doc => base/doc}/ltnews12.tex | 0
{doc => base/doc}/ltnews13.tex | 0
{doc => base/doc}/ltnews14.tex | 0
{doc => base/doc}/ltnews15.tex | 0
{doc => base/doc}/ltnews16.tex | 0
{doc => base/doc}/ltnews17.tex | 0
{doc => base/doc}/ltnews18.tex | 0
{doc => base/doc}/ltnews19.tex | 0
{doc => base/doc}/ltnews20.tex | 0
{doc => base/doc}/ltnews21.tex | 0
{doc => base/doc}/ltnews22.tex | 0
{doc => base/doc}/ltnews23.tex | 0
{doc => base/doc}/ltnews24.tex | 0
{doc => base/doc}/ltnews25.tex | 0
{doc => base/doc}/ltnews26.tex | 0
{doc => base/doc}/ltnews27.tex | 0
{doc => base/doc}/ltnews28.tex | 0
{doc => base/doc}/ltnews29.tex | 0
{doc => base/doc}/ltnews30.tex | 0
{doc => base/doc}/ltx3info.tex | 0
{doc => base/doc}/modguide.tex | 0
base/{ => doc}/source2e.tex | 0
{doc => base/doc}/usrguide.tex | 0
build.lua | 2 +-
doc/README-doc.md | 29 ------------------------
doc/build.lua | 45 --------------------------------------
doc/changes-doc.txt | 32 ---------------------------
47 files changed, 18 insertions(+), 112 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8c8b8c4f..713364ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,7 @@ build/
*.toc
*.synctex.gz
-base/*.pdf
-doc/*.pdf
+base/*/*.pdf
required/*/*.pdf
replace-string.sh
install-new-tlg-versions.sh
diff --git a/base/build.lua b/base/build.lua
index 94b9e427..a2df7832 100644
--- a/base/build.lua
+++ b/base/build.lua
@@ -12,7 +12,10 @@ ctanpkg = "latex-base"
-- Location of main directory: use Unix-style path separators
maindir = ".."
+docfiledir = "./doc"
+
-- Set up the file types needed here
+docfiles = {"ltnews??.tex"}
installfiles =
{
"*.cfg",
@@ -34,7 +37,7 @@ installfiles =
"sample2e.tex",
"small2e.tex",
"testpage.tex",
- }
+ }
sourcefiles =
{
"ltnews.cls",
@@ -52,7 +55,7 @@ sourcefiles =
}
typesetfiles =
{
- "source2e.tex",
+ "source2e.tex", -- Has to be first: source2e.ist creation!
"alltt.dtx",
"classes.dtx",
"cmfonts.dtx",
@@ -64,7 +67,6 @@ typesetfiles =
"ifthen.dtx",
"inputenc.dtx",
"ltunicode.dtx",
- "lppl.tex",
"utf8ienc.dtx",
"latexrelease.dtx",
"latexsym.dtx",
@@ -79,6 +81,17 @@ typesetfiles =
"syntonly.dtx",
"*.fdd",
"*.err",
+ "lppl.tex",
+ "cfgguide.tex",
+ "clsguide.tex",
+ "cyrguide.tex",
+ "encguide.tex",
+ "fntguide.tex",
+ "ltnews.tex",
+ "ltx3info.tex",
+ "modguide.tex",
+ "usrguide.tex",
+ "latexchanges.tex"
}
dynamicfiles = {"*.tst"}
diff --git a/doc/cfgguide.tex b/base/doc/cfgguide.tex
similarity index 100%
rename from doc/cfgguide.tex
rename to base/doc/cfgguide.tex
diff --git a/doc/clsguide.tex b/base/doc/clsguide.tex
similarity index 100%
rename from doc/clsguide.tex
rename to base/doc/clsguide.tex
diff --git a/doc/cyrguide.tex b/base/doc/cyrguide.tex
similarity index 100%
rename from doc/cyrguide.tex
rename to base/doc/cyrguide.tex
diff --git a/doc/encguide.tex b/base/doc/encguide.tex
similarity index 100%
rename from doc/encguide.tex
rename to base/doc/encguide.tex
diff --git a/doc/fntguide.tex b/base/doc/fntguide.tex
similarity index 100%
rename from doc/fntguide.tex
rename to base/doc/fntguide.tex
diff --git a/doc/latexchanges.tex b/base/doc/latexchanges.tex
similarity index 100%
rename from doc/latexchanges.tex
rename to base/doc/latexchanges.tex
diff --git a/doc/ltnews.tex b/base/doc/ltnews.tex
similarity index 100%
rename from doc/ltnews.tex
rename to base/doc/ltnews.tex
diff --git a/doc/ltnews01.tex b/base/doc/ltnews01.tex
similarity index 100%
rename from doc/ltnews01.tex
rename to base/doc/ltnews01.tex
diff --git a/doc/ltnews02.tex b/base/doc/ltnews02.tex
similarity index 100%
rename from doc/ltnews02.tex
rename to base/doc/ltnews02.tex
diff --git a/doc/ltnews03.tex b/base/doc/ltnews03.tex
similarity index 100%
rename from doc/ltnews03.tex
rename to base/doc/ltnews03.tex
diff --git a/doc/ltnews04.tex b/base/doc/ltnews04.tex
similarity index 100%
rename from doc/ltnews04.tex
rename to base/doc/ltnews04.tex
diff --git a/doc/ltnews05.tex b/base/doc/ltnews05.tex
similarity index 100%
rename from doc/ltnews05.tex
rename to base/doc/ltnews05.tex
diff --git a/doc/ltnews06.tex b/base/doc/ltnews06.tex
similarity index 100%
rename from doc/ltnews06.tex
rename to base/doc/ltnews06.tex
diff --git a/doc/ltnews07.tex b/base/doc/ltnews07.tex
similarity index 100%
rename from doc/ltnews07.tex
rename to base/doc/ltnews07.tex
diff --git a/doc/ltnews08.tex b/base/doc/ltnews08.tex
similarity index 100%
rename from doc/ltnews08.tex
rename to base/doc/ltnews08.tex
diff --git a/doc/ltnews09.tex b/base/doc/ltnews09.tex
similarity index 100%
rename from doc/ltnews09.tex
rename to base/doc/ltnews09.tex
diff --git a/doc/ltnews10.tex b/base/doc/ltnews10.tex
similarity index 100%
rename from doc/ltnews10.tex
rename to base/doc/ltnews10.tex
diff --git a/doc/ltnews11.tex b/base/doc/ltnews11.tex
similarity index 100%
rename from doc/ltnews11.tex
rename to base/doc/ltnews11.tex
diff --git a/doc/ltnews12.tex b/base/doc/ltnews12.tex
similarity index 100%
rename from doc/ltnews12.tex
rename to base/doc/ltnews12.tex
diff --git a/doc/ltnews13.tex b/base/doc/ltnews13.tex
similarity index 100%
rename from doc/ltnews13.tex
rename to base/doc/ltnews13.tex
diff --git a/doc/ltnews14.tex b/base/doc/ltnews14.tex
similarity index 100%
rename from doc/ltnews14.tex
rename to base/doc/ltnews14.tex
diff --git a/doc/ltnews15.tex b/base/doc/ltnews15.tex
similarity index 100%
rename from doc/ltnews15.tex
rename to base/doc/ltnews15.tex
diff --git a/doc/ltnews16.tex b/base/doc/ltnews16.tex
similarity index 100%
rename from doc/ltnews16.tex
rename to base/doc/ltnews16.tex
diff --git a/doc/ltnews17.tex b/base/doc/ltnews17.tex
similarity index 100%
rename from doc/ltnews17.tex
rename to base/doc/ltnews17.tex
diff --git a/doc/ltnews18.tex b/base/doc/ltnews18.tex
similarity index 100%
rename from doc/ltnews18.tex
rename to base/doc/ltnews18.tex
diff --git a/doc/ltnews19.tex b/base/doc/ltnews19.tex
similarity index 100%
rename from doc/ltnews19.tex
rename to base/doc/ltnews19.tex
diff --git a/doc/ltnews20.tex b/base/doc/ltnews20.tex
similarity index 100%
rename from doc/ltnews20.tex
rename to base/doc/ltnews20.tex
diff --git a/doc/ltnews21.tex b/base/doc/ltnews21.tex
similarity index 100%
rename from doc/ltnews21.tex
rename to base/doc/ltnews21.tex
diff --git a/doc/ltnews22.tex b/base/doc/ltnews22.tex
similarity index 100%
rename from doc/ltnews22.tex
rename to base/doc/ltnews22.tex
diff --git a/doc/ltnews23.tex b/base/doc/ltnews23.tex
similarity index 100%
rename from doc/ltnews23.tex
rename to base/doc/ltnews23.tex
diff --git a/doc/ltnews24.tex b/base/doc/ltnews24.tex
similarity index 100%
rename from doc/ltnews24.tex
rename to base/doc/ltnews24.tex
diff --git a/doc/ltnews25.tex b/base/doc/ltnews25.tex
similarity index 100%
rename from doc/ltnews25.tex
rename to base/doc/ltnews25.tex
diff --git a/doc/ltnews26.tex b/base/doc/ltnews26.tex
similarity index 100%
rename from doc/ltnews26.tex
rename to base/doc/ltnews26.tex
diff --git a/doc/ltnews27.tex b/base/doc/ltnews27.tex
similarity index 100%
rename from doc/ltnews27.tex
rename to base/doc/ltnews27.tex
diff --git a/doc/ltnews28.tex b/base/doc/ltnews28.tex
similarity index 100%
rename from doc/ltnews28.tex
rename to base/doc/ltnews28.tex
diff --git a/doc/ltnews29.tex b/base/doc/ltnews29.tex
similarity index 100%
rename from doc/ltnews29.tex
rename to base/doc/ltnews29.tex
diff --git a/doc/ltnews30.tex b/base/doc/ltnews30.tex
similarity index 100%
rename from doc/ltnews30.tex
rename to base/doc/ltnews30.tex
diff --git a/doc/ltx3info.tex b/base/doc/ltx3info.tex
similarity index 100%
rename from doc/ltx3info.tex
rename to base/doc/ltx3info.tex
diff --git a/doc/modguide.tex b/base/doc/modguide.tex
similarity index 100%
rename from doc/modguide.tex
rename to base/doc/modguide.tex
diff --git a/base/source2e.tex b/base/doc/source2e.tex
similarity index 100%
rename from base/source2e.tex
rename to base/doc/source2e.tex
diff --git a/doc/usrguide.tex b/base/doc/usrguide.tex
similarity index 100%
rename from doc/usrguide.tex
rename to base/doc/usrguide.tex
diff --git a/build.lua b/build.lua
index 360ffedf..9ba78917 100644
--- a/build.lua
+++ b/build.lua
@@ -7,7 +7,7 @@ bundle = "LaTeX2e"
module = ""
-- A couple of custom variables: the order here is set up for 'importance'
-bundles = {"base", "doc"}
+bundles = {"base"}
required = {"cyrillic", "graphics", "tools", "amsmath"}
-- Location of main directory: use Unix-style path separators
diff --git a/doc/README-doc.md b/doc/README-doc.md
deleted file mode 100644
index aaf48be9..00000000
--- a/doc/README-doc.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Documentation for the LaTeX kernel
-==================================
-
-Release 2019-10-01 pre-release 2
-
-Overview
---------
-
-This bundle provides the core documentation supporting the LaTeX kernel.
-
-For historical reasons, the base distribution and the core documentation
-are bundled separately. Documentation is found in the `doc` bundle. In an
-installed TeX system, `base` and `doc` should be placed within the same
-location; the distinction is therefore primarily of importance when looking
-at the development code.
-
-License
--------
-
-The contents of this bundle are distributed under the [LaTeX Project
-Public License](https://www.latex-project.org/lppl/lppl-1-3c/),
-version 1.3c or later.
-
------
-
-<p>Copyright (C) 2019 The LaTeX3 Project <br />
-<a href="http://latex-project.org/">http://latex-project.org/</a> <br />
-All rights reserved.</p>
-
diff --git a/doc/build.lua b/doc/build.lua
deleted file mode 100644
index 6883394b..00000000
--- a/doc/build.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env texlua
-
--- Build script for LaTeX2e "doc" files
-
--- Identify the bundle and module
-module = "base"
-bundle = ""
-
--- CTAN's name for this is a bit different from ours
-ctanpkg = "latex-doc"
-
--- Location of main directory: use Unix-style path separators
-maindir = ".."
-
--- Set up the file types needed here
-installfiles = { }
-sourcefiles = {"ltnews??.tex"}
-tagfiles = {"README-doc.md"}
-typesetfiles =
- {
- "cfgguide.tex",
- "clsguide.tex",
- "cyrguide.tex",
- "encguide.tex",
- "fntguide.tex",
- "ltnews.tex",
- "ltx3info.tex",
- "modguide.tex",
- "usrguide.tex",
- "latexchanges.tex"
- }
-
--- No dependencies at all (other than l3build of course)
-checkdeps = { }
-unpackdeps = { }
-
--- Load the common settings for the LaTeX2e repo
-dofile (maindir .. "/build-config.lua")
-
--- Find and run the build system
-kpse.set_program_name ("kpsewhich")
-if not release_date then
- dofile(kpse.lookup("l3build.lua"))
-end
-
diff --git a/doc/changes-doc.txt b/doc/changes-doc.txt
deleted file mode 100644
index cd70fad5..00000000
--- a/doc/changes-doc.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-This file lists changes to the LaTeX2e files in reverse chronological order.
-It is provided for convenience only. It therefore makes no claims to
-completeness or accuracy and it contains some references to files that
-are not part of the distribution.
-=======================================================================
-
-2016-03-31 Joseph Wright <latex-bugs at latex-project.org>
-
- * latexchanges.tex: Bring up to date to 2016/03/31
-
-2016-02-01 Joseph Wright <latex-bugs at latex-project.org>
-
- * latexchanges.tex: Bring up to date to 2016/02/01
-
-2015-10-27 Joseph Wright <latex-bugs at latex-project.org>
-
- * latexchanges.tex: Bring up to date to 2015/10/01 PL2
-
-2015-07-01 David Carlisle <latex-bugs at latex-project.org>
-
- * latexchanges.tex: describe the patch level system
-
-2015-04-05 Joseph Wright <joseph.wright at morningstar2.co.uk>
- * Clarify reason for \typein change in LuaTeX
-
-2015-04-03 David Carlisle <latex-bugs at latex-project.org>
-
- * ltnews22.tex: set date back to Jan
-
-2015-03-31 Joseph Wright <joseph.wright at morningstar2.co.uk>
- * New changes.txt file for LaTeX2e core documentation
-
More information about the latex3-commits
mailing list