Received: from mail-pv0-f189.google.com ([74.125.83.189])
	by chain.digitalkingdom.org with esmtp (Exim 4.72)
	(envelope-from <bpfk-list+bncCMbnveiNHRCXq4_pBBoEuIzQdw@googlegroups.com>)
	id 1PaJ07-00081X-8L; Tue, 04 Jan 2011 18:21:26 -0800
Received: by pvh1 with SMTP id 1sf6095873pvh.16
        for <multiple recipients>; Tue, 04 Jan 2011 18:21:17 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=googlegroups.com; s=beta;
        h=domainkey-signature:received:mime-version:x-beenthere:received
         :received:received:received:received-spf:received:received:received
         :date:message-id:to:subject:from:x-original-sender
         :x-original-authentication-results:reply-to:precedence:mailing-list
         :list-id:list-post:list-help:list-archive:sender:list-subscribe
         :list-unsubscribe:content-type;
        bh=9Wbp41r65LQ2qHE7Z7JMz3w66hqkJfntbZs2QO3LTPY=;
        b=vJzudbrOhfvN6IPfQkGaSCFjYIExvXmET4nDaS5gO2MmZmxbCHpgO8EbFLm06PIEAV
         UuSfGBBjhTk169Gd5m+JBtuUEmdixani7uvkcBXiedot2TxrlZ1KDu3vCA9WC8n/vfHG
         kOSUA2O+fWGfelMYLm6ZG1J3rpbNAP/g0e7iQ=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=googlegroups.com; s=beta;
        h=mime-version:x-beenthere:received-spf:date:message-id:to:subject
         :from:x-original-sender:x-original-authentication-results:reply-to
         :precedence:mailing-list:list-id:list-post:list-help:list-archive
         :sender:list-subscribe:list-unsubscribe:content-type;
        b=AivJB5puotGuU78+VgpNmKPpODNCvT3EX/Dii9RcuXA/lKi7V31IKEnzxnkoKI13c1
         OoYYw5smlMm5cjzq4VzsFdFo9KNf5oAudgeu9KCjMa4g1sk4nTYczTJhEbAUdLHtCyGC
         kIxuAlf/nCP26iyA8Hw/nQ43rCbqDtN8/UMKM=
Received: by 10.143.85.10 with SMTP id n10mr1058805wfl.50.1294194071356;
        Tue, 04 Jan 2011 18:21:11 -0800 (PST)
MIME-Version: 1.0
X-BeenThere: bpfk-list@googlegroups.com
Received: by 10.142.121.31 with SMTP id t31ls23063288wfc.3.p; Tue, 04 Jan 2011
 18:21:10 -0800 (PST)
Received: by 10.142.240.17 with SMTP id n17mr16640376wfh.32.1294194070556;
        Tue, 04 Jan 2011 18:21:10 -0800 (PST)
Received: by 10.142.240.17 with SMTP id n17mr16640375wfh.32.1294194070516;
        Tue, 04 Jan 2011 18:21:10 -0800 (PST)
Received: from chain.digitalkingdom.org (digitalkingdom.org [173.13.139.234])
        by gmr-mx.google.com with ESMTPS id p40si23870705wfc.6.2011.01.04.18.21.10
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Tue, 04 Jan 2011 18:21:10 -0800 (PST)
Received-SPF: pass (google.com: best guess record for domain of nobody@digitalkingdom.org designates 173.13.139.234 as permitted sender) client-ip=173.13.139.234;
Received: from nobody by chain.digitalkingdom.org with local (Exim 4.72)
	(envelope-from <nobody@digitalkingdom.org>)
	id 1PaIzt-00081J-M2
	for bpfk-list@googlegroups.com; Tue, 04 Jan 2011 18:21:09 -0800
Received: from 128-177-28-49.ip.openhosting.com ([128.177.28.49] helo=oh-www1.lojban.org)
	by chain.digitalkingdom.org with esmtp (Exim 4.72)
	(envelope-from <www-data@oh-www1.lojban.org>)
	id 1PaIzo-000817-Kz
	for bpfk@lojban.org; Tue, 04 Jan 2011 18:21:09 -0800
Received: from www-data by oh-www1.lojban.org with local (Exim 4.72)
	(envelope-from <www-data@oh-www1.lojban.org>)
	id 1PaIzn-0005nn-LP
	for bpfk@lojban.org; Tue, 04 Jan 2011 21:21:03 -0500
Date: Tue, 04 Jan 2011 21:21:03 -0500
Message-Id: <E1PaIzn-0005nn-LP@oh-www1.lojban.org>
To: bpfk@lojban.org
Subject: [bpfk] dag-cll git updates for Tue Jan  4 21:21:03 EST 2011
From: www-data <www-data@oh-www1.lojban.org>
X-Original-Sender: www-data@oh-www1.lojban.org
X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com:
 best guess record for domain of nobody@digitalkingdom.org designates
 173.13.139.234 as permitted sender) smtp.mail=nobody@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>
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>
Sender: bpfk-list@googlegroups.com
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:bpfk-list+unsubscribe@googlegroups.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Length: 4915

commit 5b85cff2223e332c35d5fc4b9db4330700d2bdf2
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date:   Tue Jan 4 17:42:55 2011 -0800

    Better glossary handling.

