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.

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

em-dash after term modified: https://github.com/metanorma/metanorma-i… #208

Merged
merged 1 commit into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile.devel
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "fix/primary-docidentifier"
gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main"
gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "main"
gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/emdash-termsource"
2 changes: 1 addition & 1 deletion lib/isodoc/ietf/terms.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def termsource_status(status)

def termsource_add_modification_text(mod)
mod or return
mod.text.strip.empty? or mod.previous = " – "
mod.text.strip.empty? or mod.previous = " — "
mod.elements.size == 1 and
mod.elements[0].replace(mod.elements[0].children)
mod.replace(mod.children)
Expand Down
43 changes: 23 additions & 20 deletions lib/metanorma/ietf/isodoc.rng
Original file line number Diff line number Diff line change
Expand Up @@ -407,26 +407,7 @@
</define>
<define name="figure">
<element name="figure">
<attribute name="id">
<data type="ID"/>
</attribute>
<optional>
<attribute name="unnumbered">
<data type="boolean"/>
</attribute>
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
<attribute name="subsequence"/>
</optional>
<optional>
<attribute name="class"/>
</optional>
<optional>
<attribute name="width"/>
</optional>
<ref name="FigureAttributes"/>
<ref name="BlockAttributes"/>
<optional>
<ref name="tname"/>
Expand Down Expand Up @@ -457,6 +438,28 @@
</optional>
</element>
</define>
<define name="FigureAttributes">
<attribute name="id">
<data type="ID"/>
</attribute>
<optional>
<attribute name="unnumbered">
<data type="boolean"/>
</attribute>
</optional>
<optional>
<attribute name="number"/>
</optional>
<optional>
<attribute name="subsequence"/>
</optional>
<optional>
<attribute name="class"/>
</optional>
<optional>
<attribute name="width"/>
</optional>
</define>
<define name="source">
<element name="source">
<attribute name="status">
Expand Down
2 changes: 1 addition & 1 deletion spec/isodoc/blocks_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
<figure anchor='figure-C'>
<artwork type='ascii-art'><![CDATA[A <
B]]></artwork>
<t>[SOURCE: <xref target="ISO2191" section="1" relative=""/>
<t>[SOURCE: <xref target="ISO2191" section="1" relative=""/> &#x2014;
with adjustments]</t>
</figure>
</abstract></front><middle/><back/></rfc>
Expand Down
2 changes: 1 addition & 1 deletion spec/isodoc/table_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<dt>Drago</dt>
<dd>A type of rice</dd>
</dl>
<t>[SOURCE: <xref target="ISO2191" section="1" relative=""/> with adjustments]</t>
<t>[SOURCE: <xref target="ISO2191" section="1" relative=""/> &#x2014; with adjustments]</t>
<aside>
<t>NOTE: This is a table about rice</t>
</aside>
Expand Down
2 changes: 1 addition & 1 deletion spec/isodoc/terms_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<ul>
<li>A</li>
</ul>
<t>[SOURCE: <xref target="ISO7301" section="3.1" relative=""/>, modified
<t>[SOURCE: <xref target="ISO7301" section="3.1" relative=""/>, modified &#x2014;
The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</t>
</section>
<section anchor='paddy'>
Expand Down
Loading