Skip to content

Commit

Permalink
Merge pull request #86 from metanorma/features/feedback-statement
Browse files Browse the repository at this point in the history 
feedback statement for PDF: https://github.com/metanorma/metanorma-ie…
  • Loading branch information
@opoudjis
opoudjis authored Nov 14, 2020
2 parents 3a08298 + a4fea6e commit 7cdd8f1
Show file tree
Hide file tree
Showing 5 changed files with 141 additions and 74 deletions.
135 changes: 82 additions & 53 deletions lib/asciidoctor/iec/iec_intro_en.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,60 +2,89 @@
<copyright-statement>
<clause>
<p id="boilerplate-year">
&copy; {{ agency }} {{ docyear }}, Published in Switzerland
</p>

<p id="boilerplate-message">
All rights
reserved. Unless otherwise specified, no part of this publication may be
reproduced or utilized otherwise in any form or by any means, electronic or
mechanical, including photocopying, or posting on the internet or an intranet,
without prior written permission. Permission can be requested from either IEC
at the address below or IEC's member body in the country of the requester.
</p>

<p id="boilerplate-name">IEC Central Office</p>

<p id="boilerplate-address" align="left">
3, rue de Varemb&eacute;<br/>
CH-1211 Geneva 20, Switzerland<br/>
Tel.&nbsp;&nbsp;+ 41 22 919 02 11<br/>
Fax&nbsp;&nbsp;+ 41 22 919 03 00<br/>
[email protected]<br/>
www.iec.ch
</p>
</clause>
</copyright-statement>
<legal-statement>
<clause>
<ol>
<li><p>The International Electrotechnical Commission (IEC) is a worldwide organization for standardization comprising all national electrotechnical committees (IEC National Committees). The object of IEC is to promote international co-operation on all questions concerning standardization in the electrical and electronic fields. To this end and in addition to other activities, IEC publishes International Standards, Technical Specifications, Technical Reports, Publicly Available Specifications (PAS) and Guides (hereafter referred to as “IEC Publication(s)”). Their preparation is entrusted to technical committees; any IEC National Committee interested in the subject dealt with may participate in this preparatory work. International, governmental and non-governmental organizations liaising with the IEC also participate in this preparation. IEC collaborates closely with the International Organization for Standardization (ISO) in accordance with conditions determined by agreement between the two organizations.</p></li>
<li><p>The formal decisions or agreements of IEC on technical matters express, as nearly as possible, an international consensus of opinion on the relevant subjects since each technical committee has representation from all interested IEC National Committees.</p></li>
<li><p>IEC Publications have the form of recommendations for international use and are accepted by IEC National Committees in that sense. While all reasonable efforts are made to ensure that the technical content of IEC Publications is accurate, IEC cannot be held responsible for the way in which they are used or for any misinterpretation by any end user.</p></li>
<li><p>In order to promote international uniformity, IEC National Committees undertake to apply IEC Publications transparently to the maximum extent possible in their national and regional publications. Any divergence between any IEC Publication and the corresponding national or regional publication shall be clearly indicated in the latter.</p></li>
<li><p>IEC itself does not provide any attestation of conformity. Independent certification bodies provide conformity assessment services and, in some areas, access to IEC marks of conformity. IEC is not responsible for any services carried out by independent certification bodies.</p></li>
<li><p>All users should ensure that they have the latest edition of this publication.</p></li>
<li><p>No liability shall attach to IEC or its directors, employees, servants or agents including individual experts and members of its technical committees and IEC National Committees for any personal injury, property damage or other damage of any nature whatsoever, whether direct or indirect, or for costs (including legal fees) and expenses arising out of the publication, use of, or reliance upon, this IEC Publication or any other IEC Publications.</p></li>
<li><p>Attention is drawn to the Normative references cited in this publication. Use of the referenced publications is indispensable for the correct application of this publication.</p></li>
<li><p>Attention is drawn to the possibility that some of the elements of this IEC Publication may be the subject of patent rights. IEC shall not be held responsible for identifying any or all such patent rights.</p></li>
</ol>
</clause>
</legal-statement>
© {{ agency }} {{ docyear }}, Published in Switzerland
</p>
<p id="boilerplate-message">
All rights
reserved. Unless otherwise specified, no part of this publication may be
reproduced or utilized otherwise in any form or by any means, electronic or
mechanical, including photocopying, or posting on the internet or an intranet,
without prior written permission. Permission can be requested from either IEC
at the address below or IEC's member body in the country of the requester.
</p>
<p id="boilerplate-name">IEC Central Office</p>
<p id="boilerplate-address" align="left">
3, rue de Varembé<br/>
CH-1211 Geneva 20, Switzerland<br/>
Tel.&#xa0;&#xa0;+ 41 22 919 02 11<br/>
Fax&#xa0;&#xa0;+ 41 22 919 03 00<br/>
[email protected]<br/>
www.iec.ch
</p>
</clause>
</copyright-statement>
<legal-statement>
<clause>
<ol>
<li><p>The International Electrotechnical Commission (IEC) is a worldwide organization for standardization comprising all national electrotechnical committees (IEC National Committees). The object of IEC is to promote international co-operation on all questions concerning standardization in the electrical and electronic fields. To this end and in addition to other activities, IEC publishes International Standards, Technical Specifications, Technical Reports, Publicly Available Specifications (PAS) and Guides (hereafter referred to as “IEC Publication(s)”). Their preparation is entrusted to technical committees; any IEC National Committee interested in the subject dealt with may participate in this preparatory work. International, governmental and non-governmental organizations liaising with the IEC also participate in this preparation. IEC collaborates closely with the International Organization for Standardization (ISO) in accordance with conditions determined by agreement between the two organizations.</p></li>
<li><p>The formal decisions or agreements of IEC on technical matters express, as nearly as possible, an international consensus of opinion on the relevant subjects since each technical committee has representation from all interested IEC National Committees.</p></li>
<li><p>IEC Publications have the form of recommendations for international use and are accepted by IEC National Committees in that sense. While all reasonable efforts are made to ensure that the technical content of IEC Publications is accurate, IEC cannot be held responsible for the way in which they are used or for any misinterpretation by any end user.</p></li>
<li><p>In order to promote international uniformity, IEC National Committees undertake to apply IEC Publications transparently to the maximum extent possible in their national and regional publications. Any divergence between any IEC Publication and the corresponding national or regional publication shall be clearly indicated in the latter.</p></li>
<li><p>IEC itself does not provide any attestation of conformity. Independent certification bodies provide conformity assessment services and, in some areas, access to IEC marks of conformity. IEC is not responsible for any services carried out by independent certification bodies.</p></li>
<li><p>All users should ensure that they have the latest edition of this publication.</p></li>
<li><p>No liability shall attach to IEC or its directors, employees, servants or agents including individual experts and members of its technical committees and IEC National Committees for any personal injury, property damage or other damage of any nature whatsoever, whether direct or indirect, or for costs (including legal fees) and expenses arising out of the publication, use of, or reliance upon, this IEC Publication or any other IEC Publications.</p></li>
<li><p>Attention is drawn to the Normative references cited in this publication. Use of the referenced publications is indispensable for the correct application of this publication.</p></li>
<li><p>Attention is drawn to the possibility that some of the elements of this IEC Publication may be the subject of patent rights. IEC shall not be held responsible for identifying any or all such patent rights.</p></li>
</ol>
</clause>
</legal-statement>
{% if unpublished %}
<license-statement>
<clause>
<title>Warning for CDs, CDVs and FDISs</title>
<license-statement>
<clause>
<title>Warning for CDs, CDVs and FDISs</title>

