about summary refs log tree commit diff stats
path: root/prototypes/browse/24-bold/main.mu
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2020-06-05 22:39:14 -0700
committerKartik Agaram <vc@akkartik.com>2020-06-05 22:39:14 -0700
commit0fc0653816b6f8760bf39eeb723dc33a0fc556a0 (patch)
treeab73ca33ae1d3dd8dfeff990fc3406e279b7aebb /prototypes/browse/24-bold/main.mu
parentaa804a0a67a081ae55761c67053a07dc7fdf50c0 (diff)
downloadmu-0fc0653816b6f8760bf39eeb723dc33a0fc556a0.tar.gz
6484
Ooh, it's nice and composable if we just never render the delimiters. Perfect.
Diffstat (limited to 'prototypes/browse/24-bold/main.mu')
-rw-r--r--prototypes/browse/24-bold/main.mu22
1 files changed, 6 insertions, 16 deletions
diff --git a/prototypes/browse/24-bold/main.mu b/prototypes/browse/24-bold/main.mu
index f0a74687..4cb51bd7 100644
--- a/prototypes/browse/24-bold/main.mu
+++ b/prototypes/browse/24-bold/main.mu
@@ -45,7 +45,6 @@ $render-normal:body: {
       break-if-!=
       start-color 0xec, 7  # 236 = darkish gray
       start-bold
-        add-char state, c
         render-until-asterisk fs, state
       reset-formatting
       start-color 0xec, 7  # 236 = darkish gray
@@ -56,7 +55,6 @@ $render-normal:body: {
       break-if-!=
       start-color 0xec, 7  # 236 = darkish gray
       start-bold
-        add-char state, c
         render-until-underscore fs, state
       reset-formatting
       start-color 0xec, 7  # 236 = darkish gray
@@ -70,7 +68,7 @@ $render-normal:body: {
 }
 
 fn render-until-asterisk fs: (addr file-state), state: (addr screen-position-state) {
-$render-until-asterisk:body: {
+  {
     # if done-drawing?(state) break
     var done?/eax: boolean <- done-drawing? state
     compare done?, 0  # false
@@ -80,13 +78,9 @@ $render-until-asterisk:body: {
     # if (c == EOF) break
     compare c, 0xffffffff  # EOF marker
     break-if-=
-    # if (c == '*') print it and break
+    # if (c == '*') break
     compare c, 0x2a  # '*'
-    {
-      break-if-!=
-      add-char state, c
-      break $render-until-asterisk:body
-    }
+    break-if-=
     #
     add-char state, c
     #
@@ -95,7 +89,7 @@ $render-until-asterisk:body: {
 }
 
 fn render-until-underscore fs: (addr file-state), state: (addr screen-position-state) {
-$render-until-underscore:body: {
+  {
     # if done-drawing?(state) break
     var done?/eax: boolean <- done-drawing? state
     compare done?, 0  # false
@@ -105,13 +99,9 @@ $render-until-underscore:body: {
     # if (c == EOF) break
     compare c, 0xffffffff  # EOF marker
     break-if-=
-    # if (c == '_') print it and break
+    # if (c == '_') break
     compare c, 0x5f  # '_'
-    {
-      break-if-!=
-      add-char state, c
-      break $render-until-underscore:body
-    }
+    break-if-=
     #
     add-char state, c
     #
Vetter <jubalh@iodoru.org> 2019-04-13 23:18:44 +0200 Move travis from Ubuntu to docker+openSUSE' href='/danisanti/profani-tty/commit/Dockerfile?id=9cd5dfbdaab42e4b5874e6f72bd75f3523afb2ea'>9cd5dfbd ^
3700c80a ^

9cd5dfbd ^
3700c80a ^
9cd5dfbd ^
9cd5dfbd ^
3700c80a ^


672f3e22 ^

0857b5ee ^




9cd5dfbd ^














1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
                                            
                        
 


                                     
                                                 

                    
            


                
               
                

                
                   

                  
                   

                   
                       

                   

                              
                 
        
                 
          


                 

                  




                                                               














                                                           
# Build the latest openSUSE Tumbleweed image
FROM opensuse/tumbleweed

# expect - for functional tests
# libmicrohttpd - for stabber
# glibc-locale - to have en_US locale
RUN zypper --non-interactive in --no-recommends \
  autoconf \
  autoconf-archive \
  automake \
  expect-devel \
  gcc \
  git \
  glib2-devel \
  glibc-locale \
  gtk2-devel \
  libXss-devel \
  libcmocka-devel \
  libcurl-devel \
  libexpat-devel \
  libgcrypt-devel \
  libgpgme-devel \
  libmesode-devel \
  libmicrohttpd-devel \
  libnotify-devel \
  libotr-devel \
  libsignal-protocol-c-devel \
  libtool \
  libuuid-devel \
  make \
  ncurses-devel \
  python \
  python-devel \
  python3 \
  python3-devel \
  readline-devel \
  sqlite3-devel

# https://github.com/openSUSE/docker-containers-build/issues/26
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

RUN mkdir -p /usr/src
WORKDIR /usr/src

RUN mkdir -p /usr/src/stabber
RUN git clone git://github.com/boothj5/stabber.git
WORKDIR /usr/src/stabber
RUN ./bootstrap.sh
RUN ./configure --prefix=/usr --disable-dependency-tracking
RUN make
RUN make install

RUN mkdir -p /usr/src/profanity
WORKDIR /usr/src/profanity
COPY . /usr/src/profanity