knowledge (22nov18)

git-svn-id: svn://tug.org/texlive/trunk@49224 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 15 insertions, 26 deletions

diff --git a/Master/texmf-dist/tex/latex/knowledge/knowledge.sty b/Master/texmf-dist/tex/latex/knowledge/knowledge.sty
index 991e6a7dc6e..ea34f9f19a2 100644
--- a/Master/texmf-dist/tex/latex/knowledge/knowledge.sty
+++ b/Master/texmf-dist/tex/latex/knowledge/knowledge.sty
@@ -23,7 +23,7 @@
 %% LaTeX version 1999/12/01 or later.
 %% 
 \usepackage{expl3}
-\ProvidesExplPackage{knowledge}{2018/07/26}{1.12}{}
+\ProvidesExplPackage{knowledge}{2018/11/22}{1.14}{}
 %%%%%%%%%%
 \RequirePackage{l3keys2e}
 \RequirePackage{etoolbox}
@@ -2659,6 +2659,8 @@
            \tl_if_exist_ne:NTF\knowledge_kl_index_key_tl
                  {\exp_not:V\knowledge_kl_index_key_tl@}{}
            \expandafter\tl_to_str:n\expandafter{\knowledge_kl_index_tl}
+           \tl_if_exist_ne:NTF\knowledge_kl_index_number_style_tl
+                 {|\exp_not:V\knowledge_kl_index_number_style_tl}{}
          }}{}
 }
 
@@ -2899,23 +2901,7 @@
        \let\klTKS\knowledge_fake_klTKS
   }
 }
-\bool_if:NT\knowledge_makeidx_active_bool{
-  \makeindex
-
-  \cs_gset:Npn\knowledge_kl_display_code_index:n
-    {\knowledge_kl_default_display_code_index:n}
-
-  \cs_new:Npn\knowledge_kl_default_display_code_index:n
-  {\tl_if_exist_ne:NT\knowledge_kl_index_tl
-      {\exp_not:N\index
-        {{\tl_if_exist_ne:NTF\kl_index_parent_key_tl
-            {\exp_not:V\kl_index_parent_key_tl!}{}
-          \tl_if_exist_ne:NTF\knowledge_kl_indexkey_tl
-            {\exp_not:V\knowledge_kl_indexkey_tl@}{}
-          \expandafter\tl_to_str:n\expandafter{\knowledge_kl_index_tl}
-         }}}}
-}
-
+\def\knowledgeIntroIndexStyle#1{\textbf{#1}}
 \NewKnowledgeParamTl{index}
 \keys_define:nn { knowledge~directives }
 { index .code:n =  {
@@ -2925,9 +2911,9 @@
   index .default:n = {}
 }
 
-\NewKnowledgeParamTl*{index~style}
-\NewKnowledgeParamTl*{index~parent~key}
-\NewKnowledgeParamTl*{index~key}
+\NewKnowledgeParamTl*[\knowledge_kl_index_number_style_tl]{index~style}
+\NewKnowledgeParamTl*[\knowledge_kl_index_parent_key_tl]{index~parent~key}
+\NewKnowledgeParamTl*[\knowledge_kl_index_key_tl]{index~key}
 \ExplSyntaxOff\makeatletter
 \newcommand\knowledgeFixHyperrefTwocolumn{
   \RequirePackage{etoolbox}
@@ -2992,6 +2978,9 @@
 \IfXcolorTF
   \Xcolortrue
   \Xcolorfalse
+\IfXcolorTF
+  {\def\knowledgeIntroIndexStyle#1{\textcolor{red}{#1}}}
+  {}
 \tl_new:Nn\knowledge_kl_default_style_tl{kl}
 \tl_new:Nn\knowledge_kl_unknown_style_tl{kl~unknown}
 \tl_new:Nn\knowledge_kl_unknown_style_cont_tl{kl~unknown~cont}
@@ -3045,7 +3034,7 @@
   \knowledgestyle{kl}{}
   \knowledgestyle{kl unknown}{}
   \knowledgestyle{kl unknown cont}{}
-  \knowledgestyle{intro}{emphasize}
+  \knowledgestyle{intro}{emphasize,index style=knowledgeIntroIndexStyle}
   \knowledgestyle{intro unknown}{emphasize}
   \knowledgestyle{intro unknown cont}{emphasize}
 }{}
@@ -3055,14 +3044,14 @@
     \knowledgestyle{kl}{color={blue!70!black}}
     \knowledgestyle{kl unknown}{color=orange}
     \knowledgestyle{kl unknown cont}{color=brown}
-    \knowledgestyle{intro}{emphasize,color=blue}
+    \knowledgestyle{intro}{emphasize,color=blue,index style=knowledgeIntroIndexStyle}
     \knowledgestyle{intro unknown}{emphasize,color=orange}
     \knowledgestyle{intro unknown cont}{emphasize,color=brown}
    }{
     \knowledgestyle{kl}{}
     \knowledgestyle{kl unknown}{underline}
     \knowledgestyle{kl unknown cont}{underline}
-    \knowledgestyle{intro}{emphasize}
+    \knowledgestyle{intro}{emphasize,index style=introindexstyle}
     \knowledgestyle{intro unknown}{emphasize,underline}
     \knowledgestyle{intro unknown cont}{emphasize,underline}
    }
@@ -3073,14 +3062,14 @@
     \knowledgestyle{kl}{color={blue!70!black}}
     \knowledgestyle{kl unknown}{}
     \knowledgestyle{kl unknown cont}{}
-    \knowledgestyle{intro}{emphasize,color=blue}
+    \knowledgestyle{intro}{emphasize,color=blue,index style=introindexstyle}
     \knowledgestyle{intro unknown}{emphasize}
     \knowledgestyle{intro unknown cont}{emphasize}
    }{
     \knowledgestyle{kl}{}
     \knowledgestyle{kl unknown}{}
     \knowledgestyle{kl unknown cont}{}
-    \knowledgestyle{intro}{emphasize}
+    \knowledgestyle{intro}{emphasize,index style=introindexstyle}
     \knowledgestyle{intro unknown}{emphasize}
     \knowledgestyle{intro unknown cont}{emphasize}
    }