<p>This
document is not an IEC International Standard. It is distributed for review and
comment. It is subject to change without notice and may not be referred to as
an International Standard.</p>
<p>This
document is not an IEC International Standard. It is distributed for review and
comment. It is subject to change without notice and may not be referred to as
an International Standard.</p>

<p>Recipients
of this draft are invited to submit, with their comments, notification of any
relevant patent rights of which they are aware and to provide supporting
documentation.</p>
</clause>
</license-statement>
{% endif %}
<p>Recipients
of this draft are invited to submit, with their comments, notification of any
relevant patent rights of which they are aware and to provide supporting
documentation.</p>
</clause>
</license-statement>
{% endif %}
<feedback-statement>
<clause>
<title>About the IEC</title>
<p>The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes International Standards for all electrical, electronic and related technologies.</p>
</clause>
<clause>
<title>About IEC publications</title>
<p>The technical content of IEC publications is kept under constant review by the IEC. Please make sure that you have the latest edition, a corrigenda or an amendment might have been published.</p>
</clause>
<clause>
<clause>
<title>IEC Catalogue - <link target="https://webstore.iec.ch/catalogue">webstore.iec.ch/catalogue</link></title>
<p>The stand-alone application for consulting the entire bibliographical information on IEC International Standards, Technical Specifications, Technical Reports and other documents. Available for PC, Mac OS, Android Tablets and iPad.</p>
</clause>
<clause><title>IEC publications search - <link target="https://www.iec.ch/searchpub">www.iec.ch/searchpub</link></title>
<p>The advanced search enables to find IEC publications by a variety of criteria (reference number, text, technical committee,...). It also gives information on projects, replaced and withdrawn publications.</p>
</clause>
<clause><title>IEC Just Published - <link target="https://webstore.iec.ch/justpublished">webstore.iec.ch/justpublished</link></title>
<p>Stay up to date on all new IEC publications. Just Published details all new publications released. Available online and also once a month by email.</p>
</clause>
<clause><title>Electropedia - <link target="http://www.electropedia.org">www.electropedia.org</link></title>
<p>The world's leading online dictionary of electronic and electrical terms containing more than 30 000 terms and definitions in English and French, with equivalent terms in 14 additional languages. Also known as the International Electrotechnical Vocabulary (IEV) online.</p>
</clause>
<clause><title>IEC Glossary - <link target="http://std.iec.ch/glossary">std.iec.ch/glossary</link></title>
<p>More than 55 000 electrotechnical terminology entries in English and French extracted from the Terms and Definitions clause of IEC publications issued since 2002. Some entries have been collected from earlier publications of IEC TC 37, 77, 86 and CISPR.</p>
</clause>
<clause><title>IEC Customer Service Centre - <link target="https://webstore.iec.ch/csc">webstore.iec.ch/csc</link></title>
<p>If you wish to give us your feedback on this publication or need further assistance, please contact the Customer Service Centre: <link target="mailto://[email protected]">[email protected]</link>.</p>
</clause>
</clause>
</feedback-statement>
</boilerplate>

