Skip to content

Commit e596000

Browse files
committed
3d
1 parent 94b224c commit e596000

File tree

2 files changed

+24
-40
lines changed

2 files changed

+24
-40
lines changed

flowR.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
\usepackage{xcolor}
55
% \definecolor{col}{RGB}{0, 139, 162}% {163,38,56} [color=col]
66
\definecolor{col}{RGB}{163,38,56}
7-
\usepackage[color=col,profile=A,print]{flowrlogo}
7+
\usepackage[color=col,profile=B]{flowrlogo}
88

99
\usepackage[active,tightpage]{preview}
1010
\usepackage{fontawesome}

flowrlogo.sty

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
\DeclareBoolOption{notext}
66
\DeclareStringOption[B]{profile}[B]
77
\DeclareStringOption[default@color]{color}[default@color]
8-
\DeclareBoolOption{print}
98
\ProcessKeyvalOptions*
109

1110
\ifflowrlogo@notext\else
@@ -14,29 +13,22 @@
1413
\RequirePackage{fontspec}
1514
\fi\RequirePackage{tikz}
1615

17-
\def\flowrlogo@Shade{\ifflowrlogo@print\tikzset{@/.style={fill=white}}\else\pgfmathsetmacro\I{int(\i)}\ifnum\I>140 \tikzset{@/.style={right color=\flowrlogo@InnerColor,left color=\flowrlogo@OuterColor}}
18-
\def\flowrlogo@Offshift{0}
19-
\ifnum\I>180 \tikzset{@/.style={top color=\flowrlogo@InnerColor,bottom color=\flowrlogo@OuterColor}}
20-
\ifnum\I<220 \tikzset{@/.style={right color=\flowrlogo@InnerColor,left color=\flowrlogo@OuterColor}}
21-
\else\ifnum\I>320\tikzset{@/.style={left color=\flowrlogo@InnerColor,right color=\flowrlogo@OuterColor}}
22-
\fi
23-
\fi\fi
24-
\else\ifnum\I<50 \tikzset{@/.style={left color=\flowrlogo@InnerColor,right color=\flowrlogo@OuterColor}}
25-
\else \tikzset{@/.style={bottom color=\flowrlogo@InnerColor,top color=\flowrlogo@OuterColor}}
26-
\fi\fi
27-
\fi}
28-
\ifflowrlogo@print
29-
\tikzset{@/.style={},@default/.style={draw=black,very thick}}
30-
\else
16+
\def\flowrlogo@Shade{\tikzset{@/.style={fill=\flowrlogo@InnerColor}}%
17+
% \pgfmathsetmacro\I{int(\i)}\ifnum\I>140 \tikzset{@/.style={right color=\flowrlogo@InnerColor,left color=\flowrlogo@OuterColor}}
18+
% \def\flowrlogo@Offshift{0}
19+
% \ifnum\I>180 \tikzset{@/.style={top color=\flowrlogo@InnerColor,bottom color=\flowrlogo@OuterColor}}
20+
% \ifnum\I<220 \tikzset{@/.style={right color=\flowrlogo@InnerColor,left color=\flowrlogo@OuterColor}}
21+
% \else\ifnum\I>320\tikzset{@/.style={left color=\flowrlogo@InnerColor,right color=\flowrlogo@OuterColor}}
22+
% \fi
23+
% \fi\fi
24+
% \else\ifnum\I<50 \tikzset{@/.style={left color=\flowrlogo@InnerColor,right color=\flowrlogo@OuterColor}}
25+
% \else \tikzset{@/.style={bottom color=\flowrlogo@InnerColor,top color=\flowrlogo@OuterColor}}
26+
% \fi\fi
27+
}
3128
\tikzset{@/.style={},@default/.style={draw=black,very thin}}
32-
\fi
33-
\def\flowrlogo@DrawLeaf#1#2;{%
34-
\scope[rotate around={\i-90:(0,0)}]
29+
\def\flowrlogo@DrawLeaf#1#2;{\scope[rotate around={\i-90:(0,0)}]
3530
\flowrlogo@Shade
36-
\def\res{0}% \domath\res{(\i>=0 && \i<=30) || (\i >= 120 && \i <= 230) || \i>=330}%
37-
\ifnum\res=0
3831
#1[@,@default] (-\flowrlogo@Offshift/2,0) to[bend right=4] ++(5.75pt+\flowrlogo@Offshift,\flowrlogo@Length) arc(-9:189:5.75pt and 6pt) to[bend right=4] ++(5.75pt,-\flowrlogo@Length) -- cycle #2;
39-
\fi
4032
\endscope}
4133

4234
\tikzset{flowr@clip even odd rule/.code={\pgfseteorule}, % Credit to Andrew Stacey
@@ -48,11 +40,11 @@ flowr@invclip/.style={
4840
}}
4941

