Received: from mail-vb0-f61.google.com ([209.85.212.61]:36382)
	by stodi.digitalkingdom.org with esmtps (TLSv1:RC4-SHA:128)
	(Exim 4.76)
	(envelope-from <bpfk-list+bncCObBx8ecFhCc8rz9BBoEEuL7kw@googlegroups.com>)
	id 1STQSx-0003tX-KL; Sat, 12 May 2012 21:31:52 -0700
Received: by vbzb23 with SMTP id b23sf4774132vbz.16
        for <multiple recipients>; Sat, 12 May 2012 21:31:24 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=googlegroups.com; s=beta;
        h=x-beenthere:received-spf:from:date:to:subject:user-agent
         :mime-version:message-id:x-spam-score:x-spam_score:x-spam_score_int
         :x-spam_bar:sender:x-original-sender
         :x-original-authentication-results:reply-to:precedence:mailing-list
         :list-id:x-google-group-id:list-post:list-help:list-archive
         :list-subscribe:list-unsubscribe:content-type
         :content-transfer-encoding;
        bh=lqZTt9VmZjNPkqH3xlqeadGe6phy++mwpfp5DSRLt3o=;
        b=Zr8wnote4uLahzD+0sDWogM2uw8eDgE2ic7dNwth1Dgk07NwsH/Ajzfg6EYy0pZ3D6
         aYiddeJ/846y4QuX19sL8zGRWxD4ds9SPA/Y0J1j+k1Yalnd7PWxs/SdrAt/OC2YKrda
         yCGGNgB1z8e+EpjTVrH6JEFMqFJmYQJhxwM/o=
Received: by 10.50.169.37 with SMTP id ab5mr320059igc.1.1336883484626;
        Sat, 12 May 2012 21:31:24 -0700 (PDT)
X-BeenThere: bpfk-list@googlegroups.com
Received: by 10.231.8.197 with SMTP id i5ls4675623ibi.9.gmail; Sat, 12 May
 2012 21:31:24 -0700 (PDT)
Received: by 10.50.197.137 with SMTP id iu9mr2323876igc.5.1336883484186;
        Sat, 12 May 2012 21:31:24 -0700 (PDT)
Received: by 10.50.87.229 with SMTP id bb5msigb;
        Sat, 12 May 2012 20:21:17 -0700 (PDT)
Received: by 10.68.241.98 with SMTP id wh2mr2920356pbc.7.1336879277056;
        Sat, 12 May 2012 20:21:17 -0700 (PDT)
Received: by 10.68.241.98 with SMTP id wh2mr2920355pbc.7.1336879277045;
        Sat, 12 May 2012 20:21:17 -0700 (PDT)
Received: from stodi.digitalkingdom.org (mail.digitalkingdom.org. [173.13.139.236])
        by gmr-mx.google.com with ESMTPS id or6si8064959pbc.0.2012.05.12.20.21.16
        (version=TLSv1/SSLv3 cipher=OTHER);
        Sat, 12 May 2012 20:21:16 -0700 (PDT)
Received-SPF: pass (google.com: domain of nobody@stodi.digitalkingdom.org designates 173.13.139.236 as permitted sender) client-ip=173.13.139.236;
Received: from nobody by stodi.digitalkingdom.org with local (Exim 4.76)
	(envelope-from <nobody@stodi.digitalkingdom.org>)
	id 1STPMx-0003ZK-J7
	for bpfk-list@googlegroups.com; Sat, 12 May 2012 20:21:15 -0700
Received: from 173-13-139-235-sfba.hfc.comcastbusiness.net ([173.13.139.235]:33607 helo=digitalkingdom.org)
	by stodi.digitalkingdom.org with smtp (Exim 4.76)
	(envelope-from <apache@digitalkingdom.org>)
	id 1STPMn-0003ZC-2Q
	for bpfk@lojban.org; Sat, 12 May 2012 20:21:15 -0700
Received: by digitalkingdom.org (sSMTP sendmail emulation); Sat, 12 May 2012 20:21:04 -0700
From: "Apache" <apache@digitalkingdom.org>
Date: Sat, 12 May 2012 20:21:04 -0700
To: bpfk@lojban.org
Subject: [bpfk] dag-cll git updates for Sat May 12 20:21:03 PDT 2012
User-Agent: Heirloom mailx 12.5 7/5/10
MIME-Version: 1.0
Message-Id: <E1STPMn-0003ZC-2Q@stodi.digitalkingdom.org>
X-Spam-Score: 0.4 (/)
X-Spam_score: 0.4
X-Spam_score_int: 4
X-Spam_bar: /
Sender: bpfk-list@googlegroups.com
X-Original-Sender: nobody@stodi.digitalkingdom.org
X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com:
 domain of nobody@stodi.digitalkingdom.org designates 173.13.139.236 as
 permitted sender) smtp.mail=nobody@stodi.digitalkingdom.org
