Skip to content
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
10 changes: 5 additions & 5 deletions content/learn/example-exp-cars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ EXPRESS takes precedence.

[[fig_cargschema]]
.Complete schema-level model for Registration Authority example
image::../images/ex-cargschema.svg[]
image::ex-cargschema.svg[]

The model consists of three schemas, as shown in
Figure&nbsp;<<fig_cargschema>>.
Expand Down Expand Up @@ -89,7 +89,7 @@ ownership records may be destroyed.

[[fig_cargreg]]
.Complete entity-level model of the Authority schema.
image::../images/ex-cargreg.svg[]
image::ex-cargreg.svg[]

*EXPRESS specification:*

Expand Down Expand Up @@ -448,7 +448,7 @@ END_TYPE;

[[fig_cargaux1]]
.Complete entity-level model of the Support schema.
image::../images/ex-cargaux1.svg[]
image::ex-cargaux1.svg[]


==== fuel_consumption
Expand All @@ -475,7 +475,7 @@ range&#58;:: The value is limited to lie in the range 4 to 25 inclusive.

[[fig_cargaux2]]
.Complete entity-level model of the Support schema.
image::../images/ex-cargaux2.svg[]
image::ex-cargaux2.svg[]


=== Entity definitions
Expand Down Expand Up @@ -949,7 +949,7 @@ This schema contains definitions related to dates and other calendrical items.

[[fig_cargcal]]
.Complete entity-level model of Calendar schema.
image::../images/ex-cargcal.svg[]
image::ex-cargcal.svg[]


Figure&nbsp;<<fig_cargcal>> is an EXPRESS-G
Expand Down
10 changes: 5 additions & 5 deletions content/learn/example-expg-cars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Figure&nbsp;<<fig_cargschema>>.

[[fig_cargschema]]
.Complete schema-level model for Registration Authority example (Page 1 of 1).
image::../images/ex-cargschema.svg[]
image::ex-cargschema.svg[]

The schema `registration_authority` is the primary schema.
It references the noted items from the `auxiliary` schema;
Expand Down Expand Up @@ -61,7 +61,7 @@ the entities and types in it.

[[fig_cargreg]]
.Complete entity-level model of the Registration Authority schema (Page 1 of 1).
image::../images/ex-cargreg.svg[]
image::ex-cargreg.svg[]


There are three entities altogether, namely `send_message`,
Expand All @@ -82,11 +82,11 @@ show the entities and types that are contained in the schema.

[[fig_cargaux1]]
.Complete entity-level model of the Auxiliary schema (Page 1 of 2).
image::../images/ex-cargaux1.svg[]
image::ex-cargaux1.svg[]

[[fig_cargaux2]]
.Complete entity-level model of the Auxiliary schema (Page 2 of 2).
image::../images/ex-cargaux2.svg[]
image::ex-cargaux2.svg[]

The schema contains the following entities:

Expand Down Expand Up @@ -121,7 +121,7 @@ Figure&nbsp;<<fig_cargcal>> shows the entities and types within the

[[fig_cargcal]]
.Complete entity-level model of Calendar schema (Page 1 of 1).
image::../images/ex-cargcal.svg[]
image::ex-cargcal.svg[]

There is one entity called `date` and one enumeration type called
`months`.
Expand Down
16 changes: 8 additions & 8 deletions content/learn/express-03-step-overview.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ eventually resolved by changing the name of PDES to be -- "Product Data Exchange
using STEP" (which some then called Standard for Exchange using PDES).


image::../images/01-pstphist.svg[]
image::01-pstphist.svg[]


=== STEP standards
Expand Down Expand Up @@ -165,7 +165,7 @@ which specify application dependent information models for the purposes
of data exchange.


image::../images/01-pstpover.svg[]
image::01-pstpover.svg[]


=== STEP architecture
Expand All @@ -187,7 +187,7 @@ are APs and exchange levels.


.STEP architecture
image::../images/01-pstparch.svg[]
image::01-pstparch.svg[]


==== Level 1 exchange
Expand All @@ -197,7 +197,7 @@ STEP data file then archive it and/or send it to someone else (to read into
their CAD system).

