[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bpfk] dag-cll git updates for Sun Jan 2 19:21:04 EST 2011



commit 18bc6ba909b12df0cd8290674469b32abb2d0dd9
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Sun Jan 2 16:15:52 2011 -0800

    More documentation and script fixes.

diff --git a/todocbook/README b/todocbook/README
index f421d90..395faa1 100644
--- a/todocbook/README
+++ b/todocbook/README
@@ -1,9 +1,17 @@
 To make the XHTML version (ends up in a dir named html/):
 
   make
 
 This takes quite a while.  To do it for just one chapter for faster
 testing:
 
   ./merge -t 5.xml
   make
+
+
+Requirements
+------------
+
+  xsltproc
+
+  xmlto
diff --git a/todocbook/generate_glossary.sh b/todocbook/generate_glossary.sh
index 18635c5..57b353a 100755
--- a/todocbook/generate_glossary.sh
+++ b/todocbook/generate_glossary.sh
@@ -30,21 +30,21 @@ do
       echo "</glossdiv>"
     else
       indiv=1
     fi
     echo "<glossdiv><title>$newinitial</title>"
     initial=$newinitial
   fi
 
   if [ ! -f jbovlaste.xml -o "$(find jbovlaste.xml -mtime +1)" ]
   then
-    echo "jbovlaste file is old; refetching."
+    echo "jbovlaste file is old; refetching." 1>&2
     wget 'http://jbovlaste.lojban.org/export/xml-export.html?lang=en' -O jbovlaste.xml
   fi
   
   definition=$(grep -E "^<valsi word=\"$word\" " jbovlaste.xml | \
       sed -e 's/.*<definition>//' -e 's;</definition>.*;;' | \
       sed -e 's/\&/\&amp;/g' -e 's/</\&lt;/g' -e 's/>/\&gt;/g' | \
       sed 's/\s\s*/ /g')
 
   if [ ! "$(echo $definition | sed 's/\s*//g')" ]
   then

commit 9c93002386e65173e36578e1ecadab7e67edd4bc
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Sun Jan 2 15:46:11 2011 -0800

    Path issues.

diff --git a/todocbook/merge.sh b/todocbook/merge.sh
index 59f2682..7963e37 100755
--- a/todocbook/merge.sh
+++ b/todocbook/merge.sh
@@ -35,21 +35,21 @@ do
       sed "s/<xref linkend=\"section-[^\"]*\"/<xref linkend=\"$sectiontag\"/g" >>cll.xml
   else
     cat $file >>cll.xml
   fi
 done
 
 cp cll.xml cll_preglossary.xml
 
 echo '</book>' >>cll_preglossary.xml
 
-generate_glossary.sh >>cll.xml
+./generate_glossary.sh >>cll.xml
 
 rm cll_preglossary.xml
 
 echo '
 
 <index>
 <title>General Index</title>
 </index>
 
 <index type="lojban-words">

commit 8edb95b26385a21c2609a8e1a9d3a96117496e01
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Sun Jan 2 15:43:36 2011 -0800

    Whoops, wrong type of comparison.

diff --git a/todocbook/merge.sh b/todocbook/merge.sh
index 87e64a4..59f2682 100755
--- a/todocbook/merge.sh
+++ b/todocbook/merge.sh
@@ -4,21 +4,21 @@ echo '<?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
                "dtd/docbook-5.0.dtd">
 
 <book xmlns:xlink="http://www.w3.org/1999/xlink";>
 
 <!-- THIS FILE IS AUTOGENERATED.  DO NOT EDIT OR CHECK IN! -->
 
 ' >cll.xml
 
 testing=""
-if [ "$1" -eq "-t" ]
+if [ "$1" = "-t" ]
 then
   testing=1
   shift
   echo "Entering testing mode: will replace all external xrefs in each chapter."
 fi
 #<chapter xml:id="chapter-selbri">
 #<section xml:id="section-brivla">
 
 for file in $@
 do

commit 5ac80f68b72d49c5af2d65421e1596ffd0a81115
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Sun Jan 2 15:41:36 2011 -0800

    Documentation and script change.

diff --git a/todocbook/README b/todocbook/README
index a4ecd78..f421d90 100644
--- a/todocbook/README
+++ b/todocbook/README
@@ -1,9 +1,9 @@
 To make the XHTML version (ends up in a dir named html/):
 
   make
 
 This takes quite a while.  To do it for just one chapter for faster
 testing:
 
-  merge -t 5.xml
+  ./merge -t 5.xml
   make
diff --git a/todocbook/merge.sh b/todocbook/merge.sh
index 21bba55..87e64a4 100755
--- a/todocbook/merge.sh
+++ b/todocbook/merge.sh
@@ -4,21 +4,21 @@ echo '<?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
                "dtd/docbook-5.0.dtd">
 
 <book xmlns:xlink="http://www.w3.org/1999/xlink";>
 
 <!-- THIS FILE IS AUTOGENERATED.  DO NOT EDIT OR CHECK IN! -->
 
 ' >cll.xml
 
 testing=""
-if [ "$1" == "-t" ]
+if [ "$1" -eq "-t" ]
 then
   testing=1
   shift
   echo "Entering testing mode: will replace all external xrefs in each chapter."
 fi
 #<chapter xml:id="chapter-selbri">
 #<section xml:id="section-brivla">
 
 for file in $@
 do

-- 
You received this message because you are subscribed to the Google Groups "BPFK" group.
To post to this group, send email to bpfk-list@googlegroups.com.
To unsubscribe from this group, send email to bpfk-list+unsubscribe@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/bpfk-list?hl=en.