64 changes: 44 additions & 20 deletions lib/asciidoctor/iec/iec_intro_fr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,24 @@
<copyright-statement>
<clause>
<p id="boilerplate-year">
&copy; {{ agency }} {{ docyear }}, Published in Switzerland
© {{ agency }} {{ docyear }}, Publié en Suisse
</p>

<p id="boilerplate-message">
All rights
reserved. Unless otherwise specified, no part of this publication may be
reproduced or utilized otherwise in any form or by any means, electronic or
mechanical, including photocopying, or posting on the internet or an intranet,
without prior written permission. Permission can be requested from either IEC
at the address below or IEC's member body in the country of the requester.
Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne
peut être reproduite ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique
ou mécanique, y compris la photocopie, l’affichage sur l’internet ou sur un Intranet, sans
autorisation écrite préalable. Les demandes d’autorisation peuvent être adressées à l’IEC à
l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
</p>

<p id="boilerplate-name">IEC Central Office</p>

<p id="boilerplate-address" align="left">
3, rue de Varemb&eacute;<br/>
3, rue de Varembé<br/>
CH-1211 Geneva 20, Switzerland<br/>
Tel.&nbsp;&nbsp;+ 41 22 919 02 11<br/>
Fax&nbsp;&nbsp;+ 41 22 919 03 00<br/>
Tel.&#xa0;&#xa0;+ 41 22 919 02 11<br/>
Fax&#xa0;&#xa0;+ 41 22 919 03 00<br/>
[email protected]<br/>
www.iec.ch
</p>
Expand All @@ -44,18 +43,43 @@ at the address below or IEC's member body in the country of the requester.
{% if unpublished %}
<license-statement>
<clause>
<title>Warning for CDs, CDVs and FDISs</title>
<title>Avertissement</title>

<p>This
document is not an IEC International Standard. It is distributed for review and
comment. It is subject to change without notice and may not be referred to as
an International Standard.</p>

