Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into ODATA-1626
Browse files Browse the repository at this point in the history
  • Loading branch information
HeikoTheissen committed Jan 14, 2025
2 parents e405cda + 5bade31 commit 2401642
Show file tree
Hide file tree
Showing 117 changed files with 9,809 additions and 7,491 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

strategy:
matrix:
node-version: [20.x]
node-version: [22.x]

steps:
- uses: actions/checkout@v4
Expand Down
13 changes: 1 addition & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,7 @@ Documents are generated from Markdown sources using Node.js modules described [h
3. Download and install [git](https://git-scm.com/), verify via `git -v`
4. Optionally download and install [GitHub Desktop](https://desktop.github.com/)
5. Clone this repository
6. In the local repository folder run `npm install`, verify via `npm test`
Repeat this step if the test fails with an error message like the following after upgrading to a new Chrome version:
```
1 failing
1) OASIS doc build
Puppeteer:
Error: Could not find Chrome (ver. 116.0.5845.96). This can occur if either
1. you did not perform an installation before running the script (e.g. `npm install`) or
2. your cache path is incorrectly configured (which is: C:\Users\D024504\.cache\puppeteer).
For (2), check out our guide on configuring puppeteer at https://pptr.dev/guides/configuration.
```
6. In the local repository folder run `npm install`, verify via `npm test`

### Document preparation

Expand Down
826 changes: 453 additions & 373 deletions docs/odata-csdl-json/odata-csdl-json.html

Large diffs are not rendered by default.

664 changes: 353 additions & 311 deletions docs/odata-csdl-json/odata-csdl-json.md

Large diffs are not rendered by default.

Binary file modified docs/odata-csdl-json/odata-csdl-json.pdf
Binary file not shown.
71 changes: 52 additions & 19 deletions docs/odata-csdl-json/styles/odata.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
a:target {
:root {
--indent: 40px;
}

a:target,
span:target {
background-color: yellow;
}

h6 span[id],
a[href^="https://docs.oasis-open.org"][href*="#"],
a[href^="#_"],
a[href^="#OData"]:not(a[href^="#OData4"]),
a[href^="#rfc"],
a[href^="#XML-"] {
font-weight: bold;
}

h6 span[id]::before,
a[href^="https://docs.oasis-open.org"][href*="#"]::before,
a[href^="#_"]::before,
a[href^="#OData"]:not(a[href^="#OData4"])::before,
a[href^="#rfc"]::before,
Expand All @@ -17,6 +26,8 @@ a[href^="#XML-"]::before {
font-weight: bold;
}

h6 span[id]::after,
a[href^="https://docs.oasis-open.org"][href*="#"]::after,
a[href^="#_"]::after,
a[href^="#OData"]:not(a[href^="#OData4"])::after,
a[href^="#rfc"]::after,
Expand Down Expand Up @@ -149,16 +160,9 @@ table {

p code,
li code,
h1 code,
h2 code,
h3 code,
h4 code,
h5 code,
h6 code,
td > code {
font-family: MJXZERO, MJXTEX-T;
font-size: 1em;
line-height: 0;
font-weight: bold;
}

.example p code,
Expand All @@ -168,11 +172,31 @@ td > code {

.example pre,
.rep {
margin-left: 40px;
margin-left: var(--indent);
}

.caption p {
margin-left: var(--indent);
margin-bottom: -1em;
}

.side-by-side {
margin: -1em 0;
}

.side-by-side:after {
content: "";
display: block;
clear: both;
}

.side-by-side > div {
width: 50%;
float: left;
}

.indent {
margin-left: 40px;
margin-left: var(--indent);
}

td pre {
Expand All @@ -195,14 +219,7 @@ mjx-container {

mjx-container[display="true"] {
text-align: left !important;
margin-left: 40px !important;
}

/* The following rule enables typewriter single quotes in maths, like $\hbox{\tt{'$Q$'}}$ */
mjx-c.mjx-c2019::before {
content: "\27" !important;
padding-right: 0.525em !important;
font-family: MJXZERO, MJXTEX-T;
margin-left: var(--indent) !important;
}

code .er {
Expand All @@ -215,6 +232,17 @@ hr:first-of-type {
}

@media screen {
#darkmode {
position: fixed;
top: 0;
right: 0;
}

html.darkmode {
background-color: #f2eee8;
filter: invert(100%);
}

details:not([open]) > summary {
list-style: disclosure-closed;
}
Expand All @@ -225,6 +253,10 @@ hr:first-of-type {
}

@media print {
#darkmode {
display: none;
}

details > summary {
list-style: none;
}
Expand All @@ -239,6 +271,7 @@ h6 {
page-break-after: avoid;
}

.side-by-side,
td {
page-break-inside: avoid;
}
Expand Down
903 changes: 490 additions & 413 deletions docs/odata-csdl-xml/odata-csdl-xml.html

Large diffs are not rendered by default.

Loading

0 comments on commit 2401642

Please sign in to comment.