Skip to content

Commit 6ca2fb4

Browse files
authored
Merge branch 'main' into joint-monos
2 parents 46fbc72 + b3875c1 commit 6ca2fb4

File tree

113 files changed

+3341
-399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+3341
-399
lines changed

src/1Lab/Counterexamples/Sigma.lagda.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: |
66
the domain of the function.
77
---
88
<!--
9-
```
9+
```agda
1010
open import 1Lab.Equiv
1111
open import 1Lab.Path
1212
open import 1Lab.Type

src/1Lab/Equiv.lagda.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ id-equiv .is-eqv y .paths (x , p) i = p (~ i) , λ j → p (~ i ∨ j)
250250
```
251251

252252
<!--
253-
```
253+
```agda
254254
-- This helper is for functions f, g that cancel eachother, up to
255255
-- definitional equality, without any case analysis on the argument:
256256
@@ -293,7 +293,7 @@ is-eqv' A B (f , is-equiv) a ψ u0 = inS (
293293
```
294294

295295
<!--
296-
```
296+
```agda
297297
equiv-centre : (e : A ≃ B) (y : B) → fibre (e .fst) y
298298
equiv-centre e y = e .snd .is-eqv y .centre
299299

src/1Lab/Equiv/Biinv.lagda.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module 1Lab.Equiv.Biinv where
2020
```
2121

2222
<!--
23-
```
23+
```agda
2424
private variable
2525
ℓ : Level
2626
A B C : Type ℓ

src/1Lab/Equiv/Fibrewise.lagda.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ x` can be referred as a _fibrewise map_.
3131
A function like this can be lifted to a function on total spaces:
3232

3333
<!--
34-
```
34+
```agda
3535
private variable
3636
ℓ : Level
3737
A B : Type ℓ
@@ -153,3 +153,12 @@ An equivalence over $e$ induces an equivalence of total spaces:
153153
over→total : P ≃[ e ] Q → Σ A P ≃ Σ B Q
154154
over→total e' = Σ-ap e λ a → e' a (e.to a) refl
155155
```
156+
157+
<!--
158+
```agda
159+
subst-fibrewise
160+
: ∀ {ℓ ℓ' ℓ''} {A : Type ℓ} {B : A → Type ℓ'} {B' : A → Type ℓ''} (g : ∀ x → B x → B' x)
161+
→ {x y : A} (p : x ≡ y) (h : B x) → subst B' p (g x h) ≡ g y (subst B p h)
162+
subst-fibrewise {B = B} {B'} g {x} p h = J (λ y p → subst B' p (g x h) ≡ g y (subst B p h)) (transport-refl _ ∙ ap (g x) (sym (transport-refl _))) p
163+
```
164+
-->

src/1Lab/Equiv/FromPath.lagda.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: |
44
efficient manner, using cubical methods.
55
---
66
<!--
7-
```
7+
```agda
88
open import 1Lab.HLevel
99
open import 1Lab.Equiv
1010
open import 1Lab.Path

src/1Lab/Extensionality.agda

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,6 @@ instance
151151
Extensional-Π'' ⦃ sb ⦄ .idsᵉ .to-path h i = sb .idsᵉ .to-path h i
152152
Extensional-Π'' ⦃ sb ⦄ .idsᵉ .to-path-over h i = sb .idsᵉ .to-path-over h i
153153

154-
Extensional-×
155-
: {ℓ ℓ' ℓr ℓs} {A : Type ℓ} {B : Type ℓ'}
156-
→ ⦃ sa : Extensional A ℓr ⦄
157-
→ ⦃ sb : Extensional B ℓs ⦄
158-
Extensional (A × B) (ℓr ⊔ ℓs)
159-
Extensional-× ⦃ sa ⦄ ⦃ sb ⦄ .Pathᵉ (x , y) (x' , y') = Pathᵉ sa x x' × Pathᵉ sb y y'
160-
Extensional-× ⦃ sa ⦄ ⦃ sb ⦄ .reflᵉ (x , y) = reflᵉ sa x , reflᵉ sb y
161-
Extensional-× ⦃ sa ⦄ ⦃ sb ⦄ .idsᵉ .to-path (p , q) = ap₂ _,_
162-
(sa .idsᵉ .to-path p)
163-
(sb .idsᵉ .to-path q)
164-
Extensional-× ⦃ sa ⦄ ⦃ sb ⦄ .idsᵉ .to-path-over (p , q) = Σ-pathp
165-
(sa .idsᵉ .to-path-over p)
166-
(sb .idsᵉ .to-path-over q)
167-
168154
-- Some non-confluent "reduction rules" for extensionality are those
169155
-- for functions from a type with a mapping-out property; here, we can
170156
-- immediately define instances for functions from Σ-types (equality
@@ -363,7 +349,12 @@ instance
363349
Extensional-equiv
364350
: {ℓ ℓ' ℓr} {A : Type ℓ} {B : Type ℓ'}
365351
→ ⦃ ea : Extensional (A B) ℓr ⦄ Extensional (A ≃ B) ℓr
366-
Extensional-equiv ⦃ ea ⦄ = Σ-prop-extensional (λ x is-equiv-is-prop _) ea
352+
Extensional-equiv ⦃ ea ⦄ = Σ-prop-extensional (λ x hlevel 1) ea
353+
354+
Extensional-emb
355+
: {ℓ ℓ' ℓr} {A : Type ℓ} {B : Type ℓ'}
356+
→ ⦃ ea : Extensional (A B) ℓr ⦄ Extensional (A ↪ B) ℓr
357+
Extensional-emb ⦃ ea ⦄ = Σ-prop-extensional (λ x hlevel 1) ea
367358

368359
Extensional-tr-map
369360
: {ℓ ℓ' ℓr} {A : Type ℓ} {B : Type ℓ'}

src/1Lab/Function/Embedding.lagda.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module 1Lab.Function.Embedding where
2424
```
2525

