From 9c040a9d2b6aa0400df868c8a8581a9e168b9d14 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Mon, 29 Mar 2021 14:51:54 +0200
Subject: [PATCH] =?UTF-8?q?Move=20around=20test=20cases=20=F0=9F=9A=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/library/{base.rs => basic.rs}           |   0
 src/library/mod.rs                          |   4 ++--
 tests/ref/markup/basic.png                  | Bin 0 -> 3827 bytes
 tests/ref/markup/linebreak.png              | Bin 3574 -> 0 bytes
 tests/ref/markup/nbsp.png                   | Bin 1664 -> 0 bytes
 tests/ref/markup/parbreak.png               | Bin 1682 -> 0 bytes
 tests/ref/text/{complex.png => shaping.png} | Bin
 tests/typ/library/{base.typ => basic.typ}   |   2 +-
 tests/typ/markup/basic.typ                  |  22 +++++++++++++++++
 tests/typ/markup/linebreak.typ              |  25 --------------------
 tests/typ/markup/nbsp.typ                   |   4 ----
 tests/typ/markup/parbreak.typ               |  11 ---------
 tests/typ/text/{complex.typ => shaping.typ} |   0
 13 files changed, 25 insertions(+), 43 deletions(-)
 rename src/library/{base.rs => basic.rs} (100%)
 create mode 100644 tests/ref/markup/basic.png
 delete mode 100644 tests/ref/markup/linebreak.png
 delete mode 100644 tests/ref/markup/nbsp.png
 delete mode 100644 tests/ref/markup/parbreak.png
 rename tests/ref/text/{complex.png => shaping.png} (100%)
 rename tests/typ/library/{base.typ => basic.typ} (95%)
 create mode 100644 tests/typ/markup/basic.typ
 delete mode 100644 tests/typ/markup/linebreak.typ
 delete mode 100644 tests/typ/markup/nbsp.typ
 delete mode 100644 tests/typ/markup/parbreak.typ
 rename tests/typ/text/{complex.typ => shaping.typ} (100%)

diff --git a/src/library/base.rs b/src/library/basic.rs
similarity index 100%
rename from src/library/base.rs
rename to src/library/basic.rs
diff --git a/src/library/mod.rs b/src/library/mod.rs
index 9c2a661a6..738348ee0 100644
--- a/src/library/mod.rs
+++ b/src/library/mod.rs
@@ -4,7 +4,7 @@
 //! definitions.
 
 mod align;
-mod base;
+mod basic;
 mod font;
 mod image;
 mod lang;
@@ -17,7 +17,7 @@ mod spacing;
 
 pub use self::image::*;
 pub use align::*;
-pub use base::*;
+pub use basic::*;
 pub use font::*;
 pub use lang::*;
 pub use markup::*;
diff --git a/tests/ref/markup/basic.png b/tests/ref/markup/basic.png
new file mode 100644
index 0000000000000000000000000000000000000000..a43fcbcbc85043ef46262908760991c424f202ae
GIT binary patch
literal 3827
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
UcBM*1=Vlh5tA)@kQMZZs7gGWy=Kufz

literal 0
HcmV?d00001

diff --git a/tests/ref/markup/linebreak.png b/tests/ref/markup/linebreak.png
deleted file mode 100644
index 32236e7428f4d4bf6013247c27dce89618c189fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3574
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

diff --git a/tests/ref/markup/nbsp.png b/tests/ref/markup/nbsp.png
deleted file mode 100644
index 8834bb2bcf8ec6da115bfea95592a6179edf2951..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1664
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
KMNUMnLSTY1YYJBY

diff --git a/tests/ref/markup/parbreak.png b/tests/ref/markup/parbreak.png
deleted file mode 100644
index f100b9d7377de5891f2e24d1a076daa53971c20f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1682
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

diff --git a/tests/ref/text/complex.png b/tests/ref/text/shaping.png
similarity index 100%
rename from tests/ref/text/complex.png
rename to tests/ref/text/shaping.png
diff --git a/tests/typ/library/base.typ b/tests/typ/library/basic.typ
similarity index 95%
rename from tests/typ/library/base.typ
rename to tests/typ/library/basic.typ
index cc9f14a03..a16215a75 100644
--- a/tests/typ/library/base.typ
+++ b/tests/typ/library/basic.typ
@@ -1,4 +1,4 @@
-// Test the base functions.
+// Test basic functions.
 // Ref: false
 
 ---
diff --git a/tests/typ/markup/basic.typ b/tests/typ/markup/basic.typ
new file mode 100644
index 000000000..3e83b9113
--- /dev/null
+++ b/tests/typ/markup/basic.typ
@@ -0,0 +1,22 @@
+// Test basic markup.
+
+---
+#let linebreak() = [
+    // Inside the old line break definition is still active.
+    #circle(radius: 2pt, fill: #000) \
+]
+
+A \ B \ C
+
+---
+// Paragraph breaks don't exist!
+#let parbreak() = [ ]
+
+No more
+
+paragraph breaks
+
+for you!
+
+---
+The non-breaking~space does work.
diff --git a/tests/typ/markup/linebreak.typ b/tests/typ/markup/linebreak.typ
deleted file mode 100644
index b1b83dcc8..000000000
--- a/tests/typ/markup/linebreak.typ
+++ /dev/null
@@ -1,25 +0,0 @@
-// Test forced line breaks.
-
----
-// Directly after word.
-Line\ Break
-
-// Spaces around.
-Line \ Break
-
-// Directly before word does not work.
-No \Break
-
-\ Before
-
-Multiple \ \ \
-
-Times
-
----
-#let linebreak() = [
-    // Inside the old line break definition is still active.
-    #circle(radius: 2pt, fill: #000) \
-]
-
-A \ B \ C
diff --git a/tests/typ/markup/nbsp.typ b/tests/typ/markup/nbsp.typ
deleted file mode 100644
index 372268eb5..000000000
--- a/tests/typ/markup/nbsp.typ
+++ /dev/null
@@ -1,4 +0,0 @@
-// Test the non breaking space.
-
----
-The non-breaking~space does work.
diff --git a/tests/typ/markup/parbreak.typ b/tests/typ/markup/parbreak.typ
deleted file mode 100644
index b9b8a222d..000000000
--- a/tests/typ/markup/parbreak.typ
+++ /dev/null
@@ -1,11 +0,0 @@
-// Test paragraph breaks.
-
----
-// Paragraph breaks don't exist!
-#let parbreak() = [ ]
-
-No more
-
-paragraph breaks
-
-for you!
diff --git a/tests/typ/text/complex.typ b/tests/typ/text/shaping.typ
similarity index 100%
rename from tests/typ/text/complex.typ
rename to tests/typ/text/shaping.typ