Reply-To: bpfk-list@googlegroups.com
Precedence: list
Mailing-list: list bpfk-list@googlegroups.com; contact bpfk-list+owners@googlegroups.com
List-ID: <bpfk-list.googlegroups.com>
X-Google-Group-Id: 972099695765
List-Post: <http://groups.google.com/group/bpfk-list/post?hl=en_US>, <mailto:bpfk-list@googlegroups.com>
List-Help: <http://groups.google.com/support/?hl=en_US>, <mailto:bpfk-list+help@googlegroups.com>
List-Archive: <http://groups.google.com/group/bpfk-list?hl=en_US>
List-Subscribe: <http://groups.google.com/group/bpfk-list/subscribe?hl=en_US>, <mailto:bpfk-list+subscribe@googlegroups.com>
List-Unsubscribe: <http://groups.google.com/group/bpfk-list/subscribe?hl=en_US>,
 <mailto:googlegroups-manage+972099695765+unsubscribe@googlegroups.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.7 (/)
X-Spam_score: -0.7
X-Spam_score_int: -6
X-Spam_bar: /
Content-Length: 8339

commit 8f313a25d262d4aa7fa256b4a1104fe773399410
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Sat May 12 19:45:14 2012 -0700

    Tiny changes to let it build; no idea why it ever worked.

diff --git a/chapters/17.xml b/chapters/17.xml
index 5ac87f4..0ad980c 100644
--- a/chapters/17.xml
+++ b/chapters/17.xml
@@ -722,36 +722,30 @@ ty. .ubu    vy. xy. .ybu    zy.
     <valsi>kanji</valsi> in Japanese) represent an entirely different appr=
oach to writing from alphabets or syllabaries. (A syllabary, such as Japane=
se hiragana or Amharic writing, has one lerfu for each syllable of the spok=
en language.) Very roughly, Chinese characters represent single elements of=
 meaning; also very roughly, they represent single syllables of spoken Chin=
ese. There is in principle no limit to the number of Chinese characters tha=
t can exist, and many thousands are in regular use.</para>
     <para>It is hopeless for Lojban, with its limited lerfu and shift word=
s, to create an alphabet which will match this diversity. However, there ar=
e various possible ways around the problem.</para>
     <para> <indexterm type=3D"general-imported"><primary>romaji</primary><=
secondary>as a basis for kanji characters in Lojban lerfu words</secondary>=
</indexterm>  <indexterm type=3D"general-imported"><primary>pinyin</primary=
><secondary>as a basis for Chinese characters in Lojban lerfu words</second=
ary></indexterm>  <indexterm type=3D"general-imported"><primary>kanji</prim=
ary><secondary>representing based on romaji spelling</secondary></indexterm=
>  <indexterm type=3D"general-imported"><primary>Chinese characters</primar=
y><secondary>representing based on pinyin spelling</secondary></indexterm> =
First, both Chinese and Japanese have standard Latin-alphabet representatio=
ns, known as=20
     <quote>pinyin</quote> for Chinese and=20
    =20
     <quote>romaji</quote> for Japanese, and these can be used. Thus, the w=
ord=20
    =20
     <quote>han=20
     <superscript>4</superscript> zi=20
     <superscript>4</superscript></quote> is conventionally written with tw=
o characters, but it may be spelled out as:</para>
+
+    <!-- FIXME: Shouldn't there be some suprescripts here somewhere?? Chec=
k the red book. If not, should the "4"s be quoted? -->
     <example role=3D"interlinear-gloss-example" xml:id=3D"example-random-i=
d-fBfe">
       <title>
         <anchor xml:id=3D"c17e8d1"/>
         <indexterm type=3D"example"><primary>han^{4}zi^{4}</primary></inde=
xterm>
       </title>
       <interlinear-gloss>
         <jbo>.y'y.bu .abu ny. vo zy. .ibu vo</jbo>
-        <natlang>
-          <quote>h</quote>
-          <quote>a</quote>
-          <quote>n</quote>
-          4
-          <quote>z</quote>
-          <quote>i</quote>
-          4
-        </natlang>
+        <natlang> <quote>h</quote> <quote>a</quote> <quote>n</quote> 4 <qu=
ote>z</quote> <quote>i</quote> 4 </natlang>
       </interlinear-gloss>
     </example>
     <para> <indexterm type=3D"general-imported"><primary>lerfu words with =
numeric digits</primary><secondary>grammar considerations</secondary></inde=
xterm>  <indexterm type=3D"general-imported"><primary>numeric digits in ler=
fu words</primary><secondary>grammar considerations</secondary></indexterm>=
 The cmavo=20
     <valsi>vo</valsi> is the Lojban digit=20
     <quote>4</quote>. It is grammatical to intersperse digits (of selma'o =
PA) into a string of lerfu words; as long as the first cmavo is a lerfu wor=
d, the whole will be interpreted as a string of lerfu words. In Chinese, th=
e digits can be used to represent tones. Pinyin is more usually written usi=
ng accent marks, the mechanism for which was explained in=20
    =20
     <xref linkend=3D"section-accents"/>.</para>
     <para>The Japanese company named=20
     <quote>Mitsubishi</quote> in English is spelled the same way in romaji=
, and could be spelled out in Lojban thus:</para>
    =20
