luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #306 from nhooyr/textmeasure-ab94

Browse source 
Move textmeasure into lib
This commit is contained in:
Anmol Sethi 2022-12-01 08:57:18 -08:00 committed by GitHub
commit 026959bc57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 57 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ci/release/template/scripts/lib.sh
View file

@ -55,12 +55,14 @@ tput() {
should_color() {
if [ -n "${COLOR-}" ]; then
if [ "$COLOR" = 0 -o "$COLOR" = false ]; then
_COLOR=
return 1
elif [ "$COLOR" = 1 -o "$COLOR" = true ]; then
if [ "$COLOR" = 1 -o "$COLOR" = true ]; then
_COLOR=1
__COLOR=1
return 0
elif [ "$COLOR" = 0 -o "$COLOR" = false ]; then
_COLOR=
__COLOR=0
return 1
else
printf '$COLOR must be 0, 1, false or true but got %s\n' "$COLOR" >&2
fi
@ -68,9 +70,11 @@ should_color() {
if [ -t 1 -a "${TERM-}" != dumb ]; then
_COLOR=1
__COLOR=1
return 0
else
_COLOR=
__COLOR=0
return 1
fi
}
@ -114,9 +118,9 @@ printfp() {(
fi
should_color || true
if [ $# -eq 0 ]; then
printf '%s' "$(COLOR=${_COLOR-} setaf "$FGCOLOR" "$prefix")"
printf '%s' "$(COLOR=$__COLOR setaf "$FGCOLOR" "$prefix")"
else
printf '%s: %s\n' "$(COLOR=${_COLOR-} setaf "$FGCOLOR" "$prefix")" "$(printf "$@")"
printf '%s: %s\n' "$(COLOR=$__COLOR setaf "$FGCOLOR" "$prefix")" "$(printf "$@")"
fi
)}
@ -125,7 +129,7 @@ catp() {
shift
should_color || true
sed "s/^/$(COLOR=${_COLOR-} printfp "$prefix" '')/"
sed "s/^/$(COLOR=$__COLOR printfp "$prefix" '')/"
}
repeat() {
@ -152,17 +156,17 @@ printferr() {
logp() {
should_color >&2 || true
COLOR=${_COLOR-} echop "$@" | humanpath >&2
COLOR=$__COLOR echop "$@" | humanpath >&2
}
logfp() {
should_color >&2 || true
COLOR=${_COLOR-} printfp "$@" | humanpath >&2
COLOR=$__COLOR printfp "$@" | humanpath >&2
}
logpcat() {
should_color >&2 || true
COLOR=${_COLOR-} catp "$@" | humanpath >&2
COLOR=$__COLOR catp "$@" | humanpath >&2
}
log() {
@ -287,3 +291,10 @@ runtty() {
return 1
esac
}
capcode() {
set +e
"$@"
code=$?
set -e
}

2
ci/sub

@ -1 +1 @@
Subproject commit 0dacc9c6cee5b8d901f22f57e9dc7f9acf640cbc
Subproject commit 702b771228f41e5485b5f3f593ce79f6efcb555d

2
d2chaos/d2chaos_test.go
View file

@ -17,8 +17,8 @@ import (
"oss.terrastruct.com/d2/d2compiler"
"oss.terrastruct.com/d2/d2exporter"
"oss.terrastruct.com/d2/d2layouts/d2dagrelayout"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/lib/log"
"oss.terrastruct.com/d2/lib/textmeasure"
)
// usage: D2_CHAOS_MAXI=100 D2_CHAOS_N=100 ./ci/test.sh ./d2chaos

2
d2exporter/export_test.go
View file

@ -15,11 +15,11 @@ import (
"oss.terrastruct.com/d2/d2compiler"
"oss.terrastruct.com/d2/d2exporter"
"oss.terrastruct.com/d2/d2layouts/d2dagrelayout"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/d2target"
"oss.terrastruct.com/d2/d2themes/d2themescatalog"
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/log"
"oss.terrastruct.com/d2/lib/textmeasure"
)
type testCase struct {

2
d2graph/d2graph.go
View file

@ -12,11 +12,11 @@ import (
"oss.terrastruct.com/d2/d2parser"
"oss.terrastruct.com/d2/d2renderers/d2fonts"
"oss.terrastruct.com/d2/d2renderers/d2latex"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/d2target"
"oss.terrastruct.com/d2/d2themes"
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/go2"
"oss.terrastruct.com/d2/lib/textmeasure"
)
// TODO: Refactor with a light abstract layer on top of AST implementing scenarios,

2
d2lib/d2.go
View file

@ -9,8 +9,8 @@ import (
"oss.terrastruct.com/d2/d2compiler"
"oss.terrastruct.com/d2/d2exporter"
"oss.terrastruct.com/d2/d2graph"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/d2target"
"oss.terrastruct.com/d2/lib/textmeasure"
)
type CompileOptions struct {

2
d2renderers/d2svg/d2svg.go
View file

@ -22,13 +22,13 @@ import (
"oss.terrastruct.com/d2/d2renderers/d2fonts"
"oss.terrastruct.com/d2/d2renderers/d2latex"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/d2target"
"oss.terrastruct.com/d2/lib/color"
"oss.terrastruct.com/d2/lib/geo"
"oss.terrastruct.com/d2/lib/go2"
"oss.terrastruct.com/d2/lib/label"
"oss.terrastruct.com/d2/lib/shape"
"oss.terrastruct.com/d2/lib/textmeasure"
)
const (

2
docs/examples/lib/1-d2lib/d2lib.go
View file

@ -8,8 +8,8 @@ import (
"oss.terrastruct.com/d2/d2layouts/d2dagrelayout"
"oss.terrastruct.com/d2/d2lib"
"oss.terrastruct.com/d2/d2renderers/d2svg"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/d2themes/d2themescatalog"
"oss.terrastruct.com/d2/lib/textmeasure"
)
// Remember to add if err != nil checks in production.

2
docs/examples/lib/2-d2oracle/d2oracle.go
View file

@ -8,8 +8,8 @@ import (
"oss.terrastruct.com/d2/d2layouts/d2dagrelayout"
"oss.terrastruct.com/d2/d2lib"
"oss.terrastruct.com/d2/d2oracle"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/d2themes/d2themescatalog"
"oss.terrastruct.com/d2/lib/textmeasure"
)
// Remember to add if err != nil checks in production.

2
docs/examples/lib/3-lowlevel/lowlevel.go
View file

@ -10,8 +10,8 @@ import (
"oss.terrastruct.com/d2/d2exporter"
"oss.terrastruct.com/d2/d2layouts/d2dagrelayout"
"oss.terrastruct.com/d2/d2renderers/d2svg"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/d2themes/d2themescatalog"
"oss.terrastruct.com/d2/lib/textmeasure"
)
// Remember to add if err != nil checks in production.

2
e2etests/e2e_test.go
View file

@ -21,10 +21,10 @@ import (
"oss.terrastruct.com/d2/d2layouts/d2elklayout"
"oss.terrastruct.com/d2/d2lib"
"oss.terrastruct.com/d2/d2renderers/d2svg"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/d2target"
xdiff "oss.terrastruct.com/d2/lib/diff"
"oss.terrastruct.com/d2/lib/log"
"oss.terrastruct.com/d2/lib/textmeasure"
)
func TestE2E(t *testing.T) {

31
install.sh
View file

@ -61,12 +61,14 @@ tput() {
should_color() {
if [ -n "${COLOR-}" ]; then
if [ "$COLOR" = 0 -o "$COLOR" = false ]; then
_COLOR=
return 1
elif [ "$COLOR" = 1 -o "$COLOR" = true ]; then
if [ "$COLOR" = 1 -o "$COLOR" = true ]; then
_COLOR=1
__COLOR=1
return 0
elif [ "$COLOR" = 0 -o "$COLOR" = false ]; then
_COLOR=
__COLOR=0
return 1
else
printf '$COLOR must be 0, 1, false or true but got %s\n' "$COLOR" >&2
fi
@ -74,9 +76,11 @@ should_color() {
if [ -t 1 -a "${TERM-}" != dumb ]; then
_COLOR=1
__COLOR=1
return 0
else
_COLOR=
__COLOR=0
return 1
fi
}
@ -120,9 +124,9 @@ printfp() {(
fi
should_color || true
if [ $# -eq 0 ]; then
printf '%s' "$(COLOR=${_COLOR-} setaf "$FGCOLOR" "$prefix")"
printf '%s' "$(COLOR=$__COLOR setaf "$FGCOLOR" "$prefix")"
else
printf '%s: %s\n' "$(COLOR=${_COLOR-} setaf "$FGCOLOR" "$prefix")" "$(printf "$@")"
printf '%s: %s\n' "$(COLOR=$__COLOR setaf "$FGCOLOR" "$prefix")" "$(printf "$@")"
fi
)}
@ -131,7 +135,7 @@ catp() {
shift
should_color || true
sed "s/^/$(COLOR=${_COLOR-} printfp "$prefix" '')/"
sed "s/^/$(COLOR=$__COLOR printfp "$prefix" '')/"
}
repeat() {
@ -158,17 +162,17 @@ printferr() {
logp() {
should_color >&2 || true
COLOR=${_COLOR-} echop "$@" | humanpath >&2
COLOR=$__COLOR echop "$@" | humanpath >&2
}
logfp() {
should_color >&2 || true
COLOR=${_COLOR-} printfp "$@" | humanpath >&2
COLOR=$__COLOR printfp "$@" | humanpath >&2
}
logpcat() {
should_color >&2 || true
COLOR=${_COLOR-} catp "$@" | humanpath >&2
COLOR=$__COLOR catp "$@" | humanpath >&2
}
log() {
@ -293,6 +297,13 @@ runtty() {
return 1
esac
}
capcode() {
set +e
"$@"
code=$?
set -e
}
#!/bin/sh
if [ "${LIB_FLAG-}" ]; then
return 0

0
d2renderers/textmeasure/NOTICE.txt → lib/textmeasure/NOTICE.txt
View file

0
d2renderers/textmeasure/atlas.go → lib/textmeasure/atlas.go
View file

0
d2renderers/textmeasure/markdown.go → lib/textmeasure/markdown.go
View file

0
d2renderers/textmeasure/rect.go → lib/textmeasure/rect.go
View file

0
d2renderers/textmeasure/textmeasure.go → lib/textmeasure/textmeasure.go
View file

2
d2renderers/textmeasure/textmeasure_test.go → lib/textmeasure/textmeasure_test.go
View file

@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"oss.terrastruct.com/d2/d2renderers/d2fonts"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/lib/textmeasure"
)
var txts = []string{

2
main.go
View file

@ -18,11 +18,11 @@ import (
"oss.terrastruct.com/d2/d2lib"
"oss.terrastruct.com/d2/d2plugin"
"oss.terrastruct.com/d2/d2renderers/d2svg"
"oss.terrastruct.com/d2/d2renderers/textmeasure"
"oss.terrastruct.com/d2/d2themes"
"oss.terrastruct.com/d2/d2themes/d2themescatalog"
"oss.terrastruct.com/d2/lib/imgbundler"
"oss.terrastruct.com/d2/lib/png"
"oss.terrastruct.com/d2/lib/textmeasure"
"oss.terrastruct.com/d2/lib/version"
"oss.terrastruct.com/d2/lib/xmain"
)

4
make.sh
View file

@ -1,7 +1,9 @@
#!/bin/sh
set -eu
if [ ! -d "$(dirname "$0")/ci/sub/.git" ]; then
if [ ! -e "$(dirname "$0")/ci/sub/.git" ]; then
set -x
git submodule update --init
set +x
fi
. "$(dirname "$0")/ci/sub/lib.sh"
PATH="$(cd -- "$(dirname "$0")" && pwd)/ci/sub/bin:$PATH"