[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bpfk] dag-cll git updates for Tue Mar 22 19:21:03 EDT 2011
commit 4472ba1187e65e02a2b04b3f7f356ab181554c55
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date: Tue Mar 22 15:52:23 2011 -0700
Various minor tweaks to make it compile; fixed an issue with the Ns
in the IPA table.
diff --git a/todocbook/10.xml b/todocbook/10.xml
index 0c2020c..0545d96 100644
--- a/todocbook/10.xml
+++ b/todocbook/10.xml
@@ -3453,38 +3453,38 @@
<cmavo-list>
<cmavo-entry>
<cmavo>noroi</cmavo>
<description>never</description>
</cmavo-entry>
<cmavo-entry>
<cmavo>paroi</cmavo>
<description>once</description>
</cmavo-entry>
<cmavo-entry>
- <para>[N]roi</para>
- <para>[N] times</para>
+ <pseudo-cmavo>[N]roi</pseudo-cmavo>
+ <description>[N] times</description>
</cmavo-entry>
<cmavo-entry>
<cmavo>roroi</cmavo>
<description>always</description>
</cmavo-entry>
<cmavo-entry>
<cmavo>pare'u</cmavo>
<description>the first time</description>
</cmavo-entry>
<cmavo-entry>
<cmavo>rere'u</cmavo>
<description>the second time</description>
</cmavo-entry>
<cmavo-entry>
- <para>[N]re'u</para>
- <para>the [N]th time</para>
+ <pseudo-cmavo>[N]re'u</pseudo-cmavo>
+ <description>the [N]th time</description>
</cmavo-entry>
</cmavo-list>
</listitem>
</varlistentry>
<varlistentry>
<term>TAhE</term>
<listitem>
<para>subjective quantified tense</para>
<cmavo-list>
<cmavo-entry>
diff --git a/todocbook/15.xml b/todocbook/15.xml
index ee86de8..73b6f73 100644
--- a/todocbook/15.xml
+++ b/todocbook/15.xml
@@ -1038,21 +1038,21 @@
</section>
<section xml:id="section-other-negation">
<title>Negation of minor grammatical constructs</title>
<para>We have a few other constructs that can be negated, all of them based on negating individual words. For such negation, we use the suffix-combining negator, which is
<valsi>nai</valsi>.
<valsi>nai</valsi>, by the way, is almost always written as a compound into the previous word that it is negating, although it is a regular separate-word cmavo and the sole member of selma'o NAI.</para>
<para>Most of these negation forms are straightforward, and should be discussed and interpreted in connection with an analysis of the particular construct being negated. Thus, we will not go into much detail here.</para>
<para>The following are places where
<valsi>nai</valsi> is used:</para>
<para>When attached to tenses and modals (see
- <xref linkend="section-modal-negation"/>, <xref linkend="section-interval-properties">, <xref linkend="section-tense-negation"> and <xref linkend="section-connected-tenses">), the
+ <xref linkend="section-modal-negation"/>, <xref linkend="section-interval-properties"/>, <xref linkend="section-tense-negation"/> and <xref linkend="section-connected-tenses"/>), the
<valsi>nai</valsi> suffix usually indicates a contradictory negation of the tagged bridi. Thus
<oldjbophrase>punai</oldjbophrase> as a tense inflection means
<quote>not-in-the-past</quote>, or
<quote>not-previously</quote>, without making any implication about any other time period unless explicitly stated. As a result,</para>
<example role="interlinear-gloss-example" xml:id="example-random-id-PprX">
<title>
<anchor xml:id="c15e7d1"/>
</title>
<interlinear-gloss>
<jbo>mi na pu klama le zarci</jbo>
diff --git a/todocbook/3.xml b/todocbook/3.xml
index c874516..da322b4 100644
--- a/todocbook/3.xml
+++ b/todocbook/3.xml
@@ -178,21 +178,21 @@
<row>
<entry><letteral>m</letteral></entry>
<entry><phrase role="IPA">[m]</phrase>, <phrase role="IPA">[m̩]</phrase>
</entry>
<entry><phrase role="X-SAMPA">[m]</phrase>, <phrase role="X-SAMPA">[m=]</phrase>
</entry>
<entry>a voiced bilabial nasal (may be syllabic)</entry>
</row>
<row>
<entry><letteral>n</letteral></entry>
- <entry><phrase role="IPA">[n]</phrase>, <phrase role="IPA">[n̩]</phrase>, <phrase role="IPA">[ŋ]</phrase>, <phrase role="IPA">[ŋ̩]</phrase>
+ <entry><phrase role="IPA">[n]</phrase>, <phrase role="IPA">[n̩]</phrase>, <phrase role="IPA">[ŋ]</phrase>, <phrase role="IPA">[ŋ̍]</phrase>
</entry>
<entry><phrase role="X-SAMPA">[n]</phrase>, <phrase role="X-SAMPA">[n=]</phrase>, <phrase role="X-SAMPA">[N]</phrase>, <phrase role="X-SAMPA">[N=]</phrase>
</entry>
<entry>a voiced dental or velar nasal (may be syllabic)</entry>
</row>
<row>
<entry><letteral>o</letteral></entry>
<entry><phrase role="IPA">[o]</phrase>, <phrase role="IPA">[ɔ]</phrase>
</entry>
<entry><phrase role="X-SAMPA">[o]</phrase>, <phrase role="X-SAMPA">[O]</phrase>
diff --git a/todocbook/docbook2html_preprocess.xsl b/todocbook/docbook2html_preprocess.xsl
index e76dd8d..3fbb60e 100644
--- a/todocbook/docbook2html_preprocess.xsl
+++ b/todocbook/docbook2html_preprocess.xsl
@@ -53,21 +53,21 @@
</xsl:template>
<!-- Turn cmavo-list nodes into tables. -->
<xsl:template match="cmavo-list">
<informaltable>
<tgroup cols="8">
<xsl:apply-templates select="cmavo-list-head"/>
<tbody>
<xsl:for-each select=".//cmavo-entry">
<row>
- <xsl:for-each select="cmavo|selmaho|description|gismu|rafsi|attitudinal-scale|modal-place">
+ <xsl:for-each select="cmavo|pseudo-cmavo|selmaho|description|gismu|rafsi|attitudinal-scale|modal-place">
<entry><xsl:value-of select="."/></entry>
</xsl:for-each>
</row>
</xsl:for-each>
</tbody>
</tgroup>
</informaltable>
</xsl:template>
<xsl:template match="cmavo-list-head">
@@ -318,29 +318,29 @@
</para>
</blockquote>
</xsl:template>
<xsl:template match="oldjbophrase" priority="1">
<phrase role="oldjbophrase">
<xsl:apply-templates select="node()|text()"/>
</phrase>
</xsl:template>
- <xsl:template match="place-structure[not(boolean(parent::title)) and not(boolean(parent::term)) and not(boolean(parent::member)) and not(boolean(parent::secondary))]" priority="100">
- <blockquote role="place-structure">
+ <xsl:template match="definition[not(boolean(parent::title)) and not(boolean(parent::term)) and not(boolean(parent::member)) and not(boolean(parent::secondary))]" priority="100">
+ <blockquote role="definition">
<para>
<xsl:apply-templates select="node()|text()"/>
</para>
</blockquote>
</xsl:template>
- <xsl:template match="place-structure" priority="1">
+ <xsl:template match="definition" priority="1">
<phrase>
<xsl:apply-templates select="node()|text()"/>
</phrase>
</xsl:template>
<xsl:template match="inlinemath" priority="1">
<inlineequation><mathphrase>
<xsl:apply-templates select="node()|text()"/>
</mathphrase></inlineequation>
</xsl:template>
--
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.