<p>Recipients
of this draft are invited to submit, with their comments, notification of any
relevant patent rights of which they are aware and to provide supporting
documentation.</p>
<p>Ce document n'est pas une Norme internationale de l'ISO. Il est distribué pour examen et observations. Il est susceptible de modification sans préavis et ne peut être cité comme Norme internationale.</p>
<p>Les destinataires du présent projet sont invités à présenter, avec leurs observations, notification des droits de propriété dont ils auraient éventuellement connaissance et à fournir une documentation explicative.</p>
</clause>
</license-statement>
{% endif %}
<feedback-statement>
<clause>
<title>A propos de l'IEC</title>
<p>La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</p>
</clause>
<clause>
<title>A propos des publications IEC</title>
<p>Le contenu technique des publications IEC est constamment revu. Veuillez vous assurer que vous possédez l’édition la plus récente, un corrigendum ou amendement peut avoir été publié.</p>
</clause>
<clause>
<clause>
<title>Catalogue IEC - <link target="https://webstore.iec.ch/catalogue">webstore.iec.ch/catalogue</link></title>
<p>Application autonome pour consulter tous les renseignements bibliographiques sur les Normes internationales, Spécifications techniques, Rapports techniques et autres documents de l'IEC. Disponible pour PC, Mac OS, tablettes Android et iPad.</p>
</clause>
<clause><title>Recherche de publications IEC - <link target="https://www.iec.ch/searchpub">www.iec.ch/searchpub</link></title>
<p>La recherche avancée permet de trouver des publications IEC en utilisant différents critères (numéro de référence, texte, comité d’études,...). Elle donne aussi des informations sur les projets et les publications remplacées ou retirées.</p>
</clause>
<clause><title>IEC Just Published - <link target="https://webstore.iec.ch/justpublished">webstore.iec.ch/justpublished</link></title>
<p>Restez informé sur les nouvelles publications IEC. Just Published détaille les nouvelles publications parues. Disponible en ligne et aussi une fois par mois par email.</p>
</clause>
<clause><title>Electropedia - <link target="http://www.electropedia.org">www.electropedia.org</link></title>
<p>Le premier dictionnaire en ligne de termes électroniques et électriques. Il contient plus de 30 000 termes et définitions en anglais et en français, ainsi que les termes équivalents dans 14 langues additionnelles. Egalement appelé Vocabulaire Electrotechnique International (IEV) en ligne.</p>
</clause>
<clause><title>Glossaire IEC - <link target="http://std.iec.ch/glossary">std.iec.ch/glossary</link></title>
<p>Plus de 55 000 entrées terminologiques électrotechniques, en anglais et en français, extraites des articles Termes et Définitions des publications IEC parues depuis 2002. Plus certaines entrées antérieures extraites des publications des CE 37, 77, 86 et CISPR de l'IEC.</p>
</clause>
<clause><title>Service Clients - <link target="https://webstore.iec.ch/csc">webstore.iec.ch/csc</link></title>
<p>Si vous désirez nous donner des commentaires sur cette publication ou si vous avez des questions contactez-nous: <link target="mailto://[email protected]">[email protected]</link>.</p>
</clause>
</clause>
</feedback-statement>
</boilerplate>

6 changes: 6 additions & 0 deletions lib/isodoc/iec/html_convert.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ def htmlstyle(docxml)
docxml
end

def authority_cleanup(docxml)
auth = docxml.at("//div[@id = 'boilerplate-feedback' or @class = 'boilerplate-feedback']")
auth&.remove
super
end

include BaseConvert
include Init
end
Expand Down
6 changes: 6 additions & 0 deletions lib/isodoc/iec/word_convert.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,12 @@ def word_foreword_cleanup(docxml)
b.replace(b.children)
end

def authority_cleanup(docxml)
auth = docxml.at("//div[@id = 'boilerplate-feedback' or @class = 'boilerplate-feedback']")
auth&.remove
super
end

def make_body1(body, _docxml)
end

Expand Down
4 changes: 3 additions & 1 deletion spec/spec_helper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ def xmlpp(x)
gsub(/\{% if unpublished %\}.*\{% endif %\}/m, "").
gsub(/(?<=\p{Alnum})'(?=\p{Alpha})/, "’").
gsub(/<p>/, "<p id='_'>").
gsub(/<ol>/, "<ol id='_'>")
gsub(/<ol>/, "<ol id='_'>").
gsub(/ - /, " — ").
gsub(/\.\.\./, "…")
)

BOILERPLATE_LICENSE = <<~END
Expand Down

0 comments on commit 7cdd8f1

Please sign in to comment.