* milena/doc/Doxyfile.in, * milena/doc/doc.mk, * milena/doc/tutorial/tools/split_sample.sh, * milena/doc/tutorial/tutorial.tex: Here. --- ChangeLog | 9 +++++++++ milena/doc/Doxyfile.in | 2 +- milena/doc/doc.mk | 4 +--- milena/doc/tutorial/tools/split_sample.sh | 11 +++++------ milena/doc/tutorial/tutorial.tex | 4 ++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index e749aad..faac3f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-02-03 Roland Levillain <roland@lrde.epita.fr> + Typo: s/splitted/split/. + + * milena/doc/Doxyfile.in, + * milena/doc/doc.mk, + * milena/doc/tutorial/tools/split_sample.sh, + * milena/doc/tutorial/tutorial.tex: Here. + +2009-02-03 Roland Levillain <roland@lrde.epita.fr> + Use modern idioms of Libtool. * configure.ac: Invoke LT_INIT instead of AC_PROG_LIBTOOL. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index cda47dc..448bc3d 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -92,7 +92,7 @@ EXCLUDE_SYMBOLS = EXAMPLE_PATH = @top_srcdir@/milena/doc/tutorial/samples \ @top_builddir@/milena/doc/tutorial/samples \ @top_builddir@/milena/doc/tutorial/outputs \ - @top_builddir@/milena/doc/tutorial/outputs/splitted \ + @top_builddir@/milena/doc/tutorial/outputs/split \ @top_srcdir@/milena/doc/tutorial/outputs EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO diff --git a/milena/doc/doc.mk b/milena/doc/doc.mk index c5ff517..50aaefc 100644 --- a/milena/doc/doc.mk +++ b/milena/doc/doc.mk @@ -11,8 +11,6 @@ SAMPLES_SRCDIR = $(TUTORIAL_SRCDIR)/samples TUTORIAL_BUILDDIR = $(top_builddir)/milena/doc/tutorial OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs -SPLITTED_OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs/splitted +SPLIT_OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs/split FIGURES_BUILDDIR = $(TUTORIAL_BUILDDIR)/figures SAMPLES_BUILDDIR = $(TUTORIAL_BUILDDIR)/samples - - diff --git a/milena/doc/tutorial/tools/split_sample.sh b/milena/doc/tutorial/tools/split_sample.sh index a3bf2d1..1a4d434 100755 --- a/milena/doc/tutorial/tools/split_sample.sh +++ b/milena/doc/tutorial/tools/split_sample.sh @@ -1,4 +1,4 @@ -#/bin/sh +# /bin/sh if ! [ $# -eq 3 ]; then echo "Usage: $0 <file1> <file extension> <dst dir>" @@ -8,16 +8,15 @@ fi begins=`grep -n -R '//[[:space:]]*\\\{' $1 | cut -d ':' -f 1` ends=`grep -n -R '//[[:space:]]*\\\}' $1 | cut -d ':' -f 1` -splitted=false +split=false i=1 for begin in $begins; do partend=$((`echo $ends | cut -d ' ' -f $i` - 1)) head -n $partend $1 | tail -n $(($partend - $begin)) > $3/"`basename $1 .$2`-$i.$2" i=$((i+1)) - splitted=true + split=true done -if [ $splitted ] && [ $i -gt 1 ]; then - echo "* $1 has been splitted in $i files." +if [ $split ] && [ $i -gt 1 ]; then + echo "* $1 has been split in $i files." fi - diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index 83219ee..6dd2d0c 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -93,7 +93,7 @@ \backslash htmlonly % } -% Include file '#1' from a splitted output. +% Include file '#1' from a split output. % #1 - part number (Optional) % #2 - file name \newcommand{\doxymoutput}[2][1]{ @@ -153,7 +153,7 @@ $$ \renewcommand{\doxycode}[2][1]{\lstinputlisting[frame=single]{samples/#2-#1.cc}} \renewcommand{\doxyrawcode}[1]{\lstinputlisting[frame=single]{samples/#1.cc.raw}} \renewcommand{\doxyoutput}[1]{\lstinputlisting[frame=single]{outputs/#1.txt}} -\renewcommand{\doxymoutput}[2][1]{\lstinputlisting[frame=single]{outputs/splitted/#2-#1.txt}} +\renewcommand{\doxymoutput}[2][1]{\lstinputlisting[frame=single]{outputs/split/#2-#1.txt}} \renewcommand{\doxyfigure}[3][1]{% \pgfimage[width=#3]{figures/#2-#1}% \label{#1}% -- 1.6.1.2