Changeset a4da45e for doc/LaTeXmacros


Ignore:
Timestamp:
Feb 26, 2024, 3:53:42 AM (23 months ago)
Author:
JiadaL <j82liang@…>
Branches:
master
Children:
3f9a8d0
Parents:
0522ebe (diff), 022bce0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Resolve conflict

Location:
doc/LaTeXmacros
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • doc/LaTeXmacros/common.sty

    r0522ebe ra4da45e  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Sun Jan 21 13:17:48 2024
    14 %% Update Count     : 633
     13%% Last Modified On : Sun Feb 25 17:37:46 2024
     14%% Update Count     : 640
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
    … …  
    4040\newcommand{\CFA}{\protect\CFAIcon\xspace}                              % CFA symbolic name
    4141\newcommand{\CFL}{\textrm{Cforall}\xspace}                              % Cforall non-icon name
    42 \newcommand{\Celeven}{\textrm{C11}\xspace}                              % C11 symbolic name
     42\newcommand{\Celeven}{\textrm{C1\!1}\xspace}                    % C11 symbolic name
     43
    4344\newcommand{\CCIcon}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}} % C++ icon
    44 \newcommand{\CC}[1][]{\protect\CCIcon{#1}\xspace}               % C++ symbolic name
    45 \newcommand{\Cpp}[1][]{\CC{#1}}                                                 % C++ synonym
    4645% numbers disallowed in latex variables names => use number names
    47 \newcommand{\CCeleven}{\protect\CCIcon{11}\xspace}              % C++11 symbolic name
     46\newcommand{\CCeleven}{\protect\CCIcon{1\!1}\xspace}    % C++11 symbolic name
    4847\newcommand{\CCfourteen}{\protect\CCIcon{14}\xspace}    % C++14 symbolic name
    4948\newcommand{\CCseventeen}{\protect\CCIcon{17}\xspace}   % C++17 symbolic name
    5049\newcommand{\CCtwenty}{\protect\CCIcon{20}\xspace}              % C++20 symbolic name
     50\newcommand{\CC}[1][]{\protect\CCIcon{#1}\xspace}               % C++ symbolic name
     51\newcommand{\Cpp}[1][]{\CC{#1}}                                                 % C++ synonym
     52
    5153\newcommand{\Csharp}{C\raisebox{-0.7ex}{\relsize{2}$^\sharp$}\xspace} % C# symbolic name
    5254
    … …  
    293295xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
    294296extendedchars=true,                                             % allow ASCII characters in the range 128-255
    295 escapechar=§,                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
    296297mathescape=false,                                               % disable LaTeX math escape in CFA code $...$
    297298keepspaces=true,                                                %
    … …  
    304305literate=
    305306%  {-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.75ex}{0.1ex}}}}1
    306   {-}{\raisebox{-1pt}{\texttt{-}}}1
     307  {-}{\raisebox{-1pt}{\ttfamily-}}1
    307308  {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1
    308309  {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1
     310  {'}{\ttfamily'\!}1
    309311  {`}{\ttfamily\upshape\hspace*{-0.3ex}`}1
    310312  {<-}{$\leftarrow$}2
    … …  
    318320\lstset{
    319321language=CFA,
    320 %moredelim=**[is][\color{red}]{@}{@},   % red highlighting @...@
     322escapechar=§,                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
    321323moredelim=**[is][\color{red}]{®}{®},    % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
    322324%moredelim=**[is][\color{blue}]{ß}{ß},  % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
    … …  
    328330% inline code ©...© (copyright symbol) emacs: C-q M-)
    329331\lstMakeShortInline©                                    % single-character for \lstinline
     332
    330333\else% regular ASCI characters
     334
    331335\lstnewenvironment{cfa}[1][]{% necessary
    332336\lstset{
    333337language=CFA,
    334338escapechar=\$,                                                  % LaTeX escape in CFA code
    335 mathescape=false,                                               % LaTeX math escape in CFA code $...$
    336339moredelim=**[is][\color{red}]{@}{@},    % red highlighting @...@
    337340}% lstset

  • doc/LaTeXmacros/common.tex

    r0522ebe ra4da45e  
    1111%% Created On       : Sat Apr  9 10:06:17 2016
    1212%% Last Modified By : Peter A. Buhr
    13 %% Last Modified On : Wed Jan 24 08:43:57 2024
    14 %% Update Count     : 593
     13%% Last Modified On : Sun Feb 25 18:11:56 2024
     14%% Update Count     : 614
    1515%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1616
    … …  
    4040\newcommand{\CFA}{\protect\CFAIcon\xspace}                              % CFA symbolic name
    4141\newcommand{\CFL}{\textrm{Cforall}\xspace}                              % Cforall non-icon name
    42 \newcommand{\Celeven}{\textrm{C11}\xspace}                              % C11 symbolic name
     42\newcommand{\Celeven}{\textrm{C1\!1}\xspace}                    % C11 symbolic name
     43
    4344\newcommand{\CCIcon}{\textrm{C}\kern-.1em\hbox{+\kern-.25em+}} % C++ icon
    44 \newcommand{\CC}[1][]{\protect\CCIcon{#1}\xspace}               % C++ symbolic name
    45 \newcommand{\Cpp}[1][]{\CC{#1}}                                                 % C++ synonym
    4645% numbers disallowed in latex variables names => use number names
    47 \newcommand{\CCeleven}{\protect\CCIcon{11}\xspace}              % C++11 symbolic name
     46\newcommand{\CCeleven}{\protect\CCIcon{1\!1}\xspace}    % C++11 symbolic name
    4847\newcommand{\CCfourteen}{\protect\CCIcon{14}\xspace}    % C++14 symbolic name
    4948\newcommand{\CCseventeen}{\protect\CCIcon{17}\xspace}   % C++17 symbolic name
    5049\newcommand{\CCtwenty}{\protect\CCIcon{20}\xspace}              % C++20 symbolic name
     50\newcommand{\CC}[1][]{\protect\CCIcon{#1}\xspace}               % C++ symbolic name
     51\newcommand{\Cpp}[1][]{\CC{#1}}                                                 % C++ synonym
     52
    5153\newcommand{\Csharp}{C\raisebox{-0.7ex}{\relsize{2}$^\sharp$}\xspace} % C# symbolic name
    5254
    … …  
    297299xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
    298300extendedchars=true,                                             % allow ASCII characters in the range 128-255
    299 escapechar=§,                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
    300301mathescape=false,                                               % disable LaTeX math escape in CFA code $...$
    301302keepspaces=true,                                                %
    … …  
    308309literate=
    309310%  {-}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.75ex}{0.1ex}}}}1
    310   {-}{\raisebox{-1pt}{\texttt{-}}}1
     311  {-}{\raisebox{-1pt}{\ttfamily-}}1
    311312  {^}{\raisebox{0.6ex}{$\scriptstyle\land\,$}}1
    312313  {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1
     314  {'}{\ttfamily'\!}1
    313315  {`}{\ttfamily\upshape\hspace*{-0.3ex}`}1
    314316  {<-}{$\leftarrow$}2
    … …  
    322324\lstset{
    323325language=CFA,
    324 %moredelim=**[is][\color{red}]{@}{@},   % red highlighting @...@
     326escapechar=§,                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
    325327moredelim=**[is][\color{red}]{®}{®},    % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
    326328%moredelim=**[is][\color{blue}]{ß}{ß},  % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
    … …  
    332334% inline code ©...© (copyright symbol) emacs: C-q M-)
    333335\lstMakeShortInline©                                    % single-character for \lstinline
     336
    334337\else% regular ASCI characters
     338
    335339\lstnewenvironment{cfa}[1][]{% necessary
    336340\lstset{
    337341language=CFA,
    338342escapechar=\$,                                                  % LaTeX escape in CFA code
    339 mathescape=false,                                               % LaTeX math escape in CFA code $...$
    340343moredelim=**[is][\color{red}]{@}{@},    % red highlighting @...@
    341344}% lstset

  • doc/LaTeXmacros/lstlang.sty

    r0522ebe ra4da45e  
    88%% Created On       : Sat May 13 16:34:42 2017
    99%% Last Modified By : Peter A. Buhr
    10 %% Last Modified On : Thu Sep 21 08:40:05 2023
    11 %% Update Count     : 31
     10%% Last Modified On : Fri Feb 16 07:59:29 2024
     11%% Update Count     : 37
    1212%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
    1313
    … …  
    125125}
    126126
    127 % C++ programming language
    128 \lstdefinelanguage{C++}[ANSI]{C++}{
    129         morekeywords={nullptr,}
    130 }
    131 
    132127% uC++ programming language, based on ANSI C++
    133 \lstdefinelanguage{uC++}[ANSI]{C++}{
     128\lstdefinelanguage{uC++}[GNU]{C++}{
    134129        morekeywords={
    135130                _Accept, _AcceptReturn, _AcceptWait, _Actor, _At, _Catch, _CatchResume, _CorActor, _Cormonitor, _Coroutine,
Note: See TracChangeset for help on using the changeset viewer.