Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

17.4 doesn't describe a word for quotation mark #388

Open
wants to merge 4 commits into
base: geklojban-1.2.1
Choose a base branch
from
Open

17.4 doesn't describe a word for quotation mark #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adebc48
Revert "remove 'Unlike -nai contradictory negation, scalar negation o…
lagleki Aug 28, 2019
c956e00
#386 for this branch
lagleki Nov 22, 2019
5d8b5c0
for this branch only: \#380
lagleki Nov 22, 2019
0111141
17.4 doesn't describe a word for quotation mark
lagleki Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
VERSION="geklojban-1.2.1"
TITLE=The Complete GekLojban Languag
PUBLISHER=An Illogical Language Group Publication
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1
GekLojban-1.2.1
2 changes: 1 addition & 1 deletion chapters/17.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
<quote>&amp;</quote>, based on the cmavo
<valsi>joi</valsi> meaning
<quote>mixed and</quote>. Many more such lerfu words will probably be invented in future.</para>
<para> <indexterm type="general"><primary>&quot;</primary><secondary>&quot;</secondary><tertiary>word for</tertiary></indexterm> <indexterm type="general"><primary>&quot;.&quot;</primary><secondary>word for</secondary></indexterm> <indexterm type="general"><primary>syllable break</primary><secondary>word for</secondary></indexterm> <indexterm type="general"><primary>pause</primary><secondary>word for</secondary></indexterm> <indexterm type="general"><primary>syllable break</primary><secondary>symbol for</secondary></indexterm> <indexterm type="general"><primary>pause</primary><secondary>symbol for</secondary></indexterm> The
<para><indexterm type="general"><primary>&quot;.&quot;</primary><secondary>word for</secondary></indexterm> <indexterm type="general"><primary>syllable break</primary><secondary>word for</secondary></indexterm> <indexterm type="general"><primary>pause</primary><secondary>word for</secondary></indexterm> <indexterm type="general"><primary>syllable break</primary><secondary>symbol for</secondary></indexterm> <indexterm type="general"><primary>pause</primary><secondary>symbol for</secondary></indexterm> The
<letteral>.</letteral> and
<letteral>,</letteral> characters used in Lojbanic writing to represent pause and syllable break respectively have been assigned the lerfu words

Expand Down
14 changes: 11 additions & 3 deletions scripts/merge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,21 @@ ofile="$BUILDDIR/cll.xml"

cp scripts/header.xml "$ofile"

version=$(cat VERSION)
read_var() {
VAR=$(grep $1 $2 | xargs)
IFS="=" read -ra VAR <<< "$VAR"
echo ${VAR[1]}
}

version=$(read_var VERSION .env)
publisher=$(read_var PUBLISHER .env)
title=$(read_var TITLE .env)
datestamp=$(date +%Y-%m-%d)

echo "

<info>
<title>The Complete Lojban Language</title>
<title>$title</title>
<author>
<personname>
<firstname>John</firstname>
Expand All @@ -53,7 +61,7 @@ Version $version, Generated $datestamp
</releaseinfo>
<othercredit>
<orgname>
A Logical Language Group Publication
$publisher
</orgname>
</othercredit>
</info>
Expand Down