Received: from mail-vb0-f61.google.com ([209.85.212.61]:53186) by stodi.digitalkingdom.org with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) (envelope-from ) id 1SBA0u-0000Ws-3l; Fri, 23 Mar 2012 12:19:15 -0700 Received: by vbbfd1 with SMTP id fd1sf2348083vbb.16 for ; Fri, 23 Mar 2012 12:18:57 -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=2VtRmpANVkPTXastB8z7oVkwNVjzaP+K/sS6lesa1bs=; b=fBBk93lQ+6Vwg0NAUjcWOtueOvFgVCiOOK20HrEiL0ugY88x8EpYIzgNB9eZYNxCcY Nue71SV9ybh7eYhuJ3IN9HAt2KSW4I3vG2NvlxI/AcR0xZsfIR82yOTJl10H7NnK8N15 ReZ0ur4tmHbcnFCgePcBF+fBmrH9sZRIxR/qw= Received: by 10.50.36.230 with SMTP id t6mr894137igj.5.1332530330326; Fri, 23 Mar 2012 12:18:50 -0700 (PDT) X-BeenThere: bpfk-list@googlegroups.com Received: by 10.50.87.170 with SMTP id az10ls1106240igb.4.gmail; Fri, 23 Mar 2012 12:18:50 -0700 (PDT) Received: by 10.50.183.230 with SMTP id ep6mr2108993igc.0.1332530329937; Fri, 23 Mar 2012 12:18:49 -0700 (PDT) Received: by 10.50.213.40 with SMTP id np8msigc; Thu, 22 Mar 2012 23:21:14 -0700 (PDT) Received: by 10.68.235.4 with SMTP id ui4mr10356673pbc.3.1332483673923; Thu, 22 Mar 2012 23:21:13 -0700 (PDT) Received: by 10.68.235.4 with SMTP id ui4mr10356672pbc.3.1332483673906; Thu, 22 Mar 2012 23:21:13 -0700 (PDT) Received: from stodi.digitalkingdom.org (mail.digitalkingdom.org. [173.13.139.236]) by gmr-mx.google.com with ESMTPS id e6si7109196pbt.1.2012.03.22.23.21.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Mar 2012 23:21:13 -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 ) id 1SAxs8-0002Ud-9U for bpfk-list@googlegroups.com; Thu, 22 Mar 2012 23:21:12 -0700 Received: from 173-13-139-235-sfba.hfc.comcastbusiness.net ([173.13.139.235]:35456 helo=digitalkingdom.org) by stodi.digitalkingdom.org with smtp (Exim 4.76) (envelope-from ) id 1SAxs0-0002UW-HJ for bpfk@lojban.org; Thu, 22 Mar 2012 23:21:11 -0700 Received: by digitalkingdom.org (sSMTP sendmail emulation); Thu, 22 Mar 2012 23:21:04 -0700 From: "Apache" Date: Thu, 22 Mar 2012 23:21:03 -0700 To: bpfk@lojban.org Subject: [bpfk] dag-cll git updates for Thu Mar 22 23:21:03 PDT 2012 User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: X-Spam-Score: 1.0 (+) X-Spam_score: 1.0 X-Spam_score_int: 10 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: X-Google-Group-Id: 972099695765 List-Post: , List-Help: , List-Archive: List-Subscribe: , List-Unsubscribe: , Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Spam_score: -0.0 X-Spam_score_int: 0 X-Spam_bar: / commit e2dc9a80c0937dae8ff6ab26c90689d80a4884a2 Author: Robin Lee Powell Date: Thu Mar 22 22:39:56 2012 -0700 Whoops. Stupidly, the title format there matters. diff --git a/latex/cll.sty b/latex/cll.sty index 6851caf..8b73fca 100644 --- a/latex/cll.sty +++ b/latex/cll.sty @@ -1,17 +1,18 @@ =20 %% %% Stole much of this from %% /usr/lib/python2.7/site-packages/dblatex-0.3.2-py2.7.egg/share/dblatex/= latex/contrib/example/dbsimple.sty=20 %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{cll}[cll style] +% Note that the format (date first) here is important +\ProvidesPackage{cll}[2012/03/22 cll style] =20 % The defined options \DeclareOption{hyperlink}{ \def\DBKhyperlink{yes} } \DeclareOption{nohyperlink}{ \def\DBKhyperlink{no} } =20 % Default values \ExecuteOptions{nohyperlink} =20 % If defined, process the options \ProcessOptions\relax commit 60bf9914c16140e0184fb28e62859118fc567841 Author: Robin Lee Powell Date: Thu Mar 22 22:28:23 2012 -0700 docs tweak, essentially. diff --git a/latex/cll.sty b/latex/cll.sty index 7365cd8..6851caf 100644 --- a/latex/cll.sty +++ b/latex/cll.sty @@ -1,16 +1,17 @@ =20 %% -%% This is a DocBook LaTeX style example +%% Stole much of this from +%% /usr/lib/python2.7/site-packages/dblatex-0.3.2-py2.7.egg/share/dblatex/= latex/contrib/example/dbsimple.sty=20 %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{dbsimple}[2003/04/11 Simple DocBook Style] +\ProvidesPackage{cll}[cll style] =20 % The defined options \DeclareOption{hyperlink}{ \def\DBKhyperlink{yes} } \DeclareOption{nohyperlink}{ \def\DBKhyperlink{no} } =20 % Default values \ExecuteOptions{nohyperlink} =20 % If defined, process the options \ProcessOptions\relax commit 1016383f16332bbe8e5eb6a5d23ecd834540b0a1 Author: Robin Lee Powell Date: Thu Mar 22 22:23:17 2012 -0700 Using a proper LaTeX style instead of the post-process insertion hack; yay. diff --git a/Makefile b/Makefile index d8626e9..49c0239 100644 --- a/Makefile +++ b/Makefile @@ -27,59 +27,64 @@ cll_processed_xhtml.xml: cll.xml xml/docbook2html_prepr= ocess.xsl =20 #******* # Many xhtml files #******* .PHONY: xhtml_web xhtml_web: xhtml.done mkdir -p ~/www/media/public/tmp rm -rf ~/www/media/public/tmp/cll-xhtml cp -pr xhtml ~/www/media/public/tmp/cll-xhtml cp $(PWD)/docbook2html.css ~/www/media/public/tmp/cll-xhtml/docbook2html= .css + mkdir -p ~/www/media/public/tmp/cll-xhtml/media + cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/cll-xhtml/me= dia/chapter-2-diagram.png =20 .PHONY: xhtml xhtml: xhtml.done xhtml.done: cll_processed_xhtml.xml xml/docbook2html_config.xsl rm -rf xhtml mkdir xhtml # FIXME: Consider doing something like this: -x /usr/share/sgml/docbook/x= sl-ns-stylesheets-1.76.1/fo/docbook.xsl # So we know exactly what stylesheets we're getting xmlto -m xml/docbook2html_config.xsl -o xhtml/ xhtml cll_processed_xhtml.= xml 2>&1 | grep -v 'No localization exists for "jbo" or "". Using default "= en".' touch xhtml.done =20 #******* # Section xhtml files #******* .PHONY: xhtml_sections_web xhtml_sections_web: xhtml_sections.done mkdir -p ~/www/media/public/tmp rm -rf ~/www/media/public/tmp/cll-xhtml-sections cp -pr xhtml_sections ~/www/media/public/tmp/cll-xhtml-sections cp $(PWD)/docbook2html.css ~/www/media/public/tmp/cll-xhtml-sections/doc= book2html.css + mkdir -p ~/www/media/public/tmp/cll-xhtml-sections/media + cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/cll-xhtml/se= ctions/media/chapter-2-diagram.png =20 .PHONY: xhtml_sections xhtml_sections: xhtml_sections.done xhtml_sections.done: cll_processed_xhtml.xml xml/docbook2html_config.xsl rm -rf xhtml_sections mkdir xhtml_sections # FIXME: Consider doing something like this: -x /usr/share/sgml/docbook/x= sl-ns-stylesheets-1.76.1/fo/docbook.xsl # So we know exactly what stylesheets we're getting xmlto -m xml/docbook2html_config_sections.xsl -o xhtml_sections/ --string= param chunk.section.depth=3D1 --stringparam chunk.first.sections=3D1 xhtml = cll_processed_xhtml.xml 2>&1 | grep -v 'No localization exists for "jbo" or= "". Using default "en".' touch xhtml_sections.done =20 #******* # One XHTML file #******* .PHONY: xhtml_nochunks_web xhtml_nochunks_web: xhtml-nochunks.done - mkdir -p ~/www/media/public/tmp + mkdir -p ~/www/media/public/tmp/media cp $(PWD)/docbook2html.css ~/www/media/public/tmp/docbook2html.css cp $(PWD)/xhtml-nochunks/cll_processed_xhtml.html ~/www/media/public/tmp/= cll-xhtml-nochunks.html + cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/media/chapte= r-2-diagram.png =20 .PHONY: xhtml_nochunks xhtml_nochunks: xhtml-nochunks.done xhtml-nochunks.done: cll_processed_xhtml.xml xml/docbook2html_config.xsl rm -rf xhtml-nochunks mkdir xhtml-nochunks ln -fs $(PWD)/docbook2html.css xhtml-nochunks/ # FIXME: Consider doing something like this: -x /usr/share/sgml/docbook/x= sl-ns-stylesheets-1.76.1/fo/docbook.xsl # So we know exactly what stylesheets we're getting xmlto -m xml/docbook2html_config.xsl -o xhtml-nochunks/ xhtml-nochunks cl= l_processed_xhtml.xml 2>&1 | grep -v 'No localization exists for "jbo" or "= ". Using default "en".' @@ -111,21 +116,21 @@ mobi_web: mobi =20 #******* # PDF # # We actually do need xetex (aka xalatex) here, for the IPA and # other utf-8 issues #******* .PHONY: pdf pdf: cll.pdf cll.pdf: cll_processed_pdf.xml xml/dblatex_config.xsl - dblatex -T simple -o cll.pdf -b xetex -p xml/dblatex_config.xsl -r post_p= rocess_latex.pl cll_processed_pdf.xml 2>&1 | grep -v 'default template used= in programlisting or screen' + dblatex -T latex/cll -o cll.pdf -b xetex -p xml/dblatex_config.xsl cll_pr= ocessed_pdf.xml 2>&1 | grep -v 'default template used in programlisting or = screen' =20 .PHONY: pdf_web pdf_web: pdf cp cll.pdf ~/www/media/public/tmp/cll.pdf =20 #********************* # Faster testing versions go here; lots of copy and paste; lame #********************* =20 .PHONY: test diff --git a/latex/cll.specs b/latex/cll.specs new file mode 100644 index 0000000..4632c30 --- /dev/null +++ b/latex/cll.specs @@ -0,0 +1,6 @@ +# +# Dblatex spec file example +# +TexInputs: . +TexStyle: cll +Options: -b xetex diff --git a/latex/cll.sty b/latex/cll.sty new file mode 100644 index 0000000..7365cd8 --- /dev/null +++ b/latex/cll.sty @@ -0,0 +1,102 @@ + +%% +%% This is a DocBook LaTeX style example +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{dbsimple}[2003/04/11 Simple DocBook Style] + +% The defined options +\DeclareOption{hyperlink}{ \def\DBKhyperlink{yes} } +\DeclareOption{nohyperlink}{ \def\DBKhyperlink{no} } + +% Default values +\ExecuteOptions{nohyperlink} + +% If defined, process the options +\ProcessOptions\relax + +% Needed packages +\usepackage{float} +\usepackage{dbk_core} + +\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}}\AfterEndEnviron= ment{description}{\end{multicols}} +\usepackage{fullpage} + +%% % LaTeX commands to define +%% % +%% % #1: mapped to +%% % #2: mapped to +%% % +%% \def\DBKinditem#1#2{ +%% #2 & #1 \tabularnewline +%% \hline +%% } +%% =20 +%% \newenvironment{DBKindtable}{ +%% \begin{tabular}{ |l|l| } +%% \hline +%% \emph{Collaborator} & \emph{Contribution} +%% \hline +%% }{ +%% \end{tabular} +%% } +%% =20 +%% % +%% % Latex table +%% % +%% \newenvironment{DBKrevtable}{ +%% \begin{longtable}{ |l|l|l|l| } +%% \hline +%% Revision number & Date & Release Info & Author \tabularnewline +%% \hline +%% \endhead +%% }{ +%% \end{longtable} +%% } +%% =20 +%% % +%% % environment skip the information +%% % +%% \newenvironment{DBKlegalnotice}{ +%% }{ +%% } + +% +% These floats must be defined to map and +% +\usepackage{float} + +\floatstyle{ruled} +\newfloat{example}{ht}{loe}[section] +\floatname{example}{Example} + +\floatstyle{plain} +\newfloat{dbequation}{ht}{loe}[section] +\floatname{dbequation}{{\scshape Equation }} + +%% % +%% % Nothing special for , , +%% % +%% \newenvironment{DBKadmonition}[2] { +%% }{ +%% } +%% =20 +%% % +%% % environment +%% % +%% \newenvironment{sidebar}[1][\textwidth]{ +%% \hspace{0mm}\newline% +%% \noindent\begin{Sbox}\begin{minipage}{#1} +%% }{ +%% \end{minipage}\end{Sbox}\shadowbox{\TheSbox}% +%% } +%% =20 diff --git a/post_process_latex.pl b/post_process_latex.pl deleted file mode 100755 index 891cf4c..0000000 --- a/post_process_latex.pl +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl -n -l -a -i - - -if( m{^\\makeindex$} ) { - # Fix spacing in the ToC - print q( - % BEGIN Added by post_process_latex.pl -% More space for the numbers in the ToC (table of contents) -\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}}\AfterEndEnviron= ment{description}{\end{multicols}} -\usepackage{fullpage} - % END Added by post_process_latex.pl - ); - print; - # These two covered by options -#} elsif( m{^\\frontmatter$} ) { -# # do nothing -#} elsif( m{^\\listof.example..List of Examples.$} ) { -# # do nothing -} else { - print; -} commit ca9b236bfa140342aabde8fcdf07bdc4ae61d551 Author: Robin Lee Powell Date: Thu Mar 22 22:22:56 2012 -0700 Tweaking the picture file diff --git a/chapters/2.xml b/chapters/2.xml index bceea82..e9ddf8a 100644 --- a/chapters/2.xml +++ b/chapters/2.xml @@ -57,21 +57,21 @@ bridi (predicate) ______________|__________________ | | John is the father of Sam |____| |______________| |___| | | | sumti selbri sumti (argument) - + =20 =20 =20 In a relationship, there are a definite number of things being related. I= n English, for example,=20 give has three places: the donor, the recipient and the= gift. For example: <anchor xml:id=3D"c2e1d4"/> diff --git a/media/chapter-2-diagram.png b/media/chapter-2-diagram.png new file mode 100644 index 0000000..edfb991 Binary files /dev/null and b/media/chapter-2-diagram.png differ diff --git a/media/chapter-2-diagram.svg b/media/chapter-2-diagram.svg new file mode 100644 index 0000000..95cc013 --- /dev/null +++ b/media/chapter-2-diagram.svg @@ -0,0 +1,43 @@ +<?xml version=3D"1.0" encoding=3D"UTF-8"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG Tiny 1.1//EN" "http://www.w3.org/Gra= phics/SVG/1.1/DTD/svg11-tiny.dtd"> +<svg version=3D"1.1" + baseProfile=3D"tiny" + xmlns=3D"http://www.w3.org/2000/svg" + xmlns:xlink=3D"http://www.w3.org/1999/xlink" + viewBox=3D"0 0 300 200" + width=3D"300" + height=3D"200" + preserveAspectRatio=3D"xMidYMid"> + + <text x=3D"125" y=3D"20" font-family=3D"Times New Roman" font-style=3D"i= talic" font-size=3D"20px">bridi</text> + <text x=3D"170" y=3D"20" font-family=3D"Times New Roman" font-style=3D"i= talic" font-size=3D"14">(predicate)</text> + + <polyline fill=3D"none" stroke=3D"black" stroke-width=3D"1" points=3D" + 144,25 144,50 15,50 15,62 15,50 273,50 273,62 273,50 144,50 144,25 + " /> + + <text x=3D"20" y=3D"75" font-family=3D"Arial">John</text> + <text x=3D"100" y=3D"75" font-family=3D"Arial">is the father of</text> + <text x=3D"235" y=3D"75" font-family=3D"Arial">Sam</text> + + <polyline fill=3D"none" stroke=3D"black" stroke-width=3D"1" points=3D" + 35,103 35,83 15,83 15,72 15,83 58,83 58,72 58,83 35,83 35,103 + " /> + + <polyline fill=3D"none" stroke=3D"black" stroke-width=3D"1" points=3D" + 145,103 145,83 95,83 95,72 95,83 201,83 201,72 201,83 145,83 145,103 + " /> + + <polyline fill=3D"none" stroke=3D"black" stroke-width=3D"1" points=3D" + 255,103 255,83 232,83 232,72 232,83 273,83 273,72 273,83 255,83 255,10= 3 + " /> + + <text x=3D"15" y=3D"120" font-family=3D"Times New Roman" font-style=3D"i= talic" font-size=3D"20px">sumti</text> + <text x=3D"121" y=3D"120" font-family=3D"Times New Roman" font-style=3D"= italic" font-size=3D"20px">selbri</text> + <text x=3D"231" y=3D"120" font-family=3D"Times New Roman" font-style=3D"= italic" font-size=3D"20px">sumti</text> + + <text x=3D"5" y=3D"135" font-family=3D"Times New Roman" font-style=3D"it= alic" font-size=3D"14px">(argument)</text> + <text x=3D"220" y=3D"135" font-family=3D"Times New Roman" font-style=3D"= italic" font-size=3D"14px">(argument)</text> + +</svg> + commit c943c2a9f0e6cb90571a70eccf171ebf748ac9e9 Author: Robin Lee Powell <rlpowell@digitalkingdom.org> Date: Thu Mar 22 21:54:10 2012 -0700 Fixed the picture. diff --git a/chapters/2.xml b/chapters/2.xml index 25288f5..bceea82 100644 --- a/chapters/2.xml +++ b/chapters/2.xml @@ -47,38 +47,33 @@ <xref linkend=3D"example-random-id-qiuQ"/>, and the adjective=20 <quote>taller</quote> to describe an attributive relationship in=20 =20 <xref linkend=3D"example-random-id-qIuS"/>. In Lojban we make no such = grammatical distinctions; these three sentences, when expressed in Lojban, = are structurally identical. The same part of speech is used to represent th= e relationship. In formal logic this whole structure is called a=20 <quote>predication</quote>; in Lojban it is called a=20 <valsi>bridi</valsi>, and the central part of speech is the=20 <valsi>selbri</valsi>. Logicians refer to the things thus related as= =20 <quote>arguments</quote>, while Lojbanists call them=20 <valsi>sumti</valsi>. These Lojban terms will be used for the rest of = the book.</para> <mediaobject> + <alt> + bridi (predicate) + ______________|__________________ + | | + John is the father of Sam + |____| |______________| |___| + | | | + sumti selbri sumti (argument) + </alt> <imageobject> - <imagedata fileref=3D"file:///epicuser/AISolutions/graphics/AIWork= bench/diagram.png" width=3D"291px"/> + <imagedata fileref=3D"diagram.png" /> </imageobject> </mediaobject> - <mediaobject> - <alt>[svg version]</alt> - <imageobject> - <imagedata fileref=3D"diagram.svg"/> - </imageobject> - </mediaobject> - <!--fallback for text-based browsers w/o css:--> - <!-- FIXME --> - <cmavo-list>John is the father of Sam| | |=20 - <cmavo-entry> - <cmavo>sumti</cmavo> - <selmaho>selbri</selmaho> - <description>sumti (argument)</description> - </cmavo-entry></cmavo-list> <para>=20 =20 =20 In a relationship, there are a definite number of things being related. I= n English, for example,=20 <quote>give</quote> has three places: the donor, the recipient and the= gift. For example:</para> <example xml:id=3D"example-random-id-DE08"> <title> <anchor xml:id=3D"c2e1d4"/> <indexterm type=3D"example"><primary>give</primary><secondary>exam= ple</secondary></indexterm> --=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.