sdaps (10nov21)

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

1 files changed, 33 insertions, 24 deletions

diff --git a/Master/texmf-dist/tex/latex/sdaps/sdapsclassic.cls b/Master/texmf-dist/tex/latex/sdaps/sdapsclassic.cls
index 1a4a52ddfcf..505877b251f 100644
--- a/Master/texmf-dist/tex/latex/sdaps/sdapsclassic.cls
+++ b/Master/texmf-dist/tex/latex/sdaps/sdapsclassic.cls
@@ -202,7 +202,7 @@
 
 
 \providecommand{\addinfo}[2]{
-  \sdaps_info_write:x{\unexpanded{#1}=\unexpanded{#2}}
+  \sdaps_info_write:x{Info-\unexpanded{#1}=\unexpanded{#2}}
 }
 
 \newcommand\qid{\tl_use:N \g__sdaps_questionnaire_id_tl}
@@ -758,33 +758,38 @@ you~can~get~similar~results~by~temporarily~changing~the~checkbox~style. }
   noinfo       .meta:n  = { info=false },
 }
 
-\cs_new_protected_nopar:Nn \_sdaps_classic_show_info:
+\cs_new_protected_nopar:Nn \_sdaps_classic_info:
 {
-  \bool_if:NT \l__sdaps_questionnaire_info_bool {
-    \begin{info}
-      \translate{infotext} \\[1ex]
-      \tl_if_eq:VnTF \g_sdaps_checkmode_tl { checkcorrect } {
-        \begin{tabularx}{\textwidth}{lXllll}
-          \checkbox & \strut \translate{info-multi} & \hspace{2em} \checkedbox {} & \translate{info-cross} & \hspace{1em} \correctedbox {} & \translate{info-corrected} \\
-          \checkbox* & \strut \translate{info-single} & \hspace{2em} \checkedbox* {} & \translate{info-cross} & \hspace{1em} \correctedbox* {} & \translate{info-corrected} \\
+  \translate{infotext} \\[1ex]
+  \tl_if_eq:VnTF \g_sdaps_checkmode_tl { checkcorrect } {
+    \begin{tabularx}{\textwidth}{lXllll}
+      \checkbox & \strut \translate{info-multi} & \hspace{2em} \checkedbox {} & \translate{info-cross} & \hspace{1em} \correctedbox {} & \translate{info-corrected} \\
+      \checkbox* & \strut \translate{info-single} & \hspace{2em} \checkedbox* {} & \translate{info-cross} & \hspace{1em} \correctedbox* {} & \translate{info-corrected} \\
+    \end{tabularx}
+  } {
+    \tl_if_eq:VnTF \g_sdaps_checkmode_tl { check } {
+      \begin{tabularx}{\textwidth}{lXll}
+        \checkbox & \strut \translate{info-multi} & \hspace{2em} \checkedbox {} & \translate{info-cross} \\
+        \checkbox* & \strut \translate{info-single} & \hspace{2em} \checkedbox* {} & \translate{info-cross} \\
+      \end{tabularx}
+    } {
+      \tl_if_eq:VnTF \g_sdaps_checkmode_tl { fill } {
+        \begin{tabularx}{\textwidth}{lXll}
+          \checkbox & \strut \translate{info-multi} & \hspace{2em} \filledbox {} & \translate{info-fill} \\
+          \checkbox* & \strut \translate{info-single} & \hspace{2em} \filledbox* {} & \translate{info-fill} \\
         \end{tabularx}
       } {
-        \tl_if_eq:VnTF \g_sdaps_checkmode_tl { check } {
-          \begin{tabularx}{\textwidth}{lXll}
-            \checkbox & \strut \translate{info-multi} & \hspace{2em} \checkedbox {} & \translate{info-cross} \\
-            \checkbox* & \strut \translate{info-single} & \hspace{2em} \checkedbox* {} & \translate{info-cross} \\
-          \end{tabularx}
-        } {
-          \tl_if_eq:VnTF \g_sdaps_checkmode_tl { fill } {
-            \begin{tabularx}{\textwidth}{lXll}
-              \checkbox & \strut \translate{info-multi} & \hspace{2em} \filledbox {} & \translate{info-fill} \\
-              \checkbox* & \strut \translate{info-single} & \hspace{2em} \filledbox* {} & \translate{info-fill} \\
-            \end{tabularx}
-          } {
-            \PackageError{sdaps}{Sorry, there is no help text for the checkmode you have choosen right now! Please pass the noinfo optional argument to the questionnaire environment!}\@ehb %
-          }
-        }
+        \PackageError{sdaps}{Sorry, there is no help text for the checkmode you have choosen right now! Please pass the noinfo optional argument to the questionnaire environment!}\@ehb %
       }
+    }
+  }
+}
+
+\cs_new_protected_nopar:Nn \_sdaps_classic_show_info:
+{
+  \bool_if:NT \l__sdaps_questionnaire_info_bool {
+    \begin{info}
+      \_sdaps_classic_info:
     \end{info}
   }
   \ignorespaces
@@ -892,6 +897,10 @@ you~can~get~similar~results~by~temporarily~changing~the~checkbox~style. }
   \sdaps_page_end:
 }
 
+\def\sdapsinfo{
+  \_sdaps_classic_info:
+}
+
 
 \tl_new:N \l__sdaps_classic_group_var_tl
 \tl_new:N \l__sdaps_classic_group_text_tl