.STEP level 1 exchange
image::../images/01-plevel1.svg[]
image::01-plevel1.svg[]


==== Level 2 exchange
Expand All @@ -208,7 +208,7 @@ can be written to a file for Level 1 use. At the end of the session
the STEP database is no longer available.

.STEP level 2 exchange
image::../images/01-plevel2.svg[]
image::01-plevel2.svg[]


==== Level 3 exchange
Expand All @@ -218,7 +218,7 @@ in a (permanent) shared database. STEP level 1 files can be written and read
by the database.

.STEP level 3 exchange
image::../images/01-plevel3.svg[]
image::01-plevel3.svg[]


==== Procedural exchange
Expand All @@ -233,7 +233,7 @@ can be the same but the route is very different.


.STEP procedural exchange
image::../images/01-pfilproc.svg[]
image::01-pfilproc.svg[]


==== Level 4 Exchange
Expand All @@ -248,4 +248,4 @@ Internally, though, they are implemented using a Level 2 or 3 architecture.


.STEP level 4 exchange
image::../images/01-plevel4.svg[]
image::01-plevel4.svg[]
36 changes: 18 additions & 18 deletions content/learn/express-g.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ END_FUNCTION;

.Example model in EXPRESS-G
====
image::../images/02-models-1.svg[]
image::../images/02-models-2.svg[]
image::02-models-1.svg[]
image::02-models-2.svg[]
====


Expand All @@ -159,22 +159,22 @@ SUBTYPE_CONSTRAINT is a late addition.

.EXPRESS-G base types
====
image::../images/02-symbols-1.svg[]
image::../images/02-symbols-4.svg[]
image::02-symbols-1.svg[]
image::02-symbols-4.svg[]
====


.EXPRESS-G defined types
image::../images/02-symbols-8.svg[]
image::02-symbols-8.svg[]

.EXPRESS-G ENTITY
image::../images/02-symbols-9.svg[]
image::02-symbols-9.svg[]

.EXPRESS-G SUBTYPE_CONSTRAINT
image::../images/02-symbols-17.svg[]
image::02-symbols-17.svg[]

.EXPRESS-G SCHEMA
image::../images/02-symbols-13.svg[]
image::02-symbols-13.svg[]


=== Relationship symbols
Expand All @@ -189,7 +189,7 @@ of the relationship.
// end notes

.EXPRESS-G line styles
image::../images/02-symbols-14.svg[]
image::02-symbols-14.svg[]


=== Composition symbols
Expand All @@ -203,10 +203,10 @@ another page.
schema than the current one.

.EXPRESS-G page references
image::../images/02-symbols-15.svg[]
image::02-symbols-15.svg[]

.EXPRESS-G inter-schema references
image::../images/02-symbols-16.svg[]
image::02-symbols-16.svg[]


== Usage examples
Expand Down Expand Up @@ -240,7 +240,7 @@ END_SCHEMA; -- simple_tree
----

.Example EXPRESS-G supertype tree
image::../images/02-models-5.svg[]
image::02-models-5.svg[]


=== Expressing retyped attributes
Expand All @@ -267,7 +267,7 @@ END_ENTITY;
----

.EXPRESS-G of the
image::../images/02-models-6.svg[]
image::02-models-6.svg[]


=== Expressing partial and complete ENTITY models
Expand Down Expand Up @@ -308,10 +308,10 @@ TYPE strings LIST [1:?] OF STRING; END_TYPE;


.EXPRESS-G PARTIAL ENTITY LEVEL MODEL
image::../images/02-models-3.svg[]
image::02-models-3.svg[]

.EXPRESS-G COMPLETE ENTITY LEVEL MODEL
image::../images/02-models-4.svg[]
image::02-models-4.svg[]


=== Expressing schema and entity models
Expand Down Expand Up @@ -366,10 +366,10 @@ END_SCHEMA; -- geom
----

.EXPRESS-G schema level model
image::../images/02-models-8.svg[]
image::02-models-8.svg[]

