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

WD 1.1 - basic reset to REC-ConeSearch-1.03 w/ Errata fixes #55

Merged
merged 15 commits into from
Sep 30, 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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
test -f ${{ env.doc_name }}.bbl

- name: Keep the PDF artefact
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: PDF Preview
path: ${{ env.doc_name }}.pdf
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
ivoatexmeta.tex
gitmeta.tex
ConeSearch.aux
ConeSearch.bbl
ConeSearch.blg
ConeSearch.log
ConeSearch.out
ConeSearch.pdf
ConeSearch.toc
ConeSearch.hd
ConeSearch.fls
ConeSearch.fdb_latexmk
ConeSearch.html
1,511 changes: 641 additions & 870 deletions ConeSearch.tex

Large diffs are not rendered by default.

34 changes: 24 additions & 10 deletions Makefile
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# ivoatex Makefile. The ivoatex/README for the targets available.
# ivoatex Makefile. The http://ivoa.net/documents/notes/IVOATex
# for the targets available.

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

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

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

# An e-mail address of the person doing the submission to the document
# repository (can be empty until a make upload is being made)
[email protected]

# Source files for the TeX document (but the main file must always
# be called $(DOCNAME).tex
SOURCES = $(DOCNAME).tex
# be called $(DOCNAME).tex)
SOURCES = $(DOCNAME).tex gitmeta.tex

# List of pixel image files to be included in submitted package
# List of image files to be included in submitted package (anything that
# can be rendered directly by common web browsers)
FIGURES =

# List of PDF figures (for vector graphics)
VECTORFIGURES = role_diagram.pdf
# List of PDF figures (figures that must be converted to pixel images to
# work in web browsers).
VECTORFIGURES =

# Additional files to distribute (e.g., CSS, schema files, examples...)
AUX_FILES =
AUX_FILES =

-include ivoatex/Makefile

ivoatex/Makefile:
@echo "*** ivoatex submodule not found. Initialising submodules."
@echo
git submodule update --init

include ivoatex/Makefile
test:
@echo "No tests defined yet"
Binary file modified role_diagram.pdf
Binary file not shown.
118 changes: 57 additions & 61 deletions role_diagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 32 additions & 19 deletions role_diagram.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,45 @@ Document authors (ivoatex maintainers have different rules):
For the time being, keep both role_diagram.pdf and role_diagram.svg as
created by this in the VCS. This helps document builds on machines
with missing dependencies.


Archdiag maintainers: When adding boxes here, first look for a good place,
preferably in one of the grid positions given in the comments for the
WGs (e.g., 55 for Registry). Good y positions are ones that already
exist. Leave out the w at first.

Then, run

make archdiag-debug.svg

and open archdiag-debug.svg in a javascript-enabled browser. In that
browser's javascript console you will see lines like:

SpectralDM: 67; 11.5

The first number is the box's natural width, which you should use in the w
attribute of the rec/prerec. The second is the offset to x you'd need to
add to one of the x grid lines (the x=something in the opening comments
of the various sections) to have the box centered.
-->

<archdiag xmlns="http://ivoa.net/archdiag">
<!-- Registry: x=55, y=150..450 -->
<rec name="VOResource" x="55" y="155"/>
<rec name="RegistryInterface" x="55" y="205"/>
<rec name="VODataService" x="55" y="350"/>
<rec name="StandardsRegExt" x="55" y="375"/>
<rec name="SimpleDALR.E." x="55" y="400"/>
<!-- Registry: x=55, y=150..450 -->
<rec name="VOResource" x="64.5" y="155" w="71"/>
<rec name="Resource M.D." x="58" y="230" w="84"/>

<!-- Apps: all over the place -->
<rec name="VOTable" x="270" y="325"/>
<!-- Apps: all over the place -->
<rec name="VOTable" x="270" y="325" w="50"/>

<!-- DAL: x=655, y=155..435 -->
<rec name="DALI" x="310" y="290"/>
<thisrec name="SCS" x="655" y="155"/>
<!-- DAL: x=655, y=155..435 -->
<thisrec name="ConeSearch" x="665.5" y="155" w="69"/>

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

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

<!-- Semantics: x=160..250 y=250..400 -->
<rec name="VOUnits" x="200" y="250"/>
<rec name="UCD" x="160" y="310"/>
<rec name="Vocabularies" x="160" y="335"/>
<!-- Semantics: x=160..250 y=250..400 -->
<rec name="UCD" x="189" y="310" w="32"/>

<!-- TD -->
<!-- TD -->
</archdiag>