Commit aedc3120 authored by Florent Terrones's avatar Florent Terrones
Browse files

2006-06-19 Florent Terrones <terron_f@lrde.epita.fr>

	The nodes like `<label_type>' are renamed to `<labelType>', so as to
	fit with all other XML files format.

	* data/vaucanson.xsd: Remove underscores in all the compound names,
	capitalize the first letter of the following words. Change weight type
	from decimal to string. Change the minimal number of children of the
	nodes `sum' and `product' from 0 to 2.
	* include/vaucanson/algebra/implementation/series/rat/xml_exp_visitor.hxx,
	* include/vaucanson/xml/xml_chooser.hh,
	* include/vaucanson/xml/node.hh,
	* include/vaucanson/xml/xml_chooser.hxx,
	* include/vaucanson/xml/node.hxx,
	* src/tests/xml/label_node_ref.xml,
	* src/tests/xml/trans_ref.xml,
	* src/tests/xml/geometry_ref.xml,
	* src/tests/xml/r_ref.xml,
	* src/tests/xml/z_ref.xml,
	* src/tests/xml/z_min_plus_ref.xml,
	* src/tests/xml/b_ref.xml,
	* src/tests/xml/z_max_plus_ref.xml,
	* src/tests/xml/fmp_ref.xml,
	* src/tests/xml/session_ref.xml,
	* src/demos/automaton_library/a1.xml,
	* src/demos/automaton_library/b1.xml,
	* src/demos/automaton_library/c1.xml,
	* src/demos/transducers/t1.xml,
	* src/demos/transducers/u1.xml,
	* taf-kit/tests/non_ambiguous.xml,
	* taf-kit/tests/non_ambiguous2.xml,
	* taf-kit/tests/ambiguous.xml,
	* doc/xml/xml_proposal.tex,
	* doc/manual/examples/a1.xml,
	* doc/manual/examples/b1.xml,
	* doc/manual/examples/add1_rt.xml,
	* doc/manual/examples/quot_3_rt.xml: Update accordingly.
