[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: master -> main (c540f6a)

[Marcel Fabian Krüger]

Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/c540f6aaedd8a9a62e6509b457b3566bd6734e0f

>---------------------------------------------------------------

commit c540f6aaedd8a9a62e6509b457b3566bd6734e0f
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Fri Jun 4 19:00:11 2021 +0200

    master -> main


>---------------------------------------------------------------

c540f6aaedd8a9a62e6509b457b3566bd6734e0f
 build.lua               | 10 +++++-----
 buildinfo.txt           |  6 +++---
 doc/luaotfload-main.tex |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/build.lua b/build.lua
index 86a4deb..7aeac28 100644
--- a/build.lua
+++ b/build.lua
@@ -19,10 +19,10 @@ print(mydata.email)
 
 --------- setup things for a dev-version
 -- See stackoverflow.com/a/12142066/212001 / build-config from latex2e
-local master_branch do
+local maimainanch do
   local tag = os.getenv'TRAVIS_TAG'
   if tag and tag ~= "" then
-    master_branch = not string.match(tag, '-dev$')
+    main_branch = not string.match(tag, '-dev$')
   else
     local branch = os.getenv'TRAVIS_BRANCH'
     if not branch then
@@ -30,9 +30,9 @@ local master_branch do
       branch = f:read'*a':sub(1,-2)
       assert(f:close())
     end
-    master_branch = string.match(branch, '^master')
+    main_branch = string.match(branch, '^main')
   end
-  if not master_branch then
+  if not main_branch then
     tdsroot = "latex-dev"
     print("creating/installing dev-version in " .. tdsroot)
     ctanpkg = ctanpkg .. "-dev"
@@ -292,7 +292,7 @@ function update_tag (file,content,_tagname,_tagdate)
   if string.match (file, "%.sty$" ) then
     return sty_pattern:match(content)
   elseif string.match (file,"fontloader%-basic") then
-   if master_branch then
+   if main_branch then
      return string.gsub (content,
                           "caches.namespace = 'generic%-dev'",
                           "caches.namespace = 'generic'")
diff --git a/buildinfo.txt b/buildinfo.txt
index 45a6aae..ac2d6fc 100644
--- a/buildinfo.txt
+++ b/buildinfo.txt
@@ -156,6 +156,6 @@ CHECK if in fontloader-basics-gen.lua line 192 is
 =======
 I would do the merge to dev last because it is the least important step and the only
 step where we it is quite likely to get merge conflicts.
-So my order would be: Do a fast-forward merge to master, then set the tag.
-After the Tag tests ran through send the code to CTAN and delete the master-xx branch.
-Finally merge master back into dev.
+So my order would be: Do a fast-forward merge to main, then set the tag.
+After the Tag tests ran through send the code to CTAN and delete the main-xx branch.
+Finally merge main back into dev.
diff --git a/doc/luaotfload-main.tex b/doc/luaotfload-main.tex
index 9be30b3..7ba67b8 100644
--- a/doc/luaotfload-main.tex
+++ b/doc/luaotfload-main.tex
@@ -504,7 +504,7 @@ where \meta{prefix} is either \inlinecode{file:} or \inlinecode {name:}.\footnot
   %
   For a working example see the
   \hyperlink [test in the luaotfload
-  repo]{https://github.com/latex3/luaotfload/blob/master/testfiles/my-resolver.lvt}.
+  repo]{https://github.com/latex3/luaotfload/blob/main/testfiles/my-resolver.lvt}.
 }
 %
 It determines whether the font loader should interpret the request as
@@ -2477,7 +2477,8 @@ code imported from \CONTEXT.
 
 The complete text of the license is given as a separate file \fileent
 {COPYING} in the toplevel directory of the
-\hyperlink [\fileent {Luaotfload} Git repository]{https://github.com/lualatex/luaotfload/blob/master/COPYING}.\\
+\hyperlink [\fileent {Luaotfload} Git
+repository]{https://github.com/latex3/luaotfload/blob/main/COPYING}.\\
 Distributions probably package it as \fileent
 {doc/luatex/luaotfload/COPYING} in the relevant \fileent {texmf} tree.