A run of Unicode code points now needs one pair of carets, not one pair
each: ^9053 53EF 9053^ renders the characters adjacently, and a single
character inside such a run stands for itself. An invalid code point is
an error naming the position that wrote it, rather than an apology
rendered into the finished document; noncharacters are refused alongside
surrogates; and a code point that lands on a Klammertext special is safe
through the re-reads that assemble a document. The character tables now
produce the precomposed form, so a diacritic written as ^a" and one typed
directly are the same text to a search or a copy-paste.
"kdesc -u" describes how to write a Unicode character, with tables of
glyphs beside the codes that produce them. It is new and not yet
complete: it predates the sequence form and the typeface klammer below.
A typeface and a style are no longer both called "font". A typeface is a
family resolved by name; a style code is the one letter naming a type
style. So @document takes :serif_typeface and its siblings, a table takes
:style, captions take :caption_style and :caption_size, the uniform scale
is :text_scale, and the command is "kdesc --typeface". This renames
arguments a document may already use; an old name is a located error
rather than a silent omission.
@typeface sets a passage in another typeface for the length of that
passage:
@typeface Noto Sans Egyptian Hieroglyphs | ^132AA 133CF^ :scale 1.5 @
Writing the klammer is the whole declaration -- the document resolves the
typeface, embeds it in what it produces, and carries its license along.
Two typefaces for scripts no text font covers now ship with Klammertext:
Noto Sans Egyptian Hieroglyphs and Noto Sans Cuneiform. Every typeface in
the distribution now carries its license file.
(from dev 61e598698891)
160 lines
4.7 KiB
C++
160 lines
4.7 KiB
C++
#include <iostream>
|
|
|
|
#include "character.h"
|
|
#include "locator.h"
|
|
#include "show.h"
|
|
#include "file.h"
|
|
#include "util.h"
|
|
|
|
std::string abbreviate_location(
|
|
const std::string& location, bool make_map,
|
|
std::map<std::string, std::string>& relpath)
|
|
{
|
|
std::string result = location;
|
|
fs::path basename = fs::path(location).filename();
|
|
if (sks_commands.contains(basename)) {
|
|
result = basename;
|
|
} else {
|
|
if (make_map) {
|
|
if (relpath.count(location)) {
|
|
result = relpath[location];
|
|
} else {
|
|
result = fs::relative(location, fs::current_path());
|
|
relpath[location] = result;
|
|
}
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
|
|
Locator::Locator(const fs::path& filename, int line, int chr)
|
|
: m_filename(filename)
|
|
, m_line(line)
|
|
, m_chr(chr)
|
|
{
|
|
string_map relpath {};
|
|
//m_filename = abbreviate_location(m_filename, false, relpath);
|
|
}
|
|
|
|
|
|
std::ostream &nformat(std::ostream &os)
|
|
{
|
|
os << std::setfill('0') << std::setw(3);
|
|
return os;
|
|
}
|
|
|
|
std::string Locator::str(bool relative) const
|
|
{
|
|
// relative_pathname(m_filename, fs::current_path().string()) << ":"
|
|
std::string filename = m_filename;
|
|
if (relative) {
|
|
filename = relative_to_cwd(m_filename);
|
|
}
|
|
std::stringstream ss {};
|
|
ss << "[" << filename << ":"
|
|
<< nformat << m_line << "."
|
|
<< nformat << m_chr+1 << "]";
|
|
return ss.str();
|
|
}
|
|
|
|
std::string Locator::desc(bool relative) const
|
|
{
|
|
// relative_pathname(m_filename, fs::current_path().string()) << ":"
|
|
std::string filename = m_filename;
|
|
if (relative) {
|
|
filename = relative_to_cwd(m_filename);
|
|
}
|
|
std::stringstream ss {};
|
|
ss << filename << ", line " << m_line << ", character " << m_chr + 1;
|
|
return ss.str();
|
|
}
|
|
|
|
std::string Locator::abbrev(bool include_chr) const
|
|
{
|
|
fs::path fname(m_filename);
|
|
std::stringstream ss {};
|
|
ss << "[" << fname.filename().string() << ":"
|
|
<< nformat << m_line;
|
|
if (include_chr) {
|
|
ss << "." << nformat << m_chr+1;
|
|
}
|
|
ss << "]";
|
|
return ss.str();
|
|
}
|
|
|
|
|
|
|
|
std::string locator_range(const Locator& start_loc, const Locator& end_loc, string_map& relpath)
|
|
{
|
|
std::string start_filename = abbreviate_location(start_loc.m_filename, true, relpath);
|
|
std::string end_filename = abbreviate_location(end_loc.m_filename, true, relpath);
|
|
|
|
std::stringstream ss {};
|
|
std::cout << std::setfill('0') << std::setw(3);
|
|
if (start_filename != end_filename) {
|
|
ss << start_loc << right_arrow << end_loc;
|
|
} else {
|
|
ss << "[" << start_filename << ":";
|
|
if (start_loc.m_line == end_loc.m_line) {
|
|
ss << nformat << start_loc.m_line << "."
|
|
<< nformat << start_loc.m_chr+1 << right_arrow
|
|
<< nformat << end_loc.m_chr+1;
|
|
} else {
|
|
ss << nformat << start_loc.m_line << "."
|
|
<< nformat << start_loc.m_chr+1
|
|
<< right_arrow
|
|
<< nformat << end_loc.m_line << "."
|
|
<< nformat << end_loc.m_chr+1;
|
|
}
|
|
ss << "]";
|
|
}
|
|
std::cout << std::setfill(' ');
|
|
return ss.str();
|
|
}
|
|
|
|
|
|
Locator current_locator(const std::source_location location)
|
|
{
|
|
// file_name() may be null (Homebrew GCC on macOS) -> avoid path(nullptr).
|
|
return Locator(location.file_name() ? location.file_name() : "",
|
|
location.line(), location.column());
|
|
}
|
|
|
|
std::string locator_summary(std::vector<Locator> locators)
|
|
{
|
|
std::map<std::string, std::vector<int>> file_locs {};
|
|
for (auto loc : locators) {
|
|
if (!file_locs.contains(loc.m_filename)) {
|
|
file_locs[loc.m_filename] = {};
|
|
}
|
|
file_locs[loc.m_filename].push_back(loc.m_line);
|
|
}
|
|
for (auto [filename, lines] : file_locs) {
|
|
std::cout << " " << filename << ": " << lines << "\n";
|
|
}
|
|
return "";
|
|
}
|
|
|
|
// Parse "[<file>:<line>.<column>]" -- see the declaration in locator.h.
|
|
// Scanned from the RIGHT, because a pathname may itself contain ":" and
|
|
// "." while the line and column never do.
|
|
Locator Locator::from_string(const std::string& s)
|
|
{
|
|
if (s.size() < 6 || s.front() != '[' || s.back() != ']')
|
|
return Locator::none();
|
|
std::string body = s.substr(1, s.size() - 2);
|
|
size_t dot = body.rfind('.');
|
|
if (dot == std::string::npos) return Locator::none();
|
|
size_t colon = body.rfind(':', dot);
|
|
if (colon == std::string::npos) return Locator::none();
|
|
try {
|
|
int line = std::stoi(body.substr(colon + 1, dot - colon - 1));
|
|
int chr = std::stoi(body.substr(dot + 1));
|
|
// str() prints m_chr + 1; undo that so a round trip is exact.
|
|
return Locator(fs::path(body.substr(0, colon)), line, chr - 1);
|
|
} catch (const std::exception&) {
|
|
return Locator::none();
|
|
}
|
|
}
|