parent 8007cc4c
2006-06-19 Florent Terrones <terron_f@lrde.epita.fr>
The nodes like `<label_type>' are renamed to `<labelType>', so as to
fit with all other XML files format.
* data/vaucanson.xsd: Remove underscores in all the compound names,
capitalize the first letter of the following words. Change weight type
from decimal to string. Change the minimal number of children of the
nodes `sum' and `product' from 0 to 2.
* include/vaucanson/algebra/implementation/series/rat/xml_exp_visitor.hxx,
* include/vaucanson/xml/xml_chooser.hh,
* include/vaucanson/xml/node.hh,
* include/vaucanson/xml/xml_chooser.hxx,
* include/vaucanson/xml/node.hxx,
* src/tests/xml/label_node_ref.xml,
* src/tests/xml/trans_ref.xml,
* src/tests/xml/geometry_ref.xml,
* src/tests/xml/r_ref.xml,
* src/tests/xml/z_ref.xml,
* src/tests/xml/z_min_plus_ref.xml,
* src/tests/xml/b_ref.xml,
* src/tests/xml/z_max_plus_ref.xml,
* src/tests/xml/fmp_ref.xml,
* src/tests/xml/session_ref.xml,
* src/demos/automaton_library/a1.xml,
* src/demos/automaton_library/b1.xml,
* src/demos/automaton_library/c1.xml,
* src/demos/transducers/t1.xml,
* src/demos/transducers/u1.xml,
* taf-kit/tests/non_ambiguous.xml,
* taf-kit/tests/non_ambiguous2.xml,
* taf-kit/tests/ambiguous.xml,
* doc/xml/xml_proposal.tex,
* doc/manual/examples/a1.xml,
* doc/manual/examples/b1.xml,
* doc/manual/examples/add1_rt.xml,
* doc/manual/examples/quot_3_rt.xml: Update accordingly.
2006-06-19 Akim Demaille <akim@lrde.epita.fr>
Don't compile the developer guide in the user manual.
......@@ -11,7 +49,7 @@
Update texi2dvi.
Now that texi2dvi supports --dvipdf, we no longer need
manual.mk. As a benefit (err, target actually), it will be easier
manual.mk. As a benefit (err, target actually), it will be easier
to generate several outputs from a single source (say including
or not the developer sections).
* doc/manual.mk: Remove.
......
......@@ -9,15 +9,15 @@ vaucanson.xsd version 0.3.1
-->
<!--
The following tags are used for the <expression_label> tag.
The following tags are used for the <expressionLabel> tag.
-->
<!--
Attribute group used to factorize some code.
-->
<xs:attributeGroup name="expression_attributes">
<xs:attributeGroup name="expressionAttributes">
<xs:attribute name="parenthesis" type="xs:boolean"/>
<xs:attribute name="weight" type="xs:decimal"/>
<xs:attribute name="weight" type="xs:string"/>
</xs:attributeGroup>
<!--
......@@ -25,15 +25,15 @@ vaucanson.xsd version 0.3.1
-->
<xs:complexType name="word">
<xs:attribute name="value" type="xs:string" use="required"/>
<xs:attributeGroup ref="expression_attributes"/>
<xs:attributeGroup ref="expressionAttributes"/>
</xs:complexType>
<xs:complexType name="zero_val">
<xs:attribute name="weight" type="xs:decimal"/>
<xs:complexType name="zeroVal">
<xs:attribute name="weight" type="xs:string"/>
</xs:complexType>
<xs:complexType name="identity_val">
<xs:attribute name="weight" type="xs:decimal"/>
<xs:complexType name="identityVal">
<xs:attribute name="weight" type="xs:string"/>
</xs:complexType>
<!--
......@@ -47,10 +47,10 @@ vaucanson.xsd version 0.3.1
<xs:element name="word" type="word" minOccurs="0"/>
<xs:element name="sum" type="sum" minOccurs="0"/>
<xs:element name="product" type="product" minOccurs="0"/>
<xs:element name="zero" type="zero_val" minOccurs="0"/>
<xs:element name="identity" type="identity_val" minOccurs="0"/>
<xs:element name="zero" type="zeroVal" minOccurs="0"/>
<xs:element name="identity" type="identityVal" minOccurs="0"/>
</xs:choice>
<xs:attributeGroup ref="expression_attributes"/>
<xs:attributeGroup ref="expressionAttributes"/>
</xs:complexType>
<!--
......@@ -61,10 +61,10 @@ vaucanson.xsd version 0.3.1
-->
<xs:complexType name="sum">
<xs:choice>
<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
<xs:any minOccurs="2" maxOccurs="unbounded" processContents="lax"/>
<xs:element name="star" type="star" minOccurs="0"/>
</xs:choice>
<xs:attributeGroup ref="expression_attributes"/>
<xs:attributeGroup ref="expressionAttributes"/>
</xs:complexType>
<!--
......@@ -75,26 +75,26 @@ vaucanson.xsd version 0.3.1
-->
<xs:complexType name="product">
<xs:choice>
<xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
<xs:any minOccurs="2" maxOccurs="unbounded" processContents="lax"/>
<xs:element name="star" type="star" minOccurs="0"/>
</xs:choice>
<xs:attributeGroup ref="expression_attributes"/>
<xs:attributeGroup ref="expressionAttributes"/>
</xs:complexType>
<!--
<expression_label> tag properties. Used to clearly define the content of a
<expressionLabel> tag properties. Used to clearly define the content of a
label by using <product>, <sum>, <zero>, <identity> and <word> tags.
-->
<xs:complexType name="expression_label">
<xs:complexType name="expressionLabel">
<xs:choice>
<xs:element name="star" type="star" minOccurs="0"/>
<xs:element name="word" type="word" minOccurs="0"/>
<xs:element name="sum" type="sum" minOccurs="0"/>
<xs:element name="product" type="product" minOccurs="0"/>
<xs:element name="zero" type="zero_val" minOccurs="0"/>
<xs:element name="identity" type="identity_val" minOccurs="0"/>
<xs:element name="zero" type="zeroVal" minOccurs="0"/>
<xs:element name="identity" type="identityVal" minOccurs="0"/>
</xs:choice>
<xs:attributeGroup ref="expression_attributes"/>
<xs:attributeGroup ref="expressionAttributes"/>
</xs:complexType>
......@@ -111,12 +111,12 @@ element.
This type is divided in two parts, since it's irrelevant to set
transitionType for states or coordinates for transitions.
-->
<xs:complexType name="geometry_state">
<xs:complexType name="geometryState">
<xs:attribute name="x" type="xs:decimal"/>
<xs:attribute name="y" type="xs:decimal"/>
</xs:complexType>
<xs:complexType name="geometry_trans">
<xs:complexType name="geometryTrans">
<xs:attribute name="transitionType">
<xs:simpleType>
<xs:restriction base="xs:string">
......@@ -127,7 +127,7 @@ transitionType for states or coordinates for transitions.
<xs:attribute name="direction" type="xs:decimal"/>
</xs:complexType>
<xs:complexType name="geometry_global">
<xs:complexType name="geometryGlobal">
<xs:attribute name="x" type="xs:decimal"/>
<xs:attribute name="y" type="xs:decimal"/>
<xs:attribute name="orientation" type="xs:decimal"/>
......@@ -255,7 +255,7 @@ The default semiring is Boolean.
-->
<xs:complexType name="semiring">
<xs:sequence>
<xs:element name="monoid" type="monoid_automaton" minOccurs="0"/>
<xs:element name="monoid" type="monoidAutomaton" minOccurs="0"/>
<xs:element name="semiring" type="semiring" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="set" default="B">
......@@ -289,18 +289,18 @@ The monoid type is broken in two parts, for automata and transducers.
-->
<xs:complexType name="generator">
<xs:attribute name="value" type="xs:string"/>
<xs:attribute name="range" default="implicit_alphabet">
<xs:attribute name="range" default="implicitAlphabet">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:pattern value="implicit_alphabet|digits|ascii"/>
<xs:pattern value="implicitAlphabet|digits|ascii"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:complexType>
<xs:complexType name="monoid_automaton">
<xs:complexType name="monoidAutomaton">
<xs:choice>
<xs:element name="monoid" type="monoid_automaton" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="monoid" type="monoidAutomaton" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="generator" type="generator" minOccurs="0" maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute name="type" default="free">
......@@ -317,13 +317,13 @@ The monoid type is broken in two parts, for automata and transducers.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="identity_symbol" type="xs:string"/>
<xs:attribute name="identitySymbol" type="xs:string"/>
</xs:complexType>
<xs:complexType name="monoid_transducer">
<xs:complexType name="monoidTransducer">
<xs:choice>
<xs:element name="monoid" type="monoid_automaton" minOccurs="0" maxOccurs="2"/>
<xs:element name="monoid" type="monoidAutomaton" minOccurs="0" maxOccurs="2"/>
<xs:element name="generator" type="generator" minOccurs="0" maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute name="type" default="product">
......@@ -340,27 +340,27 @@ The monoid type is broken in two parts, for automata and transducers.
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="identity_symbol" type="xs:string"/>
<xs:attribute name="identitySymbol" type="xs:string"/>
</xs:complexType>
<!--
<label_type> tag properties. This tag encapsulates semiring and monoid
<labelType> tag properties. This tag encapsulates semiring and monoid
definitions to entirely define the algebraic structure the automaton /
transducer is working on. This tag is optionnal if you want to use
default values. You can specify only one of the monoid / semiring tag,
if necessary.
-->
<xs:complexType name="type_automaton">
<xs:complexType name="typeAutomaton">
<xs:sequence>
<xs:element name="monoid" type="monoid_automaton" minOccurs="0"/>
<xs:element name="monoid" type="monoidAutomaton" minOccurs="0"/>
<xs:element name="semiring" type="semiring" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="type_transducer">
<xs:complexType name="typeTransducer">
<xs:sequence>
<xs:element name="monoid" type="monoid_transducer" minOccurs="0"/>
<xs:element name="monoid" type="monoidTransducer" minOccurs="0"/>
<xs:element name="semiring" type="semiring" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
......@@ -378,7 +378,7 @@ set using the <drawing> tag.
<xs:sequence>
<xs:element name="automaton" type="automaton" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="transducer" type="transducer" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="geometry" type="geometry_global" minOccurs="0"/>
<xs:element name="geometry" type="geometryGlobal" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string"/>
......@@ -396,9 +396,9 @@ properties can be set with the <drawing> tag.
-->
<xs:complexType name="state">
<xs:sequence>
<xs:element name="geometry" type="geometry_state" minOccurs="0"/>
<xs:element name="geometry" type="geometryState" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
<xs:element name="label" type="expression_label" minOccurs="0"/>
<xs:element name="label" type="expressionLabel" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="label" type="xs:string"/>
......@@ -418,21 +418,21 @@ be set with the <drawing> tag.
When unspecified, the unlabeled transition should be considered
labeled with the identity on the monoid.
-->
<xs:complexType name="label_base">
<xs:complexType name="labelAutomaton">
<xs:attribute name="label" type="xs:string"/>
<xs:attribute name="weight" type="xs:string"/>
</xs:complexType>
<xs:complexType name="label_transducer">
<xs:complexType name="labelTransducer">
<xs:attribute name="in" type="xs:string"/>
<xs:attribute name="out" type="xs:string"/>
</xs:complexType>
<xs:complexType name="transition">
<xs:sequence>
<xs:element name="geometry" type="geometry_trans" minOccurs="0"/>
<xs:element name="geometry" type="geometryTrans" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
<xs:element name="label" type="expression_label" minOccurs="0"/>
<xs:element name="label" type="expressionLabel" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="src" type="xs:string" use="required"/>
<xs:attribute name="dst" type="xs:string" use="required"/>
......@@ -441,13 +441,13 @@ labeled with the identity on the monoid.
<xs:attribute name="weight" type="xs:string"/>
</xs:complexType>
<xs:complexType name="transition_transducer">
<xs:complexType name="transitionTransducer">
<xs:sequence>
<xs:element name="geometry" type="geometry_trans" minOccurs="0"/>
<xs:element name="geometry" type="geometryTrans" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
<xs:element name="in" type="expression_label" minOccurs="0"/>
<xs:element name="out" type="expression_label" minOccurs="0"/>
<xs:element name="label" type="expression_label" minOccurs="0"/>
<xs:element name="in" type="expressionLabel" minOccurs="0"/>
<xs:element name="out" type="expressionLabel" minOccurs="0"/>
<xs:element name="label" type="expressionLabel" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="src" type="xs:string" use="required"/>
<xs:attribute name="dst" type="xs:string" use="required"/>
......@@ -466,7 +466,7 @@ Global geometry and drawing properties can be set for all states.
<xs:complexType name="states">
<xs:sequence>
<xs:element name="state" type="state" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="geometry" type="geometry_state" minOccurs="0"/>
<xs:element name="geometry" type="geometryState" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
......@@ -482,17 +482,17 @@ Global geometry and drawing properties can be set for all transitions.
<xs:element name="transition" type="transition" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="initial" type="initial" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="final" type="final" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="geometry" type="geometry_trans" minOccurs="0"/>
<xs:element name="geometry" type="geometryTrans" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="transitions_transducer">
<xs:complexType name="transitionsTransducer">
<xs:sequence>
<xs:element name="transition" type="transition_transducer" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="initial" type="initial_transducer" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="final" type="final_transducer" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="geometry" type="geometry_trans" minOccurs="0"/>
<xs:element name="transition" type="transitionTransducer" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="initial" type="initialTransducer" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="final" type="finalTransducer" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="geometry" type="geometryTrans" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
......@@ -506,22 +506,22 @@ and drawing properties.
-->
<xs:complexType name="initial">
<xs:sequence>
<xs:element name="geometry" type="geometry_trans" minOccurs="0"/>
<xs:element name="geometry" type="geometryTrans" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
<xs:element name="label" type="expression_label" minOccurs="0"/>
<xs:element name="label" type="expressionLabel" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="state" type="xs:string" use="required"/>
<xs:attribute name="label" type="xs:string"/>
<xs:attribute name="weight" type="xs:string"/>
</xs:complexType>
<xs:complexType name="initial_transducer">
<xs:complexType name="initialTransducer">
<xs:sequence>
<xs:element name="geometry" type="geometry_trans" minOccurs="0"/>
<xs:element name="geometry" type="geometryTrans" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
<xs:element name="in" type="expression_label" minOccurs="0"/>
<xs:element name="out" type="expression_label" minOccurs="0"/>
<xs:element name="label" type="expression_label" minOccurs="0"/>
<xs:element name="in" type="expressionLabel" minOccurs="0"/>
<xs:element name="out" type="expressionLabel" minOccurs="0"/>
<xs:element name="label" type="expressionLabel" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="state" type="xs:string" use="required"/>
<xs:attribute name="label" type="xs:string"/>
......@@ -536,22 +536,22 @@ and drawing properties.
-->
<xs:complexType name="final">
<xs:sequence>
<xs:element name="geometry" type="geometry_trans" minOccurs="0"/>
<xs:element name="geometry" type="geometryTrans" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
<xs:element name="label" type="expression_label" minOccurs="0"/>
<xs:element name="label" type="expressionLabel" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="state" type="xs:string" use="required"/>
<xs:attribute name="label" type="xs:string"/>
<xs:attribute name="weight" type="xs:string"/>
</xs:complexType>
<xs:complexType name="final_transducer">
<xs:complexType name="finalTransducer">
<xs:sequence>
<xs:element name="geometry" type="geometry_trans" minOccurs="0"/>
<xs:element name="geometry" type="geometryTrans" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
<xs:element name="in" type="expression_label" minOccurs="0"/>
<xs:element name="out" type="expression_label" minOccurs="0"/>
<xs:element name="label" type="expression_label" minOccurs="0"/>
<xs:element name="in" type="expressionLabel" minOccurs="0"/>
<xs:element name="out" type="expressionLabel" minOccurs="0"/>
<xs:element name="label" type="expressionLabel" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="state" type="xs:string" use="required"/>
<xs:attribute name="label" type="xs:string"/>
......@@ -571,21 +571,21 @@ is constrained.
<!--
Two possible contents are available, one for automata and one for transducers.
-->
<xs:complexType name="content_automaton">
<xs:complexType name="contentAutomaton">
<xs:sequence>
<xs:element name="geometry" type="geometry_global" minOccurs="0"/>
<xs:element name="geometry" type="geometryGlobal" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
<xs:element name="states" type="states"/>
<xs:element name="transitions" type="transitions"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="content_transducer">
<xs:complexType name="contentTransducer">
<xs:sequence>
<xs:element name="geometry" type="geometry_global" minOccurs="0"/>
<xs:element name="geometry" type="geometryGlobal" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
<xs:element name="states" type="states"/>
<xs:element name="transitions" type="transitions_transducer"/>
<xs:element name="transitions" type="transitionsTransducer"/>
</xs:sequence>
</xs:complexType>
......@@ -597,9 +597,9 @@ be set.
-->
<xs:complexType name="automaton">
<xs:sequence>
<xs:element name="label_type" type="type_automaton" minOccurs="0"/>
<xs:element name="content" type="content_automaton"/>
<xs:element name="geometry" type="geometry_global" minOccurs="0"/>
<xs:element name="labelType" type="typeAutomaton" minOccurs="0"/>
<xs:element name="content" type="contentAutomaton"/>
<xs:element name="geometry" type="geometryGlobal" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string"/>
......@@ -612,9 +612,9 @@ be set.
-->
<xs:complexType name="transducer">
<xs:sequence>
<xs:element name="label_type" type="type_transducer" minOccurs="0"/>
<xs:element name="content" type="content_transducer"/>
<xs:element name="geometry" type="geometry_global" minOccurs="0"/>
<xs:element name="labelType" type="typeTransducer" minOccurs="0"/>
<xs:element name="content" type="contentTransducer"/>
<xs:element name="geometry" type="geometryGlobal" minOccurs="0"/>
<xs:element name="drawing" type="drawing" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string"/>
......
<automaton name="a1" xmlns="http://vaucanson.lrde.epita.fr">
<label_type>
<labelType>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
</monoid>
<semiring operations="numerical" set="B"/>
</label_type>
</labelType>
<content>
<states>
<state name="s0"/>
......
<transducer name="T" xmlns="http://vaucanson.lrde.epita.fr">
<label_type>
<labelType>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
......@@ -11,7 +11,7 @@
</monoid>
<semiring operations="numerical" set="B"/>
</semiring>
</label_type>
</labelType>
<content>
<states>
<state name="s0"/>
......
<automaton name="b1" xmlns="http://vaucanson.lrde.epita.fr">
<label_type>
<labelType>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
</monoid>
<semiring operations="numerical" set="Z"/>
</label_type>
</labelType>
<content>
<states>
<state name="s0"/>
......
<transducer xmlns="http://vaucanson.lrde.epita.fr">
<label_type>
<labelType>
<monoid generators="letters" type="free">
<generator value="a"/>
<generator value="b"/>
......@@ -11,7 +11,7 @@
</monoid>
<semiring operations="numerical" set="B"/>
</semiring>
</label_type>
</labelType>
<content>
<states>
<state name="s0"/>
......
......@@ -328,12 +328,12 @@ definition. So, the resticted alphabet would be defined as shown in
\small
\begin{center}
\begin{alltt}
<label_type>
<labelType>
<monoid>
<generator value="a"/>
<generator value="b"/>
</monoid>
</label_type>
</labelType>
\end{alltt}
\caption{Setting $\{a, b\}$ alphabet}
......@@ -348,12 +348,12 @@ Similarly, one can also set a restriction on the alphabet like in
\small
\begin{center}
\begin{alltt}
<label_type>
<labelType>
<monoid generators="digits" type="free">
<generator value="0"/>
<generator value="1"/>
</monoid>
</label_type>
</labelType>
\end{alltt}
\caption{Example of a restriction}
......@@ -405,7 +405,7 @@ The XSD description of the \generatortag{} tag is:
alphabets.
\item \xattr{range}\\
This allows to set a fixed range without being obliged to add all
the symbols one by one. For instance, the range \textsc{implicit\_alphabet}
the symbols one by one. For instance, the range \textsc{implicitAlphabet}
sets the alphabet on the lowercase and uppercase alphabet characters.
\end{itemize}
......@@ -485,7 +485,7 @@ remain clear.
\begin{center}
\begin{alltt}
<transducer>
<label_type>
<labelType>
<monoid generators="digits" type="free">
<generator value="0"/>
<generator value="1"/>
......@@ -498,7 +498,7 @@ remain clear.
</monoid>
<semiring operations="numerical" set="B"/>
</semiring>
</label_type>
</labelType>
<content>
...
</content>
......@@ -690,12 +690,12 @@ $\mathbb{B}$ shall be applied.
\begin{figure}[ht]
\begin{center}
\begin{alltt}
<label_type>
<labelType>
<monoid type="free" generators="letters">
<generator range="implicit_alphabet"/>
<generator range="implicitAlphabet"/>
</monoid>
<semiring set="B" operations="numerical"/>
</label_type>
</labelType>
\end{alltt}
\caption{Default type for an automaton}
......@@ -707,17 +707,17 @@ $\mathbb{B}$ shall be applied.
\begin{figure}[ht]
\begin{center}
\begin{alltt}
<label_type>
<labelType>
<monoid type="product">
<monoid type="free" generators="letters">
<generator range="implicit_alphabet"/>
<generator range="implicitAlphabet"/>
</monoid>
<monoid type="free" generators="letters">
<generator range="implicit_alphabet"/>
<generator range="implicitAlphabet"/>
</monoid>
</monoid>
<semiring set="B" operations="numerical"/>
</label_type>
</labelType>
\end{alltt}
\caption{Default type for a transducer}
......
......@@ -111,14 +111,14 @@ namespace vcsn {
template<typename M_, typename W_>
void XmlExpVisitor<M_, W_>::zero()
{
xercesc::DOMElement* zero = doc_->createElement(STR2XML("zero_val"));
xercesc::DOMElement* zero = doc_->createElement(STR2XML("zeroVal"));
current_->appendChild(zero);
}