diff --git a/Manual_tools/src/latex_converter_config/html/cc_manual.sty b/Manual_tools/src/latex_converter_config/html/cc_manual.sty index 1564771c801..87c20c0ac67 100644 --- a/Manual_tools/src/latex_converter_config/html/cc_manual.sty +++ b/Manual_tools/src/latex_converter_config/html/cc_manual.sty @@ -425,7 +425,11 @@ % | \ccStyle % +-------------------------------------------------------------------------- \newcommand{\ccc}[1]{[cccbegin]\lciParseCC{\lciCCStyle 1}{#1}[cccend]} %% the 1 is a dummy to keep it - %% from parsing spaces + %% from parsing spaces +\newcommand{\ccc@om}{\lciParseCC{\cccCont}{#2}{#1}} +\newcommand{\cccCont}{\cccContX\lciCCParameter} +\newcommand{\cccContX}[2]{\lcRawHtml{}\ccRef[#X1]{ccRef_#2}\lcRawHtml{}} + \newcommand{\ccStyle}{\ccc} % Add a wrapper around \ccc so that one can chose the URL of the HTML link, diff --git a/Manual_tools/sty/cc_manual.sty b/Manual_tools/sty/cc_manual.sty index f06bf1488e6..dbfbf393f7c 100644 --- a/Manual_tools/sty/cc_manual.sty +++ b/Manual_tools/sty/cc_manual.sty @@ -1007,7 +1007,7 @@ Reference~Manual}% } % abbreviations -\newcommand{\ccc}{\ccStyle} +\newcommand{\ccc}[2][]{\ccStyle{#2}} % Add a wrapper around \ccc so that one can chose the URL of the HTML link, % instead of the automatic one. @@ -1326,12 +1326,15 @@ Reference~Manual}% \newcommand{\ccRefPageNumAtMargin}{} \gdef\ccRefPageNumAtMargin{\ccTrue} \newcommand{\ccRefPageFill}{\dotfill} -\newcommand{\ccRefIdfierPage}{\begingroup\ccCatcode\ccRefIdfierPageX} -\def\ccRefIdfierPageX #1{\endgroup% +\newcommand{\ccRefIdfierPage}[2][\ccRefIdfierPageDefault]{% + \def\ccRefIdfierPageDefault{#2}% + \begingroup\ccCatcode\ccRefIdfierPageX{#1}{#2}% +} +\def\ccRefIdfierPageX #1#2{\endgroup% \ifnum\ccRefPageNumAtMargin=\ccTrue - \ccc{#1}\ccRefPageFill \ccRefPage{#1}% + \ccc{#2}\ccRefPageFill \ccRefPage{#1}% \else - \ccc{#1} (pg. \pageref{ccRef_#1})% + \ccc{#2} (pg. \pageref{ccRef_#1})% \fi }