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

Markus PR-2.1 review #20

Merged
merged 3 commits into from
Nov 20, 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
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ jobs:
test -f VOEvent.pdf
test -f VOEvent.bbl

- uses: actions/upload-artifact@v1
- name: Keep the PDF artefact
uses: actions/upload-artifact@v4
with:
name: PDF Preview
path: VOEvent.pdf
path: ${{ env.doc_name }}.pdf
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ ivoatexmeta.tex
*.tar.gz
*.swp
role_diagram.svg
gitmeta.tex
*.fdb_latexmk
*.fls
14 changes: 12 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,27 @@ [email protected]

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

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

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

# Additional files to distribute (e.g., CSS, schema files, examples...)
AUX_FILES = VOEvent-v2.1.xsd VOEventRegExt-v2.0.xsd resrec-sample.vor

include ivoatex/Makefile

-include ivoatex/Makefile

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

test:
@echo "No tests defined yet"
2 changes: 1 addition & 1 deletion VOEvent-v2.1.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Revision 2.1 2020/05/05 BaptisteCecconi
- added "coord_value" type introducing "ucd" and "unit" attributes for C1, C2 and C3 elements
- added "error2" type, with "C1" and "C2" elements
- added "error3" type, with "C1", "C2" and "C3" elements
- added "TimeFrameType" (taken from to STC-1.30)
- added "TimeFrameType" (taken from to STC-1.30)
- added "SpaceFrameType" (taken from to STC-1.30)
-->
<xs:schema xmlns="http://www.ivoa.net/xml/VOEvent/v2.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
Expand Down
1,784 changes: 897 additions & 887 deletions VOEvent.tex

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions VOEventRegExt-v2.0.xsd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:vr="http://www.ivoa.net/xml/VOResource/v1.0"
xmlns:voe="http://www.ivoa.net/xml/VOEventRegExt/v2"
xmlns:vm="http://www.ivoa.net/xml/VOMetadata/v0.1"
Expand Down Expand Up @@ -41,7 +41,7 @@
A URI of the standard or convention this endpoint follows.
</xs:documentation>
<xs:documentation>
This will normally be a key from
This will normally be a key from
ivo://ivoa.net/std/VOEvent starting with acc-.
</xs:documentation>
</xs:annotation>
Expand Down
Loading