diff --git a/chapters/19.xml b/chapters/19.xml
index 8129e52..0ee78cb 100644
--- a/chapters/19.xml
+++ b/chapters/19.xml
@@ -157,28 +157,27 @@
     <example role=3D"interlinear-gloss-example" xml:id=3D"example-random-i=
d-4WsN">
       <title>
         <anchor xml:id=3D"c19e4d1"/>
       </title>
       <interlinear-gloss>
         <jbo>mi klama le zarci</jbo>
         <natlang>I went to the market</natlang>
       </interlinear-gloss>
     </example>
     <para> <indexterm type=3D"general-imported"><primary>topic-comment</pr=
imary><secondary>description</secondary></indexterm> In Chinese, the normal=
 sentence form is different: a topic is stated, and a comment about it is m=
ade. (Japanese also has the concept of a topic, but indicates it by attachi=
ng a suffix; other languages also distinguish topics in various ways.) The =
topic says what the sentence is about:</para>
+    <!-- FIXME: check this whole example against the red book, carefully -=
->
     <example role=3D"interlinear-gloss-example" xml:id=3D"example-random-i=
d-ovFJ">
       <title>
         <anchor xml:id=3D"c19e4d2"/>
       </title>
       <interlinear-gloss>
-        <natlang xml:lang=3D"zh">
-          zhe<superscript>4</superscript> xiao<superscript>1</superscript>=
xi<superscript>2</superscript>   wo<superscript>3</superscript> zhi<supersc=
ript>1</superscript>dao le
-        </natlang> <!-- FIXME: instead of three spaces, why not a colon? -=
->
+        <natlang xml:lang=3D"zh"> zhe<superscript>4</superscript> xiao<sup=
erscript>1</superscript>xi<superscript>2</superscript>   wo<superscript>3</=
superscript> zhi<superscript>1</superscript>dao le </natlang> <!-- FIXME: i=
nstead of three spaces, why not a colon? -->
         <gloss>this news   I know [perfective]</gloss>
         <natlang>As for this news, I knew it.</natlang>
         <natlang>I've heard this news already.</natlang>
       </interlinear-gloss>
     </example>
     <para>=20
=20
  The wide space in the first two versions of=20
     <xref linkend=3D"example-random-id-ovFJ"/> separate the topic (=20
     <quote>this news</quote>) from the comment (=20

commit 2b5ddc6cd8de3092731e89e4dbdbe624ac370e10
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Sat May 12 19:45:07 2012 -0700

    Remove more on clean.

diff --git a/Makefile b/Makefile
index d192003..4a5b203 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
 test =3D=20
 chapters =3D $(if $(CHAPTERS), $(CHAPTERS), chapters/1.xml chapters/2.xml =
chapters/3.xml chapters/4.xml chapters/5.xml chapters/6.xml chapters/7.xml =
chapters/8.xml chapters/9.xml chapters/10.xml chapters/11.xml chapters/12.x=
ml chapters/13.xml chapters/14.xml chapters/15.xml chapters/16.xml chapters=
/17.xml chapters/18.xml chapters/19.xml chapters/20.xml chapters/21.xml)
=20
 .PHONY: all
 all: xhtml_web xhtml_sections_web xhtml_nochunks_web pdf_web epub_web mobi=
_web
=20
 .PHONY: clean
 clean:
-	-rm -rf cll* xhtml/ xhtml.done xhtml-nochunks/ xhtml-nochunks.done
+	-rm -rf cll* xhtml/ xhtml.done xhtml-nochunks/ xhtml-nochunks.done xhtml_=
chapters/ xhtml_chapters.done xhtml_sections/ xhtml_sections.done
=20
 .PHONY: realclean
 realclean: clean
 	-rm -rf jbovlaste.xml jbovlaste2.xml
=20
 #*******
 # Basic prep
 #*******
=20
 cll.xml: $(chapters)

commit a97476f4eddfd08775208efbe7b62b269b87f3f5
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Sat May 12 18:11:26 2012 -0700

    Wasn't testing properly.

diff --git a/scripts/merge.sh b/scripts/merge.sh
index 3a8fea3..1cca6da 100755
--- a/scripts/merge.sh
+++ b/scripts/merge.sh
@@ -59,21 +59,21 @@ do
       sed "s/<xref linkend=3D\"section-[^\"]*\"/<xref linkend=3D\"$section=
tag\"/g" >>cll.xml
   else
     cat $file >>cll.xml
   fi
 done
=20
 cp cll.xml cll_preglossary.xml
=20
 echo '</book>' >>cll_preglossary.xml
=20
-if [ "$testing" !=3D "solo" ]
+if [ "$testing" -a "$testing" !=3D "solo" ]
 then
   scripts/generate_glossary.sh -t >>cll.xml
 else
   scripts/generate_glossary.sh >>cll.xml
 fi
=20
 #rm cll_preglossary.xml
=20
 echo '
=20

--=20
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@googleg=
roups.com.
For more options, visit this group at http://groups.google.com/group/bpfk-l=
ist?hl=3Den.