[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bpfk] dag-cll git updates for Sat Mar 24 23:21:03 PDT 2012
commit 129409fb065b501fe619be5ef6d0ab08c0d8bd04
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
Date: Sat Mar 24 23:15:13 2012 -0700
much better table handling for the pdf
diff --git a/TODO b/TODO
index a753230..e1dd021 100644
--- a/TODO
+++ b/TODO
@@ -1,70 +1,11 @@
==================
-PDF Visual Issues
-==================
-
-Maybe add an interlinear-gloss-manual? for manual grouping that
-isn't chapter 2 style; otherwise it's hard to see how to make
-something like this work:
-
- le se nelci cu cafne
- The liked-thing is-frequent.
-
-18-17:36 < tsani> rlpowell: why sans serif fonts for the titles? Wouldn't serif look nicer?
-18-17:38 < tsani> rlpowell: also, chapter 2's title is hyphenated? Not very aesthetic
-18-17:39 < tsani> Also, I like the glossary at the end
-18-17:40 < tsani> that was definitely missing in the first version
-18-17:40 < tsani> but, the brivla definitions are messed up, as in they look like << $X_{1}$ is
- high/up/upward... >>
-18-17:41 < tsani> additionally, I think that it would look better if the glossary looked a bit
- more dictionary-like, with columns, and maybe a smaller font.
-18-17:42 < lunra> Personally Serif fonts annoy me.
-18-17:42 < lunra> I love nice clean smooth Sans fonts. Then again I love monospace.
-18-17:42 < tsani> :P
-18-17:42 < tsani> everyone loves monospace, but not for a book, pe'i
-18-17:44 < tsani> rlpowell: I think that having the glossary split into [cmavo], [brivla], and
- [cmene] sections might be worth while
-18-17:44 < lunra> ^
-18-17:44 -!- Amie_ [~Amie@117.192.246.12] has joined #lojban
-18-17:44 < tsani> rlpowell: where the cmavo definitions say in which section the cmavo is
- discussed
-18-17:46 -!- zugz [~zugz@bas8-hamilton14-3096449902.dsl.bell.ca] has joined #lojban
-18-17:46 < tsani> rlpowell: the x/780 for the page numbers is weird, I find. Simply x is enough,
- I think.
-18-17:47 -!- Amie [~Amie@117.192.248.3] has quit [Ping timeout: 248 seconds]
-18-17:47 < tsani> rlpowell: Also, there seems to be a large space between "Example x.y" and the
- box for the example proper.
-18-17:49 < tsani> I think that shading the example boxes would be nice as well.
-18-17:49 < tsani> Ah, some of the examples, for example on page 56, are tables with some empty
- cells. It definitely looks silly.
-
-==================
- New Tool Note
-==================
-
-Calibre, which exists in yum:
-
-rlpowell@vrici> sudo yum whatprovides '*ebook-convert*'
-Loaded plugins: langpacks, presto, refresh-packagekit
-calibre-0.7.56-1.fc15.x86_64 : E-book converter and library management
-Repo : fedora
-Matched from:
-Filename : /usr/share/man/man1/ebook-convert.1.gz
-Filename : /usr/bin/ebook-convert
-Filename : /usr/share/calibre/ebook-convert-complete.pickle
-
-has an ebook conversion tool that *takes HTML*:
-
-http://manual.calibre-ebook.com/cli/ebook-convert-4.html#html-input-to-pdf-output
-
-
-==================
Instructions For Helpers
==================
Ok, things are a lot more miscellaneous now, and require a lot more
care and attention.
First off,
YOU MUST READ "README-tags"
@@ -77,27 +18,57 @@ help at this stage.
IF YOU CHANGE, ADD, OR REMOVE ANY ACTUAL CONTENT, I WILL EAT YOUR
FAMILY. WITH STEAK SAUCE. MMMMMM.
If you make a change that is not *solely* XML tags, that's a content
change, and I will hunt you down and bad things will occur.
------
==================
+PDF Visual Issues
+==================
+
+Maybe add an interlinear-gloss-manual? for manual grouping that
+isn't chapter 2 style; otherwise it's hard to see how to make
+something like this work:
+
+ le se nelci cu cafne
+ The liked-thing is-frequent.
+
+18-17:44 < tsani> rlpowell: I think that having the glossary split into [cmavo], [brivla], and
+ [cmene] sections might be worth while
+18-17:44 < tsani> rlpowell: where the cmavo definitions say in which section the cmavo is
+ discussed
+
+==================
+I Don't Even
+==================
+24-22:44 < rlpowell> *Neat*.
+24-22:45 < rlpowell> The HTML and the LaTeX number the examples differently.
+24-22:45 < rlpowell> *THAT'S* gonna need to change.
+
+==================
+ Random Visual Issues (numbered by chapter)
+==================
+2. "sumti selbri sumti (argument)" below example 2.3 looks weird;
+compare red book.
+2. NOT FIRST PASS, but section 2.4 should be dropped eventually.
+2. S1.11: "gismu:" as a line by itself looks pretty lame.
+
+==================
Issues noticed during the proofread
==================
1. Captions to Pictures section is broken
-2. Bridi diagram is broken
2. Description of formatting for interlinear-gloss needs to be fixed to match the formatting changes
-2. Example 2.9 could do with some re-formatting
+2. Example 2.9 could do with some re-formatting (compare 5.3 in http://dag.github.com/cll/2/5/ )
3. Tengwar table should be made multi-column to save vertical space
4. Example 4.4 is formatted differently from other nearby and similar examples
4. Examples 4.24, 4.26-4.38, 4.52-4.70 are missing content
- The content in question gets deleted by xml/docbook2html_preprocess.xsl
4. Examples 4.46-4.51 are broken, and 4.51 is not present in the red book
4. Broken HTML character codes on the last line of page 79 of the red book
- This is from the <quote xml:lang="el"/> tag not being handled properly in the docbook->html conversion
5. Table of language acronyms in section 14 could use reformatting to save space
7. Section cmavo lists are missing series information
- This seems to be due to the <series> tag not being handled by the xml->docbook conversion
diff --git a/chapters/2.xml b/chapters/2.xml
index e9ddf8a..63bc84f 100644
--- a/chapters/2.xml
+++ b/chapters/2.xml
@@ -329,21 +329,21 @@
<xref linkend="chapter-lujvo"/> explains how to give them appropriate meanings.</para>
</section>
<section xml:id="section-some-simple-bridi">
<title>Some simple Lojban bridi</title>
<para> <indexterm type="general-imported"><primary>bridi</primary><secondary>quick-tour version</secondary></indexterm> Let's look at a simple Lojban bridi. The place structure of the gismu
<valsi>tavla</valsi> is</para>
<example xml:id="example-random-id-5Lis">
<title>
<anchor xml:id="c2e5d1"/>
</title>
- <para><definition><content>x1 talks to x2 about x3 in language x4</content></definition></para>
+ <para>x1 talks to x2 about x3 in language x4</para>
</example>
<para>where the
<quote>x</quote> es with following numbers represent the various arguments that could be inserted at the given positions in the English sentence. For example:</para>
<example xml:id="example-random-id-3bc3">
<title>
<indexterm type="example"><primary>engineering</primary><secondary>example</secondary></indexterm>
<anchor xml:id="c2e5d2"/>
</title>
<para>John talks to Sam about engineering in Lojban.</para>
@@ -753,22 +753,22 @@
<jbo>sutra tavla</jbo>
</interlinear-gloss>
</example>
<para>has the place structure</para>
<example xml:id="example-random-id-ANfh">
<title>
<indexterm type="example"><primary>fast talker</primary><secondary>example</secondary></indexterm>
<anchor xml:id="c2e9d2"/>
</title>
- <para><definition><content>x1 is a fast type-of talker to x2 about x3 in language x4</content></definition></para>
- <para><definition><content>x1 talks fast to x2 about x3 in language x4</content></definition></para>
+ <para>x1 is a fast type-of talker to x2 about x3 in language x4</para>
+ <para>x1 talks fast to x2 about x3 in language x4</para>
</example>
<para>
<indexterm type="general-imported"><primary>tanru default grouping</primary><secondary>quick-tour version</secondary></indexterm> When three or more gismu are in a row, the first modifies the second, and that combined meaning modifies the third, and that combined meaning modifies the fourth, and so on. For example</para>
<example role="interlinear-gloss-example" xml:id="example-random-id-pzS9">
<title>
<anchor xml:id="c2e9d3"/>
</title>
<interlinear-gloss>
@@ -778,21 +778,21 @@
<para>
has the place structure</para>
<example xml:id="example-random-id-7KPn">
<title>
<indexterm type="example"><primary>fast-talker shoe</primary><secondary>example</secondary></indexterm>
<anchor xml:id="c2e9d4"/>
</title>
- <para><definition><content>s1 is a fast-talker type of shoe worn by s2 of material s3</content></definition></para>
+ <para>s1 is a fast-talker type of shoe worn by s2 of material s3</para>
</example>
<para>That is, it is a shoe that is worn by a fast talker rather than a shoe that is fast and is also worn by a talker.</para>
<para>Note especially the use of
<quote>type-of</quote> as a mechanism for connecting the English translations of the two or more gismu; this convention helps the learner understand each tanru in its context. Creative interpretations are also possible, however:</para>
<example role="interlinear-gloss-example" xml:id="example-random-id-jE94">
<title>
<indexterm type="example"><primary>runner shoe</primary><secondary>example</secondary></indexterm>
<anchor xml:id="c2e9d5"/>
@@ -1842,21 +1842,21 @@
<elidable>cu</elidable>
<selbri>klama</selbri>
<sumti>le melbi</sumti>
<cmavo>.ui</cmavo>
<elidable>ku</elidable>
</jbo>
<gloss>
<sumti>I</sumti>
<elidable></elidable>
<selbri>go</selbri>
- <sumti>to the beautiful-thing</sumti>
+ <sumti>to-the beautiful-thing</sumti>
<cmavo>and I am happy because it is the beautiful thing I'm going to</cmavo>
<elidable></elidable>
</gloss>
</interlinear-gloss-itemized>
</example>
<para> <indexterm type="general-imported"><primary>but/and equivalence</primary></indexterm> <indexterm type="general-imported"><primary>metalinguistic words</primary><secondary>quick-tour version</secondary></indexterm> <indexterm type="general-imported"><primary>discursives</primary><secondary>quick-tour version</secondary></indexterm> Not all indicators indicate attitudes. Discursives, another group of cmavo with the same grammatical rules as attitudinal indicators, allow free expression of certain kinds of commentary about the main utterances. Using discursives allows a clear separation of these so-called
<quote>metalinguistic</quote> features from the underlying statements and logical structure. By comparison, the English words
<quote>but</quote> and
@@ -2043,45 +2043,49 @@
<xref linkend="example-random-id-xIVa"/> or
<xref linkend="example-random-id-1Acu"/>, and of many other possible English sentences as well. It is not marked for tense, and can refer to an event in the past, the present or the future. This rule does not mean that Lojban has no way of representing the time of an event. A close translation of
<xref linkend="example-random-id-xIVa"/> would be:</para>
<example role="interlinear-gloss-example" xml:id="example-random-id-k1Y5">
<title>
<anchor xml:id="c2e17d4"/>
</title>
<interlinear-gloss-itemized>
<jbo>
<sumti>la djan.</sumti>
- <selbri>pu klama</selbri>
+ <cmavo>pu</cmavo>
+ <selbri>klama</selbri>
<sumti>le zarci</sumti>
</jbo>
<gloss>
<sumti>John</sumti>
- <selbri>[past] goes</selbri>
+ <cmavo>[past]</cmavo>
+ <selbri>goes</selbri>
<sumti>to-the store</sumti>
</gloss>
</interlinear-gloss-itemized>
</example>
<para>where the tag
<valsi>pu</valsi> forces the sentence to refer to a time in the past. Similarly,</para>
<example role="interlinear-gloss-example" xml:id="example-random-id-k1Y8">
<title>
<anchor xml:id="c2e17d5"/>
</title>
<interlinear-gloss-itemized>
<jbo>
<sumti>la djan.</sumti>
- <selbri>ca klama</selbri>
+ <cmavo>ca</cmavo>
+ <selbri>klama</selbri>
<sumti>le zarci</sumti>
</jbo>
<gloss>
<sumti>John</sumti>
- <selbri>[present] goes</selbri>
+ <cmavo>[present]</cmavo>
+ <selbri>goes</selbri>
<sumti>to-the store</sumti>
</gloss>
</interlinear-gloss-itemized>
</example>
<para>necessarily refers to the present, because of the tag
<valsi>ca</valsi>. Tags used in this way always appear at the very beginning of the selbri, just after the
<valsi>cu</valsi>, and they may make a
<valsi>cu</valsi> unnecessary, since tags cannot be absorbed into tanru. Such tags serve as an equivalent to English tenses and adverbs. In Lojban, tense information is completely optional. If unspecified, the appropriate tense is picked up from context.</para>
<para> <indexterm type="general-imported"><primary>space tenses</primary><secondary>quick-tour version</secondary></indexterm> Lojban also extends the notion of
diff --git a/latex/cll.sty b/latex/cll.sty
index 8b73fca..ada2f0b 100644
--- a/latex/cll.sty
+++ b/latex/cll.sty
@@ -13,33 +13,45 @@
% Default values
\ExecuteOptions{nohyperlink}
% If defined, process the options
\ProcessOptions\relax
% Needed packages
\usepackage{float}
\usepackage{dbk_core}
+\usepackage{multicol}
+\usepackage{etoolbox}
+\usepackage{tabulary}
+\usepackage{soul}
+% Deal with the width provided for ToC numbers
\usepackage{savesym}
\savesymbol{c@lofdepth} % tocloft conflicts with subfigure.sty
\savesymbol{c@lotdepth} % tocloft conflicts with subfigure.sty
\usepackage{tocloft}
\addtolength{\cftsecnumwidth}{2em}
\addtolength{\cftchapnumwidth}{0.5em}
+
% Two-column glossaries and other such things
-\usepackage{multicol}
-\usepackage{etoolbox}
\BeforeBeginEnvironment{description}{\begin{multicols}{2}}\AfterEndEnvironment{description}{\end{multicols}}
\usepackage{fullpage}
+% Shaded examples
+\usepackage{framed,color}
+\definecolor{shadecolor}{gray}{0.9}
+\BeforeBeginEnvironment{example}{\begin{snugshade}}\AfterEndEnvironment{example}{\end{snugshade}}
+
+% Less vertical space at the top of examples
+\AtBeginEnvironment{example}{\vspace*{-1em}}
+
%% % LaTeX <othercredit> commands to define
%% %
%% % #1: mapped to <contrib>
%% % #2: mapped to <firstname> <surname>
%% %
%% \def\DBKinditem#1#2{
%% #2 & #1 \tabularnewline
%% \hline
%% }
%%
diff --git a/xml/latex_preprocess.xsl b/xml/latex_preprocess.xsl
index 1820801..2fb1939 100644
--- a/xml/latex_preprocess.xsl
+++ b/xml/latex_preprocess.xsl
@@ -41,21 +41,21 @@
<xsl:template match="para[@role='selbri' and ancestor::informaltable]">
<latex-verbatim>
<xsl:text>\bf{</xsl:text>
<xsl:apply-templates select="node()|text()"/>
<xsl:text>}</xsl:text>
</latex-verbatim>
</xsl:template>
<xsl:template match="para[@role='sumti' and ancestor::informaltable]">
<latex-verbatim>
- <xsl:text>\underline{</xsl:text>
+ <xsl:text>\ul{</xsl:text>
<xsl:apply-templates select="node()|text()"/>
<xsl:text>}</xsl:text>
</latex-verbatim>
</xsl:template>
<!-- backticks appear in chapter 3, and this upsets LaTeX a bit;
fix it.
-->
<xsl:template match="phrase[@role='X-SAMPA']/text()">
<xsl:call-template name="string-char-replace">
@@ -79,26 +79,24 @@
</xsl:for-each>
</xsl:template>
<xsl:template name="counted_table">
<xsl:param name="maximal" select="''"/>
<xsl:param name="items" select="''"/>
<latex-verbatim>
<!-- LaTeX table setup -->
<xsl:text>
% see longtable docs for these next lines
- \setlength\LTleft\parindent
- \setlength\LTright\fill
- \begin{longtable}{</xsl:text>
+ \begin{tabulary}{\linewidth}{</xsl:text>
<!-- LaTeX table width -->
<xsl:for-each select="$maximal/td">
- <xsl:text>l</xsl:text>
+ <xsl:text>L</xsl:text>
</xsl:for-each>
<xsl:text>} </xsl:text>
<xsl:for-each select="$items/tr">
<xsl:for-each select="./td">
<xsl:choose>
<!-- Deal with full width columns -->
<xsl:when test="@colspan='0'">
<xsl:text>\multicolumn{</xsl:text>
<xsl:value-of select="count($maximal/*)"/>
<xsl:text>}{l}{</xsl:text>
@@ -122,21 +120,21 @@
</xsl:otherwise>
</xsl:choose>
<!-- column terminator if not last -->
<xsl:if test="position() != last()">
<xsl:text>& </xsl:text>
</xsl:if>
</xsl:for-each>
<!-- end of row -->
<xsl:text>\tabularnewline </xsl:text>
</xsl:for-each>
- <xsl:text>\end{longtable}</xsl:text>
+ <xsl:text>\end{tabulary}</xsl:text>
</latex-verbatim>
</xsl:template>
<!-- deal with aleph -->
<xsl:template match="math/text()[contains(.,'ℵ')]|inlinemath/text()[contains(.,'ℵ')]|mathphrase/text()[contains(.,'ℵ')]">
<xsl:call-template name="string-char-replace">
<xsl:with-param name="from">ℵ</xsl:with-param>
<xsl:with-param name="to"><latex-verbatim>$\aleph$</latex-verbatim></xsl:with-param>
<xsl:with-param name="string" select="."/>
--
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.