From 1d871e6152c1acfa01db6fd90ee809274b9f8751 Mon Sep 17 00:00:00 2001
From: Elie Roux <elie.roux@telecom-bretagne.eu>
Date: Mon, 29 Apr 2013 15:42:56 +0200
Subject: Merging pull request #18

---
 tests/fontconfig_conf_reading.tex |  8 ++++---
 tests/fonts.conf.test             | 44 ++++++++++++++++++++++-----------------
 tests/weirdfonts.tex              | 15 +++++++++++++
 3 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 tests/weirdfonts.tex

(limited to 'tests')

diff --git a/tests/fontconfig_conf_reading.tex b/tests/fontconfig_conf_reading.tex
index dbbbc3c..66ab377 100644
--- a/tests/fontconfig_conf_reading.tex
+++ b/tests/fontconfig_conf_reading.tex
@@ -1,6 +1,8 @@
 \directlua{
-require("lualibs")
-require("otfl-font-nms.lua")
-texio.write_nl(table.serialize(fonts.names.read_fonts_conf("fonts.conf.test", {})))
+  config = { lualibs = { load_extended = false } }
+  require"lualibs"
+  require"luaotfload-database"
+  local results = fonts.names.read_fonts_conf{"fonts.conf.test"}
+  inspect(results)
 }
 \bye
diff --git a/tests/fonts.conf.test b/tests/fonts.conf.test
index 0e5b961..3c3e132 100644
--- a/tests/fonts.conf.test
+++ b/tests/fonts.conf.test
@@ -1,19 +1,25 @@
-<!-- this is a comment -->
-<!-- this is a comment with the <dir>test 0 failed!</dir> -->
-<!---->
-<!--
-this is a comment -->
-<!--
-this is a comment
--->
-<!-- 
-this is a comment
-<dir>test -1 failed!</dir>
--->
-<dir>test 1 ok</dir>
-<dir>test 2 ok</dir><dir>test 3 ok</dir>
-<dir>test 4 ok</dir><!-- comment--><dir>test 5 ok</dir>
-<!-- this starts to be more debian-specific... change it to fit your system -->
-<include>/etc/fonts/conf.d</include><!-- this is a dir -->
-<include>/etc/fonts/fonts.conf</include>
-<include ignore_missing="no">/etc/fonts/conf.d/69-unifont.conf</include>
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+    <!-- this is a comment -->
+    <!-- this is a comment with the <dir>test 0 failed!</dir> -->
+    <!---->
+    <!--
+    this is a comment -->
+    <!--
+    this is a comment
+    -->
+    <!-- 
+    this is a comment
+    <dir>test -1 failed!</dir>
+    -->
+    <include prefix="xdg">fontconfig/fonts.conf</include><!-- this is a dir -->
+    <dir>test 1 ok</dir>
+    <dir>test 2 ok</dir><dir>test 3 ok</dir>
+    <dir>test 4 ok</dir><!-- comment--><dir>test 5 ok</dir>
+    <!-- this starts to be more debian-specific... change it to fit your system -->
+    <include>/etc/fonts/conf.d</include><!-- this is a dir -->
+    <include>/etc/fonts/fonts.conf</include>
+    <include ignore_missing="no">/etc/fonts/conf.d/69-unifont.conf</include>
+</fontconfig>
diff --git a/tests/weirdfonts.tex b/tests/weirdfonts.tex
new file mode 100644
index 0000000..9cbf8ac
--- /dev/null
+++ b/tests/weirdfonts.tex
@@ -0,0 +1,15 @@
+%% non-standard fonts deserve an extra test file
+\documentclass{scrartcl}
+\usepackage{fontspec}
+%% ····································································
+%% libertine monospace
+%% -------------------
+%% real-world example from: http://tex.stackexchange.com/q/110566
+%% causing database lookups to fail; addressed in luaotfload since
+%% https://github.com/phi-gamma/luaotfload/commit/4d0d2c19ab36d4918a72041a087fbcb451ac8c52
+\setmonofont{Linux Libertine Mono O}
+%% ····································································
+
+\begin{document}
+  foo {\ttfamily bar} baz
+\end{document}
-- 
cgit v1.2.3