.EXPRESS-G entity level model
image::../images/02-models-7.svg[]
image::02-models-7.svg[]


=== Expressing subtype constraints
Expand Down Expand Up @@ -402,4 +402,4 @@ ENTITY i SUBTYPE OF (a); END_ENTITY; -- illegal
----

.EXPRESS-G with SUBTYPE_CONSTRAINTs
image::../images/02-models-10.svg[]
image::02-models-10.svg[]
10 changes: 5 additions & 5 deletions content/posts/2022-05-01-express-history.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ STEP file structure (also called "`physical file`"), also inspired by the PDDI
effort, was submitted as N279.

.ISO/TC 184/SC 4/WG 1 N287
image::/assets/blog/2022-05-01-express-history/n287.png[height=400]
image::/images/blog/2022-05-01-express-history/n287.png[height=400]

SOURCE: NISTIR 88-4004 PDES First Working Draft.

Expand All @@ -125,7 +125,7 @@ ____
It was accepted by ISO at the same time as EXPRESS itself.

.Description of when EXPRESS-G was created, according to Peter Wilson
image::/assets/blog/2022-05-01-express-history/expressg.png[width=600]
image::/images/blog/2022-05-01-express-history/expressg.png[width=600]

== Birth of EXPRESS-I (1991/92)

Expand All @@ -151,11 +151,11 @@ https://www.iso.org/standard/18348.html[ISO 10303-11:1994],
|===
|
.Information Modeling: The EXPRESS Way, by Douglas Schenck and Peter Wilson
image::/assets/blog/2022-05-01-express-history/expressway.jpeg[height=400]
image::/images/blog/2022-05-01-express-history/expressway.jpeg[height=400]

|
.ISO 10303-11:1994
image::/assets/blog/2022-05-01-express-history/10303-11-1994.jpeg[height=400]
image::/images/blog/2022-05-01-express-history/10303-11-1994.jpeg[height=400]

|===

Expand All @@ -175,7 +175,7 @@ Wilson, Ed Barkmeyer, Peter Denno, Jochen Haenisch, David Price.
|===
|
.Cover page of ISO 10303-11:2004
image::/assets/blog/2022-05-01-express-history/10303-11-2004.jpeg[]
image::/images/blog/2022-05-01-express-history/10303-11-2004.jpeg[]

