[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bpfk] dag-cll git updates for Sat May 12 20:21:03 PDT 2012
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 approach to writing from alphabets or syllabaries. (A syllabary, such as Japanese hiragana or Amharic writing, has one lerfu for each syllable of the spoken language.) Very roughly, Chinese characters represent single elements of meaning; also very roughly, they represent single syllables of spoken Chinese. There is in principle no limit to the number of Chinese characters that can exist, and many thousands are in regular use.</para>
<para>It is hopeless for Lojban, with its limited lerfu and shift words, to create an alphabet which will match this diversity. However, there are various possible ways around the problem.</para>
<para> <indexterm type="general-imported"><primary>romaji</primary><secondary>as a basis for kanji characters in Lojban lerfu words</secondary></indexterm> <indexterm type="general-imported"><primary>pinyin</primary><secondary>as a basis for Chinese characters in Lojban lerfu words</secondary></indexterm> <indexterm type="general-imported"><primary>kanji</primary><secondary>representing based on romaji spelling</secondary></indexterm> <indexterm type="general-imported"><primary>Chinese characters</primary><secondary>representing based on pinyin spelling</secondary></indexterm> First, both Chinese and Japanese have standard Latin-alphabet representations, known as
<quote>pinyin</quote> for Chinese and
<quote>romaji</quote> for Japanese, and these can be used. Thus, the word
<quote>han
<superscript>4</superscript> zi
<superscript>4</superscript></quote> is conventionally written with two characters, but it may be spelled out as:</para>
+
+ <!-- FIXME: Shouldn't there be some suprescripts here somewhere?? Check the red book. If not, should the "4"s be quoted? -->
<example role="interlinear-gloss-example" xml:id="example-random-id-fBfe">
<title>
<anchor xml:id="c17e8d1"/>
<indexterm type="example"><primary>han^{4}zi^{4}</primary></indexterm>
</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 <quote>z</quote> <quote>i</quote> 4 </natlang>
</interlinear-gloss>
</example>
<para> <indexterm type="general-imported"><primary>lerfu words with numeric digits</primary><secondary>grammar considerations</secondary></indexterm> <indexterm type="general-imported"><primary>numeric digits in lerfu words</primary><secondary>grammar considerations</secondary></indexterm> The cmavo
<valsi>vo</valsi> is the Lojban digit
<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 word, the whole will be interpreted as a string of lerfu words. In Chinese, the digits can be used to represent tones. Pinyin is more usually written using accent marks, the mechanism for which was explained in
<xref linkend="section-accents"/>.</para>
<para>The Japanese company named
<quote>Mitsubishi</quote> in English is spelled the same way in romaji, and could be spelled out in Lojban thus:</para>
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="interlinear-gloss-example" xml:id="example-random-id-4WsN">
<title>
<anchor xml:id="c19e4d1"/>
</title>
<interlinear-gloss>
<jbo>mi klama le zarci</jbo>
<natlang>I went to the market</natlang>
</interlinear-gloss>
</example>
<para> <indexterm type="general-imported"><primary>topic-comment</primary><secondary>description</secondary></indexterm> In Chinese, the normal sentence form is different: a topic is stated, and a comment about it is made. (Japanese also has the concept of a topic, but indicates it by attaching 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="interlinear-gloss-example" xml:id="example-random-id-ovFJ">
<title>
<anchor xml:id="c19e4d2"/>
</title>
<interlinear-gloss>
- <natlang xml:lang="zh">
- zhe<superscript>4</superscript> xiao<superscript>1</superscript>xi<superscript>2</superscript> wo<superscript>3</superscript> zhi<superscript>1</superscript>dao le
- </natlang> <!-- FIXME: instead of three spaces, why not a colon? -->
+ <natlang xml:lang="zh"> zhe<superscript>4</superscript> xiao<superscript>1</superscript>xi<superscript>2</superscript> wo<superscript>3</superscript> zhi<superscript>1</superscript>dao le </natlang> <!-- FIXME: instead 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>
The wide space in the first two versions of
<xref linkend="example-random-id-ovFJ"/> separate the topic (
<quote>this news</quote>) from the comment (
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 =
chapters = $(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.xml 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)
.PHONY: all
all: xhtml_web xhtml_sections_web xhtml_nochunks_web pdf_web epub_web mobi_web
.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
.PHONY: realclean
realclean: clean
-rm -rf jbovlaste.xml jbovlaste2.xml
#*******
# Basic prep
#*******
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=\"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
-if [ "$testing" != "solo" ]
+if [ "$testing" -a "$testing" != "solo" ]
then
scripts/generate_glossary.sh -t >>cll.xml
else
scripts/generate_glossary.sh >>cll.xml
fi
#rm cll_preglossary.xml
echo '
--
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.