5042
\def\flowrlogo@Offshift{0pt}
51-
\let\domath\pgfmathsetmacro
43+
5244
% #1 is length | #2 inner | #3 outer | #4 step
5345
\def\flowrlogo@DrawRound#1#2#3#4{%
5446
\gdef\flowrlogo@Length{#1}%
55-
\def\flowrlogo@InnerColor{#2!96!\flowrlogo@OuterColor}%
47+
\def\flowrlogo@InnerColor{#2}%
5648
\def\flowrlogo@OuterColor{#3}%
5749
% \def\Init{0}%
5850
\def\Step{#4}%
@@ -63,10 +55,7 @@ flowr@invclip/.style={
6355
}
6456
\scope
6557
\pgfinterruptboundingbox
66-
\edef\i{\Step}{\def\flowrlogo@Shade{}\tikzset{@default/.style={}}%
67-
{\def\domath##1##2{}\def\res{0}%
68-
\flowrlogo@DrawLeaf{\path[save path=\clippath,flowr@invclip]};
69-
}}%
58+
\edef\i{\Step}{\def\flowrlogo@Shade{}\tikzset{@default/.style={}}\flowrlogo@DrawLeaf{\path[save path=\clippath,flowr@invclip]};}%
7059
\endpgfinterruptboundingbox
7160
\clip[use path=\clippath];
7261
\pgfmathsetmacro\Cur{int(360-2*\Step)}
@@ -81,10 +70,8 @@ flowr@invclip/.style={
8170
\def\i{\Cur}{\def\flowrlogo@Shade{}\tikzset{@default/.style={}}\flowrlogo@DrawLeaf{\path[save path=\clippath,flowr@invclip]};}
8271
\endpgfinterruptboundingbox
8372
\scope[rotate around={\Step-90:(0,0)}]
84-
\ifcsname clippath\endcsname
8573
\clip[use path=\clippath];
86-
\fi
87-
\path (0,0) to[bend right=4] ++(5.75pt,\flowrlogo@Length) arc(-9:189:5.75pt and 6pt);
74+
\draw[very thin] (0,0) to[bend right=4] ++(5.75pt,\flowrlogo@Length) arc(-9:189:5.75pt and 6pt);
8875
\endscope
8976
\endscope
9077
}
@@ -98,7 +85,7 @@ flowr@invclip/.style={
9885
\def\flowrlogo@ProfileB{%
9986
\def\flowrlogo@Circles{2}%
10087
\def\flowrlogo@Xshift{-4.52pt}%
101-
\def\flowrlogo@CenterSize{5.465pt}%
88+
\def\flowrlogo@CenterSize{12.465pt}%
10289
}
10390
\def\flowrlogo@ProfileC{%
10491
\def\flowrlogo@Circles{3}%
@@ -117,7 +104,7 @@ flowr@invclip/.style={
117104
}
118105

119106
\def\flowrlogo@Bloom#1{%
120-
\scope[transparency group, opacity=\ifflowrlogo@print1\else.755\fi] % 625
107+
\scope[transparency group, opacity=.755] % 625
121108
\ifnum\flowrlogo@Circles>5 \scope[rotate around={5:(0,0)}]
122109
\flowrlogo@DrawRound{2}{@inner}{#1!50!black}{8}
123110
\endscope\fi
@@ -127,7 +114,7 @@ flowr@invclip/.style={
127114
\endscope\fi
128115
\ifnum\flowrlogo@Circles>2 \flowrlogo@DrawRound{1.25}{@inner}{#1!80!black}{15}\fi
129116
\ifnum\flowrlogo@Circles>1 \scope[rotate around={-8:(0,0)}]
130-
\scope[transparency group,opacity=\ifflowrlogo@print1\else.685\fi]\flowrlogo@DrawRound{1}{@inner}{#1}{22.5}\endscope
117+
\scope[transparency group,opacity=.685]\flowrlogo@DrawRound{1}{@inner}{#1}{22.5}\endscope
131118
\endscope\fi
132119
\flowrlogo@DrawRound{.75}{@inner!98!black}{#1}{36}
133120
\endscope
@@ -144,12 +131,9 @@ flowr@invclip/.style={
144131
\usepackage{relsize}
145132
\newsavebox\Flower
146133
\def\flowrlogo{%
147-
\ifflowrlogo@print\colorlet{@inner}{\flowrlogo@color}\else
148-
\colorlet{@inner}{\flowrlogo@color!50!white}\fi\csname flowrlogo@Profile\flowrlogo@profile\endcsname\setbox\Flower=\hbox{\tikz{\flowrlogo@Bloom{\flowrlogo@color}}}%
134+
\colorlet{@inner}{\flowrlogo@color!50!white}\csname flowrlogo@Profile\flowrlogo@profile\endcsname\setbox\Flower=\hbox{\tikz{\flowrlogo@Bloom{\flowrlogo@color}}}%
149135
\begin{tikzpicture}
150-
% \node (@) at (\flowrlogo@Xshift,-.3pt) {\resizebox{26pt}!{\usebox\Flower}};
151-
\ifflowrlogo@notext\else\node at (0,0) {\rotatebox{1}{\setmainfont[Scale=MatchLowercase]{Pecita}flow\kern.25pt{\larger R}}}; \fi %{\LARGE\selectfont flow\itshape R};\fi % \setmainfont[Scale=MatchLowercase]{Pecita}flow\kern.25pt{\large R}
152-
% [right=1.5mm] at (@.east)
136+
\node at (\flowrlogo@Xshift,-.3pt) {\resizebox{26pt}!{\usebox\Flower}};
137+
\ifflowrlogo@notext\else\node[white] at (-.15,0) {\fontsize{4pt}{4pt}\setmainfont[Scale=MatchLowercase]{Pecita}flow\kern.25pt{\larger[2]R}};\fi
153138
% \node at(current bounding box.center) {R\,~S};
154-
% \draw[line cap=round,thick] ([xshift=.8mm,yshift=1mm]@.south east) -- ([xshift=.8mm,yshift=-1mm]@.north east);
155139
\end{tikzpicture}}

0 commit comments

Comments
 (0)