From 5c794ca17bc687dc64451aa3faf5ddf15c5d1cbf Mon Sep 17 00:00:00 2001 From: dtb Date: Wed, 31 Aug 2022 13:19:16 -0400 Subject: [PATCH] m4ify phones/ --- homepage/Makefile | 14 +++++-- homepage/css/index.m4 | 1 + homepage/head.m4 | 2 +- homepage/home/index.m4 | 1 + homepage/html.m4 | 4 ++ homepage/index.m4 | 1 + homepage/phones/Makefile | 2 + homepage/phones/index.html | 80 -------------------------------------- homepage/phones/index.m4 | 75 +++++++++++++++++++++++++++++++++++ 9 files changed, 95 insertions(+), 85 deletions(-) create mode 100644 homepage/html.m4 create mode 100644 homepage/phones/Makefile delete mode 100644 homepage/phones/index.html create mode 100644 homepage/phones/index.m4 diff --git a/homepage/Makefile b/homepage/Makefile index cc70fd2..3fefed9 100644 --- a/homepage/Makefile +++ b/homepage/Makefile @@ -1,6 +1,9 @@ .POSIX: -generate: index.html css/index.html home/index.html +MAKE = make +RM = rm -f + +generate: index.html css/index.html home/index.html phones/index.html index.html: \ index.m4 \ @@ -21,12 +24,15 @@ zelda.m4 m4 index.m4 >index.html css/index.html: head.m4 css/index.m4 - make -C css + $(MAKE) -C css home/index.html: head.m4 home/index.m4 - make -C home + $(MAKE) -C home + +phones/index.html: head.m4 html.m4 phones/index.m4 + $(MAKE) -C phones clean: - rm index.html css/index.html home/index.html + $(RM) index.html css/index.html home/index.html phones/index.html .PHONY: generate clean diff --git a/homepage/css/index.m4 b/homepage/css/index.m4 index 28d212a..52e43ec 100644 --- a/homepage/css/index.m4 +++ b/homepage/css/index.m4 @@ -1,6 +1,7 @@ define(`_PAGE', `css/')dnl define(`_TITLE', `trinity.moe/css/')dnl define(`_DESCRIPTION', `trinity.moe css')dnl +define(`_STYLE', `') define(`csspage', `
')dnl diff --git a/homepage/head.m4 b/homepage/head.m4 index 4115c0d..7122f65 100644 --- a/homepage/head.m4 +++ b/homepage/head.m4 @@ -9,6 +9,6 @@ - + _TITLE diff --git a/homepage/home/index.m4 b/homepage/home/index.m4 index 192adab..bb2ba79 100644 --- a/homepage/home/index.m4 +++ b/homepage/home/index.m4 @@ -1,6 +1,7 @@ define(`_TITLE', `home')dnl define(`_DESCRIPTION', `browser home page')dnl define(`_PAGE', `home/')dnl +define(`_STYLE', `') include(`../head.m4')dnl diff --git a/homepage/html.m4 b/homepage/html.m4 new file mode 100644 index 0000000..5f150b4 --- /dev/null +++ b/homepage/html.m4 @@ -0,0 +1,4 @@ +define(`td', `$1') +define(`th', `$1') +define(`tr', `$1') +define(`_BAR', `
') diff --git a/homepage/index.m4 b/homepage/index.m4 index c3422e2..4a2987d 100644 --- a/homepage/index.m4 +++ b/homepage/index.m4 @@ -1,6 +1,7 @@ define(`_PAGE', `')dnl define(`_TITLE', `trinity dot moe')dnl define(`_DESCRIPTION', `trinity`'s personal website')dnl +define(`_STYLE', `') include(`head.m4')dnl diff --git a/homepage/phones/Makefile b/homepage/phones/Makefile new file mode 100644 index 0000000..dcc2fc0 --- /dev/null +++ b/homepage/phones/Makefile @@ -0,0 +1,2 @@ +index.html: ../head.m4 ../html.m4 index.m4 + m4 index.m4 >index.html diff --git a/homepage/phones/index.html b/homepage/phones/index.html deleted file mode 100644 index a280c73..0000000 --- a/homepage/phones/index.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - -phones - - -

~ Return to the rest of the site

- - - -

phones

-

updated 2022-08-30

-
- - - - - - - - - -
PhoneBatteryCharging jackCodecsFirmwareHeadphone jackKeyboardOSSDWLAN
Samsung SCH-R390GoodMicro USB-B, no OTGNo FLAC, no Vorbis, no VP8Proprietary3.5mmHardwareProprietaryMicroNo
LG UN280DecentMicro USB-B, no OTGNo FLAC, no Vorbis, no VP8Proprietary3.5mmHardwareProprietaryMicroNo
iPhone SE (2016)DismalProprietaryNo FLAC, no Vorbis, no VP8Proprietary3.5mmSoftwareProprietaryNoneYes
Unihertz TitanExcellentUSB-C PDConfigurableProprietary3.5mmHardwareProprietaryMicroYes
PinephoneUpgradeableUSB-C PDConfigurableChangeable3.5mmSoftware or hardwareOpenMicroYes
Punkt MP-02ExcellentUSB-C but no PDNo FLAC, no Vorbis, no VP8Proprietaryover USB-CHardwareProprietaryNoneYes
- -

Samsung SCH-R390

-

-Also known as the Freeform 4. -I used this extensively and enjoyed it at the time. -

- -

Samsung SCH-R480

-

-Also known as the FreeForm 5. -No significant changes from the FreeForm 4 beyond aesthetics. -

- -

LG UN280

-

-Also known as the Freedom II. -I used this extensively and enjoyed it at the time. -

- -

iPhone SE (2016)

-

-I used this extensively and despise it. -

- -

Unihertz Titan

-

-I used this extensively and despise it. -Bad hardware keyboard (no dollar sign). -Vendor unlawfully non-compliant with GPL 2 licensing on Linux, for this reason I would avoid this phone like the plague. -

- -

Pine64 Pinephone

-

-I love this phone a lot. -Hardware keyboard available as an extension; hardware keyboard also adds a second battery, tripling the battery life of the phone. -Firmware is proprietary by default but the vendor allows using free firmware. -

- -

Punkt MP-02

-

-Sucks. -

- - - diff --git a/homepage/phones/index.m4 b/homepage/phones/index.m4 new file mode 100644 index 0000000..34d0ae7 --- /dev/null +++ b/homepage/phones/index.m4 @@ -0,0 +1,75 @@ + + +define(`_TITLE', `phones')dnl +define(`_DESCRIPTION', `phones')dnl +define(`_PAGE', `phones/')dnl +define(`_STYLE',`.bad{ background-color: red; color: white; } +.good{ background-color: green; color: white; } +table, td, th{ border: 1px solid; border-collapse: collapse; }')dnl +include(`../head.m4')dnl +define(`good', `$1')dnl +define(`bad', `$1')dnl +include(`../html.m4')dnl + +