2626
<!--
27-
```
27+
```agda
2828
private variable
2929
ℓ ℓ₁ : Level
3030
A B : Type ℓ

src/1Lab/HLevel/Closure.lagda.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module 1Lab.HLevel.Closure where
2424
# Closure of h-levels
2525

2626
<!--
27-
```
27+
```agda
2828
private variable
2929
ℓ ℓ' : Level
3030
A B C : Type ℓ

src/1Lab/HLevel/Universe.lagda.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description: Using univalence, we compute the h-level of the universe of n types.
33
---
44
<!--
5-
```
5+
```agda
66
open import 1Lab.HLevel.Closure
77
open import 1Lab.Type.Sigma
88
open import 1Lab.Univalence
@@ -18,7 +18,7 @@ module 1Lab.HLevel.Universe where
1818
```
1919

2020
<!--
21-
```
21+
```agda
2222
private variable
2323
ℓ : Level
2424
A B C : Type ℓ

src/1Lab/Membership.agda

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ record Membership {ℓ ℓe} (A : Type ℓe) (ℙA : Type ℓ) ℓm : Type (ℓ
2121
infix 30 _∈_
2222

2323
open Membership ⦃ ... ⦄ using (_∈_) public
24-
{-# DISPLAY Membership._∈_ i a b = a ∈ b #-}
24+
{-# DISPLAY Membership._∈_ _ a b = a ∈ b #-}
2525

2626
-- The prototypical instance is given by functions into a universe:
2727

@@ -65,7 +65,7 @@ record Inclusion {ℓ} (ℙA : Type ℓ) ℓi : Type (ℓ ⊔ lsuc (ℓi)) where
6565
infix 30 _⊆_
6666

6767
open Inclusion ⦃ ... ⦄ using (_⊆_) public
68-
{-# DISPLAY Inclusion._⊆_ i a b = a ⊆ b #-}
68+
{-# DISPLAY Inclusion._⊆_ _ a b = a ⊆ b #-}
6969

7070
instance
7171
Inclusion-default

0 commit comments

Comments
 (0)