diff --git a/todocbook/TODO b/todocbook/TODO
index 969a951..35b659d 100644
--- a/todocbook/TODO
+++ b/todocbook/TODO
@@ -95,21 +95,21 @@ annoying.
 
 If you see a <quote>...</quote> around Lojban text, replace it with
 <jbophrase>...</jbophrase>.  There are lots of these.
 
 Also, use <jbophrase valid="false">...</jbophrase> for na gendra and
 <jbophrase valid="iffy">...</jbophrase> for na smudra
 
 Turn letterals, like <quote>l</quote>, into <jbophrase
 role="letteral">l</jbophrase>
 
-Similarily we have role="morphology", role="dipthong", and
+Similarily we have role="morphology", role="diphthong", and
 role="rafsi"
 
  ------
 
 <programlisting> is bad; change it.  If you can't figure out how to
 change it, or think it's actually correct in some particular place,
 post to the BPFK list.
 
  ------
 
diff --git a/todocbook/docbook2html_preprocess.xsl b/todocbook/docbook2html_preprocess.xsl
index d925a9f..95de8ea 100644
--- a/todocbook/docbook2html_preprocess.xsl
+++ b/todocbook/docbook2html_preprocess.xsl
@@ -165,20 +165,31 @@
     </xsl:choose>
   </xsl:template>
 
   <!-- <en> tags that arn't in <interlinear-gloss> tags -->
   <xsl:template match="example/en[not(boolean(ancestor::interlinear-gloss))]">
     <para>
       <xsl:value-of select='.//text()'/>
     </para>
   </xsl:template>
 
+  <!-- <compound-cmavo> tags; placeholder -->
+  <xsl:template match="compound-cmavo">
+    <simplelist>
+      <xsl:for-each select=".//jbo">
+        <member>
+          <xsl:value-of select=".//text()"/>
+        </member>
+      </xsl:for-each>
+    </simplelist>
+  </xsl:template>
+
   <!-- turn a string into a lowercase & dashes slug -->
   <xsl:template name="make_slug">
     <xsl:param name="input" select="''"/>
     <!-- This bit below just replaces ' with h-->
     <xsl:variable name="slug1">
       <xsl:value-of select="translate( $input, &#x22;&#x27;&#x22;, 'h' )"/>
     </xsl:variable>
     <!-- This bit below just deletes " -->
     <xsl:variable name="slug2">
       <xsl:value-of select='translate( $slug1, &#x27;&#x22;&#x27;, "" )'/>
@@ -195,24 +206,25 @@
         '&#x20;&#x9;&#xD;&#xA;ABCDEFGHIJKLMNOPQRSTUVWXYZ',
         '----abcdefghijklmnopqrstuvwxyz' )"/>
     </xsl:variable>
     <xsl:value-of select="$slug"/>
   </xsl:template>
 
   <!-- turn <jbophrase> elements with single lojban words into
        glossary and indexed elements
        -->
   <!-- If you change the match here, also change it in
-       docbook2html_preprocess.xsl ; search for LOJBAN WORDS MATCH
+       generate_glossary.xsl ; search for LOJBAN WORDS MATCH
        -->
   <xsl:template match="jbophrase[count(str:tokenize(text())) = 1 and ( not(@glossary) or @glossary != 'false')
-    and ( not(@role) or ( @role != 'morphology' and @role != 'rafsi' and @role != 'dipthong' and @role != 'letteral' ) ) ]">
+    and ( not(@role) or ( @role != 'morphology' and @role != 'rafsi' and @role != 'diphthong' and @role != 'letteral' ) ) ]"
+    priority="2">
     <xsl:variable name="wordsnum">
       <xsl:value-of select="count(str:tokenize(text()))"/>
     </xsl:variable>
     <xsl:variable name="slug">
       <xsl:call-template name="make_slug">
         <xsl:with-param name="input" select="text()"/>
       </xsl:call-template>
     </xsl:variable>
     <!-- FIXME: the role is currently only used by the chapter2
          markup stuff, which still needs to be implemented
@@ -227,22 +239,22 @@
         <indexterm>
           <xsl:attribute name="type">lojban-words</xsl:attribute>
           <primary><xsl:value-of select="text()"/></primary>
         </indexterm>
         <xsl:value-of select="text()"/>
       </foreignphrase>
     </glossterm>
   </xsl:template>
 
   <!-- lojban phrases and/or unglossed words -->
-  <xsl:template match="jbophrase[count(str:tokenize(text())) > 1 or @glossary = 'false'
-    or @role = 'morphology' or @role = 'rafsi' or @role = 'diphthong' or @role = 'letteral' ]">
+  <xsl:template match="jbophrase"
+    priority="1">
     <xsl:variable name="wordsnum">
       <xsl:value-of select="count(str:tokenize(text()))"/>
     </xsl:variable>
     <xsl:variable name="slug">
       <xsl:call-template name="make_slug">
         <xsl:with-param name="input" select="text()"/>
       </xsl:call-template>
     </xsl:variable>
     <!-- FIXME: the role is currently only used by the chapter2
          markup stuff, which still needs to be implemented

-- 
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.