metanorma-m3d 1.3.15 → 1.3.20
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +10 -10
- data/.github/workflows/ubuntu.yml +25 -11
- data/.github/workflows/windows.yml +11 -12
- data/README.adoc +4 -6
- data/lib/asciidoctor/m3d/biblio.rng +131 -46
- data/lib/asciidoctor/m3d/converter.rb +1 -7
- data/lib/asciidoctor/m3d/isodoc.rng +32 -4
- data/lib/isodoc/m3d/html/htmlstyle.scss +5 -2
- data/lib/isodoc/m3d/html/scripts.html +14 -27
- data/lib/isodoc/m3d/metadata.rb +1 -27
- data/lib/metanorma-m3d.rb +0 -1
- data/lib/metanorma/m3d/processor.rb +8 -4
- data/lib/metanorma/m3d/version.rb +1 -1
- metadata +2 -4
- data/lib/isodoc/m3d/html/scripts.pdf.html +0 -72
- data/lib/isodoc/m3d/pdf_convert.rb +0 -72
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 98c7fd2a7105bf1a2d4029013d6ee79b5c45df90d297e4e4e4f0365311f51543
|
|
4
|
+
data.tar.gz: 2cf26c590821e184feb4739b3cd63725b63880c9ea3eb0052271178aa6c9c74d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5b392067b7fb4c0252a22eb5c2cfb04f20db519b3b9f5f7791fc57af49fcb5d862447f835c1db4df2d35b3a5fefbc0d95793b44d6f7fbe2a8e1e41e4ac47bd86
|
|
7
|
+
data.tar.gz: 485376ad0cb7e5ce24438b619369e30c9335a07b27ea04bf129cc2c5de2bc63e8e7fb601f3a7210ab32d2b01941f2148179cf56cb67bc56ca1e0b888643a415c
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -1,21 +1,28 @@
|
|
|
1
|
-
# Auto-generated
|
|
2
|
-
#
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
3
3
|
name: macos
|
|
4
4
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
8
|
pull_request:
|
|
9
|
-
|
|
9
|
+
paths-ignore:
|
|
10
|
+
- .github/workflows/ubuntu.yml
|
|
11
|
+
- .github/workflows/windows.yml
|
|
10
12
|
|
|
11
13
|
jobs:
|
|
12
14
|
test-macos:
|
|
13
15
|
name: Test on Ruby ${{ matrix.ruby }} macOS
|
|
14
16
|
runs-on: macos-latest
|
|
17
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
15
18
|
strategy:
|
|
16
19
|
fail-fast: false
|
|
17
20
|
matrix:
|
|
18
21
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
22
|
+
experimental: [false]
|
|
23
|
+
include:
|
|
24
|
+
- ruby: '2.7'
|
|
25
|
+
experimental: true
|
|
19
26
|
steps:
|
|
20
27
|
- uses: actions/checkout@master
|
|
21
28
|
- name: Use Ruby
|
|
@@ -27,13 +34,6 @@ jobs:
|
|
|
27
34
|
run: |
|
|
28
35
|
sudo gem install bundler --force
|
|
29
36
|
bundle install --jobs 4 --retry 3
|
|
30
|
-
- name: Use Node
|
|
31
|
-
uses: actions/setup-node@v1
|
|
32
|
-
with:
|
|
33
|
-
node-version: '8'
|
|
34
|
-
- name: Install Puppeteer
|
|
35
|
-
run: |
|
|
36
|
-
npm install -g puppeteer
|
|
37
37
|
- name: Run specs
|
|
38
38
|
run: |
|
|
39
39
|
bundle exec rake
|
|
@@ -1,21 +1,30 @@
|
|
|
1
|
-
# Auto-generated
|
|
2
|
-
#
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
3
3
|
name: ubuntu
|
|
4
4
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
|
+
tags:
|
|
9
|
+
- '*'
|
|
8
10
|
pull_request:
|
|
9
|
-
|
|
11
|
+
paths-ignore:
|
|
12
|
+
- .github/workflows/macos.yml
|
|
13
|
+
- .github/workflows/windows.yml
|
|
10
14
|
|
|
11
15
|
jobs:
|
|
12
16
|
test-linux:
|
|
13
17
|
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
|
14
18
|
runs-on: ubuntu-latest
|
|
19
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
15
20
|
strategy:
|
|
16
21
|
fail-fast: false
|
|
17
22
|
matrix:
|
|
18
23
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
24
|
+
experimental: [false]
|
|
25
|
+
include:
|
|
26
|
+
- ruby: '2.7'
|
|
27
|
+
experimental: true
|
|
19
28
|
steps:
|
|
20
29
|
- uses: actions/checkout@master
|
|
21
30
|
- name: Use Ruby
|
|
@@ -25,15 +34,20 @@ jobs:
|
|
|
25
34
|
architecture: 'x64'
|
|
26
35
|
- name: Update gems
|
|
27
36
|
run: |
|
|
28
|
-
gem install bundler
|
|
37
|
+
gem install bundler
|
|
29
38
|
bundle install --jobs 4 --retry 3
|
|
30
|
-
- name: Use Node
|
|
31
|
-
uses: actions/setup-node@v1
|
|
32
|
-
with:
|
|
33
|
-
node-version: '8'
|
|
34
|
-
- name: Install Puppeteer
|
|
35
|
-
run: |
|
|
36
|
-
npm install -g puppeteer
|
|
37
39
|
- name: Run specs
|
|
38
40
|
run: |
|
|
39
41
|
bundle exec rake
|
|
42
|
+
- name: Trigger dependent repositories
|
|
43
|
+
if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
|
|
44
|
+
env:
|
|
45
|
+
GH_USERNAME: ${{ secrets.PAT_USERNAME }}
|
|
46
|
+
GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
|
|
47
|
+
run: |
|
|
48
|
+
curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
|
|
49
|
+
[[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
|
|
50
|
+
for repo in $DEPENDENT_REPOS
|
|
51
|
+
do
|
|
52
|
+
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
|
|
53
|
+
done
|
|
@@ -1,21 +1,28 @@
|
|
|
1
|
-
# Auto-generated
|
|
2
|
-
#
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
3
3
|
name: windows
|
|
4
4
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
8
|
pull_request:
|
|
9
|
-
|
|
9
|
+
paths-ignore:
|
|
10
|
+
- .github/workflows/macos.yml
|
|
11
|
+
- .github/workflows/ubuntu.yml
|
|
10
12
|
|
|
11
13
|
jobs:
|
|
12
14
|
test-windows:
|
|
13
15
|
name: Test on Ruby ${{ matrix.ruby }} Windows
|
|
14
16
|
runs-on: windows-latest
|
|
17
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
15
18
|
strategy:
|
|
16
19
|
fail-fast: false
|
|
17
20
|
matrix:
|
|
18
21
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
22
|
+
experimental: [false]
|
|
23
|
+
include:
|
|
24
|
+
- ruby: '2.7'
|
|
25
|
+
experimental: true
|
|
19
26
|
steps:
|
|
20
27
|
- uses: actions/checkout@master
|
|
21
28
|
- name: Use Ruby
|
|
@@ -26,17 +33,9 @@ jobs:
|
|
|
26
33
|
- name: Update gems
|
|
27
34
|
shell: pwsh
|
|
28
35
|
run: |
|
|
29
|
-
gem install bundler
|
|
36
|
+
gem install bundler
|
|
30
37
|
bundle config --local path vendor/bundle
|
|
31
|
-
bundle update
|
|
32
38
|
bundle install --jobs 4 --retry 3
|
|
33
|
-
- name: Use Node
|
|
34
|
-
uses: actions/setup-node@v1
|
|
35
|
-
with:
|
|
36
|
-
node-version: '8'
|
|
37
|
-
- name: Install Puppeteer
|
|
38
|
-
run: |
|
|
39
|
-
npm install -g puppeteer
|
|
40
39
|
- name: Run specs
|
|
41
40
|
run: |
|
|
42
41
|
bundle exec rake
|
data/README.adoc
CHANGED
|
@@ -45,7 +45,7 @@ The preferred way to invoke this gem is via the `metanorma` script:
|
|
|
45
45
|
----
|
|
46
46
|
$ metanorma --type m3d a.adoc # output HTML and DOC
|
|
47
47
|
$ metanorma --type m3d --extensions html a.adoc # output just HTML
|
|
48
|
-
$ metanorma --type m3d --extensions
|
|
48
|
+
$ metanorma --type m3d --extensions doc a.adoc # output just DOC
|
|
49
49
|
$ metanorma --type m3d --extensions xml a.adoc # output M3D XML
|
|
50
50
|
----
|
|
51
51
|
|
|
@@ -55,7 +55,7 @@ reported to console against the XML, and are intended for users to
|
|
|
55
55
|
check that they have provided all necessary components of the
|
|
56
56
|
document.
|
|
57
57
|
|
|
58
|
-
The gem then converts the XML into HTML and
|
|
58
|
+
The gem then converts the XML into HTML and DOC.
|
|
59
59
|
|
|
60
60
|
The gem can also be invoked directly within asciidoctor, though this is deprecated:
|
|
61
61
|
|
|
@@ -88,8 +88,6 @@ this general model can be found on its page. Details of the M3D modifications
|
|
|
88
88
|
to this general model can be found on the https://github.com/metanorma/metanorma-model-m3d[M3D model]
|
|
89
89
|
repository.
|
|
90
90
|
|
|
91
|
+
////
|
|
91
92
|
== Examples
|
|
92
|
-
|
|
93
|
-
* link:spec/examples/rfc6350.adoc[] is an AsciiM3D version of https://tools.ietf.org/html/rfc6350[RFC 6350].
|
|
94
|
-
* link:spec/examples/rfc6350.html[] is an HTML file generated from the AsciiM3D.
|
|
95
|
-
* link:spec/examples/rfc6350.doc[] is a Word document generated from the AsciiM3D.
|
|
93
|
+
////
|
|
@@ -49,11 +49,17 @@
|
|
|
49
49
|
</define>
|
|
50
50
|
<define name="stage">
|
|
51
51
|
<element name="stage">
|
|
52
|
+
<optional>
|
|
53
|
+
<attribute name="abbreviation"/>
|
|
54
|
+
</optional>
|
|
52
55
|
<text/>
|
|
53
56
|
</element>
|
|
54
57
|
</define>
|
|
55
58
|
<define name="substage">
|
|
56
59
|
<element name="substage">
|
|
60
|
+
<optional>
|
|
61
|
+
<attribute name="abbreviation"/>
|
|
62
|
+
</optional>
|
|
57
63
|
<text/>
|
|
58
64
|
</element>
|
|
59
65
|
</define>
|
|
@@ -82,7 +88,7 @@
|
|
|
82
88
|
<text/>
|
|
83
89
|
</element>
|
|
84
90
|
</define>
|
|
85
|
-
<define name="
|
|
91
|
+
<define name="LocalizedString1">
|
|
86
92
|
<optional>
|
|
87
93
|
<!-- multiple languages and scripts possible: comma delimit them if so -->
|
|
88
94
|
<attribute name="language"/>
|
|
@@ -92,6 +98,16 @@
|
|
|
92
98
|
</optional>
|
|
93
99
|
<text/>
|
|
94
100
|
</define>
|
|
101
|
+
<define name="LocalizedString">
|
|
102
|
+
<choice>
|
|
103
|
+
<ref name="LocalizedString1"/>
|
|
104
|
+
<oneOrMore>
|
|
105
|
+
<element name="variant">
|
|
106
|
+
<ref name="LocalizedString1"/>
|
|
107
|
+
</element>
|
|
108
|
+
</oneOrMore>
|
|
109
|
+
</choice>
|
|
110
|
+
</define>
|
|
95
111
|
<!--
|
|
96
112
|
Unlike UML, change type to format: type is overloaded
|
|
97
113
|
Would be need if plain were default value and could omit the attribute
|
|
@@ -115,7 +131,7 @@
|
|
|
115
131
|
</optional>
|
|
116
132
|
<ref name="LocalizedStringOrXsAny"/>
|
|
117
133
|
</define>
|
|
118
|
-
<define name="
|
|
134
|
+
<define name="LocalizedStringOrXsAny1">
|
|
119
135
|
<optional>
|
|
120
136
|
<!-- multiple languages and scripts possible: comma delimit them if so -->
|
|
121
137
|
<attribute name="language"/>
|
|
@@ -130,6 +146,16 @@
|
|
|
130
146
|
</choice>
|
|
131
147
|
</oneOrMore>
|
|
132
148
|
</define>
|
|
149
|
+
<define name="LocalizedStringOrXsAny">
|
|
150
|
+
<choice>
|
|
151
|
+
<ref name="LocalizedStringOrXsAny1"/>
|
|
152
|
+
<oneOrMore>
|
|
153
|
+
<element name="variant">
|
|
154
|
+
<ref name="LocalizedStringOrXsAny1"/>
|
|
155
|
+
</element>
|
|
156
|
+
</oneOrMore>
|
|
157
|
+
</choice>
|
|
158
|
+
</define>
|
|
133
159
|
<define name="contributor">
|
|
134
160
|
<element name="contributor">
|
|
135
161
|
<zeroOrMore>
|
|
@@ -452,9 +478,14 @@
|
|
|
452
478
|
<attribute name="bibitemid">
|
|
453
479
|
<data type="IDREF"/>
|
|
454
480
|
</attribute>
|
|
455
|
-
<
|
|
456
|
-
<
|
|
457
|
-
|
|
481
|
+
<choice>
|
|
482
|
+
<zeroOrMore>
|
|
483
|
+
<ref name="locality"/>
|
|
484
|
+
</zeroOrMore>
|
|
485
|
+
<zeroOrMore>
|
|
486
|
+
<ref name="localityStack"/>
|
|
487
|
+
</zeroOrMore>
|
|
488
|
+
</choice>
|
|
458
489
|
<optional>
|
|
459
490
|
<ref name="date"/>
|
|
460
491
|
</optional>
|
|
@@ -469,6 +500,25 @@
|
|
|
469
500
|
<ref name="BibItemLocality"/>
|
|
470
501
|
</element>
|
|
471
502
|
</define>
|
|
503
|
+
<define name="localityStack">
|
|
504
|
+
<element name="localityStack">
|
|
505
|
+
<zeroOrMore>
|
|
506
|
+
<ref name="locality"/>
|
|
507
|
+
</zeroOrMore>
|
|
508
|
+
</element>
|
|
509
|
+
</define>
|
|
510
|
+
<define name="sourceLocality">
|
|
511
|
+
<element name="sourceLocality">
|
|
512
|
+
<ref name="BibItemLocality"/>
|
|
513
|
+
</element>
|
|
514
|
+
</define>
|
|
515
|
+
<define name="sourceLocalityStack">
|
|
516
|
+
<element name="sourceLocalityStack">
|
|
517
|
+
<zeroOrMore>
|
|
518
|
+
<ref name="sourceLocality"/>
|
|
519
|
+
</zeroOrMore>
|
|
520
|
+
</element>
|
|
521
|
+
</define>
|
|
472
522
|
<define name="BibItemLocality">
|
|
473
523
|
<attribute name="type">
|
|
474
524
|
<ref name="LocalityType"/>
|
|
@@ -703,21 +753,11 @@
|
|
|
703
753
|
</define>
|
|
704
754
|
<define name="TypedTitleString">
|
|
705
755
|
<optional>
|
|
706
|
-
<attribute name="type"
|
|
707
|
-
<ref name="TitleType"/>
|
|
708
|
-
</attribute>
|
|
756
|
+
<attribute name="type"/>
|
|
709
757
|
</optional>
|
|
710
758
|
<ref name="FormattedString"/>
|
|
711
759
|
</define>
|
|
712
|
-
|
|
713
|
-
<choice>
|
|
714
|
-
<value>alternative</value>
|
|
715
|
-
<value>original</value>
|
|
716
|
-
<value>unofficial</value>
|
|
717
|
-
<value>subtitle</value>
|
|
718
|
-
<value>main</value>
|
|
719
|
-
</choice>
|
|
720
|
-
</define>
|
|
760
|
+
<!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
|
|
721
761
|
<define name="TypedUri">
|
|
722
762
|
<optional>
|
|
723
763
|
<attribute name="type"/>
|
|
@@ -747,6 +787,8 @@
|
|
|
747
787
|
<value>unchanged</value>
|
|
748
788
|
<value>circulated</value>
|
|
749
789
|
<value>adapted</value>
|
|
790
|
+
<value>vote-started</value>
|
|
791
|
+
<value>vote-ended</value>
|
|
750
792
|
</choice>
|
|
751
793
|
</define>
|
|
752
794
|
<define name="bdate">
|
|
@@ -999,38 +1041,63 @@
|
|
|
999
1041
|
</define>
|
|
1000
1042
|
<define name="DocRelationType">
|
|
1001
1043
|
<choice>
|
|
1002
|
-
<value>obsoletes</value>
|
|
1003
|
-
<value>obsoletedBy</value>
|
|
1004
|
-
<value>supersedes</value>
|
|
1005
|
-
<value>supersededBy</value>
|
|
1006
|
-
<value>updates</value>
|
|
1007
|
-
<value>updatedBy</value>
|
|
1008
|
-
<value>complements</value>
|
|
1009
|
-
<value>derivedFrom</value>
|
|
1010
|
-
<value>translatedFrom</value>
|
|
1011
|
-
<value>hasTranslation</value>
|
|
1012
|
-
<value>adoptedFrom</value>
|
|
1013
|
-
<value>equivalent</value>
|
|
1014
|
-
<value>identical</value>
|
|
1015
|
-
<value>nonequivalent</value>
|
|
1016
|
-
<value>includedIn</value>
|
|
1017
1044
|
<value>includes</value>
|
|
1018
|
-
<value>
|
|
1019
|
-
<value>instanceOf</value>
|
|
1020
|
-
<value>partOf</value>
|
|
1045
|
+
<value>includedIn</value>
|
|
1021
1046
|
<value>hasPart</value>
|
|
1022
|
-
<value>
|
|
1023
|
-
<value>draftOf</value>
|
|
1047
|
+
<value>partOf</value>
|
|
1024
1048
|
<value>merges</value>
|
|
1049
|
+
<value>mergedInto</value>
|
|
1025
1050
|
<value>splits</value>
|
|
1026
|
-
<value>
|
|
1027
|
-
<value>
|
|
1028
|
-
<value>
|
|
1029
|
-
<value>
|
|
1030
|
-
<value>
|
|
1031
|
-
<value>
|
|
1051
|
+
<value>splitInto</value>
|
|
1052
|
+
<value>instance</value>
|
|
1053
|
+
<value>hasInstance</value>
|
|
1054
|
+
<value>exemplarOf</value>
|
|
1055
|
+
<value>hasExemplar</value>
|
|
1056
|
+
<value>manifestationOf</value>
|
|
1057
|
+
<value>hasManifestation</value>
|
|
1058
|
+
<value>reproductionOf</value>
|
|
1059
|
+
<value>hasReproduction</value>
|
|
1060
|
+
<value>reprintOf</value>
|
|
1061
|
+
<value>hasReprint</value>
|
|
1062
|
+
<value>expressionOf</value>
|
|
1063
|
+
<value>hasExpression</value>
|
|
1064
|
+
<value>translatedFrom</value>
|
|
1065
|
+
<value>hasTranslation</value>
|
|
1066
|
+
<value>arrangementOf</value>
|
|
1067
|
+
<value>hasArrangement</value>
|
|
1068
|
+
<value>abridgementOf</value>
|
|
1069
|
+
<value>hasAbridgement</value>
|
|
1070
|
+
<value>annotationOf</value>
|
|
1071
|
+
<value>hasAnnotation</value>
|
|
1072
|
+
<value>draftOf</value>
|
|
1073
|
+
<value>hasDraft</value>
|
|
1074
|
+
<value>editionOf</value>
|
|
1075
|
+
<value>hasEdition</value>
|
|
1076
|
+
<value>updates</value>
|
|
1077
|
+
<value>updatedBy</value>
|
|
1078
|
+
<value>derivedFrom</value>
|
|
1079
|
+
<value>derives</value>
|
|
1032
1080
|
<value>describes</value>
|
|
1033
1081
|
<value>describedBy</value>
|
|
1082
|
+
<value>catalogues</value>
|
|
1083
|
+
<value>cataloguedBy</value>
|
|
1084
|
+
<value>hasSuccessor</value>
|
|
1085
|
+
<value>successorOf</value>
|
|
1086
|
+
<value>adaptedFrom</value>
|
|
1087
|
+
<value>hasAdaptation</value>
|
|
1088
|
+
<value>adoptedFrom</value>
|
|
1089
|
+
<value>adoptedAs</value>
|
|
1090
|
+
<value>reviewOf</value>
|
|
1091
|
+
<value>hasReview</value>
|
|
1092
|
+
<value>commentaryOf</value>
|
|
1093
|
+
<value>hasCommentary</value>
|
|
1094
|
+
<value>related</value>
|
|
1095
|
+
<value>complements</value>
|
|
1096
|
+
<value>complementOf</value>
|
|
1097
|
+
<value>obsoletes</value>
|
|
1098
|
+
<value>obsoletedBy</value>
|
|
1099
|
+
<value>cited</value>
|
|
1100
|
+
<value>isCitedIn</value>
|
|
1034
1101
|
</choice>
|
|
1035
1102
|
</define>
|
|
1036
1103
|
<define name="docrelation">
|
|
@@ -1038,12 +1105,30 @@
|
|
|
1038
1105
|
<attribute name="type">
|
|
1039
1106
|
<ref name="DocRelationType"/>
|
|
1040
1107
|
</attribute>
|
|
1108
|
+
<optional>
|
|
1109
|
+
<element name="description">
|
|
1110
|
+
<ref name="FormattedString"/>
|
|
1111
|
+
</element>
|
|
1112
|
+
</optional>
|
|
1041
1113
|
<element name="bibitem">
|
|
1042
1114
|
<ref name="BibliographicItem"/>
|
|
1043
1115
|
</element>
|
|
1044
|
-
<
|
|
1045
|
-
<
|
|
1046
|
-
|
|
1116
|
+
<choice>
|
|
1117
|
+
<zeroOrMore>
|
|
1118
|
+
<ref name="locality"/>
|
|
1119
|
+
</zeroOrMore>
|
|
1120
|
+
<zeroOrMore>
|
|
1121
|
+
<ref name="localityStack"/>
|
|
1122
|
+
</zeroOrMore>
|
|
1123
|
+
</choice>
|
|
1124
|
+
<choice>
|
|
1125
|
+
<zeroOrMore>
|
|
1126
|
+
<ref name="sourceLocality"/>
|
|
1127
|
+
</zeroOrMore>
|
|
1128
|
+
<zeroOrMore>
|
|
1129
|
+
<ref name="sourceLocalityStack"/>
|
|
1130
|
+
</zeroOrMore>
|
|
1131
|
+
</choice>
|
|
1047
1132
|
</element>
|
|
1048
1133
|
</define>
|
|
1049
1134
|
<define name="version">
|
|
@@ -2,7 +2,6 @@ require "asciidoctor"
|
|
|
2
2
|
require "metanorma/m3d/version"
|
|
3
3
|
require "isodoc/m3d/html_convert"
|
|
4
4
|
require "isodoc/m3d/word_convert"
|
|
5
|
-
require "isodoc/m3d/pdf_convert"
|
|
6
5
|
require "asciidoctor/standoc/converter"
|
|
7
6
|
require "fileutils"
|
|
8
7
|
require_relative "./validate.rb"
|
|
@@ -105,10 +104,9 @@ module Asciidoctor
|
|
|
105
104
|
gsub(%r{^.*/}, "")
|
|
106
105
|
File.open(filename, "w") { |f| f.write(ret) }
|
|
107
106
|
html_converter(node).convert filename unless node.attr("nodoc")
|
|
108
|
-
pdf_converter(node).convert filename unless node.attr("nodoc")
|
|
109
107
|
word_converter(node).convert filename unless node.attr("nodoc")
|
|
110
108
|
end
|
|
111
|
-
@log.write(@filename + ".err") unless @novalid
|
|
109
|
+
@log.write(@localdir + @filename + ".err") unless @novalid
|
|
112
110
|
@files_to_delete.each { |f| FileUtils.rm f }
|
|
113
111
|
ret
|
|
114
112
|
end
|
|
@@ -137,10 +135,6 @@ module Asciidoctor
|
|
|
137
135
|
def word_converter(node)
|
|
138
136
|
IsoDoc::M3d::WordConvert.new(doc_extract_attributes(node))
|
|
139
137
|
end
|
|
140
|
-
|
|
141
|
-
def pdf_converter(node)
|
|
142
|
-
IsoDoc::M3d::PdfConvert.new(html_extract_attributes(node))
|
|
143
|
-
end
|
|
144
138
|
end
|
|
145
139
|
end
|
|
146
140
|
end
|
|
@@ -101,9 +101,7 @@
|
|
|
101
101
|
<ref name="structuredidentifier"/>
|
|
102
102
|
</zeroOrMore>
|
|
103
103
|
</define>
|
|
104
|
-
|
|
105
|
-
<text/>
|
|
106
|
-
</define>
|
|
104
|
+
<!-- TitleType = text -->
|
|
107
105
|
<define name="sections">
|
|
108
106
|
<element name="sections">
|
|
109
107
|
<oneOrMore>
|
|
@@ -131,6 +129,9 @@
|
|
|
131
129
|
</choice>
|
|
132
130
|
</attribute>
|
|
133
131
|
</optional>
|
|
132
|
+
<attribute name="normative">
|
|
133
|
+
<data type="boolean"/>
|
|
134
|
+
</attribute>
|
|
134
135
|
<optional>
|
|
135
136
|
<ref name="section-title"/>
|
|
136
137
|
</optional>
|
|
@@ -307,6 +308,21 @@
|
|
|
307
308
|
</define>
|
|
308
309
|
</include>
|
|
309
310
|
<!-- end overrides -->
|
|
311
|
+
<define name="TextElement" combine="choice">
|
|
312
|
+
<ref name="concept"/>
|
|
313
|
+
</define>
|
|
314
|
+
<define name="concept">
|
|
315
|
+
<element name="concept">
|
|
316
|
+
<optional>
|
|
317
|
+
<attribute name="term"/>
|
|
318
|
+
</optional>
|
|
319
|
+
<choice>
|
|
320
|
+
<ref name="eref"/>
|
|
321
|
+
<ref name="xref"/>
|
|
322
|
+
<ref name="termref"/>
|
|
323
|
+
</choice>
|
|
324
|
+
</element>
|
|
325
|
+
</define>
|
|
310
326
|
<define name="BasicBlock" combine="choice">
|
|
311
327
|
<choice>
|
|
312
328
|
<ref name="requirement"/>
|
|
@@ -913,7 +929,10 @@
|
|
|
913
929
|
</define>
|
|
914
930
|
<define name="origin">
|
|
915
931
|
<element name="origin">
|
|
916
|
-
<
|
|
932
|
+
<choice>
|
|
933
|
+
<ref name="erefType"/>
|
|
934
|
+
<ref name="termref"/>
|
|
935
|
+
</choice>
|
|
917
936
|
</element>
|
|
918
937
|
</define>
|
|
919
938
|
<define name="modification">
|
|
@@ -921,6 +940,15 @@
|
|
|
921
940
|
<ref name="paragraph"/>
|
|
922
941
|
</element>
|
|
923
942
|
</define>
|
|
943
|
+
<define name="termref">
|
|
944
|
+
<element name="termref">
|
|
945
|
+
<attribute name="base"/>
|
|
946
|
+
<attribute name="target"/>
|
|
947
|
+
<optional>
|
|
948
|
+
<text/>
|
|
949
|
+
</optional>
|
|
950
|
+
</element>
|
|
951
|
+
</define>
|
|
924
952
|
<define name="structuredidentifier">
|
|
925
953
|
<element name="structuredidentifier">
|
|
926
954
|
<optional>
|
|
@@ -98,14 +98,17 @@ div.figure {
|
|
|
98
98
|
*/
|
|
99
99
|
|
|
100
100
|
.document-type-band {
|
|
101
|
-
@include docBand(2,
|
|
101
|
+
@include docBand($order: 2, $offset: 180px);
|
|
102
|
+
|
|
103
|
+
.document-type {
|
|
104
|
+
top: 20px;
|
|
105
|
+
}
|
|
102
106
|
}
|
|
103
107
|
|
|
104
108
|
.document-stage-band {
|
|
105
109
|
@include docBand(1, 150);
|
|
106
110
|
}
|
|
107
111
|
|
|
108
|
-
p.document-type,
|
|
109
112
|
p.document-stage {
|
|
110
113
|
@include docBandTitle(120);
|
|
111
114
|
}
|
|
@@ -1,24 +1,8 @@
|
|
|
1
1
|
<script>
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
'smoothScrolling': true, //enable or disable smooth scrolling on click
|
|
7
|
-
'prefix': 'toc', //prefix for anchor tags and class names
|
|
8
|
-
'onHighlight': function(el) {}, //called when a new section is highlighted
|
|
9
|
-
'highlightOnScroll': true, //add class to heading that is currently in focus
|
|
10
|
-
'highlightOffset': 100, //offset to trigger the next headline
|
|
11
|
-
'anchorName': function(i, heading, prefix) { //custom function for anchor name
|
|
12
|
-
return prefix+i;
|
|
13
|
-
},
|
|
14
|
-
'headerText': function(i, heading, $heading) { //custom function building the header-item text
|
|
15
|
-
return $heading.text();
|
|
16
|
-
},
|
|
17
|
-
'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
|
|
18
|
-
return $heading[0].tagName.toLowerCase();
|
|
19
|
-
}
|
|
20
|
-
});
|
|
21
|
-
|
|
2
|
+
$("#toc").on('click', 'li', function(e) {
|
|
3
|
+
$(this).parent().find('li.toc-active').removeClass('toc-active');
|
|
4
|
+
$(this).addClass('toc-active');
|
|
5
|
+
});
|
|
22
6
|
</script>
|
|
23
7
|
|
|
24
8
|
<script>
|
|
@@ -58,13 +42,16 @@ $('#toggle').on('click', function(){
|
|
|
58
42
|
</script>
|
|
59
43
|
|
|
60
44
|
<script>
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
45
|
+
// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
|
|
46
|
+
//
|
|
47
|
+
// AnchorJS - v4.2.2 - 2020-04-20
|
|
48
|
+
// https://www.bryanbraun.com/anchorjs/
|
|
49
|
+
// Copyright (c) 2020 Bryan Braun; Licensed MIT
|
|
50
|
+
//
|
|
51
|
+
// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
|
|
52
|
+
!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function f(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.base=A.hasOwnProperty("base")?A.base:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64,A.titleText=A.hasOwnProperty("titleText")?A.titleText:""}function p(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}this.options=A||{},this.elements=[],f(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var e,t,i,n,o,s,a,r,c,h,l,u,d=[];if(f(this.options),"touch"===(l=this.options.visible)&&(l=this.isTouchDevice()?"always":"hover"),0===(e=p(A=A||"h2, h3, h4, h5, h6")).length)return this;for(!function(){if(null!==document.head.querySelector("style.anchorjs"))return;var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"],style'))?document.head.appendChild(e):document.head.insertBefore(e,A);e.sheet.insertRule(".anchorjs-link{opacity:0;text-decoration:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}",e.sheet.cssRules.length),e.sheet.insertRule(":hover>.anchorjs-link,.anchorjs-link:focus{opacity:1}",e.sheet.cssRules.length),e.sheet.insertRule("[data-anchorjs-icon]::after{content:attr(data-anchorjs-icon)}",e.sheet.cssRules.length),e.sheet.insertRule('@font-face{font-family:anchorjs-icons;src:url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype")}',e.sheet.cssRules.length)}(),t=document.querySelectorAll("[id]"),i=[].map.call(t,function(A){return A.id}),o=0;o<e.length;o++)if(this.hasAnchorJSLink(e[o]))d.push(o);else{if(e[o].hasAttribute("id"))n=e[o].getAttribute("id");else if(e[o].hasAttribute("data-anchor-id"))n=e[o].getAttribute("data-anchor-id");else{for(c=r=this.urlify(e[o].textContent),a=0;void 0!==s&&(c=r+"-"+a),a+=1,-1!==(s=i.indexOf(c)););s=void 0,i.push(c),e[o].setAttribute("id",c),n=c}(h=document.createElement("a")).className="anchorjs-link "+this.options.class,h.setAttribute("aria-label",this.options.ariaLabel),h.setAttribute("data-anchorjs-icon",this.options.icon),this.options.titleText&&(h.title=this.options.titleText),u=document.querySelector("base")?window.location.pathname+window.location.search:"",u=this.options.base||u,h.href=u+"#"+n,"always"===l&&(h.style.opacity="1"),""===this.options.icon&&(h.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(h.style.lineHeight="inherit")),"left"===this.options.placement?(h.style.position="absolute",h.style.marginLeft="-1em",h.style.paddingRight="0.5em",e[o].insertBefore(h,e[o].firstChild)):(h.style.paddingLeft="0.375em",e[o].appendChild(h))}for(o=0;o<d.length;o++)e.splice(d[o]-o,1);return this.elements=this.elements.concat(e),this},this.remove=function(A){for(var e,t,i=p(A),n=0;n<i.length;n++)(t=i[n].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(i[n]))&&this.elements.splice(e,1),i[n].removeChild(t));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){return this.options.truncate||f(this.options),A.trim().replace(/\'/gi,"").replace(/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\\n\t\b\v]/g,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&-1<(" "+A.firstChild.className+" ").indexOf(" anchorjs-link "),t=A.lastChild&&-1<(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ");return e||t||!1}}});
|
|
53
|
+
// @license-end
|
|
54
|
+
</script>
|
|
68
55
|
<script>
|
|
69
56
|
/*
|
|
70
57
|
$(document).ready(function() {
|
data/lib/isodoc/m3d/metadata.rb
CHANGED
|
@@ -27,6 +27,7 @@ module IsoDoc
|
|
|
27
27
|
set(:tc, nil)
|
|
28
28
|
tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
|
|
29
29
|
set(:tc, tc.text) if tc
|
|
30
|
+
super
|
|
30
31
|
end
|
|
31
32
|
|
|
32
33
|
def docid(isoxml, _out)
|
|
@@ -47,33 +48,6 @@ module IsoDoc
|
|
|
47
48
|
def unpublished(status)
|
|
48
49
|
!%w(published withdrawn).include? status.downcase
|
|
49
50
|
end
|
|
50
|
-
|
|
51
|
-
def version(isoxml, _out)
|
|
52
|
-
super
|
|
53
|
-
revdate = get[:revdate]
|
|
54
|
-
set(:revdate_monthyear, monthyr(revdate))
|
|
55
|
-
end
|
|
56
|
-
|
|
57
|
-
MONTHS = {
|
|
58
|
-
"01": "January",
|
|
59
|
-
"02": "February",
|
|
60
|
-
"03": "March",
|
|
61
|
-
"04": "April",
|
|
62
|
-
"05": "May",
|
|
63
|
-
"06": "June",
|
|
64
|
-
"07": "July",
|
|
65
|
-
"08": "August",
|
|
66
|
-
"09": "September",
|
|
67
|
-
"10": "October",
|
|
68
|
-
"11": "November",
|
|
69
|
-
"12": "December",
|
|
70
|
-
}.freeze
|
|
71
|
-
|
|
72
|
-
def monthyr(isodate)
|
|
73
|
-
m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
|
|
74
|
-
return isodate unless m && m[:yr] && m[:mo]
|
|
75
|
-
return "#{MONTHS[m[:mo].to_sym]} #{m[:yr]}"
|
|
76
|
-
end
|
|
77
51
|
end
|
|
78
52
|
end
|
|
79
53
|
end
|
data/lib/metanorma-m3d.rb
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
require "asciidoctor" unless defined? Asciidoctor::Converter
|
|
2
2
|
require_relative "asciidoctor/m3d/converter"
|
|
3
3
|
require_relative "isodoc/m3d/html_convert"
|
|
4
|
-
require_relative "isodoc/m3d/pdf_convert"
|
|
5
4
|
require_relative "isodoc/m3d/word_convert"
|
|
6
5
|
require_relative "metanorma/m3d/version"
|
|
7
6
|
|
|
@@ -2,6 +2,13 @@ require "metanorma/processor"
|
|
|
2
2
|
|
|
3
3
|
module Metanorma
|
|
4
4
|
module M3d
|
|
5
|
+
def self.fonts_used
|
|
6
|
+
{
|
|
7
|
+
html: ["Overpass", "Space Mono"],
|
|
8
|
+
doc: ["Garamond", "Courier New"]
|
|
9
|
+
}
|
|
10
|
+
end
|
|
11
|
+
|
|
5
12
|
class Processor < Metanorma::Processor
|
|
6
13
|
|
|
7
14
|
def initialize
|
|
@@ -13,8 +20,7 @@ module Metanorma
|
|
|
13
20
|
def output_formats
|
|
14
21
|
super.merge(
|
|
15
22
|
html: "html",
|
|
16
|
-
doc: "doc"
|
|
17
|
-
pdf: "pdf"
|
|
23
|
+
doc: "doc"
|
|
18
24
|
)
|
|
19
25
|
end
|
|
20
26
|
|
|
@@ -30,8 +36,6 @@ module Metanorma
|
|
|
30
36
|
case format
|
|
31
37
|
when :html
|
|
32
38
|
IsoDoc::M3d::HtmlConvert.new(options).convert(outname, isodoc_node)
|
|
33
|
-
when :pdf
|
|
34
|
-
IsoDoc::M3d::PdfConvert.new(options).convert(outname, isodoc_node)
|
|
35
39
|
when :doc
|
|
36
40
|
IsoDoc::M3d::WordConvert.new(options).convert(outname, isodoc_node)
|
|
37
41
|
else
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-m3d
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.20
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-05-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: asciimath
|
|
@@ -308,13 +308,11 @@ files:
|
|
|
308
308
|
- lib/isodoc/m3d/html/m3-logo.png
|
|
309
309
|
- lib/isodoc/m3d/html/m3d.scss
|
|
310
310
|
- lib/isodoc/m3d/html/scripts.html
|
|
311
|
-
- lib/isodoc/m3d/html/scripts.pdf.html
|
|
312
311
|
- lib/isodoc/m3d/html/word_m3d_intro.html
|
|
313
312
|
- lib/isodoc/m3d/html/word_m3d_titlepage.html
|
|
314
313
|
- lib/isodoc/m3d/html/wordstyle.scss
|
|
315
314
|
- lib/isodoc/m3d/html_convert.rb
|
|
316
315
|
- lib/isodoc/m3d/metadata.rb
|
|
317
|
-
- lib/isodoc/m3d/pdf_convert.rb
|
|
318
316
|
- lib/isodoc/m3d/word_convert.rb
|
|
319
317
|
- lib/metanorma-m3d.rb
|
|
320
318
|
- lib/metanorma/m3d.rb
|
|
@@ -1,72 +0,0 @@
|
|
|
1
|
-
<script>
|
|
2
|
-
//TOC generation
|
|
3
|
-
$('#toc').toc({
|
|
4
|
-
'selectors': toclevel(), //elements to use as headings
|
|
5
|
-
'container': 'main', //element to find all selectors in
|
|
6
|
-
'smoothScrolling': true, //enable or disable smooth scrolling on click
|
|
7
|
-
'prefix': 'toc', //prefix for anchor tags and class names
|
|
8
|
-
'onHighlight': function(el) {}, //called when a new section is highlighted
|
|
9
|
-
'highlightOnScroll': false, //add class to heading that is currently in focus
|
|
10
|
-
'highlightOffset': 100, //offset to trigger the next headline
|
|
11
|
-
'anchorName': function(i, heading, prefix) { //custom function for anchor name
|
|
12
|
-
return prefix+i;
|
|
13
|
-
},
|
|
14
|
-
'headerText': function(i, heading, $heading) { //custom function building the header-item text
|
|
15
|
-
return $heading.text();
|
|
16
|
-
},
|
|
17
|
-
'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
|
|
18
|
-
return $heading[0].tagName.toLowerCase();
|
|
19
|
-
}
|
|
20
|
-
});
|
|
21
|
-
|
|
22
|
-
</script>
|
|
23
|
-
|
|
24
|
-
<script>
|
|
25
|
-
//TOC toggle animation
|
|
26
|
-
$('#toggle').on('click', function(){
|
|
27
|
-
if( $('nav').is(':visible') ) {
|
|
28
|
-
$('nav').animate({ 'left': '-353px' }, 'slow', function(){
|
|
29
|
-
$('nav').hide();
|
|
30
|
-
});
|
|
31
|
-
$('.container').animate({ 'padding-left': '31px' }, 'slow');
|
|
32
|
-
}
|
|
33
|
-
else {
|
|
34
|
-
$('nav').show();
|
|
35
|
-
$('nav').animate({ 'left': '0px' }, 'slow');
|
|
36
|
-
$('.container').animate({ 'padding-left': '360px' }, 'slow');
|
|
37
|
-
}
|
|
38
|
-
});
|
|
39
|
-
</script>
|
|
40
|
-
|
|
41
|
-
<script>
|
|
42
|
-
// Scroll to top button
|
|
43
|
-
window.onscroll = function() {scrollFunction()};
|
|
44
|
-
|
|
45
|
-
function scrollFunction() {
|
|
46
|
-
if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
|
|
47
|
-
document.getElementById("myBtn").style.display = "block";
|
|
48
|
-
} else {
|
|
49
|
-
document.getElementById("myBtn").style.display = "none";
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
// When the user clicks on the button, scroll to the top of the document
|
|
54
|
-
function topFunction() {
|
|
55
|
-
document.body.scrollTop = 0;
|
|
56
|
-
document.documentElement.scrollTop = 0;
|
|
57
|
-
}
|
|
58
|
-
</script>
|
|
59
|
-
|
|
60
|
-
<script>
|
|
61
|
-
/*
|
|
62
|
-
$(document).ready(function() {
|
|
63
|
-
$('[id^=toc]').each(function ()
|
|
64
|
-
{
|
|
65
|
-
var currentToc = $(this);
|
|
66
|
-
var url = window.location.href;
|
|
67
|
-
currentToc.wrap("<a href='" + url + "#" + currentToc.attr("id") + "' </a>");
|
|
68
|
-
});
|
|
69
|
-
});
|
|
70
|
-
*/
|
|
71
|
-
</script>
|
|
72
|
-
|
|
@@ -1,72 +0,0 @@
|
|
|
1
|
-
require "isodoc"
|
|
2
|
-
require_relative "base_convert"
|
|
3
|
-
|
|
4
|
-
module IsoDoc
|
|
5
|
-
module M3d
|
|
6
|
-
# A {Converter} implementation that generates CSAND output, and a document
|
|
7
|
-
# schema encapsulation of the document for validation
|
|
8
|
-
class PdfConvert < IsoDoc::PdfConvert
|
|
9
|
-
def initialize(options)
|
|
10
|
-
@libdir = File.dirname(__FILE__)
|
|
11
|
-
super
|
|
12
|
-
end
|
|
13
|
-
|
|
14
|
-
#def convert1(docxml, filename, dir)
|
|
15
|
-
#add_image(%w(logo.jpg m3-logo.png))
|
|
16
|
-
#super
|
|
17
|
-
#end
|
|
18
|
-
|
|
19
|
-
def default_fonts(options)
|
|
20
|
-
{
|
|
21
|
-
bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
|
|
22
|
-
headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
|
|
23
|
-
monospacefont: '"Space Mono",monospace'
|
|
24
|
-
}
|
|
25
|
-
end
|
|
26
|
-
|
|
27
|
-
def default_file_locations(_options)
|
|
28
|
-
{
|
|
29
|
-
htmlstylesheet: html_doc_path("htmlstyle.scss"),
|
|
30
|
-
htmlcoverpage: html_doc_path("html_m3d_titlepage.html"),
|
|
31
|
-
htmlintropage: html_doc_path("html_m3d_intro.html"),
|
|
32
|
-
standardstylesheet: nil,
|
|
33
|
-
scripts_pdf: html_doc_path("scripts.pdf.html"),
|
|
34
|
-
}
|
|
35
|
-
end
|
|
36
|
-
|
|
37
|
-
def colophon(body, docxml)
|
|
38
|
-
body.div **{ class: "colophon" } do |div|
|
|
39
|
-
div << <<~"COLOPHON"
|
|
40
|
-
<p>As with all M3AAWG documents that we publish, please check the M3AAWG website
|
|
41
|
-
(<a href="http://www.m3aawg.org">www.m3aawg.org</a>) for updates to this paper.</p>
|
|
42
|
-
<p>© {{ docyear }} copyright by the Messaging, Malware and Mobile Anti-Abuse Working Group (M3AAWG)</p>
|
|
43
|
-
COLOPHON
|
|
44
|
-
end
|
|
45
|
-
end
|
|
46
|
-
|
|
47
|
-
def googlefonts()
|
|
48
|
-
<<~HEAD.freeze
|
|
49
|
-
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
|
|
50
|
-
<link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
|
|
51
|
-
HEAD
|
|
52
|
-
end
|
|
53
|
-
|
|
54
|
-
def make_body(xml, docxml)
|
|
55
|
-
body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
|
|
56
|
-
xml.body **body_attr do |body|
|
|
57
|
-
make_body1(body, docxml)
|
|
58
|
-
make_body2(body, docxml)
|
|
59
|
-
make_body3(body, docxml)
|
|
60
|
-
colophon(body, docxml)
|
|
61
|
-
end
|
|
62
|
-
end
|
|
63
|
-
|
|
64
|
-
def html_toc(docxml)
|
|
65
|
-
docxml
|
|
66
|
-
end
|
|
67
|
-
|
|
68
|
-
include BaseRender
|
|
69
|
-
end
|
|
70
|
-
end
|
|
71
|
-
end
|
|
72
|
-
|