Changeset 253 for trunk/SRC/Documentation/xmldoc

Timestamp:

06/26/07 17:10:29 (17 years ago)

Author:

pinsard

Message:

improvment of links in idldoc outputs but still not perfect. see ticket:62

Location:

trunk/SRC/Documentation/xmldoc

Files:

• pro2href.sh (modified) (5 diffs)
• savesaxo.sh (modified) (2 diffs)

trunk/SRC/Documentation/xmldoc/pro2href.sh

@@ -8 +8 @@
 # update :
 # $Id$
+#++ still not working perfectly because path of links on the different occurences of <pro>...</pro> may not be the same 
+# ex: see restoreboxparam.pro : domdef and saveboxparam
+# fplod 2007-06-26T13:32:06Z aedon.locean-ipsl.upmc.fr (Darwin)
+# improvment for multiple occurences of <pro>...</pro> on one line
+# see http://www.gentoo.org/doc/en/articles/l-sed2.xml 
+# Sed by example, Part 2
+# especially for directory-overview files
 # fplod 2007-03-20T14:02:14Z aedon.locean-ipsl.upmc.fr (Darwin)
 # creation
@@ -14 +21 @@
 output=${1} # ++ parameter
 #
-# first find all files containing <pro>..</pro>
+# first find all files containing <pro>...</pro>
 list_html_pro=$(find ${output} -name "*.html" -exec grep -l "<pro>.*</pro>" {} \;)
 if [ "${list_html_pro}" = " " ]
 then
-   echo "iii : no <pro>..</pro> in html files"
+   echo "iii : no <pro>...</pro> in html files"
 else
    for file_html in ${list_html_pro}
@@ -24 +31 @@
        fpath=$(dirname ${file_html} | sed -e "s+\(${output}/\)\(.*\)+\2+")
        list_llink=$(grep -n "<pro>.*</pro>" ${file_html} | awk -F ":" '{print $1}')
-       # ++ repérer si plusieurs <pro>.*</pro> par ligne
-       # ++ sortir en erreur si c'est le cas
        for line in ${list_llink}
        do
@@ -33 +38 @@
           module=$(sed -ne "${line},${line}p" ${file_html} | \
                    grep "<pro>.*</pro>" | \
-                   sed -e "s+\(.*<pro>\)\(.*\)\(</pro>.*\)+\\2.html+")
+                   sed -e "s+\(.*<pro>\)\([^<]*\)\(</pro>.*\)+\\2.html+g")
           modulemin=$(echo ${module} | tr "[:upper:]" "[:lower:]" )
           # lpath is the path on module relatively to the location of
-          # the html file containing the <pro>..</pro>
+          # the html file containing the <pro>...</pro>
           lpath=$(find ${output} -name "${modulemin}")
-           # ++ repérer si doublons 
-           # ++ sortir en erreur si c'est le cas
           if [ "${lpath}" = "" ]
           then
@@ -64 +67 @@
              fi
 #echo "relpath ${relpath}"
-             sed -e "${line}s+\(<pro>\)\(.*\)\(</pro>\)+<a href=\"${relpath}/\\2.html\">\2</a>+" \
+             sed -e "${line}s+\(<pro>\)\([^<]*\)\(</pro>\)+<a href=\"${relpath}/\\2.html\">\2</a>+g" \
              ${file_html} > ${file_html}_modify
              mv ${file_html}_modify ${file_html}

trunk/SRC/Documentation/xmldoc/savesaxo.sh

@@ -3 +3 @@
 # update :
 # $Id$
+# fplod 2007-06-26T14:33:12Z aedon.locean-ipsl.upmc.fr (Darwin)
+# copy listings.css in idldoc_assistant_output
 # fplod 2007-03-20T15:10:29Z aedon.locean-ipsl.upmc.fr (Darwin)
 # . replace <pro>ginette</pro> by a sequence like
@@ -434 +436 @@
       cp ${file_html} ${fout}
     done
+    # copy listings.css (needed by directory-overview.html files)
+    cp ../idldoc/resource/listings.css ${output}
     # add an id in idldoc-lib.adp
     cat << EOF > /tmp/adp_modification