Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/micmacIGN/micmac
Browse files Browse the repository at this point in the history
  • Loading branch information
erupnik committed May 20, 2021
2 parents 62b7599 + 7378653 commit cb7cb25
Show file tree
Hide file tree
Showing 53 changed files with 6,165 additions and 1,044 deletions.
10 changes: 10 additions & 0 deletions MMVII/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,15 @@ include/CodeGen_*.h
*.log
*.out
*.toc
*.ilg
*.ind
MMVII/MMVII-TestDir/Input/Files/RelTest.xml
MMVII/MMVII-TestDir/Input/Files/RelTest_0-5.xml
.*.d
!bin/
bin/*
!bin/Makefile
!bin/Mk-MMVII.makefile
html/
latex/
doxygen/
19 changes: 19 additions & 0 deletions MMVII/Doc/Doc2007.tex
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,25 @@
\setcounter{secnumdepth}{4}


%allow to break on / in texttt
\usepackage{xparse}
\ExplSyntaxOn
\NewDocumentCommand{\replace}{mmm}
{
\marian_replace:nnn {#1} {#2} {#3}
}
\tl_new:N \l_marian_input_text_tl
\cs_new_protected:Npn \marian_replace:nnn #1 #2 #3
{
\tl_set:Nn \l_marian_input_text_tl { #1 }
\tl_replace_all:Nnn \l_marian_input_text_tl { #2 } { #3 }
\tl_use:N \l_marian_input_text_tl
}
\ExplSyntaxOff
\let\OldTexttt\texttt
\renewcommand{\texttt}[1]{\OldTexttt{\replace{#1}{/}{/\allowbreak}}}
\let\Oldtt\tt
\renewcommand{\tt}[1]{\Oldtt{\replace{#1}{/}{/\allowbreak}}}

%---------------------------------------------
\newcommand{\CPP}{\mbox{\tt C\hspace{-0.05cm}\raisebox{0.2ex}{\small ++} }}
Expand Down
17 changes: 10 additions & 7 deletions MMVII/Doc/Generalities/Intro.tex
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,15 @@ \subsection{Getting help}
== Mandatory unnamed args : ==
* string [FDP] :: Full Name of Xml in/out
* string :: Operator in (+= *= -= = =0)
* string [MPI0] :: Pattern or Xml for modifying
* OpAff :: Operator
* string [MPF0] :: Pattern or Xml for modifying
== Optional named args : ==
* [Name=Show] int :: Show detail of set before/after , (def) 0->none, (1) modif, (2) all
* [Name=Show] int :: Show detail of set before/after, 0->none, (1) modif, (2) all ,[Default=0]
* [Name=Out] string :: Destination, def=Input, no save for NONE
* [Name=FFI0] string [FFI0] :: File Filter Interval, Main Set
\end{verbatim}

We get three part :
Expand All @@ -137,7 +140,7 @@ \subsection{Getting help}
the entry point of the command is implemented (may be of interest to programmers);

\item second part contains the description of mandatory args, we see that here we
have three mandatory args; for each args is indicated the type (here all strings),
have three mandatory args; for each args is indicated the type (string for the first),
and after {\tt ::}, the semantic of the parameter;
sometime it is inserted inside square bracket (like {\tt [FDP]}) some "predefined semantics"
that will be described later (~\ref{Param:Pred:Sem});
Expand Down Expand Up @@ -218,7 +221,7 @@ \subsection{basic usage}

As always when a regular expression is used to specify set of file,
it is understood as a filter on existing file. So if one had used {\tt "F([0-3]|[a-z]).txt"},
given the file present in {\tt {\MMVIDIR}MMVII-TestDir/Input/Files}, we woul have
given the file present in \texttt{{\MMVIDIR}MMVII-TestDir/Input/Files}, we would have
obtained exactly the same result.

\subsubsection{Exercices}
Expand All @@ -239,7 +242,7 @@ \subsection{Optional paramaters}
\subsubsection{{\tt Out} paramater}

Optional parameter are given after the mandary one in a list of
string {\tt Name=Value}. For example until now we have use
string {\tt Name=Value}. For example until now we have used
the file {\tt File.xml} both as input and output, but sometime
we don't want to modify the input file, we can the use the optionnal
{\tt Out} parameter. For example if we enter :
Expand All @@ -249,7 +252,7 @@ \subsubsection{{\tt Out} paramater}
MMVII EditSet File.xml += "F[7-9].txt" Out=File2.xml
\end{verbatim}

After first line {\tt File.xml} contains t$4$ names.
After first line {\tt File.xml} contains $4$ names.
After second line, the {\tt File.xml} is unchanged
while {\tt File2.xml} contains $7$ names.

Expand Down
Loading

0 comments on commit cb7cb25

Please sign in to comment.