Commit 1489456e authored by Georges Khaznadar's avatar Georges Khaznadar

changes for the new version

parent 0ff03198
'\" t
.\" Title: CHEMEQ
.\" Author: Georges Khaznadar <georgesk@debian.org>
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
.\" Date: 06/19/2013
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
.\" Date: 12/02/2016
.\" Manual: User Manuals
.\" Source: chemeq 2.10
.\" Language: English
.\"
.TH "CHEMEQ" "1" "06/19/2013" "chemeq 2.10" "User Manuals"
.TH "CHEMEQ" "1" "12/02/2016" "chemeq 2.10" "User Manuals"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
......@@ -37,7 +37,7 @@ chemeq \- Chemical Equation Parser and Renderer
.SH "DESCRIPTION"
.PP
\fBchemeq\fR
is a chemical equation analyzer\&. It is a fast lexical and syntaxic analyser which helps to find out chemical informations embedded in source chemical equations\&. Data can be output in various sophisticated formats, depending on options\&. \*(Aqchemeq\*(Aq defaults to \*(Aqchemeq \-mlcwCn\*(Aq\&.
is a chemical equation analyzer\&. It is a fast lexical and syntaxic analyser which helps to find out chemical information embedded in source chemical equations\&. Data can be output in various sophisticated formats, depending on options\&. \*(Aqchemeq\*(Aq defaults to \*(Aqchemeq \-mlcwCn\*(Aq\&.
.SH "OPTIONS"
.PP
\fB\-M\fR
......@@ -59,7 +59,7 @@ Outputs a
.PP
\fB\-c\fR
.RS 4
Outputs a message giving informations about the Conservation of elements and charges in the equation\&. \*(AqOK\*(Aq means that both elements and electric charges are balanced\&.
Outputs a message giving information about the Conservation of elements and charges in the equation\&. \*(AqOK\*(Aq means that both elements and electric charges are balanced\&.
.RE
.PP
\fB\-w\fR
......@@ -94,7 +94,7 @@ Outputs a
\fB\-W\fR
.RS 4
Changes the behavior of the renderer for some versions of
\fBW\fRims : works around a bug whith the macro \erightarrow\&.
\fBW\fRims : works around a bug with the macro \erightarrow\&.
.RE
.PP
\fB\-h\fR
......@@ -129,12 +129,12 @@ See above (useful for the WIMS server)\&.
.PP
\fBecho "1/2 Cu^2+ + OH\- \-> 1/2Cu(OH)2s" | chemeq\fR
.RS 4
will display informations about the reaction of hydroxyde and Cu II ions\&.
will display information about the reaction of hydroxyde and Cu II ions\&.
.RE
.PP
\fBecho "MnO4^\- + 8H3O^+ + 5e\- \-\-> Mn^2+ + 12 H2O" | chemeq\fR
.RS 4
will display informations about the reaction of reduction of permanganate ions in an acid environment\&.
will display information about the reaction of reduction of permanganate ions in an acid environment\&.
.RE
.PP
\fBecho "MnO4^\- + 8H3O^+ + 5e\- \-\-> Mn^2+ + 12 H2O" | chemeq \-w\fR
......@@ -150,12 +150,12 @@ will highlight the lack of conservation of elements H and O (water molecules are
.PP
\fBsyntax of ions\fR
.RS 4
allthough in some cases, shorter expressions are sucessfully parsed, it is safer to consider that an "up arrow" (^) must be put before the charge symbols of an ion\&. Examples : H3O^+, Fe(CN)6^4\-, OH^\-
although in some cases, shorter expressions are successfully parsed, it is safer to consider that an "up arrow" (^) must be put before the charge symbols of an ion\&. Examples : H3O^+, Fe(CN)6^4\-, OH^\-
.RE
.PP
\fBComposing chemical equations\fR
.RS 4
Two operators are defined, # as an additive oprator and ~ (tilde) as a substractive operator: they allow to compose several chemical equations
Two operators are defined, # as an additive oprator and ~ (tilde) as a substractive operator: they allow one to compose several chemical equations
.sp
\fB echo "MnO4^\- + 8H3O^+ + 5e\- \-\-> Mn^2+ + 8 H2O ~ 5Fe^3+ + 5e\- \-> 5Fe^2+" | chemeq\fR
.sp
......@@ -167,7 +167,7 @@ which is their combination\&.
.PP
\fBMutiplying a chemical equation by one coefficient\fR
.RS 4
The operator * permits to multiply a whole equation by one coefficient which may be a fraction\&. Here is an example:
The operator * permits one to multiply a whole equation by one coefficient which may be a fraction\&. Here is an example:
.sp
\fB echo "5 * Fe^3+ + e\- \-> Fe^2+" | chemeq \fR
.sp
......@@ -182,7 +182,7 @@ The two previous techniques can be used at the same time, which enables you to m
.sp
\fB echo "Fe^3+ + e^\- \-> Fe^2+ (0\&.77 V) # Fe^2+ + 6CN^\- \-> Fe(CN)6^4\- (Kfa=1e24) ~ Fe^3+ + 6CN^\- \-> Fe(CN)6^3\- (Kfb=1e31)" | chemeq \fR
.sp
which will work as expected, and yeld a good value for the stan\(hy dard potential of the redox couple of hexacyanoferrate II and III ions\&.
which will work as expected, and yield a good value for the stan\(hy dard potential of the redox couple of hexacyanoferrate II and III ions\&.
.RE
.SH "KNOWN BUGS"
.PP
......
......@@ -103,7 +103,7 @@
<para><command>&dhpackage;</command>
is a chemical equation analyzer. It is a fast lexical
and syntaxic analyser which helps to find out chemical
informations embedded in source chemical equations. Data can be output
information embedded in source chemical equations. Data can be output
in various sophisticated formats, depending on options. 'chemeq'
defaults to 'chemeq -mlcwCn'. </para>
</refsect1>
......@@ -136,7 +136,7 @@ Outputs a <option>L</option>aTeX string representing the chemical equation.</par
<term><option>-c</option></term>
<listitem>
<para>
Outputs a message giving informations about the Conservation of
Outputs a message giving information about the Conservation of
elements and charges in the equation. 'OK' means that both
elements and electric charges are balanced.</para>
</listitem>
......@@ -190,7 +190,7 @@ and the coefficient are not equal but proportionnal.</para>
<listitem>
<para>
Changes the behavior of the renderer for some versions of
<option>W</option>ims : works around a bug whith the macro \rightarrow.</para>
<option>W</option>ims : works around a bug with the macro \rightarrow.</para>
</listitem>
</varlistentry>
<varlistentry>
......@@ -250,14 +250,14 @@ See above (useful for the WIMS server).</para>
<varlistentry>
<term><option>echo "1/2 Cu^2+ + OH- -> 1/2Cu(OH)2s" | chemeq</option></term>
<listitem><para>
will display informations about the reaction of hydroxyde and Cu
will display information about the reaction of hydroxyde and Cu
II ions.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>echo "MnO4^- + 8H3O^+ + 5e- --> Mn^2+ + 12 H2O" | chemeq</option></term>
<listitem><para>
will display informations about the reaction of reduction of
will display information about the reaction of reduction of
permanganate ions in an acid environment.</para>
</listitem>
</varlistentry>
......@@ -283,7 +283,7 @@ will highlight the lack of conservation of elements H and O
<varlistentry>
<term><option>syntax of ions</option></term>
<listitem><para>
allthough in some cases, shorter expressions are sucessfully parsed, it
although in some cases, shorter expressions are successfully parsed, it
is safer to consider that an "up arrow" (^) must be put before the
charge symbols of an ion. Examples : H3O^+, Fe(CN)6^4-, OH^-</para>
</listitem>
......@@ -292,7 +292,8 @@ allthough in some cases, shorter expressions are sucessfully parsed, it
<term><option>Composing chemical equations</option></term>
<listitem><para>
Two operators are defined, # as an additive oprator and ~ (tilde) as a
substractive operator: they allow to compose several chemical equations
substractive operator: they allow one to compose several chemical
equations
</para>
<para><option>
echo "MnO4^- + 8H3O^+ + 5e- --> Mn^2+ + 8 H2O ~ 5Fe^3+ + 5e- -> 5Fe^2+"
......@@ -312,7 +313,7 @@ allthough in some cases, shorter expressions are sucessfully parsed, it
<varlistentry>
<term><option>Mutiplying a chemical equation by one coefficient</option></term>
<listitem><para>
The operator * permits to multiply a whole equation by one coefficient
The operator * permits one to multiply a whole equation by one coefficient
which may be a fraction. Here is an example:
</para><para><option>
echo "5 * Fe^3+ + e- -> Fe^2+" | chemeq
......@@ -330,7 +331,7 @@ The two previous techniques can be used at the same time, which enables
echo "Fe^3+ + e^- -> Fe^2+ (0.77 V) # Fe^2+ + 6CN^- -> Fe(CN)6^4-
(Kfa=1e24) ~ Fe^3+ + 6CN^- -> Fe(CN)6^3- (Kfb=1e31)" | chemeq
</option></para><para>
which will work as expected, and yeld a good value for the stan‐
which will work as expected, and yield a good value for the stan‐
dard potential of the redox couple of hexacyanoferrate II and
III ions.</para>
</listitem>
......
chemeq (2.14-1) unstable; urgency=medium
* applied patches from debian/patches in upstream source
* applied Chris Lamb's patch. Closes: #901763
-- Georges Khaznadar <georgesk@debian.org> Mon, 18 Jun 2018 15:51:20 +0200
chemeq (2.13-1) unstable; urgency=medium
* changed the LaTeX rendering for (explicitly) aqueous, solid and liquid
......
With shared libfl unnecessary -lfl causes FTBFS
Due to libfl requiring yylex.
(thanks, Adrian Bunk <bunk@debian.org>)
Index: chemeq/src/Makefile
===================================================================
--- chemeq.orig/src/Makefile
+++ chemeq/src/Makefile
@@ -3,8 +3,7 @@ CXX = g++
CXXFLAGS= -g -O1
chemeq : chemeq.o chemparser.o mendeleiev.o
- ${CXX} $(CXXFLAGS) -o chemeq chemeq.o chemparser.o mendeleiev.o -lfl
-
+ ${CXX} $(CXXFLAGS) -o chemeq chemeq.o chemparser.o mendeleiev.o
chemeq.h: chemeq.h.in
echo "// Do not edit this file which has been automatically genreated." > $@
Index: chemeq-2.12/chemeq.man.xml
===================================================================
--- chemeq-2.12.orig/chemeq.man.xml
+++ chemeq-2.12/chemeq.man.xml
@@ -103,7 +103,7 @@
<para><command>&dhpackage;</command>
is a chemical equation analyzer. It is a fast lexical
and syntaxic analyser which helps to find out chemical
-informations embedded in source chemical equations. Data can be output
+information embedded in source chemical equations. Data can be output
in various sophisticated formats, depending on options. 'chemeq'
defaults to 'chemeq -mlcwCn'. </para>
</refsect1>
@@ -136,7 +136,7 @@ Outputs a <option>L</option>aTeX string
<term><option>-c</option></term>
<listitem>
<para>
-Outputs a message giving informations about the Conservation of
+Outputs a message giving information about the Conservation of
elements and charges in the equation. 'OK' means that both
elements and electric charges are balanced.</para>
</listitem>
@@ -190,7 +190,7 @@ and the coefficient are not equal but pr
<listitem>
<para>
Changes the behavior of the renderer for some versions of
-<option>W</option>ims : works around a bug whith the macro \rightarrow.</para>
+<option>W</option>ims : works around a bug with the macro \rightarrow.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -250,14 +250,14 @@ See above (useful for the WIMS server).<
<varlistentry>
<term><option>echo "1/2 Cu^2+ + OH- -> 1/2Cu(OH)2s" | chemeq</option></term>
<listitem><para>
-will display informations about the reaction of hydroxyde and Cu
+will display information about the reaction of hydroxyde and Cu
II ions.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>echo "MnO4^- + 8H3O^+ + 5e- --> Mn^2+ + 12 H2O" | chemeq</option></term>
<listitem><para>
-will display informations about the reaction of reduction of
+will display information about the reaction of reduction of
permanganate ions in an acid environment.</para>
</listitem>
</varlistentry>
@@ -283,7 +283,7 @@ will highlight the lack of conservation
<varlistentry>
<term><option>syntax of ions</option></term>
<listitem><para>
-allthough in some cases, shorter expressions are sucessfully parsed, it
+although in some cases, shorter expressions are successfully parsed, it
is safer to consider that an "up arrow" (^) must be put before the
charge symbols of an ion. Examples : H3O^+, Fe(CN)6^4-, OH^-</para>
</listitem>
@@ -292,7 +292,8 @@ allthough in some cases, shorter express
<term><option>Composing chemical equations</option></term>
<listitem><para>
Two operators are defined, # as an additive oprator and ~ (tilde) as a
- substractive operator: they allow to compose several chemical equations
+ substractive operator: they allow one to compose several chemical
+ equations
</para>
<para><option>
echo "MnO4^- + 8H3O^+ + 5e- --> Mn^2+ + 8 H2O ~ 5Fe^3+ + 5e- -> 5Fe^2+"
@@ -312,7 +313,7 @@ allthough in some cases, shorter express
<varlistentry>
<term><option>Mutiplying a chemical equation by one coefficient</option></term>
<listitem><para>
-The operator * permits to multiply a whole equation by one coefficient
+The operator * permits one to multiply a whole equation by one coefficient
which may be a fraction. Here is an example:
</para><para><option>
echo "5 * Fe^3+ + e- -> Fe^2+" | chemeq
@@ -330,7 +331,7 @@ The two previous techniques can be used
echo "Fe^3+ + e^- -> Fe^2+ (0.77 V) # Fe^2+ + 6CN^- -> Fe(CN)6^4-
(Kfa=1e24) ~ Fe^3+ + 6CN^- -> Fe(CN)6^3- (Kfb=1e31)" | chemeq
</option></para><para>
- which will work as expected, and yeld a good value for the stan‐
+ which will work as expected, and yield a good value for the stan‐
dard potential of the redox couple of hexacyanoferrate II and
III ions.</para>
</listitem>
Index: chemeq-2.12/chemeq.1
===================================================================
--- chemeq-2.12.orig/chemeq.1
+++ chemeq-2.12/chemeq.1
@@ -1,13 +1,13 @@
'\" t
.\" Title: CHEMEQ
.\" Author: Georges Khaznadar <georgesk@debian.org>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 06/19/2013
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Date: 12/02/2016
.\" Manual: User Manuals
.\" Source: chemeq 2.10
.\" Language: English
.\"
-.TH "CHEMEQ" "1" "06/19/2013" "chemeq 2.10" "User Manuals"
+.TH "CHEMEQ" "1" "12/02/2016" "chemeq 2.10" "User Manuals"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -37,7 +37,7 @@ chemeq \- Chemical Equation Parser and R
.SH "DESCRIPTION"
.PP
\fBchemeq\fR
-is a chemical equation analyzer\&. It is a fast lexical and syntaxic analyser which helps to find out chemical informations embedded in source chemical equations\&. Data can be output in various sophisticated formats, depending on options\&. \*(Aqchemeq\*(Aq defaults to \*(Aqchemeq \-mlcwCn\*(Aq\&.
+is a chemical equation analyzer\&. It is a fast lexical and syntaxic analyser which helps to find out chemical information embedded in source chemical equations\&. Data can be output in various sophisticated formats, depending on options\&. \*(Aqchemeq\*(Aq defaults to \*(Aqchemeq \-mlcwCn\*(Aq\&.
.SH "OPTIONS"
.PP
\fB\-M\fR
@@ -59,7 +59,7 @@ Outputs a
.PP
\fB\-c\fR
.RS 4
-Outputs a message giving informations about the Conservation of elements and charges in the equation\&. \*(AqOK\*(Aq means that both elements and electric charges are balanced\&.
+Outputs a message giving information about the Conservation of elements and charges in the equation\&. \*(AqOK\*(Aq means that both elements and electric charges are balanced\&.
.RE
.PP
\fB\-w\fR
@@ -94,7 +94,7 @@ Outputs a
\fB\-W\fR
.RS 4
Changes the behavior of the renderer for some versions of
-\fBW\fRims : works around a bug whith the macro \erightarrow\&.
+\fBW\fRims : works around a bug with the macro \erightarrow\&.
.RE
.PP
\fB\-h\fR
@@ -129,12 +129,12 @@ See above (useful for the WIMS server)\&
.PP
\fBecho "1/2 Cu^2+ + OH\- \-> 1/2Cu(OH)2s" | chemeq\fR
.RS 4
-will display informations about the reaction of hydroxyde and Cu II ions\&.
+will display information about the reaction of hydroxyde and Cu II ions\&.
.RE
.PP
\fBecho "MnO4^\- + 8H3O^+ + 5e\- \-\-> Mn^2+ + 12 H2O" | chemeq\fR
.RS 4
-will display informations about the reaction of reduction of permanganate ions in an acid environment\&.
+will display information about the reaction of reduction of permanganate ions in an acid environment\&.
.RE
.PP
\fBecho "MnO4^\- + 8H3O^+ + 5e\- \-\-> Mn^2+ + 12 H2O" | chemeq \-w\fR
@@ -150,12 +150,12 @@ will highlight the lack of conservation
.PP
\fBsyntax of ions\fR
.RS 4
-allthough in some cases, shorter expressions are sucessfully parsed, it is safer to consider that an "up arrow" (^) must be put before the charge symbols of an ion\&. Examples : H3O^+, Fe(CN)6^4\-, OH^\-
+although in some cases, shorter expressions are successfully parsed, it is safer to consider that an "up arrow" (^) must be put before the charge symbols of an ion\&. Examples : H3O^+, Fe(CN)6^4\-, OH^\-
.RE
.PP
\fBComposing chemical equations\fR
.RS 4
-Two operators are defined, # as an additive oprator and ~ (tilde) as a substractive operator: they allow to compose several chemical equations
+Two operators are defined, # as an additive oprator and ~ (tilde) as a substractive operator: they allow one to compose several chemical equations
.sp
\fB echo "MnO4^\- + 8H3O^+ + 5e\- \-\-> Mn^2+ + 8 H2O ~ 5Fe^3+ + 5e\- \-> 5Fe^2+" | chemeq\fR
.sp
@@ -167,7 +167,7 @@ which is their combination\&.
.PP
\fBMutiplying a chemical equation by one coefficient\fR
.RS 4
-The operator * permits to multiply a whole equation by one coefficient which may be a fraction\&. Here is an example:
+The operator * permits one to multiply a whole equation by one coefficient which may be a fraction\&. Here is an example:
.sp
\fB echo "5 * Fe^3+ + e\- \-> Fe^2+" | chemeq \fR
.sp
@@ -182,7 +182,7 @@ The two previous techniques can be used
.sp
\fB echo "Fe^3+ + e^\- \-> Fe^2+ (0\&.77 V) # Fe^2+ + 6CN^\- \-> Fe(CN)6^4\- (Kfa=1e24) ~ Fe^3+ + 6CN^\- \-> Fe(CN)6^3\- (Kfb=1e31)" | chemeq \fR
.sp
-which will work as expected, and yeld a good value for the stan\(hy dard potential of the redox couple of hexacyanoferrate II and III ions\&.
+which will work as expected, and yield a good value for the stan\(hy dard potential of the redox couple of hexacyanoferrate II and III ions\&.
.RE
.SH "KNOWN BUGS"
.PP
manpage.patch
fixFlexLib.patch
......@@ -9,5 +9,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/dpkg/pkg-info.mk
%:
dh $@
override_dh_auto_configure:
dh_auto_configure
$(MAKE) src/chemeq.h
sed -i -e 's/VERSION.*/VERSION "'$(DEB_VERSION_UPSTREAM)'"/' src/chemeq.h
......@@ -3,8 +3,7 @@ CXX = g++
CXXFLAGS= -g -O1
chemeq : chemeq.o chemparser.o mendeleiev.o
${CXX} $(CXXFLAGS) -o chemeq chemeq.o chemparser.o mendeleiev.o -lfl
${CXX} $(CXXFLAGS) -o chemeq chemeq.o chemparser.o mendeleiev.o
chemeq.h: chemeq.h.in
echo "// Do not edit this file which has been automatically genreated." > $@
......
......@@ -9,7 +9,7 @@
#include <string>
#include <map>
#define VERSION "2.11"
#define VERSION "2.14"
/* Constante d'Avogadro, recommandée par CODATA, 2006 */
#define Avogadro 6.022141e+23
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment