Skip to content

Commit 5f9a104

Browse files
authored
Merge pull request #55 from molinaro-m/reset-to-103
WD 1.1 - basic reset to REC-ConeSearch-1.03 w/ Errata fixes
2 parents ab699e9 + c08324d commit 5f9a104

File tree

8 files changed

+760
-962
lines changed

8 files changed

+760
-962
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
test -f ${{ env.doc_name }}.bbl
3434
3535
- name: Keep the PDF artefact
36-
uses: actions/upload-artifact@v1
36+
uses: actions/upload-artifact@v4
3737
with:
3838
name: PDF Preview
3939
path: ${{ env.doc_name }}.pdf

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
ivoatexmeta.tex
2+
gitmeta.tex
23
ConeSearch.aux
34
ConeSearch.bbl
45
ConeSearch.blg
56
ConeSearch.log
67
ConeSearch.out
78
ConeSearch.pdf
89
ConeSearch.toc
10+
ConeSearch.hd
11+
ConeSearch.fls
12+
ConeSearch.fdb_latexmk
913
ConeSearch.html

ConeSearch.tex

Lines changed: 641 additions & 870 deletions
Large diffs are not rendered by default.

Makefile

100755100644
Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# ivoatex Makefile. The ivoatex/README for the targets available.
1+
# ivoatex Makefile. The http://ivoa.net/documents/notes/IVOATex
2+
# for the targets available.
23

34
# short name of your document (edit $DOCNAME.tex; would be like RegTAP)
45
DOCNAME = ConeSearch
@@ -7,23 +8,36 @@ DOCNAME = ConeSearch
78
DOCVERSION = 1.1
89

910
# Publication date, ISO format; update manually for "releases"
10-
#DOCDATE = 2019-11-15
11-
DOCDATE = 2020-08-28
11+
DOCDATE = 2023-08-29
1212

1313
# What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
1414
DOCTYPE = WD
1515

16+
# An e-mail address of the person doing the submission to the document
17+
# repository (can be empty until a make upload is being made)
18+
AUTHOR_EMAIL=marco.molinaro@inaf.it
19+
1620
# Source files for the TeX document (but the main file must always
17-
# be called $(DOCNAME).tex
18-
SOURCES = $(DOCNAME).tex
21+
# be called $(DOCNAME).tex)
22+
SOURCES = $(DOCNAME).tex gitmeta.tex
1923

20-
# List of pixel image files to be included in submitted package
24+
# List of image files to be included in submitted package (anything that
25+
# can be rendered directly by common web browsers)
2126
FIGURES =
2227

23-
# List of PDF figures (for vector graphics)
24-
VECTORFIGURES = role_diagram.pdf
28+
# List of PDF figures (figures that must be converted to pixel images to
29+
# work in web browsers).
30+
VECTORFIGURES =
2531

2632
# Additional files to distribute (e.g., CSS, schema files, examples...)
27-
AUX_FILES =
33+
AUX_FILES =
34+
35+
-include ivoatex/Makefile
36+
37+
ivoatex/Makefile:
38+
@echo "*** ivoatex submodule not found. Initialising submodules."
39+
@echo
40+
git submodule update --init
2841

29-
include ivoatex/Makefile
42+
test:
43+
@echo "No tests defined yet"

role_diagram.pdf

2.13 KB
Binary file not shown.

role_diagram.svg

Lines changed: 57 additions & 61 deletions
Loading

role_diagram.xml

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,45 @@ Document authors (ivoatex maintainers have different rules):
1313
For the time being, keep both role_diagram.pdf and role_diagram.svg as
1414
created by this in the VCS. This helps document builds on machines
1515
with missing dependencies.
16+
17+
18+
Archdiag maintainers: When adding boxes here, first look for a good place,
19+
preferably in one of the grid positions given in the comments for the
20+
WGs (e.g., 55 for Registry). Good y positions are ones that already
21+
exist. Leave out the w at first.
22+
23+
Then, run
24+
25+
make archdiag-debug.svg
26+
27+
and open archdiag-debug.svg in a javascript-enabled browser. In that
28+
browser's javascript console you will see lines like:
29+
30+
SpectralDM: 67; 11.5
31+
32+
The first number is the box's natural width, which you should use in the w
33+
attribute of the rec/prerec. The second is the offset to x you'd need to
34+
add to one of the x grid lines (the x=something in the opening comments
35+
of the various sections) to have the box centered.
1636
-->
1737

1838
<archdiag xmlns="http://ivoa.net/archdiag">
19-
<!-- Registry: x=55, y=150..450 -->
20-
<rec name="VOResource" x="55" y="155"/>
21-
<rec name="RegistryInterface" x="55" y="205"/>
22-
<rec name="VODataService" x="55" y="350"/>
23-
<rec name="StandardsRegExt" x="55" y="375"/>
24-
<rec name="SimpleDALR.E." x="55" y="400"/>
39+
<!-- Registry: x=55, y=150..450 -->
40+
<rec name="VOResource" x="64.5" y="155" w="71"/>
41+
<rec name="Resource M.D." x="58" y="230" w="84"/>
2542

26-
<!-- Apps: all over the place -->
27-
<rec name="VOTable" x="270" y="325"/>
43+
<!-- Apps: all over the place -->
44+
<rec name="VOTable" x="270" y="325" w="50"/>
2845

29-
<!-- DAL: x=655, y=155..435 -->
30-
<rec name="DALI" x="310" y="290"/>
31-
<thisrec name="SCS" x="655" y="155"/>
46+
<!-- DAL: x=655, y=155..435 -->
47+
<thisrec name="ConeSearch" x="665.5" y="155" w="69"/>
3248

33-
<!-- Data Models: x=430..580, y=250..400 -->
49+
<!-- Data Models: x=430..580, y=250..400 -->
3450

35-
<!-- GWS: all over the place -->
36-
<rec name="VOSI" x="540" y="435"/>
51+
<!-- GWS: all over the place -->
3752

38-
<!-- Semantics: x=160..250 y=250..400 -->
39-
<rec name="VOUnits" x="200" y="250"/>
40-
<rec name="UCD" x="160" y="310"/>
41-
<rec name="Vocabularies" x="160" y="335"/>
53+
<!-- Semantics: x=160..250 y=250..400 -->
54+
<rec name="UCD" x="189" y="310" w="32"/>
4255

43-
<!-- TD -->
56+
<!-- TD -->
4457
</archdiag>

0 commit comments

Comments
 (0)