[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bpfk] dag-cll git updates for Thu Mar 22 23:21:03 PDT 2012
commit e2dc9a80c0937dae8ff6ab26c90689d80a4884a2
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
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 @@
%%
%% 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
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cll}[cll style]
+% Note that the format (date first) here is important
+\ProvidesPackage{cll}[2012/03/22 cll 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
commit 60bf9914c16140e0184fb28e62859118fc567841
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
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 @@
%%
-%% 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
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dbsimple}[2003/04/11 Simple DocBook Style]
+\ProvidesPackage{cll}[cll 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
commit 1016383f16332bbe8e5eb6a5d23ecd834540b0a1
Author: Robin Lee Powell <rlpowell@digitalkingdom.org>
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_preprocess.xsl
#*******
# 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/media/chapter-2-diagram.png
.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/xsl-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
#*******
# 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/docbook2html.css
+ mkdir -p ~/www/media/public/tmp/cll-xhtml-sections/media
+ cp $(PWD)/media/chapter-2-diagram.png ~/www/media/public/tmp/cll-xhtml/sections/media/chapter-2-diagram.png
.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/xsl-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/ --stringparam chunk.section.depth=1 --stringparam chunk.first.sections=1 xhtml cll_processed_xhtml.xml 2>&1 | grep -v 'No localization exists for "jbo" or "". Using default "en".'
touch xhtml_sections.done
#*******
# 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/chapter-2-diagram.png
.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/xsl-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 cll_processed_xhtml.xml 2>&1 | grep -v 'No localization exists for "jbo" or "". Using default "en".'
@@ -111,21 +116,21 @@ mobi_web: mobi
#*******
# 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_process_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_processed_pdf.xml 2>&1 | grep -v 'default template used in programlisting or screen'
.PHONY: pdf_web
pdf_web: pdf
cp cll.pdf ~/www/media/public/tmp/cll.pdf
#*********************
# Faster testing versions go here; lots of copy and paste; lame
#*********************
.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}}\AfterEndEnvironment{description}{\end{multicols}}
+\usepackage{fullpage}
+
+%% % LaTeX <othercredit> commands to define
+%% %
+%% % #1: mapped to <contrib>
+%% % #2: mapped to <firstname> <surname>
+%% %
+%% \def\DBKinditem#1#2{
+%% #2 & #1 \tabularnewline
+%% \hline
+%% }
+%%
+%% \newenvironment{DBKindtable}{
+%% \begin{tabular}{ |l|l| }
+%% \hline
+%% \emph{Collaborator} & \emph{Contribution}
+%% \hline
+%% }{
+%% \end{tabular}
+%% }
+%%
+%% %
+%% % Latex <revhistory> table
+%% %
+%% \newenvironment{DBKrevtable}{
+%% \begin{longtable}{ |l|l|l|l| }
+%% \hline
+%% Revision number & Date & Release Info & Author \tabularnewline
+%% \hline
+%% \endhead
+%% }{
+%% \end{longtable}
+%% }
+%%
+%% %
+%% % <legalnotice> environment skip the information
+%% %
+%% \newenvironment{DBKlegalnotice}{
+%% }{
+%% }
+
+%
+% These floats must be defined to map <example> and <equation>
+%
+\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 <note>, <caution>, <warning>
+%% %
+%% \newenvironment{DBKadmonition}[2] {
+%% }{
+%% }
+%%
+%% %
+%% % <sidebar> environment
+%% %
+%% \newenvironment{sidebar}[1][\textwidth]{
+%% \hspace{0mm}\newline%
+%% \noindent\begin{Sbox}\begin{minipage}{#1}
+%% }{
+%% \end{minipage}\end{Sbox}\shadowbox{\TheSbox}%
+%% }
+%%
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}}\AfterEndEnvironment{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 <rlpowell@digitalkingdom.org>
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 @@
<alt>
bridi (predicate)
______________|__________________
| |
John is the father of Sam
|____| |______________| |___|
| | |
sumti selbri sumti (argument)
</alt>
<imageobject>
- <imagedata fileref="diagram.png" />
+ <imagedata fileref="media/chapter-2-diagram.png" />
</imageobject>
</mediaobject>
<para>
In a relationship, there are a definite number of things being related. In English, for example,
<quote>give</quote> has three places: the donor, the recipient and the gift. For example:</para>
<example xml:id="example-random-id-DE08">
<title>
<anchor xml:id="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="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG Tiny 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd";>
+<svg version="1.1"
+ baseProfile="tiny"
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ viewBox="0 0 300 200"
+ width="300"
+ height="200"
+ preserveAspectRatio="xMidYMid">
+
+ <text x="125" y="20" font-family="Times New Roman" font-style="italic" font-size="20px">bridi</text>
+ <text x="170" y="20" font-family="Times New Roman" font-style="italic" font-size="14">(predicate)</text>
+
+ <polyline fill="none" stroke="black" stroke-width="1" points="
+ 144,25 144,50 15,50 15,62 15,50 273,50 273,62 273,50 144,50 144,25
+ " />
+
+ <text x="20" y="75" font-family="Arial">John</text>
+ <text x="100" y="75" font-family="Arial">is the father of</text>
+ <text x="235" y="75" font-family="Arial">Sam</text>
+
+ <polyline fill="none" stroke="black" stroke-width="1" points="
+ 35,103 35,83 15,83 15,72 15,83 58,83 58,72 58,83 35,83 35,103
+ " />
+
+ <polyline fill="none" stroke="black" stroke-width="1" points="
+ 145,103 145,83 95,83 95,72 95,83 201,83 201,72 201,83 145,83 145,103
+ " />
+
+ <polyline fill="none" stroke="black" stroke-width="1" points="
+ 255,103 255,83 232,83 232,72 232,83 273,83 273,72 273,83 255,83 255,103
+ " />
+
+ <text x="15" y="120" font-family="Times New Roman" font-style="italic" font-size="20px">sumti</text>
+ <text x="121" y="120" font-family="Times New Roman" font-style="italic" font-size="20px">selbri</text>
+ <text x="231" y="120" font-family="Times New Roman" font-style="italic" font-size="20px">sumti</text>
+
+ <text x="5" y="135" font-family="Times New Roman" font-style="italic" font-size="14px">(argument)</text>
+ <text x="220" y="135" font-family="Times New Roman" font-style="italic" font-size="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="example-random-id-qiuQ"/>, and the adjective
<quote>taller</quote> to describe an attributive relationship in
<xref linkend="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 the relationship. In formal logic this whole structure is called a
<quote>predication</quote>; in Lojban it is called a
<valsi>bridi</valsi>, and the central part of speech is the
<valsi>selbri</valsi>. Logicians refer to the things thus related as
<quote>arguments</quote>, while Lojbanists call them
<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="file:///epicuser/AISolutions/graphics/AIWorkbench/diagram.png" width="291px"/>
+ <imagedata fileref="diagram.png" />
</imageobject>
</mediaobject>
- <mediaobject>
- <alt>[svg version]</alt>
- <imageobject>
- <imagedata fileref="diagram.svg"/>
- </imageobject>
- </mediaobject>
- <!--fallback for text-based browsers w/o css:-->
- <!-- FIXME -->
- <cmavo-list>John is the father of Sam| | |
- <cmavo-entry>
- <cmavo>sumti</cmavo>
- <selmaho>selbri</selmaho>
- <description>sumti (argument)</description>
- </cmavo-entry></cmavo-list>
<para>
In a relationship, there are a definite number of things being related. In English, for example,
<quote>give</quote> has three places: the donor, the recipient and the gift. For example:</para>
<example xml:id="example-random-id-DE08">
<title>
<anchor xml:id="c2e1d4"/>
<indexterm type="example"><primary>give</primary><secondary>example</secondary></indexterm>
</title>
--
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.