|

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed public/images/authors/tse@ribose.com.jpg
Binary file not shown.
Binary file modified public/images/people/thomas-thurman.jpg
1 change: 1 addition & 0 deletions public/images/supporters/supporter-ribose.svg
1 change: 1 addition & 0 deletions public/images/supporters/supporter-steptools.svg

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/build-content.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ console.log('Building content...')
const imagesDirs: Record<string, string> = {
pages: '/images',
posts: '/images/blog',
learn: '/learn/images',
learn: '/images/learn',
course: '/course/images',
languages: '/images/languages',
people: '/images/people',
Expand Down
10 changes: 4 additions & 6 deletions src/components/layout/TheFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ import { siteData } from '@/data/site'
<!-- Organization -->
<div class="sm:col-span-2 lg:col-span-1">
<RouterLink to="/" class="flex items-center gap-2 mb-4 group">
<svg viewBox="55 70 440 200" class="h-7 shrink-0 text-elf-blue dark:text-white" fill="currentColor" aria-hidden="true">
<path d="M204.85 225.43h-60.72c-17.43 0-31.61-14.18-31.61-31.61v-11.86h64.53v-31.79h-64.53v-.3c0-17.43 14.18-31.61 31.61-31.61h82.73l31.48 36.03 23.23-21.73-26.3-30.11c-11.32-13.02-24.3-15.58-30.78-15.99h-80.36c-34.96 0-63.4 28.44-63.4 63.4v43.95c0 34.96 28.44 63.4 63.4 63.4h32.94l27.77-31.79z"/>
<path d="M454.93 86.44h-73.72l-25.49-.01c-.77 0-1.58.13-2.34.23-6.7.85-17.54 3.98-27.35 14.61l-29.66 33.88 21.1 24.15 29.26-33.39c5.47-4.64 10.52-7.36 15.3-7.66l65.48-.02 27.42-31.79z"/>
<path d="M413.54 257.56l27.41-31.78-77.98-.03-39.85-45.61-.04.04-68.9-78.87c-11.05-11.98-23.42-14.44-29.69-14.84h-25.49l67.64 77.42.04-.04 68.9 78.87c11.06 11.98 23.42 14.44 29.69 14.84h25.49l-.02-.02 22.8.02z"/>
<path d="M257.12 180.18l-.04-.04-67.64 77.42h25.49c5.39 0 18.64-2.86 29.69-14.84l39.94-45-21.08-24.13-6.35 6.59z"/>
</svg>
<img src="/logos/logo-icon-blue.svg" alt="ELF" class="h-7 shrink-0 dark:hidden" />
<img src="/logos/logo-icon-white.svg" alt="ELF" class="h-7 shrink-0 hidden dark:block" />
<div class="flex flex-col leading-none">
<span class="font-logo font-bold text-[0.8rem] tracking-[0.06em] text-elf-blue dark:text-white">EXPRESS</span>
<span class="font-logo font-medium text-[0.5rem] tracking-[0.1em] text-elf-blue/70 dark:text-gray-400 mt-[2px]">Language Foundation</span>
Expand All @@ -41,6 +37,7 @@ import { siteData } from '@/data/site'
<li><RouterLink to="/languages#express-g" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">EXPRESS-G</RouterLink></li>
<li><RouterLink to="/languages#express-i" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">EXPRESS-I</RouterLink></li>
<li><RouterLink to="/languages#express-x" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">EXPRESS-X</RouterLink></li>
<li><RouterLink to="/languages#express-q" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">EXPRESS-Q</RouterLink></li>
</ul>
</div>

Expand All @@ -60,6 +57,7 @@ import { siteData } from '@/data/site'
<ul class="space-y-2.5 text-sm">
<li><RouterLink to="/about" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">About</RouterLink></li>
<li><RouterLink to="/leadership" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">Leadership</RouterLink></li>
<li><RouterLink to="/supporters" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">Supporters</RouterLink></li>
<li><RouterLink to="/membership" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">Membership</RouterLink></li>
<li><RouterLink to="/blog" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">Blog</RouterLink></li>
<li><RouterLink to="/privacy" class="text-gray-600 dark:text-gray-400 hover:text-elf-blue dark:hover:text-elf-blue transition-colors">Privacy</RouterLink></li>
Expand Down
8 changes: 6 additions & 2 deletions src/components/layout/TheHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@ onMounted(() => {
<div class="flex items-center justify-between h-16">
<!-- Logo -->
<RouterLink to="/" class="flex items-center gap-2.5 shrink-0 group" @click="closeMobile">
<img src="/logos/logo-icon-blue.svg" alt="ELF" class="h-8 shrink-0 dark:hidden" />
<img src="/logos/logo-icon-white.svg" alt="ELF" class="h-8 shrink-0 hidden dark:block" />
<img src="/logos/logo-icon-blue.svg" alt="" class="h-8 shrink-0 dark:hidden" />
<img src="/logos/logo-icon-white.svg" alt="" class="h-8 shrink-0 hidden dark:block" />
<div class="flex flex-col leading-none">
<span class="font-[Montserrat,sans-serif] font-bold text-[0.9rem] tracking-[0.06em] text-elf-blue dark:text-white">EXPRESS</span>
<span class="font-[Montserrat,sans-serif] font-medium text-[0.58rem] tracking-[0.1em] text-elf-blue/70 dark:text-gray-400 mt-[3px]">Language Foundation</span>
</div>
</RouterLink>

<!-- Desktop nav -->
Expand Down
1 change: 1 addition & 0 deletions src/data/navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const mainNavigation: NavItem[] = [
children: [
{ title: 'About ELF', path: '/about' },
{ title: 'Leadership', path: '/leadership' },
{ title: 'Supporters', path: '/supporters' },
{ title: 'Membership', path: '/membership' },
],
},
Expand Down
Loading
Loading