unified module declarations issue lualatex#17, enabled tagging, issue l…

…ualatex#19, new ctan build
zauguin · Oct 28, 2018 · 5d5a8f3 · 5d5a8f3
1 parent a8dcab5
commit 5d5a8f3
Show file tree

Hide file tree

Showing 55 changed files with 860 additions and 1,723 deletions.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,11 @@
 Change History
 --------------
+2018-10-28 luaotfload v2.93
+    * reinserted forgotten man files
+    * unified and improved version/module info for automatic tagging
+    * 
+
+
 2018-10-21 luaotfload v2.92
     * better deva support, issue #9
     * test for --safer and abort, issue #12 

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # The Luaotfload Package
 
-![Version: 2.92](https://img.shields.io/badge/current_version-2.91-blue.svg?style=flat-square)
+![Version: 2.93](https://img.shields.io/badge/current_version-2.93-blue.svg?style=flat-square)
+![Date: 2018-10-28](https://img.shields.io/badge/date-2018--10--28-blue.svg?style=flat-square)
 [![License: GNU GPLv2](https://img.shields.io/badge/license-GNU_GPLv2-blue.svg?style=flat-square)](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 
 
@@ -19,13 +20,15 @@ Please see the documentation luaotfload.pdf for more information.
 
 ## Versions
 
-[![Version: 2.92](https://img.shields.io/badge/version-2.91-blue.svg?style=flat-square)](https://travis-ci.com/u-fischer/luaotfload/)
-![Travis CI for 2.92](https://img.shields.io/travis/com/u-fischer/luaotfload/master.svg?style=flat-square)
+[![Version: 2.93](https://img.shields.io/badge/version-2.93-blue.svg?style=flat-square)](https://travis-ci.com/u-fischer/luaotfload/)
+![Travis CI for 2.93](https://img.shields.io/travis/com/u-fischer/luaotfload/master.svg?style=flat-square)
 [![Version: development](https://img.shields.io/badge/version-dev-blue.svg?style=flat-square)](https://travis-ci.com/u-fischer/luaotfload/branches)
 ![Travis CI for dev](https://img.shields.io/travis/com/u-fischer/luaotfload/dev.svg?style=flat-square)
 
 
-Luaotfload 2.92 has been pushed to CTAN on october,21, 2018. The ongoing development is in the dev branch. 
+Date of last CTAN upload: 2018-10-28. 
+
+The ongoing development is in the dev branch. 
 
 ## Support
 [![GitHub issues](https://img.shields.io/badge/github-issues-blue.svg?style=flat-square)](https://github.com/u-fischer/luaotfload/issues) 

diff --git a/build.lua b/build.lua
@@ -1,7 +1,6 @@
 
-packageversion= "2.9"
-packagestatus = "upload"
-packagedate   = "2018-09-24"
+packageversion= "2.93"
+packagedate   = "2018-10-28"
 
 module   = "luaotfload"
 ctanpkg  = "luaotfload"
@@ -66,7 +65,7 @@ typesetdemofiles  = {"filegraph.tex","luaotfload-conf.tex","luaotfload-tool.tex"
 -- typesetsuppfiles  = {"texmf.cnf"} --later
 
 typesetfiles      = {"**/luaotfload-latex.tex"}
-typsetcycles = 2 -- for the tests
+typesetcycles = 2 -- for the tests
 
 -- installation
 tdsroot = "luatex"
@@ -78,8 +77,8 @@ sourcefiles  = {
  "**/fontloader-*.tex",
  "luaotfload-blacklist.cnf",
  "./doc/filegraph.tex",
- "./doc/luaotfload-conf.tex",
- "./doc/luaotfload-tool.tex",
+-- "./doc/luaotfload-conf.tex",
+-- "./doc/luaotfload-tool.tex",
  "./doc/luaotfload-main.tex", 
                 }
 
@@ -104,45 +103,90 @@ scriptmanfiles = {"luaotfload.conf.5","luaotfload-tool.1"}
 -- l3build settings for tags:
 
 tagfiles = {
-            "src/*.md",
+            "doc/CTANREADME.md",
+            "README.md",
             "src/luaotfload.sty",
             "src/luaotfload-*.lua",
+            "src/auto/luaotfload-glyphlist.lua",
             "doc/luaotfload-main.tex",
-            "doc/luaotfload.conf.rst"
+            "doc/luaotfload.conf.rst",
+            "doc/luaotfload-tool.rst"
             }
 
+function typeset_demo_tasks()
+ local errorlevel = 0
+ errorlevel = run (docfiledir,"rst2man.py luaotfload.conf.rst luaotfload.conf.5")
+ if errorlevel ~= 0 then
+        return errorlevel
+ end
+ errorlevel = run (docfiledir,"rst2man.py luaotfload-tool.rst luaotfload-tool.1")
+ if errorlevel ~= 0 then
+        return errorlevel
+ end
+ errorlevel= run (typesetdir,"rst2xetex.py luaotfload.conf.rst luaotfload-conf.tex") 
+ if errorlevel ~= 0 then
+        return errorlevel
+ end
+ errorlevel=run (typesetdir,"rst2xetex.py luaotfload-tool.rst luaotfload-tool.tex")
+ if errorlevel ~= 0 then
+        return errorlevel
+ end
+ return 0
+end 
+
 function update_tag (file,content,tagname,tagdate)
  tagdate = string.gsub (packagedate,"-", "/")
  if string.match (file, "%.sty$" ) then
   content = string.gsub (content,  
                          "%d%d%d%d/%d%d/%d%d [a-z]+%d%.%d+",
-                         tagdate.." ".. packagestatus..packageversion)
+                         tagdate.." v"..packageversion)
   return content                         
  elseif string.match (file, "%.lua$") then
   content = string.gsub (content,  
-                         "-- REQUIREMENTS:  luaotfload %d.%d+",
-                         "-- REQUIREMENTS:  luaotfload "..packageversion)                         
+                         '(version%s*=%s*")%d%.%d+(",%s*--TAGVERSION)',
+                         "%1"..packageversion.."%2")
+  content = string.gsub (content,  
+                         '(date%s*=%s*")%d%d%d%d%-%d%d%-%d%d(",%s*--TAGDATE)',
+                         "%1"..packagedate.."%2")                                                  
   return content                         
- elseif string.match (file, "%.md$") then
+ elseif string.match (file, "^README.md$") then
    content = string.gsub (content,  
-                         "Packageversion: %d%.%d",
-                         "Packageversion: " .. packageversion )
+                         "Version: %d%.%d+",
+                         "Version: " .. packageversion )
    content = string.gsub (content,  
-                         "Packagedate: %d%d%d%d/%d%d/%d%d",
-                         "Packagedate: " .. tagdate )                      
+                         "version%-%d%.%d+",
+                         "version-" .. packageversion ) 
+   content = string.gsub (content,  
+                         "for %d%.%d+",
+                         "for " .. packageversion ) 
+   content = string.gsub (content,  
+                         "%d%d%d%d%-%d%d%-%d%d",
+                         packagedate )
+   local imgpackagedate = string.gsub (packagedate,"%-","--")                          
+   content = string.gsub (content,  
+                         "%d%d%d%d%-%-%d%d%-%-%d%d",
+                         imgpackagedate)                                                                                                     
    return content
+ elseif string.match (file, "CTANREADME.md$") then
+   content = string.gsub (content,  
+                         "VERSION: %d%.%d+",
+                         "VERSION: " .. packageversion )
+   content = string.gsub (content,  
+                         "DATE: %d%d%d%d%-%d%d%-%d%d",
+                         "DATE: " .. packagedate )                                                                          
+   return content   
  elseif string.match (file, "%.tex$" ) then
    content = string.gsub (content,  
-                         "%d%d%d%d/%d%d/%d%d [a-z]+%d%.%d+",
-                         tagdate.." ".. packagestatus..packageversion)
+                         "%d%d%d%d%-%d%d%-%d%d v%d%.%d+",
+                         packagedate.." v"..packageversion)
   return content    
  elseif string.match (file, "%.rst$" ) then
    content = string.gsub (content,  
-                         "%d%d%d%d-%d%d-%d%d",
-                         packagedate)
+                         "(:Date:%s+)%d%d%d%d%-%d%d%-%d%d",
+                         "%1"..packagedate)
   content = string.gsub (content,  
-                         ":Version:               2.8",
-                         ":Version:               "..packageversion)                       
+                         "(:Version:%s+)%d%.%d+",
+                         "%1"..packageversion)                       
   return content                          
  end
  return content

diff --git a/buildinfo.txt b/buildinfo.txt
@@ -39,7 +39,6 @@ files are created in src/auto
 6. Merge the files to get the default fontloader.
 The name contains the current date.
 
-!!! Set USER and HOSTNAME to get a sensible header
 
 -->   texlua scripts/mkimport package
 
@@ -49,7 +48,7 @@ The name contains the current date.
 
 !!! date must be naturally correct
 
---> texlua scripts/mkstatus --fontloader=./src/auto/fontloader-2018-10-18.lua
+--> texlua scripts/mkstatus --fontloader=./src/auto/fontloader-2018-10-28.lua
 
 8. Check lualibs status -- perhaps it needs update too
 
@@ -58,82 +57,72 @@ The name contains the current date.
 --> l3build install
 --> mktexlsr
 
+=== end phase 1 - preparation ===
+
+=== phase 2 - tests ==
+
 10. Install new dev luatex version
 
 11. Run tests in default TL and with dev-version
 
 --> l3build check
 
+=== end phase 2 - tests ===
 
-12. Update version information everywhere ... (tagging doesn't work for now,
-    too many different variants)
-- sty:
-  %% Copyright (C) 2009-2018
-  [2018/09/24 v2.9  OpenType layout system]
-
-- auxiliary no date, only version:
-  -- REQUIREMENTS:  luaotfload 2.9
-
-- colors, database, features, letterspace, log: "module"
-      version   = "2.9",
+=== phase 3 - documentation ===
 
-- configuration module and requirements:
-   -- REQUIREMENTS:  Luaotfload 2.8 or above
-  version   = "2.9",
+12. Update documentation (see below)
 
-- filelist
---         DATE:  2018-09-23
---      VERSION:  2.9
+=== end phase 3 ===
 
+=== phase 4  - ctan build ===
 
-- init
---      VERSION:  2.9 2018-09-24
+13. Update version information:
+    Update date and tag in build.lua
+    then run
+-->    l3build tag 0
 
-- loaders, resolvers: no info
+(number is irrelevant)
 
-- main:
- luaotfload.version                = "2.9"
- und noch mehr weiter unten ...
+14. commit and tag the commit so that status can pick it up. Grumpf.
 
-- parsers
- -- REQUIREMENTS:  Luaotfload >= 2.8
-
-- tool
- -- REQUIREMENTS:  luaotfload 2.9
-local version                  = "2.9"
-
-13. commit and tag the commit so that status can pick it up.
-
-14. Update luatotfload-status again so that the hashes are correct.
+15. Update luaotfload-status again so that the hashes are correct.
 
 !!! date must be naturally correct
 
--->  texlua scripts/mkstatus --fontloader=./src/auto/fontloader-2018-10-18.lua
+-->  texlua scripts/mkstatus --fontloader=./src/auto/fontloader-2018-10-28.lua
 
 
 ==============
 Dokumentation
 ==============
 
-1. Update NEWS
+1. Update NEWS -- no tagging needed
+
+2. Update README.md -- tagging is activated
 
-2. Update README.md (twice, ctan and git)
+3. Update CTANREADME -- tagging is activated
 
-3. Change version in luaotfload-main
+4. Check text in luaotfload-main -- version is done by tagging.
 
-4. Check text of the other four files
+5. Check text of the other four files
+   -luaotfload-latex.tex (no version)
+   -luaotfload.conf.rst (version by tagging)
+   -luaotfload-tool.rst (version by tagging)
+   -filegraph.tex (no version)
 
-5. Create man file: (requires docutils) <----!!!!!
+6. Create man file: (requires docutils)
+   Done by l3build doc, so only info
    the man pages should also go in the manual so we need also a pdf
 
 --> luaotfload/doc> rst2man.py luaotfload.conf.rst luaotfload.conf.5
---> luaotfload/doc> rst2xetex.py luaotfload.conf.rst luaotfload.conf.tex
+--> luaotfload/doc> rst2xetex.py luaotfload.conf.rst luaotfload-conf.tex
 --> luaotfload/doc> rst2man.py luaotfload-tool.rst luaotfload-tool.1
 --> luaotfload/doc> rst2xetex.py luaotfload-tool.rst luaotfload-tool.tex
 
-6. Compile the doc (hopefully done by l3build so only info)
+7. Compile the doc (done by l3build so only info)
 --> luaotfload/doc> lualatex luaotfload-tool.tex
---> luaotfload/doc> lualatex luaotfload.conf.tex
+--> luaotfload/doc> lualatex luaotfload-conf.tex
 --> luaotfload/doc> lualatex filegraph
 --> luaotfload/doc  lualatex
 

diff --git a/doc/CTANREADME.md b/doc/CTANREADME.md
@@ -1,8 +1,8 @@
 # The Luaotfload Package
 
-VERSION: 2.92
+VERSION: 2.93
 
-DATE: 2018-10-21
+DATE: 2018-10-28
 
 
 ## Description