From 97f560d2993c367fb84ef62eefbe90ca03c19ebc Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Mon, 20 Mar 2023 17:14:54 +0100
Subject: 2023-03-20 15:44:00

---
 web2c/contextcnf.lua | 34 +++++++++++++++++++---------------
 web2c/texlivecnf.lua | 14 +++++++++-----
 2 files changed, 28 insertions(+), 20 deletions(-)

(limited to 'web2c')

diff --git a/web2c/contextcnf.lua b/web2c/contextcnf.lua
index 5ad9ea6d8..3c27eda19 100644
--- a/web2c/contextcnf.lua
+++ b/web2c/contextcnf.lua
@@ -45,9 +45,9 @@ return {
             -- but there can be more readable paths.
 
             -- standalone:
-            
+
             TEXMFCACHE      = "$SELFAUTOPARENT/texmf-cache",
-            
+
             -- texlive
 
          -- TEXMFVAR        = "home:" .. hiddentexlivepath .. "/texmf-var",
@@ -63,21 +63,21 @@ return {
             -- tex root relocatable.
 
             TEXMFOS         = "selfautodir:",
-            
-            -- standalone: 
-            
+
+            -- standalone:
+
             TEXMFSYSTEM     = "selfautoparent:texmf-$SELFAUTOSYSTEM",
             TEXMFMAIN       = "selfautoparent:texmf",
             TEXMFCONTEXT    = "selfautoparent:texmf-context",
             TEXMFMODULES    = "selfautoparent:texmf-modules",
-            
+
             -- texlive:
-                        
+
          -- TEXMFDIST       = "selfautoparent:texmf-dist",
          -- TEXMFSYSCONFIG  = "selfautoparent:texmf-config",
-            
+
             -- The texmf-local path is only used for (maybe) some additional configuration file.
-            
+
             TEXMFLOCAL      = "selfautoparent:texmf-local",
             TEXMFFONTS      = "selfautoparent:texmf-fonts",
             TEXMFPROJECT    = "selfautoparent:texmf-project",
@@ -91,9 +91,9 @@ return {
             -- standalone:
 
             TEXMF           = "{$TEXMFHOME,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFMODULES,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}",
-            
+
             -- texlive:
-            
+
          -- TEXMF           = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFDIST}",
 
             TEXFONTMAPS     = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
@@ -127,19 +127,23 @@ return {
             BIBINPUTS       = ".;$TEXMF/bibtex/bib//;$TEXMF/tex/context//",
             BSTINPUTS       = ".;$TEXMF/bibtex/bst//;$TEXMF/tex/context//",
 
-            -- Experimental
+            -- standalone
 
             ICCPROFILES     = ".;$TEXMF/colors/icc/{context,profiles}//;$OSCOLORDIR",
 
+            -- texlive
+
+         -- ICCPROFILES     = ".;$TEXMF/tex/context/colors/{icc,profiles}//;$OSCOLORDIR",
+
             -- A few special ones that will change some day.
 
             FONTCONFIG_FILE = "fonts.conf",
 
             -- standalone
-            
+
             FONTCONFIG_PATH = "$TEXMFSYSTEM/fonts/conf",
-            
-            --texlive 
+
+            --texlive
 
          -- FONTCONFIG_PATH = "$TEXMFSYSVAR/fonts/conf",
 
diff --git a/web2c/texlivecnf.lua b/web2c/texlivecnf.lua
index e14d5cbfc..3dca87fc5 100644
--- a/web2c/texlivecnf.lua
+++ b/web2c/texlivecnf.lua
@@ -127,19 +127,23 @@ return {
             BIBINPUTS       = ".;$TEXMF/bibtex/bib//;$TEXMF/tex/context//",
             BSTINPUTS       = ".;$TEXMF/bibtex/bst//;$TEXMF/tex/context//",
 
-            -- Experimental
+            -- standalone
+
+         -- ICCPROFILES     = ".;$TEXMF/colors/icc/{context,profiles}//;$OSCOLORDIR",
+
+            -- texlive
 
-            ICCPROFILES     = ".;$TEXMF/colors/icc/{context,profiles}//;$OSCOLORDIR",
+            ICCPROFILES     = ".;$TEXMF/tex/context/colors/{icc,profiles}//;$OSCOLORDIR",
 
             -- A few special ones that will change some day.
 
             FONTCONFIG_FILE = "fonts.conf",
 
             -- standalone
-            
+
          -- FONTCONFIG_PATH = "$TEXMFSYSTEM/fonts/conf",
-            
-            --texlive 
+
+            --texlive
 
             FONTCONFIG_PATH = "$TEXMFSYSVAR/fonts/conf",
 
-- 
cgit v1.2.3