~ Return to the rest of the site

+ + + +

phones

+

updated 2022-08-30

+_BAR + + + th(`Phone') th(`Battery') th(`Charging jack') th(`Codecs') th(`Firmware') th(`Headphone jack') th(`Keyboard') th(`OS') th(`SD') th(`WLAN') +td(`Samsung SCH-R390') good(`Good') bad(`Micro USB-B, no OTG') bad(`No FLAC, no Vorbis, no VP8') bad(`Proprietary') good(`3.5mm') good(`Hardware') bad(`Proprietary') good(`Micro') bad(`No') + td(`LG UN280') good(`Decent') bad(`Micro USB-B, no OTG') bad(`No FLAC, no Vorbis, no VP8') bad(`Proprietary') good(`3.5mm') good(`Hardware') bad(`Proprietary') good(`Micro') bad(`No') +td(`iPhone SE (2016)') bad(`Dismal') bad(`Proprietary') bad(`No FLAC, no Vorbis, no VP8') bad(`Proprietary') good(`3.5mm') bad(`Software') bad(`Proprietary') bad(`None') good(`Yes') + td(`Unihertz Titan') good(`Excellent') good(`USB-C PD') good(`Configurable') bad(`Proprietary') good(`3.5mm') good(`Hardware') bad(`Proprietary') good(`Micro') good(`Yes') + td(`Pinephone') good(`Upgradeable') good(`USB-C PD') good(`Configurable') good(`Changeable') good(`3.5mm') good(`Software or hardware') good(`Open') good(`Micro') good(`Yes') + td(`Punkt MP-02') good(`Excellent') bad(`USB-C but no PD') bad(`No FLAC, no Vorbis, no VP8') bad(`Proprietary') bad(`over USB-C') good(`Hardware') bad(`Proprietary') bad(`None') good(`Yes') +
+ +

Samsung SCH-R390

+

+Also known as the Freeform 4. +I used this extensively and enjoyed it at the time. +

+ +

Samsung SCH-R480

+

+Also known as the FreeForm 5. +No significant changes from the FreeForm 4 beyond aesthetics. +

+ +

LG UN280

+

+Also known as the Freedom II. +I used this extensively and enjoyed it at the time. +

+ +

iPhone SE (2016)

+

+I used this extensively and despise it. +

+ +

Unihertz Titan

+

+I used this extensively and despise it. +Bad hardware keyboard (no dollar sign). +Vendor unlawfully non-compliant with GPL 2 licensing on Linux, for this reason I would avoid this phone like the plague. +

+ +

Pine64 Pinephone

+

+I love this phone a lot. +Hardware keyboard available as an extension; hardware keyboard also adds a second battery, tripling the battery life of the phone. +Firmware is proprietary by default but the vendor allows using free firmware. +

+ +

Punkt MP-02

+

+Sucks. +

+ + +